Merge branch 'dongk' into dev

src/components/ruleConditionContainer/index.vue

@@ -30,7 +30,7 @@
             <el-select v-model="item.minArray" placeholder="选择值" clearable filterable multiple :disabled="disabled"
               @change="change($event, index)">
               <el-option v-for="dictLabalitem in item.dictLabal" :key="dictLabalitem.id" :label="dictLabalitem.name"
-                :value="item.attrName == '车辆种类' ||item.attrName == '使用性质' ||item.attrName == '能源类型'  ? dictLabalitem.code : dictLabalitem.name" />
+                :value="dictLabalitem.code" />
             </el-select>
           </template>
           <template v-if="item.attrType == 'inputNumber'">
@@ -135,7 +135,6 @@
 
 <!-- 行为区域 -->
 <script lang='ts' setup>
-import { defineProps, defineEmits } from "vue";
 const props = defineProps<{
   rulesAttrList: any[],//list集合
   disabled?: boolean,

src/views/representative/quoteApproval.vue

@@ -169,6 +169,8 @@ const columns = [
       return `${row.agreementCode}\n${row.agreementAbbreviation}`
     }
   },
+  { prop: "effectiveTime", label: "生效时间", width: '200' },
+  { prop: "failureTime", label: "失效时间", width: '200' },
   {
     prop: "ruleDescription", label: "承保规则", width: '500',
   },
@@ -194,8 +196,7 @@ const columns = [
       }
     }
   },
-  { prop: "effectiveTime", label: "生效时间", width: '200' },
-  { prop: "failureTime", label: "失效时间", width: '200' },
+
   {
     prop: "ruleConditions", label: "交强费用", width: '300', formatter: (row: any) => {
       let info = row.ruleConditions.find((val: any) => val.costType == '交强险');