报价

src/api/crm/contract/index.ts

@@ -140,6 +140,11 @@ export const getOrg = async (params) => {
   return await request.get({ url: '/system/organizations/page', params })
 }
 
+// 合作主主体详情
+export const getOrgInfo = async (params) => {
+  return await request.get({ url: '/system/organizations/get?id=' + params })
+}
+
 // ==================== 子表（CRM 合同产品关联） ====================
 
 // 获得CRM 合同产品关联列表

src/views/crm/contract/ContractForm.vue

@@ -75,14 +75,14 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="票据模板" prop="invoiceTemplateId">
             <el-input v-model="formData.invoiceTemplateId" placeholder="请输入票据模板" disabled />
           </el-form-item>
         </el-col>
       </el-row>
       
-      <el-row>
+      <el-row> -->
         <el-col :span="8">
           <el-form-item label="违约金比例" prop="penaltyRate">
             <el-input v-model="formData.penaltyRate" placeholder="请输入违约金比例" />

src/views/crm/contract/detail/ContractChangeDetail.vue

@@ -72,7 +72,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="变更项目" prop="endTime">
-            <el-radio-group v-model="formData.radio">
+            <el-radio-group v-model="formData.radio" disabled>
               <el-radio :value="1">额度</el-radio>
               <el-radio :value="2">授权人</el-radio>
               <el-radio :value="3">延期</el-radio>

src/views/crm/quotation/QuotationForm.vue

@@ -12,7 +12,7 @@
 
         <el-col :span="8">
           <el-form-item label="选择商机" prop="businessId">
-            <el-select v-model="formData.businessId" placeholder="请选择商机" @change="onBusinessChange">
+            <el-select v-model="formData.businessId" clearable placeholder="请选择商机" @change="onBusinessChange">
               <el-option
                 v-for="dict in businessList"
                 :key="dict.id"
@@ -37,7 +37,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="授信额度调整" prop="creditLimitNum">
-            <el-input v-model="formData.creditLimitNum" @input="changeNum"  placeholder="请输入授信额度调整" />
+            <el-input v-model="formData.creditLimitNum" @input="changeNum" clearable placeholder="请输入授信额度调整" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -47,7 +47,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="客户" prop="customerId">
-            <el-select v-model="formData.customerId" placeholder="请选择客户" @change="onCustomerChange">
+            <el-select v-model="formData.customerId" placeholder="请选择客户" clearable @change="onCustomerChange">
               <el-option
                     v-for="item in customerList"
                     :key="item.id"
@@ -59,7 +59,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="合作类型" prop="cooperationType">
-             <el-select v-model="formData.cooperationType" filterable placeholder="请选择合作类型" class="w-1/1">
+             <el-select v-model="formData.cooperationType" filterable clearable placeholder="请选择合作类型" class="w-1/1">
               <el-option
                 v-for="dict in getIntDictOptions(DICT_TYPE.CRM_COOPERATION_TYPE)"
                 :key="dict.value"
@@ -71,42 +71,42 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="公司类型" prop="companyType">
-            <el-input v-model="formData.companyType" />
+            <el-input v-model="formData.companyType" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="上市情况" prop="listingStatus">
-            <el-input v-model="formData.listingStatus" />
+            <el-input v-model="formData.listingStatus" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="融资信息" prop="financingInfo">
-            <el-input v-model="formData.financingInfo"  />
+            <el-input v-model="formData.financingInfo" clearable  />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="实缴资金" prop="paidInCapital">
-            <el-input v-model="formData.paidInCapital"  />
+            <el-input v-model="formData.paidInCapital" clearable  />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="参保人数" prop="insuredCount">
-            <el-input v-model="formData.insuredCount"  />
+            <el-input v-model="formData.insuredCount" clearable  />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="成立日期" prop="establishmentDate">
-            <el-input v-model="formData.establishmentDate"  />
+            <el-input v-model="formData.establishmentDate" clearable  />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="企业类型" prop="enterpriseType">
-            <el-input v-model="formData.enterpriseType"  />
+            <el-input v-model="formData.enterpriseType" clearable  />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="营业状态" prop="businessStatus">
-            <el-input v-model="formData.businessStatus"  />
+            <el-input v-model="formData.businessStatus"  clearable />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -163,7 +163,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="合作主体" prop="partnerCompanyId">
-            <el-select v-model="formData.partnerCompanyId" placeholder="请选择合作主体" @change="onPartnerChange">
+            <el-select v-model="formData.partnerCompanyId" clearable placeholder="请选择合作主体" @change="onPartnerChange">
               <el-option
                 v-for="dict in orgList"
                 :key="dict.id"
@@ -525,7 +525,7 @@ const onPartnerChange = async (id: string) => {
   if (!id) return
   try {
     formLoading.value = true;
-    const res = await DeptApi.getDept(id);
+    const res = await ContractApi.getOrgInfo(id);
     formData.value.bBankName = res.bankName;
     formData.value.bBankAccount = res.bankAccount;
     formData.value.bLegalRepresentative = res.legalRepresentative;

src/views/crm/quotation/components/QuotationProductForm.vue

@@ -201,8 +201,6 @@ watch(
 watch(
   () => props.billTemplateId,
   async (val) => {
-    // 1. 重置表单
-    formData.value = []
     // 2. val 非空，则加载数据
     if (!val) {
       return;
@@ -216,8 +214,17 @@ watch(
           businessId: props.businessId,
           billTemplateId: val,
         });
-        console.log('%csrc/views/crm/quotation/components/QuotationProductForm.vue:167 business.data', 'color: #007acc;', business.data);
+        for(let i = 0; i < business.length; i++) {
-        formData.value = business
+          let data = business[i]
+          let foundItem = formData.value.find(item => item.productId == data.productId);
+          if (foundItem) {
+            foundItem.productInvoice = data.productInvoice
+            foundItem.productInvoiceItems = data.productInvoiceItems
+            foundItem.serviceFeeInvoice = data.serviceFeeInvoice
+            foundItem.serviceFeeInvoiceItems = data.serviceFeeInvoiceItems
+          }
+        }
+        // formData.value = business
       // }
     } finally {
       formLoading.value = false