代码提交

src/views/cw/reportManagement/ReportManagementList.vue

@@ -236,7 +236,8 @@
                 <!--              被驳回后当前申请人重新调整-->
                 <el-button v-if="hasPermission('cw:workContract:filed')&&scope.row.createById === $store.state.user.id&&scope.row.reviewStatus === '4'" text type="primary" @click="adjustReview(scope.row)">驳回调整</el-button>
                 <!--              复核流程-->
-                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" text type="primary" @click="pushF(scope.row)">复核</el-button>
+				<el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& !scope.row.takeNumberType && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" text type="primary" @click="pushTakeNumber(scope.row)">报告号申请</el-button>
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& scope.row.takeNumberType && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" text type="primary" @click="pushF(scope.row)">复核</el-button>
                 <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& scope.row.reviewStatus === '2'" text type="primary" @click="rebackF(scope.row)">撤回复核申请</el-button>
                 <!--              未选择盖章类型点击签章操作-->
                 <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && !scope.row.signatureType && (this.commonJS.isEmpty(scope.row.newType) || scope.row.newType !== '1')" text type="primary"  @click="pushS(scope.row)">签章</el-button>
@@ -367,6 +368,10 @@
         haveProjectIds: '',
 	    processDefinitionSigId: '',
 	    procDefSigKey: '',
+	    processDefinitionTakeNumberAuditId: '',
+	    procDefTakeNumberAuditKey: '',
+	    processDefinitionTakeNumberSId: '',
+	    procDefSTakeNumberKey: '',
       }
     },
     reportReviewService: null,
@@ -470,6 +475,18 @@
             this.procDefAuditKey = data.key
           }
         })
+        processService.getByName('会计-报告号申请').then((data) => {
+          if (!this.commonJS.isEmpty(data.id)) {
+            this.processDefinitionTakeNumberAuditId = data.id
+            this.procDefTakeNumberAuditKey = data.key
+          }
+        })
+        processService.getByName('会计-报告签章复核').then((data) => {
+          if (!this.commonJS.isEmpty(data.id)) {
+            this.processDefinitionTakeNumberSId = data.id
+            this.procDefSTakeNumberKey = data.key
+          }
+        })
 		  processService.getByName('会计-复核及签章').then((data) => {
 			  if (!this.commonJS.isEmpty(data.id)) {
 				  this.processDefinitionAuditIdAndSId = data.id
@@ -618,7 +635,7 @@
 						}
 					})
 				})
-			} else {
+			} else if (this.commonJS.isNotEmpty(row.newType) && row.newType === '0') {
 				// eslint-disable-next-line eqeqeq
 				taskService.getTaskDef({
 					procInsId: row.procInsId3,
@@ -637,12 +654,33 @@
 						}
 					})
 				})
+			} else if (this.commonJS.isNotEmpty(row.newType) && row.newType === '2') {
+				// eslint-disable-next-line eqeqeq
+				taskService.getTaskDef({
+					procInsId: row.procInsId3,
+					procDefId: this.processDefinitionTakeNumberAuditId
+				}).then((data) => {
+					this.$router.push({
+						path: '/flowable/task/TaskFormDetail',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+							isShow: 'false',
+							readOnly: true,
+							title: '报告号申请' + '流程详情',
+							formTitle: '报告号申请' + '流程详情',
+							businessId: row.id,
+							status: 'reback'
+						}
+					})
+				})
 			}
 
         }
       },
       pushF (row) {
         // console.log('row', row)
+        console.log('this.processDefinitionAuditIdAndSId', this.processDefinitionAuditIdAndSId)
+        console.log('this.procDefAuditKeyAndSId', this.procDefAuditKeyAndSId)
         // 读取流程表单
 		let title = ' '
 		if (!row.documentNo) {
@@ -715,6 +753,44 @@
 			  })
 		  }
       },
+      pushTakeNumber (row) {
+        // 读取流程表单
+		let title = ' '
+		if (!row.documentNo) {
+			title = ' ' + row.projectName
+		} else {
+			title = ' ' + row.documentNo + ' - ' + row.projectName
+		}
+
+		  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.processDefinitionTakeNumberAuditId,
+			  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.processDefinitionTakeNumberAuditId,
+					  procDefKey: this.procDefTakeNumberAuditKey,
+					  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'
+				  }
+			  })
+		  })
+      },
       pushS (row) {
         // 读取流程表单
         let title = `发起流程【会计-报告签章-电子公章】`
@@ -741,27 +817,51 @@
         } else if (row.status1 === '4') {
           status = 'reapplyFlag'
         }
