Merge remote-tracking branch 'origin/master'

src/api/cw/reportManagement/ProjectReportService.js

@@ -9,6 +9,14 @@ export default {
       params: params
     })
   },
+exportAllSignatureFile: function (ids) {
+	return request({
+		url: prefix + '/cwProjectReport/exportAllSignatureFile',
+		method: 'get',
+		params: {ids: ids},
+		responseType: 'blob'
+	})
+},
   saveForm: function (inputForm) {
     return request({
       url: prefix + `/cwProjectReport/saveForm`,

src/api/human/depart/DepartRegistrationService.js

@@ -51,4 +51,11 @@ export default {
 			params: {}
 		})
 	},
+	selectContractStartDate () {
+		return request({
+			url: prefix + '/departRegistration/selectContractStartDate',
+			method: 'get',
+			params: {}
+		})
+	},
 }

src/utils/index.js

@@ -352,11 +352,29 @@ export function downloadWord (data, filename) {
 	window.URL.revokeObjectURL(href) // 释放掉blob对象
 }
 
+/**
+ * zip压缩文件下载
+ * @param data
+ * @param filename
+ */
+export function downloadZip (data, filename) {
+	var blob = new Blob([data], {type: 'application/zip,charset=utf-8'}) // application/vnd.openxmlformats-officedocument.spreadsheetml.sheet这里表示xlsx类型
+	var downloadElement = document.createElement('a')
+	var href = window.URL.createObjectURL(blob) // 创建下载的链接
+	downloadElement.href = href
+	downloadElement.download = filename // 下载后文件名
+	document.body.appendChild(downloadElement)
+	downloadElement.click() // 点击下载
+	document.body.removeChild(downloadElement) // 下载完成移除元素
+	window.URL.revokeObjectURL(href) // 释放掉blob对象
+}
+
 export default {
 	getTenantColorById,
 	getTenantNameById,
 	downloadExcel,
 	downloadWord,
+	downloadZip,
 	toLine,
 	escapeHTML,
 	hashCode,

src/views/calendar/MyCalendar.vue

@@ -11,8 +11,7 @@
 					<el-tag
 						@click.stop="handleEventClick(event)"
 						v-if="
-							moment(data.day).format('YYYY-MM-DD HH:mm:ss') ===
-							event.startDate
+							data.day === event.startDate.substring(0, 10)
 						"
 					>
 						{{ event.title }}
@@ -60,6 +59,7 @@ export default {
 		},
 		refreshList() {
 			myCalendarService.list().then((data) => {
+				console.log('data', data)
 				this.calendarEvents = data;
 			});
 		},

src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -157,7 +157,7 @@
                                 :rules="[
                                  {required: true, message:'报备类型不能为空', trigger:'blur'}
                   ]">
-                    <el-select v-model="inputForm.reportType" placeholder="请选择报备类型" clearable style="width: 100%;">
+                    <el-select v-model="inputForm.reportType" placeholder="请选择报备类型" clearable style="width: 100%;" @change="reportTypeChange">
                       <el-option
                         v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
                         :key="item.value"
@@ -167,6 +167,21 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="12" v-if="this.reportTypeFlag">
+                  <el-form-item label="项目分类" prop="projectClassification"
+                                :rules="[
+                                 {required: true, message:'项目分类不能为空', trigger:'blur'}
+                  ]">
+                    <el-select v-model="inputForm.projectClassification" placeholder="请选择项目分类类型" clearable style="width: 100%;">
+                      <el-option
+                        v-for="item in $dictUtils.getDictList('project_classification')"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="审计期间" prop="auditYear"
                                 :rules="[
@@ -471,6 +486,7 @@
           realHeader: '',
           clientContactsName: '',
           reportType: '',
+		  projectClassification: '',
           programRow: '',
           cwProjectClientContactDTOList: []
         },
@@ -480,6 +496,7 @@
         tableKeyClient: '1',
         tableKeyContact: '2',
         visible: false,
+	    reportTypeFlag: false,
         validContactRules: {
           name: [
             {required: true, message: '姓名不可以为空'}
@@ -600,6 +617,7 @@
           realHeader: '',
           clientContactsName: '',
           reportType: '',
+			projectClassification: '',
           cwProjectClientContactDTOList: []
         }
         this.inputForm.id = id
@@ -614,6 +632,15 @@
             if (this.commonJS.isEmpty(this.inputForm.workAttachmentDtoList)) {
               this.inputForm.workAttachmentDtoList = []
             }
+            if (this.commonJS.isEmpty(data.reportType)) {
+              this.reportTypeFlag = false
+            }else{
+            	if ('10' === data.reportType){
+					this.reportTypeFlag = true
+				}else {
+					this.reportTypeFlag = false
+				}
+			}
             if (this.commonJS.isEmpty(this.inputForm.cwProjectClientContactDTOList)) {
               this.inputForm.cwProjectClientContactDTOList = []
             }
@@ -640,6 +667,14 @@
           })
         })
       },
+		reportTypeChange(value){
+      		if(value && value === '10'){
+				this.reportTypeFlag = true;
+			}else{
+				this.reportTypeFlag = false;
+			}
+		}
+		,
       // 表单提交
       save () {
         this.$refs['inputForm'].validate((valid) => {

src/views/cw/projectRecords/ProjectRecordsForm.vue

@@ -170,6 +170,21 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+				  <el-col :span="12" v-if="this.reportTypeFlag">
+					  <el-form-item label="项目分类" prop="projectClassification"
+									:rules="[
+                                 {required: true, message:'项目分类不能为空', trigger:'blur'}
+                  ]">
+						  <el-select v-model="inputForm.projectClassification" placeholder="请选择项目分类类型" clearable style="width: 100%;">
+							  <el-option
+								  v-for="item in $dictUtils.getDictList('project_classification')"
+								  :key="item.value"
+								  :label="item.label"
+								  :value="item.value">
+							  </el-option>
+						  </el-select>
+					  </el-form-item>
+				  </el-col>
                 <el-col :span="12">
                   <el-form-item label="审计期间" prop="auditYear"
                                 :rules="[
@@ -589,6 +604,7 @@
           realHeader: '',
           clientContactsName: '',
           reportType: '',
+			projectClassification: '',
           cwProjectClientContactDTOList: [],
           cwProjectMembersDTOList: []
         },
@@ -599,6 +615,7 @@
         tableKeyClient: '1',
         tableKeyMembers: '3',
         visible: false,
+		  reportTypeFlag: false,
         invoiceList: [],
         invoiceForm: {
           no: ''
@@ -717,6 +734,8 @@
           businessTypeName: '',
           planDate: [],
           realHeader: '',
+			reportType: '',
+			projectClassification: '',
           clientContactsName: '',
           cwProjectClientContactDTOList: [],
           cwProjectMembersDTOList: []
@@ -733,6 +752,16 @@
             if (this.commonJS.isEmpty(this.inputForm.workAttachmentDtoList)) {
               this.inputForm.workAttachmentDtoList = []
             }
+        console.log(data)
+			  if (this.commonJS.isEmpty(data.reportType)) {
+				  this.reportTypeFlag = false
+			  }else{
+				  if ('10' === data.reportType){
+					  this.reportTypeFlag = true
+				  }else {
+					  this.reportTypeFlag = false
+				  }
+			  }
             if (this.commonJS.isEmpty(this.inputForm.createDate)) {
               this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             }

src/views/cw/reportManagement/ReportManagementForm.vue

@@ -1314,9 +1314,22 @@
 				  //根据签字注师1的人员id去查是否超过了100次
 				  userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 					  if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-						  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-						  this.loading = false
-						  throw new Error()
+						  if(data.name === '王真' && data.accountantUserCount <= 120){
+
+							  this.reportReviewService.save(this.inputForm).then(() => {
+								  projectReportService.saveForm(this.inputForm).then(() => {
+									  this.$emit('refreshList')
+									  this.close()
+									  this.loading = false
+								  }).catch(() => {
+									  this.loading = false
+								  })
+							  })
+						  }else{
+							  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+							  this.loading = false
+							  throw new Error()
+						  }
 					  } else {
 						  this.reportReviewService.save(this.inputForm).then(() => {
 							  projectReportService.saveForm(this.inputForm).then(() => {

src/views/cw/reportManagement/ReportManagementList.vue

@@ -117,7 +117,7 @@
       <vxe-toolbar :refresh="{query: refreshList}" ref="toolbarRef" export custom>
         <template #buttons>
           <el-button v-if="hasPermission('cw_work_client:info:add')" type="primary" icon="el-icon-plus" @click="start()">新建</el-button>
-          <!--          <el-button v-if="hasPermission('klg:question:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.questionsTable && $refs.questionsTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
+		  <el-button type="warning" icon="el-icon-download" @click="exportAllSignatureFile()" :disabled="$refs.clientTable && $refs.clientTable.getCheckboxRecords().length === 0" plain>已盖章文件下载</el-button>
         </template>
 		  <template #tools>
 			  <vxe-button
@@ -156,6 +156,7 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
+			<vxe-column type="checkbox" width="60" ></vxe-column>
           <vxe-column width="100" align="center" title="单据编号" field="documentNo">
             <template #default="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectReport:list')" @click="view(scope.row.id)">{{scope.row.documentNo}}</el-link>
@@ -316,7 +317,15 @@
                           (scope.row.signatureType === '3' && scope.row.status3 === '4')
                           )
                           && scope.row.createById === $store.state.user.id && (this.commonJS.isEmpty(scope.row.newType) || scope.row.newType !== '1')" @click="adjustSign(scope.row)"   text type="primary" >驳回调整</el-button>
-				<!--			   	修改签字注师流程-->
+
+				  <!--			   	重新复核流程-->
+				  <el-button
+					  v-if="scope.row.reviewStatus === '5'&&(scope.row.status1 === '5' || scope.row.status3 === '5')&& (scope.row.signatureAnnotatorStatus ==='5' || scope.row.signatureAnnotatorStatus ==='0' ) && scope.row.createById === $store.state.user.id && scope.row.repetitionReviewFlag"
+					  text type="primary"
+					  @click="repetitionPushF(scope.row)"
+				  >重新复核</el-button>
+
+				  <!--			   	修改签字注师流程-->
 			    <el-button
 					v-if="scope.row.reviewStatus === '5'&&(scope.row.status1 === '5' || scope.row.status3 === '5')&& (scope.row.signatureAnnotatorStatus ==='5' || scope.row.signatureAnnotatorStatus ==='0' ) && scope.row.createById === $store.state.user.id"
 					text type="primary"
@@ -708,7 +717,8 @@
 							title: '复核及签章' + '流程详情',
 							formTitle: '复核及签章' + '流程详情',
 							businessId: row.id,
-							status: 'reback'
+							status: 'reback',
+							detail: 'view'
 						}
 					})
 				})
