所长报销

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

@@ -520,6 +520,13 @@
 			  }
 		  })
 
+		  processService.getByName('会计-所长报销-电子发票').then((data) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdSzbxInvoice = data.id
+				  this.procDefKeySzbxInvoice = data.key
+			  }
+		  })
+
       },
       // 删除
       del (id) {
@@ -546,15 +553,22 @@
       // 流程详情
       detail (row) {
         if (!this.commonJS.isEmpty(row.type) && row.type !== '1') {
-			if (row.reimbursementType === '1') {
-				this.procDefId = this.processDefinitionIdInvoice
-			} else if (row.reimbursementType === '0') {
-				{
-					this.procDefId = this.processDefinitionId
-				}
-			}
 			if (this.isKjsz){
-				this.procDefId = this.processDefinitionIdSzbx
+				if (row.reimbursementType === '1') {
+					this.procDefId = this.processDefinitionIdSzbxInvoice
+				} else if (row.reimbursementType === '0') {
+					{
+						this.procDefId = this.processDefinitionIdSzbx
+					}
+				}
+			}else {
+				if (row.reimbursementType === '1') {
+					this.procDefId = this.processDefinitionIdInvoice
+				} else if (row.reimbursementType === '0') {
+					{
+						this.procDefId = this.processDefinitionId
+					}
+				}
 			}
           taskService.getTaskDef({
             procInsId: row.procInsId,

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

@@ -1449,34 +1449,50 @@
 		  let title = `发起流程【会计-报销审批】`
 		  let describe = `[会计-报销审批]`
 		  if (this.inputForm.reimbursementType) {
-			  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 = `[会计-报销审批-电子发票]`
-			  }
-		  }
-		  if (this.isKjsz){
-			   await processService.getByName('会计-所长报销').then((data) => {
-				  if (!this.commonJS.isEmpty(data.id)) {
-					  this.inputForm.procDefId = data.id
-					  this.inputForm.procDefKey = data.key
+			  if (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.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) {
             this.loading = true

src/views/flowable/task/TaskForm.vue

@@ -740,6 +740,7 @@ export default {
 		// Process_1702369424692 会计-报告号申请
 		// Process_1670486210440 会计-报告号复核
 		// Process_1704851888818 会计-所长报销
+		// Process_1705370333755 会计-所长报销-电子发票
 		// 驳回
 		reject(vars) {
 			if (this.procDefId.includes('Process_1667978088459') ||
@@ -800,7 +801,8 @@ export default {
 				this.procDefId.includes('Process_1702005929963') ||
 				this.procDefId.includes('Process_1702369424692') ||
 				this.procDefId.includes('Process_1670486210440') ||
-				this.procDefId.includes('Process_1704851888818')
+				this.procDefId.includes('Process_1704851888818') ||
+				this.procDefId.includes('Process_1705370333755')
 			) {
 				console.log('进入新版驳回')
 				this.$confirm(`确定驳回流程吗?`, '提示', {