fix:修改bug

src/components/DialogSetDeptLeader/index.vue

@@ -122,16 +122,16 @@ watch(props, (val) => {
     if(props.dialogVisible)
     if(props.deptIds.length<2){
       treeRef.value?.setCurrentKey(props?.deptIds[0]);
-      treeClick({id:props.deptIds[0]}) 
+      treeClick({id:props.deptIds[0]})
     }
   })
-  
+
   // if(val.dialogVisible){
-   
-   
+
+
   // }
-  
- 
+
+
 });
 
 const list = ref<ListItem[]>([]);
@@ -152,15 +152,17 @@ const remoteMethod = (query: string) => {
         name: query,
       })
       .then((res: any) => {
-        
+
         if (res.code === 200) {
           // userList.value = res.data;
           let arr: any = [];
+          console.log('res.data是啥', res.data)
           res.data.forEach((item) => {
             arr.push({
               label: item.name,
               value: item.id,
               mobile: item.mobile,
+              userOd: item.userId
             });
           });
           loading.value = false;
@@ -192,43 +194,36 @@ function treeClick(node: any) {
 }
 
 function submit(){
- 
+
   if(props.title=='设置负责人'){
     if(userId.value){
-      
-     const obj=options.value.map((item:any)=>{
-        if(item.value==userId.value){
-          return {
-            name:item.label,
-            id:item.value,
-            mobile:item.mobile
-          }
-        }
-      })
+     const obj = options.value.find(a => a.value === userId.value)
       api.institutionApi.setDeptLeader({
         deptId:props.deptIds,
-        leaderId:obj[0].userId
+        leaderId:obj.userId
       }).then(res=>{
-        
+
         if(res.code==200){
           ElMessage.success(res.msg)
           emits('closeDialog')
+        } else {
+            ElMessage.warning(res.msg)
         }
       })
-      
-      
+
+
     }else{
       let flag={}
      userList.value.some((item:any)=>{
-     
+
          if( item.id==treeReId.value){
           flag={...item}
           return true
          }
          return false
-        
+
       })
-    
+
       api.institutionApi.setDeptLeader({
         deptId:props.deptIds,
         leaderId:flag.userId
@@ -251,30 +246,30 @@ function submit(){
           }
         }
       })
-      
+
       emits('closeDialog',obj[0])
     }else{
       let flag={}
       userList.value.some((item:any)=>{
-     
+
          if( item.id==treeReId.value){
           flag={...item}
           return true
          }
          return false
-        
+
       })
       emits('closeDialog',flag)
     }
   }
- 
-   
+
+
 }
 
 const handleClose = (done: () => void) => {
-  
+
   emits('cancelDialog',false)
-    
+
 }
 
 

src/views/additionalOrder/additional/index.vue

@@ -6322,7 +6322,7 @@ const initEditData = () => {
       if(res.code == 200) {
         let obj = {...res.data}
         detailData.value = {...res.data}
-        insuranceForm.value = obj.vehicleAndVesselTax
+        insuranceForm.value.vehicleAndVesselTax = obj.vehicleAndVesselTax
         insuranceForm.value.productId = obj.insOrders.productId
         insuranceForm.value.jqStart = obj.ciRiskInfoVo?.startDate
         insuranceForm.value.jqEnd = obj.ciRiskInfoVo?.endDate

src/views/additionalOrder/order/index.vue

@@ -31,7 +31,7 @@
             <el-col :span="8">
               <el-form-item label="保险公司">
                 <el-select v-model="form.companyName" placeholder="请选择">
-                  <el-option label="公司1" value="1" key="1"></el-option>
+                    <el-option v-for="item in companyList" :key="item.companyCode" :value="item.companyCode" :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -359,6 +359,7 @@ const search = () => {
 }
 const reset = () => {
   form.value = {}
+  initData(type.value)
 }
 
 // 列表
@@ -455,8 +456,19 @@ const initData = (type) => {
   })
 }
 
+// 获取保险公司
+let companyList = ref([])
+const initCompany = () => {
+    api.insuranceApi.leftList('').then(res => {
+        if(res.code == 200) {
+            companyList.value = res.data
+        }
+    })
+}
+
 onMounted(() => {
   initData(0);
+    initCompany();
 })
 
 </script>

src/views/additionalOrder/temporarily/index.vue

@@ -25,8 +25,8 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="保险公司">
-            <el-select v-model="form.companyName" placeholder="请选择">
-              <el-option label="公司1" value="1" key="1"></el-option>
+            <el-select v-model="form.companyName" filterable placeholder="请选择">
+                <el-option v-for="item in companyList" :key="item.companyCode" :value="item.companyCode" :label="item.name"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -120,6 +120,7 @@ const search = () => {
 }
 const reset = () => {
   form.value = {}
+  initData()
 }
 
 // 列表
@@ -205,8 +206,19 @@ const initData = () => {
   })
 }
 
+// 获取保险公司
+let companyList = ref([])
+const initCompany = () => {
+    api.insuranceApi.leftList('').then(res => {
+        if(res.code == 200) {
+            companyList.value = res.data
+        }
+    })
+}
+
 onMounted(() => {
   initData();
+    initCompany();
 })
 
 </script>

src/views/externalAgreement/agreement/components/agreementAuth.vue

@@ -12,7 +12,7 @@
               :prefix-icon="Search" />
             <el-button @click="query">查询</el-button>
           </div>
-          <el-checkbox v-model="checkedALL" label="全选" size="large" />
+          <el-checkbox v-model="checkedALL" label="全选" size="large" @change="selectChange" />
           <el-tree :data="props.deptlist" show-checkbox node-key="id" ref="treeRef" :props="defaultProps"
             :default-expand-all="true" @check="handleCheck" :default-checked-keys="props.checkedKeys"
             :check-strictly="true" />
@@ -44,11 +44,33 @@ const defaultProps = {
   children: 'children',
   label: 'name',
 }
+
+let treeRef = ref()
+
 const direction = ref<DrawerProps['direction']>('rtl')
 const deptName = ref('');
 
 
 const checkedALL = ref(false)
+// 递归获取所有节点的key
+const getAllKeys = (data) => {
+    let keys = [];
+    data.forEach(node => {
+        keys.push(node.id);
+        if (node.children && node.children.length > 0) {
+            keys = keys.concat(getAllKeys(node.children));
+        }
+    });
+    return keys;
+};
+const selectChange = (e) => {
+    if(e) {
+        const allKeys = getAllKeys(props.deptlist);
+        treeRef.value.setCheckedKeys(allKeys);
+    } else {
+        treeRef.value.setCheckedKeys([]);
+    }
+}
 const ids = ref()//id集合
 const DrawerOpen = () => {