Browse Source

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

@dongkboy 1 tháng trước cách đây
mục cha
commit
18ffc61d59

+ 3 - 4
src/views/quoteConfig/dispatch/components/rule.vue

@@ -442,9 +442,8 @@ const getOptions = (conditionValue: string) => {
   const target = dispatchList.value.find(
     (item) => item.attrCode === conditionValue
   );
-  let arr=target?.dictLabal || []
-  if(conditionValue==='InsruanceProduct') arr=arr.map(v=>({...v,idStr:v.code}))
-  return target?.dictLabal || [];
+  let arr = target?.dictLabal || []
+  return arr;
 };
 
 // 工具函数:根据条件类型获取输入组件类型
@@ -627,7 +626,7 @@ const submit = async () => {
     return
   }
   // 处理多选框额外传值
-  const allActions = formData.value.conditionGroups.flatMap((group) => group.actions);
+  const allActions = formData.value.conditionGroups.flatMap((group, i) => group.actions.map(v => ({ ...v, section: i + 1 })));
   allActions.map((item) => {
     if (["checkbox", "inputTag", "select"].includes(item.attrType)) {
       item.min = item.minArray.join(',');

+ 1 - 1
src/views/quoteConfig/dispatch/index.vue

@@ -98,7 +98,7 @@
                             : row.attrDesc ?? "无"
                         }}
                       </template>
-                      <template v-else-if="['select','radio','inputNumber'].includes(row.attrType)">
+                      <template v-else-if="['select','radio','inputNumber','checkbox'].includes(row.attrType)">
                         {{
                           row.minName ?? "无"
                         }}