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

src/views/representative/externalCostApproval.vue

@@ -243,7 +243,7 @@ const columns = [
     prop: "costExternalTypeAdds", label: "交强险费用", width: '300', formatter: (row: any) => {
       let info = row.costExternalTypeAdds.find((val: any) => val.costType == '交强险');
       if (info) {
-        return `入口：${info.inlet?.toFixed(2)}% 出口：${info.export?.toFixed(2)}%\n一级：${info.level1?.toFixed(2)}% 五级：${info.level5?.toFixed(2)}%`
+        return `入口：${info.inlet?.toFixed(2)}% 出口：${info.export?.toFixed(2)}%\n加投：${info.addThrow?.toFixed(2)}% 出口留点：${info.keepPointRatio?.toFixed(2)}%`
       } else {
         return '-'
       }
@@ -253,7 +253,7 @@ const columns = [
     prop: "costExternalTypeAdds", label: "商业险费用", width: '300', formatter: (row: any) => {
       let info = row.costExternalTypeAdds.find((val: any) => val.costType == '商业险');
       if (info) {
-        return `入口：${info.inlet?.toFixed(2)}% 出口：${info.export?.toFixed(2)}%\n一级：${info.level1?.toFixed(2)}% 五级：${info.level5?.toFixed(2)}%`
+        return `入口：${info.inlet?.toFixed(2)}% 出口：${info.export?.toFixed(2)}%\n加投：${info.addThrow?.toFixed(2)}% 出口留点：${info.keepPointRatio?.toFixed(2)}%`
       } else {
         return '-'
       }
@@ -263,7 +263,7 @@ const columns = [
     prop: "costExternalTypeAdds", label: "驾意险费用", width: '300', formatter: (row: any) => {
       let info = row.costExternalTypeAdds.find((val: any) => val.costType == '驾意险');
       if (info) {
-        return `入口：${info.inlet?.toFixed(2)}% 出口：${info.export?.toFixed(2)}%\n一级：${info.level1?.toFixed(2)}% 五级：${info.level5?.toFixed(2)}%`
+        return `入口：${info.inlet?.toFixed(2)}% 出口：${info.export?.toFixed(2)}%\n加投：${info.addThrow?.toFixed(2)}% 出口留点：${info.keepPointRatio?.toFixed(2)}%`
       } else {
         return '-'
       }

src/views/representative/quoteApproval.vue

@@ -66,7 +66,7 @@ interface PageInfo {
 onBeforeMount(async () => {
   await loadDicts(['valid_status', 'is_enable', 'audit_status', 'insurance_type']);//获取多个字典
   if (id.value) {
-    formInline.agreement = id.value;
+    formInline.agreementIds = [id.value];
   }
   findpage("0");//列表数据
   findpage("1");//列表数据
@@ -139,8 +139,8 @@ const pageInfo = computed(() => {
   }
 });
 const formInline = reactive({
-  agreement: '',//协议信息
-  productId: "",//归属
+  agreementIds: [],//协议信息
+  productIds: [],//归属
   rulesName: '',//保险公司id
   costRules: [],//费用规则
   agreementStatus: "",//有效状态
@@ -172,14 +172,14 @@ const companylist = computed(() => {
 //表格字段数据(待审核时隐藏"审核人"筛选项)
 const fields = ref([
   {
-    label: "所属协议", model: "agreement", type: "select", placeholder: "输入代码，名称，简称查找", options: agreementListALL,
+    label: "所属协议", model: "agreementIds", type: "select", multiple: true, placeholder: "输入代码，名称，简称查找", options: agreementListALL,
     props: {
       label: 'agreementTitle',
-      value: 'agreementTitle'
+      value: 'id'
     }, filterable: true
   },
   {
-    label: "险种", model: "productId", type: "select", options: insurance_type,
+    label: "险种", model: "productIds", type: "select", multiple: true, placeholder: "请选择险种", options: insurance_type,
   },
   {
     label: "保险公司", model: "companyId", type: "cascader", placeholder: "选择保险公司", options: company_list, props: companyIdprops, placement: 'left', onChange: (value: any) => {
@@ -556,8 +556,8 @@ const auditSuccess = async (list: string[], automatic?: boolean) => {
   });
 }
 const resetForm = () => {
-  formInline.agreement = '';//协议信息
-  formInline.productId = "";//归属
+  formInline.agreementIds = [];//协议信息
+  formInline.productIds = [];//归属
   formInline.rulesName = '';//保险公司id
   formInline.costRules = [];//协议类型
   formInline.agreementStatus = "";//有效状态