Explorar o código

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

@dongkboy hai 2 meses
pai
achega
6577f6501d

+ 2 - 2
src/views/insurancePolicy/index.vue

@@ -1038,7 +1038,7 @@
                               </el-icon>
                             </template>
                             <template #default="props">
-                              <el-icon @click="handleDrivingDel(scope, props)" v-if="props.row.selectedStatus !== '3'">
+                              <el-icon @click="handleDrivingDel(scope, props)" v-if="props.row.selectedStatus !== '2'">
                                 <Delete />
                               </el-icon>
                             </template>
@@ -2769,7 +2769,7 @@ const getSchemeResult = () => {
         item.projectList = list.map((item1: any) => {
           return {
             ...item1,
-            drivings: item1.drivings.filter(v => ['3', '2'].includes(v.selectedStatus)),
+            drivings: item1.drivings.filter(v => ['1', '2'].includes(v.selectedStatus)),
             drivingsArr: item1.drivings,
             rescue: [],
             detection: [],

+ 3 - 3
src/views/quoteConfig/project/modules/projectAdd.vue

@@ -87,9 +87,9 @@
                         <el-table-column label="客户端状态" prop="selectedStatus" v-if="projectAddFrom.schemeType != 1">
                           <template #default="scope">
                             <el-select v-model="scope.row.selectedStatus">
-                              <el-option label="默认选中" key="1" value="1"></el-option>
-                              <el-option label="默认选中" key="2" value="2"></el-option>
-                              <el-option label="强制选中" key="3" value="3"></el-option>
+                              <el-option label="默认选中" key="1" value="1"></el-option>
+                              <el-option label="强制选中" key="2" value="2"></el-option>
+                              <el-option label="默认不选中" key="3" value="3"></el-option>
                             </el-select>
                           </template>
                         </el-table-column>