bug修改

src/views/additionalOrder/additional/index.vue

@@ -1409,8 +1409,8 @@
                           </el-form-item>
                       </el-col>
                       <el-col :span="6">
-                          <el-form-item label="评分" prop="scope">
-                              <el-input v-model="additionalForm.scope" placeholder="请输入评分"></el-input>
+                          <el-form-item label="评分" prop="score">
+                              <el-input v-model="additionalForm.score" placeholder="请输入评分"></el-input>
                           </el-form-item>
                       </el-col>
                       <el-col :span="6">
@@ -1424,8 +1424,8 @@
                       </el-col>
 
                       <el-col :span="6">
-                          <el-form-item class="white-m-p24" label="交强险保单号" prop="jqApplyNo">
-                              <el-input v-model="additionalForm.jqApplyNo" placeholder="请输入交强险保单号"></el-input>
+                          <el-form-item class="white-m-p24" label="交强险保单号" prop="jqPolicyNo">
+                              <el-input v-model="additionalForm.jqPolicyNo" placeholder="请输入交强险保单号"></el-input>
                           </el-form-item>
                       </el-col>
                       <el-col :span="6">
@@ -1516,51 +1516,51 @@
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
-                          <el-form-item label="非现询费用" prop="c" v-if="additionalForm.isInquiry == '2'">
-                              <el-input placeholder="请输入" v-model="additionalForm.isInquiry"></el-input>
+                          <el-form-item label="非现询费用" prop="costId" v-if="additionalForm.isInquiry == '2'">
+                              <el-input placeholder="请输入" v-model="additionalForm.costId"></el-input>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
-                          <el-form-item class="white-m-p24" label="交强险总比例" prop="jqOtherCostsProportion">
-                              <el-input  v-model="additionalForm.jqOtherCostsProportion" >
-                                  <template #append>%</template>
-                              </el-input>
+                          <el-form-item class="white-m-p24" label="交强险总比例" prop="jqInletRatio">
+                              <el-input-number  v-model="additionalForm.jqInletRatio" :min="0" :max="100" :controls="false" style="width: 100%;" >
+                                  <template #suffix>%</template>
+                              </el-input-number>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
-                          <el-form-item label="商业险总比例" prop="syOtherCostsProportion">
-                              <el-input  v-model="additionalForm.syOtherCostsProportion" >
-                                  <template #append>%</template>
-                              </el-input>
+                          <el-form-item label="商业险总比例" prop="syInletRatio">
+                              <el-input-number  v-model="additionalForm.syInletRatio" :min="0" :max="100" :controls="false" style="width: 100%;"  >
+                                  <template #suffix>%</template>
+                              </el-input-number>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
-                          <el-form-item label="驾意险总比例" prop="f">
-                              <el-input  v-model="additionalForm.jyOtherCostsProportion" >
-                                  <template #append>%</template>
-                              </el-input>
+                          <el-form-item label="驾意险总比例" prop="jyInletRatio">
+                              <el-input-number  v-model="additionalForm.jyInletRatio" :min="0" :max="100" :controls="false" style="width: 100%;"  >
+                                  <template #suffix>%</template>
+                              </el-input-number>
                           </el-form-item>
                       </el-col>
 
                       <el-col :span="8">
-                          <el-form-item class="white-m-p24" label="交强险出口比例" prop="g">
-                              <el-input  v-model="additionalForm.jqExportRadio" >
-                                  <template #append>%</template>
-                              </el-input>
+                          <el-form-item class="white-m-p24" label="交强险出口比例" prop="jqExportRatio">
+                              <el-input-number  v-model="additionalForm.jqExportRatio" :min="0" :max="100" :controls="false" style="width: 100%;"  >
+                                  <template #suffix>%</template>
+                              </el-input-number>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
-                          <el-form-item label="商业险出口比例" prop="h">
-                              <el-input  v-model="additionalForm.syExportRadio" >
-                                  <template #append>%</template>
-                              </el-input>
+                          <el-form-item label="商业险出口比例" prop="syExportRatio">
+                              <el-input-number  v-model="additionalForm.syExportRatio" :min="0" :max="100" :controls="false" style="width: 100%;"  >
+                                  <template #suffix>%</template>
+                              </el-input-number>
                           </el-form-item>
                       </el-col>
                       <el-col :span="8">
