From 29db999713b93cad218cca1b358626fcb80ad01e Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 8 Nov 2023 16:31:38 +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/print/print_part_label.js           | 2 +-
 src/views/modules/production/cancelSfdc.vue           | 1 +
 src/views/modules/production/closeSchedule.vue        | 6 ++++--
 src/views/modules/production/generateReport.vue       | 1 +
 src/views/modules/production/scheduleForSOTask.vue    | 2 ++
 src/views/modules/production/scheduleForShopOrder.vue | 2 ++
 src/views/modules/production/searchSfdc.vue           | 1 +
 src/views/modules/production/soscheduleRouting.vue    | 1 +
 src/views/modules/production/transFerPrint.vue        | 8 ++++++++
 9 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/print/print_part_label.js b/src/views/modules/print/print_part_label.js
index 1619a71..9c15e1d 100644
--- a/src/views/modules/print/print_part_label.js
+++ b/src/views/modules/print/print_part_label.js
@@ -12,7 +12,7 @@ export function printPartLabel(printList) {
     for(let i = 0; i < printList.length; i++){
       let printData = printList[i];
       LODOP.NewPage();
-      LODOP.SET_PRINT_PAGESIZE(0,1000,1500,"");
+      LODOP.SET_PRINT_PAGESIZE(0,1000,1900,"");
 
       LODOP.ADD_PRINT_RECT(43,5,551,308,0,1);
       LODOP.ADD_PRINT_TEXT(3,287,140,30,"物料状态标识卡");
diff --git a/src/views/modules/production/cancelSfdc.vue b/src/views/modules/production/cancelSfdc.vue
index f0cadc7..5ae0478 100644
--- a/src/views/modules/production/cancelSfdc.vue
+++ b/src/views/modules/production/cancelSfdc.vue
@@ -52,6 +52,7 @@
           <el-option label="全部" value=""></el-option>
           <el-option label="白班" value="白班"></el-option>
           <el-option label="晚班" value="晚班"></el-option>
+          <el-option label="加班" value="加班"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="' '">
diff --git a/src/views/modules/production/closeSchedule.vue b/src/views/modules/production/closeSchedule.vue
index b109e23..22e35d2 100644
--- a/src/views/modules/production/closeSchedule.vue
+++ b/src/views/modules/production/closeSchedule.vue
@@ -67,6 +67,7 @@
           <el-option label="全部" value=""></el-option>
           <el-option label="白班" value="白班"></el-option>
           <el-option label="晚班" value="晚班"></el-option>
+          <el-option label="加班" value="加班"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="'是否关闭'">
@@ -107,8 +108,8 @@
         min-width="160"
         label="操作">
         <template slot-scope="scope" class="foo_container">
-          <a v-if="scope.row.circulationSeqNo===null"  type="text" size="small" @click="circulation(scope.row)">流转</a>
-          <a v-if="scope.row.circulationSeqNo===null"  type="text" size="small" @click="closeSchedule(scope.row)">关闭派工单</a>
+          <a v-if="scope.row.circulationSeqNo===null&&scope.row.closedFlag=='N'"  type="text" size="small" @click="circulation(scope.row)">流转</a>
+          <a v-if="scope.row.circulationSeqNo===null&&scope.row.closedFlag=='N'"  type="text" size="small" @click="closeSchedule(scope.row)">关闭派工单</a>
           <a v-if="scope.row.circulationSeqNo!=null" type="text" size="small" >派工单已流转</a>
         </template>
       </el-table-column>
@@ -336,6 +337,7 @@
                      placeholder="请选择">
             <el-option label="白班" value="白班"></el-option>
             <el-option label="晚班" value="晚班"></el-option>
+            <el-option label="加班" value="加班"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="派工人员:">
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index c30f719..2b788f5 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -67,6 +67,7 @@
           <el-option label="全部" value=""></el-option>
           <el-option label="白班" value="白班"></el-option>
           <el-option label="晚班" value="晚班"></el-option>
+          <el-option label="加班" value="加班"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="' '">
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 1b449d1..cb0b562 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -356,6 +356,7 @@
                      placeholder="请选择">
             <el-option label="白班" value="白班"></el-option>
             <el-option label="晚班" value="晚班"></el-option>
+            <el-option label="加班" value="加班"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="派工人员:">
@@ -453,6 +454,7 @@
                          allow-create>
                 <el-option label="白班" value="白班"></el-option>
                 <el-option label="晚班" value="晚班"></el-option>
+                <el-option label="加班" value="加班"></el-option>
               </el-select>
             </template>
           </el-table-column>
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index 72f2e32..54e64c0 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -374,6 +374,7 @@
                      placeholder="请选择">
             <el-option label="白班" value="白班"></el-option>
             <el-option label="晚班" value="晚班"></el-option>
+            <el-option label="加班" value="加班"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="派工人员:">
@@ -482,6 +483,7 @@
                          allow-create>
                 <el-option label="白班" value="白班"></el-option>
                 <el-option label="晚班" value="晚班"></el-option>
+                <el-option label="加班" value="加班"></el-option>
               </el-select>
             </template>
           </el-table-column>
diff --git a/src/views/modules/production/searchSfdc.vue b/src/views/modules/production/searchSfdc.vue
index 8ec9f53..83422aa 100644
--- a/src/views/modules/production/searchSfdc.vue
+++ b/src/views/modules/production/searchSfdc.vue
@@ -52,6 +52,7 @@
           <el-option label="全部" value=""></el-option>
           <el-option label="白班" value="白班"></el-option>
           <el-option label="晚班" value="晚班"></el-option>
+          <el-option label="加班" value="加班"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="' '">
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 794fb8c..8c56c87 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -67,6 +67,7 @@
           <el-option label="全部" value=""></el-option>
           <el-option label="白班" value="白班"></el-option>
           <el-option label="晚班" value="晚班"></el-option>
+          <el-option label="加班" value="加班"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="'是否关闭'">
diff --git a/src/views/modules/production/transFerPrint.vue b/src/views/modules/production/transFerPrint.vue
index 959624f..cafc36a 100644
--- a/src/views/modules/production/transFerPrint.vue
+++ b/src/views/modules/production/transFerPrint.vue
@@ -86,6 +86,14 @@
         style="font-size: 20px"
         label="生产订单号">
       </el-table-column>
+      <el-table-column
+        prop="status"
+        header-align="center"
+        align="left"
+        min-width="65"
+        style="font-size: 20px"
+        label="是否入库">
+      </el-table-column>
       <el-table-column
         prop="transDate"
         header-align="center"