sangwenwei пре 1 година
родитељ
комит
9d39f79589

+ 259 - 190
src/views/ccpm/reimbursement/info/InfoList.vue

@@ -111,6 +111,7 @@
       <vxe-toolbar ref="toolbarRef" :refresh="{query: refreshList}" export custom>
         <template #buttons>
           <el-button v-if="hasPermission('ccpm:info:add')" type="primary" icon="el-icon-plus" @click="add()">新建</el-button>
+          <el-button v-else-if="hasPermission('ccpm:info:xdj') && isXdj" type="primary" icon="el-icon-plus" @click="add()">新建</el-button>
           <el-button v-if="hasPermission('ccpm:info:del')" type="danger" icon="el-icon-delete" @click="del()" :disabled="$refs.infoTable && $refs.infoTable.getCheckboxRecords().length === 0" plain>删除</el-button>
 			<el-button type="warning" icon="el-icon-download" @click="exportInvoiceReimbursementFile()" plain>电子发票报销</el-button>
         </template>
@@ -270,6 +271,7 @@
 		  isAdmin:false,
 		  isDgsbxBmzr:false,
 		  isKjsz:false,
+		  isXdj:false
       }
     },
     // reimbursementService: null,
@@ -338,88 +340,111 @@
         let tabTitle = `发起流程【项目-报销审批】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [项目-报销审批]`
         console.log(this.processDefinitionId)
-        if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
-			taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
-				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.processDefinitionIdSzbx,
-						procDefKey: this.procDefKeySzbx,
-						status: 'startAndHold',
-						title: tabTitle,
-						formType: data.formType,
-						formUrl: data.formUrl,
-						formTitle: processTitle,
-						businessId: 'false',
-						isShow: false,
-						routePath: '/ccpm/reimbursement/info/InfoList'
-					}
+	  	if (this.isXdj) {
+			  taskService.getTaskDef({ procDefId: this.processDefinitionIdXdj,
+				  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.processDefinitionIdXdj,
+						  procDefKey: this.procDefKeyXdj,
+						  status: 'startAndHold',
+						  title: tabTitle,
+						  formType: data.formType,
+						  formUrl: data.formUrl,
+						  formTitle: processTitle,
+						  businessId: 'false',
+						  isShow: false,
+						  routePath: '/ccpm/reimbursement/info/InfoList'
+					  }
+				  })
+			  })
+		  }else {
+			if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
+				taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
+					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.processDefinitionIdSzbx,
+							procDefKey: this.procDefKeySzbx,
+							status: 'startAndHold',
+							title: tabTitle,
+							formType: data.formType,
+							formUrl: data.formUrl,
+							formTitle: processTitle,
+							businessId: 'false',
+							isShow: false,
+							routePath: '/ccpm/reimbursement/info/InfoList'
+						}
+					})
 				})
-			})
-		}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 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 if (this.isSs) {
-			taskService.getTaskDef({ procDefId: this.processDefinitionIdSs,
-				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.processDefinitionIdSs,
-						procDefKey: this.procDefKeySs,
-						status: 'startAndHold',
-						title: tabTitle,
-						formType: data.formType,
-						formUrl: data.formUrl,
-						formTitle: processTitle,
-						businessId: 'false',
-						isShow: false,
-						routePath: '/ccpm/reimbursement/info/InfoList'
-					}
+			}else if (this.isSs) {
+				taskService.getTaskDef({ procDefId: this.processDefinitionIdSs,
+					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.processDefinitionIdSs,
+							procDefKey: this.procDefKeySs,
+							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({
-					path: '/flowable/task/TaskForm',
-					query: {
-						...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
-						procDefId: this.processDefinitionId,
-						procDefKey: this.procDefKey,
-						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({
+						path: '/flowable/task/TaskForm',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+							procDefId: this.processDefinitionId,
+							procDefKey: this.procDefKey,
+							status: 'startAndHold',
+							title: tabTitle,
+							formType: data.formType,
+							formUrl: data.formUrl,
+							formTitle: processTitle,
+							businessId: 'false',
+							isShow: false,
+							routePath: '/ccpm/reimbursement/info/InfoList'
+						}
+					})
 				})
-			})
+			}
 		}
 
