总经办人员报销

src/api/sys/userService.js

@@ -146,6 +146,12 @@ export default {
 			method: "get",
 		});
 	},
+	isZjbry:function() {
+		return request({
+			url: prefix + "/sys/user/isZjbry",
+			method: "get",
+		});
+	},
 
 	queryDetailList(ids) {
 		return request({

src/views/ccpm/reimbursement/info/InfoList.vue

@@ -257,6 +257,7 @@
         },
         loading: false,
 		  isZj:false,
+		  isZjbry:false,
       }
     },
     // reimbursementService: null,
@@ -345,7 +346,27 @@
 					}
 				})
 			})
-		}else {
+		}else if (this.isZjbry) {
+			taskService.getTaskDef({ procDefId: this.processDefinitionIdZjb,
+				status: 'startAndHold'}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionIdZjb,
+						procDefKey: this.procDefKeyZjb,
+						status: 'startAndHold',
+						title: tabTitle,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessId: 'false',
+						isShow: false,
+						routePath: '/ccpm/reimbursement/info/InfoList'
+					}
+				})
+			})
+		} else {
 			taskService.getTaskDef({ procDefId: this.processDefinitionId,
 				status: 'startAndHold'}).then((data) => {
 				this.$router.push({
@@ -408,6 +429,30 @@
 					}
 				})
 			})
+		}else if(this.isZjbry){
+			taskService.getTaskDef({ procDefId: this.processDefinitionIdZjb,
+				businessId: row.id,
+				businessTable: 'zs_reimbursement_info',
+				status: status
+			}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionIdZjb,
+						procDefKey: this.procDefKeyZjb,
+						status: status,
+						title: tabTitle,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessTable: 'zs_reimbursement_info',
+						businessId: row.id,
+						isShow: false,
+						routePath: '/ccpm/reimbursement/info/InfoList'
+					}
+				})
+			})
 		}else {
 			taskService.getTaskDef({ procDefId: this.processDefinitionId,
 				businessId: row.id,
@@ -485,6 +530,12 @@
 				console.log('this.isZj',this.isZj)
 			})
 		},
+		//是否是总经办人员
+		checkIsZjbry(){
+			userService.isZjbry().then((data)=>{
+				this.isZjbry = data
+			})
+		},
       // 获取数据列表
       refreshList () {
         this.loading = true
@@ -509,6 +560,7 @@
         //   this.loading = false
         // })
 		  this.checkIsZj()
+		  this.checkIsZjbry()
         processService.getByName('项目-报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -535,6 +587,12 @@
 				  this.procDefKeySzbxInvoice = data.key
 			  }
 		  })
+		  processService.getByName('项目-总经办报销').then((data) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdZjb = data.id
+				  this.procDefKeyZjb = data.key
+			  }
+		  })
       },
       // 删除
       del (id) {
@@ -574,6 +632,8 @@
 						this.procDefId = this.processDefinitionIdSzbx
 					}
 				}
+			}else if (this.isZjbry){
+				this.procDefId = this.processDefinitionIdZjb
 			}else {
 				if (row.reimbursementType === '1') {
 					this.procDefId = this.processDefinitionIdInvoice

src/views/ccpm/reimbursement/info/ReimbursementForm.vue

@@ -803,6 +803,7 @@
         amountKey: '',
 		  invoiceReimbursementKey: '',
 		  isZj:false,
+		  isZjbry:false,
       }
     },
 	  provide() {
@@ -965,6 +966,9 @@
 			userService.isZj().then((data)=>{
 				this.isZj = data
 			})
+			userService.isZjbry().then((data)=>{
+				this.isZjbry = data
+			})
         })
       },
       // 表单提交
@@ -1298,7 +1302,27 @@
 					title = `发起流程【项目-报销审批-电子发票】`
 					describe = `[项目-报销审批-电子发票]`
 				}