-                          <el-form-item label="驾意险出口比例" prop="i">
-                              <el-input  v-model="additionalForm.jyExportRadio" >
-                                  <template #append>%</template>
-                              </el-input>
+                          <el-form-item label="驾意险出口比例" prop="jyExportRatio">
+                              <el-input-number v-model="additionalForm.jyExportRatio" :min="0" :max="100" :controls="false" style="width: 100%;"  >
+                                  <template #suffix>%</template>
+                              </el-input-number>
                           </el-form-item>
                       </el-col>
                   </el-row>
@@ -2014,9 +2014,9 @@ let additionalForm = ref({
     transfer: false,
     companyId: '',
     signingTime: '',
-    scope: '',
+    score: '',
     taxPremium: '',
-    jqApplyNo: '',
+    jqPolicyNo: '',
     jqRenewal: '',
     jqPremium: '',
     jyPremium: '',
@@ -2028,12 +2028,12 @@ let additionalForm = ref({
     // 保费信息
     agreementId: '',
     isInquiry: null,
-    jqOtherCostsProportion: '',
-    syOtherCostsProportion: '',
-    jyOtherCostsProportion: '',
-    jqExportRadio: '',
-    syExportRadio: '',
-    jyExportRadio: '',
+    jqInletRatio: '',
+    syInletRatio: '',
+    jyInletRatio: '',
+    jqExportRatio: '',
+    syExportRatio: '',
+    jyExportRatio: '',
 })
 let additionalRules = ref({
   licenseNo:[
@@ -3390,6 +3390,7 @@ const handleSave = () => {
       ciRiskInfoVo: {},
       biRiskInfoVo: {},
       insOrdersOtherInfo: {},
+      feeOrdersVo: {},
       imagesAdds: {
           images: []
       },
@@ -3446,6 +3447,9 @@ const handleSave = () => {
       additionalForm.value.age2 = additionalForm.value.age1
       additionalForm.value.gender2 = additionalForm.value.gender1
       additionalForm.value.email2 = additionalForm.value.email1
+
+      sfz1FrontResult.value={id:sfzFrontResult.value?.id}
+      sfz1BackResult.value={id:sfzBackResult.value?.id}
     }
     obj.policyHolderInfo = {
         personType: additionalForm.value.personType2, // 1个人2法人
@@ -3459,34 +3463,50 @@ const handleSave = () => {
         gender: additionalForm.value.gender2,
         email: additionalForm.value.email2,
     }
+    obj.feeOrdersVo = {
+        agreementId: additionalForm.value.agreementId,
+        costId: additionalForm.value.costId,
+        jqInletRatio: additionalForm.value.jqInletRatio,
+        syInletRatio: additionalForm.value.syInletRatio,
+        jyInletRatio: additionalForm.value.jyInletRatio,
+        jqExportRatio: additionalForm.value.jqExportRatio,
+        syExportRatio: additionalForm.value.syExportRatio,
+        jyExportRatio: additionalForm.value.jyExportRatio,
+    }
     if(btns.value.ower2show) {
-    let obj = btns.value.ower2.find(a => a.checked)
-    if(obj.text === '同投保人') {
-        additionalForm.value.personType3 = additionalForm.value.personType2 // 1个人2法人
-        additionalForm.value.carOwner3 = 2
-        additionalForm.value.name3 = additionalForm.value.name2
-        additionalForm.value.mobile3 = additionalForm.value.mobile2
-        additionalForm.value.addr3 = additionalForm.value.addr2
-        additionalForm.value.identifyNumber3 = additionalForm.value.identifyNumber2
-        additionalForm.value.identifyValidDate3 = additionalForm.value.identifyValidDate2
-        additionalForm.value.identifyValidEndDate3 = additionalForm.value.identifyValidEndDate2
-        additionalForm.value.age3 = additionalForm.value.age2
-        additionalForm.value.gender3 = additionalForm.value.gender2
-        additionalForm.value.email3 = additionalForm.value.email2
-    } else {
-        additionalForm.value.personType3 = additionalForm.value.personType1 // 1个人2法人
-        additionalForm.value.carOwner3 = 1
-        additionalForm.value.name3 = additionalForm.value.name1
-        additionalForm.value.mobile3 = additionalForm.value.mobile1
-        additionalForm.value.addr3 = additionalForm.value.addr1
-        additionalForm.value.identifyNumber3 = additionalForm.value.identifyNumber1
-        additionalForm.value.identifyValidDate3 = additionalForm.value.identifyValidDate1
-        additionalForm.value.identifyValidEndDate3 = additionalForm.value.identifyValidEndDate1
-        additionalForm.value.age3 = additionalForm.value.age1
-        additionalForm.value.gender3 = additionalForm.value.gender1
-        additionalForm.value.email3 = additionalForm.value.email1
+      let obj = btns.value.ower2.find(a => a.checked)
+      if(obj.text === '同投保人') {
+          additionalForm.value.personType3 = additionalForm.value.personType2 // 1个人2法人
+          additionalForm.value.carOwner3 = 2
+          additionalForm.value.name3 = additionalForm.value.name2
+          additionalForm.value.mobile3 = additionalForm.value.mobile2
+          additionalForm.value.addr3 = additionalForm.value.addr2
+          additionalForm.value.identifyNumber3 = additionalForm.value.identifyNumber2
+          additionalForm.value.identifyValidDate3 = additionalForm.value.identifyValidDate2
+          additionalForm.value.identifyValidEndDate3 = additionalForm.value.identifyValidEndDate2
+          additionalForm.value.age3 = additionalForm.value.age2
+          additionalForm.value.gender3 = additionalForm.value.gender2
+          additionalForm.value.email3 = additionalForm.value.email2
+
+          sfz2FrontResult.value={id:sfz1FrontResult.value?.id}
+          sfz2BackResult.value={id:sfz1BackResult.value?.id}
+      } else {
+          additionalForm.value.personType3 = additionalForm.value.personType1 // 1个人2法人
+          additionalForm.value.carOwner3 = 1
+          additionalForm.value.name3 = additionalForm.value.name1
+          additionalForm.value.mobile3 = additionalForm.value.mobile1
+          additionalForm.value.addr3 = additionalForm.value.addr1
+          additionalForm.value.identifyNumber3 = additionalForm.value.identifyNumber1
+          additionalForm.value.identifyValidDate3 = additionalForm.value.identifyValidDate1
+          additionalForm.value.identifyValidEndDate3 = additionalForm.value.identifyValidEndDate1
+          additionalForm.value.age3 = additionalForm.value.age1
+          additionalForm.value.gender3 = additionalForm.value.gender1
+          additionalForm.value.email3 = additionalForm.value.email1
+
+          sfz2FrontResult.value={id:sfzFrontResult.value?.id}
+          sfz2BackResult.value={id:sfzBackResult.value?.id}
+      }
     }
-  }
     obj.insuredPersonInfo = {
         personType: additionalForm.value.personType3, // 1个人2法人
         name: additionalForm.value.name3,
@@ -3565,9 +3585,9 @@ const handleSave = () => {
     ]
   }
     obj.insOrdersOtherInfo = {
-        scope: additionalForm.value.scope,
+        score: additionalForm.value.score,
         taxPremium: additionalForm.value.taxPremium,
-        jqApplyNo: additionalForm.value.jqApplyNo,
+        jqPolicyNo: additionalForm.value.jqPolicyNo,
         jqRenewal: additionalForm.value.jqRenewal,
         jqPremium: additionalForm.value.jqPremium,
         jyPremium: additionalForm.value.jyPremium,
@@ -3644,6 +3664,7 @@ const handleSubmit = async (FormRefs) => {
     ciRiskInfoVo: {},
     biRiskInfoVo: {},
     insOrdersOtherInfo: {},
+    feeOrdersVo: {},
     imagesAdds: {
       images: []
     },
@@ -3697,7 +3718,10 @@ const handleSubmit = async (FormRefs) => {
       additionalForm.value.age2 = additionalForm.value.age1
       additionalForm.value.gender2 = additionalForm.value.gender1
       additionalForm.value.email2 = additionalForm.value.email1
-  }
+
+      sfz1FrontResult.value={id:sfzFrontResult.value?.id}
+      sfz1BackResult.value={id:sfzBackResult.value?.id}
+    }
   obj.policyHolderInfo = {
       personType: additionalForm.value.personType2, // 1个人2法人
       name: additionalForm.value.name2,
@@ -3724,7 +3748,10 @@ const handleSubmit = async (FormRefs) => {
         additionalForm.value.age3 = additionalForm.value.age2
         additionalForm.value.gender3 = additionalForm.value.gender2
         additionalForm.value.email3 = additionalForm.value.email2
-    } else {
+
+          sfz2FrontResult.value={id:sfz1FrontResult.value?.id}
+          sfz2BackResult.value={id:sfz1BackResult.value?.id}
+      } else {
         additionalForm.value.personType3 = additionalForm.value.personType1 // 1个人2法人
         additionalForm.value.carOwner3 = 1
         additionalForm.value.name3 = additionalForm.value.name1
@@ -3736,7 +3763,10 @@ const handleSubmit = async (FormRefs) => {
         additionalForm.value.age3 = additionalForm.value.age1
         additionalForm.value.gender3 = additionalForm.value.gender1
         additionalForm.value.email3 = additionalForm.value.email1
-    }
+
+        sfz2FrontResult.value={id:sfzFrontResult.value?.id}
+        sfz2BackResult.value={id:sfzBackResult.value?.id}
+      }
   }
   obj.insuredPersonInfo = {
       personType: additionalForm.value.personType3, // 1个人2法人
@@ -3750,6 +3780,16 @@ const handleSubmit = async (FormRefs) => {
       gender: additionalForm.value.gender3,
       email: additionalForm.value.email3,
   }
+  obj.feeOrdersVo = {
+    agreementId: additionalForm.value.agreementId,
+    costId: additionalForm.value.costId,
+    jqInletRatio: additionalForm.value.jqInletRatio,
+    syInletRatio: additionalForm.value.syInletRatio,
+    jyInletRatio: additionalForm.value.jyInletRatio,
+    jqExportRatio: additionalForm.value.jqExportRatio,
+    syExportRatio: additionalForm.value.syExportRatio,
+    jyExportRatio: additionalForm.value.jyExportRatio,
+  }
   if(detailData.value) {
     obj.insOrders = detailData.value.insOrders
   }
@@ -3781,9 +3821,9 @@ const handleSubmit = async (FormRefs) => {
     riskCode: '0510'
   }
   obj.insOrdersOtherInfo = {
-      scope: additionalForm.value.scope,
+      score: additionalForm.value.score,
       taxPremium: additionalForm.value.taxPremium,
-      jqApplyNo: additionalForm.value.jqApplyNo,
+      jqPolicyNo: additionalForm.value.jqPolicyNo,
       jqRenewal: additionalForm.value.jqRenewal,
       jqPremium: additionalForm.value.jqPremium,
       jyPremium: additionalForm.value.jyPremium,
@@ -3975,7 +4015,7 @@ const initEditData = () => {
         fileList.value = obj.imagesAdds?.images
         // 有对应图片说明是通过识别拿到的信息
         if(fileList.value&&fileList.value.length>0) {
-          carSwitch.value = fileList.value.filter(a => a.imageType === 'C01' || a.imageType === 'D01')?true: false
+          carSwitch.value = fileList.value.some(a => a.imageType === 'C01' || a.imageType === 'D01')?true: false
         } else {
           carSwitch.value = false
         }
@@ -3998,12 +4038,28 @@ const initEditData = () => {
         } else {
           ower2Switch.value = false
         }
+          xszFrontResult.value=fileList.value.find(v => v.imageType === 'C01')
+          xszFront.value=fileList.value.find(v => v.imageType === 'C01')?.downloadUrl
+          xszBackResult.value=fileList.value.find(v => v.imageType === 'D01')
+          xszBack.value=fileList.value.find(v => v.imageType === 'D01')?.downloadUrl
+          sfzFrontResult.value=fileList.value.find(v => v.imageType === 'C02')
+          sfzFront.value=fileList.value.find(v => v.imageType === 'C02')?.downloadUrl
+          sfzBackResult.value=fileList.value.find(v => v.imageType === 'D02')
+          sfzBack.value=fileList.value.find(v => v.imageType === 'D02')?.downloadUrl
+          sfz1FrontResult.value=fileList.value.find(v => v.imageType === 'C03')
+          sfz1Front.value=fileList.value.find(v => v.imageType === 'C03')?.downloadUrl
+          sfz1BackResult.value=fileList.value.find(v => v.imageType === 'D03')
+          sfz1Back.value=fileList.value.find(v => v.imageType === 'D03')?.downloadUrl
+          sfz2FrontResult.value=fileList.value.find(v => v.imageType === 'C04')
+          sfz2Front.value=fileList.value.find(v => v.imageType === 'C04')?.downloadUrl
+          sfz2BackResult.value=fileList.value.find(v => v.imageType === 'D04')
+          sfz2Back.value=fileList.value.find(v => v.imageType === 'D04')?.downloadUrl
 
           additionalForm.value.companyId = obj.insOrders.companyId
           additionalForm.value.signingTime = obj.insOrders.signingTime
-          additionalForm.value.scope = obj.insOrdersOtherInfo.scope
+          additionalForm.value.score = obj.insOrdersOtherInfo.score
           additionalForm.value.taxPremium = obj.insOrdersOtherInfo.taxPremium
-          additionalForm.value.jqApplyNo = obj.insOrdersOtherInfo.jqApplyNo
+          additionalForm.value.jqPolicyNo = obj.insOrdersOtherInfo.jqPolicyNo
           additionalForm.value.jqRenewal = obj.insOrdersOtherInfo.jqRenewal
           additionalForm.value.jqPremium = obj.insOrdersOtherInfo.jqPremium
           additionalForm.value.jyPremium = obj.insOrdersOtherInfo.jyPremium
@@ -4011,6 +4067,17 @@ const initEditData = () => {
           additionalForm.value.syRenewal = obj.insOrdersOtherInfo. syRenewal
           additionalForm.value.syPremium = obj.insOrdersOtherInfo. syPremium
           additionalForm.value.sumPremium = obj.insOrdersOtherInfo.sumPremium
+
+          additionalForm.value.agreementId = obj.feeOrdersVo.agreementId
+          additionalForm.value.costId = obj.feeOrdersVo.costId
+          additionalForm.value.jqInletRatio = obj.feeOrdersVo.jqInletRatio
+          additionalForm.value.syInletRatio = obj.feeOrdersVo.syInletRatio
+          additionalForm.value.jyInletRatio = obj.feeOrdersVo.jyInletRatio
+          additionalForm.value.jqExportRatio = obj.feeOrdersVo.jqExportRatio
+          additionalForm.value.syExportRatio = obj.feeOrdersVo.syExportRatio
+          additionalForm.value.jyExportRatio = obj.feeOrdersVo.jyExportRatio
+
+
         jqPolicyId.value = obj.insOrdersExternalPolicy?.jqPolicy
         syPolicyId.value = obj.insOrdersExternalPolicy?.syPolicy
         noPolicyId.value = obj.insOrdersExternalPolicy?.noPolicy

src/views/additionalOrder/temporarily/index.vue

@@ -61,7 +61,7 @@
     >
       <el-table-column label="订单号" prop="a" width="200">
         <template #default="scope">
-          <el-button link type="primary" @click="handleDetail(scope.row)">{{ scope.row.quoteNo }}</el-button>
+          <el-button link type="primary" @click="handleDetail(scope.row)">{{ scope.row.id }}</el-button>
         </template>
       </el-table-column  >
       <el-table-column label="业务员信息" prop="realQuoteUserName" width="120"></el-table-column>
@@ -187,6 +187,7 @@ const initData = () => {
     pages: pages.value,
     size: size.value,
     isTemporarily: 1,
+    parentId: 1,
     orderNo: form.value.orderNo,
     salesman: form.value.salesman,
     salesmanCompany: form.value.salesmanCompany,