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

src/views/insurancePolicy/order/orderDetail.vue

@@ -183,6 +183,12 @@
                 ${detailData?.biRiskInfoVo?.endDate}` : '--' }}</span>
             </span>
           </el-col>
+          <el-col :span="6" class="TBMsgItem">
+            <span class="label">驾意险保单号</span>
+            <span class="value">
+              <span>{{ detailData?.policy?.niPolicyNumber || '--' }}</span>
+            </span>
+          </el-col>
           <el-col :span="6" class="TBMsgItem">
             <span class="label">报价时间</span>
             <span class="value">
@@ -1848,7 +1854,7 @@ const initDetail = () => {
           break;
       }
       // 投保方案-左侧
-      insuranceData.value = detailData.value.kindInfoVo
+      insuranceData.value = detailData.value.kindInfoVo.filter((v, i, arr) => arr.findIndex(k => k.kindCode === v.kindCode) === i)
       // 投保方案-右侧
       drivingData.value = detailData.value.accidentalDrivings
       // 批改数据的判断
@@ -2108,9 +2114,9 @@ const onComplete = () => {
 const getValAlias = (code: any, val: any) => {
   let data = insuranceAllData.value;
   // 特殊处理，null转为投保的值
-  if (val === null) val = '1';
-  let objs = data.find((item: any) => item.kindCode === code)?.options.find((item: any) => item.value == val);
-  return objs ? objs.label : '';
+  if (val === null || code === 'J1') val = '1';
+  let objs = data.find((item: any) => item.kindCode === code)?.options.find((item: any) => Number(item.value) === Number(val));
+  return objs ? objs.label : '--';
 };
 // 获取全部保险数据
 const initData = () => {

src/views/quoteConfig/agreement/components/ruleFeeDialogEdit.vue

@@ -39,8 +39,7 @@
               :disabled="disabledShow" class="flex a-c f-wrap" :size="fromSize" :rules="editRules">
               <ElCol :md="24" :lg="24">
                 <el-form-item label="险种" prop="productId">
-                  <el-radio-group v-model="costitemEditInfo.productId"
-                    @change="costitemEditInfo.productName = ruleFeeinfo.find(v => v.value === costitemEditInfo.productId).label">
+                  <el-radio-group v-model="costitemEditInfo.productId" @change="changeProductId()">
                     <el-radio-button v-for="item in ruleFeeinfo" :key="item.id" :label="item.label"
                       :value="item.value" />
                   </el-radio-group>
@@ -288,7 +287,7 @@ const handelRK = (scope) => {
   if (scope.row.keepPointRatio && scope.row.addThrow || scope.row.keepPointRatio && scope.row.addThrow === 0) {
     scope.row.export = scope.row.inlet + scope.row.addThrow - scope.row.keepPointRatio
   }
-  if (scope.row.inlet < scope.row.export) scope.row.export = scope.row.inlet;handelCK(scope)
+  if (scope.row.inlet < scope.row.export) scope.row.export = scope.row.inlet; handelCK(scope)
 }
 const handelCK = (scope) => {
   if (scope.row.inlet && scope.row.addThrow || scope.row.inlet && scope.row.addThrow === 0) {
@@ -407,6 +406,57 @@ const rejectOperation = () => {
 const auditOperation = () => {
   emits("auditOperation", automatic.value, costitemEditInfo.value.id)
 }
+
+// 过滤方法
+const ptlAgreementCostTypeList = [
+  {
+    costType: "交强险",
+    inlet: 0,
+    export: 0,
+    addThrow: 0,
+    keepPointRatio: 0,
+    exportKeepPointRatio: 0,
+  },
+  {
+    costType: "商业险",
+    inlet: 0,
+    export: 0,
+    addThrow: 0,
+    keepPointRatio: 0,
+    exportKeepPointRatio: 0,
+  },
+  {
+    costType: "驾意险",
+    inlet: 0,
+    export: 0,
+    addThrow: 0,
+    keepPointRatio: 0,
+    exportKeepPointRatio: 0,
+  }
+];
+const changeProductId = () => {
+  const name = ruleFeeinfo.value.find(v => v.value === costitemEditInfo.value.productId).label
+  costitemEditInfo.value.productName = name
+  const list= ptlAgreementCostTypeList.filter(item => {
+    if (name === "单交" && item.costType === "商业险") {
+      return false; // 当 name 为 "单交" 且 costType 为 "商业险" 时，返回 false，不包含该项
+    }
+    if (name === "单商" && item.costType === "交强险") {
+      return false; // 当 name 为 "商业" 且 costType 为 "交强险" 时，返回 false，不包含该项
+    }
+    if (name === "单三" && item.costType === "交强险") {
+      return false; // 当 name 为 "商业" 且 costType 为 "交强险" 时，返回 false，不包含该项
+    }
+    return true; // 其他情况返回 true，保留该项
+  });
+  costitemEditInfo.value.ptlAgreementCostTypeList=list.map(v=>{
+    const obj=costitemEditInfo.value.ptlAgreementCostTypeList.find(k=>k.costType===v.costType) ?? {}
+    return {
+      ...v,
+      ...obj
+    }
+  })
+}
 </script>
 <!-- 样式区域 -->
 <style lang='scss' scoped>

src/views/quoteConfig/dispatch/components/rule.vue

@@ -839,7 +839,6 @@ onMounted(async () => {
             minArray: [],
           });
         }
-        console.log('group-------------', group)
         return group;
       }
     );