-			}else {
+			}else if (this.isZjbry){
+				if (this.inputForm.reimbursementType === '0') {
+					await processService.getByName('项目-总经办报销').then((data) => {
+						if (!this.commonJS.isEmpty(data.id)) {
+							this.inputForm.procDefId = data.id
+							this.inputForm.procDefKey = data.key
+						}
+					})
+					title = `发起流程【项目-报销审批】`
+					describe = `[项目-报销审批]`
+				}else if (this.inputForm.reimbursementType === '1') {
+					await processService.getByName('项目-总经办报销').then((data) => {
+						if (!this.commonJS.isEmpty(data.id)) {
+							this.inputForm.procDefId = data.id
+							this.inputForm.procDefKey = data.key
+						}
+					})
+					title = `发起流程【项目-报销审批-电子发票】`
+					describe = `[项目-报销审批-电子发票]`
+				}
+			} else {
 				if (this.inputForm.reimbursementType === '0') {
 					await processService.getByName('项目-报销审批').then((data) => {
 						if (!this.commonJS.isEmpty(data.id)) {
@@ -1431,6 +1455,9 @@
                 if (data === '所长审批') {
                   this.inputForm.type = '5'
                 }
+				  if (data === '总经办人员审批') {
+					  this.inputForm.type = '5'
+				  }
               }
               this.reimbursementService.save(this.inputForm).then((data) => {
                 callback(data.businessTable, data.businessId, this.inputForm)

src/views/cw/reimbursementApproval/info/InfoList.vue

@@ -275,6 +275,7 @@
         isAdmin: false,
 		  isKjsz:false,
 		  isZj:false,
+		  isZjbry:false,
       }
     },
     reimbursementApprovalService: null,
@@ -345,6 +346,11 @@
 				console.log('this.isZj',this.isZj)
 			})
 		},
+		checkIsZjbry(){
+			userService.isZjbry().then((data)=>{
+				this.isZjbry = data
+			})
+		},
       viewContract (id) {
         this.$refs.contractNameForm.init('view', id)
       },
@@ -374,7 +380,27 @@
 					  }
 				  })
 			  })
-		  }else {
+		  }else if (this.isZjbry) {
+			  taskService.getTaskDef({ procDefId: this.processDefinitionIdZjb,
+				  status: 'startAndHold'}).then((data) => {
+				  this.$router.push({
+					  path: '/flowable/task/TaskForm',
+					  query: {
+						  ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						  procDefId: this.processDefinitionIdZjb,
+						  procDefKey: this.procDefKeyZjb,
+						  status: 'startAndHold',
+						  title: tabTitle,
+						  formType: data.formType,
+						  formUrl: data.formUrl,
+						  formTitle: processTitle,
+						  businessId: 'false',
+						  isShow: false,
+						  routePath: '/cw/reimbursementApproval/info/InfoList'
+					  }
+				  })
+			  })
+		  } else {
 			  taskService.getTaskDef({ procDefId: this.processDefinitionId,
 				  status: 'startAndHold'}).then((data) => {
 				  this.$router.push({
@@ -438,6 +464,30 @@
 					  }
 				  })
 			  })
+		  }else if(this.isZjbry){
+			  taskService.getTaskDef({ procDefId: this.processDefinitionIdZjb,
+				  businessId: row.id,
+				  businessTable: 'cw_reimbursement_info',
+				  status: status
+			  }).then((data) => {
+				  this.$router.push({
+					  path: '/flowable/task/TaskForm',
+					  query: {
+						  ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						  procDefId: this.processDefinitionIdZjb,
+						  procDefKey: this.procDefKeyZjb,
+						  status: status,
+						  title: tabTitle,
+						  formType: data.formType,
+						  formUrl: data.formUrl,
+						  formTitle: processTitle,
+						  businessTable: 'cw_reimbursement_info',
+						  businessId: row.id,
+						  isShow: false,
+						  routePath: '/cw/reimbursementApproval/info/InfoList'
+					  }
+				  })
+			  })
 		  }else {
 			  taskService.getTaskDef({ procDefId: this.processDefinitionId,
 				  businessId: row.id,
@@ -508,6 +558,7 @@
         this.checkIsAdmin()
 	  	this.checkIsKjsz()
 		  this.checkIsZj()
+		  this.checkIsZjbry()
         processService.getByName('会计-报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -535,6 +586,12 @@
 				  this.procDefKeySzbxInvoice = data.key
 			  }
 		  })
+		  processService.getByName('会计-总经办报销').then((data) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdZjb = data.id
+				  this.procDefKeyZjb = data.key
+			  }
+		  })
 
       },
       // 删除
@@ -570,6 +627,8 @@
 						this.procDefId = this.processDefinitionIdSzbx
 					}
 				}