@@ -830,6 +840,91 @@
 			  })
 		  }
       },
+		repetitionPushF (row) {
+			this.$confirm(`是否确定对该报告重新复核?确定后原已盖章文件将被删除，已归档数据将被清除！`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				projectReportService.rebackReviewSign(row.id).then(() => {
+					// 读取流程表单
+					let title = ' '
+					if (!row.documentNo) {
+						title = ' ' + row.projectName
+					} else {
+						title = ' ' + row.documentNo + ' - ' + row.projectName
+					}
+					console.log('row', row)
+
+					if (this.commonJS.isEmpty(row.newType) || row.newType !== '1'){
+
+						let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了` + title + '[会计-报告复核]'
+						let status = 'startAndClose'
+						if (row.reviewStatus === '3') {
+							status = 'startAndClose'
+						} else if (row.reviewStatus === '4') {
+							status = 'reapplyFlag'
+						}
+
+						taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
+							businessId: row.id,
+							businessTable: 'cw_project_report_review'}).then((data) => {
+							this.$router.push({
+								path: '/flowable/task/TaskForm',
+								query: {
+									...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+									procDefId: this.processDefinitionAuditId,
+									procDefKey: this.procDefAuditKey,
+									title: title,
+									formType: data.formType,
+									formUrl: data.formUrl,
+									formTitle: processTitle,
+									businessTable: 'cw_project_report_review',
+									businessId: row.id,
+									isShow: 'false',
+									status: status,
+									routePath: '/cw/reportManagement/ReportManagementList'
+								}
+							})
+						})
+					} else if ( row.newType === '1') {
+						let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了` + title + '[会计-复核及签章]'
+						let status = 'startAndClose'
+						if (row.reviewStatus === '3') {
+							status = 'startAndClose'
+						} else if (row.reviewStatus === '4') {
+							status = 'reapplyFlag'
+						}
+
+						taskService.getTaskDef({ procDefId: this.processDefinitionAuditIdAndSId,
+							businessId: row.id,
+							businessTable: 'cw_project_report_review'}).then((data) => {
+							this.$router.push({
+								path: '/flowable/task/TaskForm',
+								query: {
+									...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+									procDefId: this.processDefinitionAuditIdAndSId,
+									procDefKey: this.procDefAuditKeyAndSId,
+									title: title,
+									formType: data.formType,
+									formUrl: data.formUrl,
+									formTitle: processTitle,
+									businessTable: 'cw_project_report_review',
+									businessId: row.id,
+									isShow: 'false',
+									status: status,
+									routePath: '/cw/reportManagement/ReportManagementList'
+								}
+							})
+						})
+					}
+				}).catch(() => {
+					this.refreshList()
+					this.$message.error('签章已撤回')
+				})
+			})
+
+      },
       pushTakeNumber (row) {
         // 读取流程表单
 		let title = ' '
@@ -1710,7 +1805,31 @@
 					}
 				})
 			})
