From af7f2ec43df0cb93f9dc2eeb6a14aa9149945d94 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 27 Oct 2022 10:09:25 +0800
Subject: [PATCH] =?UTF-8?q?0505=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/close_schedule.vue     | 22 ++-----------------
 src/views/modules/production/dailyPlan.vue    |  1 +
 .../modules/production/search_schedule.vue    | 20 +----------------
 3 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/src/views/modules/production/close_schedule.vue b/src/views/modules/production/close_schedule.vue
index 6dfd903..4e7da80 100644
--- a/src/views/modules/production/close_schedule.vue
+++ b/src/views/modules/production/close_schedule.vue
@@ -84,7 +84,7 @@
               <a v-if="scope.row.closedFlag==='N'&&scope.row.printFlag==='N'" type="text" size="small" @click="circulation(scope.row)">流转</a>
               <a v-if="scope.row.closedFlag==='Y'&&scope.row.qtyRequired>scope.row.qtyReported" type="text" size="small" @click="openSchedule(scope.row)">开启</a>
               <a v-if="scope.row.closedFlag==='N'&&scope.row.qtyRequired>scope.row.qtyReported" type="text" size="small" @click="closeSchedule(scope.row)">关闭</a>
-              <a v-if="scope.row.qtyApprove==0" type="text" size="small" @click="cancelSchedule(scope.row)">取消</a>
+              <a v-if="scope.row.qtyApprove==0" type="text" size="small" @click="cancelSchedule(scope.row)" >取消</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -350,7 +350,7 @@
             columnProp: "partDesc",
             headerAlign: "center",
             align: "left",
-            columnLabel: "产品名称",
+            columnLabel: "产品名称/规格",
             columnWidth: 180,
             columnHidden: false,
             columnImage: false,
@@ -557,24 +557,6 @@
             status: true,
             fixed: false
           },
-          {
-            userId: this.$store.state.user.name,
-            functionId: this.$route.meta.menuId,
-            serialNumber: '5303ProduceSpec',
-            tableId: "5303Produce",
-            tableName: "流转日计划",
-            columnProp: "spec",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "规格型号",
-            columnWidth: 80,
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: false
-          },
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index e8033f1..4d3453a 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -1812,6 +1812,7 @@
         })
       },
       //--------------动态列end---------------
+
     },
     created () {
       this.getTableUserColumn()
diff --git a/src/views/modules/production/search_schedule.vue b/src/views/modules/production/search_schedule.vue
index 0301ee7..18131aa 100644
--- a/src/views/modules/production/search_schedule.vue
+++ b/src/views/modules/production/search_schedule.vue
@@ -392,7 +392,7 @@
             columnProp: "partDesc",
             headerAlign: "center",
             align: "left",
-            columnLabel: "产品名称",
+            columnLabel: "产品名称/规格",
             columnWidth: 180,
             columnHidden: false,
             columnImage: false,
@@ -599,24 +599,6 @@
             status: true,
             fixed: false
           },
-          {
-            userId: this.$store.state.user.name,
-            functionId: this.$route.meta.menuId,
-            serialNumber: '5302ProduceSpec',
-            tableId: "5302Produce",
-            tableName: "待生产工单",
-            columnProp: "spec",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "规格型号",
-            columnWidth: 80,
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: false
-          },
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,