+			}else if (this.isZjbry){
+				this.procDefId = this.processDefinitionIdZjb
 			}else {
 				if (row.reimbursementType === '1') {
 					this.procDefId = this.processDefinitionIdInvoice

src/views/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -926,6 +926,7 @@
 		  invoiceReimbursementKey: '',
 		  isKjsz:false,
 		  isZj:false,
+		  isZjbry:false,
       }
     },
 	  provide() {
@@ -1099,6 +1100,9 @@
 			userService.isZj().then((data)=>{
 				this.isZj = data
 			})
+			userService.isZjbry().then((data)=>{
+				this.isZjbry = data
+			})
 
         })
       },
@@ -1476,7 +1480,27 @@
 					  title = `发起流程【会计-报销审批-电子发票】`
 					  describe = `[会计-报销审批-电子发票]`
 				  }
-			  }else {
+			  }else if (this.isZjbry){
+				  if (this.inputForm.reimbursementType === '0') {
+					  await processService.getByName('会计-总经办报销').then((data) => {
+						  if (!this.commonJS.isEmpty(data.id)) {
+							  this.inputForm.procDefId = data.id
+							  this.inputForm.procDefKey = data.key
+						  }
+					  })
+					  title = `发起流程【会计-报销审批】`
+					  describe = `[会计-报销审批]`
+				  }else if (this.inputForm.reimbursementType === '1') {
+					  await processService.getByName('会计-总经办报销').then((data) => {
+						  if (!this.commonJS.isEmpty(data.id)) {
+							  this.inputForm.procDefId = data.id
+							  this.inputForm.procDefKey = data.key
+						  }
+					  })
+					  title = `发起流程【会计-报销审批-电子发票】`
+					  describe = `[会计-报销审批-电子发票]`
+				  }
+			  } else {
 				  if (this.inputForm.reimbursementType === '0') {
 					  await processService.getByName('会计-报销审批').then((data) => {
 						  if (!this.commonJS.isEmpty(data.id)) {
@@ -1619,6 +1643,9 @@
 						  if (data === '公司领导审批') {
 							  this.inputForm.type = '5'
 						  }
+					  if (data === '总经办人员审批') {
+						  this.inputForm.type = '5'
+					  }
 
                   }
 					console.log('this.inputForm',this.inputForm)

src/views/flowable/task/TaskForm.vue

@@ -747,6 +747,10 @@ export default {
 		// Process_1705391725816 评估-所长报销-电子发票
 		// Process_1705454007925 项目-报销审批
 		// Process_1705454863808 项目-报销审批-电子发票
+		// Process_1706170102059 会计-总经办报销
+		// Process_1706175399469 评估-总经办报销
+		// Process_1706176397312 中审-总经办报销
+		// Process_1706176937876 项目-总经办报销
 		// 驳回
 		reject(vars) {
 			if (this.procDefId.includes('Process_1667978088459') ||
@@ -814,7 +818,11 @@ export default {
 				this.procDefId.includes('Process_1705391439287') ||
 				this.procDefId.includes('Process_1705391725816') ||
 				this.procDefId.includes('Process_1705454007925') ||
-				this.procDefId.includes('Process_1705454863808')
+				this.procDefId.includes('Process_1705454863808') ||
+				this.procDefId.includes('Process_1706170102059') ||
+				this.procDefId.includes('Process_1706175399469') ||
+				this.procDefId.includes('Process_1706176397312') ||
+				this.procDefId.includes('Process_1706176937876')
 			) {
 				console.log('进入新版驳回')
 				this.$confirm(`确定驳回流程吗?`, '提示', {

src/views/reimbursement/info/InfoList.vue

@@ -247,6 +247,7 @@
         },
         loading: false,
 		  isZj:false,
+		  isZjbry:false,
       }
     },
     reimbursementService: null,
@@ -301,6 +302,11 @@
           this.showHideName = '展示'
         }
       },
+		checkIsZjbry(){
+			userService.isZjbry().then((data)=>{
+				this.isZjbry = data
+			})
+		},
       // 新增
       add () {
         // 读取流程表单
@@ -326,6 +332,26 @@
 						}
 					})
 				})
+			}else if (this.isZjbry) {
+				taskService.getTaskDef({ procDefId: this.processDefinitionIdZjb,
+					status: 'startAndHold'}).then((data) => {
+					this.$router.push({
+						path: '/flowable/task/TaskForm',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+							procDefId: this.processDefinitionIdZjb,
+							procDefKey: this.procDefKeyZjb,
+							status: 'startAndHold',
+							title: tabTitle,
+							formType: data.formType,
+							formUrl: data.formUrl,
+							formTitle: processTitle,
+							businessId: 'false',
+							isShow: false,
+							routePath: '/reimbursement/info/InfoList'
+						}
+					})
+				})
 			}else {
 				taskService.getTaskDef({ procDefId: this.processDefinitionId,
 					status: 'startAndHold'}).then((data) => {
@@ -393,6 +419,30 @@
 					}
 				})
 			})
