报销详情-调整为根据当前流程的id获取流程数据

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

@@ -964,36 +964,36 @@ export default {
 		detail(row) {
 
 			if (!this.commonJS.isEmpty(row.type) && row.type !== '1') {
-				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
-							}
-						}
-					}
-				}
+				// 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
+				// 			}
+				// 		}
+				// 	}
+				// }
 				let newStartDate = this.$dictUtils.getDictLabel("new_version_reimbursement_date", '1', '-')
 				let newVersionFlag = this.validateXG.compareDate(row.approvalTime, newStartDate) == 'same' || this.validateXG.compareDate(row.approvalTime, newStartDate) == 'after'
 				taskService.getTaskDef({
 					procInsId: row.procInsId,
-					procDefId: this.procDefId
+					procDefId: row.processDefinitionId
 				}).then((data) => {
 					if (newVersionFlag) {
 						data.formUrl = this.formUrl

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

@@ -806,31 +806,31 @@ export default {
 		// 流程详情
 		detail(row) {
 			if (!this.commonJS.isEmpty(row.type) && row.type !== '1') {
-				if (this.isZj || this.isDgsbxBmzr) {
-					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 (row.reimbursementType === '1') {
-						this.procDefId = this.processDefinitionIdInvoice
-					} else if (row.reimbursementType === '0') {
-						{
-							this.procDefId = this.processDefinitionId
-						}
-					}
-				}
+				// if (this.isZj || this.isDgsbxBmzr) {
+				// 	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 (row.reimbursementType === '1') {
+				// 		this.procDefId = this.processDefinitionIdInvoice
+				// 	} else if (row.reimbursementType === '0') {
+				// 		{
+				// 			this.procDefId = this.processDefinitionId
+				// 		}
+				// 	}
+				// }
 
 				let newStartDate = this.$dictUtils.getDictLabel("new_version_reimbursement_date", '1', '-')
 				let newVersionFlag = this.validateXG.compareDate(row.approvalTime, newStartDate) == 'same' || this.validateXG.compareDate(row.approvalTime, newStartDate) == 'after'
 				taskService.getTaskDef({
 					procInsId: row.procInsId,
-					procDefId: this.procDefId
+					procDefId: row.processDefinitionId
 				}).then((data) => {
 					if (newVersionFlag) {
 						data.formUrl = this.formUrl

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

@@ -474,7 +474,7 @@ export default {
 			let newStartDate = this.$dictUtils.getDictLabel("new_version_reimbursement_date", '1', '-')
 			let today = dayjs().format('YYYY-MM-DD');
 			let newVersionFlag = this.validateXG.compareDate(today, newStartDate) == 'same' || this.validateXG.compareDate(today, newStartDate) == 'after'
-			// 读取流程表单			
+			// 读取流程表单
 			let tabTitle = `发起流程【会计-报销审批】`
 			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-报销审批]`
 			//当前用户是否是会计所长
@@ -849,34 +849,32 @@ export default {
 		// 流程详情
 		detail(row) {
 			if (!this.commonJS.isEmpty(row.type) && row.type !== '1') {
-				if (this.isKjsz || this.isZj || this.isDgsbxBmzr) {
-					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
-						}
-					}
-				}
-				console.log(row.approvalTime);
-
+				// if (this.isKjsz || this.isZj || this.isDgsbxBmzr) {
+				// 	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
+				// 		}
+				// 	}
+				// }
 				let newStartDate = this.$dictUtils.getDictLabel("new_version_reimbursement_date", '1', '-')
 				let newVersionFlag = this.validateXG.compareDate(row.approvalTime, newStartDate) == 'same' || this.validateXG.compareDate(row.approvalTime, newStartDate) == 'after'
 				taskService.getTaskDef({
 					procInsId: row.procInsId,
-					procDefId: this.procDefId
+					procDefId: row.processDefinitionId
 				}).then((data) => {
 					if (newVersionFlag) {
 						data.formUrl = this.formUrl

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

@@ -893,31 +893,31 @@ export default {
 		// 流程详情
 		detail(row) {
 			if (!this.commonJS.isEmpty(row.type) && row.type !== '1') {
-				if (this.isZj || this.isDgsbxBmzr) {
-					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 (row.reimbursementType === '1') {
-						this.procDefId = this.processDefinitionIdInvoice
-					} else if (row.reimbursementType === '0') {
-						{
-							this.procDefId = this.processDefinitionId
-						}
-					}
-				}
+				// if (this.isZj || this.isDgsbxBmzr) {
+				// 	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 (row.reimbursementType === '1') {
+				// 		this.procDefId = this.processDefinitionIdInvoice
+				// 	} else if (row.reimbursementType === '0') {
+				// 		{
+				// 			this.procDefId = this.processDefinitionId
+				// 		}
+				// 	}
+				// }
 
 				let newStartDate = this.$dictUtils.getDictLabel("new_version_reimbursement_date", '1', '-')
 				let newVersionFlag = this.validateXG.compareDate(row.approvalTime, newStartDate) == 'same' || this.validateXG.compareDate(row.approvalTime, newStartDate) == 'after'
 				taskService.getTaskDef({
 					procInsId: row.procInsId,
-					procDefId: this.procDefId
+					procDefId: row.processDefinitionId
 				}).then((data) => {
 					if (newVersionFlag) {
 						data.formUrl = this.formUrl