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

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

@@ -28,7 +28,7 @@
             <el-form-item label="险种类型" prop="productId">
               <el-radio-group :disabled="isEdit" v-model="projectAddFrom.productId" @change="initProduct">
                 <el-radio-button v-for="item in insuranceType" :key="item.value" :value="item.value">{{ item.label
-                }}</el-radio-button>
+                  }}</el-radio-button>
               </el-radio-group>
             </el-form-item>
 
@@ -80,7 +80,7 @@
                         <el-table-column label="名称" prop="productName">
                           <template #default="scope">
                             <el-button link type="primary" @click="getJYXDetail(scope.row)">{{ scope.row.productName
-                              }}</el-button>
+                            }}</el-button>
                           </template>
                         </el-table-column>
                         <!-- 客户端状态（仅自选方案显示） -->
@@ -98,13 +98,13 @@
                           <template #default="scope">
                             <div class="">
                               <el-input-number v-model="scope.row.minSeatCount" controls-position="right"
-                                style="width: 100px;" :min="2" :max="scope.row.maxSeatCount??Number.MAX_SAFE_INTEGER">
+                                style="width: 100px;" :min="2" :max="scope.row.maxSeatCount ?? Number.MAX_SAFE_INTEGER">
                                 <template #suffix>
                                   <span>座</span>
                                 </template>
                               </el-input-number> 至
                               <el-input-number v-model="scope.row.maxSeatCount" controls-position="right"
-                                style="width: 100px;" :min="scope.row.minSeatCount??Number.MIN_SAFE_INTEGER" :max="99">
+                                style="width: 100px;" :min="scope.row.minSeatCount ?? Number.MIN_SAFE_INTEGER" :max="99">
                                 <template #suffix>
                                   <span>座</span>
                                 </template>
@@ -709,9 +709,16 @@ const handleDriving = (item, index) => {
 const handleDrivingClose = (obj) => {
   if (obj.list && obj.list.length > 0) {
     obj.list.forEach(sub => {
+      const obj1 = projectAddFrom.value.schemeList[obj.index].drivingList.find(v => v.drivingIntentionId === sub.drivingIntentionId)
       sub.drivingIntentionId = sub.drivingIntentionId
       sub.selectedStatus = sub.selectedStatus ? sub.selectedStatus : '1'
       sub.quantity = sub.quantity ? sub.quantity : '1'
+      if (obj1) {
+        sub.selectedStatus = obj1.selectedStatus
+        sub.minSeatCount = obj1.minSeatCount
+        sub.maxSeatCount = obj1.maxSeatCount
+        sub.quantity = obj1.quantity
+      }
     })
     projectAddFrom.value.schemeList[obj.index].drivingList = obj.list
   }