+		}else if(this.isZjbry){
+			taskService.getTaskDef({ procDefId: this.processDefinitionIdZjb,
+				businessId: row.id,
+				businessTable: 'reimbursement_info',
+				status: status
+			}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionIdZjb,
+						procDefKey: this.procDefKeyZjb,
+						status: status,
+						title: tabTitle,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessTable: 'reimbursement_info',
+						businessId: row.id,
+						isShow: false,
+						routePath: '/reimbursement/info/InfoList'
+					}
+				})
+			})
 		}else {
 			taskService.getTaskDef({ procDefId: this.processDefinitionId,
 				businessId: row.id,
@@ -493,6 +543,7 @@
           this.loading = false
         })
 		  this.checkIsZj()
+		  this.checkIsZjbry()
         processService.getByName('评估-报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -519,6 +570,13 @@
 				  this.procDefKeySzbxInvoice = data.key
 			  }
 		  })
+
+		  processService.getByName('评估-总经办报销').then((data) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdZjb = data.id
+				  this.procDefKeyZjb = data.key
+			  }
+		  })
       },
       // 删除
       del (id) {
@@ -553,6 +611,8 @@
 						this.procDefId = this.processDefinitionIdSzbx
 					}
 				}
+			}else if (this.isZjbry){
+				this.procDefId = this.processDefinitionIdZjb
 			}else {
 				if (row.reimbursementType === '1') {
 					this.procDefId = this.processDefinitionIdInvoice

src/views/reimbursement/info/ReimbursementForm.vue

@@ -871,6 +871,7 @@
 				amountKey: '',
 				invoiceReimbursementKey: '',
 				isZj:false,
+				isZjbry:false,
 			}
 		},
 
@@ -1047,6 +1048,9 @@
 					userService.isZj().then((data)=>{
 						this.isZj = data
 					})
+					userService.isZjbry().then((data)=>{
+						this.isZjbry = data
+					})
 				})
 			},
 			reapplyForm (callback) {
@@ -1390,7 +1394,27 @@
 							title = `发起流程【评估-报销审批-电子发票】`
 							describe = `[评估-报销审批-电子发票]`
 						}
-					}else {
+					}else if (this.isZjbry){
+						if (this.inputForm.reimbursementType === '0') {
+							await processService.getByName('评估-总经办报销').then((data) => {
+								if (!this.commonJS.isEmpty(data.id)) {
+									this.inputForm.procDefId = data.id
+									this.inputForm.procDefKey = data.key
+								}
+							})
+							title = `发起流程【评估-报销审批】`
+							describe = `[评估-报销审批]`
+						}else if (this.inputForm.reimbursementType === '1') {
+							await processService.getByName('评估-总经办报销').then((data) => {
+								if (!this.commonJS.isEmpty(data.id)) {
+									this.inputForm.procDefId = data.id
+									this.inputForm.procDefKey = data.key
+								}
+							})
+							title = `发起流程【评估-报销审批-电子发票】`
+							describe = `[评估-报销审批-电子发票]`
+						}
+					} else {
 						if (this.inputForm.reimbursementType === '0') {
 							await processService.getByName('评估-报销审批').then((data) => {
 								if (!this.commonJS.isEmpty(data.id)) {
@@ -1528,6 +1552,9 @@
 										if (data === '公司领导审批') {
 											this.inputForm.type = '5'
 										}
+										if (data === '总经办人员审批') {
+											this.inputForm.type = '5'
+										}
 									}
 									this.reimbursementService.save(this.inputForm).then((data) => {
 										callback(data.businessTable, data.businessId, this.inputForm)

src/views/zs/reimbursement/info/InfoList.vue

@@ -257,6 +257,7 @@
         },
         loading: false,
 		  isZj:false,
+		  isZjbry:false,
       }
     },
     // reimbursementService: null,
@@ -345,7 +346,27 @@
 					}
 				})
 			})
