修复部分bug

src/option/distribution/arteryDistrilbutionBillLadingList.js

@@ -618,9 +618,9 @@ export const columnNewList = [
     isshowSummary: true,
   },
   {
-    prop: 'planNum',
+    prop: 'noBillladingNum',
-    label: '计划件数',
+    label: '未入库件数',
-    type: 6,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],

src/utils/print.js

@@ -2,22 +2,22 @@ import { getLodop } from '@/utils/LodopFuncs';
 import hwyPrintNew from '@/utils/print/index';
 
 /** 处理标签打印 */
-const handleTitlePrint = (LODOP, templateData)=>{
+const handleTitlePrint = (LODOP, templateData) => {
-  LODOP.PRINT_INITA("");
+  LODOP.PRINT_INITA('');
   // LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
   LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
   // LODOP.SET_PRINT_STYLE('FontColor', '#000000');
   // // 设置打印整宽且不变形
-  LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '60%');
+  LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '95%');
   // // 设置打印后自动关闭
   LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
-    // // data就是一段html文本
+  // // data就是一段html文本
-    LODOP.ADD_PRINT_HTM('30', '0%', '100%', '100%', templateData);
+  LODOP.ADD_PRINT_HTM('30', '0%', '100%', '100%', templateData);
-}
+};
 
 /** 打印配送单 */
-const handleDeliveryPrint = (LODOP, templateData)=>{
+const handleDeliveryPrint = (LODOP, templateData) => {
-  LODOP.PRINT_INITA("");
+  LODOP.PRINT_INITA('');
   // LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
   LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
   // LODOP.SET_PRINT_STYLE('FontColor', '#000000');
@@ -27,8 +27,8 @@ const handleDeliveryPrint = (LODOP, templateData)=>{
   LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
 
   // // data就是一段html文本
-  LODOP.ADD_PRINT_HTM('0', '0%', '100%%', "100%", templateData);
+  LODOP.ADD_PRINT_HTM('0', '0%', '100%%', '100%', templateData);
-}
+};
 
 /**
  * 根据传入的元素列表进行打印
@@ -50,10 +50,8 @@ const print = (nodeList, type = 'deliveryPrint') => {
     let templateData = orderNode.innerHTML;
     // let templateData="<h1>1111</h1>"
 
-
+    if (type === 'titlePrint') handleTitlePrint(LODOP, templateData);
-
+    else handleDeliveryPrint(LODOP, templateData);
-    if (type === 'titlePrint') handleTitlePrint(LODOP, templateData)
-    else handleDeliveryPrint(LODOP, templateData)
     // LODOP.NewPage()
     // LODOP.PRINT(); //直接打印
     LODOP.PRINT_DESIGN();
@@ -74,7 +72,4 @@ const newPrint = nodeName => {
   hwyPrintNew('.el-dialog__body>div>div>div');
 };
 
-
-
-
 export default print;

src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue

@@ -305,9 +305,9 @@
             @selection="list => selectionChange(list, 1)"
           >
             <template #default="{ scope }">
-              <template v-if="scope.column.label === '计划件数'">
+              <!-- <template v-if="scope.column.label === '计划件数'">
                 <span class="w100">{{ scope.row.totalPlanNum }}</span>
-              </template>
+              </template> -->
             </template>
           </tablecmt>
 
@@ -365,7 +365,7 @@
             @selection="list => selectionChange(list, 2)"
           >
             <template #default="{ scope }">
-              <template v-if="scope.column.label === '计划件数'">
+              <!-- <template v-if="scope.column.label === '计划件数'">
                 <el-input-number
                   v-model="scope.row.planNum"
                   :controls="false"
@@ -373,7 +373,7 @@
                   :min="scope.row.realNum || 0"
                   :precision="0"
                 />
-              </template>
+              </template> -->
             </template>
           </tablecmt>
 

src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

@@ -109,7 +109,7 @@
 
               <template v-if="slotProps.scope.column.label === '提货件数'">
                 <el-input-number
-                  v-model="slotProps.scope.row[slotProps.scope.column.property]"
+                  v-model="slotProps.scope.row.realNum"
                   :controls="false"
                   :precision="0"
                   :min="0"
@@ -348,8 +348,8 @@ export default {
           sortable: true,
         },
         {
-          prop: 'planNum',
+          prop: 'scanNum',
-          label: '计划件数',
+          label: '扫描件数',
           type: 2,
           values: '',
           width: '150',
@@ -716,6 +716,8 @@ export default {
         const { code, data } = res.data;
         if (code !== 200) return;
 
+        console.log('data :>> ', data);
+
         this.deliverydata = data;
         this.deliverydata.chargeTypeName = this.chargeTypeList.find(
           val => val.dictKey == data.chargeType
@@ -725,10 +727,12 @@ export default {
         for (let i = 0; i < this.data.length; i++) {
           const value = this.data[i];
 
-          value.realNum = value.realNum ? value.realNum : value.totalCount - value.stockCount;
+          // value.realNum = value.realNum ? value.realNum : value.totalCount - value.stockCount;
+
+          console.log('value :>> ', value);
         }
 
-        this.inputsc('', { prop: 'aaa' });
+        // this.inputsc('', { prop: 'aaa' });
       } catch (error) {
         console.log('error :>> ', error);
       } finally {