0412 新看板

src/views/modules/board/SeqNoForLiuHua.vue

@@ -70,14 +70,14 @@
           prop="text2"
           header-align="center"
           align="left"
-          min-width="25"
+          min-width="35"
           label="硬度">
         </el-table-column>
         <el-table-column
           prop="text3"
           header-align="center"
           align="left"
-          min-width="20"
+          min-width="25"
           label="颜色">
         </el-table-column>
         <el-table-column
@@ -91,7 +91,7 @@
           prop="planStartTime"
           header-align="center"
           align="left"
-          min-width="45"
+          min-width="35"
           label="生产日期">
         </el-table-column>
         <el-table-column

src/views/modules/board/nextWeekShipmentBoard.vue

@@ -15,89 +15,68 @@
         border
         style="width: 100%;">
         <el-table-column
-          prop="planShipDate"
+          prop="abbreviateName"
           header-align="center"
           align="left"
-          min-width="45"
-          style="font-size: 20px"
-          label="发货日期">
+          min-width="25"
+          label="客户简称">
         </el-table-column>
         <el-table-column
-          prop="partSpec"
+          prop="customerPONo"
           header-align="center"
           align="left"
-          min-width="100"
-          label="产品型号">
-        </el-table-column>
-        <el-table-column
-          prop="notifyQty"
-          header-align="center"
-          align="right"
-          min-width="40"
-          label="需求总数">
+          min-width="45"
+          style="font-size: 20px"
+          label="客户采购订单号">
         </el-table-column>
         <el-table-column
-          prop="qtyPerBox"
+          prop="delNotifyNo"
           header-align="center"
-          align="right"
-          min-width="40"
-          label="袋装数量">
+          align="left"
+          min-width="45"
+          label="通知单号">
         </el-table-column>
         <el-table-column
-          prop="weightperBag"
+          prop="planShipDate"
           header-align="center"
-          align="right"
+          align="left"
           min-width="40"
-          label="袋装重量"
-          :formatter="getFormatterNumber">
+          label="要求发货日期">
         </el-table-column>
         <el-table-column
-          prop="bagsperBox"
+          prop="partSpec"
           header-align="center"
-          align="right"
-          min-width="40"
-          label="每箱袋数">
+          align="left"
+          min-width="60"
+          label="产品型号">
         </el-table-column>
         <el-table-column
-          prop="boxType"
+          prop="notifyQty"
           header-align="center"
           align="right"
-          min-width="45"
-          label="纸箱规格">
+          min-width="35"
+          label="通知单数量"
+        >
         </el-table-column>
-<!--        <el-table-column-->
-<!--          prop="weightperBox"-->
-<!--          header-align="center"-->
-<!--          align="right"-->
-<!--          min-width="50"-->
-<!--          label="每箱总重">-->
-<!--        </el-table-column>-->
         <el-table-column
-          prop="operationSz"
+          prop="forwarderName"
           header-align="center"
           align="left"
-          min-width="70"
-          label="工艺备注-水煮">
+          min-width="30"
+          label="货运代理">
         </el-table-column>
         <el-table-column
-          prop="operationHk"
+          prop="enteredDate"
           header-align="center"
           align="left"
-          min-width="70"
-          label="工艺备注-烘烤">
-        </el-table-column>
-        <el-table-column
-          prop="abbreviateName"
-          header-align="center"
-          align="left"
-          min-width="45"
-          label="客户简称">
+          min-width="60"
+          label="通知单下达时间">
         </el-table-column>
         <el-table-column
           prop="remark"
           header-align="center"
           align="left"
-          min-width="95"
+          min-width="70"
           label="备注">
         </el-table-column>
       </el-table>

src/views/modules/board/thisWeekShipmentBoard.vue

@@ -15,91 +15,71 @@
         border
         style="width: 100%;">
         <el-table-column
-          prop="planShipDate"
+          prop="abbreviateName"
           header-align="center"
           align="left"
-          min-width="45"
-          style="font-size: 20px"
-          label="发货日期">
+          min-width="25"
+          label="客户简称">
         </el-table-column>
         <el-table-column
-          prop="partSpec"
+          prop="customerPONo"
           header-align="center"
           align="left"
-          min-width="100"
-          label="产品型号">
-        </el-table-column>
-        <el-table-column
-          prop="notifyQty"
-          header-align="center"
-          align="right"
-          min-width="40"
-          label="需求总数">
+          min-width="45"
+          style="font-size: 20px"
+          label="客户采购订单号">
         </el-table-column>
         <el-table-column
-          prop="qtyPerBox"
+          prop="delNotifyNo"
           header-align="center"
-          align="right"
-          min-width="40"
-          label="袋装数量">
+          align="left"
+          min-width="45"
+          label="通知单号">
         </el-table-column>
         <el-table-column
-          prop="weightperBag"
+          prop="planShipDate"
           header-align="center"
-          align="right"
+          align="left"
           min-width="40"
-          label="袋装重量"
-          :formatter="getFormatterNumber">
+          label="要求发货日期">
         </el-table-column>
         <el-table-column
-          prop="bagsperBox"
+          prop="partSpec"
           header-align="center"
-          align="right"
-          min-width="40"
-          label="每箱袋数">
+          align="left"
+          min-width="60"
+          label="产品型号">
         </el-table-column>
         <el-table-column
-          prop="boxType"
+          prop="notifyQty"
           header-align="center"
           align="right"
-          min-width="45"
-          label="纸箱规格">
-        </el-table-column>
-<!--        <el-table-column-->
-<!--          prop="weightperBox"-->
-<!--          header-align="center"-->
-<!--          align="right"-->
-<!--          min-width="50"-->
-<!--          label="每箱总重">-->
-<!--        </el-table-column>-->
-        <el-table-column
-          prop="operationSz"
-          header-align="center"
-          align="left"
-          min-width="70"
-          label="工艺备注-水煮">
+          min-width="35"
+          label="通知单数量"
+          >
         </el-table-column>
         <el-table-column
-          prop="operationHk"
+          prop="forwarderName"
           header-align="center"
           align="left"
-          min-width="70"
-          label="工艺备注-烘烤">
+          min-width="30"
+          label="货运代理">
         </el-table-column>
         <el-table-column
-          prop="abbreviateName"
+          prop="enteredDate"
           header-align="center"
           align="left"
-          min-width="45"
-          label="客户简称">
+          min-width="60"
+          label="通知单下达时间">
         </el-table-column>
         <el-table-column
           prop="remark"
           header-align="center"
           align="left"
-          min-width="95"
+          min-width="70"
           label="备注">
         </el-table-column>
+
       </el-table>
     </div>
 

src/views/modules/production/print_inspect_label.js

@@ -45,7 +45,7 @@ export function printInspectLabel(printList) {
       LODOP.ADD_PRINT_TEXT(64,8,96,25,"Q.T.Y:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(64,70,188,24,printData.qtyRequired+printData.umid+' | '+printData.weight+'公斤');
+      LODOP.ADD_PRINT_TEXT(64,70,188,24,printData.qtyRequired+printData.umid+' | '+printData.weight.toFixed(2)+'公斤');
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(194,8,128,25,"MFG Date:");

src/views/modules/production/stockPrint.vue

@@ -121,7 +121,7 @@
         prop="batchNo"
         header-align="center"
         align="left"
-        min-width="80"
+        min-width="110"
         label="批号">
       </el-table-column>
       <el-table-column