From 47e64389d33ebb31d47a07f4e6e5f227b08b7f9b Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 3 Jan 2023 18:02:57 +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/SeqNoForLiuHua.vue    |   9 +-
 src/views/modules/print/print_hunlian_card.js | 154 ++++++----------
 .../modules/print/print_hunlian_card_old.js   | 169 ++++++++++++++++++
 src/views/modules/print/print_liuhua_card.js  |  34 ++--
 src/views/modules/print/print_part_label.js   |  24 +--
 .../modules/production/dailyPlanReport.vue    |   1 +
 .../production/productionBlankingSearch.vue   |   8 +
 .../modules/production/scheduleForSOTask.vue  |  11 +-
 .../production/scheduleForShopOrder.vue       |  13 +-
 .../modules/taskmanage/mysendtasklist.vue     |   6 +-
 src/views/modules/taskmanage/mytasklist.vue   |   6 +-
 11 files changed, 299 insertions(+), 136 deletions(-)
 create mode 100644 src/views/modules/print/print_hunlian_card_old.js

diff --git a/src/views/modules/board/SeqNoForLiuHua.vue b/src/views/modules/board/SeqNoForLiuHua.vue
index c660028..8d7aabe 100644
--- a/src/views/modules/board/SeqNoForLiuHua.vue
+++ b/src/views/modules/board/SeqNoForLiuHua.vue
@@ -49,7 +49,7 @@
           prop="partDesc"
           header-align="center"
           align="left"
-          min-width="60"
+          min-width="57"
           label="产品名称">
         </el-table-column>
         <el-table-column
@@ -77,7 +77,7 @@
           prop="text3"
           header-align="center"
           align="left"
-          min-width="25"
+          min-width="23"
           label="颜色">
         </el-table-column>
         <el-table-column
@@ -91,8 +91,11 @@
           prop="planStartTime"
           header-align="center"
           align="left"
-          min-width="35"
+          min-width="40"
           label="生产日期">
+<!--          <template slot-scope="scope">-->
+<!--            {{dayjs(scope.row.planStartTime).format('YYYYMMDD')}}-->
+<!--          </template>-->
         </el-table-column>
         <el-table-column
           prop="operatorDesc"
