From dbe4d740a7b0b5696c89f4df14b6804a71364432 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 08 五月 2024 14:56:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/masterproductionschedule/index.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index ef87846..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
>
@@ -661,7 +663,7 @@
label: '鑷姩鏂板',
command: 'AUTO',
disabled: false,
- permitArr: ['01pending','04completed']
+ permitArr: ['04completed']
})
}
this.getSysParam(sysParam.IS_REPORT_OPERATION)
@@ -1049,7 +1051,7 @@
this.stateTagArr[i].disabled = true
}
}
- for (var i = 0; i < this.stateTagArr.length; i++) {
+ for (var i = 0; i < this.orderTypeArr.length; i++) {
if (
uniqueStateArr.every((val) =>
this.orderTypeArr[i].permitArr.length <= 0
@@ -1057,9 +1059,9 @@
: this.orderTypeArr[i].permitArr.includes(val)
)
) {
- this.orderTypeArr[i].disabled = false
- } else {
this.orderTypeArr[i].disabled = true
+ } else {
+ this.orderTypeArr[i].disabled = false
}
}
this.masterPlanSelection = val
--
Gitblit v1.9.3