From ceb9732e73b00526ed04d39d02afd7ae8ef303b7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 16:10:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/customerorder/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 239db79..7151b17 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -975,6 +975,7 @@
// 鍒涘缓涓荤敓浜ц鍒�
masterPlanHandle() {
console.log(this.multipleSelection);
+
if (this.multipleSelection && this.multipleSelection.length > 0) {
if (this.judgeCoState(this.multipleSelection)) {
// 鍒ゆ柇涓�涓嬪墿浣欐暟閲忔槸鍚﹀ぇ浜�0
@@ -1091,7 +1092,7 @@
let flag = true
const ids = []
this.multipleSelection.forEach((item) => {
- if (item.salesPartNo != null && item.salesPartNo !== '') {
+ if (item.partNo != null && item.partNo !== '') {
ids.push(item.id)
} else {
flag = false
@@ -1185,13 +1186,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