From 8dc474768e47ecfcb2f590e7d5c704b46f7a612a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 16:10:39 +0800
Subject: [PATCH] 	modified:   src/api/plan/customerorder.js 	modified:   src/views/plan/customerorder/index.vue 	modified:   src/views/plan/customerorder/sample-customerorder-form.vue 	modified:   src/views/plan/customerorder/schedule-table.vue 	modified:   vue.config.js

---
 src/views/plan/customerorder/index.vue |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index cf9d74d..7151b17 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -919,14 +919,14 @@
     //   })
     // }
     if (this.permissions.customerorder_submit_oa) {
-      // this.table.toolbar.push({
-      //   text: '鎻愪氦瀹℃牳',
-      //   type: 'primary',
-      //   fun: this.auditCustomerOrder,
-      //   disabled: false,
-      //   permitArr: [],
-      //   loading: false
-      // })
+      this.table.toolbar.push({
+        text: '鎻愪氦瀹℃牳',
+        type: 'primary',
+        fun: this.auditCustomerOrder,
+        disabled: false,
+        permitArr: [],
+        loading: false
+      })
     }
     if (this.permissions.customerorder_set_salesparts) {
       this.table.toolbar.push({
@@ -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