From ec5790cd8e6bd32a3dd599ace9b27f298789bc2d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 15:42:23 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

---
 src/views/plan/customerorder/index.vue |   56 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 12915ec..41d2c4f 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -342,6 +342,13 @@
       showCustomerorderReturn: false,
       scheduleVisible: false,
       showDocument: false,
+      sourceIdList: [{
+        label: '澶栭儴',
+        value: '0',
+      },{
+        label: '鍐呴儴',
+        value: '1',
+      }],
       stateTagArr: [
         {
           label: '鏍囪闆朵欢寰呴��',
@@ -438,7 +445,7 @@
           {
             minWidth: '100',
             width: '100px',
-            prop: 'contractNo',
+            prop: 'customerOrderNo',
             label: '鍚堝悓缂栧彿',
             sort: true,
             isTrue: true,
@@ -661,18 +668,18 @@
         ],
         toolbar: [],
         operator: [
-          {
-            text: '璁㈠崟璇存槑',
-            type: 'text',
-            size: 'small',
-            fun: this.openCustomerOrder
-          },
-          {
-            text: '鏌ョ湅搴撳瓨',
-            type: 'text',
-            size: 'small',
-            fun: this.stockHandle
-          },
+          // {
+          //   text: '璁㈠崟璇存槑',
+          //   type: 'text',
+          //   size: 'small',
+          //   fun: this.openCustomerOrder
+          // },
+          // {
+          //   text: '鏌ョ湅搴撳瓨',
+          //   type: 'text',
+          //   size: 'small',
+          //   fun: this.stockHandle
+          // },
           {
             text: '浣滃簾',
             type: 'text',
@@ -683,7 +690,6 @@
                 '01partUnCheck',
                 '02technologyUnCheck',
                 '03plan'
-                // '04planed'
               ],
               key: 'coState'
             }
@@ -692,7 +698,7 @@
         operatorConfig: {
           fixed: 'right',
           label: '鎿嶄綔',
-          width: 260,
+          width: 100,
           minWidth: 100
         }
       },
@@ -809,7 +815,7 @@
         }
       },
       immediate: true
-    }
+    },
   },
   mounted() {
     this.initQueryParams()
@@ -860,6 +866,14 @@
     }
   },
   methods: {
+    getSourceId(row, column, cellValue) {
+      this.sourceIdList.forEach((obj) => {
+        if (obj.value === cellValue) {
+          cellValue = obj.label
+        }
+      })
+      return cellValue
+    },
     getOtcPartSyncOptionList() {
       return this.otcPartSyncOptionList
     },
@@ -870,7 +884,6 @@
           prop: 'coState',
           searchInfoType: 'select',
           // propVal: '01partUnCheck'
-          propVal: '02technologyUnCheck'
         })
       )
       this.$refs.customerOrderTable.setQueryParam(queryParam)
@@ -914,6 +927,7 @@
             }
           }
           this.scheduleVisible = true
+          console.log(this.multipleSelection);
           this.$nextTick(() => {
             this.$refs.schedule.init(this.multipleSelection)
           })
@@ -1353,10 +1367,10 @@
                   '瀛樺湪閿�鍞鍗曞凡鍏宠仈宸ヨ壓鏂囦欢锛屽闇�鏇存敼锛岃鍏堣В闄ゅ叧鑱�'
                 )
               }
-              if (item.salesPartNo == null || item.salesPartNo === '') {
-                status = true
-                this.$message.error('瀛樺湪閿�鍞鍗曟湭缁戝畾閿�鍞欢锛岃鍏堢粦瀹�')
-              }
+              // if (item.salesPartNo == null || item.salesPartNo === '') {
+              //   status = true
+              //   this.$message.error('瀛樺湪閿�鍞鍗曟湭缁戝畾閿�鍞欢锛岃鍏堢粦瀹�')
+              // }
               if (item.partNo != firstPartNo) {
                 status = true
                 this.$message.error('璁㈠崟闆朵欢鍙蜂笉涓�鑷�')

--
Gitblit v1.9.3