From 51983c50781800e3c0b68815968af69437c01dcf Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 15 Nov 2023 17:43:54 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/board/sopBoard.vue              |  2 +-
 src/views/modules/production/dailyPlan.vue        | 15 +++++++++++----
 src/views/modules/production/generateReport.vue   |  2 +-
 .../production/productionBlankingSearch.vue       |  7 +++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/board/sopBoard.vue b/src/views/modules/board/sopBoard.vue
index 68c7954..7a16409 100644
--- a/src/views/modules/board/sopBoard.vue
+++ b/src/views/modules/board/sopBoard.vue
@@ -15,7 +15,7 @@
 <!--      ></pdf>-->
     </div>
     <div  class="pdfMenu" >
-      <h1 style="color: white">SQC指导书  当前操作员|{{operator}}</h1>
+      <h1 style="color: white">SIP指导书  当前操作员|{{operator}}</h1>
     </div>
     <div  class="pdf-wrapper" ref="pdfWrapper">
       <img style="max-width:  100%;max-height: 100%;vertical-align:middle;" :src="badUrl">
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index 45194d3..58c50ff 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -231,9 +231,16 @@
           prop="orderDate"
           header-align="center"
           align="left"
-          min-width="50"
+          min-width="40"
           label="计划日期">
         </el-table-column>
+        <el-table-column
+          prop="orderNo"
+          header-align="center"
+          align="left"
+          min-width="50"
+          label="日计划号">
+        </el-table-column>
         <el-table-column
           prop="orderQty"
           header-align="center"
@@ -245,21 +252,21 @@
           prop="userName"
           header-align="center"
           align="left"
-          min-width="50"
+          min-width="40"
           label="录入人">
         </el-table-column>
         <el-table-column
           prop="enterDate"
           header-align="center"
           align="center"
-          min-width="90"
+          min-width="60"
           label="录入日期">
         </el-table-column>
         <el-table-column
           prop=""
           header-align="center"
           align="center"
-          min-width="50"
+          min-width="40"
           label="操作">
           <template slot-scope="scope" class="foo_container">
             <a type="text" size="small" @click="editSchedule(scope.row)">编辑</a>
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 8923e5a..f9de686 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -856,7 +856,7 @@
           if (data.code == 0) {
             this.$message.success(data.msg)
             this.setUp.reviewFlag = false
-            this.search()
+            // this.search()
             let inList=[];
             if(data.transData!=null){
               inList.push(data.transData)
diff --git a/src/views/modules/production/productionBlankingSearch.vue b/src/views/modules/production/productionBlankingSearch.vue
index c11852e..450ec3b 100644
--- a/src/views/modules/production/productionBlankingSearch.vue
+++ b/src/views/modules/production/productionBlankingSearch.vue
@@ -4,6 +4,9 @@
       <el-form-item :label="'硫化订单号：'">
         <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'硫化日计划号：'">
+        <el-input v-model="searchData.soTaskNo" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'硫化产品名称：'">
         <el-input v-model="searchData.partDescSpec" style="width: 120px"></el-input>
       </el-form-item>
@@ -251,7 +254,8 @@
         tableData: [],
         searchData:{
           orderNo:'',
-          partDescSpec:''
+          partDescSpec:'',
+          soTaskNo:'',
         },
         dataListSelections: [],
         qty1:0,
@@ -325,7 +329,6 @@
             if(data.rows[i].site==null||data.rows[i].site==''){
               data.rows[i].componentPartNo=null;
             }
-
           }
           this.tableData = data.rows;
         })