diff --git a/src/views/modules/print/print_hunlian_card.js b/src/views/modules/print/print_hunlian_card.js
index ef8c60c..26feec1 100644
--- a/src/views/modules/print/print_hunlian_card.js
+++ b/src/views/modules/print/print_hunlian_card.js
@@ -11,26 +11,22 @@ export function printHunlianLabel(printList) {
     for(let i = 0; i < printList.length; i++){
       let printData = printList[i];
       LODOP.NewPage();
-      LODOP.SET_PRINT_PAGESIZE(0,1000,1900,"");
+      LODOP.SET_PRINT_PAGESIZE(0,1900,1000,"");
       LODOP.ADD_PRINT_LINE(61,0,60,718,0,1);
       LODOP.ADD_PRINT_LINE(85,0,84,718,0,1);
       LODOP.ADD_PRINT_LINE(109,0,108,718,0,1);
       LODOP.ADD_PRINT_LINE(371,0,370,718,0,1);
       LODOP.ADD_PRINT_LINE(131,0,130,718,0,1);
-      LODOP.ADD_PRINT_LINE(151,0,150,470,0,1);
-      LODOP.ADD_PRINT_LINE(171,0,170,718,0,1);
-      LODOP.ADD_PRINT_LINE(191,0,190,470,0,1);
-      LODOP.ADD_PRINT_LINE(211,0,210,718,0,1);
-      LODOP.ADD_PRINT_LINE(291,0,290,470,0,1);
-      LODOP.ADD_PRINT_LINE(311,0,310,470,0,1);
-      LODOP.ADD_PRINT_LINE(331,0,330,470,0,1);
-      LODOP.ADD_PRINT_LINE(351,0,350,470,0,1);
+      LODOP.ADD_PRINT_LINE(171,470,170,718,0,1);
+      LODOP.ADD_PRINT_LINE(211,470,210,718,0,1);
       LODOP.ADD_PRINT_LINE(370,0,60,1,0,1);
       LODOP.ADD_PRINT_LINE(370,718,60,719,0,1);
       LODOP.ADD_PRINT_LINE(370,470,108,471,0,1);
       LODOP.ADD_PRINT_LINE(108,180,60,181,0,1);
-      LODOP.ADD_PRINT_LINE(108,360,60,361,0,1);
-      LODOP.ADD_PRINT_LINE(108,540,60,541,0,1);
+      LODOP.ADD_PRINT_LINE(131,332,60,333,0,1);
+      LODOP.ADD_PRINT_LINE(131,215,108,216,0,1);
+      LODOP.ADD_PRINT_LINE(131,106,108,107,0,1);
+      LODOP.ADD_PRINT_LINE(131,591,108,592,0,1);
       LODOP.ADD_PRINT_TEXT(25,231,264,35,"混炼胶生产计划单");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",18);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
@@ -39,123 +35,87 @@ export function printHunlianLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(39,93,70,25,"排产日期:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(66,3,70,25,"产品型号:");
+      LODOP.ADD_PRINT_TEXT(173,475,140,25,"粉料包装袋是否破损:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(66,182,90,25,"原材料型号1:");
+      LODOP.ADD_PRINT_RECT(195,479,10,10,0,1);
+      LODOP.ADD_PRINT_TEXT(194,492,35,20,"完整");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(66,362,70,25,"生胶批号:");
+      LODOP.ADD_PRINT_TEXT(194,553,65,20,"部分破损");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(66,543,85,25,"排产需求量:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(66,699,25,25,"KG");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(91,3,80,22,"客户订单:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(90,183,50,20,"车数:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(90,336,24,25,"车");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(90,362,85,25,"原材料领取:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(90,521,24,20,"KG");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(91,544,75,20,"实际生产:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(91,699,25,20,"KG");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(113,0,470,25,"密炼机开炼机基本操作内容指导");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(113,539,115,25,"配方说明");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(134,475,140,25,"粉料包装袋是否破损:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_RECT(156,479,10,10,0,1);
-      LODOP.ADD_PRINT_TEXT(155,492,35,20,"完整");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(155,553,65,20,"部分破损");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(155,642,65,25,"完全破损");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_RECT(156,538,10,10,0,1);
-      LODOP.ADD_PRINT_RECT(157,627,10,10,0,1);
-      LODOP.ADD_PRINT_TEXT(175,477,161,25,"电子秤校准:  标准秤砣:");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_LINE(189,628,188,698,0,1);
-      LODOP.ADD_PRINT_TEXT(193,477,100,25,"校准结果:");
+      LODOP.ADD_PRINT_TEXT(194,642,65,25,"完全破损");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_RECT(195,538,10,10,0,1);
+      LODOP.ADD_PRINT_RECT(196,627,10,10,0,1);
+
       LODOP.ADD_PRINT_TEXT(215,478,85,20,"配料说明:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(234,477,100,25,"混炼胶硬度A;");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(262,477,100,25,"混炼胶颜色:");
+      LODOP.ADD_PRINT_TEXT(262,477,100,25,"混炼胶名称:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(290,477,100,25,"原材料型号1:");
+      LODOP.ADD_PRINT_TEXT(290,477,100,25,"原材料颜色:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(318,477,100,25,"原材料型号2:");
+      LODOP.ADD_PRINT_TEXT(318,477,100,25,"原材料型号:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(345,477,100,25,"催化剂类型:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(134,4,441,25,"1.检查配料品种是否正确，配料复核检验后按顺序合并配合剂;");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(154,4,336,25,"2.按设备操作规程对密炼机进行检查清理;");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(173,4,343,20,"3.将生胶投入密炼机,加压捏炼2-3分钟;");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(194,4,412,20,"4.投入小料(不含硫磺，TMTD和NA-22类硫化剂)加压捏炼1-2分钟");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(213,4,267,20,"5.先投填料，再投增塑剂，加压捏炼3-4分钟");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(214,269,140,20,"(适用50-80度胶料)");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(234,4,140,25,"高硬度胶80度以上，");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(234,123,298,25,"需要将填料分2-3次加入密炼，每次不少于2-3分钟");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(254,4,226,24,"低硬度胶50度以下,生胶要塑炼透,");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(135,87,288,30,"混 炼 胶 标 签 和 检 验 标 签");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(254,210,250,25,"先投入炭黑和部分填料，塑炼2-3分钟后,");
+      LODOP.ADD_PRINT_TEXT(66,2,95,25,"混炼胶编码:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(65,184,141,25,"合并公用产品型号:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(90,2,100,25,"合并排产量:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(90,184,123,25,"合并硫化订单号:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(113,2,120,25,"密练真空时间夏");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(113,220,115,25,"密练真空时间冬");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(113,475,120,25,"密练(真空)温度");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(91,165,29,20,"KG");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(134,475,85,25,"实际生产量:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(133,686,27,20,"KG");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(273,4,260,20,"再将剩余填料和油一起放入塑炼3-4分钟。");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(294,4,472,25,"6.升起上顶栓，打开加料口，清理加料口和上顶栓粉料，再加压捏炼2-3分钟");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(314,4,417,25,"7.排胶后，将混炼胶投入开炼机翻滚3-4个卷后出片。然后放料车冷却;");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(334,4,297,25,"8.冷却后的混炼胶放到货架上静置8小时以上;");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(354,4,459,20,"9.将静置后的混炼胶投入开炼，加入硫化剂翻炼，5-6次薄通和打卷出片。");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
 
       LODOP.ADD_PRINT_TEXT(39,152,120,20,printData.CreateDate.substring(0,10));
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(39,576,141,20,printData.TaskNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(66,63,125,20,printData.spec);
-      LODOP.ADD_PRINT_TEXT(67,259,110,25,printData.materialType1);
+      LODOP.ADD_PRINT_TEXT(91,82,80,25,printData.taskQty);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(67,603,95,25,printData.taskQty);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
       LODOP.ADD_PRINT_TEXT(234,559,155,25,printData.duroa);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(263,554,160,25,printData.color);
+      LODOP.ADD_PRINT_TEXT(263,554,160,25,printData.PartDesc);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(290,559,155,25,printData.materialType1);
+      LODOP.ADD_PRINT_TEXT(290,559,155,25,printData.color);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(318,559,157,25,printData.materialType2);
+      LODOP.ADD_PRINT_TEXT(318,559,157,25,printData.materialType1);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(345,560,155,25,printData.chjlt);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_BARCODE(12,30,138,65,"QRCode",printData.TaskNo);
+      LODOP.ADD_PRINT_TEXT(67,88,100,25,"PartNo");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(66,333,385,25,"11合并公用产品型号");
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(90,333,386,25,"11合并硫化订单号");
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(114,107,116,20,printData.mlzksjx);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(114,335,135,20,printData.mlzksjd);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(113,593,126,25,printData.zkwd);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
 
     }
     LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
diff --git a/src/views/modules/print/print_hunlian_card_old.js b/src/views/modules/print/print_hunlian_card_old.js
new file mode 100644
index 0000000..d0c6ead
--- /dev/null
+++ b/src/views/modules/print/print_hunlian_card_old.js
@@ -0,0 +1,169 @@
+/*调用js打印标签*/
+import getLodop from '@/utils/LodopFuncs.js'
+/*打印材料卷标签*/
+export function printHunlianLabel(printList) {
+  const LODOP = getLodop()
+  if (LODOP) {
+    //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", "");
+    LODOP.SET_LICENSES("", "AF8A5800B823CC8E18BCF67B925E7BF0", "", "");
+    // LODOP.SET_PRINTER_INDEXA("小标签打印机");
+    //循环调用打印机
+    for(let i = 0; i < printList.length; i++){
+      let printData = printList[i];
+      LODOP.NewPage();
+      LODOP.SET_PRINT_PAGESIZE(0,1000,1900,"");
+      LODOP.ADD_PRINT_LINE(61,0,60,718,0,1);
+      LODOP.ADD_PRINT_LINE(85,0,84,718,0,1);
+      LODOP.ADD_PRINT_LINE(109,0,108,718,0,1);
+      LODOP.ADD_PRINT_LINE(371,0,370,718,0,1);
+      LODOP.ADD_PRINT_LINE(131,0,130,718,0,1);
+      LODOP.ADD_PRINT_LINE(151,0,150,470,0,1);
+      LODOP.ADD_PRINT_LINE(171,0,170,718,0,1);
+      LODOP.ADD_PRINT_LINE(191,0,190,470,0,1);
+      LODOP.ADD_PRINT_LINE(211,0,210,718,0,1);
+      LODOP.ADD_PRINT_LINE(291,0,290,470,0,1);
+      LODOP.ADD_PRINT_LINE(311,0,310,470,0,1);
+      LODOP.ADD_PRINT_LINE(331,0,330,470,0,1);
+      LODOP.ADD_PRINT_LINE(351,0,350,470,0,1);
+      LODOP.ADD_PRINT_LINE(370,0,60,1,0,1);
+      LODOP.ADD_PRINT_LINE(370,718,60,719,0,1);
+      LODOP.ADD_PRINT_LINE(370,470,108,471,0,1);
+      LODOP.ADD_PRINT_LINE(108,180,60,181,0,1);
+      LODOP.ADD_PRINT_LINE(108,360,60,361,0,1);
+      LODOP.ADD_PRINT_LINE(108,540,60,541,0,1);
+      LODOP.ADD_PRINT_TEXT(25,231,264,35,"混炼胶生产计划单");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",18);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(38,502,100,25,"混炼工单号:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(39,93,70,25,"排产日期:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(66,3,70,25,"产品型号:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(66,182,90,25,"原材料型号1:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(66,362,70,25,"生胶批号:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(66,543,85,25,"排产需求量:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(66,699,25,25,"KG");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(91,3,80,22,"客户订单:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(90,183,50,20,"车数:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(90,336,24,25,"车");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(90,362,85,25,"原材料领取:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(90,521,24,20,"KG");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(91,544,75,20,"实际生产:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(91,699,25,20,"KG");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(113,0,470,25,"密炼机开炼机基本操作内容指导");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(113,539,115,25,"配方说明");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(134,475,140,25,"粉料包装袋是否破损:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_RECT(156,479,10,10,0,1);
+      LODOP.ADD_PRINT_TEXT(155,492,35,20,"完整");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(155,553,65,20,"部分破损");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(155,642,65,25,"完全破损");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_RECT(156,538,10,10,0,1);
+      LODOP.ADD_PRINT_RECT(157,627,10,10,0,1);
+      LODOP.ADD_PRINT_TEXT(175,477,161,25,"电子秤校准:  标准秤砣:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_LINE(189,628,188,698,0,1);
+      LODOP.ADD_PRINT_TEXT(193,477,100,25,"校准结果:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(215,478,85,20,"配料说明:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(234,477,100,25,"混炼胶硬度A;");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(262,477,100,25,"混炼胶颜色:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(290,477,100,25,"原材料型号1:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(318,477,100,25,"原材料型号2:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(345,477,100,25,"催化剂类型:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(134,4,441,25,"1.检查配料品种是否正确，配料复核检验后按顺序合并配合剂;");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(154,4,336,25,"2.按设备操作规程对密炼机进行检查清理;");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(173,4,343,20,"3.将生胶投入密炼机,加压捏炼2-3分钟;");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(194,4,412,20,"4.投入小料(不含硫磺，TMTD和NA-22类硫化剂)加压捏炼1-2分钟");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(213,4,267,20,"5.先投填料，再投增塑剂，加压捏炼3-4分钟");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(214,269,140,20,"(适用50-80度胶料)");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(234,4,140,25,"高硬度胶80度以上，");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(234,123,298,25,"需要将填料分2-3次加入密炼，每次不少于2-3分钟");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(254,4,226,24,"低硬度胶50度以下,生胶要塑炼透,");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(254,210,250,25,"先投入炭黑和部分填料，塑炼2-3分钟后,");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(273,4,260,20,"再将剩余填料和油一起放入塑炼3-4分钟。");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(294,4,472,25,"6.升起上顶栓，打开加料口，清理加料口和上顶栓粉料，再加压捏炼2-3分钟");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(314,4,417,25,"7.排胶后，将混炼胶投入开炼机翻滚3-4个卷后出片。然后放料车冷却;");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(334,4,297,25,"8.冷却后的混炼胶放到货架上静置8小时以上;");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(354,4,459,20,"9.将静置后的混炼胶投入开炼，加入硫化剂翻炼，5-6次薄通和打卷出片。");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+
+
+      LODOP.ADD_PRINT_TEXT(39,152,120,20,printData.CreateDate.substring(0,10));
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(39,576,141,20,printData.TaskNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(66,63,125,20,printData.spec);
+      LODOP.ADD_PRINT_TEXT(67,259,110,25,printData.materialType1);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(67,603,95,25,printData.taskQty);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_TEXT(234,559,155,25,printData.duroa);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(263,554,160,25,printData.color);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(290,559,155,25,printData.materialType1);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(318,559,157,25,printData.materialType2);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(345,560,155,25,printData.chjlt);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_BARCODE(12,30,138,65,"QRCode",printData.TaskNo);
+
+    }
+    // LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
+    LODOP.PRINT_DESIGN();
+    // LODOP.PREVIEW();
+    // LODOP.PRINT();
+    console.log("操作成功！")
+  }
+}
+
+
diff --git a/src/views/modules/print/print_liuhua_card.js b/src/views/modules/print/print_liuhua_card.js
index c866c16..aa3ad59 100644
--- a/src/views/modules/print/print_liuhua_card.js
+++ b/src/views/modules/print/print_liuhua_card.js
@@ -189,7 +189,7 @@ export function printCardLabel(printList) {
       LODOP.ADD_PRINT_TEXT(302,585,70,25,"射出位置3");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"FontColor","#FF0000");
-      LODOP.ADD_PRINT_TEXT(326,5,100,25,"计划领取重量:");
+      LODOP.ADD_PRINT_TEXT(326,5,115,25,"计划班需求重量:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"FontColor","#FF0000");
       LODOP.ADD_PRINT_TEXT(326,200,90,25,"实际领取重量");
@@ -202,7 +202,7 @@ export function printCardLabel(printList) {
       LODOP.ADD_PRINT_TEXT(327,545,65,25,"储料位置");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"FontColor","#FF0000");
-      LODOP.ADD_PRINT_TEXT(351,6,100,25,"计划生产任务:");
+      LODOP.ADD_PRINT_TEXT(351,6,110,25,"计划班生产重量:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"FontColor","#FF0000");
       LODOP.ADD_PRINT_TEXT(349,173,23,20,"KG");
@@ -237,8 +237,8 @@ export function printCardLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       // LODOP.ADD_PRINT_TEXT(63,615,105,25,"外购件批号");//外购件批号
       // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(86,82,120,20,"123原材料型号");//原材料型号
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(86,82,120,20,printData.yclxh);//原材料型号
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(87,283,105,25,printData.hljyd);//混炼胶硬度
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(86,461,100,25,printData.mjks);//模具孔条数
@@ -282,10 +282,10 @@ export function printCardLabel(printList) {
       // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       // LODOP.ADD_PRINT_TEXT(182,616,105,20,"二段实际时间");//二段实际时间
       // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(207,83,75,25,"挤出总功率");//挤出总功率
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(206,243,85,20,"挤出机功率");//挤出机功率
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(207,83,75,25,printData.jczgl);//挤出总功率
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(206,243,85,20,printData.jcjgl);//挤出机功率
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(206,422,90,25,printData.gdsd);//钢带速度
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(207,582,90,25,printData.qdgc);//前段尺寸公差
@@ -312,10 +312,10 @@ export function printCardLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(278,243,85,25,printData.sjsj);//水煮时间
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(278,423,85,25,"底层胶水");//底层胶水
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(278,585,75,25,"表层胶水");//表层胶水
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(278,423,85,25,printData.dcjs);//底层胶水
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(278,585,75,25,printData.bcjs);//表层胶水
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(279,649,75,25,printData.bysj);//保压时间
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(301,155,85,25,printData.cjlwz);//储胶量位置
@@ -326,17 +326,17 @@ export function printCardLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(302,650,70,25,printData.scwz3);//射出位置3
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(325,115,100,25,"计划领取重量");//计划领取重量
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(325,115,100,25,printData.bxqzl);//计划班需求重量
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       // LODOP.ADD_PRINT_TEXT(327,269,90,25,"实际领取重量");//实际领取重量
       // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       // LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
       LODOP.ADD_PRINT_TEXT(327,438,80,25,printData.scwz1);//射胶位置1
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
-      // LODOP.ADD_PRINT_TEXT(327,615,104,25,"储料位置");//储料位置
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(350,90,90,25,printData.qtyRequired);//计划生产任务
+      LODOP.ADD_PRINT_TEXT(327,615,104,25,printData.cllwz);//储料位置
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(350,90,90,25,printData.bsczl);//计划班生产重量
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
       // LODOP.ADD_PRINT_TEXT(351,284,90,20,"实际生产模数");//实际生产模数
diff --git a/src/views/modules/print/print_part_label.js b/src/views/modules/print/print_part_label.js
index 5effe64..ad86100 100644
--- a/src/views/modules/print/print_part_label.js
+++ b/src/views/modules/print/print_part_label.js
@@ -15,7 +15,7 @@ export function printPartLabel(printList) {
       LODOP.SET_PRINT_PAGESIZE(0,1000,1500,"");
 
       LODOP.ADD_PRINT_RECT(43,5,551,308,0,1);
-      LODOP.ADD_PRINT_TEXT(2,214,140,30,"物料状态标识卡");
+      LODOP.ADD_PRINT_TEXT(3,287,140,30,"物料状态标识卡");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -23,7 +23,7 @@ export function printPartLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(25,60,240,25,printData.orderNo);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(26,359,197,25,"说明：不合格品须用红色标识");
+      LODOP.ADD_PRINT_TEXT(27,518,197,25,"说明：不合格品须用红色标识");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
       LODOP.SET_PRINT_STYLEA(0,"Underline",1);
@@ -46,10 +46,10 @@ export function printPartLabel(printList) {
       LODOP.ADD_PRINT_LINE(273,379,241,380,0,1);
       LODOP.ADD_PRINT_LINE(273,452,241,453,0,1);
       LODOP.ADD_PRINT_LINE(299,264,298,556,0,1);
-      LODOP.ADD_PRINT_TEXT(353,179,211,25,"苏州赫艾聚合科技有限公司");
+      LODOP.ADD_PRINT_TEXT(353,254,211,25,"苏州赫艾聚合科技有限公司");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-      LODOP.ADD_PRINT_TEXT(353,437,120,25,"QP-7.5-03-R01");
+      LODOP.ADD_PRINT_TEXT(353,597,120,25,"QP-7.5-03-R01");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
       LODOP.ADD_PRINT_LINE(351,331,273,332,0,1);
@@ -69,7 +69,7 @@ export function printPartLabel(printList) {
       LODOP.ADD_PRINT_TEXT(61,470,85,25,printData.qtyRequired);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(92,12,65,40,"进厂/\r\n生产日期");
-      LODOP.ADD_PRINT_TEXT(98,77,105,25,printData.sScheduledDate);
+      LODOP.ADD_PRINT_TEXT(98,77,105,25,printData.sScheduledDate.substring(0,10));
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(102,190,55,25,"生产者");
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
@@ -124,13 +124,17 @@ export function printPartLabel(printList) {
       LODOP.ADD_PRINT_TEXT(317,264,75,25,"物料说明：");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-      LODOP.ADD_PRINT_TEXT(300,333,224,57,printData.remark);
+      // LODOP.ADD_PRINT_TEXT(300,333,224,57,printData.remark);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_RECT(43,556,162,308,0,1);
+      LODOP.ADD_PRINT_TEXT(53,563,100,20,"备注:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(72,564,152,274,printData.remark);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-
     }
-    LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
-    // LODOP.PRINT_DESIGN();
-    LODOP.PREVIEW();
+    // LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
+    LODOP.PRINT_DESIGN();
+    // LODOP.PREVIEW();
     // LODOP.PRINT();
     console.log("操作成功！")
   }
diff --git a/src/views/modules/production/dailyPlanReport.vue b/src/views/modules/production/dailyPlanReport.vue
index 899f5a2..08613a1 100644
--- a/src/views/modules/production/dailyPlanReport.vue
+++ b/src/views/modules/production/dailyPlanReport.vue
@@ -341,6 +341,7 @@
           partDesc:row.partDesc,
           qtyRequired:row.taskQty,
           toExpireDays:row.toExpireDays,
+          remark:row.remark,
         }
         array.push(data)
         printPartLabel(array)
diff --git a/src/views/modules/production/productionBlankingSearch.vue b/src/views/modules/production/productionBlankingSearch.vue
index 646f1c5..4af8c53 100644
--- a/src/views/modules/production/productionBlankingSearch.vue
+++ b/src/views/modules/production/productionBlankingSearch.vue
@@ -147,6 +147,12 @@
           <el-input v-model="qty3" readonly  style="width: 130px" ></el-input>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item :label="'合并备注：'">
+          <el-input v-model="remark"  style="width: 670px"></el-input>
+        </el-form-item>
+
+      </el-form>
       <el-table
         height="200"
         :data="modalTableData"
@@ -256,6 +262,7 @@
         modalTableData:[],
         hunlianPartNo:'',
         hunlianOnHand:'',
+        remark:'',
       }
     },
     mounted () {
@@ -412,6 +419,7 @@
           site:this.modalTableData[0].site,
           taskQty:this.qty1,
           partNo:this.modalTableData[0].componentPartNo,
+          remark:this.remark,
           createBy:this.$store.state.user.name,
           detailList:detailList
         }
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index a66ccd8..18be3c4 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -308,6 +308,11 @@
           <el-input v-model="schedulingModalData.weightFactor" disabled style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="派工备注:">
+          <el-input v-model="schedulingModalData.remark"  style="width: 656px"></el-input>
+        </el-form-item>
+      </el-form>
       <el-button type="primary" @click="addPlans()" style="margin-left: 10px;">添加</el-button>
       <el-button type="primary" @click="saveSchedule()">保存</el-button>
       <div class="rq ">
@@ -479,6 +484,7 @@
         },
         weightFactorFlag:false,
         schedulingModalData: {
+          remark:'',
           weightFactor:'',
           orderNo: '',
           site: '',
@@ -571,6 +577,7 @@
           return false
         }
         this.schedulingModalData = {
+          remark:'',
           weightFactor: row.weightFactor,
           partPlanQty: row.partPlanQty,
           orderNo: row.orderNo,
@@ -624,6 +631,7 @@
             shiftNo: this.schedulingModalData.shiftNo,
             scheduleDate: null,
             operatorId:this.schedulingModalData.operatorId,
+            createBy:this.$store.state.user.name
           }
         if(this.schedulingModalData.partPlanQty!=null&&this.schedulingModalData.partPlanQty!=''&&this.schedulingModalData.partPlanQty!=0){
           data.scheduleQty=this.schedulingModalData.partPlanQty;
@@ -743,7 +751,8 @@
           sumQty: this.schedulingModalData.sumQty,
           scheduleDetail:this.schedulingModalTableData,
           efficiency:this.schedulingModalData.efficiency,
-          orderRef1:this.schedulingModalData.orderRef1
+          orderRef1:this.schedulingModalData.orderRef1,
+          remark:this.schedulingModalData.remark,
         }
         scheduleForSOTask(indata).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index dc12cb8..bd1a85f 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -363,6 +363,11 @@
           <el-button type="primary" @click="saveSchedule()">保存</el-button>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="派工备注:">
+          <el-input v-model="schedulingModalData.remark" style="width: 791px"></el-input>
+        </el-form-item>
+      </el-form>
       <div class="rq ">
         <el-table
           height="200"
@@ -540,6 +545,7 @@
         },
         weightFactorFlag:false,
         schedulingModalData: {
+          remark:'',
           weightFactor:'',
           orderNo: '',
           site: '',
@@ -628,6 +634,7 @@
           return false
         }
         this.schedulingModalData = {
+          remark:'',
           weightFactor: row.weightFactor,
           partPlanQty: row.partPlanQty,
           orderNo: row.orderNo,
@@ -693,6 +700,7 @@
           shiftNo: this.schedulingModalData.shiftNo,
           scheduleDate: null,
           operatorId:this.schedulingModalData.operatorId,
+          createBy:this.$store.state.user.name
         }
         if(this.schedulingModalData.partPlanQty!=null&&this.schedulingModalData.partPlanQty!=''&&this.schedulingModalData.partPlanQty!=0){
           data.scheduleQty=this.schedulingModalData.partPlanQty;
@@ -797,7 +805,7 @@
             type: 'warning'
           }).then(() => {
             if(flag2){
-              this.$confirm(`实际派工数量大于上工序完成数量，是否继续`, '提示', {
+              this.$confirm(`实际派工数量大于上工序完成数量，是否存在超额派工或者重复派工的情况， 请确认是否继续！`, '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
@@ -810,7 +818,7 @@
           })
         }else {
           if(flag2){
-            this.$confirm(`实际派工数量大于上工序完成数量，是否继续`, '提示', {
+            this.$confirm(`实际派工数量大于上工序完成数量，是否存在超额派工或者重复派工的情况， 请确认是否继续！`, '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
@@ -833,6 +841,7 @@
           sumQty: this.schedulingModalData.sumQty,
           scheduleDetail:this.schedulingModalTableData,
           efficiency:this.schedulingModalData.efficiency,
+          remark:this.schedulingModalData.remark,
         }
         scheduleForShopOrder(indata).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/taskmanage/mysendtasklist.vue b/src/views/modules/taskmanage/mysendtasklist.vue
index 167f6a3..aaeebf4 100644
--- a/src/views/modules/taskmanage/mysendtasklist.vue
+++ b/src/views/modules/taskmanage/mysendtasklist.vue
@@ -560,9 +560,9 @@
         })
       },
       tableRowClassName({row, rowIndex}) {
-        if (row.chatLastType == '有新回复'&&row.finalStatus=='未完成') {
-          return 'newChat'
-        }
+        // if (row.chatLastType == '有新回复'&&row.finalStatus=='未完成') {
+        //   return 'newChat'
+        // }
       },
       // 新增 / 修改
       addOrUpdateHandle(id) {
diff --git a/src/views/modules/taskmanage/mytasklist.vue b/src/views/modules/taskmanage/mytasklist.vue
index 9ffc5d3..2051392 100644
--- a/src/views/modules/taskmanage/mytasklist.vue
+++ b/src/views/modules/taskmanage/mytasklist.vue
@@ -468,9 +468,9 @@
     },
     methods: {
       tableRowClassName({row, rowIndex}) {
-        if (row.chatLastType == '有新消息'&&row.finalStatus=='未完成') {
-          return 'newChat'
-        }
+        // if (row.chatLastType == '有新消息'&&row.finalStatus=='未完成') {
+        //   return 'newChat'
+        // }
       },
       // 获取数据列表
       getDataList() {