sangwenwei 1 рік тому
батько
коміт
8980e1a1d5

+ 14 - 3
src/views/ccpm/reimbursement/info/InfoList.vue

@@ -269,6 +269,7 @@
 		  isSs:false,
 		  isAdmin:false,
 		  isDgsbxBmzr:false,
+		  isKjsz:false,
       }
     },
     // reimbursementService: null,
@@ -337,7 +338,7 @@
         let tabTitle = `发起流程【项目-报销审批】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [项目-报销审批]`
         console.log(this.processDefinitionId)
-        if (this.isZj || this.isDgsbxBmzr){
+        if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
 			taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
 				status: 'startAndHold'}).then((data) => {
 				this.$router.push({
@@ -436,7 +437,7 @@
         // 读取流程表单
         let tabTitle = `发起流程【项目-报销审批】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [项目-报销审批]`
-        if (this.isZj || this.isDgsbxBmzr){
+        if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
 			taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
 				businessId: row.id,
 				businessTable: 'ccpm_reimbursement_info',
@@ -583,12 +584,14 @@
         // 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)
 			})
 		},
+		//多公司报销(部门主任)
 		checkIsDgsbxBmzr(){
 			userService.isDgsbxBmzr().then((data)=>{
 				this.isDgsbxBmzr = data
@@ -613,6 +616,13 @@
 				this.isAdmin = data
 			})
 		},
+		//查询当前用户是否是会计所长
+		checkIsKjsz(){
+			userService.isKjsz().then((data)=>{
+				this.isKjsz = data
+				console.log('this.isKjsz',this.isKjsz)
+			})
+		},
       // 获取数据列表
       refreshList () {
         this.loading = true
@@ -641,6 +651,7 @@
 		  this.checkIsZjbry()
 		  this.checkIsSs()
 		  this.checkIsAdmin()
+		  this.checkIsKjsz()
         processService.getByName('项目-报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -710,7 +721,7 @@
       // 流程详情
       detail (row) {
         if (!this.commonJS.isEmpty(row.type) && row.type !== '1') {
-        	if (this.isZj || this.isDgsbxBmzr){
+        	if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
 				if (row.reimbursementType === '1') {
 					this.procDefId = this.processDefinitionIdSzbxInvoice
 				} else if (row.reimbursementType === '0') {

+ 1 - 1
src/views/ccpm/reimbursement/info/InfoUpdateForm.vue

@@ -11,7 +11,7 @@
 			<div v-show="infoHistory" style="text-align: right;margin-bottom: 3em">
 				<el-button @click="historyList()" style="float: right" type="primary">历史详情</el-button>
 			</div>
-		<el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
+		<el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'"
 				 label-width="100px" @submit.native.prevent>
 
 			<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>

+ 5 - 1
src/views/ccpm/reimbursement/info/ReimbursementForm.vue

@@ -806,6 +806,7 @@
 		  isDgsbxBmzr:false,
 		  isZjbry:false,
 		  isSs:false,
+		  isKjsz:false,
       }
     },
 	  provide() {
@@ -977,6 +978,9 @@
 			userService.isSs().then((data)=>{
 				this.isSs = data
 			})
+			userService.isKjsz().then((data)=>{
+				this.isKjsz = data
+			})
         })
       },
       // 表单提交
@@ -1290,7 +1294,7 @@
 		  let title = `发起流程【项目-报销审批】`
 		  let describe = `[项目-报销审批]`
 		  if (this.inputForm.reimbursementType) {
-		  	if (this.isZj || this.isDgsbxBmzr){
+		  	if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
 				if (this.inputForm.reimbursementType === '0') {
 					await processService.getByName('项目-报销审批').then((data) => {
 						if (!this.commonJS.isEmpty(data.id)) {

+ 12 - 3
src/views/reimbursement/info/InfoList.vue

@@ -257,6 +257,7 @@
 		  isZjbry:false,
 		  isDgsbxBmzr:false,
 		  isAdmin: false,
+		  isKjsz:false,
       }
     },
     reimbursementService: null,
@@ -327,7 +328,7 @@
         // 读取流程表单
         let tabTitle = `发起流程【报销审批】`
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [报销审批]`
-			if (this.isZj || this.isDgsbxBmzr){
+			if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
 				taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
 					status: 'startAndHold'}).then((data) => {
 					this.$router.push({
@@ -410,7 +411,7 @@
         } else if (row.type === '4') {
           status = 'reapplyFlag'
         }
-        if (this.isZj || this.isDgsbxBmzr){
+        if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
 			taskService.getTaskDef({ procDefId: this.processDefinitionIdSzbx,
 				businessId: row.id,
 				businessTable: 'reimbursement_info',
@@ -554,6 +555,13 @@
 				console.log('this.isZj',this.isZj)
 			})
 		},
+		//查询当前用户是否是会计所长
+		checkIsKjsz(){
+			userService.isKjsz().then((data)=>{
+				this.isKjsz = data
+				console.log('this.isKjsz',this.isKjsz)
+			})
+		},
       // 获取数据列表
       refreshList () {
         this.loading = true
@@ -571,6 +579,7 @@
 		  this.checkIsDgsbxBmzr()
 		  this.checkIsZjbry()
 		  this.checkIsAdmin()
+		  this.checkIsKjsz()
         processService.getByName('评估-报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
@@ -630,7 +639,7 @@
       // 流程详情
       detail (row) {
         if (!this.commonJS.isEmpty(row.type) && row.type !== '1') {
-        	if (this.isZj || this.isDgsbxBmzr){
+        	if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
 				if (row.reimbursementType === '1') {
 					this.procDefId = this.processDefinitionIdSzbxInvoice
 				} else if (row.reimbursementType === '0') {

+ 1 - 1
src/views/reimbursement/info/InfoUpdateForm.vue

@@ -11,7 +11,7 @@
 			<div v-show="infoHistory" style="text-align: right;margin-bottom: 3em">
 				<el-button @click="historyList()" style="float: right" type="primary">历史详情</el-button>
 			</div>
-		<el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
+		<el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'|| method === 'view'"
 				 label-width="120px" @submit.native.prevent>
 
 			<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>

+ 5 - 1
src/views/reimbursement/info/ReimbursementForm.vue

@@ -873,6 +873,7 @@
 				isZj:false,
 				isDgsbxBmzr:false,
 				isZjbry:false,
+				isKjsz:false,
 			}
 		},
 
@@ -1055,6 +1056,9 @@
 					userService.isZjbry().then((data)=>{
 						this.isZjbry = data
 					})
+					userService.isKjsz().then((data)=>{
+						this.isKjsz = data
+					})
 				})
 			},
 			reapplyForm (callback) {
@@ -1378,7 +1382,7 @@
 				let title = `发起流程【评估-报销审批】`
 				let describe = `[评估-报销审批]`
 				if (this.inputForm.reimbursementType) {
-					if (this.isZj || this.isDgsbxBmzr){
+					if (this.isZj || this.isDgsbxBmzr || this.isKjsz){
 						if (this.inputForm.reimbursementType === '0') {
 							await processService.getByName('评估-所长报销').then((data) => {
 								if (!this.commonJS.isEmpty(data.id)) {