From d896d25a2bee6dc9496f102035b2d68d17f3de65 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期二, 05 三月 2024 13:58:13 +0800 Subject: [PATCH] 生产调度变更记录功能 --- src/views/plan/masterproductionschedule/index.vue | 64 ++++++++++++++++---------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue index 5aca1b1..8618138 100644 --- a/src/views/plan/masterproductionschedule/index.vue +++ b/src/views/plan/masterproductionschedule/index.vue @@ -22,6 +22,7 @@ <el-dropdown-item :command="item.command" v-for="item in orderTypeArr" + :key="item.value" :disabled="item.disabled" >{{ item.label }}</el-dropdown-item > @@ -40,6 +41,7 @@ <el-dropdown-item :command="item.command" v-for="item in stateTagArr" + :key="item.value" :disabled="item.disabled" >{{ item.label }}</el-dropdown-item > @@ -65,7 +67,7 @@ </el-dropdown-menu> </el-dropdown> --> <!--瀹℃牳鐘舵�佹敼鍙�--> - <el-dropdown + <!-- <el-dropdown v-if="permissions.masterproductionschedule_audit_change" @command="handleCommitCommand" style="margin-left: 10px" @@ -81,7 +83,7 @@ >{{ item.label }}</el-dropdown-item > </el-dropdown-menu> - </el-dropdown> + </el-dropdown> --> <!-- <el-button v-if="permissions.masterproductionschedule_submit_oa" @click="commitOa()" @@ -213,7 +215,8 @@ statesList: [ { value: '01pending', label: '寰呭鐞�' }, { value: '02processed', label: '宸插鐞�' }, - { value: '03canceled', label: '宸蹭綔搴�' } + { value: '03canceled', label: '宸蹭綔搴�' }, + { value: '04completed', label: '宸插畬鎴�' } ], isAuditList: [ { @@ -239,19 +242,25 @@ label: '鏍囪寰呭鐞�', command: 'PENDING', disabled: false, - permitArr: ['02processed'] + permitArr: ['01pending'] }, { label: '鏍囪宸插鐞�', command: 'PROCESSED', disabled: false, - permitArr: ['01pending'] + permitArr: ['02processed'] }, { label: '鏍囪宸蹭綔搴�', command: 'CANCELED', disabled: false, - permitArr: ['01pending'] + permitArr: ['03canceled'] + }, + { + label: '鏍囪宸插畬鎴�', + command: 'COMPLETED', + disabled: false, + permitArr: ['04completed','02processed'] } ], documentTagArr: [ @@ -595,7 +604,7 @@ operatorConfig: { fixed: 'right', label: '鎿嶄綔', - width: 140, + width: 100, minWidth: 100 } }, @@ -646,14 +655,6 @@ fun: this.searchMasterPlanSourceHandle }) } - if(this.permissions.plan_masterproductionschedule_del){ - optionList.push({ - text: '浣滃簾', - type: 'text', - size: 'small', - fun: this.deleteMainPlan - }) - } if(optionList.length>0){ this.table.operator = optionList } @@ -662,7 +663,7 @@ label: '鑷姩鏂板', command: 'AUTO', disabled: false, - permitArr: ['01pending'] + permitArr: ['04completed'] }) } this.getSysParam(sysParam.IS_REPORT_OPERATION) @@ -726,22 +727,6 @@ } } return '' - }, - // 鍒犻櫎 - deleteMainPlan(row) { - this.$confirm('鏄惁纭浣滃簾ID涓�' + row.id, '鎻愮ず', { - confirmButtonText: '纭畾', - cancelButtonText: '鍙栨秷', - closeOnClickModal: false, - type: 'warning' - }) - .then(function() { - return delObj(row.id) - }) - .then((data) => { - this.$message.success('鍒犻櫎鎴愬姛') - this.getData() - }) }, // 鏌ョ湅鐢熶骇璁″垝鏉ユ簮 searchMasterPlanSourceHandle(row) { @@ -908,6 +893,8 @@ eventName = '寰呭鐞�' } else if (event == 'PROCESSED') { eventName = '宸插鐞�' + } else if (event == 'COMPLETED') { + eventName = '宸插畬鎴�' } else { eventName = '宸蹭綔搴�' } @@ -1064,6 +1051,19 @@ this.stateTagArr[i].disabled = true } } + for (var i = 0; i < this.orderTypeArr.length; i++) { + if ( + uniqueStateArr.every((val) => + this.orderTypeArr[i].permitArr.length <= 0 + ? true + : this.orderTypeArr[i].permitArr.includes(val) + ) + ) { + this.orderTypeArr[i].disabled = true + } else { + this.orderTypeArr[i].disabled = false + } + } this.masterPlanSelection = val }, // 鏌ョ湅搴撳瓨 -- Gitblit v1.9.3