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

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

diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 9c4423c..1b11ec8 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -67,20 +67,20 @@
               >
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button
+          <!-- <el-button
             v-if="permissions.customerorder_ifs_line"
             style="margin-left:10px;"
             type="primary"
             @click="pullIfsLineNo"
             >鑾峰彇OTC琛屽彿</el-button
-          >
-          <el-button
+          > -->
+          <!-- <el-button
             v-if="permissions.customerorder_push_otc"
             style="margin-left:10px;"
             type="primary"
             @click="pushOtc"
             >鎺ㄩ�丱TC</el-button
-          >
+          > -->
           <!-- <el-button
             style="margin-left:10px;"
             type="primary"
@@ -93,13 +93,13 @@
             @click="exportStandBook"
             >瀵煎嚭鍙拌处</el-button
           > -->
-          <el-button
+          <!-- <el-button
             v-if="permissions.plan_customerorder_return"
             style="margin-left:10px;"
             type="primary"
             @click="returnOrder"
             >璁㈠崟閫�鍥�</el-button
-          >
+          > -->
         </template>
       </ttable>
 
@@ -342,6 +342,15 @@
       showCustomerorderReturn: false,
       scheduleVisible: false,
       showDocument: false,
+      sourceIdList: [{
+        label: '澶栭儴',
+        value: '0',
+        type: 'success',
+      },{
+        label: '鍐呴儴',
+        value: '1',
+        type: ''
+      }],
       stateTagArr: [
         {
           label: '鏍囪闆朵欢寰呴��',
@@ -661,18 +670,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',
@@ -692,7 +701,7 @@
         operatorConfig: {
           fixed: 'right',
           label: '鎿嶄綔',
-          width: 260,
+          width: 100,
           minWidth: 100
         }
       },
@@ -860,6 +869,14 @@
     }
   },
   methods: {
+    getSourceId(row, column, cellValue) {
+      this.sourceIdList.forEach((obj) => {
+        if (obj.value === cellValue) {
+          cellValue = obj.label
+        }
+      })
+      return cellValue
+    },
     getOtcPartSyncOptionList() {
       return this.otcPartSyncOptionList
     },
@@ -1353,10 +1370,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