From da81627f0b578ea7858ddae6e2fe7991dc734eb0 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 18:32:34 +0800
Subject: [PATCH] 	modified:   src/views/plan/manufacturingorder/index.vue 	modified:   src/views/plan/manufacturingorder/productorder-form.vue 	modified:   src/views/plan/outsourcingorder/index.vue

---
 src/views/plan/outsourcingorder/index.vue |   63 +++++++++++++------------------
 1 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/views/plan/outsourcingorder/index.vue b/src/views/plan/outsourcingorder/index.vue
index 858ffa0..eb35ef0 100644
--- a/src/views/plan/outsourcingorder/index.vue
+++ b/src/views/plan/outsourcingorder/index.vue
@@ -259,7 +259,7 @@
           {
             minWidth: '140',
             prop: 'foreignState',
-            label: '瀵瑰鐩村彂鐘舵��',
+            label: '澶栧崗鐩村彂鐘舵��',
             sort: true,
             isTrue: true,
             formatter: this.formatForeignState,
@@ -357,12 +357,12 @@
             loading: false,
             fun: this.launchOaProcess
           },
-          {
-            text: '鏂板澶栧崗鐩村彂鐢宠鍗�',
-            type: 'primary',
-            loading: false,
-            fun: this.showForeign
-          },
+          // {
+          //   text: '鏂板澶栧崗鐩村彂鐢宠鍗�',
+          //   type: 'primary',
+          //   loading: false,
+          //   fun: this.showForeign
+          // },
         ],
         operator:[
           {
@@ -376,23 +376,12 @@
               key: 'oaState'
             }
           },
-          {
-            text: '鎵撳嵃妯″叿澶栧崗鐢熶骇鍗�',
-            type: 'text',
-            size: 'small',
-            show: {
-              val: [
-                '03pass'
-              ],
-              key: 'oaState'
-            }
-          }
         ],
         operatorConfig: {
           fixed: 'right',
           label: '鎿嶄綔',
-          width: 230,
-          minWidth: 230
+          width: 100,
+          minWidth: 100
         }
       },
       foreignStateList: [
@@ -524,23 +513,23 @@
   },
   methods: {
     //灞曠ず鏂板澶栧崗鐩村彂妯℃�佹
-    showForeign(){
-      let data = this.currentOutsourcingOrder
-      if(data){
-        if(data.foreignState == "1"){
-          this.$message.warning("璇ヨ鍗曟棤闇�澶栧崗鐩村彂鐢宠鍗�")
-          return
-        }
-        if(data.foreignState == "0" && data.foreignId!= null){
-          this.$message.warning("璇ヨ鍗曞凡鏈夊鍗忕洿鍙戠敵璇峰崟")
-          return
-        }
-        //
-        this.$message.success("鏂板")
-      }else{
-        this.$message.warning("璇烽�夋嫨涓�鏉″澶栬鍗�")
-      }
-    },
+    // showForeign(){
+    //   let data = this.currentOutsourcingOrder
+    //   if(data){
+    //     if(data.foreignState == "1"){
+    //       this.$message.warning("璇ヨ鍗曟棤闇�澶栧崗鐩村彂鐢宠鍗�")
+    //       return
+    //     }
+    //     if(data.foreignState == "0" && data.foreignId!= null){
+    //       this.$message.warning("璇ヨ鍗曞凡鏈夊鍗忕洿鍙戠敵璇峰崟")
+    //       return
+    //     }
+    //     //
+    //     this.$message.success("鏂板")
+    //   }else{
+    //     this.$message.warning("璇烽�夋嫨涓�鏉″澶栬鍗�")
+    //   }
+    // },
     // 鑾峰彇鏁版嵁鍒楄〃
     getData() {
       this.$refs.outsourcingOrderTable.refreshData()

--
Gitblit v1.9.3