文件补充调整

src/api/flowable/taskService.js

@@ -172,4 +172,12 @@ export default {
 			params: { procInsId: procInsId },
 		});
 	},
+	//根据procInsId获取创建时间，只限于文件补充流程
+	getCreateTimeByProcInsId(procInsId) {
+		return request({
+			url: prefix + "/flowable/task/getCreateTimeByProcInsId",
+			method: "get",
+			params: { procInsId: procInsId },
+		});
+	},
 };

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

@@ -178,7 +178,12 @@
 					<vxe-column width="100" title="报销人" field="name" align="center"></vxe-column>
 					<vxe-column width="100" title="报销部门" field="deptName" align="center"></vxe-column>
 					<vxe-column width="100" title="报销日期" field="approvalTime" align="center"></vxe-column>
-					<vxe-column width="120" title="报销金额(元)" field="number" fixed="right" align="center"></vxe-column>
+					<vxe-column width="120" title="报销金额(元)" field="number" fixed="right" align="center">
+						<template #default="scope">
+							<span v-if="isNewVersion(scope.row)">{{ scope.row.numberCount }}</span>
+							<span v-else>{{ scope.row.number }}</span>
+						</template>
+					</vxe-column>
 					<vxe-column width="100" title="状态" fixed="right" align="center" field="type">
 						<template #default="scope">
 							<el-button @click="detail(scope.row)"
@@ -339,7 +344,8 @@ export default {
 					return null
 				}
 			},
-			formUrl: '/ccpm/reimbursement/info/NewReimbursementForm'
+			formUrl: '/ccpm/reimbursement/info/NewReimbursementForm',
+			formUrlFile: '/ccpm/reimbursement/info/NewReimbursementFileSupplementForm',
 		}
 	},
 	// reimbursementService: null,
