打印相关问题处理

fe/PC/src/api/wms-core.js

@@ -2,8 +2,8 @@ import request from '@/utils/request'
 // let baseURL = localStorage.getItem('print') + '/api/'
 let baseURL = localStorage.getItem('base') + '/api/'
 
-// 根据箱码获取标签相关信息 | 补打标签 |  打印需要获取标签（供应商简称等）相关位置
-export function getOneInventoryLabelByCodes(code) {
+// 根据箱码获取标签相关信息 | 补打标签
+export function getOneInventoryLabelByCode(code) {
   return request({
     url: baseURL + 'label/inventory-label/by-code/' + code,
     method: 'get'

fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetNote.vue

@@ -90,7 +90,12 @@ export default {
     drawerbutton (val) {
       // 打印
       if(val == 'print'){
-        let data = initPrintAllData(this.propsData,'tzd.rdlx','AdjustmentReason');
+        let _option = {
+          details:{
+            locationCode:"toLocationCode",
+          }
+        }
+        let data = initPrintAllData(this.propsData,'tzd.rdlx','AdjustmentReason',_option);
         this.Print(data)
       }
     },

fe/PC/src/views/labelManage/RepairLabels.vue

@@ -62,7 +62,7 @@ import resultStatus from "@/components/resultStatus"
 import currenTableFlex from "@/components/currenTableFlex"
 import {initPrintPackingCodeData} from "@/mixins/printMixin"
 import { getDetailed} from "@/api/wms-api"
-import { getOneInventoryLabelByCodes} from "@/api/wms-core"
+import { getOneInventoryLabelByCode} from "@/api/wms-core"
 import _ from "lodash"
 import { mixins } from "@/mixins/mixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
@@ -165,7 +165,7 @@ export default {
           this.pageLoading = true
           // getDetailed(this.selectData.packingCode, "label/purchase-label/by-code")
           // getDetailed(this.selectData.packingCode, "label/inventory-label/by-code")
-          getOneInventoryLabelByCodes(this.selectData.packingCode)
+          getOneInventoryLabelByCode(this.selectData.packingCode)
             .then(res => {
               this.pageLoading = false
               this.flexTableData = []

fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue

@@ -45,14 +45,14 @@
   </div>
 </template>
 <script>
-import { getPageListWip,getOneSupplierInfoByCode } from "@/api/wms-api"
+import { getPageListWip } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import { initPrintAllData } from '@/mixins/printMixin'
-import { getOneInventoryLabelByCodes} from "@/api/wms-core"
+import { getInventoryLabelByCodes} from "@/api/wms-core"
 export default {
   name: "PutawayNote",
   mixins: [
@@ -100,38 +100,31 @@ export default {
           this.Loading.tableLoading = false
         })
     },
-    getLabel(){
-      return getOneInventoryLabelByCodes(this.propsData.packingCode)
-    },
-    getSupplier(){
-      return getOneSupplierInfoByCode(this.propsData.supplierCode)
-    },
     //抽屉常用按钮
     drawerbutton (val) {
-      // 打印 todo:待确定打印位置
+      // 打印
       if(val == 'print'){
-        // Promise.all([this.getSupplier()])
-        //   .then((supplier) => {
-        //     console.log(supplier)
-        //   });
-        // if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){
-        //   this.Loading.tableLoading = true
-        //   allSupplierByCodes([this.propsData.supplierCode]).then(res => {
-        //     this.Loading.tableLoading = false
-        //     if(res.length > 0){
-        //       this.propsData.supplierName = res[0].name
-        //       this.propsData.supplierShortName = res[0].shortName
-        //     }
-        //     let data = initPrintAllData(this.propsData,'ysd.rdlx');
-        //     this.Print(data)
-        //   }).catch(err => {
-        //     this.Loading.tableLoading = false
-        //     console.log(err)
-        //   })
-        // }else{
-          let data = initPrintAllData(this.propsData,'ysd.rdlx');
+        let _ids = []
+        this.propsData.details.forEach(item => {
+          _ids.push(item.handledPackingCode)
+        });
+        getInventoryLabelByCodes(_ids).then(res => {
+          this.Loading.appMainLoading = false;
+          let _printData = JSON.parse(JSON.stringify(this.propsData))
+          _printData.supplierCode = res[0].supplierCode;
+          _printData.supplierSimpleName = res[0].supplierSimpleName;
+          res.forEach((item)=>{
+            _printData.details.forEach((item2)=>{
+              if(item.itemCode == item2.itemCode){
+                item2.supplierItemCode = item.supplierItemCode
+              }
+            })
+          })
+          let data = initPrintAllData(_printData,'ysd.rdlx');
           this.Print(data)
-        // }
+        }).catch(err => {
+          this.Loading.appMainLoading = false;
+        })
       }
     },
   },