-		}
+		},
+		// 删除
+		exportAllSignatureFile (id) {
+			let ids = id || this.$refs.clientTable.getCheckboxRecords().map(item => {
+				return item.id
+			}).join(',')
+			this.$confirm(`确定下载所选项的已盖章文件吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				this.loading = true
+				projectReportService.exportAllSignatureFile(ids).then((res) => {
+					// 将二进制流文件写入excel表，以下为重要步骤
+					this.$utils.downloadZip(res, '已签章文件')
+					this.loading = false
+				}).catch(function (err) {
+					this.loading = false
+					if (err.response) {
+						console.log(err.response)
+					}
+				})
+			})
+		},
+
     }
   }
 </script>

src/views/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -1011,9 +1011,31 @@
 				  //根据签字注师1的人员id去查是否超过了100次
 				  userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 					  if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-						  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-						  this.loading = false
-						  throw new Error()
+						  if(data.name === '王真' && data.accountantUserCount <= 120){
+							  this.reportReviewService.save(this.inputForm).then(() => {
+								  let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}
+								  projectReportService.saveSignFiles(da).then(() => {
+									  projectReportService.saveData(this.inputForm).then((data) => {
+										  if (this.inputForm.signatureType === '2') {
+											  this.inputForm.assignee = this.inputForm.signatureAnnotator1
+										  }
+										  callback(data.businessTable, data.businessId, this.inputForm)
+										  this.loading = false
+										  throw new Error()
+									  }).catch(() => {
+										  this.loading = false
+										  throw new Error('流程发起失败')
+									  })
+								  }).catch(() => {
+									  this.loading = false
+									  throw new Error('流程发起失败')
+								  })
+							  })
+						  }else{
+							  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+							  this.loading = false
+							  throw new Error()
+						  }
 					  } else {
 						  this.reportReviewService.save(this.inputForm).then(() => {
 							  let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}

src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue

@@ -841,9 +841,24 @@
 					//根据签字注师1的人员id去查是否超过了100次
 					userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 						if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-							this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-							this.loading = false
-							throw new Error()
+							if(data.name === '王真' && data.accountantUserCount <= 120){
+
+								this.ReportNumberApplyService.save(this.inputForm).then((data) => {
+									this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
+									projectReportService.saveForm2(this.inputForm).then((da) => {
+										callback(data.businessTable, data.businessId, this.inputForm)
+										this.loading = false
+									}).catch(() => {
+										this.loading = false
+									})
+								}).catch(() => {
+									this.loading = false
+								})
+							}else{
+								this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+								this.loading = false
+								throw new Error()
+							}
 						} else {
 							this.ReportNumberApplyService.save(this.inputForm).then((data) => {
 								this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
@@ -901,9 +916,25 @@
 							//根据签字注师1的人员id去查是否超过了100次
 							userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 								if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-									this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-									this.loading = false
-									throw new Error()
+									if(data.name === '王真' && data.accountantUserCount <= 120){
+
+										this.ReportNumberApplyService.save(this.inputForm).then((data) => {
+											this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
+											console.log('this.inputForm', this.inputForm)
+											projectReportService.saveForm2(this.inputForm).then((da) => {
+												callback(data.businessTable, data.businessId, this.inputForm)
+												this.loading = false
+											}).catch(() => {
+												this.loading = false
+											})
+										}).catch(() => {
+											this.loading = false
+										})
+									}else{
+										this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+										this.loading = false
+										throw new Error()
+									}
 								} else {
 									this.ReportNumberApplyService.save(this.inputForm).then((data) => {
 										this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()

src/views/cw/reportManagement/ReportReviewTakeNumberReviewForm.vue

@@ -842,9 +842,24 @@
 					//根据签字注师1的人员id去查是否超过了100次
 					userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 						if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-							this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-							this.loading = false
-							throw new Error()
+							if(data.name === '王真' && data.accountantUserCount <= 120){
+
+								this.ReportNumberApplyService.reviewSave(this.inputForm).then((data) => {
+									this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
+									projectReportService.saveForm2(this.inputForm).then((da) => {
+										callback(data.businessTable, data.businessId, this.inputForm)
+										this.loading = false
+									}).catch(() => {
+										this.loading = false
+									})
+								}).catch(() => {
+									this.loading = false
+								})
+							}else{
+								this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+								this.loading = false
+								throw new Error()
+							}
 						} else {
 							this.ReportNumberApplyService.reviewSave(this.inputForm).then((data) => {
 								this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
@@ -902,9 +917,25 @@
 							//根据签字注师1的人员id去查是否超过了100次
 							userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 								if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-									this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-									this.loading = false
-									throw new Error()
+									if(data.name === '王真' && data.accountantUserCount <= 120){
+
+										this.ReportNumberApplyService.reviewSave(this.inputForm).then((data) => {
+											this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
+											console.log('this.inputForm', this.inputForm)
+											projectReportService.saveForm2(this.inputForm).then((da) => {
+												callback(data.businessTable, data.businessId, this.inputForm)
+												this.loading = false
+											}).catch(() => {
+												this.loading = false
+											})
+										}).catch(() => {
+											this.loading = false
+										})
+									}else{
+										this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+										this.loading = false
+										throw new Error()
+									}
 								} else {
 									this.ReportNumberApplyService.reviewSave(this.inputForm).then((data) => {
 										this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()

src/views/cw/reportManagement/ReportSignatureForm.vue

@@ -1100,9 +1100,24 @@
 					//根据签字注师1的人员id去查是否超过了100次
 					userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 						if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-							this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-							this.loading = false
-							throw new Error()
+							if(data.name === '王真' && data.accountantUserCount <= 120){
+
+								this.reportReviewService.save(this.inputForm).then((data) => {
+									this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
+									projectReportService.saveForm(this.inputForm).then((da) => {
+										callback(data.businessTable, data.businessId, this.inputForm)
+										this.loading = false
+									}).catch(() => {
+										this.loading = false
+									})
+								}).catch(() => {
+									this.loading = false
+								})
+							}else{
+								this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+								this.loading = false
+								throw new Error()
+							}
 						} else {
 							this.reportReviewService.save(this.inputForm).then((data) => {
 								this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
@@ -1149,9 +1164,20 @@
 						//根据签字注师1的人员id去查是否超过了100次
 						userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 							if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-								this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-								this.loading = false
-								throw new Error()
+								if(data.name === '王真' && data.accountantUserCount <= 120){
+
+									console.log('this.inputForm', this.inputForm)
+									projectReportService.saveSignatureAnnotator(this.inputForm).then((da) => {
+										callback(da.businessTable, da.businessId, this.inputForm)
+										this.loading = false
+									}).catch(() => {
+										this.loading = false
+									})
+								}else{
+									this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+									this.loading = false
+									throw new Error()
+								}
 							} else {
 									console.log('this.inputForm', this.inputForm)
 									projectReportService.saveSignatureAnnotator(this.inputForm).then((da) => {

src/views/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -1070,9 +1070,24 @@
 			//根据签字注师1的人员id去查是否超过了100次
 			userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 				if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-					this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-					this.loading = false
-					throw new Error()
+					if(data.name === '王真' && data.accountantUserCount <= 120){
+
+						this.reportReviewService.save(this.inputForm).then((data) => {
+							this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
+							projectReportService.saveForm(this.inputForm).then((da) => {
+								callback(data.businessTable, data.businessId, this.inputForm)
+								this.loading = false
+							}).catch(() => {
+								this.loading = false
+							})
+						}).catch(() => {
+							this.loading = false
+						})
+					}else{
+						this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+						this.loading = false
+						throw new Error()
+					}
 				} else {
 					this.reportReviewService.save(this.inputForm).then((data) => {
 						this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
@@ -1130,9 +1145,25 @@
 				  //根据签字注师1的人员id去查是否超过了100次
 				  userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 					  if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-						  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-						  this.loading = false
-						  throw new Error()
+						  if(data.name === '王真' && data.accountantUserCount <= 120){
+
+							  this.reportReviewService.save(this.inputForm).then((data) => {
+								  this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
+								  console.log('this.inputForm', this.inputForm)
+								  projectReportService.saveForm(this.inputForm).then((da) => {
+									  callback(data.businessTable, data.businessId, this.inputForm)
+									  this.loading = false
+								  }).catch(() => {
+									  this.loading = false
+								  })
+							  }).catch(() => {
+								  this.loading = false
+							  })
+						  }else{
+							  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+							  this.loading = false
+							  throw new Error()
+						  }
 					  } else {
 						  this.reportReviewService.save(this.inputForm).then((data) => {
 							  this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()

src/views/cw/reportManagement/reportReviewNew/ReportReviewFormNew.vue

@@ -830,6 +830,7 @@
           cwFileInfoList: [],
           servedUnitId: '',
           reviewStatus: '',
+		  repetitionReviewFlag: '',
           taskName: '',
           realHeaderName: '',
           projectMasterId1: '',
@@ -852,7 +853,8 @@
         tableKey: '',
         tableKeyClient: '1',
         tableKeyClient2: '1',
-        tableKeyClient3: '1'
+        tableKeyClient3: '1',
+		created: ''
       }
     },
     ReportCancellApplyService: null,
@@ -864,6 +866,7 @@
       this.reportCancellApplyService = new ReportCancellApplyService()
       this.reportReviewService = new ReportReviewService()
       this.commonApi = new CommonApi()
+		this.detail = this.$route.query.detail;
     },
     computed: {
       bus: {
@@ -913,8 +916,9 @@
       getKeyWatch (keyWatch) {
         this.keyWatch = keyWatch
       },
-      init (method, id) {
+      init (method, id,detail) {
         console.log('method', method)
+        console.log('detail', detail)
         this.activeName = 'enclosure'
         this.signatureName = 'archiveFile'
         this.reportCancellApplyService = new ReportCancellApplyService()
@@ -979,6 +983,7 @@
           cwFileInfoList2: [],
           servedUnitId: '',
           reviewStatus: '',
+		  repetitionReviewFlag: '',
           taskName: '',
           realHeaderName: '',
           projectMasterId1: '',
@@ -1059,7 +1064,6 @@
 
 						if (da === '三级复核及签章') {
 							if (this.commonJS.isNotEmpty(sFiles) && this.inputForm.signatureType !== '3' && this.status === 'audit') {
-								console.log('建立了')
 								// 签章按钮展示
 								this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwReportSignature', null, null, null, null, false, 'audit')
 								if (this.status === 'audit' && this.commonJS.isNotEmpty(sFiles) && this.inputForm.signatureType !== '3') {
@@ -1077,6 +1081,14 @@
 							if(this.inputForm.reviewStatus !== '2' && this.inputForm.reviewStatus !== '5'){
 								// 签章按钮隐藏
 								this.$refs.archiveFile.newUpload('add', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
+							}else if (this.inputForm.reviewStatus === '5' && this.inputForm.repetitionReviewFlag){
+								if(this.detail === 'view'){
+									// 签章按钮隐藏
+									this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
+								}else{
+									// 如果流程已经完成且流程完成后不超过1天，数据可调整，并重新复核
+									this.$refs.archiveFile.newUpload('add', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
+								}
 							}else{
 								// 签章按钮隐藏
 								this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
@@ -1143,9 +1155,13 @@
         if (this.commonJS.isNotEmpty(this.inputForm.id)) {
           projectReportService.queryById(this.inputForm.id).then((data) => {
             if (this.commonJS.isNotEmpty(data.reviewStatus) && data.reviewStatus !== '0' && data.reviewStatus !== '1' && data.reviewStatus !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
-              this.loading = false
-              this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
-              throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+              if(data.reviewStatus === '5' && data.repetitionReviewFlag){
+				  this.doSubmit('start', callback)
+			  }else{
+				  this.loading = false
+				  this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+				  throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+			  }
             } else {
               this.doSubmit('start', callback)
             }
@@ -1195,9 +1211,24 @@
 			//根据签字注师1的人员id去查是否超过了100次
 			userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 				if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-					this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-					this.loading = false
-					throw new Error()
+					if(data.name === '王真' && data.accountantUserCount <= 120){
+
+						this.reportReviewService.save(this.inputForm).then((data) => {
+							this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
+							projectReportService.saveForm(this.inputForm).then((da) => {
+								callback(data.businessTable, data.businessId, this.inputForm)
+								this.loading = false
+							}).catch(() => {
+								this.loading = false
+							})
+						}).catch(() => {
+							this.loading = false
+						})
+					}else{
+						this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+						this.loading = false
+						throw new Error()
+					}
 				} else {
 					this.reportReviewService.save(this.inputForm).then((data) => {
 						this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
@@ -1292,9 +1323,25 @@
 					  //根据签字注师1的人员id去查是否超过了100次
 					  userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
 						  if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-							  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-							  this.loading = false
-							  throw new Error()
+							  if(data.name === '王真' && data.accountantUserCount <= 120){
+
+								  this.reportReviewService.save(this.inputForm).then((data) => {
+									  this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
+									  console.log('this.inputForm', this.inputForm)
+									  projectReportService.saveForm(this.inputForm).then((da) => {
+										  callback(data.businessTable, data.businessId, this.inputForm)
+										  this.loading = false
+									  }).catch(() => {
+										  this.loading = false
+									  })
+								  }).catch(() => {
+									  this.loading = false
+								  })
+							  }else{
+								  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+								  this.loading = false
+								  throw new Error()
+							  }
 						  } else {
 							  this.reportReviewService.save(this.inputForm).then((data) => {
 								  this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
@@ -1432,6 +1479,7 @@
           industry: '',
           businessObjects: ''
         }
+        this.detail = ''
         this.reviewBys = []
         // this.$refs.uploadComponent.clearUpload()
         // this.$refs.inputForm.resetFields()

src/views/cw/workClientInfo/clientUserSelect/AccountantUserSelectDialog.vue

@@ -449,9 +449,14 @@
           this.$message.error(`你最多只能选择${this.limit}个用户`)
           return
         }
+        console.log(this.dataListAllSelections[0])
         if (this.dataListAllSelections[0].accountantUserCount >= 100 && this.dataListAllSelections[0].accountantUserFlag === 1) {
-          this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-          return
+        	if(this.dataListAllSelections[0].name === '王真' && this.dataListAllSelections[0].accountantUserCount <= 120){
+
+			}else{
+				this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+				return
+			}
         }
         this.visible = false
         this.$emit('doSubmit', this.dataListAllSelections)

src/views/cw/workClientInfo/clientUserSelect/AccountantUserSelectDialog2.vue

@@ -450,8 +450,12 @@ export default {
         return
       }
       if (this.dataListAllSelections[0].accountantUserCount >= 100 && this.dataListAllSelections[0].accountantUserFlag === 1) {
-        this.$message.error(`请选择被选次数小于100次的签字注师人员`)
-        return
+		  if(this.dataListAllSelections[0].name === '王真' && this.dataListAllSelections[0].accountantUserCount <= 120){
+
+		  }else{
+			  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+			  return
+		  }
       }
       this.visible = false
       this.$emit('doSubmit', this.dataListAllSelections)

src/views/cw/workContract/ContractFilePaperForm.vue

@@ -132,7 +132,7 @@
             <el-date-picker
               :disabled="true"
               placement="bottom-start"
-              value-format="yyyy-MM-dd"
+              value-format="YYYY-MM-DD"
               v-model="inputForm.signingDate"
               style="width: 100%"
               placeholder="选择日期">
@@ -614,6 +614,7 @@
           // 查询合同登记数据
           // console.log('this.inputForm.id', this.inputForm.id)
           contractInfoService.findById(this.inputForm.id).then((data) => {
+          	console.log(data)
             this.inputForm = this.recover(this.inputForm, data)
             const f = []
             if (data.fees !== null && data.fees !== undefined && data.fees !== '') {

src/views/cw/workContract/ContractNameForm.vue

@@ -136,7 +136,7 @@
                      ]">
                   <el-date-picker
                     placement="bottom-start"
-                    value-format="yyyy-MM-dd"
+                    value-format="YYYY-MM-DD"
                     v-model="inputForm.signingDate"
                     style="width: 100%"
                     placeholder="选择日期">

src/views/cw/workContract/ContractRegistration.vue

@@ -188,8 +188,8 @@
           <vxe-column title="操作" min-width="200px" fixed="right" align="center">
             <template  #default="scope">
               <div v-if="isAdmin">
-                <el-button v-if="scope.row.filedPaperType === '5'" text type="primary" size="small" @click="edit(scope.row)">修改</el-button>
-                <el-button v-if="scope.row.filedPaperType === '5'" text type="primary" size="small" @click="del(scope.row.id)">删除</el-button>
+                <el-button v-if="scope.row.status === '5'" text type="primary" size="small" @click="edit(scope.row)">修改</el-button>
+                <el-button v-if="scope.row.status === '5'" text type="primary" size="small" @click="del(scope.row.id)">删除</el-button>
               </div>
               <div v-else>
 <!--              <el-button v-if="hasPermission('cw:workContract:view')" text type="primary" size="small" @click="view(scope.row.id)">查看</el-button>-->

src/views/flowable/task/TaskForm.vue

@@ -395,6 +395,7 @@ export default {
 		},
 		init() {
 			this.cs = this.$route.query.cs;
+			this.detail = this.$route.query.detail;
 			this.taskSelectedTab = "form-first";
 			this.procDefId = this.$route.query.procDefId;
 			this.procDefKey = this.$route.query.procDefKey;
@@ -1506,6 +1507,7 @@ export default {
 			taskFormData: [],
 			taskDefKey: "",
 			status: "",
+			detail: "",
 			title: "",
 			businessId: "",
 			buttons: [],

src/views/human/depart/registration/DepartRegistrationAddForm.vue

@@ -236,6 +236,14 @@
 						if (this.commonJS.isEmpty(this.inputForm.department)){
 							this.inputForm.department = this.$store.state.user.office.id
 						}
+
+						if (this.commonJS.isEmpty(this.inputForm.arrivalDate)) {
+							//去后台查询他入职登记时的入职日期
+							departRegistrationService.selectContractStartDate().then((data) => {
+								this.inputForm.arrivalDate = data
+							})
+						}
+
 						this.loading = false
 					})
 				})

src/views/human/enrollment/registration/EnrollmentRegistrationEditForm.vue

@@ -285,7 +285,7 @@
 								</el-row>
 							</el-form>
 							<el-form v-else-if="inputForm.type !== '0'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
-
+									:disabled="true"
 									 label-width="110px" @submit.native.prevent>
 								<el-row :gutter="26">
 									<el-col :span="12">
@@ -570,6 +570,221 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
+						<el-divider content-position="left"><i class="el-icon-document"></i> 中信银行卡信息</el-divider>
+						<el-row :gutter="26">
+							<el-col :span="12">
+								<el-form-item label="中信银行卡号" prop="zxBankCardNumber" :rules="[{required: true, message: '中信银行卡号不能为空', trigger: 'blur'}]">
+									<el-input v-model="inputForm.zxBankCardNumber" @change="checkBankNumber(inputForm.zxBankCardNumber,'zx')" maxlength="19"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="开户行" prop="zxAccountHolder" :rules="[{required: true, message: '开户行不能为空', trigger: 'blur'}]">
+									<el-input v-model="inputForm.zxAccountHolder" ></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="银行卡正面" prop="accountHolderFront" :rules="[
+						{required: true, message: '银行卡正面不能为空', trigger: 'blur'}
+					]">
+									<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
+											   :limit="limitNum"
+											   :disabled="bankHideUploadEdit"
+											   list-type="picture-card"
+											   :auto-upload="true"
+											   :on-success="bankHandleUploadSuccess"
+											   v-model:file-list="bankFileList"
+									>
+										<el-icon><Plus /></el-icon>
+
+										<template #file="{ file }">
+											<div>
+												<img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
+												<span class="el-upload-list__item-actions">
+										  <span
+											  class="el-upload-list__item-preview"
+											  @click="bankHandlePictureCardPreview(file)"
+										  >
+											<el-icon><zoom-in /></el-icon>
+										  </span>
+										  <span
+											  v-if="!disabled"
+											  class="el-upload-list__item-delete"
+											  @click="bankHandleDownload(file)"
+										  >
+											<el-icon><Download /></el-icon>
+										  </span>
+										  <span
+											  v-if="!(method === 'view')"
+											  class="el-upload-list__item-delete"
+											  @click="bankHandleRemove(file,fileList)"
+										  >
+											<el-icon><Delete /></el-icon>
+										  </span>
+									</span>
+											</div>
+										</template>
+									</el-upload>
+									<el-dialog v-model="bankDialogVisible">
+										<img w-full :src="inputForm.accountHolderFrontUrl" alt="Preview Image" :style="{ maxWidth: '100%', maxHeight: '100%' }"/>
+									</el-dialog>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="银行卡反面" prop="accountHolderOpposite" :rules="[
+						{required: true, message: '银行卡反面不能为空', trigger: 'blur'}
+					]">
+									<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
+											   :limit="limitNum"
+											   :disabled="bankHideUploadEdit2"
+											   list-type="picture-card"
+											   :auto-upload="true"
+											   :on-success="bankHandleUploadSuccess2"
+											   v-model:file-list="bankFileList2"
+									>
+										<el-icon><Plus /></el-icon>
+
+										<template #file="{ file }">
+											<div>
+												<img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
+												<span class="el-upload-list__item-actions">
+										  <span
+											  class="el-upload-list__item-preview"
+											  @click="bankHandlePictureCardPreview2(file)"
+										  >
+											<el-icon><zoom-in /></el-icon>
+										  </span>
+										  <span
+											  v-if="!disabled"
+											  class="el-upload-list__item-delete"
+											  @click="bankHandleDownload2(file)"
+										  >
+											<el-icon><Download /></el-icon>
+										  </span>
+										  <span
+											  v-if="!(method === 'view')"
+											  class="el-upload-list__item-delete"
+											  @click="bankHandleRemove2(file,fileList)"
+										  >
+											<el-icon><Delete /></el-icon>
+										  </span>
+									</span>
+											</div>
+										</template>
+									</el-upload>
+									<el-dialog v-model="bankDialogVisible2">
+										<img w-full :src="inputForm.accountHolderOppositeUrl" alt="Preview Image" :style="{ maxWidth: '100%', maxHeight: '100%' }"/>
+									</el-dialog>
+								</el-form-item>
+							</el-col>
+						</el-row>
+						<el-divider content-position="left"><i class="el-icon-document"></i> 工商银行卡信息</el-divider>
+						<el-row :gutter="26">
+							<el-col :span="12">
+								<el-form-item label="工商银行卡号" prop="gsBankCardNumber" :rules="[{required: true, message: '工商银行卡号不能为空', trigger: 'blur'}]">
+									<el-input v-model="inputForm.gsBankCardNumber" @change="checkBankNumber(inputForm.gsBankCardNumber,'gs')" maxlength="19"></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="开户行" prop="gsAccountHolder" :rules="[{required: true, message: '开户行不能为空', trigger: 'blur'}]">
+									<el-input v-model="inputForm.gsAccountHolder" ></el-input>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="银行卡正面" prop="gsAccountHolderFront" :rules="[
+						{required: true, message: '银行卡正面不能为空', trigger: 'blur'}
+					]">
+									<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
+											   :limit="limitNum"
+											   :disabled="gsHideUploadEdit"
+											   list-type="picture-card"
+											   :auto-upload="true"
+											   :on-success="gsHandleUploadSuccess"
+											   v-model:file-list="gsFileList"
+									>
+										<el-icon><Plus /></el-icon>
+
+										<template #file="{ file }">
+											<div>
+												<img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
+												<span class="el-upload-list__item-actions">
+										  <span
+											  class="el-upload-list__item-preview"
+											  @click="gsHandlePictureCardPreview(file)"
+										  >
+											<el-icon><zoom-in /></el-icon>
+										  </span>
+										  <span
+											  v-if="!disabled"
+											  class="el-upload-list__item-delete"
+											  @click="gsHandleDownload(file)"
+										  >
+											<el-icon><Download /></el-icon>
+										  </span>
+										  <span
+											  v-if="!(method === 'view')"
+											  class="el-upload-list__item-delete"
+											  @click="gsHandleRemove(file,fileList)"
+										  >
+											<el-icon><Delete /></el-icon>
+										  </span>
+									</span>
+											</div>
+										</template>
+									</el-upload>
+									<el-dialog v-model="gsDialogVisible">
+										<img w-full :src="inputForm.gsAccountHolderFrontUrl" alt="Preview Image" :style="{ maxWidth: '100%', maxHeight: '100%' }"/>
+									</el-dialog>
+								</el-form-item>
+							</el-col>
+							<el-col :span="12">
+								<el-form-item label="银行卡反面" prop="gsAccountHolderOpposite" :rules="[
+						{required: true, message: '银行卡反面不能为空', trigger: 'blur'}
+					]">
+									<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
+											   :limit="limitNum"
+											   :disabled="gsHideUploadEdit2"
+											   list-type="picture-card"
+											   :auto-upload="true"
+											   :on-success="gsHandleUploadSuccess2"
+											   v-model:file-list="gsFileList2"
+									>
+										<el-icon><Plus /></el-icon>
+
+										<template #file="{ file }">
+											<div>
+												<img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
+												<span class="el-upload-list__item-actions">
+										  <span
+											  class="el-upload-list__item-preview"
+											  @click="gsHandlePictureCardPreview2(file)"
+										  >
+											<el-icon><zoom-in /></el-icon>
+										  </span>
+										  <span
+											  v-if="!disabled"
+											  class="el-upload-list__item-delete"
+											  @click="gsHandleDownload2(file)"
+										  >
+											<el-icon><Download /></el-icon>
+										  </span>
+										  <span
+											  v-if="!(method === 'view')"
+											  class="el-upload-list__item-delete"
+											  @click="gsHandleRemove2(file,fileList)"
+										  >
+											<el-icon><Delete /></el-icon>
+										  </span>
+									</span>
+											</div>
+										</template>
+									</el-upload>
+									<el-dialog v-model="gsDialogVisible2">
+										<img w-full :src="inputForm.gsAccountHolderOppositeUrl" alt="Preview Image" :style="{ maxWidth: '100%', maxHeight: '100%' }"/>
+									</el-dialog>
+								</el-form-item>
+							</el-col>
+						</el-row>
+
 					</el-form>				</el-row>
 			</el-row>
 			<template #footer>
@@ -608,6 +823,19 @@
 		},
 		data () {
 			return {
+				bankHideUploadEdit: false, //控制上传点击
+				bankHideUploadEdit2: false, //控制上传点击
+				bankFileList: [],
+				bankFileList2: [],
+				bankDialogVisible: false,
+				bankDialogVisible2: false,
+				gsDialogVisible: false,
+				gsDialogVisible2: false,
+				gsHideUploadEdit: false, //控制上传点击
+				gsHideUploadEdit2: false, //控制上传点击
+				gsFileList: [],
+				gsFileList2: [],
+
 				hideUploadEdit: false, //隐藏上传按钮
 				hideUploadEdit2: false, //隐藏上传按钮
 				limitNum: 1,
@@ -623,6 +851,19 @@
 				loading: false,
 				showViewer: false,
 				inputForm: {
+					zxBankCardNumber: '',//银行卡信息
+					zxAccountHolder: '',
+					accountHolderFront: '',
+					accountHolderFrontUrl: '',
+					accountHolderOpposite: '',
+					accountHolderOppositeUrl: '',
+					gsAccountHolder: '',
+					gsBankCardNumber: '',
+					gsAccountHolderFront: '',
+					gsAccountHolderFrontUrl: '',
+					gsAccountHolderOpposite: '',
+					gsAccountHolderOppositeUrl: '',
+
 					id: '',
 					userId: '',
 					name: '',
@@ -763,6 +1004,18 @@
 			init (method, id) {
 				this.method = method
 				this.inputForm = {
+					zxBankCardNumber: '',//银行卡信息
+					zxAccountHolder: '',
+					accountHolderFront: '',
+					accountHolderFrontUrl: '',
+					accountHolderOpposite: '',
+					accountHolderOppositeUrl: '',
+					gsAccountHolder: '',
+					gsBankCardNumber: '',
+					gsAccountHolderFront: '',
+					gsAccountHolderFrontUrl: '',
+					gsAccountHolderOpposite: '',
+					gsAccountHolderOppositeUrl: '',
 					id: '',
 					userId: '',
 					name: '',
@@ -822,22 +1075,53 @@
 						this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
 						if (this.commonJS.isNotEmpty(this.inputForm.socialSecurityPictureFront)){
 							await this.ossService.getTemporaryUrl(this.inputForm.socialSecurityPictureFront).then((data) => {
-								console.log('data', data)
 								let file = {
 									url: data
 								}
 								this.fileList.push(file)
-								// this.inputForm.socialSecurityPictureFrontUrl = data
 							})
 						}
 						if (this.commonJS.isNotEmpty(this.inputForm.socialSecurityPictureOpposite)){
-							console.log('123')
 							await this.ossService.getTemporaryUrl(this.inputForm.socialSecurityPictureOpposite).then((data) => {
 								let file = {
 									url: data
 								}
 								this.fileList2.push(file)
-								// this.inputForm.socialSecurityPictureFrontUrl = data
+							})
+						}
+						if (this.commonJS.isNotEmpty(this.inputForm.accountHolderFront)){
+
+							await this.ossService.getTemporaryUrl(this.inputForm.accountHolderFront).then((data) => {
+								console.log('data', data)
+								let file = {
+									url: data
+								}
+								this.bankFileList.push(file)
+							})
+						}
+						if (this.commonJS.isNotEmpty(this.inputForm.accountHolderOpposite)){
+							console.log('123')
+							await this.ossService.getTemporaryUrl(this.inputForm.accountHolderOpposite).then((data) => {
+								let file = {
+									url: data
+								}
+								this.bankFileList2.push(file)
+							})
+						}
+						if (this.commonJS.isNotEmpty(this.inputForm.gsAccountHolderFront)){
+							await this.ossService.getTemporaryUrl(this.inputForm.gsAccountHolderFront).then((data) => {
+								let file = {
+									url: data
+								}
+								this.gsFileList.push(file)
+							})
+						}
+						if (this.commonJS.isNotEmpty(this.inputForm.gsAccountHolderOpposite)){
+							await this.ossService.getTemporaryUrl(this.inputForm.gsAccountHolderOpposite).then((data) => {
+								let file = {
+									url: data
+								}
+								this.gsFileList2.push(file)
 							})
 						}
 						this.loading = false
@@ -892,6 +1176,10 @@
 				this.$refs.inputForm.resetFields()
 				this.fileList = []
 				this.fileList2 = []
+				this.bankFileList = []
+				this.bankFileList2 = []
+				this.gsFileList = []
+				this.gsFileList2 = []
 				this.visible = false
 			},
 			reapplyForm (callback) {
@@ -1044,11 +1332,19 @@
 				})
 
 			},
-			checkBankNumber(bankNumber) {
+			checkBankNumber(bankNumber,type) {
 				if (!this.validateXG.isBankNum(bankNumber)) {
-					this.$message.error('请输入正确的社保银行卡号')
-					this.inputForm.socialSecurityBankNumber = ''
-					throw new Error('请输入正确的社保银行卡号')
+					if (type === 'zx' ){
+						this.inputForm.zxBankCardNumber = ''
+					} else if (type === 'gs') {
+						this.inputForm.gsBankCardNumber = ''
+					} else {
+						this.$message.error('请输入正确的社保银行卡号')
+						this.inputForm.socialSecurityBankNumber = ''
+						throw new Error('请输入正确的社保银行卡号')
+					}
+					this.$message.error('请输入正确的银行卡号')
+					throw new Error('请输入正确的银行卡号')
 				}
 			},
 			handleAvatarSuccess (res, file, fileList, index, val) {
@@ -1083,7 +1379,124 @@
 			validateInput() {
 				// 使用正则表达式验证输入内容，禁止中文
 				this.inputForm.socialSecurityNumber = this.inputForm.socialSecurityNumber.replace(/[\u4e00-\u9fa5]/g, '');
-			}
+			},
+			bankHandleUploadSuccess(response, file,fileList) {
+				return this.bankHandleAvatarSuccess(response,file,fileList,null,'front')
+			},
+			bankHandleAvatarSuccess (res, file, fileList, index, val) {
+				if (val === 'front') {
+					this.inputForm.accountHolderFront = '/' +res.url
+					this.inputForm.accountHolderFrontUrl = res.lsUrl
+				}
+				this.bankHideUploadEdit = true
+				this.$forceUpdate()
+			},
+			bankHandlePictureCardPreview(file) {
+				this.inputForm.accountHolderFrontUrl = file.url
+				this.bankDialogVisible = true;
+			},
+			bankHandleDownload(file) {
+				let file2 = {
+					url: this.inputForm.accountHolderFront
+				}
+				toHref(file2)
+			},
+			bankHandleRemove(file, fileList) {
+				this.bankHideUploadEdit = false
+				// 如果需要删除图片信息，可以根据file或其他标识从相应的数据结构中删除信息
+				const fileIndex = this.bankFileList.indexOf(file);
+				if (fileIndex !== -1) {
+					this.bankFileList.splice(fileIndex, 1); // 从fileList中删除该图片信息
+				}
+			},
+			bankHandleUploadSuccess2(response, file,fileList) {
+				return this.bankHandleAvatarSuccess2(response,file,fileList,null,'front')
+			},
+			bankHandleAvatarSuccess2 (res, file, fileList, index, val) {
+				if (val === 'front') {
+					this.inputForm.accountHolderOpposite = '/' +res.url
+					this.inputForm.accountHolderOppositeUrl = res.lsUrl
+				}
+				this.bankHideUploadEdit2 = true
+				this.$forceUpdate()
+			},
+			bankHandlePictureCardPreview2(file) {
+				this.inputForm.accountHolderOppositeUrl = file.url
+				this.bankDialogVisible2 = true;
+			},
+			bankHandleDownload2(file) {
+				let file2 = {
+					url: this.inputForm.accountHolderOpposite
+				}
+				toHref(file2)
+			},
+			bankHandleRemove2(file, fileList) {
+				this.hideUploadEdit2 = false
+				// 如果需要删除图片信息，可以根据file或其他标识从相应的数据结构中删除信息
+				const fileIndex = this.bankFileList2.indexOf(file);
+				if (fileIndex !== -1) {
+					this.bankFileList2.splice(fileIndex, 1); // 从fileList中删除该图片信息
+				}
+			},
+			gsHandleUploadSuccess(response, file,fileList) {
+				return this.gsHandleAvatarSuccess(response,file,fileList,null,'front')
+			},
+			gsHandleUploadSuccess2(response, file,fileList) {
+				return this.gsHandleAvatarSuccess2(response,file,fileList,null,'front')
+			},
+			gsHandleAvatarSuccess (res, file, fileList, index, val) {
+				if (val === 'front') {
+					this.inputForm.gsAccountHolderFront = '/' +res.url
+					this.inputForm.gsAccountHolderFrontUrl = res.lsUrl
+				}
+				this.hideUploadEdit = true
+				this.$forceUpdate()
+			},
+			gsHandleAvatarSuccess2 (res, file, fileList, index, val) {
+				if (val === 'front') {
+					this.inputForm.gsAccountHolderOpposite = '/' +res.url
+					this.inputForm.gsAccountHolderOppositeUrl = res.lsUrl
+				}
+				this.hideUploadEdit2 = true
+				this.$forceUpdate()
+			},
+			gsHandlePictureCardPreview(file) {
+				this.dialogImageUrl = file.url;
+				this.inputForm.gsAccountHolderFrontUrl = file.url
+				this.gsDialogVisible = true;
+			},
+			gsHandlePictureCardPreview2(file) {
+				this.inputForm.gsAccountHolderOppositeUrl = file.url
+				this.gsDialogVisible2 = true;
+			},
+			gsHandleDownload(file) {
+				let file2 = {
+					url: this.inputForm.gsAccountHolderFront
+				}
+				toHref(file2)
+			},
+			gsHandleDownload2(file) {
+				let file2 = {
+					url: this.inputForm.gsAccountHolderOpposite
+				}
+				toHref(file2)
+			},
+			gsHandleRemove(file, fileList) {
+				this.gsHideUploadEdit = false
+				// 如果需要删除图片信息，可以根据file或其他标识从相应的数据结构中删除信息
+				const fileIndex = this.gsFileList.indexOf(file);
+				if (fileIndex !== -1) {
+					this.gsFileList.splice(fileIndex, 1); // 从fileList中删除该图片信息
+				}
+			},
+			gsHandleRemove2(file, fileList) {
+				this.gsHideUploadEdit2 = false
+				// 如果需要删除图片信息，可以根据file或其他标识从相应的数据结构中删除信息
+				const fileIndex = this.gsFileList2.indexOf(file);
+				if (fileIndex !== -1) {
+					this.gsFileList2.splice(fileIndex, 1); // 从fileList中删除该图片信息
+				}
+			},
 		}
 	}
 </script>

src/views/human/enrollment/registration/WageCardInfoAddForm.vue

@@ -56,7 +56,7 @@
 											<el-icon><Download /></el-icon>
 										  </span>
 										  <span
-											  v-if="!(status === 'audit' || status === 'taskFormDetail')"
+											  v-if="!testDisabledFlag"
 											  class="el-upload-list__item-delete"
 											  @click="handleRemove(file,fileList)"
 										  >
@@ -112,7 +112,7 @@
 											<el-icon><Download /></el-icon>
 										  </span>
 										  <span
-											  v-if="!(status === 'audit' || status === 'taskFormDetail')"
+											  v-if="!testDisabledFlag"
 											  class="el-upload-list__item-delete"
 											  @click="handleRemove2(file,fileList)"
 										  >
@@ -181,7 +181,7 @@
 											<el-icon><Download /></el-icon>
 										  </span>
 										  <span
-											  v-if="!(status === 'audit' || status === 'taskFormDetail')"
+											  v-if="!testDisabledFlag"
 											  class="el-upload-list__item-delete"
 											  @click="gsHandleRemove(file,fileList)"
 										  >
@@ -237,7 +237,7 @@
 											<el-icon><Download /></el-icon>
 										  </span>
 										  <span
-											  v-if="!(status === 'audit' || status === 'taskFormDetail')"
+											  v-if="!testDisabledFlag"
 											  class="el-upload-list__item-delete"
 											  @click="gsHandleRemove2(file,fileList)"
 										  >
@@ -286,6 +286,7 @@
 				title: '',
 				method: '',
 				testFlag: false,
+				testDisabledFlag: false,
 				dialogVisible: false,
 				dialogVisible2: false,
 				hideUploadEdit: false, //控制上传点击
@@ -372,7 +373,7 @@
 				}
 			},
 			handleRemove2(file, fileList) {
-				this.hideUploadEdit = false
+				this.hideUploadEdit2 = false
 				// 如果需要删除图片信息，可以根据file或其他标识从相应的数据结构中删除信息
 				const fileIndex = this.fileList2.indexOf(file);
 				if (fileIndex !== -1) {
@@ -388,7 +389,7 @@
 				}
 			},
 			gsHandleRemove2(file, fileList) {
-				this.gsHideUploadEdit = false
+				this.gsHideUploadEdit2 = false
 				// 如果需要删除图片信息，可以根据file或其他标识从相应的数据结构中删除信息
 				const fileIndex = this.gsFileList2.indexOf(file);
 				if (fileIndex !== -1) {
@@ -472,7 +473,7 @@
 					this.inputForm.gsAccountHolderFront = '/' +res.url
 					this.inputForm.gsAccountHolderFrontUrl = res.lsUrl
 				}
-				this.hideUploadEdit = true
+				this.gsHideUploadEdit = true
 				this.$forceUpdate()
 			},
 			gsHandleAvatarSuccess2 (res, file, fileList, index, val) {
@@ -519,6 +520,8 @@
 					enrollmentWageCardService.findWageCardById(this.inputForm.id).then( async (data) => {
 						this.fileList = []
 						this.fileList2 = []
+						this.gsFileList = []
+						this.gsFileList2 = []
 						if (this.status === 'audit' || this.status === 'taskFormDetail') {
 							method = 'view'
 						}
@@ -566,6 +569,13 @@
 								// this.inputForm.socialSecurityPictureFrontUrl = data
 							})
 						}
+						await this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
+							if (this.commonJS.isNotEmpty(data)) {
+								if (data === '审核') {
+									this.testDisabledFlag = true
+								}
+							}
+						})
 						this.loading = false
 					})
 				})

src/views/human/practice/register/RegistrationBankAddForm.vue

@@ -16,6 +16,98 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
+					<el-form-item label="银行卡正面" prop="accountHolderFront" :rules="[
+						{required: true, message: '银行卡正面不能为空', trigger: 'blur'}
+					]">
+						<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
+								   :limit="limitNum"
+								   :disabled="hideUploadEdit"
+								   list-type="picture-card"
+								   :auto-upload="true"
+								   :on-success="handleUploadSuccess"
+								   v-model:file-list="fileList"
+						>
+							<el-icon><Plus /></el-icon>
+
+							<template #file="{ file }">
+								<div>
+									<img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
+									<span class="el-upload-list__item-actions">
+										  <span
+											  class="el-upload-list__item-preview"
+											  @click="handlePictureCardPreview(file)"
+										  >
+											<el-icon><zoom-in /></el-icon>
+										  </span>
+										  <span
+											  v-if="!disabled"
+											  class="el-upload-list__item-delete"
+											  @click="handleDownload(file)"
+										  >
+											<el-icon><Download /></el-icon>
+										  </span>
+										  <span
+											  class="el-upload-list__item-delete"
+											  @click="handleRemove(file,fileList)"
+										  >
+											<el-icon><Delete /></el-icon>
+										  </span>
+									</span>
+								</div>
+							</template>
+						</el-upload>
+						<el-dialog v-model="dialogVisible">
+							<img w-full :src="inputForm.accountHolderFrontUrl" alt="Preview Image" :style="{ maxWidth: '100%', maxHeight: '100%' }"/>
+						</el-dialog>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="银行卡反面" prop="accountHolderOpposite" :rules="[
+						{required: true, message: '银行卡反面不能为空', trigger: 'blur'}
+					]">
+						<el-upload :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/upload`"
+								   :limit="limitNum"
+								   :disabled="hideUploadEdit2"
+								   list-type="picture-card"
+								   :auto-upload="true"
+								   :on-success="handleUploadSuccess2"
+								   v-model:file-list="fileList2"
+						>
+							<el-icon><Plus /></el-icon>
+
+							<template #file="{ file }">
+								<div>
+									<img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
+									<span class="el-upload-list__item-actions">
+										  <span
+											  class="el-upload-list__item-preview"
+											  @click="handlePictureCardPreview2(file)"
+										  >
+											<el-icon><zoom-in /></el-icon>
+										  </span>
+										  <span
+											  v-if="!disabled"
+											  class="el-upload-list__item-delete"
+											  @click="handleDownload2(file)"
+										  >
+											<el-icon><Download /></el-icon>
+										  </span>
+										  <span
+											  class="el-upload-list__item-delete"
+											  @click="handleRemove2(file,fileList)"
+										  >
+											<el-icon><Delete /></el-icon>
+										  </span>
+									</span>
+								</div>
+							</template>
+						</el-upload>
+						<el-dialog v-model="dialogVisible2">
+							<img w-full :src="inputForm.accountHolderOppositeUrl" alt="Preview Image" :style="{ maxWidth: '100%', maxHeight: '100%' }"/>
+						</el-dialog>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
 					<el-form-item label="简介" prop="remarks" :rules="[]">
 						<el-input type="textarea"
 								  maxlength="200" placeholder="请输入简介"
@@ -28,6 +120,11 @@
 </template>
 
 <script>
+	import OSSSerivce, {
+		httpRequest,
+		fileName,
+		toHref,
+	} from '@/api/sys/OSSService'
 	import registerBankService from '@/api/human/register/RegisterBankService'
 
 	export default {
@@ -50,13 +147,26 @@
 				title: '',
 				method: '',
 				visible: false,
+				testDisabledFlag: false,
 				loading: false,
+				limitNum: 1,
+				disabled: false,
+				dialogVisible: false,
+				dialogVisible2: false,
+				hideUploadEdit: false, //控制上传点击
+				hideUploadEdit2: false, //控制上传点击
+				fileList: [],
+				fileList2: [],
 				inputForm: {
 					userId: '',
 					remarks: '',
 					type: '',
 					bankCardNumber: '',
 					name: '',
+					accountHolderFront: '',
+					accountHolderFrontUrl: '',
+					accountHolderOpposite: '',
+					accountHolderOppositeUrl: '',
 				},
 				keyWatch: '',
 				amountKey: '',
@@ -64,6 +174,7 @@
 			}
 		},
 		created () {
+			this.ossService = new OSSSerivce()
 		},
 		components: {
 		},
@@ -122,6 +233,10 @@
 					type: '',
 					bankCardNumber: '',
 					name: '',
+					accountHolderFront: '',
+					accountHolderFrontUrl: '',
+					accountHolderOpposite: '',
+					accountHolderOppositeUrl: '',
 				}
 				if (method === 'add') {
 					this.title = `新建实习登记`
@@ -133,7 +248,9 @@
 				this.loading = false
 				this.$nextTick(() => {
 					this.loading = true
-					registerBankService.findById(this.inputForm.id).then((data) => {
+					registerBankService.findById(this.inputForm.id).then( async (data) => {
+						this.fileList = []
+						this.fileList2 = []
 						if (this.status === 'audit' || this.status === 'taskFormDetail') {
 							method = 'view'
 						}
@@ -143,7 +260,25 @@
 						if (this.commonJS.isEmpty(this.inputForm.name)) {
 							this.inputForm.name = this.$store.state.user.name
 						}
+						if (this.commonJS.isNotEmpty(this.inputForm.accountHolderFront)){
 
+							await this.ossService.getTemporaryUrl(this.inputForm.accountHolderFront).then((data) => {
+								let file = {
+									url: data
+								}
+								this.fileList.push(file)
+								this.hideUploadEdit = true
+							})
+						}
+						if (this.commonJS.isNotEmpty(this.inputForm.accountHolderOpposite)){
+							await this.ossService.getTemporaryUrl(this.inputForm.accountHolderOpposite).then((data) => {
+								let file = {
+									url: data
+								}
+								this.fileList2.push(file)
+								this.hideUploadEdit2 = true
+							})
+						}
 						this.loading = false
 					})
 				})
@@ -168,8 +303,8 @@
 			},
 			close () {
 				this.$refs.inputForm.resetFields()
-				this.inputForm.experiences = []
-				this.inputForm.familyMembers = []
+				this.fileList = []
+				this.fileList2 = []
 				this.visible = false
 			},
 			reapplyForm (callback) {
@@ -281,6 +416,66 @@
 					})
 				}
 			},