@@ -392,6 +398,15 @@ export default {
 		}
 	},
 	methods: {
+		// 判断时间
+		isNewVersion(row) {
+			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'
+			if (newVersionFlag) {
+				return true
+			}
+			return false
+		},
 		showHide() {
 			if (this.showHideItem === false) {
 				this.showHideItem = true
@@ -1144,6 +1159,8 @@ export default {
 		},
 		//文件补充
 		addFile(row) {
+			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'
 			// 读取流程表单
 			let tabTitle = `发起流程【项目-报销文件补充】`
 			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [项目-报销文件补充]`
@@ -1151,6 +1168,9 @@ export default {
 				procDefId: this.processDefinitionIdFile,
 				status: 'startAndClose'
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {
@@ -1183,10 +1203,16 @@ export default {
 		},
 		//文件补充  重新调整
 		todoFile(row) {
+			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'
+			// 读取流程表单
 			let cUser = false
 			taskService.getTaskDefInfo({
 				taskId: row.taskIdFile
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {
@@ -1226,10 +1252,16 @@ export default {
 		},
 		//文件补充流程详情
 		detailFile(row) {
+			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.procInsIdFile,
 				procDefId: this.processDefinitionIdFile
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskFormDetail',
 					query: {
@@ -1261,6 +1293,9 @@ export default {
 		},
 		//文件补充 修改
 		editFile(row) {
+			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'
+			// 读取流程表单
 			status = 'startAndClose'
 			let tabTitle = `发起流程【项目-报销文件补充】`
 			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [项目-报销文件补充]`
@@ -1271,6 +1306,10 @@ export default {
 				businessTable: 'ccpm_reimbursement_file_supplement',
 				status: status
 			}).then((data) => {
+				// 根据时间判断formUrl
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {

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

@@ -177,7 +177,12 @@
 					<vxe-column width="100" title="报销人" field="name" align="center"></vxe-column>
 					<vxe-column width="100" title="报销部门" field="deptName" align="center"></vxe-column>
 					<vxe-column width="100" title="报销日期" field="approvalTime" align="center"></vxe-column>
-					<vxe-column width="120" title="报销金额(元)" field="number" fixed="right" align="center"></vxe-column>
+					<vxe-column width="120" title="报销金额(元)" field="number" fixed="right" align="center">
+						<template #default="scope">
+							<span v-if="isNewVersion(scope.row)">{{ scope.row.numberCount }}</span>
+							<span v-else>{{ scope.row.number }}</span>
+						</template>
+					</vxe-column>
 					<vxe-column width="100" title="状态" fixed="right" align="center" field="type">
 						<template #default="scope">
 							<el-button @click="detail(scope.row)"
@@ -290,6 +295,7 @@ import dayjs from 'dayjs';
 export default {
 	data() {
 		return {
+			formUrlFile: '/consultancy/reimbursement/info/NewReimbursementFileSupplementForm',
 			formUrl: '/consultancy/reimbursement/info/NewReimbursementForm',
 			showHideItem: false,
 			showHideIcon: 'el-icon-arrow-down',
@@ -392,6 +398,15 @@ export default {
 		}
 	},
 	methods: {
+		// 判断时间
+		isNewVersion(row) {
+			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'
+			if (newVersionFlag) {
+				return true
+			}
+			return false
+		},
 		showHide() {
 			if (this.showHideItem === false) {
 				this.showHideItem = true
@@ -981,6 +996,9 @@ export default {
 		},
 		//文件补充
 		addFile(row) {
+			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'
+			// 读取流程表单
 			// 读取流程表单
 			let tabTitle = `发起流程【咨询-报销文件补充】`
 			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [咨询-报销文件补充]`
@@ -988,6 +1006,11 @@ export default {
 				procDefId: this.processDefinitionIdFile,
 				status: 'startAndClose'
 			}).then((data) => {
+				// 根据时间判断formUrl
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
+
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {
@@ -1020,10 +1043,16 @@ export default {
 		},
 		//文件补充  重新调整
 		todoFile(row) {
+			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'
+			// 读取流程表单
 			let cUser = false
 			taskService.getTaskDefInfo({
 				taskId: row.taskIdFile
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {
@@ -1063,10 +1092,16 @@ export default {
 		},
 		//文件补充流程详情
 		detailFile(row) {
+			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.procInsIdFile,
 				procDefId: this.processDefinitionIdFile
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskFormDetail',
 					query: {
@@ -1098,6 +1133,9 @@ export default {
 		},
 		//文件补充 修改
 		editFile(row) {
+			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'
+			// 读取流程表单
 			status = 'startAndClose'
 			let tabTitle = `发起流程【咨询-报销文件补充】`
 			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [咨询-报销文件补充]`
@@ -1108,6 +1146,9 @@ export default {
 				businessTable: 'consultancy_reimbursement_file_supplement',
 				status: status
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {

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

@@ -183,8 +183,12 @@
 					<vxe-column min-width="100" title="报销人" field="name" align="center"></vxe-column>
 					<vxe-column min-width="100" title="报销部门" field="deptName" align="center"></vxe-column>
 					<vxe-column min-width="100" title="报销日期" field="reimDate" align="center"></vxe-column>
-					<vxe-column min-width="100" title="报销金额(元)" field="number" fixed="right"
-						align="center"></vxe-column>
+					<vxe-column min-width="100" title="报销金额(元)" field="number" fixed="right" align="center">
+						<template #default="scope">
+							<span v-if="isNewVersion(scope.row)">{{ scope.row.numberCount }}</span>
+							<span v-else>{{ scope.row.number }}</span>
+						</template>
+					</vxe-column>
 					<vxe-column min-width="100" title="状态" fixed="right" align="center" field="type">
 						<template #default="scope">
 							<el-button @click="detail(scope.row)"
@@ -302,6 +306,7 @@ import dayjs from 'dayjs';
 export default {
 	data() {
 		return {
+			formUrlFile: '/cw/reimbursementApproval/info/NewReimbursementFileSupplementForm',
 			formUrl: '/cw/reimbursementApproval/info/NewReimbursementForm',
 			searchVisible: true,
 			showHideItem: false,
@@ -398,6 +403,15 @@ export default {
 		}
 	},
 	methods: {
+		// 判断时间
+		isNewVersion(row) {
+			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'
+			if (newVersionFlag) {
+				return true
+			}
+			return false
+		},
 		showHide() {
 			if (this.showHideItem === false) {
 				this.showHideItem = true
@@ -1062,6 +1076,8 @@ export default {
 		},
 		//文件补充
 		addFile(row) {
+			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'
 			// 读取流程表单
 			let tabTitle = `发起流程【会计-报销文件补充】`
 			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-报销文件补充]`
@@ -1069,6 +1085,9 @@ export default {
 				procDefId: this.processDefinitionIdFile,
 				status: 'startAndClose'
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {
@@ -1101,10 +1120,16 @@ export default {
 		},
 		//文件补充  重新调整
 		todoFile(row) {
+			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'
+			// 读取流程表单
 			let cUser = false
 			taskService.getTaskDefInfo({
 				taskId: row.taskIdFile
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {
@@ -1144,10 +1169,16 @@ export default {
 		},
 		//文件补充流程详情
 		detailFile(row) {
+			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.procInsIdFile,
 				procDefId: this.processDefinitionIdFile
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskFormDetail',
 					query: {
@@ -1179,6 +1210,9 @@ export default {
 		},
 		//文件补充 修改
 		editFile(row) {
+			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'
+			// 读取流程表单
 			status = 'startAndClose'
 			let tabTitle = `发起流程【会计-报销文件补充】`
 			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-报销文件补充]`
@@ -1189,6 +1223,9 @@ export default {
 				businessTable: 'cw_reimbursement_file_supplement',
 				status: status
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {

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

@@ -1814,8 +1814,6 @@ export default {
 									// 	return
 									// }
 									if (this.currentNodeName == "综合管理部主任审批") {
-										console.log("进来确认发票");
-
 										let confirmFlag = this.inputForm.invoiceReimbursementFiles.every(item => item.confirmStatus == 1)
 										if (!confirmFlag) {
 											this.$message.warning('数电发票未全部确认，请全部确认后再提交')
@@ -2456,9 +2454,7 @@ export default {
 			this.detailKeyProcured = Math.random()
 			this.$refs.reimbursementComponent.inputForm.invoiceReimbursementFiles = []
 			this.$refs.reimbursementComponent.inputForm.sourceType = value
-
 		},
-
 		submitCheck() {
 			if (this.commonJS.isEmpty(this.inputForm.sourceType)) {
 				this.$message.error('请填写报销类型')
@@ -2867,7 +2863,6 @@ export default {
 			}
 		},
 		async changeStatusApi() {
-
 			if (this.inputForm.invoiceReimbursementFiles.length == 0) {
 				return
 			}

src/views/dashboard/widgets/components/TodoList.vue

@@ -244,25 +244,30 @@ export default {
 					status: row.status,
 				})
 				.then(async (data) => {
-					// 如果为报销
+					// 如果是需要处理的流程
 					if (this.isReimbursementProcess(data.procDefKey)) {
-						// 根据流程名称获取对应的报销表单地址
-						let url = this.isReimbursementUrl(row.processDefinitionName)
-						if (url) {
-							let approvalTime = await taskService.getApprovalTimeByProcInsId(row.task.processInstanceId)
+						// 根据流程名称获取对应的表单地址
+						let urlObj = this.isReimbursementUrl(row.processDefinitionName)
+						if (urlObj) {
+							let approvalTime = null
+							// 判断是否为文件补充流程和报销流程
+							if (urlObj.type && urlObj.type === 'file') {
+								approvalTime = await taskService.getCreateTimeByProcInsId(row.task.processInstanceId)
+							} else {
+								approvalTime = await taskService.getApprovalTimeByProcInsId(row.task.processInstanceId)
+
+							}
 							if (approvalTime) {
 								// 根据发起审批的时间判断是否为新版本报销页面
 								let newStartDate = this.$dictUtils.getDictLabel("new_version_reimbursement_date", '1', '-')
 								const compareResult = this.validateXG.compareDate(approvalTime, newStartDate);
 								const newVersionFlag = compareResult == 'same' || compareResult == 'after';
-
 								if (newVersionFlag) {
-									data.formUrl = url
+									data.formUrl = urlObj.url
 								}
 							}
 						}
 					}
-
 					var cs = "cs"
 					this.$router.push({
 						path: "/flowable/task/TaskForm",
@@ -319,10 +324,25 @@ export default {
 				"Process_1709102298565",
 				"Process_1709104787957",
 				"Process_1711418224962",
+				"Process_1722305645394",
+				"Process_1722412442950",
+				"Process_1722416114655",
+				"Process_1722404901733",
+				"Process_1722389642543"
 			];
 			return reimbursementProcesses.includes(procDefKey);
 		},
 		isReimbursementUrl(name) {
+			// 会计-文件补充
+			let cwFile = ["会计-报销文件补充"]
+			//项目-报销文件补充
+			let ccpmFile = ["项目-报销文件补充"]
+			//咨询-报销文件补充
+			let zxFile = ["咨询-报销文件补充"]
+			//中审-文件补充
+			let zsFile = ["中审-报销文件补充"]
+			//评估-文件补充
+			let pgFile = ["评估-报销文件补充"]
 			// 会计
 			let cw = ["会计-所长报销", "会计-所长报销-电子发票", "会计-总经办报销", "盛所会计-报销申请", "会计-报销审批", "会计-报销审批-电子发票"]
 			// 中审
@@ -334,19 +354,64 @@ export default {
 			// 咨询
 			let zx = ["咨询-总经办报销", "咨询-所长报销", "咨询-所长报销-电子发票", "咨询-报销审批", "咨询-报销审批-电子发票"]
 			if (cw.includes(name)) {
-				return '/cw/reimbursementApproval/info/NewReimbursementForm'
+				return {
+					url: '/cw/reimbursementApproval/info/NewReimbursementForm',
+					type: 'reimbursement'
+				}
 			}
 			if (zs.includes(name)) {
-				return '/zs/reimbursement/info/NewReimbursementForm'
+				return {
+					url: '/zs/reimbursement/info/NewReimbursementForm',
+					type: 'reimbursement'
+				}
 			}
 			if (pg.includes(name)) {
-				return '/reimbursement/info/NewReimbursementForm'
+				return {
+					url: '/reimbursement/info/NewReimbursementForm',
+					type: 'reimbursement'
+				}
 			}
 			if (ccpm.includes(name)) {
-				return '/ccpm/reimbursement/info/NewReimbursementForm'
+				return {
+					url: '/ccpm/reimbursement/info/NewReimbursementForm',
+					type: 'reimbursement'
+				}
 			}
 			if (zx.includes(name)) {
-				return '/consultancy/reimbursement/info/NewReimbursementForm'
+				return {
+					url: '/consultancy/reimbursement/info/NewReimbursementForm',
+					type: 'reimbursement'
+				}
+			}
+			if (cwFile.includes(name)) {
+				return {
+					url: "/cw/reimbursementApproval/info/NewReimbursementFileSupplementForm",
+					type: 'file'
+				}
+			}
+			if (ccpmFile.includes(name)) {
+				return {
+					url: "/ccpm/reimbursement/info/NewReimbursementFileSupplementForm",
+					type: 'file'
+				}
+			}
+			if (zxFile.includes(name)) {
+				return {
+					url: "/consultancy/reimbursement/info/NewReimbursementFileSupplementForm",
+					type: 'file'
+				}
+			}
+			if (zsFile.includes(name)) {
+				return {
+					url: "/zs/reimbursement/info/NewReimbursementFileSupplementForm",
+					type: 'file'
+				}
+			}
+			if (pgFile.includes(name)) {
+				return {
+					url: "/reimbursement/info/NewReimbursementFileSupplementForm",
+					type: 'file'
+				}
 			}
 			return null;
 		},

src/views/home/components/TodoList2.vue

@@ -172,20 +172,26 @@ export default {
 					status: row.status,
 				})
 				.then(async (data) => {
-					// 如果为报销
+					// 如果是需要处理的流程
 					if (this.isReimbursementProcess(data.procDefKey)) {
-						// 根据流程名称获取对应的报销表单地址
-						let url = this.isReimbursementUrl(row.processDefinitionName)
-						if (url) {
-							let approvalTime = await taskService.getApprovalTimeByProcInsId(row.task.processInstanceId)
+						// 根据流程名称获取对应的表单地址
+						let urlObj = this.isReimbursementUrl(row.processDefinitionName)
+						if (urlObj) {
+							let approvalTime = null
+							// 判断是否为文件补充流程和报销流程
+							if (urlObj.type && urlObj.type === 'file') {
+								approvalTime = await taskService.getCreateTimeByProcInsId(row.task.processInstanceId)
+							} else {
+								approvalTime = await taskService.getApprovalTimeByProcInsId(row.task.processInstanceId)
+
+							}
 							if (approvalTime) {
 								// 根据发起审批的时间判断是否为新版本报销页面
 								let newStartDate = this.$dictUtils.getDictLabel("new_version_reimbursement_date", '1', '-')
 								const compareResult = this.validateXG.compareDate(approvalTime, newStartDate);
 								const newVersionFlag = compareResult == 'same' || compareResult == 'after';
-
 								if (newVersionFlag) {
-									data.formUrl = url
+									data.formUrl = urlObj.url
 								}
 							}
 						}
@@ -274,10 +280,25 @@ export default {
 				"Process_1709102298565",
 				"Process_1709104787957",
 				"Process_1711418224962",
+				"Process_1722305645394",
+				"Process_1722412442950",
+				"Process_1722416114655",
+				"Process_1722404901733",
+				"Process_1722389642543"
 			];
 			return reimbursementProcesses.includes(procDefKey);
 		},
 		isReimbursementUrl(name) {
+			// 会计-文件补充
+			let cwFile = ["会计-报销文件补充"]
+			//项目-报销文件补充
+			let ccpmFile = ["项目-报销文件补充"]
+			//咨询-报销文件补充
+			let zxFile = ["咨询-报销文件补充"]
+			//中审-文件补充
+			let zsFile = ["中审-报销文件补充"]
+			//评估-文件补充
+			let pgFile = ["评估-报销文件补充"]
 			// 会计
 			let cw = ["会计-所长报销", "会计-所长报销-电子发票", "会计-总经办报销", "盛所会计-报销申请", "会计-报销审批", "会计-报销审批-电子发票"]
 			// 中审
@@ -289,19 +310,64 @@ export default {
 			// 咨询
 			let zx = ["咨询-总经办报销", "咨询-所长报销", "咨询-所长报销-电子发票", "咨询-报销审批", "咨询-报销审批-电子发票"]
 			if (cw.includes(name)) {
-				return '/cw/reimbursementApproval/info/NewReimbursementForm'
+				return {
+					url: '/cw/reimbursementApproval/info/NewReimbursementForm',
+					type: 'reimbursement'
+				}
 			}
 			if (zs.includes(name)) {
-				return '/zs/reimbursement/info/NewReimbursementForm'
+				return {
+					url: '/zs/reimbursement/info/NewReimbursementForm',
+					type: 'reimbursement'
+				}
 			}
 			if (pg.includes(name)) {
-				return '/reimbursement/info/NewReimbursementForm'
+				return {
+					url: '/reimbursement/info/NewReimbursementForm',
+					type: 'reimbursement'
+				}
 			}
 			if (ccpm.includes(name)) {
-				return '/ccpm/reimbursement/info/NewReimbursementForm'
+				return {
+					url: '/ccpm/reimbursement/info/NewReimbursementForm',
+					type: 'reimbursement'
+				}
 			}
 			if (zx.includes(name)) {
-				return '/consultancy/reimbursement/info/NewReimbursementForm'
+				return {
+					url: '/consultancy/reimbursement/info/NewReimbursementForm',
+					type: 'reimbursement'
+				}
+			}
+			if (cwFile.includes(name)) {
+				return {
+					url: "/cw/reimbursementApproval/info/NewReimbursementFileSupplementForm",
+					type: 'file'
+				}
+			}
+			if (ccpmFile.includes(name)) {
+				return {
+					url: "/ccpm/reimbursement/info/NewReimbursementFileSupplementForm",
+					type: 'file'
+				}
+			}
+			if (zxFile.includes(name)) {
+				return {
+					url: "/consultancy/reimbursement/info/NewReimbursementFileSupplementForm",
+					type: 'file'
+				}
+			}
+			if (zsFile.includes(name)) {
+				return {
+					url: "/zs/reimbursement/info/NewReimbursementFileSupplementForm",
+					type: 'file'
+				}
+			}
+			if (pgFile.includes(name)) {
+				return {
+					url: "/reimbursement/info/NewReimbursementFileSupplementForm",
+					type: 'file'
+				}
 			}
 			return null;
 		},

src/views/reimbursement/info/InfoList.vue

@@ -167,7 +167,12 @@
           <vxe-column min-width="100" title="报销人" field="name" align="center"></vxe-column>
           <vxe-column min-width="100" title="报销部门" field="deptName" align="center"></vxe-column>
           <vxe-column min-width="100" title="报销日期" field="approvalTime" align="center"></vxe-column>
-          <vxe-column min-width="150" title="报销金额(元)" field="number" align="center"></vxe-column>
+          <vxe-column min-width="150" title="报销金额(元)" field="number" align="center">
+            <template #default="scope">
+              <span v-if="isNewVersion(scope.row)">{{ scope.row.numberCount }}</span>
+              <span v-else>{{ scope.row.number }}</span>
+            </template>
+          </vxe-column>
           <vxe-column min-width="100" title="状态" fixed="right" align="center" field="type">
             <template #default="scope">
               <el-button @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '')"
@@ -274,6 +279,7 @@ import dayjs from 'dayjs';
 export default {
   data() {
     return {
+      formUrlFile: '/reimbursement/info/NewReimbursementFileSupplementForm',
       formUrl: '/reimbursement/info/NewReimbursementForm',
       showHideItem: false,
       showHideIcon: 'el-icon-arrow-down',
@@ -368,6 +374,14 @@ export default {
     }
   },
   methods: {
+    isNewVersion(row) {
+      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'
+      if (newVersionFlag) {
+        return true
+      }
+      return false
+    },
     showHide() {
       if (this.showHideItem === false) {
         this.showHideItem = true
@@ -988,6 +1002,8 @@ export default {
     },
     //文件补充
     addFile(row) {
+      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'
       // 读取流程表单
       let tabTitle = `发起流程【评估-报销文件补充】`
       let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-报销文件补充]`
@@ -995,6 +1011,9 @@ export default {
         procDefId: this.processDefinitionIdFile,
         status: 'startAndClose'
       }).then((data) => {
+        if (newVersionFlag) {
+          data.formUrl = this.formUrlFile
+        }
         this.$router.push({
           path: '/flowable/task/TaskForm',
           query: {
@@ -1027,10 +1046,16 @@ export default {
     },
     //文件补充  重新调整
     todoFile(row) {
+      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'
+      // 读取流程表单
       let cUser = false
       taskService.getTaskDefInfo({
         taskId: row.taskIdFile
       }).then((data) => {
+        if (newVersionFlag) {
+          data.formUrl = this.formUrlFile
+        }
         this.$router.push({
           path: '/flowable/task/TaskForm',
           query: {
@@ -1070,10 +1095,16 @@ export default {
     },
     //文件补充流程详情
     detailFile(row) {
+      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.procInsIdFile,
         procDefId: this.processDefinitionIdFile
       }).then((data) => {
+        if (newVersionFlag) {
+          data.formUrl = this.formUrlFile
+        }
         this.$router.push({
           path: '/flowable/task/TaskFormDetail',
           query: {
@@ -1105,6 +1136,9 @@ export default {
     },
     //文件补充 修改
     editFile(row) {
+      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'
+      // 读取流程表单
       status = 'startAndClose'
       let tabTitle = `发起流程【评估-报销文件补充】`
       let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-报销文件补充]`
@@ -1115,6 +1149,9 @@ export default {
         businessTable: 'reimbursement_file_supplement',
         status: status
       }).then((data) => {
+        if (newVersionFlag) {
+          data.formUrl = this.formUrlFile
+        }
         this.$router.push({
           path: '/flowable/task/TaskForm',
           query: {

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

@@ -187,7 +187,12 @@
 					<vxe-column width="100" title="报销人" field="name" align="center"></vxe-column>
 					<vxe-column width="100" title="报销部门" field="deptName" align="center"></vxe-column>
 					<vxe-column width="100" title="报销日期" field="approvalTime" align="center"></vxe-column>
-					<vxe-column width="120" title="报销金额(元)" field="number" fixed="right" align="center"></vxe-column>
+					<vxe-column width="120" title="报销金额(元)" field="number" fixed="right" align="center">
+						<template #default="scope">
+							<span v-if="isNewVersion(scope.row)">{{ scope.row.numberCount }}</span>
+							<span v-else>{{ scope.row.number }}</span>
+						</template>
+					</vxe-column>
 					<vxe-column width="100" title="状态" fixed="right" align="center" field="type">
 						<template #default="scope">
 							<el-button @click="detail(scope.row)"
@@ -304,6 +309,7 @@ import dayjs from 'dayjs';
 export default {
 	data() {
 		return {
+			formUrlFile: "/zs/reimbursement/info/NewReimbursementFileSupplementForm",
 			formUrl: '/zs/reimbursement/info/NewReimbursementForm',
 			showHideItem: false,
 			showHideIcon: 'el-icon-arrow-down',
@@ -407,6 +413,15 @@ export default {
 		}
 	},
 	methods: {
+		// 判断时间
+		isNewVersion(row) {
+			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'
+			if (newVersionFlag) {
+				return true
+			}
+			return false
+		},
 		showHide() {
 			if (this.showHideItem === false) {
 				this.showHideItem = true
@@ -998,6 +1013,8 @@ export default {
 		},
 		//文件补充
 		addFile(row) {
+			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'
 			// 读取流程表单
 			let tabTitle = `发起流程【中审-报销文件补充】`
 			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [中审-报销文件补充]`
@@ -1005,6 +1022,9 @@ export default {
 				procDefId: this.processDefinitionIdFile,
 				status: 'startAndClose'
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {
@@ -1037,10 +1057,16 @@ export default {
 		},
 		//文件补充  重新调整
 		todoFile(row) {
+			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'
+
 			let cUser = false
 			taskService.getTaskDefInfo({
 				taskId: row.taskIdFile
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {
@@ -1080,10 +1106,16 @@ export default {
 		},
 		//文件补充流程详情
 		detailFile(row) {
+			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.procInsIdFile,
 				procDefId: this.processDefinitionIdFile
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskFormDetail',
 					query: {
@@ -1115,6 +1147,9 @@ export default {
 		},
 		//文件补充 修改
 		editFile(row) {
+			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'
+
 			status = 'startAndClose'
 			let tabTitle = `发起流程【中审-报销文件补充】`
 			let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [中审-报销文件补充]`
@@ -1125,6 +1160,9 @@ export default {
 				businessTable: 'zs_reimbursement_file_supplement',
 				status: status
 			}).then((data) => {
+				if (newVersionFlag) {
+					data.formUrl = this.formUrlFile
+				}
 				this.$router.push({
 					path: '/flowable/task/TaskForm',
 					query: {