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

src/views/additionalOrder/additional/index.vue

@@ -1283,7 +1283,7 @@
                     </template>
                   </el-table-column>
                 </el-table>
-                <el-popover :visible="insuranceShow" placement="bottom-start" :width="400" trigger="click">
+                <el-popover :visible="insuranceShow" :width="400" trigger="click">
                   <template #reference>
                     <div class="addData" @click="handleInsurance">
                       <el-icon>

src/views/additionalOrder/additional/modules/insuranceSelect.vue

@@ -152,7 +152,7 @@ defineExpose({
 
 <style scoped lang="scss">
 .insuranceSelect {
-  height: 300px;
+  height: 500px;
   .insuranceList {
     height: calc(100% - 40px);
     overflow: hidden;

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

@@ -140,9 +140,13 @@
         <!-- 指定报价协议 -->
         <el-form-item prop="formdata.actionJson[0].agreementId" class="form-item">
           <span>指定报价协议：</span>
-          <el-select v-model="formData.actionJson[0].agreementId" placeholder="选择报价协议" style="width: 240px" clearable>
+          <el-select class="mr-50px" v-model="formData.actionJson[0].agreementId" placeholder="选择报价协议"
+            style="width: 240px" clearable>
             <el-option v-for="item in agreementList" :key="item.id" :label="item.agreementName" :value="item.id" />
           </el-select>
+          <span>是否默认：</span>
+          <el-switch v-model="formData.isDefault" :active-value="1" :inactive-value="0">
+          </el-switch>
         </el-form-item>
 
         <!-- 对接人变更方式选择 -->
@@ -267,6 +271,7 @@ const formData = ref<{
       accountId: string; // 选择账号-账号ID
     }
   ];
+  isDefault: number;
 }>({
   actionJson: [
     {
@@ -305,6 +310,7 @@ const formData = ref<{
       ],
     },
   ],
+  isDefault: 0
 });
 const selectprops = {
   value: 'id',
@@ -456,7 +462,7 @@ const getConditionType = (conditionValue: string) => {
 
 // 条件切换时的处理
 const handleConditionChange = (domain: ConditionRow, val: string) => {
-  if(getConditionType(domain.attrCode) === 'radio') domain.min=getOptions(domain.attrCode)[0]?.id + ''
+  if (getConditionType(domain.attrCode) === 'radio') domain.min = getOptions(domain.attrCode)[0]?.id + ''
   const target = dispatchList.value.find((item: any) => item.attrCode == val)
   domain.max = null;
   domain.operator = "";
@@ -588,6 +594,7 @@ const submit = async () => {
       actionJson: {
         agreementId: actionJson[0].agreementId,
       },
+      isDefault: formData.value.isDefault
     },
 
   ];
@@ -602,6 +609,7 @@ const submit = async () => {
           ? { name: actionJson[1].name, phone: actionJson[1].phone }
           : { accountId: actionJson[1].accountId }),
       },
+      isDefault: formData.value.isDefault
     }
     actions.push(obj)
   }
@@ -616,6 +624,7 @@ const submit = async () => {
           ? { name: actionJson[2].name, phone: actionJson[2].phone }
           : { accountId: actionJson[2].accountId }),
       },
+      isDefault: formData.value.isDefault
     }
     actions.push(obj)
   }
@@ -845,7 +854,7 @@ onMounted(async () => {
         baseFormData.actionJson[0].agreementId =
           agreementAction.actionJson.agreementId;
       }
-
+      baseFormData.isDefault = agreementAction.isDefault
       // 回显对接人信息
       const linkAction = editData.actions.find(
         (action: any) =>