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

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/components/SearchForm/index.vue

@@ -10,7 +10,7 @@
             <el-option v-for="(item, index) in field.options" :key="index" :label="item.label" :value="item.value" />
           </component>
           <component v-else-if="field.type === 'cascader'" is="el-cascader" v-model="formInline[field.model]"
-            :options="field.options" :props="field.props" filterable clearable @change="field.onChange"
+            :options="field.options" :props="field.props" :placement="field.placement" filterable clearable @change="field.onChange"
             class="el-inputs" />
           <component v-else-if="field.type === 'date'" is="el-date-picker" v-model="formInline[field.model]"
             :type="field.dateType" range-separator="至" :start-placeholder="field.startplaceholder"

src/views/additionalOrder/additional/index.vue

@@ -2761,7 +2761,7 @@ const uploadImage = async (file, type) => {
               carForm.value.carNatureCode = data.useNature // 使用性质
               carForm.value.vehicleUseCode = data.vehicleUse // 车辆用途
               carForm.value.carTypeCode = data.category // 车辆类型
-              carForm.value.energyTypeCode = carForm.value.licenseNo && carForm.value.length == 7?data.plateType: '0' // 能源种类
+              carForm.value.energyTypeCode = carForm.value.licenseNo.length == 8?'1': '0' // 能源种类
               carForm.value.registerDate = data.registerDate // 注册日期
               carForm.value.issueDate = data.issueDate // 发证日期
             } else {
@@ -2797,7 +2797,7 @@ const uploadImage = async (file, type) => {
             carForm.value.carNatureCode = data.useNature
             carForm.value.vehicleUseCode = data.vehicleUse
             carForm.value.carTypeCode = data.category
-            carForm.value.energyTypeCode = data.plateType
+            carForm.value.energyTypeCode = carForm.value.licenseNo.length == 8?'1': '0'
             carForm.value.registerDate =
               data.registerDate.substring(0, 4) +
               "-" +
@@ -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/agreementDetails.vue

@@ -56,7 +56,7 @@
             <el-descriptions-item label="协议生效时间：">{{ agreementInfo.startDate }}</el-descriptions-item>
             <el-descriptions-item label="协议失效时间：">{{ agreementInfo.endDate }}</el-descriptions-item>
             <el-descriptions-item label="是否含增值税结算：">
-              {{ agreementInfo.withTax }}
+              {{ getDict('with_tax').find(a => a.value == agreementInfo.withTax)?.label }}
             </el-descriptions-item>
             <el-descriptions-item label="结算周期：">T{{ agreementInfo.moneyTime }} </el-descriptions-item>
             <el-descriptions-item label="协议描述：">{{ agreementInfo.agreementName }}</el-descriptions-item>
@@ -64,7 +64,7 @@
           <el-descriptions title="其他信息" class="m-top-20" :column="3">
             <el-descriptions-item label="协议归属：">{{ agreementInfo.deptName }} </el-descriptions-item>
             <el-descriptions-item label="保险公司："> {{ agreementInfo.companyId }}</el-descriptions-item>
-            <el-descriptions-item label="协议类型：">{{ agreementInfo.agreementType }} </el-descriptions-item>
+            <el-descriptions-item label="协议类型：">{{ getDict('agreement_type').find(a => a.value == agreementInfo.agreementType)?.label }} </el-descriptions-item>
             <el-descriptions-item label="管理人："> {{ agreementInfo.custodianId }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>

src/views/externalAgreement/agreement/agreementIndex.vue

@@ -73,6 +73,7 @@ onBeforeMount(async () => {
   await loadDicts(['agreement_type', 'valid_status', 'is_enable', 'with_tax']);//获取多个字典
   findpage();//列表数据
   getDeptTree();
+  initCompany();
   agreement_type.value = getDict('agreement_type');//协议类型
   valid_status.value = getDict('valid_status');//生效状态
   is_enable.value = getDict('is_enable');//协议状态
@@ -90,6 +91,13 @@ const tableData = ref([
 const sysUpAndDownList = ref<string[]>([])//选中id
 const provinceoptions = ref<string[]>([])//省市区回显数据
 const deptOptions = ref()//机构数据
+let company_list = ref()
+const companyIdprops = {
+    expandTrigger: 'hover' as const,
+    value: 'id',
+    label: 'nameSimple',
+    checkStrictly: true,
+}
 const agreement_type = ref();
 const valid_status = ref();
 const is_enable = ref();
@@ -129,10 +137,10 @@ const fields = ref([
     }
   },
   {
-    label: "保险公司", model: "companyId", type: "select", placeholder: "选择保险公司",
+    label: "保险公司", model: "companyId", type: "cascader", placeholder: "选择保险公司", options: company_list, props: companyIdprops, placement: 'left'
   },
   {
-    label: "协议类型", model: "agreementType", type: "select", placeholder: "选择保险公司", options: agreement_type,
+    label: "协议类型", model: "agreementType", type: "select", placeholder: "选择协议类型", options: agreement_type,
   },
   {
     label: "生效状态", model: "validStatus", type: "select", placeholder: "选择生效状态", options: valid_status,
@@ -159,9 +167,26 @@ const fields = ref([
   },
 ]);
 
+// 保险公司
+const initCompany = () => {
+    api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
+        if (res.code == '200') {
+            company_list.value = res.data;
+        } else {
+            ElMessage({
+                type: 'error',
+                message: res.msg,
+                plain: true,
+            })
+        }
+    });
+}
+
 //数据查询
 function findpage() {
-  api.agreementApi.agreementList({ pages: pageInfo.value.pageNum, size: pageInfo.value.pageSize, ...formInline }).then((res: any) => {
+  let query = {...formInline}
+  query.companyId = query.companyId[query.companyId.length - 1]
+  api.agreementApi.agreementList({ pages: pageInfo.value.pageNum, size: pageInfo.value.pageSize, ...query }).then((res: any) => {
     if (res.code == '200') {
       tableData.value = res.data.records;
       pageInfo.value.pageNum = res.data.current;
@@ -434,6 +459,21 @@ const sysUpAndDown = async (type: string, list?: string[]) => {
 }
 const resetForm = () => {
   formInline.searchValue = '';
+  formInline.deptId = '';
+  formInline.companyId = '';
+  formInline.agreementType = '';
+  formInline.validStatus = '';
+  formInline.isEnable = '';
+  formInline.withTax = '';
+  formInline.dockingPerson = '';
+  formInline.attributionName = '';
+  formInline.takeStartDate = '';
+  formInline.takeEndDate = '';
+  formInline.loseStartDate = '';
+  formInline.loseEndDate = '';
+  formInline.isExternal = '1';
+  formInline.value1 = [];
+  formInline.value2 = [];
   provinceoptions.value = [];
   findpage();
 }

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 = () => {
 

src/views/insurancePolicy/index.vue

@@ -1850,7 +1850,7 @@ const getAgeByIdCard = (idCard: any, type?: any) => {
   if (monthNow > monthBirth || (monthNow == monthBirth && dayNow > dayBirth)) {
     age++
   }
-  type.age = age
+  // type.age = age
   return age
 }
 const noeYearPast = (time) => {

src/views/operationManagement/channel.vue

@@ -48,7 +48,7 @@
           <el-table-column label="工号" prop="userId" width="200"></el-table-column>
           <el-table-column label="类型" prop="typeAttr" width="100">
             <template #default="scope">
-              {{ scope.row.typeAttr == '0'?'个代':scope.row.typeAttr == '1'?'渠道':scope.row.typeAttr == '2'?'团队':scope.row.typeAttr == '3'?'电销组': '' }}
+              {{ scope.row.typeAttr == '1'?'个代':scope.row.typeAttr == '3'?'渠道':scope.row.typeAttr == '2'?'团队':scope.row.typeAttr == '4'?'电销组': '' }}
             </template>
           </el-table-column>
           <el-table-column label="归属" prop="deptName" width="200"></el-table-column>
@@ -318,7 +318,7 @@ let peopleShow = ref(false)
 let radioValue = ref('')
 const setPeople = () => {
   peopleShow.value = true
-  pageSize.value = 99999
+  // pageSize.value = 99999
   initList(teamInfo.value)
 }
 const onCancel = () => {

src/views/operationManagement/modules/addOperation.vue

@@ -13,10 +13,10 @@
               <el-col :span="10">
                 <el-form-item prop="typeAttr" label="业务员类型">
                   <el-select v-model="operationForm.typeAttr" placeholder="请选择业务员类型" @change="typeAttrChange">
-                    <el-option key="1" value="6" label="个代"></el-option>
-                    <el-option key="2" value="8" label="渠道"></el-option>
-                    <el-option key="3" value="5" label="团队"></el-option>
-                    <el-option key="4" value="7" label="电销组"></el-option>
+                    <el-option key="1" value="1" label="个代"></el-option>
+                    <el-option key="2" value="3" label="渠道"></el-option>
+                    <el-option key="3" value="2" label="团队"></el-option>
+                    <el-option key="4" value="4" label="电销组"></el-option>
                     <!--<el-option key="1" value="1" label="前线人员"></el-option>
                     <el-option key="2" value="2" label="后线人员"></el-option>
                     <el-option key="3" value="3" label="合伙人"></el-option>
@@ -29,7 +29,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="10">
-                <el-form-item prop="organizationId" label="所属团队" v-if="operationForm.typeAttr!='6'">
+                <el-form-item prop="organizationId" label="所属团队" v-if="operationForm.typeAttr!='1'">
                   <el-select v-model="operationForm.organizationId" placeholder="请选择所属团队" @change="deptChange">
                     <el-option v-for="item in teamList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                   </el-select>
@@ -51,7 +51,7 @@
             <el-row :gutter="20">
               <el-col :span="10">
                 <el-form-item prop="organization" label="所属机构">
-                  <el-input v-if="operationForm.typeAttr!='6'" disabled v-model="operationForm.organization"></el-input>
+                  <el-input v-if="operationForm.typeAttr!='1'" disabled v-model="operationForm.organization"></el-input>
                   <el-cascader v-else style="width: 100%" v-model="operationForm.organization" placeholder="请选择所属机构" :options="deptOption" :props="optionProps" @change="deptIdChange"></el-cascader>
                 </el-form-item>
               </el-col>
@@ -719,7 +719,7 @@ const initEditData = (id, ids) => {
         let formData = res.data
         initTeamData(formData?.typeAttr==='5'?'1':formData?.typeAttr==='8'?'2':formData?.typeAttr==='7'?'3':'')
         operationForm.value = formData
-        operationForm.value.organization = formData.deptName
+        operationForm.value.organization = formData.deptId
         operationForm.value.deptId = formData.deptId
         operationForm.value.leaderNumber = formData.leaderId
         operationForm.value.referrerNumber = formData.referrerId
@@ -1350,6 +1350,7 @@ onMounted(() => {
   initInfo()
   getArea()
   initBankCard()
+  institutionList()
 })
 
 defineExpose({

src/views/operationManagement/operation.vue

@@ -112,7 +112,7 @@
       <el-table-column label="工号" prop="userId" width="200"></el-table-column>
       <el-table-column label="类型" prop="typeAttr" width="100">
         <template #default="scope">
-          {{ scope.row.typeAttr == '6'?'个代':scope.row.typeAttr == '8'?'渠道':scope.row.typeAttr == '5'?'团队':scope.row.typeAttr == '7'?'电销组': '' }}
+          {{ scope.row.typeAttr == '1'?'个代':scope.row.typeAttr == '3'?'渠道':scope.row.typeAttr == '2'?'团队':scope.row.typeAttr == '4'?'电销组': '' }}
         </template>
       </el-table-column>
       <el-table-column label="归属" prop="organizationName" width="200"></el-table-column>
@@ -239,7 +239,8 @@ let options = ref([])
 const cascaderProps = {
   value: 'id',
   label: 'name',
-  children: 'children'
+  children: 'children',
+  checkStrictly: true,
 }
 // 获取机构数据
 const institutionList = () => {

src/views/operationManagement/operationDetail.vue

@@ -122,25 +122,25 @@
             <el-descriptions title="资料附件">
               <el-descriptions-item>
                 <template #default>
-                  <div class="fileItem">
+                  <div class="fileItem" v-if="imageChangeName('sfz1')">
                     <span class="label">身份证（人像面）</span>
                     <div class="fileName">
                       <span class="file-name">{{ imageChangeName('sfz1') }}</span>
                       <el-icon class="file-icon" @click="imageView('sfz1')"><View /></el-icon>
                     </div>
                   </div>
-                  <div class="fileItem">
+                  <div class="fileItem" v-if="imageChangeName('sfz2')">
                     <span class="label">身份证（国徽面）</span>
                     <div class="fileName">
                       <span class="file-name">{{ imageChangeName('sfz2') }}</span>
-                      <el-icon class="file-icon" @click="imageView('sfz1')"><View /></el-icon>
+                      <el-icon class="file-icon" @click="imageView('sfz2')"><View /></el-icon>
                     </div>
                   </div>
-                  <div class="fileItem">
+                  <div class="fileItem" v-if="imageChangeName('qualification')">
                     <span class="label">展业资格证</span>
                     <div class="fileName">
-                      <span class="file-name">{{ imageChangeName('sfz1') }}</span>
-                      <el-icon class="file-icon" @click="imageView('sfz1')"><View /></el-icon>
+                      <span class="file-name">{{ imageChangeName('qualification') }}</span>
+                      <el-icon class="file-icon" @click="imageView('qualification')"><View /></el-icon>
                     </div>
                   </div>
                 </template>
@@ -432,13 +432,13 @@ const closeAddOperation = (text: string) => {
 const imageChangeName = (type) => {
   if(dataDetail.value&&dataDetail.value.fileList.length>0) {
     let obj = dataDetail.value.fileList.find(item => item.fileType === type)
-    return obj.fileName
+    return obj?.fileName
   }
 }
 const imageChangeUrl = (type) => {
   if(dataDetail.value.fileList.length>0) {
-    let obj = dataDetail.value.fileList.find(item => item.fileType == 'sfz1')
-    return obj.fileUrl
+    let obj = dataDetail.value.fileList.find(item => item.fileType == type)
+    return obj?.fileUrl
   }
 }
 

src/views/operationManagement/team.vue

@@ -48,7 +48,7 @@
           <el-table-column label="工号" prop="userId" width="200"></el-table-column>
           <el-table-column label="类型" prop="typeAttr" width="100">
             <template #default="scope">
-              {{ scope.row.typeAttr == '0'?'个代':scope.row.typeAttr == '1'?'渠道':scope.row.typeAttr == '2'?'团队':scope.row.typeAttr == '3'?'电销组': '' }}
+              {{ scope.row.typeAttr == '1'?'个代':scope.row.typeAttr == '3'?'渠道':scope.row.typeAttr == '2'?'团队':scope.row.typeAttr == '4'?'电销组': '' }}
             </template>
           </el-table-column>
           <el-table-column label="归属" prop="deptName" width="200"></el-table-column>
@@ -318,7 +318,7 @@ let peopleShow = ref(false)
 let radioValue = ref('')
 const setPeople = () => {
   peopleShow.value = true
-  pageSize.value = 99999
+  // pageSize.value = 99999
   initList(teamInfo.value)
 }
 const onCancel = () => {

src/views/operationManagement/telemarketing.vue

@@ -48,7 +48,7 @@
           <el-table-column label="工号" prop="userId" width="200"></el-table-column>
           <el-table-column label="类型" prop="typeAttr" width="100">
             <template #default="scope">
-              {{ scope.row.typeAttr == '0'?'个代':scope.row.typeAttr == '1'?'渠道':scope.row.typeAttr == '2'?'团队':scope.row.typeAttr == '3'?'电销组': '' }}
+              {{ scope.row.typeAttr == '1'?'个代':scope.row.typeAttr == '3'?'渠道':scope.row.typeAttr == '2'?'团队':scope.row.typeAttr == '4'?'电销组': '' }}
             </template>
           </el-table-column>
           <el-table-column label="归属" prop="deptName" width="200"></el-table-column>
@@ -318,7 +318,7 @@ let peopleShow = ref(false)
 let radioValue = ref('')
 const setPeople = () => {
   peopleShow.value = true
-  pageSize.value = 99999
+  // pageSize.value = 99999
   initList(teamInfo.value)
 }
 const onCancel = () => {

src/views/quoteConfig/agreement/agreementCopy.vue

@@ -91,6 +91,7 @@ const sysUpAndDownList = ref<string[]>([])//选中id
 const formInline = reactive({
   validState: '',//协议信息
   agreementStatus: "",//归属
+  agreement: route.query.id
 })
 const columns = [
 

src/views/quoteConfig/agreement/agreementIndex.vue

@@ -77,6 +77,7 @@ onBeforeMount(async () => {
   await loadDicts(['agreement_type', 'valid_status', 'is_enable', 'with_tax']);//获取多个字典
   findpage();//列表数据
   getDeptTree();
+  initCompany();
   agreement_type.value = getDict('agreement_type');//协议类型
   valid_status.value = getDict('valid_status');//生效状态
   is_enable.value = getDict('is_enable');//协议状态
@@ -94,6 +95,13 @@ const tableData = ref([
 const sysUpAndDownList = ref<string[]>([])//选中id
 const provinceoptions = ref<string[]>([])//省市区回显数据
 const deptOptions = ref()//机构数据
+let company_list = ref()
+const companyIdprops = {
+    expandTrigger: 'hover' as const,
+    value: 'id',
+    label: 'nameSimple',
+    checkStrictly: true,
+}
 const agreement_type = ref();
 const valid_status = ref();
 const is_enable = ref();
@@ -133,10 +141,10 @@ const fields = ref([
     }
   },
   {
-    label: "保险公司", model: "companyId", type: "select", placeholder: "选择保险公司",
+      label: "保险公司", model: "companyId", type: "cascader", placeholder: "选择保险公司", options: company_list, props: companyIdprops, placement: 'left'
   },
   {
-    label: "协议类型", model: "agreementType", type: "select", placeholder: "选择保险公司", options: agreement_type,
+    label: "协议类型", model: "agreementType", type: "select", placeholder: "选择协议类型", options: agreement_type,
   },
   {
     label: "生效状态", model: "validStatus", type: "select", placeholder: "选择生效状态", options: valid_status,
@@ -170,9 +178,26 @@ const fields = ref([
   },
 ]);
 
+// 保险公司
+const initCompany = () => {
+    api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
+        if (res.code == '200') {
+            company_list.value = res.data;
+        } else {
+            ElMessage({
+                type: 'error',
+                message: res.msg,
+                plain: true,
+            })
+        }
+    });
+}
+
 //数据查询
 function findpage() {
-  api.agreementApi.agreementList({ pages: pageInfo.value.pageNum, size: pageInfo.value.pageSize, ...formInline }).then((res: any) => {
+  let query = {...formInline}
+  query.companyId = query.companyId[query.companyId.length - 1]
+  api.agreementApi.agreementList({ pages: pageInfo.value.pageNum, size: pageInfo.value.pageSize, ...query }).then((res: any) => {
     if (res.code == '200') {
       tableData.value = res.data.records;
       pageInfo.value.pageNum = res.data.current;

src/views/quoteConfig/agreement/components/ruleFeeDialog.vue

@@ -280,6 +280,7 @@ const save = async (formEl: FormInstance | undefined | any) => {
                 message: `${ruleFeeinfo.value[insuranceTypeIndex.value].productName}费用${index + 1}至少添加一条规则`,
                 plain: true,
               });
+              return;
             } else {
               resolve(true);
             }

src/views/quoteConfig/costManagement.vue

@@ -555,6 +555,11 @@ const ruleFeeSave = (data: object) => {
       ruleFeeVisible.value = false;
       findpage();
     } else {
+        ElMessage({
+            type: 'error',
+            message: res.msg,
+            plain: true,
+        })
     }
   });
 }

src/views/quoteConfig/insuranceCompanyAccount/insuranceCompanyAccount.vue

@@ -9,7 +9,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="保险公司">
-            <el-select v-model="insuranceForm.insCompanyId" placeholder="请选择" clearable>
+            <el-select v-model="insuranceForm.insCompanyId" filterable placeholder="请选择" clearable>
               <el-option v-for="item in bankOption" :key="item.companyCode" :value="item.companyCode" :label="item.name"></el-option>
             </el-select>
           </el-form-item>
@@ -38,7 +38,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="报价状态">
+          <el-form-item label="账号状态">
             <el-select v-model="insuranceForm.quoteStatus" placeholder="请选择" clearable>
               <el-option key="0" label="启用" value="0"></el-option>
               <el-option key="1" label="禁用" value="1"></el-option>
@@ -112,7 +112,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="quoteStatus" label="报价状态">
+      <el-table-column prop="quoteStatus" label="账号状态">
         <template #default="scope">
           <div class="tableState">
             <span :class="{'state-use': scope.row.quoteStatus==='0','state-noUse': scope.row.quoteStatus==='1'}"></span>{{ scope.row.quoteStatus==='0'?'启用':scope.row.quoteStatus==='1'?'禁用':''  }}

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

@@ -564,7 +564,7 @@ const save = async (ProjectAddRef: FormInstance | undefined) => {
           myRouter.push({
             path: '/quoteConfig/agreement/project'
           })
-        } else {
+        } else if(res.code != 400) {
           ElMessage({
             message: res.msg,
             type: 'warning'
@@ -584,6 +584,7 @@ onMounted(() => {
   initInsurance()
   initType()
   initCompany()
+  projectAddFrom.value.companyId = myRoute.query.companyId
   // initAttr()
   if(myRoute.query.id) {
     isEdit.value = true

src/views/systemManage/logManage/index.vue

@@ -41,11 +41,12 @@
     </el-form>
     <el-table
       :data="tableData"
+      height="600"
       style="margin-top: 24px"
     >
       <el-table-column label="操作人" prop="createBy" width="200"></el-table-column  >
       <el-table-column label="操作时间" prop="createTime" width="240"></el-table-column>
-      <el-table-column label="操作工能" prop="moduleName"></el-table-column>
+      <el-table-column label="操作功能" prop="moduleName"></el-table-column>
       <el-table-column label="操作内容" prop="operationContent"></el-table-column>
       <el-table-column label="类型" prop="operatorName" width="150"></el-table-column>
       <el-table-column label="操作" width="150">
@@ -158,6 +159,7 @@ onMounted(() => {
   height: calc(100vh - 120px);
   background: #FFFFFF;
   padding: 24px;
+  overflow-y: auto;
   .pagination{
     margin-top: 24px;
     display: flex;