-        taskService.getTaskDef({ procDefId: this.processDefinitionSId,
-          businessId: row.sid1,
-          businessTable: 'cw_project_report_signature'}).then((data) => {
-            this.$router.push({
-              path: '/flowable/task/TaskForm',
-              query: {
-                ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
-                procDefId: this.processDefinitionSId,
-                procDefKey: this.procDefSKey,
-                title: title,
-                formType: data.formType,
-                formUrl: data.formUrl,
-                formTitle: processTitle,
-                businessTable: 'cw_project_report_signature',
-                businessId: row.sid1,
-                isShow: 'false',
-                status: status,
-                routePath: '/cw/reportManagement/ReportManagementList'
-              }
-            })
-          })
+        if(row.newType === '2'){
+			taskService.getTaskDef({ procDefId: this.processDefinitionTakeNumberSId,
+				businessId: row.id,
+				businessTable: 'cw_project_report_signature'}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionTakeNumberSId,
+						procDefKey: this.procDefSTakeNumberKey,
+						title: title,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessTable: 'cw_project_report_signature',
+						businessId: row.id,
+						isShow: 'false',
+						status: status,
+						routePath: '/cw/reportManagement/ReportManagementList'
+					}
+				})
+			})
+		}else if(row.newType === '0'){
+			taskService.getTaskDef({ procDefId: this.processDefinitionSId,
+				businessId: row.sid1,
+				businessTable: 'cw_project_report_signature'}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionSId,
+						procDefKey: this.procDefSKey,
+						title: title,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessTable: 'cw_project_report_signature',
+						businessId: row.sid1,
+						isShow: 'false',
+						status: status,
+						routePath: '/cw/reportManagement/ReportManagementList'
+					}
+				})
+			})
+		}
       },
       pushS3 (row) {
         // 读取流程表单

src/views/flowable/task/TaskForm.vue

@@ -662,6 +662,7 @@ export default {
 		// Process_1669087010742 报告签章-公章+执业章
 		// Process_1668677901585 项目报告归档
 		// Process_1670486210438 报告复核
+		// Process_1670486210439 会计-报告号领取
 		// Process_1668759076824 报告作废申请
 		// Process_1670548572652 报告作废归档
 		// Process_1670548572655 报告作废归档-苏州
@@ -720,6 +721,7 @@ export default {
 				this.procDefId.includes('Process_1669087010742') ||
 				this.procDefId.includes('Process_1668677901585') ||
 				this.procDefId.includes('Process_1670486210438') ||
+				this.procDefId.includes('Process_1670486210439') ||
 				this.procDefId.includes('Process_1668759076824') ||
 				this.procDefId.includes('Process_1670548572652') ||
 				this.procDefId.includes('Process_1670548572655') ||
@@ -868,6 +870,7 @@ export default {
 				this.procDefId.includes('Process_1669087010742') ||
 				this.procDefId.includes('Process_1668677901585') ||
 				this.procDefId.includes('Process_1670486210438') ||
+				this.procDefId.includes('Process_1670486210439') ||
 				this.procDefId.includes('Process_1668759076824') ||
 				this.procDefId.includes('Process_1670548572652') ||
 				this.procDefId.includes('Process_1670548572655') ||

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

@@ -221,9 +221,9 @@
 						highlight-current-row
 						:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
 					>
-						<vxe-table-column field="callName" title="称呼" :edit-render="{}">
+						<vxe-table-column field="callName" title="关系" :edit-render="{}">
 							<template v-slot:edit="scope">
-								<el-input  placeholder="请填写称呼"  v-model="scope.row.callName"/>
+								<el-input  placeholder="请填写关系"  v-model="scope.row.callName"/>
 							</template>
 						</vxe-table-column>
 						<vxe-table-column field="name" title="姓名" :edit-render="{}">

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

@@ -240,9 +240,9 @@
 									highlight-current-row
 									:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
 								>
-									<vxe-table-column field="callName" title="称呼" :edit-render="{}">
+									<vxe-table-column field="callName" title="关系" :edit-render="{}">
 										<template v-slot:edit="scope">
-											<el-input  placeholder="请填写称呼"  v-model="scope.row.callName"/>
+											<el-input  placeholder="请填写关系"  v-model="scope.row.callName"/>
 										</template>
 									</vxe-table-column>
 									<vxe-table-column field="name" title="姓名" :edit-render="{}">