Ver código fonte

补录订单比例手动输入完善

祁鹏飞 1 mês atrás
pai
commit
60419c4dfa

+ 1 - 1
src/components/complexTable/index.vue

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

+ 4 - 4
src/views/additionalOrder/additional/index.vue

@@ -2957,10 +2957,10 @@ const cvalculateFees = () => {
   for (const key in objInsurance) {
   for (const key in objInsurance) {
     const obj = costExternalTypeAdds.find(v => v.costType === key)
     const obj = costExternalTypeAdds.find(v => v.costType === key)
     const element = objInsurance[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({
   api.additionalApi.cvalculateFees({
     agreementId: additionalForm.value.agreementId,
     agreementId: additionalForm.value.agreementId,