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

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -32,7 +32,7 @@
                   getDict('is_enable').find(val => val.value == agreementInfo.isEnable)?.label}}</el-tag>
                 <el-tag type="success">{{getDict('valid_status').find(val => val.value ==
                   agreementInfo.validStatus)?.label
-                  }}</el-tag>
+                }}</el-tag>
               </div>
             </div>
             <el-descriptions :column="3" style="margin-top: 10px;">
@@ -50,9 +50,9 @@
           </div>
           <el-descriptions title="基本信息" class="m-top-20" :column="3">
             <el-descriptions-item label="协议名称：">{{ agreementInfo.agreementTitle
-              }}</el-descriptions-item>
+            }}</el-descriptions-item>
             <el-descriptions-item label="协议简称：">{{ agreementInfo.agreementAbbreviation
-              }}</el-descriptions-item>
+            }}</el-descriptions-item>
             <el-descriptions-item label="协议生效时间：">{{ agreementInfo.startDate }}</el-descriptions-item>
             <el-descriptions-item label="协议失效时间：">{{ agreementInfo.endDate }}</el-descriptions-item>
             <el-descriptions-item label="是否含增值税结算：">
@@ -116,7 +116,7 @@
                   <div class="flex a-c">
                     <img src="../../../assets/images/fee.png" alt="">
                     <span style="margin-right: 30px;font-size: 16px;" class="strong m-left-10">承保规则一{{ index + 1
-                    }}</span>
+                      }}</span>
                   </div>
                   <div class="flex">
                     <el-button link type="primary" :icon="CopyDocument" @click="handleCopy(item, {})">复制费用</el-button>
@@ -135,8 +135,10 @@
                       </el-icon></el-button>
                   </div>
                 </div>
-                <div class=" m-t-10px" style="font-size: 14px;letter-spacing: 2px;">规则描述：{{ item.inputDescription }}</div>
-                <div class=" m-t-10px" style="font-size: 14px;letter-spacing: 2px;">规则因子描述：{{ item.ruleDescription }}</div>
+                <div class=" m-t-10px" style="font-size: 14px;letter-spacing: 2px;">规则描述：{{ item.inputDescription }}
+                </div>
+                <div class=" m-t-10px" style="font-size: 14px;letter-spacing: 2px;">规则因子描述：{{ item.ruleDescription }}
+                </div>
               </div>
               <div class="header-content" v-if="item.ruleFeeShow">
                 <el-button plain type="primary" @click="ruleFeeAdd(item)" class="m-top-10 m-btn-10">添加费用
@@ -617,39 +619,43 @@ const addUnderwritingRule = () => {
   rulesAttrListInfo.id = ''
   rulesAttrListInfo.rulesGroups = []
 }
+const OperationFormRef = ref(null)
 //承保规则保存事件
 const UnderwritingRuleSave = () => {
   // "OwnersInfoAge" 车主年龄
   // "NonMotorInsurance" 非车险
-  if (rulesAttrListInfo.id) {//判断id是否存在
-    api.agreementApi.agreementRulesEdit(rulesAttrListInfo).then((res: any) => {
-      if (res.code == '200') {
-        ElMessage({
-          type: 'success',
-          message: res.msg,
-          plain: true,
-        })
-        addUnderwritingRuleShow.value = false;
-        agreementRulesList();
-      } else {
+  OperationFormRef.value.validate((valid, fields) => {
+    if (valid) {
+      if (rulesAttrListInfo.id) {//判断id是否存在
+        api.agreementApi.agreementRulesEdit(rulesAttrListInfo).then((res: any) => {
+          if (res.code == '200') {
+            ElMessage({
+              type: 'success',
+              message: res.msg,
+              plain: true,
+            })
+            addUnderwritingRuleShow.value = false;
+            agreementRulesList();
+          } else {
 
-      }
-    });
-  } else {
-    api.agreementApi.agreementRulesAdd(rulesAttrListInfo).then((res: any) => {
-      if (res.code == '200') {
-        ElMessage({
-          type: 'success',
-          message: res.msg,
-          plain: true,
-        })
-        addUnderwritingRuleShow.value = false;
-        agreementRulesList();
+          }
+        });
       } else {
+        api.agreementApi.agreementRulesAdd(rulesAttrListInfo).then((res: any) => {
+          if (res.code == '200') {
+            ElMessage({
+              type: 'success',
+              message: res.msg,
+              plain: true,
+            })
+            addUnderwritingRuleShow.value = false;
+            agreementRulesList();
+          } else {
+          }
+        });
       }
-    });
-  }
-
+    }
+  })
 }
 //获取承保规则列表
 const agreementRulesList = () => {
@@ -1079,7 +1085,7 @@ const fields = computed(() => [
     label: "险种", model: "productId", type: "select", options: getDict('insurance_type'),
   },
   {
-    label: "费用描述", model: "costRulesList", type: "inputTag", placeholder: "输入费用描述关键字查找",
+    label: "费用描述", model: "costRules", type: "inputTag", placeholder: "输入费用描述关键字查找",
   },
   {
     label: "费用状态", model: "agreementStatus", type: "select", placeholder: "选择状态", options: getDict('is_enable'),
@@ -1200,7 +1206,7 @@ const formInline = reactive({
   agreementId: '',//协议信息
   productId: "",//归属
   coverRuleId: '',//规则id
-  costRules: '',//协议类型
+  costRules: [],//协议类型
   agreementStatus: "",//有效状态
   auditStatus: "",//协议状态
   validState: "",

src/views/quoteConfig/costManagement.vue

@@ -231,8 +231,7 @@ const formInline = reactive({
   agreement: '',//协议信息
   productId: "",//归属
   rulesName: '',//保险公司id
-  costRules: '',//协议类型
-  costRulesList: [],//协议类型
+  costRules: [],//协议类型
   agreementStatus: "",//有效状态
   auditStatus: "",//协议状态
   validState: "",
@@ -274,7 +273,7 @@ const fields = ref([
     label: "承保规则", model: "rulesName", type: "input", placeholder: "输入业务规则查找",
   },
   {
-    label: "费用描述", model: "costRulesList", type: "inputTag", placeholder: "输入费用描述关键字查找",
+    label: "费用描述", model: "costRules", type: "inputTag", placeholder: "输入费用描述关键字查找",
   },
   {
     label: "费用状态", model: "agreementStatus", type: "select", placeholder: "选择状态", options: is_enable,