苏州智永祥部门报销功能调整

src/api/sys/userService.js

@@ -176,6 +176,12 @@ export default {
 			method: "get",
 		});
 	},
+	isSzZyx: function () {
+		return request({
+			url: prefix + "/sys/user/isSzZyx",
+			method: "get",
+		});
+	},
 	isZjbry: function () {
 		return request({
 			url: prefix + "/sys/user/isZjbry",

src/views/cw/invoice/InvoiceFormTask.vue

@@ -395,7 +395,7 @@
 
 				<el-col :span="12">
 					<el-form v-if="status === 'audit' || status === 'taskFormDetail'"
-						:disabled="status === 'taskFormDetail' || isDisabled" style="width: 100%" :model="inputForm"
+						:disabled="true" style="width: 100%" :model="inputForm"
 						v-loading="loading" :class="method === 'view' ? 'readonly' : ''" label-width="160px"
 						@submit.native.prevent>
 						<el-form-item label="是否手动开票" prop="isOmsBilling" :rules="[
@@ -949,7 +949,7 @@ export default {
 				redInvoiceRelevancyId: '',	//红字发票id
 				relatedInvoice: '1',	//关联发票
 				isSmsNotice: '0',	//是否短信通知
-				isOmsBilling: '0',	//是否手动开票
+				isOmsBilling: '1',	//是否手动开票
 				situationDetail: ''	//情况说明
 			},
 			programRow: '',
@@ -1091,7 +1091,7 @@ export default {
 				redInvoiceRelevancyId: '',	//红字发票id
 				relatedInvoice: '1',	//关联发票
 				isSmsNotice: '0',	//是否短信通知
-				isOmsBilling: '0',	//是否手动开票
+				isOmsBilling: '1',	//是否手动开票
 				situationDetail: ''	//情况说明
 			}
 			// if (method === 'add') {
@@ -1163,7 +1163,9 @@ export default {
 						this.inputForm.isSmsNotice = '0'
 					}
 					if (this.commonJS.isEmpty(this.inputForm.isOmsBilling)) {
-						this.inputForm.isOmsBilling = '0'
+						this.inputForm.isOmsBilling = '1'
+					}else{
+						this.inputForm.isOmsBilling = '1'
 					}
 					if ((this.inputForm.redInvoiceFlag == 1 &&
 						(this.inputForm.relatedInvoice == 0 || this.inputForm.invoiceNumberStr == '' || this.inputForm.invoiceNumberStr == null || this.inputForm.invoiceNumberStr.length == 8))) {

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

@@ -315,6 +315,7 @@ export default {
 				"Process_1706170102059",
 				"Process_1706175399469",
 				"Process_1706176397312",
+				"Process_1706176397323",
 				"Process_1706176937876",
 				"Process_1706671221048",
 				"Process_1706679472488",
@@ -347,7 +348,7 @@ export default {
 			// 会计
 			let cw = ["会计-所长报销", "会计-所长报销-电子发票", "会计-总经办报销", "盛所会计-报销申请", "会计-报销审批", "会计-报销审批-电子发票"]
 			// 中审
-			let zs = ["中审-所长报销", "中审-所长报销-电子发票", "中审-总经办报销", "中审-报销审批", "中审-报销审批-电子发票"]
+			let zs = ["中审-所长报销", "中审-所长报销-电子发票", "中审-总经办报销", "中审-报销审批", "中审-报销审批-电子发票", "中审-苏州分公司(智永祥)-报销"]
 			// 评估
 			let pg = ["评估-总经办报销", "评估-所长报销", "评估-所长报销-电子发票", "评估-报销申请", "评估-报销审批-电子发票"]
 			// 项目

src/views/finance/invoice/InvoiceFormTask.vue

@@ -340,7 +340,7 @@
         <el-col :span="12">
 
           <el-form v-if="status === 'audit' || status === 'taskFormDetail'"
-            :disabled="status === 'taskFormDetail' || isDisabled" style="width: 100%" :model="inputForm"
+            :disabled="true" style="width: 100%" :model="inputForm"
             v-loading="loading" :class="method === 'view' ? 'readonly' : ''" label-width="160px" @submit.native.prevent>
             <el-form-item label="是否手动开票" prop="isOmsBilling" :rules="[
               { required: true, message: '是否手动开票不能为空', trigger: 'change' }
@@ -785,7 +785,7 @@ export default {
         redInvoiceFlag: '0',	//是否红字发票
         redFlushReason: '', //红冲原因
         isSmsNotice: '0',//是否短信通知
-        isOmsBilling: '0',//是否手动开票
+        isOmsBilling: '1',//是否手动开票
         redInvoiceRelevancyNumber: '',	//红字发票编号
         invoiceNumberStr: '',	//红字发票号
         redInvoiceRelevancyId: '',	//红字发票id
@@ -916,7 +916,7 @@ export default {
         redInvoiceFlag: '0',	//是否红字发票
         redFlushReason: '', //红冲原因
         isSmsNotice: '0',//是否短信通知
-        isOmsBilling: '0',//是否手动开票
+        isOmsBilling: '1',//是否手动开票
         redInvoiceRelevancyNumber: '',	//红字发票编号
         invoiceNumberStr: '',	//红字发票号
         redInvoiceRelevancyId: '',	//红字发票id
@@ -986,8 +986,10 @@ export default {
             this.inputForm.isSmsNotice = '0'
           }
           if (this.commonJS.isEmpty(this.inputForm.isOmsBilling)) {
-            this.inputForm.isOmsBilling = '0'
-          }
+            this.inputForm.isOmsBilling = '1'
+          }else{
+			  this.inputForm.isOmsBilling = '1'
+		  }
           if ((this.inputForm.redInvoiceFlag == 1 &&
             (this.inputForm.relatedInvoice == 0 || this.inputForm.invoiceNumberStr == '' || this.inputForm.invoiceNumberStr == null || this.inputForm.invoiceNumberStr.length == 8))) {
             this.inputForm.isOmsBilling = "1"

src/views/flowable/task/TaskForm.vue

@@ -713,6 +713,7 @@ export default {
 		// Process_1706170102059 会计-总经办报销
 		// Process_1706175399469 评估-总经办报销
 		// Process_1706176397312 中审-总经办报销
+		// Process_1706176397323 中审-苏州分公司-智永祥部门
 		// Process_1706176937876 项目-总经办报销
 		// Process_1706671221048 咨询-报销审批
 		// Process_1706679472488 咨询-报销审批-电子发票
@@ -808,6 +809,7 @@ export default {
 				this.procDefId.includes('Process_1706170102059') ||
 				this.procDefId.includes('Process_1706175399469') ||
 				this.procDefId.includes('Process_1706176397312') ||
+				this.procDefId.includes('Process_1706176397323') ||
 				this.procDefId.includes('Process_1706176937876') ||
 				this.procDefId.includes('Process_1706671221048') ||
 				this.procDefId.includes('Process_1706679472488') ||

src/views/flowable/task/TodoList.vue

@@ -253,6 +253,7 @@ export default {
 				"Process_1706170102059",
 				"Process_1706175399469",
 				"Process_1706176397312",
+				"Process_1706176397323",
 				"Process_1706176937876",
 				"Process_1706671221048",
 				"Process_1706679472488",
@@ -285,7 +286,7 @@ export default {
 			// 会计
 			let cw = ["会计-所长报销", "会计-所长报销-电子发票", "会计-总经办报销", "盛所会计-报销申请", "会计-报销审批", "会计-报销审批-电子发票"]
 			// 中审
-			let zs = ["中审-所长报销", "中审-所长报销-电子发票", "中审-总经办报销", "中审-报销审批", "中审-报销审批-电子发票"]
+			let zs = ["中审-所长报销", "中审-所长报销-电子发票", "中审-总经办报销", "中审-报销审批", "中审-报销审批-电子发票", "中审-苏州分公司(智永祥)-报销"]
 			// 评估
 			let pg = ["评估-总经办报销", "评估-所长报销", "评估-所长报销-电子发票", "评估-报销申请", "评估-报销审批-电子发票"]
 			// 项目

src/views/home/components/TodoList2.vue

@@ -243,6 +243,7 @@ export default {
 		// Process_1706170102059 会计-总经办报销1
 		// Process_1706175399469 评估-总经办报销1
 		// Process_1706176397312 中审-总经办报销1
+		// Process_1706176397323 中审-苏州分公司-智永祥部门1
 		// Process_1706176937876 项目-总经办报销1
 		// Process_1706671221048 咨询-报销审批1
 		// Process_1706679472488 咨询-报销审批-电子发票1
@@ -272,6 +273,7 @@ export default {
 				"Process_1706170102059",
 				"Process_1706175399469",
 				"Process_1706176397312",
+				"Process_1706176397323",
 				"Process_1706176937876",
 				"Process_1706671221048",
 				"Process_1706679472488",

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

@@ -349,6 +349,7 @@ export default {
 			isZj: false,
 			isDgsbxBmzr: false,
 			isZjbry: false,
+			isSzZyx: false,
 			isAdmin: false,
 			tooltipConfig: {
 				showAll: false,
@@ -444,6 +445,7 @@ export default {
 		},
 		// 新增
 		add() {
+			console.log('进入新增界面')
 			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'
@@ -503,6 +505,32 @@ export default {
 						}
 					})
 				})
+			} else if (this.isSzZyx) {
+				taskService.getTaskDef({
+					procDefId: this.processDefinitionIdZsszzyx,
+					status: 'startAndHold'
+				}).then((data) => {
+					// 根据时间判断formUrl
+					if (newVersionFlag) {
+						data.formUrl = this.formUrl
+					}
+					this.$router.push({
+						path: '/flowable/task/TaskForm',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+							procDefId: this.processDefinitionIdZsszzyx,
+							procDefKey: this.procDefKeyZsszzyx,
+							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,
@@ -607,6 +635,34 @@ export default {
 						}
 					})
 				})
+			} else if (this.isSzZyx) {
+				taskService.getTaskDef({
+					procDefId: this.processDefinitionIdZsszzyx,
+					businessId: row.id,
+					businessTable: 'zs_reimbursement_info',
+					status: status
+				}).then((data) => {
+					if (newVersionFlag) {
+						data.formUrl = this.formUrl
+					}
+					this.$router.push({
+						path: '/flowable/task/TaskForm',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+							procDefId: this.processDefinitionIdZsszzyx,
+							procDefKey: this.procDefKeyZsszzyx,
+							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,
@@ -727,6 +783,12 @@ export default {
 				this.isDgsbxBmzr = data
 			})
 		},
+		//查询当前用户是否是苏州分公司报销(智永祥部门)
+		checkIsSzZyx() {
+			userService.isSzZyx().then((data) => {
+				this.isSzZyx = data
+			})
+		},
 		// 获取数据列表
 		refreshList() {
 			this.loading = true
@@ -754,6 +816,7 @@ export default {
 			this.checkIsDgsbxBmzr()
 			this.checkIsZjbry()
 			this.checkIsAdmin()
+			this.checkIsSzZyx()
 			processService.getByName('中审-报销审批').then((data) => {
 				if (!this.commonJS.isEmpty(data.id)) {
 					this.processDefinitionId = data.id
@@ -793,6 +856,13 @@ export default {
 					this.procDefKeyFile = data.key
 				}
 			})
+			processService.getByName('中审-苏州分公司(智永祥)-报销').then((data) => {
+				console.log('file', data)
+				if (!this.commonJS.isEmpty(data.id)) {
+					this.processDefinitionIdZsszzyx = data.id
+					this.procDefKeyZsszzyx = data.key
+				}
+			})
 		},
 		// 删除
 		del(id) {

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

@@ -381,6 +381,7 @@ export default {
       invoiceReimbursementKey: '',
       isZj: false,
       isZjbry: false,
+	  isSzZyx: false,
       isDgsbxBmzr: false,
       payment: '',
       isConfirm: "",
@@ -597,6 +598,9 @@ export default {
         userService.isZjbry().then((data) => {
           this.isZjbry = data
         })
+	    userService.isSzZyx().then((data) => {
+		  this.isSzZyx = data
+	    })
       })
     },
     // 表单提交
@@ -954,6 +958,7 @@ export default {
       this.getReimbursementData()
       let title = `发起流程【中审-报销审批】`
       let describe = `[中审-报销审批]`
+		console.log(123123)
       if (this.inputForm.reimbursementType) {
         if (this.isZj || this.isDgsbxBmzr) {
           if (this.inputForm.reimbursementType === '0') {
@@ -995,6 +1000,26 @@ export default {
             title = `发起流程【中审-报销审批-电子发票】`
             describe = `[中审-报销审批-电子发票]`
           }
+        } else if (this.isSzZyx) {
+          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) => {