+			handleUploadSuccess(response, file,fileList) {
+				return this.handleAvatarSuccess(response,file,fileList,null,'front')
+			},
+			handleUploadSuccess2(response, file,fileList) {
+				return this.handleAvatarSuccess2(response,file,fileList,null,'front')
+			},
+			handleAvatarSuccess (res, file, fileList, index, val) {
+				if (val === 'front') {
+					this.inputForm.accountHolderFront = '/' +res.url
+					this.inputForm.accountHolderFrontUrl = res.lsUrl
+				}
+				this.hideUploadEdit = true
+				this.$forceUpdate()
+			},
+			handleAvatarSuccess2 (res, file, fileList, index, val) {
+				if (val === 'front') {
+					this.inputForm.accountHolderOpposite = '/' +res.url
+					this.inputForm.accountHolderOppositeUrl = res.lsUrl
+				}
+				this.hideUploadEdit2 = true
+				this.$forceUpdate()
+			},
+			handlePictureCardPreview(file) {
+				this.dialogImageUrl = file.url;
+				this.inputForm.accountHolderFrontUrl = file.url
+				this.dialogVisible = true;
+			},
+			handlePictureCardPreview2(file) {
+				this.dialogImageUrl = file.url;
+				this.inputForm.accountHolderOppositeUrl = file.url
+				this.dialogVisible2 = true;
+			},
+			handleDownload(file) {
+				let file2 = {
+					url: this.inputForm.accountHolderFront
+				}
+				toHref(file2)
+			},
+			handleDownload2(file) {
+				let file2 = {
+					url: this.inputForm.accountHolderOpposite
+				}
+				toHref(file2)
+			},
+			handleRemove(file, fileList) {
+				this.hideUploadEdit = false
+				// 如果需要删除图片信息，可以根据file或其他标识从相应的数据结构中删除信息
+				const fileIndex = this.fileList.indexOf(file);
+				if (fileIndex !== -1) {
+					this.fileList.splice(fileIndex, 1); // 从fileList中删除该图片信息
+				}
+			},
+			handleRemove2(file, fileList) {
+				this.hideUploadEdit2 = false
+				// 如果需要删除图片信息，可以根据file或其他标识从相应的数据结构中删除信息
+				const fileIndex = this.fileList2.indexOf(file);
+				if (fileIndex !== -1) {
+					this.fileList2.splice(fileIndex, 1); // 从fileList中删除该图片信息
+				}
+			},
 		}
 	}
 </script>

src/views/materialManagement/collect/CollectForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
+    <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="(status === 'audit' || status === 'taskFormDetail')"
              label-width="100px" @submit.native.prevent>
 
       <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>