From 985979d1915ddee9e426260c123f2f7d93e3fcab Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 17:51:54 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
---
src/views/plan/customerorder/index.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 99c593c..d73a898 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -38,8 +38,9 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="index"
:command="item.command"
- v-for="item in documentTagArr"
+ v-for="(item,index) in documentTagArr"
:disabled="item.disabled">
{{ item.label }}
</el-dropdown-item>
@@ -56,8 +57,9 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="index"
:command="item.command"
- v-for="item in commitStateTagArr"
+ v-for="(item,index) in commitStateTagArr"
:disabled="item.disabled"
>{{ item.label }}</el-dropdown-item
>
@@ -975,6 +977,7 @@
// 鍒涘缓涓荤敓浜ц鍒�
masterPlanHandle() {
console.log(this.multipleSelection);
+
if (this.multipleSelection && this.multipleSelection.length > 0) {
if (this.judgeCoState(this.multipleSelection)) {
// 鍒ゆ柇涓�涓嬪墿浣欐暟閲忔槸鍚﹀ぇ浜�0
@@ -1185,13 +1188,13 @@
},
// 浣滃簾
cancelHandle(row) {
- this.$confirm('鏄惁纭浣滃簾閿�鍞鍗曞彿涓�' + row.customerOrderNo + '鎻愮ず', {
+ this.$confirm('纭浣滃簾閿�鍞鍗曞彿涓恒��' + row.contractNo + '銆戠殑鏁版嵁?','鎻愮ず' , {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
type: 'warning'
}).then(() => {
- dropByContractNo(row.customerOrderNo).then((res) => {
+ dropByContractNo({contractNo:row.contractNo}).then((res) => {
if (res.data.code === 0) {
this.$message.success('浣滃簾鎴愬姛')
this.getData()
--
Gitblit v1.9.3