-		}else {
+		}else if (this.isZjbry) {
+			taskService.getTaskDef({ procDefId: this.processDefinitionIdZjb,
+				status: 'startAndHold'}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionIdZjb,
+						procDefKey: this.procDefKeyZjb,
+						status: 'startAndHold',
+						title: tabTitle,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessId: 'false',
+						isShow: false,
+						routePath: '/zs/reimbursement/info/InfoList'
+					}
+				})
+			})
+		} else {
 			taskService.getTaskDef({ procDefId: this.processDefinitionId,
 				status: 'startAndHold'}).then((data) => {
 				this.$router.push({
@@ -408,6 +429,30 @@
 					}
 				})
 			})
+		}else if(this.isZjbry){
+			taskService.getTaskDef({ procDefId: this.processDefinitionIdZjb,
+				businessId: row.id,
+				businessTable: 'zs_reimbursement_info',
+				status: status
+			}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionIdZjb,
+						procDefKey: this.procDefKeyZjb,
+						status: status,
+						title: tabTitle,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessTable: 'zs_reimbursement_info',
+						businessId: row.id,
+						isShow: false,
+						routePath: '/zs/reimbursement/info/InfoList'
+					}
+				})
+			})
 		}else {
 			taskService.getTaskDef({ procDefId: this.processDefinitionId,
 				businessId: row.id,
@@ -485,6 +530,11 @@
 				console.log('this.isZj',this.isZj)
 			})
 		},
+		checkIsZjbry(){
+			userService.isZjbry().then((data)=>{
+				this.isZjbry = data
+			})
+		},
       // 获取数据列表
       refreshList () {
         this.loading = true
@@ -509,6 +559,7 @@
         //   this.loading = false
         // })
 		  this.checkIsZj()
+		  this.checkIsZjbry()
         processService.getByName('中审-报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -535,6 +586,12 @@
 				  this.procDefKeySzbxInvoice = data.key
 			  }
 		  })
+		  processService.getByName('中审-总经办报销').then((data) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdZjb = data.id
+				  this.procDefKeyZjb = data.key
+			  }
+		  })
       },
       // 删除
       del (id) {
@@ -574,6 +631,8 @@
 						this.procDefId = this.processDefinitionIdSzbx
 					}
 				}
+			}else if (this.isZjbry){
+				this.procDefId = this.processDefinitionIdZjb
 			}else {
 				if (row.reimbursementType === '1') {
 					this.procDefId = this.processDefinitionIdInvoice

src/views/zs/reimbursement/info/ReimbursementForm.vue

@@ -803,6 +803,7 @@
         amountKey: '',
 		  invoiceReimbursementKey: '',
 		  isZj:false,
+		  isZjbry:false,
       }
     },
 	  provide() {
@@ -965,6 +966,9 @@
 			userService.isZj().then((data)=>{
 				this.isZj = data
 			})
+			userService.isZjbry().then((data)=>{
+				this.isZjbry = data
+			})
         })
       },
       // 表单提交
@@ -1298,7 +1302,27 @@
 					title = `发起流程【中审-报销审批-电子发票】`
 					describe = `[中审-报销审批-电子发票]`
 				}
-			}else {
+			}else if (this.isZjbry){
+				if (this.inputForm.reimbursementType === '0') {
+					await processService.getByName('中审-总经办报销').then((data) => {
+						if (!this.commonJS.isEmpty(data.id)) {
+							this.inputForm.procDefId = data.id
+							this.inputForm.procDefKey = data.key
+						}
+					})
+					title = `发起流程【中审-报销审批】`
+					describe = `[中审-报销审批]`
+				}else if (this.inputForm.reimbursementType === '1') {
+					await processService.getByName('中审-总经办报销').then((data) => {
+						if (!this.commonJS.isEmpty(data.id)) {
+							this.inputForm.procDefId = data.id
+							this.inputForm.procDefKey = data.key
+						}
+					})
+					title = `发起流程【中审-报销审批-电子发票】`
+					describe = `[中审-报销审批-电子发票]`
+				}
+			} else {
 				if (this.inputForm.reimbursementType === '0') {
 					await processService.getByName('中审-报销审批').then((data) => {
 						if (!this.commonJS.isEmpty(data.id)) {
@@ -1431,6 +1455,9 @@
                 if (data === '所长审批') {
                   this.inputForm.type = '5'
                 }
+				  if (data === '总经办人员审批') {
+					  this.inputForm.type = '5'
+				  }
               }
               this.reimbursementService.save(this.inputForm).then((data) => {
                 callback(data.businessTable, data.businessId, this.inputForm)