From 35d86e8e773dc25c25b6951f15e55cedb026a8ba Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 29 二月 2024 16:12:11 +0800
Subject: [PATCH] 生产调度
---
src/views/plan/masterproductionschedule/index.vue | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index 5aca1b1..ef87846 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -65,7 +65,7 @@
</el-dropdown-menu>
</el-dropdown> -->
<!--瀹℃牳鐘舵�佹敼鍙�-->
- <el-dropdown
+ <!-- <el-dropdown
v-if="permissions.masterproductionschedule_audit_change"
@command="handleCommitCommand"
style="margin-left: 10px"
@@ -81,7 +81,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 +213,8 @@
statesList: [
{ value: '01pending', label: '寰呭鐞�' },
{ value: '02processed', label: '宸插鐞�' },
- { value: '03canceled', label: '宸蹭綔搴�' }
+ { value: '03canceled', label: '宸蹭綔搴�' },
+ { value: '04completed', label: '宸插畬鎴�' }
],
isAuditList: [
{
@@ -239,19 +240,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 +602,7 @@
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
- width: 140,
+ width: 100,
minWidth: 100
}
},
@@ -646,14 +653,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 +661,7 @@
label: '鑷姩鏂板',
command: 'AUTO',
disabled: false,
- permitArr: ['01pending']
+ permitArr: ['01pending','04completed']
})
}
this.getSysParam(sysParam.IS_REPORT_OPERATION)
@@ -726,22 +725,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 +891,8 @@
eventName = '寰呭鐞�'
} else if (event == 'PROCESSED') {
eventName = '宸插鐞�'
+ } else if (event == 'COMPLETED') {
+ eventName = '宸插畬鎴�'
} else {
eventName = '宸蹭綔搴�'
}
@@ -1064,6 +1049,19 @@
this.stateTagArr[i].disabled = true
}
}
+ for (var i = 0; i < this.stateTagArr.length; i++) {
+ if (
+ uniqueStateArr.every((val) =>
+ this.orderTypeArr[i].permitArr.length <= 0
+ ? true
+ : this.orderTypeArr[i].permitArr.includes(val)
+ )
+ ) {
+ this.orderTypeArr[i].disabled = false
+ } else {
+ this.orderTypeArr[i].disabled = true
+ }
+ }
this.masterPlanSelection = val
},
// 鏌ョ湅搴撳瓨
--
Gitblit v1.9.3