+
       },
       // 修改
       edit (row) {
@@ -437,104 +462,131 @@
         // 读取流程表单
         let tabTitle = `发起流程【项目-报销审批】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [项目-报销审批]`
-        if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
-			taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
-				businessId: row.id,
-				businessTable: 'ccpm_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.processDefinitionIdSzbx,
-						procDefKey: this.procDefKeySzbx,
-						status: status,
-						title: tabTitle,
-						formType: data.formType,
-						formUrl: data.formUrl,
-						formTitle: processTitle,
-						businessTable: 'ccpm_reimbursement_info',
-						businessId: row.id,
-						isShow: false,
-						routePath: '/ccpm/reimbursement/info/InfoList'
-					}
+	  	if(this.isXdj){
+			  taskService.getTaskDef({ procDefId: this.processDefinitionIdXdj,
+				  businessId: row.id,
+				  businessTable: 'ccpm_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.processDefinitionIdXdj,
+						  procDefKey: this.procDefKeyXdj,
+						  status: status,
+						  title: tabTitle,
+						  formType: data.formType,
+						  formUrl: data.formUrl,
+						  formTitle: processTitle,
+						  businessTable: 'ccpm_reimbursement_info',
+						  businessId: row.id,
+						  isShow: false,
+						  routePath: '/ccpm/reimbursement/info/InfoList'
+					  }
+				  })
+			  })
+		  }else {
+			if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
+				taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
+					businessId: row.id,
+					businessTable: 'ccpm_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.processDefinitionIdSzbx,
+							procDefKey: this.procDefKeySzbx,
+							status: status,
+							title: tabTitle,
+							formType: data.formType,
+							formUrl: data.formUrl,
+							formTitle: processTitle,
+							businessTable: 'ccpm_reimbursement_info',
+							businessId: row.id,
+							isShow: false,
+							routePath: '/ccpm/reimbursement/info/InfoList'
+						}
+					})
 				})
-			})
-		}else if(this.isZjbry){
-			taskService.getTaskDef({ procDefId: this.processDefinitionIdZjb,
-				businessId: row.id,
-				businessTable: 'ccpm_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: 'ccpm_reimbursement_info',
-						businessId: row.id,
-						isShow: false,
-						routePath: '/ccpm/reimbursement/info/InfoList'
-					}
+			}else if(this.isZjbry){
+				taskService.getTaskDef({ procDefId: this.processDefinitionIdZjb,
+					businessId: row.id,
+					businessTable: 'ccpm_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: 'ccpm_reimbursement_info',
+							businessId: row.id,
+							isShow: false,
+							routePath: '/ccpm/reimbursement/info/InfoList'
+						}
+					})
 				})
-			})
-		}else if(this.isSs){
-			taskService.getTaskDef({ procDefId: this.processDefinitionIdSs,
-				businessId: row.id,
-				businessTable: 'ccpm_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.processDefinitionIdSs,
-						procDefKey: this.procDefKeySs,
-						status: status,
-						title: tabTitle,
-						formType: data.formType,
-						formUrl: data.formUrl,
-						formTitle: processTitle,
-						businessTable: 'ccpm_reimbursement_info',
-						businessId: row.id,
-						isShow: false,
-						routePath: '/ccpm/reimbursement/info/InfoList'
-					}
+			}else if(this.isSs){
+				taskService.getTaskDef({ procDefId: this.processDefinitionIdSs,
+					businessId: row.id,
+					businessTable: 'ccpm_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.processDefinitionIdSs,
+							procDefKey: this.procDefKeySs,
+							status: status,
+							title: tabTitle,
+							formType: data.formType,
+							formUrl: data.formUrl,
+							formTitle: processTitle,
+							businessTable: 'ccpm_reimbursement_info',
+							businessId: row.id,
+							isShow: false,
+							routePath: '/ccpm/reimbursement/info/InfoList'
+						}
+					})
 				})
-			})
-		}else {
-			taskService.getTaskDef({ procDefId: this.processDefinitionId,
-				businessId: row.id,
-				businessTable: 'ccpm_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.processDefinitionId,
-						procDefKey: this.procDefKey,
-						status: status,
-						title: tabTitle,
-						formType: data.formType,
-						formUrl: data.formUrl,
-						formTitle: processTitle,
-						businessTable: 'ccpm_reimbursement_info',
-						businessId: row.id,
-						isShow: false,
-						routePath: '/ccpm/reimbursement/info/InfoList'
-					}
+			}else {
+				taskService.getTaskDef({ procDefId: this.processDefinitionId,
+					businessId: row.id,
+					businessTable: 'ccpm_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.processDefinitionId,
+							procDefKey: this.procDefKey,
+							status: status,
+							title: tabTitle,
+							formType: data.formType,
+							formUrl: data.formUrl,
+							formTitle: processTitle,
+							businessTable: 'ccpm_reimbursement_info',
+							businessId: row.id,
+							isShow: false,
+							routePath: '/ccpm/reimbursement/info/InfoList'
+						}
+					})
 				})
-			})
+			}
 		}
 
+
       },
       todo (row) {
         let cUser = false
@@ -623,6 +675,13 @@
 				console.log('this.isKjsz',this.isKjsz)
 			})
 		},
+		//查询当前登录人是否是徐大军
+		checkIsXdj(){
+      		let name = this.$store.state.user.name
+			if ("徐大军" === name){
+				this.isXdj = true
+			}
+		},
       // 获取数据列表
       refreshList () {
         this.loading = true
@@ -652,6 +711,7 @@
 		  this.checkIsSs()
 		  this.checkIsAdmin()
 		  this.checkIsKjsz()
+		  this.checkIsXdj()
         processService.getByName('项目-报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -690,6 +750,12 @@
 				  this.procDefKeySs = data.key
 			  }
 		  })
