fix: 修改bug

src/layouts/components/InsuranceType/index.vue

@@ -140,9 +140,15 @@ const initEditData = (data, index, type) => {
           data.forEach(item => {
             item.checked = true
             item.options.forEach(sub => {
-              if(item.optionId === sub.id) {
-                sub.checked = true
-              }
+                if(type === 1) {
+                    if(item.optionId === sub.id) {
+                        sub.checked = true
+                    }
+                } else if(type === 2) {
+                    if(item.optionId.includes(sub.id)) {
+                        sub.checked = true
+                    }
+                }
             })
           })
           insuranceTypeList.value = res.data.map(a => {

src/views/insurancePolicy/index.vue

@@ -2714,76 +2714,76 @@ const handleImageClose = (data) => {
     const { carForm, owerForm, ower1Form, ower2Form, imageVoList, list } = data
     if(carForm) {
       insurancePolicyForm.value.isRegistered = '1'
-      insurancePolicyForm.value.licenseNo = carForm.licenseNo
-      insurancePolicyForm.value.vinNo = carForm.vinNo
-      insurancePolicyForm.value.brandName = carForm.brandName
-      insurancePolicyForm.value.engineNo = carForm.engineNo
-      insurancePolicyForm.value.carNatureCode = carForm.carNatureCode
-      insurancePolicyForm.value.vehicleUseCode = carForm.vehicleUseCode
-      insurancePolicyForm.value.carTypeCode = carForm.carTypeCode
-      insurancePolicyForm.value.plateType = carForm.plateType
-      insurancePolicyForm.value.energyTypeCode = carForm.energyTypeCode
-      insurancePolicyForm.value.registerDate = carForm.registerDate
-      insurancePolicyForm.value.issueDate = carForm.issueDate
-      insurancePolicyForm.value.completeKerbMass = carForm.completeKerbMass
-      insurancePolicyForm.value.limitLoad = carForm.limitLoad
-      insurancePolicyForm.value.seatCount = carForm.seatCount
-      insurancePolicyForm.value.carYear = carForm.carYear
-      insurancePolicyForm.value.purchasePrice = carForm.purchasePrice
-      insurancePolicyForm.value.displacement = carForm.displacement
-      insurancePolicyForm.value.powerScale = carForm.powerScale
-      insurancePolicyForm.value.carOwner = carForm.carOwner
+      insurancePolicyForm.value.licenseNo = carForm.licenseNo || hadWritedData.value.licenseNo
+      insurancePolicyForm.value.vinNo = carForm.vinNo || hadWritedData.value.vinNo
+      insurancePolicyForm.value.brandName = carForm.brandName || hadWritedData.value.brandName
+      insurancePolicyForm.value.engineNo = carForm.engineNo || hadWritedData.value.engineNo
+      insurancePolicyForm.value.carNatureCode = carForm.carNatureCode || hadWritedData.value.carNatureCode
+      insurancePolicyForm.value.vehicleUseCode = carForm.vehicleUseCode || hadWritedData.value.vehicleUseCode
+      insurancePolicyForm.value.carTypeCode = carForm.carTypeCode || hadWritedData.value.carTypeCode
+      insurancePolicyForm.value.plateType = carForm.plateType || hadWritedData.value.plateType
+      insurancePolicyForm.value.energyTypeCode = carForm.energyTypeCode || hadWritedData.value.energyTypeCode
+      insurancePolicyForm.value.registerDate = carForm.registerDate || hadWritedData.value.registerDate
+      insurancePolicyForm.value.issueDate = carForm.issueDate || hadWritedData.value.issueDate
+      insurancePolicyForm.value.completeKerbMass = carForm.completeKerbMass || hadWritedData.value.completeKerbMass
+      insurancePolicyForm.value.limitLoad = carForm.limitLoad || hadWritedData.value.limitLoad
+      insurancePolicyForm.value.seatCount = carForm.seatCount || hadWritedData.value.seatCount
+      insurancePolicyForm.value.carYear = carForm.carYear || hadWritedData.value.carYear
+      insurancePolicyForm.value.purchasePrice = carForm.purchasePrice || hadWritedData.value.purchasePrice
+      insurancePolicyForm.value.displacement = carForm.displacement || hadWritedData.value.displacement
+      insurancePolicyForm.value.powerScale = carForm.powerScale || hadWritedData.value.powerScale
+      insurancePolicyForm.value.carOwner = carForm.carOwner || hadWritedData.value.carOwner
       if(carForm.licenseNo&&carForm.vinNo&&carForm.engineNo) {
         getQuoteNumber()
       }
     }
     if(owerForm) {
-      insurancePolicyForm.value.name1 = owerForm.name
-      insurancePolicyForm.value.mobile1 = owerForm.mobile
-      insurancePolicyForm.value.identifyType1 = owerForm.identifyType
-      insurancePolicyForm.value.identifyNumber1 = owerForm.identifyNumber
-      insurancePolicyForm.value.identifyValidDate1 = owerForm.identifyValidDate
-      insurancePolicyForm.value.identifyValidEndDate1 = owerForm.identifyValidEndDate
-      insurancePolicyForm.value.addr1 = owerForm.addr
-      insurancePolicyForm.value.telephone1 = owerForm.telephone
-      insurancePolicyForm.value.person1 = owerForm.person
-      insurancePolicyForm.value.age1 = owerForm.age
-      insurancePolicyForm.value.address1 = owerForm.address
-      insurancePolicyForm.value.registeredCapital1 = owerForm.registeredCapital
-      insurancePolicyForm.value.email1 = owerForm.email
-        insurancePolicyForm.value.taxpayerName = owerForm.name
-        insurancePolicyForm.value.taxpayerIdentifier = owerForm.identifyType
-        insurancePolicyForm.value.identifyNumber = owerForm.identifyNumber
+      insurancePolicyForm.value.name1 = owerForm.name || hadWritedData.value.name1
+      insurancePolicyForm.value.mobile1 = owerForm.mobile || hadWritedData.value.mobile1
+      insurancePolicyForm.value.identifyType1 = owerForm.identifyType || hadWritedData.value.identifyType1
+      insurancePolicyForm.value.identifyNumber1 = owerForm.identifyNumber || hadWritedData.value.identifyNumber1
+      insurancePolicyForm.value.identifyValidDate1 = owerForm.identifyValidDate || hadWritedData.value.identifyValidDate1
+      insurancePolicyForm.value.identifyValidEndDate1 = owerForm.identifyValidEndDate || hadWritedData.value.identifyValidEndDate1
+      insurancePolicyForm.value.addr1 = owerForm.addr || hadWritedData.value.addr1
+      insurancePolicyForm.value.telephone1 = owerForm.telephone || hadWritedData.value.telephone1
+      insurancePolicyForm.value.person1 = owerForm.person || hadWritedData.value.person1
+      insurancePolicyForm.value.age1 = owerForm.age || hadWritedData.value.age1
+      insurancePolicyForm.value.address1 = owerForm.address || hadWritedData.value.address1
+      insurancePolicyForm.value.registeredCapital1 = owerForm.registeredCapital || hadWritedData.value.registeredCapital1
+      insurancePolicyForm.value.email1 = owerForm.email || hadWritedData.value.email1
+      insurancePolicyForm.value.taxpayerName = owerForm.name || hadWritedData.value.taxpayerName
+      insurancePolicyForm.value.taxpayerIdentifier = owerForm.identifyType || hadWritedData.value.taxpayerIdentifier
+      insurancePolicyForm.value.identifyNumber = owerForm.identifyNumber || hadWritedData.value.identifyNumber
     }
     if(ower1Form) {
-      insurancePolicyForm.value.name2 = ower1Form.name
-      insurancePolicyForm.value.mobile2 = ower1Form.mobile
-      insurancePolicyForm.value.identifyType2 = ower1Form.identifyType
-      insurancePolicyForm.value.identifyNumber2 = ower1Form.identifyNumber
-      insurancePolicyForm.value.identifyValidDate2 = ower1Form.identifyValidDate
-      insurancePolicyForm.value.identifyValidEndDate2 = ower1Form.identifyValidEndDate
-      insurancePolicyForm.value.addr2 = ower1Form.addr
-      insurancePolicyForm.value.telephone2 = ower1Form.telephone
-      insurancePolicyForm.value.person2 = ower1Form.person
-      insurancePolicyForm.value.age2 = ower1Form.age
-      insurancePolicyForm.value.address2 = ower1Form.address
-      insurancePolicyForm.value.registeredCapital2 = ower1Form.registeredCapital
-      insurancePolicyForm.value.email2 = ower1Form.email
+      insurancePolicyForm.value.name2 = ower1Form.name || hadWritedData.value.name2
+      insurancePolicyForm.value.mobile2 = ower1Form.mobile || hadWritedData.value.mobile2
+      insurancePolicyForm.value.identifyType2 = ower1Form.identifyType || hadWritedData.value.identifyType2
+      insurancePolicyForm.value.identifyNumber2 = ower1Form.identifyNumber || hadWritedData.value.identifyNumber2
+      insurancePolicyForm.value.identifyValidDate2 = ower1Form.identifyValidDate || hadWritedData.value.identifyValidDate2
+      insurancePolicyForm.value.identifyValidEndDate2 = ower1Form.identifyValidEndDate || hadWritedData.value.identifyValidEndDate2
+      insurancePolicyForm.value.addr2 = ower1Form.addr || hadWritedData.value.addr2
+      insurancePolicyForm.value.telephone2 = ower1Form.telephone || hadWritedData.value.telephone2
+      insurancePolicyForm.value.person2 = ower1Form.person || hadWritedData.value.person2
+      insurancePolicyForm.value.age2 = ower1Form.age || hadWritedData.value.age2
+      insurancePolicyForm.value.address2 = ower1Form.address || hadWritedData.value.address2
+      insurancePolicyForm.value.registeredCapital2 = ower1Form.registeredCapital || hadWritedData.value.registeredCapital2
+      insurancePolicyForm.value.email2 = ower1Form.email || hadWritedData.value.email2
     }
     if(ower2Form) {
-      insurancePolicyForm.value.name3 = ower2Form.name
-      insurancePolicyForm.value.mobile3 = ower2Form.mobile
-      insurancePolicyForm.value.identifyType3 = ower2Form.identifyType
-      insurancePolicyForm.value.identifyNumber3 = ower2Form.identifyNumber
-      insurancePolicyForm.value.identifyValidDate3 = ower2Form.identifyValidDate
-      insurancePolicyForm.value.identifyValidEndDate3 = ower2Form.identifyValidEndDate
-      insurancePolicyForm.value.addr3 = ower2Form.addr
-      insurancePolicyForm.value.telephone3 = ower2Form.telephone
-      insurancePolicyForm.value.person3 = ower2Form.person
-      insurancePolicyForm.value.age3 = ower2Form.age
-      insurancePolicyForm.value.address3 = ower2Form.address
-      insurancePolicyForm.value.registeredCapital3 = ower2Form.registeredCapital
-      insurancePolicyForm.value.email3 = ower2Form.email
+      insurancePolicyForm.value.name3 = ower2Form.name || hadWritedData.value.name3
+      insurancePolicyForm.value.mobile3 = ower2Form.mobile || hadWritedData.value.mobile3
+      insurancePolicyForm.value.identifyType3 = ower2Form.identifyType || hadWritedData.value.identifyType3
+      insurancePolicyForm.value.identifyNumber3 = ower2Form.identifyNumber || hadWritedData.value.identifyNumber3
+      insurancePolicyForm.value.identifyValidDate3 = ower2Form.identifyValidDate || hadWritedData.value.identifyValidDate3
+      insurancePolicyForm.value.identifyValidEndDate3 = ower2Form.identifyValidEndDate || hadWritedData.value.identifyValidEndDate3
+      insurancePolicyForm.value.addr3 = ower2Form.addr || hadWritedData.value.addr3
+      insurancePolicyForm.value.telephone3 = ower2Form.telephone || hadWritedData.value.telephone3
+      insurancePolicyForm.value.person3 = ower2Form.person || hadWritedData.value.person3
+      insurancePolicyForm.value.age3 = ower2Form.age || hadWritedData.value.age3
+      insurancePolicyForm.value.address3 = ower2Form.address || hadWritedData.value.address3
+      insurancePolicyForm.value.registeredCapital3 = ower2Form.registeredCapital || hadWritedData.value.registeredCapital3
+      insurancePolicyForm.value.email3 = ower2Form.email || hadWritedData.value.email3
     }
     if(imageVoList&&imageVoList.length>0) {
       insurancePolicyForm.value.imageVoList = imageVoList.filter(a => a.imageBase64List[0].imageId)
@@ -2793,8 +2793,12 @@ const handleImageClose = (data) => {
     }
   }
 }
+
+// 记录已填好的信息，防止再次进行证件识别
+let hadWritedData = ref({})
 const handleRecognition = () => {
   imageShow.value = true
+    hadWritedData.value = JSON.parse(JSON.stringify(insurancePolicyForm.value))
 }
 
 // 提交
@@ -2884,7 +2888,8 @@ const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined, scope
         systemType: '2',
         order: {
           insuranceCompanyCode: insurancePolicyForm.value.order.insuranceCompanyCode,
-          quoteNo: insurancePolicyForm.value.order.quoteNo
+          quoteNo: insurancePolicyForm.value.order.quoteNo,
+          agreementId: quoteData.value[scope.$index].agreement
         },
         productId: insurancePolicyForm.value.productId,
         carInfoVo: {

src/views/marketingManagement/lottery.vue

@@ -36,7 +36,7 @@
           {{ scope.row.actMethod == '1'?'九宫格':scope.row.actMethod == '2'?'大转盘':'' }}
         </template>
       </el-table-column>
-      <el-table-column prop="actDept" label="所属机构" width="300"></el-table-column>
+      <el-table-column prop="actDeptName" label="所属机构" width="300"></el-table-column>
       <el-table-column prop="depts" label="参与范围" width="300"></el-table-column>
       <el-table-column prop="userCount" label="参与用户" width="150">
         <template #default="scope">

src/views/personnel/modules/addOperation.vue

@@ -622,8 +622,8 @@ onMounted(async () => {
             let qualification = formData.fileList.find(item => item.fileType == 'bankCard')
             let contractImg = formData.fileList.find(item => item.fileType == 'contract')
             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) {
               operationForm.value.sfz1 = sfz1.id
               IDCardFrontName.value = sfz1.fileName
@@ -644,18 +644,18 @@ onMounted(async () => {
               bankCard.value = qualification.id
             }
             if (contractImg) {
-              operationForm.value.contract = contract.id
+              operationForm.value.contract = contractImg.id
               contractName.value = contractImg.fileName
               contract.value = contractImg.fileUrl
-              contractId.value = ontract.id
+              contractId.value = contractImg.id
 
 
             }
             if (applicantImg) {
-              operationForm.value.applicant = applicant.id
+              operationForm.value.applicant = applicantImg.id
               applicantName.value = applicantImg.fileName
               applicant.value = applicantImg.fileUrl
-              applicantId.value = applicant.id
+              applicantId.value = applicantImg.id
 
             }
             if (salaryTable) {
@@ -1178,10 +1178,10 @@ const onSubmit = async (OperationFormRef: FormInstance, type: number) => {
           city: operationForm.value.address?.length ? operationForm.value.address[1] : '',
           district: operationForm.value.address?.length ? operationForm.value.address[2] : '',
           deptId: operationForm.value.deptId,
-          typeAttr: operationForm.value.typeAttr,
+          typeAttr: operationForm.value.isAddSalesman=='1'?operationForm.value.typeAttr:2,
           sfz1: sfz1.value,
           sfz2: sfz2.value,
-          // bankCard:bankCard.value,
+          bankCard:bankCard.value,
           contract: contractId.value,
           applicant: applicantId.value,
           salaryTable: salaryTable.value,
@@ -1201,7 +1201,7 @@ const onSubmit = async (OperationFormRef: FormInstance, type: number) => {
           city: operationForm.value.address?.length ? operationForm.value.address[1] : '',
           district: operationForm.value.address?.length ? operationForm.value.address[2] : '',
           deptId: operationForm.value.deptId,
-          typeAttr: 2,
+          typeAttr: operationForm.value.isAddSalesman=='1'?operationForm.value.typeAttr:2,
           sfz1: sfz1.value,
           sfz2: sfz2.value,
           bankCard: bankCard.value,

src/views/personnel/modules/memberMessage.vue

@@ -761,7 +761,6 @@ onMounted(async () => {
       id: route.query.id || "",
     })
     .then((res: any) => {
-      console.log(res);
       if (res.code === 200) {
         operationForm.value = res.data;
         let formData = res.data
@@ -791,12 +790,12 @@ onMounted(async () => {
             bankSize.value = qualification.fileUrl
           }
           if(contractImg) {
-            operationForm.value.contract = contract.id
+            operationForm.value.contract = contractImg.id
             contractName.value = contractImg.fileName
             contract.value = contractImg.fileUrl
           }
           if(applicantImg) {
-            operationForm.value.applicant = applicant.id
+            operationForm.value.applicant = applicantImg.id
             applicantName.value = applicantImg.fileName
             applicant.value = applicantImg.fileUrl
           }

src/views/quoteConfig/insuranceCompanyAccount/modules/insuranceAccountAdd.vue

@@ -174,7 +174,7 @@ const getPtlInsAttribution = (id, apiType, formRef) => {
           fielsOption.value = res.data.fields
           res.data.fields.filter(item => item.field !== 'comName')?.forEach(item => {
             insuranceAccountRules.value[item.field] = [
-              { required: true, trigger: "blur", message: `请填写${item.label}` }
+              { required: item.isEdit, trigger: "blur", message: `请填写${item.label}` }
             ]
           })
           setTimeout(() => {

src/views/representative/member.vue

@@ -15,22 +15,37 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="归属机构">
-                  
-                  <el-cascader
-                    clearable
-                    style="width: 100%"
-                    v-model="info.deptId"
-                    :options="institutionList"
-                    :props="tableProps"
-                    
-                  />
-                </el-form-item>
+                  <el-form-item label="归属机构">
+                      <el-cascader
+                              clearable
+                              style="width: 100%"
+                              v-model="info.deptId"
+                              :options="institutionList"
+                              :props="tableProps"
+
+                      />
+                  </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                  <el-form-item label="状态">
+                      <el-select
+                        clearable
+                        style="width: 100%"
+                        v-model="info.status"
+                      >
+                          <el-option
+                                  v-for="item in statusList"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value"
+                          />
+                      </el-select>
+                  </el-form-item>
               </el-col>
 
               <el-col :span="4">
                 <el-form-item label="">
-                  <el-button type="primary">查询</el-button>
+                  <el-button type="primary" @click="salesmanAuth">查询</el-button>
                   <el-button type="primary" plain @click="reset"
                     >重置</el-button
                   >
@@ -120,14 +135,30 @@
                     v-model="info.deptId"
                     :options="institutionList"
                     :props="tableProps"
-                    
+
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                  <el-form-item label="状态">
+                      <el-select
+                              clearable
+                              style="width: 100%"
+                              v-model="info.status"
+                      >
+                          <el-option
+                                  v-for="item in statusList"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value"
+                          />
+                      </el-select>
+                  </el-form-item>
+              </el-col>
 
               <el-col :span="4">
                 <el-form-item label="">
-                  <el-button type="primary">查询</el-button>
+                  <el-button type="primary" @click="salesmanAuth">查询</el-button>
                   <el-button type="primary" plain @click="reset"
                     >重置</el-button
                   >
@@ -276,6 +307,11 @@ const columns = [
     prop: "username",
     label: "角色",
   },
+  { prop: "status", label: "状态",
+      formatter: (row: any) => {
+          return () => h("div", {}, row.status == '4' ? "入司审核" : row.status == '7'? "离职审核" : '');
+      }
+  },
   { prop: "createTime", label: "创建时间" },
   { prop: "createBy", label: "创建人" },
 ];
@@ -382,12 +418,12 @@ function confirm() {
 interface institutionData {
   typeAttr: string;
   deptId: string;
-  status: number;
+  status: string;
 }
 const info = ref<institutionData>({
   typeAttr: "2",
   deptId: "",
-  status: 4,
+  status: '0',
 });
 
 const router = useRouter();
@@ -459,6 +495,21 @@ const getAllMemberList = () => {
   // pageInfo.pageSize=item.pageSize
 };
 
+let statusList = ref([
+    {
+        value: '0',
+        label: '全部'
+    },
+    {
+        value: '4',
+        label: '入司审核'
+    },
+    {
+        value: '7',
+        label: '离职审核'
+    },
+])
+
 const reset = (item: any) => {
   // ElMessage({})
 };