fix: 修改bug

src/components/ruleConditionContainer/index.vue

@@ -7,8 +7,7 @@
           <el-input v-model="item.attrName" disabled />
         </el-col>
         <el-col :span="3">
-          <el-select v-model="item.operator" placeholder="运算符" style="width: 100px; margin: 0 10px;"
-            :disabled="item.attrType !== 'inputNumber' && item.attrType !== 'datetime' && item.attrType !== 'inputTag'">
+          <el-select v-model="item.operator" placeholder="运算符" style="width: 100px; margin: 0 10px;">
             <template v-if="item.attrType == 'inputTag'">
               <el-option label="包含" value="1"></el-option>
               <el-option label="不包含" value="2"></el-option>

src/views/insurancePolicy/index.vue

@@ -1526,13 +1526,13 @@ const initDetail = () => {
             }
             if(obj?.ownersInfo?.identifyNumber == obj?.insuredPersonInfo?.identifyNumber) {
                 btns.value.owner2[1].checked = true
-                btns.value.owner1Text = '同车主'
+                btns.value.owner2Text = '同车主'
             } else if(obj?.policyHolderInfo?.identifyNumber == obj?.insuredPersonInfo?.identifyNumber) {
                 btns.value.owner2[0].checked = true
-                btns.value.owner1Text = '同投保人'
+                btns.value.owner2Text = '同投保人'
             } else {
                 btns.value.owner2[2].checked = true
-                btns.value.owner1Text = '其他人'
+                btns.value.owner2Text = '其他人'
             }
             // 车船税
             insurancePolicyForm.value.extendChar2 = obj?.vehicleAndVesselTaxVo?.extendChar2
