فهرست منبع

fix:修改bug

wuguojie 1 سال پیش
والد
کامیت
c948c30980

+ 49 - 14
src/components/ruleCondition/index.vue

@@ -78,7 +78,7 @@ const close = () => {
 }
 }
 watch(props, () => {
 watch(props, () => {
   if (props.attrIdList && props.attrIdList.length) {
   if (props.attrIdList && props.attrIdList.length) {
-    console.log(props.attrIdList)
+    console.log(11111, props.attrIdList)
     attractivelist.value = props.attrIdList;//获取编辑数据
     attractivelist.value = props.attrIdList;//获取编辑数据
     const matchedid = matchDataByIds(attractivelist.value);//
     const matchedid = matchDataByIds(attractivelist.value);//
     const matchedinfo = matchDataByInfos(attractivelist.value)
     const matchedinfo = matchDataByInfos(attractivelist.value)
@@ -102,6 +102,19 @@ const save = () => {
     ...checkeddata.InsuranceInformation,
     ...checkeddata.InsuranceInformation,
     ...checkeddata.InsuranceCostFactor,
     ...checkeddata.InsuranceCostFactor,
   ]
   ]
+    // let arr = [...props.attrIdList, ...mergedData]
+    // console.log('原有的', props.attrIdList)
+    // console.log('新选的', mergedData)
+    // console.log('合并的', arr)
+    // let brr = arr.reduce((acc, current) => {
+    //     const a = acc.find(item => item.id === current.id)
+    //     if(!a) {
+    //         return acc.concat([current])
+    //     } else {
+    //         return acc
+    //     }
+    // }, [])
+    // console.log('去重的', brr)
   if (mergedData.length == 0) {
   if (mergedData.length == 0) {
     return ElMessage({
     return ElMessage({
       type: 'error',
       type: 'error',
@@ -190,12 +203,20 @@ const itemclick = (type: any) => {
   activename.value = type.name;
   activename.value = type.name;
 }
 }
 const dataStore = reactive<dataStore>({
 const dataStore = reactive<dataStore>({
-  VehicleInformation: [],//车辆信息
-  VehicleOwnerInformation: [],//车主信息
-  PolicyholderInformation: [],//车主信息
-  InsuredInformation: [],//车主信息
-  InsuranceInformation: [], //车主信息
-  InsuranceCostFactor: [],//保司费用因子
+    VehicleInformation: [],//车辆信息
+    VehicleOwnerInformation: [],//车主信息
+    PolicyholderInformation: [],//车主信息
+    InsuredInformation: [],//车主信息
+    InsuranceInformation: [], //车主信息
+    InsuranceCostFactor: [],//保司费用因子
+})
+const dataStoreNo = reactive<dataStore>({
+    VehicleInformation: [],//车辆信息
+    VehicleOwnerInformation: [],//车主信息
+    PolicyholderInformation: [],//车主信息
+    InsuredInformation: [],//车主信息
+    InsuranceInformation: [], //车主信息
+    InsuranceCostFactor: [],//保司费用因子
 })
 })
 interface checkeddata {
 interface checkeddata {
   [key: string]: any[]
   [key: string]: any[]
@@ -214,16 +235,17 @@ interface VehicleInformation {
   id: string,
   id: string,
 }[]
 }[]
 interface dataStore {
 interface dataStore {
-  VehicleInformation: VehicleInformation[],
-  VehicleOwnerInformation: VehicleInformation[],
-  PolicyholderInformation: VehicleInformation[],
-  InsuredInformation: VehicleInformation[],
-  InsuranceInformation: VehicleInformation[],
-  InsuranceCostFactor: VehicleInformation[],
+    VehicleInformation: VehicleInformation[],
+    VehicleOwnerInformation: VehicleInformation[],
+    PolicyholderInformation: VehicleInformation[],
+    InsuredInformation: VehicleInformation[],
+    InsuranceInformation: VehicleInformation[],
+    InsuranceCostFactor: VehicleInformation[],
 }
 }
 
 
 onMounted(() => {
 onMounted(() => {
   ruleAttr();
   ruleAttr();
+  ruleAttrNo();
   regionLicenseRegion('0');//车牌地区
   regionLicenseRegion('0');//车牌地区
   regionLicenseNumber('14');//车牌号
   regionLicenseNumber('14');//车牌号
 })
 })
@@ -240,11 +262,24 @@ const ruleAttr = () => {
     }
     }
   });
   });
 }
 }
+const ruleAttrNo = () => {
+    api.agreementApi.ruleAttrGroup({ attrName: '' }).then((res: any) => {
+        if (res.code == '200') {
+            dataStoreNo.VehicleInformation = res.data.VehicleInformation ? processArray(res.data.VehicleInformation) : [];
+            dataStoreNo.VehicleOwnerInformation = res.data.VehicleOwnerInformation ? processArray(res.data.VehicleOwnerInformation) : [];
+            dataStoreNo.PolicyholderInformation = res.data.PolicyholderInformation ? processArray(res.data.PolicyholderInformation) : [];
+            dataStoreNo.InsuredInformation = res.data.InsuredInformation ? processArray(res.data.InsuredInformation) : [];
+            dataStoreNo.InsuranceInformation = res.data.InsuranceInformation ? processArray(res.data.InsuranceInformation) : [];
+            dataStoreNo.InsuranceCostFactor = res.data.InsuranceCostFactor ? processArray(res.data.InsuranceCostFactor) : [];
+        }
+    });
+}
 //选择事件集中处理
 //选择事件集中处理
 type title = keyof typeof dataStore;
 type title = keyof typeof dataStore;
 const change = (value: any, title: title) => {
 const change = (value: any, title: title) => {
+    console.log('选择了?', value)
   // 使用动态属性访问
   // 使用动态属性访问
-  let arrayToUpdate = dataStore[title];//获取对应类型数组
+  let arrayToUpdate = dataStoreNo[title];//获取对应类型数组
   if (arrayToUpdate) {
   if (arrayToUpdate) {
     checkeddata[title] = [];//默认清空
     checkeddata[title] = [];//默认清空
     arrayToUpdate = arrayToUpdate.map((val) => {
     arrayToUpdate = arrayToUpdate.map((val) => {

+ 4 - 2
src/store/modules/route.ts

@@ -218,13 +218,15 @@ const useRouteStore = defineStore(
         // 设置 routes 数据
         // 设置 routes 数据
         // const routes = (JSON.parse(res.data.sysConfig))
         // const routes = (JSON.parse(res.data.sysConfig))
         // const sysPerms = (JSON.parse(res.data.sysPerms))
         // const sysPerms = (JSON.parse(res.data.sysPerms))
+        console.log('第一个', JSON.parse(res.data.sysConfig))
+        console.log('第二个', JSON.parse(res.data.sysPerms))
         const userInfo = JSON.parse(localStorage.getItem('userInfo'))
         const userInfo = JSON.parse(localStorage.getItem('userInfo'))
-        let routes = preprocessRoutes(asyncRoutes);
-        console.log(123123123, routes)
+        let routes = JSON.parse(res.data.sysConfig)
         if(userInfo) {
         if(userInfo) {
           let arr = []
           let arr = []
           arr = filterTreeByPerms(routes, userInfo.auths)
           arr = filterTreeByPerms(routes, userInfo.auths)
           routesRaw.value = converDeprecatedAttribute(formatBackRoutes(arr) as any)
           routesRaw.value = converDeprecatedAttribute(formatBackRoutes(arr) as any)
+          console.log('第三个', routesRaw.value)
         } else {
         } else {
           routesRaw.value = converDeprecatedAttribute(formatBackRoutes(JSON.parse(res.data.sysConfig)) as any)
           routesRaw.value = converDeprecatedAttribute(formatBackRoutes(JSON.parse(res.data.sysConfig)) as any)
         }
         }

+ 0 - 4
src/utils/composables/routeUtils.ts

@@ -48,16 +48,13 @@ function extractImportPath(func: any) {
   }
   }
   // 将函数转换为字符串
   // 将函数转换为字符串
   const funcStr = func.toString();
   const funcStr = func.toString();
-
   // 如果字符串中包含 "layouts",返回 "layout"
   // 如果字符串中包含 "layouts",返回 "layout"
   if (funcStr.includes("layouts")) {
   if (funcStr.includes("layouts")) {
     return "layout";
     return "layout";
   }
   }
-
   // 检查 import() 的结构是否存在
   // 检查 import() 的结构是否存在
   const startIndex = funcStr.indexOf('import("') + 8;
   const startIndex = funcStr.indexOf('import("') + 8;
   const endIndex = funcStr.indexOf('")', startIndex);
   const endIndex = funcStr.indexOf('")', startIndex);
-
   if (startIndex > 7 && endIndex > startIndex) {
   if (startIndex > 7 && endIndex > startIndex) {
     let path = funcStr.substring(startIndex, endIndex);
     let path = funcStr.substring(startIndex, endIndex);
 
 
@@ -85,7 +82,6 @@ function extractImportPath(func: any) {
 // 预处理函数:确保 children 和 auth 类型正确
 // 预处理函数:确保 children 和 auth 类型正确
 export const preprocessRoutes = (routes: any[]): RouteItem[] => {
 export const preprocessRoutes = (routes: any[]): RouteItem[] => {
   return routes.map(route => {
   return routes.map(route => {
-
     const processedRoute: RouteItem = {
     const processedRoute: RouteItem = {
       id: generateId(),
       id: generateId(),
       path: route.path || '',
       path: route.path || '',

+ 13 - 1
src/views/insurancePolicy/index.vue

@@ -2130,12 +2130,19 @@ const handleCount = (scope) => {
 let underwritingShow = ref(false)
 let underwritingShow = ref(false)
 const handleUnderwriting = (scope) => {
 const handleUnderwriting = (scope) => {
   underwritingShow.value = true
   underwritingShow.value = true
+    // insurancePolicyForm.value.imageVoList
   let data = {
   let data = {
 
 
     // ordersNo: '1915570359429222400'
     // ordersNo: '1915570359429222400'
     ordersNo: scope.row.quoteResult.ordersNo,
     ordersNo: scope.row.quoteResult.ordersNo,
     quoteNo: insurancePolicyForm.value.order.quoteNo
     quoteNo: insurancePolicyForm.value.order.quoteNo
   }
   }
+  nextTick(() => {
+      UnderwritingRefs.value.initEdit({
+          ...data,
+          list: images.value
+      })
+  })
   api.insurancePolicyApi.imagesUpload({
   api.insurancePolicyApi.imagesUpload({
     order: {
     order: {
       ...data
       ...data
@@ -2159,10 +2166,12 @@ const handleUnderwritingClose = () => {
 
 
 // 证件识别
 // 证件识别
 let imageShow = ref(false)
 let imageShow = ref(false)
+let images = ref([])
 const handleImageClose = (data) => {
 const handleImageClose = (data) => {
   imageShow.value = false
   imageShow.value = false
+    images.value = []
   if(data) {
   if(data) {
-    const { carForm, owerForm, ower1Form, ower2Form, imageVoList } = data
+    const { carForm, owerForm, ower1Form, ower2Form, imageVoList, list } = data
     if(carForm) {
     if(carForm) {
       insurancePolicyForm.value.isRegistered = '1'
       insurancePolicyForm.value.isRegistered = '1'
       insurancePolicyForm.value.licenseNo = carForm.licenseNo
       insurancePolicyForm.value.licenseNo = carForm.licenseNo
@@ -2236,6 +2245,9 @@ const handleImageClose = (data) => {
     if(imageVoList&&imageVoList.length>0) {
     if(imageVoList&&imageVoList.length>0) {
       insurancePolicyForm.value.imageVoList = imageVoList.filter(a => a.imageBase64List[0].imageId)
       insurancePolicyForm.value.imageVoList = imageVoList.filter(a => a.imageBase64List[0].imageId)
     }
     }
+    if(list&&list.length>0) {
+        images.value = list
+    }
   }
   }
 }
 }
 const handleRecognition = () => {
 const handleRecognition = () => {

+ 54 - 37
src/views/insurancePolicy/modules/imageTypeSelect.vue

@@ -364,44 +364,61 @@ const handleConfirm = () => {
 }
 }
 
 
 // 修改数据
 // 修改数据
-const initEditData = (data, type) => {
-  insuranceType.value = type
-  api.projectApi.getBusinessInsurance().then((res: any) => {
-    if(res.code == 200) {
-      if(res.data&&res.data.length>0) {
-        // choiceItem.value = res.data[0]
-        choiceItem.value = list.value[0]
-        res.data.forEach(item => {
-          item.checked = false
-          item.options.forEach(sub => {
-            sub.checked = false
-          })
+const initEditData = (data) => {
+    list.value.forEach(a => {
+        a.checked = false
+        a.children.forEach(b => {
+            b.checked = false
+            if(data&&data.length>0) {
+                choiceItem.value = list.value[0]
+                data.forEach(c => {
+                  if(b.imageType === c.imageType) {
+                      b.checked = true
+                  }
+                })
+            }
         })
         })
-        typeList.value = JSON.parse(JSON.stringify(res.data))
-        if(data && data.length > 0) {
-          data.forEach(item => {
-            item.checked = true
-            item.options.forEach(sub => {
-              if(item.optionId === sub.id) {
-                sub.checked = true
-              }
-            })
-          })
-          insuranceTypeList.value = res.data.map(a => {
-            let obj = data.find(b => b.insuranceId === a.insuranceId)
-            return obj || a
-          })
-        } else {
-          insuranceTypeList.value = res.data
-        }
-      }
-    } else {
-      ElMessage({
-        message: res.msg,
-        type: 'warning'
-      })
-    }
-  })
+    })
+    list.value.forEach(a => {
+        a.checked = a.children.some(b => b.checked)
+    })
+  // insuranceType.value = type
+  // api.projectApi.getBusinessInsurance().then((res: any) => {
+  //   if(res.code == 200) {
+  //     if(res.data&&res.data.length>0) {
+  //       // choiceItem.value = res.data[0]
+  //       choiceItem.value = list.value[0]
+  //       res.data.forEach(item => {
+  //         item.checked = false
+  //         item.options.forEach(sub => {
+  //           sub.checked = false
+  //         })
+  //       })
+  //       typeList.value = JSON.parse(JSON.stringify(res.data))
+  //       if(data && data.length > 0) {
+  //         data.forEach(item => {
+  //           item.checked = true
+  //           item.options.forEach(sub => {
+  //             if(item.optionId === sub.id) {
+  //               sub.checked = true
+  //             }
+  //           })
+  //         })
+  //         insuranceTypeList.value = res.data.map(a => {
+  //           let obj = data.find(b => b.insuranceId === a.insuranceId)
+  //           return obj || a
+  //         })
+  //       } else {
+  //         insuranceTypeList.value = res.data
+  //       }
+  //     }
+  //   } else {
+  //     ElMessage({
+  //       message: res.msg,
+  //       type: 'warning'
+  //     })
+  //   }
+  // })
 }
 }
 
 
 defineExpose({
 defineExpose({

+ 46 - 0
src/views/insurancePolicy/modules/recognition.vue

@@ -1145,6 +1145,52 @@ const handleConfirm = () => {
           }
           }
         ]
         ]
       },
       },
+    ],
+    list: [
+        {
+            imageType: 'C01',
+            fileUrl: xszFrontResult.value?.downloadUrl
+        },
+        {
+            imageType: 'D01',
+            fileUrl: xszBackResult.value?.downloadUrl
+        },
+        {
+            imageType: 'C02',
+            fileUrl: sfzFrontResult.value?.downloadUrl
+        },
+        {
+            imageType: 'D02',
+            fileUrl: sfzBackResult.value?.downloadUrl
+        },
+        {
+            imageType: 'Y02',
+            fileUrl: yyzzFrontResult.value?.downloadUrl
+        },
+        {
+            imageType: 'C03',
+            fileUrl: tbrFrontResult.value?.downloadUrl
+        },
+        {
+            imageType: 'D03',
+            fileUrl: tbrBackResult.value?.downloadUrl
+        },
+        {
+            imageType: 'Y03',
+            fileUrl: tbryyzzFrontResult.value?.downloadUrl
+        },
+        {
+            imageType: 'C04',
+            fileUrl: bbrFrontResult.value?.downloadUrl
+        },
+        {
+            imageType: 'D04',
+            fileUrl: bbrBackResult.value?.downloadUrl
+        },
+        {
+            imageType: 'Y04',
+            fileUrl: bbryyzzFrontResult.value?.downloadUrl
+        },
     ]
     ]
   }
   }
   emit('close', data)
   emit('close', data)

+ 3 - 3
src/views/insurancePolicy/modules/underwriting.vue

@@ -78,14 +78,13 @@ let imageTypeShow = ref(false)
 const addImages = () => {
 const addImages = () => {
   imageTypeShow.value = true
   imageTypeShow.value = true
   nextTick(() => {
   nextTick(() => {
-    ImageTypeSelect.value.initEditData()
+    ImageTypeSelect.value.initEditData(images.value)
   })
   })
 }
 }
 const handleImageTypeSelect = (data) => {
 const handleImageTypeSelect = (data) => {
   imageTypeShow.value = false
   imageTypeShow.value = false
   if(data&&data.list?.length>0) {
   if(data&&data.list?.length>0) {
     images.value = data.list
     images.value = data.list
-    console.log(12312312321, data.list)
   }
   }
 }
 }
 
 
@@ -179,8 +178,9 @@ const handleSubmit = (bool) => {
 //数据交互
 //数据交互
 let ordersNo = ref('')
 let ordersNo = ref('')
 const initEdit = (data) => {
 const initEdit = (data) => {
-  console.log(123, data)
+  console.log(11122333, data)
   ordersNo.value = data.ordersNo
   ordersNo.value = data.ordersNo
+    images.value = data.list.filter(a => a.fileUrl)
 }
 }
 
 
 defineExpose({
 defineExpose({

+ 1 - 1
src/views/operationManagement/channel.vue

@@ -469,7 +469,7 @@ const tableDataCommand = (scope, e) => {
     case '分配管理人':
     case '分配管理人':
       allocationShow.value = true
       allocationShow.value = true
       nextTick(() => {
       nextTick(() => {
-        AllocationRef.value.initCheckedKeys(scope.row.deptId, selectType.value, [scope.row.id])
+        AllocationRef.value.initCheckedKeys(scope.row.deptId, null, [scope.row.id], scope.row.leaderId)
       })
       })
       break;
       break;
   }
   }

+ 4 - 1
src/views/operationManagement/modules/addOperation.vue

@@ -1161,7 +1161,10 @@ const onSubmit = async (OperationFormRef: FormInstance, type: number) => {
               emits('closeDialog', '取消')
               emits('closeDialog', '取消')
             })
             })
           } else {
           } else {
-            api.operationApi.addOperation(formData).then(res => {
+            api.operationApi.addOperation({
+                ...formData,
+                isAddSalesman: 2
+            }).then(res => {
               if(res.code == 200) {
               if(res.code == 200) {
                 ElMessage({
                 ElMessage({
                   message: res.msg,
                   message: res.msg,

+ 2 - 2
src/views/operationManagement/operationDetail.vue

@@ -39,7 +39,7 @@
         <el-descriptions-item label="工号:" width="33%">{{ dataDetail?.userId }}</el-descriptions-item>
         <el-descriptions-item label="工号:" width="33%">{{ dataDetail?.userId }}</el-descriptions-item>
         <el-descriptions-item label="所属机构:" width="33%">{{ dataDetail?.deptName }}</el-descriptions-item>
         <el-descriptions-item label="所属机构:" width="33%">{{ dataDetail?.deptName }}</el-descriptions-item>
         <el-descriptions-item label="状态:" width="33%">{{  dataDetail?.status == '0'?'待认证': dataDetail?.status == '1'?'已认证': dataDetail?.status == '2'?'待提交资料': dataDetail?.status == '3'?'已入职':'' }}</el-descriptions-item>
         <el-descriptions-item label="状态:" width="33%">{{  dataDetail?.status == '0'?'待认证': dataDetail?.status == '1'?'已认证': dataDetail?.status == '2'?'待提交资料': dataDetail?.status == '3'?'已入职':'' }}</el-descriptions-item>
-        <el-descriptions-item label="类型:" width="33%">{{  dataDetail?.typeAttr == '6'?'个代': dataDetail?.typeAttr == '8'?'渠道': dataDetail?.typeAttr == '5'?'团队': dataDetail?.typeAttr == '7'?'电销组': '' }}</el-descriptions-item>
+        <el-descriptions-item label="类型:" width="33%">{{  dataDetail?.typeAttr == '1'?'个代': dataDetail?.typeAttr == '2'?'渠道': dataDetail?.typeAttr == '3'?'团队': dataDetail?.typeAttr == '4'?'电销组': '' }}</el-descriptions-item>
         <el-descriptions-item label="所属团队:" width="33%">{{ dataDetail?.organizationName }}</el-descriptions-item>
         <el-descriptions-item label="所属团队:" width="33%">{{ dataDetail?.organizationName }}</el-descriptions-item>
         <el-descriptions-item label="创建人:" width="33%">{{ dataDetail?.updateBy }}</el-descriptions-item>
         <el-descriptions-item label="创建人:" width="33%">{{ dataDetail?.updateBy }}</el-descriptions-item>
         <el-descriptions-item label="创建时间:" width="33%">{{ dataDetail?.createTime }}</el-descriptions-item>
         <el-descriptions-item label="创建时间:" width="33%">{{ dataDetail?.createTime }}</el-descriptions-item>
@@ -267,7 +267,7 @@ const handleCommand = (e) => {
     case '分配管理人':
     case '分配管理人':
       allocationShow.value = true
       allocationShow.value = true
       nextTick(() => {
       nextTick(() => {
-        AllocationRef.value.initCheckedKeys(dataDetail.value.deptId, 'cur', [dataDetail.value.id])
+        AllocationRef.value.initCheckedKeys(dataDetail.value.deptId, 'cur', [dataDetail.value.id], dataDetail.value.leaderId)
       })
       })
       break;
       break;
   }
   }

+ 1 - 1
src/views/operationManagement/team.vue

@@ -469,7 +469,7 @@ const tableDataCommand = (scope, e) => {
     case '分配管理人':
     case '分配管理人':
       allocationShow.value = true
       allocationShow.value = true
       nextTick(() => {
       nextTick(() => {
-        AllocationRef.value.initCheckedKeys(scope.row.deptId, selectType.value, [scope.row.id])
+        AllocationRef.value.initCheckedKeys(scope.row.deptId, null, [scope.row.id], scope.row.leaderId)
       })
       })
       break;
       break;
   }
   }

+ 1 - 1
src/views/operationManagement/telemarketing.vue

@@ -469,7 +469,7 @@ const tableDataCommand = (scope, e) => {
     case '分配管理人':
     case '分配管理人':
       allocationShow.value = true
       allocationShow.value = true
       nextTick(() => {
       nextTick(() => {
-        AllocationRef.value.initCheckedKeys(scope.row.deptId, selectType.value, [scope.row.id])
+        AllocationRef.value.initCheckedKeys(scope.row.deptId, null, [scope.row.id], scope.row.leaderId)
       })
       })
       break;
       break;
   }
   }

+ 8 - 6
src/views/personnel/institutionManage.vue

@@ -342,14 +342,16 @@ const del = (item: any) => {
           id: item.id,
           id: item.id,
         })
         })
         .then((res) => {
         .then((res) => {
-          ElMessage.success("操作成功");
-          getInstitutionList(); //机构列表
+            if(res.code == 200) {
+                ElMessage.success("操作成功");
+                getInstitutionList(); //机构列表
+            }
         });
         });
     }
     }
-    })
-    .catch(() => {
-      ElMessage.warning("用户取消操作");
-    });
+  })
+  .catch(() => {
+    ElMessage.warning("用户取消操作");
+  });
 };
 };
 
 
 //添加的弹框
 //添加的弹框

+ 2 - 1
src/views/personnel/memberManagement.vue

@@ -554,8 +554,9 @@ const deptDialogVisible=ref(false)
 const changeDeptDialog = ref(false);
 const changeDeptDialog = ref(false);
 const operationForm=ref({})
 const operationForm=ref({})
 function changeDept(item:any) {
 function changeDept(item:any) {
-
+console.log('列表点击的', item)
   operationForm.value=item.operationData.row
   operationForm.value=item.operationData.row
+    deptItem.name = item.operationData.row.deptName
   api.userApi
   api.userApi
     .checkChangeDept({
     .checkChangeDept({
       userId: item.operationData.row.userId,
       userId: item.operationData.row.userId,

+ 7 - 7
src/views/personnel/modules/addOperation.vue

@@ -412,7 +412,7 @@
               <el-col :span="12">
               <el-col :span="12">
                 <el-form-item prop="team" label="银行卡号">
                 <el-form-item prop="team" label="银行卡号">
                   <el-input
                   <el-input
-                    v-model="operationForm.bankCardId"
+                    v-model="operationForm.bankCardNumber"
                     placeholder="请填写银行卡号"
                     placeholder="请填写银行卡号"
                   ></el-input>
                   ></el-input>
                 </el-form-item>
                 </el-form-item>
@@ -1394,9 +1394,9 @@ const onSubmit = async (OperationFormRef: FormInstance, type: number) => {
       if(!route.query.id){
       if(!route.query.id){
       api.operationApi.addOperation({
       api.operationApi.addOperation({
         ...operationForm.value,
         ...operationForm.value,
-        province:operationForm.value.address.length?operationForm.value.address[0]:'',
-        city:operationForm.value.address.length?operationForm.value.address[1]:'',
-        district:operationForm.value.address.length?operationForm.value.address[2]:'',
+        province:operationForm.value.address?.length?operationForm.value.address[0]:'',
+        city:operationForm.value.address?.length?operationForm.value.address[1]:'',
+        district:operationForm.value.address?.length?operationForm.value.address[2]:'',
         deptId:operationForm.value.deptId,
         deptId:operationForm.value.deptId,
         typeAttr:2,
         typeAttr:2,
         sfz1:sfz1.value,
         sfz1:sfz1.value,
@@ -1417,9 +1417,9 @@ const onSubmit = async (OperationFormRef: FormInstance, type: number) => {
     }else{
     }else{
       api.userApi.updateUserInfo({
       api.userApi.updateUserInfo({
         ...operationForm.value,
         ...operationForm.value,
-        province:operationForm.value.address.length?operationForm.value.address[0]:'',
-        city:operationForm.value.address.length?operationForm.value.address[1]:'',
-        district:operationForm.value.address.length?operationForm.value.address[2]:'',
+        province:operationForm.value.address?.length?operationForm.value.address[0]:'',
+        city:operationForm.value.address?.length?operationForm.value.address[1]:'',
+        district:operationForm.value.address?.length?operationForm.value.address[2]:'',
         deptId:operationForm.value.deptId,
         deptId:operationForm.value.deptId,
         typeAttr:2,
         typeAttr:2,
         sfz1:sfz1.value,
         sfz1:sfz1.value,

+ 4 - 4
src/views/personnel/modules/memberMessage.vue

@@ -259,7 +259,7 @@
                   </el-col>
                   </el-col>
                   <el-col :span="12">
                   <el-col :span="12">
                     <el-form-item prop="team" label="是否计算机专业:">
                     <el-form-item prop="team" label="是否计算机专业:">
-                      {{ operationForm.isComputer }}
+                      {{ operationForm.isComputer?'是':'否' }}
                     </el-form-item>
                     </el-form-item>
                   </el-col>
                   </el-col>
                 </el-row>
                 </el-row>
@@ -302,7 +302,7 @@
                 <el-row :gutter="24">
                 <el-row :gutter="24">
                   <el-col :span="12">
                   <el-col :span="12">
                     <el-form-item prop="team" label="银行卡号:">
                     <el-form-item prop="team" label="银行卡号:">
-                      {{ operationForm.bankCardId }}
+                      {{ operationForm.bankCardNumber }}
                     </el-form-item>
                     </el-form-item>
                   </el-col>
                   </el-col>
                   <el-col :span="12">
                   <el-col :span="12">
@@ -775,8 +775,8 @@ onMounted(async () => {
           let qualification = formData.fileList.find(item => item.fileType == 'bankCard')
           let qualification = formData.fileList.find(item => item.fileType == 'bankCard')
           let contractImg = formData.fileList.find(item => item.fileType == 'contract')
           let contractImg = formData.fileList.find(item => item.fileType == 'contract')
           let applicantImg = formData.fileList.find(item => item.fileType == 'applicant')
           let applicantImg = formData.fileList.find(item => item.fileType == 'applicant')
-          let salaryTable = formData.fileList.find(item => item.fileType == 'salaryTable')
-          let leaveTable = formData.fileList.find(item => item.fileType == 'leaveTable')
+          let salaryTable = formData.fileList.find(item => item.fileType == 'salary')
+          let leaveTable = formData.fileList.find(item => item.fileType == 'leave')
           if(sfz1) {
           if(sfz1) {
             operationForm.value.sfz1 = sfz1.id
             operationForm.value.sfz1 = sfz1.id
             IDCardFrontName.value = sfz1.fileName
             IDCardFrontName.value = sfz1.fileName

+ 65 - 50
src/views/quoteConfig/project/modules/projectAdd.vue

@@ -119,7 +119,7 @@
                     </el-table-column>
                     </el-table-column>
                     <el-table-column label="操作">
                     <el-table-column label="操作">
                       <template #default="scope">
                       <template #default="scope">
-                        <el-button :disabled="projectAddFrom.productId == '0330' || projectAddFrom.productId == '0330034002' || projectAddFrom.productId == '0330034001'" link type="primary" @click="insuranceTypeDel(item, scope.row)">删除</el-button>
+                        <el-button :disabled="projectAddFrom.productId == '0330'&&scope.row.id=='19' || projectAddFrom.productId == '0330034002'&&scope.row.id=='19' || projectAddFrom.productId == '0330034001'&&scope.row.id=='19'" link type="primary" @click="insuranceTypeDel(item, scope.row)">删除</el-button>
                       </template>
                       </template>
                     </el-table-column>
                     </el-table-column>
                   </el-table>
                   </el-table>
@@ -222,34 +222,48 @@ const numberChange = (e, row) => {
 
 
 // 新增的时候初始化已有的方案
 // 新增的时候初始化已有的方案
 const initProduct = (e) => {
 const initProduct = (e) => {
-  initAttr()
-  if(e == '034002') {
-    let obj = insuranceTypeList.value.find(item => item.id == '2')
-    obj.insuranceId = obj.id
-    projectAddFrom.value.schemeList.forEach(item => {
-      item.drivingList = []
-      item.tableData = [obj]
-    })
-  } else if(e == '0330034002') {
-    let obj = insuranceTypeList.value.filter(item => item.id == '2' || item.id == '19')
-    if(obj) {
-      obj.forEach(item => {
-        item.insuranceId = item.id
-        if(item.id == '19') {
-          item.moneyId = item.options[0].id
+    initAttr()
+    if(e == '0330' || e == '0330034001') {
+        let obj = insuranceTypeList.value.filter(item => item.id == '19')
+        if(obj) {
+            obj.forEach(item => {
+                item.insuranceId = item.id
+                if(item.id == '19') {
+                    item.moneyId = item.options[0].id
+                }
+            })
+            projectAddFrom.value.schemeList.forEach(item => {
+                item.drivingList = []
+                item.tableData = [...obj]
+            })
         }
         }
+    } else if(e == '034002') {
+      let obj = insuranceTypeList.value.find(item => item.id == '2')
+      obj.insuranceId = obj.id
+      projectAddFrom.value.schemeList.forEach(item => {
+        item.drivingList = []
+        item.tableData = [obj]
       })
       })
+    } else if(e == '0330034002') {
+      let obj = insuranceTypeList.value.filter(item => item.id == '2' || item.id == '19')
+      if(obj) {
+        obj.forEach(item => {
+          item.insuranceId = item.id
+          if(item.id == '19') {
+            item.moneyId = item.options[0].id
+          }
+        })
+        projectAddFrom.value.schemeList.forEach(item => {
+          item.drivingList = []
+          item.tableData = [...obj]
+        })
+      }
+    } else {
       projectAddFrom.value.schemeList.forEach(item => {
       projectAddFrom.value.schemeList.forEach(item => {
         item.drivingList = []
         item.drivingList = []
-        item.tableData = [...obj]
+        item.tableData = []
       })
       })
     }
     }
-  } else {
-    projectAddFrom.value.schemeList.forEach(item => {
-      item.drivingList = []
-      item.tableData = []
-    })
-  }
   if(projectAddFrom.value.companyId&&projectAddFrom.value.productId&&projectAddFrom.value.schemeType) {
   if(projectAddFrom.value.companyId&&projectAddFrom.value.productId&&projectAddFrom.value.schemeType) {
     api.projectApi.getSchemeByCompany({
     api.projectApi.getSchemeByCompany({
       companyId: projectAddFrom.value.companyId,
       companyId: projectAddFrom.value.companyId,
@@ -274,33 +288,33 @@ const initProduct = (e) => {
           rulesAttrList.value = res.data.ruleAttrs
           rulesAttrList.value = res.data.ruleAttrs
         }
         }
       } else {
       } else {
-        projectAddFrom.value.ruleAttrs = []
-        if(e == '0330' || e == '0330034002' || e == '0330034001') {
-          let obj = insuranceTypeList.value.find(a => a.alias == '交强险')
-          if(obj) {
-            obj.insuranceId = obj.id
-            let sub = obj.options.find(b => b.label == '投保')
-            obj.optionId = projectAddFrom.value.schemeType==1?sub?.id:projectAddFrom.value.schemeType==2?[sub?.id]:''
-            obj.moneyId = sub?.id
-          }
-          projectAddFrom.value.schemeList  = [{
-            schemeName: '',
-            description: '',
-            tableData: [obj],
-            drivingList: [],
-            schemeInsuranceList: [obj],
-            drivingIntentionList: []
-          }]
-        } else {
-          projectAddFrom.value.schemeList  = [{
-            schemeName: '',
-            description: '',
-            tableData: [],
-            drivingList: [],
-            schemeInsuranceList: [],
-            drivingIntentionList: []
-          }]
-        }
+        // projectAddFrom.value.ruleAttrs = []
+        // if(e == '0330' || e == '0330034002' || e == '0330034001') {
+        //   let obj = insuranceTypeList.value.find(a => a.alias == '交强险')
+        //   if(obj) {
+        //     obj.insuranceId = obj.id
+        //     let sub = obj.options.find(b => b.label == '投保')
+        //     obj.optionId = projectAddFrom.value.schemeType==1?sub?.id:projectAddFrom.value.schemeType==2?[sub?.id]:''
+        //     obj.moneyId = sub?.id
+        //   }
+        //   projectAddFrom.value.schemeList  = [{
+        //     schemeName: '',
+        //     description: '',
+        //     tableData: [obj],
+        //     drivingList: [],
+        //     schemeInsuranceList: [obj],
+        //     drivingIntentionList: []
+        //   }]
+        // } else {
+        //   projectAddFrom.value.schemeList  = [{
+        //     schemeName: '',
+        //     description: '',
+        //     tableData: [],
+        //     drivingList: [],
+        //     schemeInsuranceList: [],
+        //     drivingIntentionList: []
+        //   }]
+        // }
         // ElMessage({
         // ElMessage({
         //   message: res.msg,
         //   message: res.msg,
         //   type: 'warning'
         //   type: 'warning'
@@ -371,6 +385,7 @@ const addRules = () => {
 let rulesAttrList = ref([])
 let rulesAttrList = ref([])
 let defaultAttrList = ref([])
 let defaultAttrList = ref([])
 const saveRule = (data) => {
 const saveRule = (data) => {
+    console.log(123123123, data)
   if(data && data.length > 0) {
   if(data && data.length > 0) {
     rulesAttrList.value = data
     rulesAttrList.value = data
   }
   }