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

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

@@ -32,15 +32,15 @@
 
                 <!-- 多选下拉 -->
                 <el-select v-model="domain.minArray" placeholder="选择值" multiple style="width: 341px"
-                  v-if="getConditionType(domain.attrCode) === 'checkbox'" :disabled="!domain.operator" clearable>
+                  v-if="getConditionType(domain.attrCode) === 'checkbox'" :disabled="!domain.operator" clearable >
                   <template #header>
                     <el-checkbox v-model="domain.checkAll" :indeterminate="domain.indeterminate"
                       @change="(val) => handleCheckAll(domain, val)">
                       全选
                     </el-checkbox>
                   </template>
-                  <el-option v-for="item in getOptions(domain.attrCode)" :key="item.id" :label="item.name"
-                    :value="item.id" />
+                  <el-option v-for="(item, index) in getOptions(domain.attrCode)" :key="index" :label="item.name"
+                    :value="item.idStr" />
                 </el-select>
 
                 <!-- 单选下拉 -->
@@ -53,8 +53,8 @@
                       全选
                     </el-checkbox>
                   </template>
-                  <el-option v-for="item in getOptions(domain.attrCode)" :key="item.code" :label="item.name"
-                    :value="item.code" />
+                  <el-option v-for="item in getOptions(domain.attrCode)" :key="item.idStr" :label="item.name"
+                    :value="item.idStr" />
                 </el-select>
 
                 <!-- 数值输入 -->
@@ -116,7 +116,9 @@
               <el-button type="text" @click="handleAddRow(groupIndex)" class="add-condition-btn">
                 + 并且条件
               </el-button>
-              <el-button v-if="groupIndex!==0" type="text" @click="formData.conditionGroups=formData.conditionGroups.filter(v=>v.groupKey!==group.groupKey)" class="add-condition-btn">
+              <el-button v-if="groupIndex !== 0" type="text"
+                @click="formData.conditionGroups = formData.conditionGroups.filter(v => v.groupKey !== group.groupKey)"
+                class="add-condition-btn">
                 删除
               </el-button>
             </div>
@@ -288,7 +290,10 @@ const formData = ref<{
     },
   ],
 });
-
+const selectprops = {
+  value: 'id',
+  label: 'name',
+}
 // 下拉选项数据源
 const dispatchList = ref([]);
 const agreementList = ref([]);
@@ -421,6 +426,7 @@ const getOptions = (conditionValue: string) => {
   const target = dispatchList.value.find(
     (item) => item.attrCode === conditionValue
   );
+  console.log(target)
   return target?.dictLabal || [];
 };
 
@@ -774,7 +780,7 @@ onMounted(async () => {
             errorMsg: "",
           });
         });
-
+        console.log(group.actions);
         // 兜底：确保每组至少有一行条件
         if (group.actions.length === 0) {
           group.actions.push({
@@ -856,7 +862,7 @@ const regionLicenseNumber = (value: string) => {
       let data: any = [];
       res.data.map((val: any) => {
         data.push({
-          code: val.areaNumber,
+          idStr: val.areaNumber,
           name: val.license,
         })
         return val;

src/views/quoteConfig/project/modules/projectAdd.vue

@@ -117,17 +117,17 @@
                       </div>
                       <!-- 险种列表 -->
                       <el-table :data="item.tableData">
-                        <el-table-column label="险种" prop="kindName">
+                        <el-table-column label="险种" prop="kindName" width="300">
                           <template #default="scope">
                             <a>{{ scope.row.kindName }}</a>
                           </template>
                         </el-table-column>
                         <!-- 保额选择 -->
-                        <el-table-column label="保额" prop="optionId">
+                        <el-table-column label="保额" prop="optionId" align="center">
                           <template #default="scope">
                             <!-- 自选方案支持多选保额 -->
                             <el-select :disabled="scope.row.insuranceId == '19'" v-if="projectAddFrom.schemeType === 2"
-                              v-model="scope.row.moneyId" style="width: 150px" multiple
+                              v-model="scope.row.moneyId" style="width: 300px" multiple
                               @change="() => { scope.row.optionId = scope.row.moneyId }">
                               <el-option v-for="m in scope.row.options" :label="m.label" :key="m.id"
                                 :value="m.id"></el-option>