@@ -1783,9 +1783,9 @@ let insurancePolicyRules = ref<FormRules>({
   completeKerbMass: [
     { required: true, trigger: 'blur', message: '请输入整备质量' }
   ],
-  limitLoad: [
-    { required: true, trigger: 'blur', message: '请输入核定载质量' }
-  ],
+  // limitLoad: [
+  //   { required: true, trigger: 'blur', message: '请输入核定载质量' }
+  // ],
   seatCount: [
     { required: true, trigger: 'blur', message: '请输入座位数' }
   ],
@@ -2721,27 +2721,27 @@ const handleUnderwriting = (scope) => {
     quoteNo: insurancePolicyForm.value.order.quoteNo,
       list: images.value
   }
-  nextTick(() => {
-      UnderwritingRefs.value.initEdit({
-          ...data
-      })
-  })
-  // api.insurancePolicyApi.imagesUpload({
-  //   order: {
-  //     ...data
-  //   }
-  // }).then((res: any) => {
-  //   if(res.code === 200) {
-  //     nextTick(() => {
-  //       UnderwritingRefs.value.initEdit(data)
-  //     })
-  //   } else {
-  //     ElMessage({
-  //       message: res.msg,
-  //       type: 'warning'
+  // nextTick(() => {
+  //     UnderwritingRefs.value.initEdit({
+  //         ...data
   //     })
-  //   }
   // })
+  api.insurancePolicyApi.imagesUpload({
+    order: {
+      ...data
+    }
+  }).then((res: any) => {
+    if(res.code === 200) {
+      nextTick(() => {
+        UnderwritingRefs.value.initEdit(data)
+      })
+    } else {
+      ElMessage({
+        message: res.msg,
+        type: 'warning'
+      })
+    }
+  })
 }
 const handleUnderwritingClose = () => {
   underwritingShow.value = false
@@ -2751,6 +2751,12 @@ const handleUnderwritingClose = () => {
 let imageShow = ref(false)
 let images = ref([])
 const handleImageClose = (data) => {
+    btns.value.owner1.forEach(a => {
+        a.checked = false
+    })
+    btns.value.owner2.forEach(a => {
+        a.checked = false
+    })
   imageShow.value = false
     images.value = []
   if(data) {
@@ -2812,6 +2818,13 @@ const handleImageClose = (data) => {
       insurancePolicyForm.value.address2 = ower1Form.address || hadWritedData.value.address2
       insurancePolicyForm.value.registeredCapital2 = ower1Form.registeredCapital || hadWritedData.value.registeredCapital2
       insurancePolicyForm.value.email2 = ower1Form.email || hadWritedData.value.email2
+      if(!insurancePolicyForm.value.identifyNumber2 || insurancePolicyForm.value.identifyNumber2 && insurancePolicyForm.value.identifyNumber1 == insurancePolicyForm.value.identifyNumber2) {
+          btns.value.owner1[0].checked = true
+          btns.value.owner1Text = '同车主'
+      } else if(insurancePolicyForm.value.identifyNumber2 && insurancePolicyForm.value.identifyNumber1 != insurancePolicyForm.value.identifyNumber2) {
+          btns.value.owner1[1].checked = true
+          btns.value.owner1Text = '其他人'
+      }
     }
     if(ower2Form) {
       insurancePolicyForm.value.name3 = ower2Form.name || hadWritedData.value.name3
@@ -2827,6 +2840,16 @@ const handleImageClose = (data) => {
       insurancePolicyForm.value.address3 = ower2Form.address || hadWritedData.value.address3
       insurancePolicyForm.value.registeredCapital3 = ower2Form.registeredCapital || hadWritedData.value.registeredCapital3
       insurancePolicyForm.value.email3 = ower2Form.email || hadWritedData.value.email3
+      if(insurancePolicyForm.value.identifyNumber3 && insurancePolicyForm.value.identifyNumber1 == insurancePolicyForm.value.identifyNumber3) {
+          btns.value.owner2[1].checked = true
+          btns.value.owner2Text = '同车主'
+      } else if(!insurancePolicyForm.value.identifyNumber3 || insurancePolicyForm.value.identifyNumber3 && insurancePolicyForm.value.identifyNumber2 == insurancePolicyForm.value.identifyNumber3) {
+          btns.value.owner2[0].checked = true
+          btns.value.owner2Text = '同投保人'
+      } else if(insurancePolicyForm.value.identifyNumber3 && insurancePolicyForm.value.identifyNumber2 != insurancePolicyForm.value.identifyNumber3) {
+          btns.value.owner2[2].checked = true
+          btns.value.owner2Text = '其他人'
+      }
     }
     if(imageVoList&&imageVoList.length>0) {
       insurancePolicyForm.value.imageVoList = imageVoList.filter(a => a.imageBase64List[0].imageId)
@@ -2850,6 +2873,15 @@ const handleRecognition = (achor) => {
 // 提交
 let loading = ref(false)
 const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined, scope) => {
+    if(insurancePolicyForm.value.plateType == 'A1') {
+        if(!insurancePolicyForm.value.limitLoad) {
+            ElMessage({
+                message: '车辆种类为货车时，核定载质量必传！',
+                type: 'warning'
+            })
+            return
+        }
+    }
   if(!InsurancePolicyRefs) {
     InsurancePolicyRefs?.resetFields()
     return

src/views/quoteConfig/costManagement.vue

@@ -51,7 +51,7 @@
           <div class="flex a-c">
             <el-input v-model="agreementQueryName" style="width: 240px;margin-right: 10px;"
               placeholder="输入协议名称，简称，编码查找" />
-            <el-button type="primary">查询</el-button>
+            <el-button type="primary" @click="agreement">查询</el-button>
           </div>
           <div class="flex f-c m-top-20" style="max-height: 400px;overflow-y: auto;">
             <div class="agreementItem flex f-c " :class="{ active: agritem.id == AgreementId }"

src/views/receivable/documentary/documentaryRecord.vue

@@ -68,10 +68,9 @@
             </el-table-column>
             <el-table-column prop="invoiceParty" label="开票方" width="150"></el-table-column>
             <el-table-column prop="accountsReceivable" label="应收项" width="100"></el-table-column>
-            <el-table-column prop="receivableSupervisePremium" label="应收手续费" width="120"></el-table-column>
+            <el-table-column prop="receivableSupervisePremium" label="应收跟单费" width="120"></el-table-column>
             <el-table-column prop="overinflatedAmount" label="虚增金额" width="120"></el-table-column>
             <el-table-column prop="taxPoint" label="税点" width="120"></el-table-column>
-            <el-table-column prop="actualReceivedAmount" label="开票金额" width="120"></el-table-column>
             <el-table-column prop="receivableSupervisePremium" label="应收金额" width="120"></el-table-column>
             <el-table-column prop="settlementStatus" label="结算状态" width="120"></el-table-column>
             <el-table-column prop="a" label="已结算" width="120"></el-table-column>

src/views/receivable/documentary/documentaryReport.vue

@@ -47,8 +47,8 @@
                                                 展开
                                             </template>
                                         </el-table-column>-->
-                    <el-table-column prop="totalReceivable" label="应收金额" width="240"></el-table-column>
-                    <el-table-column prop="superviseFee" label="应收手续费" width="240"></el-table-column>
+                    <el-table-column prop="totalReceivable" label="累计应收" width="240"></el-table-column>
+                    <el-table-column prop="superviseFee" label="应收跟单费" width="240"></el-table-column>
                     <el-table-column prop="invoicedAmount" label="已开票" width="200"></el-table-column>
                     <el-table-column prop="settledAmount" label="已结算" width="200"></el-table-column>
                     <el-table-column prop="unInvoicedAmount" label="未开票" width="200"></el-table-column>
@@ -217,12 +217,12 @@
                     <el-table-column prop="status" label="状态" width="100"></el-table-column>
                     <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
                     <el-table-column prop="productName" label="险种" width="120"></el-table-column>
-                    <el-table-column prop="receivableSuperviseCosts" label="应收手续费" width="100"></el-table-column>
+                    <el-table-column prop="receivableSuperviseCosts" label="应收跟单费" width="100"></el-table-column>
                     <el-table-column prop="jqPremium" label="交强险保费" width="100"></el-table-column>
                     <el-table-column prop="taxPremium" label="车船税" width="100"></el-table-column>
-                    <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例" width="100"></el-table-column>
+                    <el-table-column prop="jqSuperviseCostsProportion" label="交强险跟单费比例" width="100"></el-table-column>
                     <el-table-column prop="syPremium" label="商业险保费" width="100"></el-table-column>
-                    <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例" width="100"></el-table-column>
+                    <el-table-column prop="sySuperviseCostsProportion" label="商业险跟单费比例" width="100"></el-table-column>
                     <el-table-column prop="jqPolicyNo" label="交强险保单号" width="200"></el-table-column>
                     <el-table-column prop="syPolicyNo" label="商业险保单号" width="200"></el-table-column>
                     <el-table-column prop="invoicePerson" label="开票人" width="100"></el-table-column>
@@ -304,11 +304,10 @@
                     <el-table-column prop="status" label="状态" width="100"></el-table-column>
                     <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
                     <el-table-column prop="productName" label="险种" width="120"></el-table-column>
-                    <el-table-column prop="receivableSuperviseCosts" label="应收手续费" width="100"></el-table-column>
+                    <el-table-column prop="receivableSuperviseCosts" label="应收跟单费" width="100"></el-table-column>
                     <el-table-column prop="jyPremium" label="非车险保费" width="100"></el-table-column>
-                    <el-table-column prop="jySuperviseCostsProportion" label="非车险手续费比例" width="100"></el-table-column>
+                    <el-table-column prop="jySuperviseCostsProportion" label="非车险跟单费比例" width="100"></el-table-column>
                     <el-table-column prop="jyPolicyNo" label="非车险保单号" width="200"></el-table-column>
-                    <el-table-column prop="syPolicyNo" label="商业险保单号" width="200"></el-table-column>
                     <el-table-column prop="invoicePerson" label="开票人" width="100"></el-table-column>
                     <el-table-column prop="invoiceTime" label="开票时间" width="150"></el-table-column>
                 </el-table>

src/views/receivable/documentary/index.vue

@@ -163,27 +163,29 @@
                     @select-all="handleSelectAll1"
                 >
                     <el-table-column type="selection" width="80"></el-table-column>
-                    <el-table-column prop="a" label="签单时间" width="150"></el-table-column>
-                    <el-table-column prop="a" label="订单号" width="150"></el-table-column>
-                    <el-table-column prop="a" label="保险公司" width="120"></el-table-column>
-                    <el-table-column prop="a" label="出单机构" width="120"></el-table-column>
-                    <el-table-column prop="a" label="出单协议" width="150"></el-table-column>
-                    <el-table-column prop="a" label="订单类型" width="100"></el-table-column>
-                    <el-table-column prop="a" label="车牌号" width="100"></el-table-column>
-                    <el-table-column prop="a" label="应收手续费" width="100"></el-table-column>
-                    <el-table-column prop="a" label="险种" width="100"></el-table-column>
-                    <el-table-column prop="a" label="被保人" width="100"></el-table-column>
-                    <el-table-column prop="a" label="交强险保费" width="100"></el-table-column>
-                    <el-table-column prop="a" label="车船税" width="100"></el-table-column>
-                    <el-table-column prop="a" label="交强险手续费比例" width="100"></el-table-column>
-                    <el-table-column prop="a" label="商业险保费" width="100"></el-table-column>
-                    <el-table-column prop="a" label="商业险手续费比例" width="100"></el-table-column>
-                    <el-table-column prop="a" label="交强险保单号" width="150"></el-table-column>
-                    <el-table-column prop="a" label="商业险保单号" width="150"></el-table-column>
-                    <el-table-column prop="a" label="交强险起保日期" width="150"></el-table-column>
-                    <el-table-column prop="a" label="商业险起保日期" width="150"></el-table-column>
-                    <el-table-column prop="a" label="创建时间" width="150"></el-table-column>
-                    <el-table-column prop="a" label="对接人" width="100"></el-table-column>
+                    <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
+                    <el-table-column prop="orderNo" label="订单号" width="150"></el-table-column>
+                    <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
+                    <el-table-column prop="deptName" label="出单机构" width="120"></el-table-column>
+                    <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
+                    <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
+                    <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
+                    <el-table-column prop="otherCostsPremiums" label="应收跟单费" width="100"></el-table-column>
+                    <el-table-column prop="productName" label="险种" width="100"></el-table-column>
+                    <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
+                    <el-table-column prop="jqPremium" label="交强险保费" width="100"></el-table-column>
+<!--                    <el-table-column prop="a" label="交强险不含税保费" width="100"></el-table-column>-->
+                    <el-table-column prop="taxPremium" label="车船税" width="100"></el-table-column>
+                    <el-table-column prop="jqSuperviseCostsProportion" label="交强险跟单费比例" width="100"></el-table-column>
+                    <el-table-column prop="syPremium" label="商业险保费" width="100"></el-table-column>
+<!--                    <el-table-column prop="a" label="商业险不含税保费" width="100"></el-table-column>-->
+                    <el-table-column prop="sySuperviseCostsProportion" label="商业险跟单费比例" width="100"></el-table-column>
+                    <el-table-column prop="jqPolicyNo" label="交强险保单号" width="150"></el-table-column>
+                    <el-table-column prop="syPolicyNo" label="商业险保单号" width="150"></el-table-column>
+                    <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
+                    <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>
+                    <el-table-column prop="createTime" label="创建时间" width="150"></el-table-column>
+                    <el-table-column prop="dockingPerson" label="对接人" width="100"></el-table-column>
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="scope">
                             <el-button link type="primary">编辑</el-button>
@@ -355,23 +357,23 @@
                     @select-all="handleSelectAll2"
                 >
                     <el-table-column type="selection" width="80"></el-table-column>
-                    <el-table-column prop="a" label="签单时间" width="150"></el-table-column>
-                    <el-table-column prop="a" label="订单号" width="150"></el-table-column>
-                    <el-table-column prop="a" label="保险公司" width="120"></el-table-column>
-                    <el-table-column prop="a" label="出单机构" width="120"></el-table-column>
-                    <el-table-column prop="a" label="出单协议" width="150"></el-table-column>
-                    <el-table-column prop="a" label="订单类型" width="100"></el-table-column>
-                    <el-table-column prop="a" label="车牌号" width="100"></el-table-column>
-                    <el-table-column prop="a" label="应收总额" width="100"></el-table-column>
-                    <el-table-column prop="a" label="险种" width="100"></el-table-column>
-                    <el-table-column prop="a" label="结算状态" width="100"></el-table-column>
-                    <el-table-column prop="a" label="被保人" width="100"></el-table-column>
-                    <el-table-column prop="a" label="非车险保费" width="100"></el-table-column>
-                    <el-table-column prop="a" label="非车险手续费比例" width="100"></el-table-column>
-                    <el-table-column prop="a" label="交强险起保日期" width="150"></el-table-column>
-                    <el-table-column prop="a" label="商业险起保日期" width="150"></el-table-column>
-                    <el-table-column prop="a" label="创建时间" width="150"></el-table-column>
-                    <el-table-column prop="a" label="对接人" width="100"></el-table-column>
+                    <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
+                    <el-table-column prop="orderNo" label="订单号" width="150"></el-table-column>
+                    <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
+                    <el-table-column prop="deptName" label="出单机构" width="120"></el-table-column>
+                    <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
+                    <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
+                    <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
+                    <el-table-column prop="otherCostsPremiums" label="应收跟单费" width="100"></el-table-column>
+                    <el-table-column prop="productName" label="险种" width="100"></el-table-column>
+                    <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
+                    <el-table-column prop="jyPremium" label="非车险保费" width="100"></el-table-column>
+<!--                    <el-table-column prop="a" label="非车险不含税保费" width="100"></el-table-column>-->
+                    <el-table-column prop="jySuperviseCostsProportion" label="非车险跟单费比例" width="100"></el-table-column>
+                    <el-table-column prop="jyPolicyNo" label="非车险保单号" width="100"></el-table-column>
+                    <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
+                    <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>
+                    <el-table-column prop="createTime" label="创建时间" width="150"></el-table-column>
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="scope">
                             <el-button link type="primary">编辑</el-button>

src/views/receivable/handingFee/index.vue

@@ -170,12 +170,8 @@
                     <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
                     <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
                     <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
-                    <el-table-column label="应收手续费" width="100">
-                        <template #default="scope">
-                            {{ scope.row.productId === '0330' || scope.row.productId === '0330034002' || scope.row.productId === '034002'?scope.row.jqSuperviseCostsPremiums:scope.row.productId === '034001' || scope.row.productId === '0330034001'?scope.row.sySuperviseCostsPremiums: ''  }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="productId" label="险种" width="100"></el-table-column>
+                    <el-table-column prop="superviseCostsPremiums" label="应收手续费" width="100"></el-table-column>
+                    <el-table-column prop="productName" label="险种" width="100"></el-table-column>
                     <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
                     <el-table-column prop="jqPremium" label="交强险保费" width="100"></el-table-column>
                     <el-table-column prop="taxPremium" label="车船税" width="100"></el-table-column>
@@ -359,23 +355,22 @@
                     @select-all="handleSelectAll2"
                 >
                     <el-table-column type="selection" width="80"></el-table-column>
-                    <el-table-column prop="a" label="签单时间" width="150"></el-table-column>
-                    <el-table-column prop="a" label="订单号" width="150"></el-table-column>
-                    <el-table-column prop="a" label="保险公司" width="120"></el-table-column>
-                    <el-table-column prop="a" label="出单机构" width="120"></el-table-column>
-                    <el-table-column prop="a" label="出单协议" width="150"></el-table-column>
-                    <el-table-column prop="a" label="订单类型" width="100"></el-table-column>
-                    <el-table-column prop="a" label="车牌号" width="100"></el-table-column>
-                    <el-table-column prop="a" label="应收总额" width="100"></el-table-column>
-                    <el-table-column prop="a" label="险种" width="100"></el-table-column>
-                    <el-table-column prop="a" label="结算状态" width="100"></el-table-column>
-                    <el-table-column prop="a" label="被保人" width="100"></el-table-column>
-                    <el-table-column prop="a" label="非车险保费" width="100"></el-table-column>
-                    <el-table-column prop="a" label="非车险手续费比例" width="100"></el-table-column>
-                    <el-table-column prop="a" label="交强险起保日期" width="150"></el-table-column>
-                    <el-table-column prop="a" label="商业险起保日期" width="150"></el-table-column>
-                    <el-table-column prop="a" label="创建时间" width="150"></el-table-column>
-                    <el-table-column prop="a" label="对接人" width="100"></el-table-column>
+                    <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
+                    <el-table-column prop="orderNo" label="订单号" width="150"></el-table-column>
+                    <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
+                    <el-table-column prop="deptName" label="出单机构" width="120"></el-table-column>
+                    <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
+                    <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
+                    <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
+                    <el-table-column prop="superviseCostsPremiums" label="应收总额" width="100"></el-table-column>
+                    <el-table-column prop="productName" label="险种" width="100"></el-table-column>
+                    <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
+                    <el-table-column prop="jyPremium" label="非车险保费" width="100"></el-table-column>
+                    <el-table-column prop="jySuperviseCostsProportion" label="非车险手续费比例" width="100"></el-table-column>
+                    <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
+                    <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>
+                    <el-table-column prop="createTime" label="创建时间" width="150"></el-table-column>
+                    <el-table-column prop="dockingPerson" label="对接人" width="100"></el-table-column>
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="scope">
                             <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>