专家报销

src/api/sys/userService.js

@@ -140,6 +140,13 @@ export default {
 		});
 	},
 
+	isZj:function() {
+		return request({
+			url: prefix + "/sys/user/isZj",
+			method: "get",
+		});
+	},
+
 	queryDetailList(ids) {
 		return request({
 			url: prefix + `/sys/user/queryDetailList`,

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

@@ -273,7 +273,8 @@
         },
         loading: false,
         isAdmin: false,
-		  isKjsz:false
+		  isKjsz:false,
+		  isZj:false,
       }
     },
     reimbursementApprovalService: null,
@@ -338,6 +339,12 @@
 			console.log('this.isKjsz',this.isKjsz)
 		})
 		},
+		checkIsZj(){
+			userService.isZj().then((data)=>{
+				this.isZj = data
+				console.log('this.isZj',this.isZj)
+			})
+		},
       viewContract (id) {
         this.$refs.contractNameForm.init('view', id)
       },
@@ -347,7 +354,7 @@
 		  let tabTitle = `发起流程【会计-报销审批】`
 		  let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-报销审批]`
       	//当前用户是否是会计所长
-		  if (this.isKjsz){
+		  if (this.isKjsz || this.isZj){
 			  taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
 				  status: 'startAndHold'}).then((data) => {
 				  this.$router.push({
@@ -407,7 +414,7 @@
         // 读取流程表单
         let tabTitle = `发起流程【会计-报销审批】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-报销审批]`
-		  if (this.isKjsz){
+		  if (this.isKjsz || this.isZj){
 			  taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
 				  businessId: row.id,
 				  businessTable: 'cw_reimbursement_info',
@@ -499,6 +506,7 @@
         })
         this.checkIsAdmin()
 	  	this.checkIsKjsz()
+		  this.checkIsZj()
         processService.getByName('会计-报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -553,7 +561,7 @@
       // 流程详情
       detail (row) {
         if (!this.commonJS.isEmpty(row.type) && row.type !== '1') {
-			if (this.isKjsz){
+			if (this.isKjsz || this.isZj){
 				if (row.reimbursementType === '1') {
 					this.procDefId = this.processDefinitionIdSzbxInvoice
 				} else if (row.reimbursementType === '0') {

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

@@ -922,7 +922,8 @@
         keyWatch: '',
         amountKey: '',
 		  invoiceReimbursementKey: '',
-		  isKjsz:false
+		  isKjsz:false,
+		  isZj:false,
       }
     },
 	  provide() {
@@ -1092,6 +1093,9 @@
 			userService.isKjsz().then((data)=>{
 				this.isKjsz = data
 			})
+			userService.isZj().then((data)=>{
+				this.isZj = data
+			})
 
         })
       },
@@ -1449,7 +1453,7 @@
 		  let title = `发起流程【会计-报销审批】`
 		  let describe = `[会计-报销审批]`
 		  if (this.inputForm.reimbursementType) {
-			  if (this.isKjsz){
+			  if (this.isKjsz || this.isZj){
 				  if (this.inputForm.reimbursementType === '0') {
 					  await processService.getByName('会计-所长报销').then((data) => {
 						  if (!this.commonJS.isEmpty(data.id)) {

src/views/flowable/task/TaskForm.vue

@@ -741,6 +741,10 @@ export default {
 		// Process_1670486210440 会计-报告号复核
 		// Process_1704851888818 会计-所长报销
 		// Process_1705370333755 会计-所长报销-电子发票
+		// Process_1705389994103 中审-所长报销
+		// Process_1705390592348 中审-所长报销-电子发票
+		// Process_1705391439287 评估-所长报销
+		// Process_1705391725816 评估-所长报销-电子发票
 		// 驳回
 		reject(vars) {
 			if (this.procDefId.includes('Process_1667978088459') ||
@@ -802,7 +806,11 @@ export default {
 				this.procDefId.includes('Process_1702369424692') ||
 				this.procDefId.includes('Process_1670486210440') ||
 				this.procDefId.includes('Process_1704851888818') ||
-				this.procDefId.includes('Process_1705370333755')
+				this.procDefId.includes('Process_1705370333755') ||
+				this.procDefId.includes('Process_1705389994103') ||
+				this.procDefId.includes('Process_1705390592348') ||
+				this.procDefId.includes('Process_1705391439287') ||
+				this.procDefId.includes('Process_1705391725816')
 			) {
 				console.log('进入新版驳回')
 				this.$confirm(`确定驳回流程吗?`, '提示', {

src/views/reimbursement/info/InfoList.vue

@@ -217,6 +217,7 @@
   import ProjectForm from '@/views/program/registered/ProjectForm'
   import ContractNameForm from '@/views/workContract/WorkContractForm2'
   import ProjectListForm from './ProgramForm'
+  import userService from '@/api/sys/UserService'
   export default {
     data () {
       return {
@@ -244,7 +245,8 @@
           pageSize: 10,
           orders: []
         },
-        loading: false
+        loading: false,
+		  isZj:false,
       }
     },
     reimbursementService: null,
@@ -304,25 +306,48 @@
         // 读取流程表单
         let tabTitle = `发起流程【报销审批】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [报销审批]`
-        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: '/reimbursement/info/InfoList'
-              }
-            })
-          })
+			if (this.isZj){
+				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: '/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: '/reimbursement/info/InfoList'
+						}
+					})
+				})
+			}
+
       },
       // 修改
       edit (row) {
@@ -344,29 +369,56 @@
         } else if (row.type === '4') {
           status = 'reapplyFlag'
         }
-        taskService.getTaskDef({ procDefId: this.processDefinitionId,
-          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.processDefinitionId,
-              procDefKey: this.procDefKey,
-              status: status,
-              title: tabTitle,
-              formType: data.formType,
-              formUrl: data.formUrl,
-              formTitle: processTitle,
-              businessTable: 'reimbursement_info',
-              businessId: row.id,
-              isShow: false,
-              routePath: '/reimbursement/info/InfoList'
-            }
-          })
-        })
+        if (this.isZj){
+			taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
+				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.processDefinitionIdSzbx,
+						procDefKey: this.procDefKeySzbx,
+						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,
+				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.processDefinitionId,
+						procDefKey: this.procDefKey,
+						status: status,
+						title: tabTitle,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessTable: 'reimbursement_info',
+						businessId: row.id,
+						isShow: false,
+						routePath: '/reimbursement/info/InfoList'
+					}
+				})
+			})
+		}
+
       },
       // 撤回
       reback (row) {
@@ -420,6 +472,13 @@
       viewContract (id) {
         this.$refs.contractNameForm.init('view', id)
       },
+		//查看当前登录人是否是专家
+		checkIsZj(){
+			userService.isZj().then((data)=>{
+				this.isZj = data
+				console.log('this.isZj',this.isZj)
+			})
+		},
       // 获取数据列表
       refreshList () {
         this.loading = true
@@ -433,6 +492,7 @@
           this.tablePage.total = data.total
           this.loading = false
         })
+		  this.checkIsZj()
         processService.getByName('评估-报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -445,6 +505,20 @@
             this.procDefKeyInvoice = data.key
           }
         })
+		  processService.getByName('评估-所长报销').then((data) => {
+			  console.log('data',data)
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdSzbx = data.id
+				  this.procDefKeySzbx = data.key
+			  }
+		  })
+
+		  processService.getByName('评估-所长报销-电子发票').then((data) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdSzbxInvoice = data.id
+				  this.procDefKeySzbxInvoice = data.key
+			  }
+		  })
       },
       // 删除
       del (id) {
@@ -471,13 +545,24 @@
       // 流程详情
       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.isZj){
+				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,
             procDefId: this.procDefId

src/views/reimbursement/info/ReimbursementForm.vue

@@ -868,7 +868,8 @@
 				},
 				keyWatch: '',
 				amountKey: '',
-				invoiceReimbursementKey: ''
+				invoiceReimbursementKey: '',
+				isZj:false,
 			}
 		},
 
@@ -1042,6 +1043,9 @@
 						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, [], 'reimbursement_ping_gu')
 						this.$refs.uploadComponent.newUpload(method, [], 'reimbursement_ping_gu')
 					}
+					userService.isZj().then((data)=>{
+						this.isZj = data
+					})
 				})
 			},
 			reapplyForm (callback) {
@@ -1365,25 +1369,48 @@
 				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.isZj){
+						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) {
@@ -1494,6 +1521,9 @@
 								this.inputForm.files = this.$refs.uploadComponent.getDataList()
 								taskService.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
 									if (this.commonJS.isNotEmpty(data)) {
+										if (data === '所长报销审核人') {
+											this.inputForm.type = '5'
+										}
 										if (data === '公司领导审批') {
 											this.inputForm.type = '5'
 										}

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

@@ -226,6 +226,7 @@
   import pick from 'lodash.pick'
   import ProjectRecordsForm from '@/views/cw/projectRecords/ProjectRecordsForm'
   import ContractNameForm from '@/views/cw/workContract/ContractNameForm'
+  import userService from '@/api/sys/UserService'
   export default {
     data () {
       return {
@@ -254,7 +255,8 @@
           pageSize: 10,
           orders: []
         },
-        loading: false
+        loading: false,
+		  isZj:false,
       }
     },
     // reimbursementService: null,
@@ -323,25 +325,48 @@
         let tabTitle = `发起流程【中审-报销审批】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [中审-报销审批]`
         console.log(this.processDefinitionId)
-        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: '/zs/reimbursement/info/InfoList'
-              }
-            })
-          })
+        if (this.isZj){
+			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: '/zs/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: '/zs/reimbursement/info/InfoList'
+					}
+				})
+			})
+		}
+
       },
       // 修改
       edit (row) {
@@ -359,29 +384,56 @@
         // 读取流程表单
         let tabTitle = `发起流程【中审-报销审批】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [中审-报销审批]`
-        taskService.getTaskDef({ procDefId: this.processDefinitionId,
-          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.processDefinitionId,
-              procDefKey: this.procDefKey,
-              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'
-            }
-          })
-        })
+        if (this.isZj){
+			taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
+				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.processDefinitionIdSzbx,
+						procDefKey: this.procDefKeySzbx,
+						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,
+				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.processDefinitionId,
+						procDefKey: this.procDefKey,
+						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'
+					}
+				})
+			})
+		}
+
       },
       todo (row) {
         let cUser = false
@@ -427,6 +479,12 @@
         // this.$refs.projectForm.init('view', id)
         this.$refs.projectRecordsForm.init('view', id)
       },
+		checkIsZj(){
+			userService.isZj().then((data)=>{
+				this.isZj = data
+				console.log('this.isZj',this.isZj)
+			})
+		},
       // 获取数据列表
       refreshList () {
         this.loading = true
@@ -450,6 +508,7 @@
         //   this.tablePage.total = data.total
         //   this.loading = false
         // })
+		  this.checkIsZj()
         processService.getByName('中审-报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -462,6 +521,20 @@
 				  this.procDefKeyInvoice = data.key
 			  }
 		  })
+		  processService.getByName('中审-所长报销').then((data) => {
+			  console.log('data',data)
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdSzbx = data.id
+				  this.procDefKeySzbx = data.key
+			  }
+		  })
+
+		  processService.getByName('中审-所长报销-电子发票').then((data) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdSzbxInvoice = data.id
+				  this.procDefKeySzbxInvoice = data.key
+			  }
+		  })
       },
       // 删除
       del (id) {
@@ -493,13 +566,24 @@
       // 流程详情
       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.isZj){
+				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,
 			  procDefId: this.procDefId

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

@@ -682,6 +682,7 @@
   //import PurchaseChooseForm from '../../../materialManagement/wareHouse/PurchaseChooseForm'
   // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
   //import MaterialManagementDialog from '../../../'
+  import userService from '@/api/sys/UserService'
   export default {
     props: {
       businessId: {
@@ -799,7 +800,8 @@
         },
         keyWatch: '',
         amountKey: '',
-		  invoiceReimbursementKey: ''
+		  invoiceReimbursementKey: '',
+		  isZj:false,
       }
     },
 	  provide() {
@@ -959,6 +961,9 @@
             this.$refs.uploadComponent.newUpload(method, [], 'reimbursement')
 			  this.loading = false
           }
+			userService.isZj().then((data)=>{
+				this.isZj = data
+			})
         })
       },
       // 表单提交
@@ -1272,25 +1277,48 @@
 		  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.isZj){
+				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) {
@@ -1396,6 +1424,9 @@
 			  this.inputForm.files = this.$refs.uploadComponent.getDataList()
             this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
               if (this.commonJS.isNotEmpty(data)) {
+				  if (data === '所长报销审核人') {
+					  this.inputForm.type = '5'
+				  }
                 if (data === '所长审批') {
                   this.inputForm.type = '5'
                 }