Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/components/complexTable/index.vue

@@ -69,7 +69,7 @@
               {{ scope.row[column.prop] }}
             </RouterLink>
             <div v-else-if="column.component === 'html'">
-              <span   v-html="htmlEvent(scope.row, column).html"></span>
+              <span v-html="htmlEvent(scope.row, column).html"></span>
             </div>
             <el-tag v-else-if="column.component === 'Tag'" :type="getTagTypeAndText(scope.row, column).type">
               {{ getTagTypeAndText(scope.row, column).text }}

src/views/additionalOrder/additional/index.vue

@@ -2957,10 +2957,10 @@ const cvalculateFees = () => {
   for (const key in objInsurance) {
     const obj = costExternalTypeAdds.find(v => v.costType === key)
     const element = objInsurance[key];
-    additionalForm.value[element + 'Inlet'] = obj?.inlet ?? null
-    additionalForm.value[element + 'AddThrow'] = obj?.addThrow ?? null
-    additionalForm.value[element + 'Export'] = obj?.export ?? null
-    additionalForm.value[element + 'KeepPointRatio'] = obj?.keepPointRatio ?? null
+    additionalForm.value[element + 'Inlet'] = additionalForm.value[element + 'Inlet'] ?? obj?.inlet ?? null
+    additionalForm.value[element + 'AddThrow'] = additionalForm.value[element + 'AddThrow'] ??  obj?.addThrow ?? null
+    additionalForm.value[element + 'Export'] = additionalForm.value[element + 'Export'] ??  obj?.export ?? null
+    additionalForm.value[element + 'KeepPointRatio'] = additionalForm.value[element + 'KeepPointRatio'] ??  obj?.keepPointRatio ?? null
   }
   api.additionalApi.cvalculateFees({
     agreementId: additionalForm.value.agreementId,

src/views/insurancePolicy/order.vue

@@ -81,7 +81,13 @@
       <el-table-column label="车架号" prop="vinNo" width="200"></el-table-column>
       <el-table-column label="状态" prop="orderStatus" width="200">
         <template #default="scope">
-          {{orderStatusList.find(v => v.value === Number(scope.row.orderStatus))?.label ?? '--'}}
+          <el-tooltip v-if="scope.row.errorMessage" class="box-item" effect="dark" :content="scope.row.errorMessage"
+            popper-style="max-width: 400px;" placement="top-start">
+            {{orderStatusList.find(v => v.value === Number(scope.row.orderStatus))?.label ?? '--'}}
+          </el-tooltip>
+          <span v-else>
+            {{orderStatusList.find(v => v.value === Number(scope.row.orderStatus))?.label ?? '--'}}
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="报价时间" prop="createTime" width="200"></el-table-column>
@@ -764,7 +770,7 @@ const handleQuotationView = async (row: any) => {
     nameSimple: data.insCompanyVo[0]?.nameSimple,
     quoteResult: data
   }
-  const { carInfoVo, ownersInfo, policyHolderInfo, insuredPersonInfo,biRiskInfoVo,ciRiskInfoVo } = data
+  const { carInfoVo, ownersInfo, policyHolderInfo, insuredPersonInfo, biRiskInfoVo, ciRiskInfoVo } = data
   insurancePolicyForm.value = {
     ...data,
     name1: ownersInfo?.name,