+		  processService.getByName('物资-项目报销').then((data) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdXdj = data.id
+				  this.procDefKeyXdj = data.key
+			  }
+		  })
       },
       // 删除
       del (id) {
@@ -721,28 +787,31 @@
       // 流程详情
       detail (row) {
         if (!this.commonJS.isEmpty(row.type) && row.type !== '1') {
-        	if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
-				if (row.reimbursementType === '1') {
-					this.procDefId = this.processDefinitionIdSzbxInvoice
-				} else if (row.reimbursementType === '0') {
-					{
-						this.procDefId = this.processDefinitionIdSzbx
-					}
-				}
-			}else if (this.isZjbry){
-				this.procDefId = this.processDefinitionIdZjb
-			}else if (this.isSs){
-				this.procDefId = this.processDefinitionIdSs
-			}else {
-				if (row.reimbursementType === '1') {
-					this.procDefId = this.processDefinitionIdInvoice
-				} else if (row.reimbursementType === '0') {
-					{
-						this.procDefId = this.processDefinitionId
-					}
-				}
-			}
-
+				 if (this.isXdj) {
+					 this.procDefId = this.processDefinitionIdXdj
+				 }else {
+					 if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
+						 if (row.reimbursementType === '1') {
+							 this.procDefId = this.processDefinitionIdSzbxInvoice
+						 } else if (row.reimbursementType === '0') {
+							 {
+								 this.procDefId = this.processDefinitionIdSzbx
+							 }
+						 }
+					 }else if (this.isZjbry){
+						 this.procDefId = this.processDefinitionIdZjb
+					 }else if (this.isSs){
+						 this.procDefId = this.processDefinitionIdSs
+					 }else {
+						 if (row.reimbursementType === '1') {
+							 this.procDefId = this.processDefinitionIdInvoice
+						 } else if (row.reimbursementType === '0') {
+							 {
+								 this.procDefId = this.processDefinitionId
+							 }
+						 }
+					 }
+				 }
           taskService.getTaskDef({
             procInsId: row.procInsId,
 			  procDefId: this.procDefId

+ 92 - 63
src/views/ccpm/reimbursement/info/ReimbursementForm.vue

@@ -807,6 +807,7 @@
 		  isZjbry:false,
 		  isSs:false,
 		  isKjsz:false,
+		  isXdj:false,
       }
     },
 	  provide() {
@@ -981,6 +982,10 @@
 			userService.isKjsz().then((data)=>{
 				this.isKjsz = data
 			})
+			let name = this.$store.state.user.name
+			if ("徐大军" === name){
+				this.isXdj = true
+			}
         })
       },
       // 表单提交
@@ -1294,9 +1299,9 @@
 		  let title = `发起流程【项目-报销审批】`
 		  let describe = `[项目-报销审批]`
 		  if (this.inputForm.reimbursementType) {
-		  	if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
+		  	if (this.isXdj){
 				if (this.inputForm.reimbursementType === '0') {
-					await processService.getByName('项目-报销审批').then((data) => {
+					await processService.getByName('物资-项目报销').then((data) => {
 						if (!this.commonJS.isEmpty(data.id)) {
 							this.inputForm.procDefId = data.id
 							this.inputForm.procDefKey = data.key
@@ -1305,47 +1310,7 @@
 					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.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.isSs){
-				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) => {
+					await processService.getByName('物资-项目报销').then((data) => {
 						if (!this.commonJS.isEmpty(data.id)) {
 							this.inputForm.procDefId = data.id
 							this.inputForm.procDefKey = data.key
@@ -1354,28 +1319,89 @@
 					title = `发起流程【项目-报销审批-电子发票】`
 					describe = `[项目-报销审批-电子发票]`
 				}
-			} else {
-				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.isZj || this.isDgsbxBmzr || this.isKjsz){
+					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.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.isSs){
+					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)) {
+								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 = `[项目-报销审批-电子发票]`
+					}
 				}
 			}
-
 		  }
         this.$refs['inputForm'].validate(async (valid) => {
           if (valid) {
@@ -1493,6 +1519,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)

+ 4 - 2
src/views/flowable/task/TaskForm.vue

@@ -764,7 +764,8 @@ export default {
 		// Process_1709606246355 财务-报告签章
 		// Process_1709716869089 评估-报告签章
 		// Process_1710204867282 评估-项目作废
-		// Process_1710983508724 会计-预开票申请
+		// Process_1711414021644 会计-预开票申请
+		// Process_1711418224962 物资-项目报销
 		// 驳回
 		reject(vars) {
 			if (this.procDefId.includes('Process_1667978088459') ||
@@ -850,7 +851,8 @@ export default {
 				this.procDefId.includes('Process_1709716622665') ||
 				this.procDefId.includes('Process_1709716869089') ||
 				this.procDefId.includes('Process_1710204867282') ||
-				this.procDefId.includes('Process_1710983508724')
+				this.procDefId.includes('Process_1711414021644') ||
+				this.procDefId.includes('Process_1711418224962')
 			) {
 				console.log('进入新版驳回')
 				this.$confirm(`确定驳回流程吗?`, '提示', {