From 1f9c32908a68eef81f549b6986a9bc1f05056108 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 16 十一月 2023 16:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/plan/masterproductionschedule/index.vue |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index 38dffbb..aeb9cf5 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -82,14 +82,14 @@
               >
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button
+          <!-- <el-button
             v-if="permissions.masterproductionschedule_submit_oa"
             @click="commitOa()"
             type="primary"
             style="margin-left:10px;"
             :loading="loadingOa"
             >鎻愪氦OA
-          </el-button>
+          </el-button> -->
           <!-- <el-button
             v-if="permissions.masterproductionschedule_sync_scm"
             @click="syncScm()"
@@ -592,12 +592,12 @@
         ],
         toolbar: [],
         operator: [
-          {
-            text: '璁㈠崟棰勭暀',
-            type: 'text',
-            size: 'small',
-            fun: this.customReserved
-          },
+          // {
+          //   text: '璁㈠崟棰勭暀',
+          //   type: 'text',
+          //   size: 'small',
+          //   fun: this.customReserved
+          // },
           // {
           //   text: '鏌ョ湅搴撳瓨',
           //   type: 'text',
@@ -611,11 +611,17 @@
             fun: this.searchMasterPlanSourceHandle
           },
           {
-            text: '璁㈠崟',
+            text: '浣滃簾',
             type: 'text',
             size: 'small',
-            fun: this.searchOrderHandle
-          }
+            fun: this.deleteMainPlan
+          },
+          // {
+          //   text: '璁㈠崟',
+          //   type: 'text',
+          //   size: 'small',
+          //   fun: this.searchOrderHandle
+          // }
         ],
         operatorConfig: {
           fixed: 'right',
@@ -684,18 +690,18 @@
       })
     }
     if (this.permissions.masterproductionschedule_create_outsourcing) {
-      this.table.toolbar.push({
-        text: '鍒涘缓濮斿璁㈠崟',
-        fun: this.createOutsourcingOrder
-      })
+      // this.table.toolbar.push({
+      //   text: '鍒涘缓濮斿璁㈠崟',
+      //   fun: this.createOutsourcingOrder
+      // })
     }
     if (this.permissions.masterproductionschedule_create_order_manual) {
-      this.orderTypeArr.push({
-        label: '鎵嬪姩鏂板',
-        command: 'MANUAL',
-        disabled: false,
-        permitArr: ['02processed']
-      })
+      // this.orderTypeArr.push({
+      //   label: '鎵嬪姩鏂板',
+      //   command: 'MANUAL',
+      //   disabled: false,
+      //   permitArr: ['02processed']
+      // })
     }
     if (this.permissions.masterproductionschedule_create_order_auto) {
       this.orderTypeArr.push({
@@ -708,6 +714,7 @@
     this.getSysParam(sysParam.IS_REPORT_OPERATION)
   },
   methods: {
+    deleteMainPlan(row){},
     getSysParam(paramKey) {
       getSysParam(paramKey).then((response) => {
         var paramVal = response.data.data

--
Gitblit v1.9.3