Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

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

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

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

@@ -62,6 +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 _ from "lodash"
 import { mixins } from "@/mixins/mixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
@@ -163,7 +164,8 @@ export default {
           // params.condition.filters.push(...this.isFilter("packingCode", this.selectData.packingCode))
           this.pageLoading = true
           // getDetailed(this.selectData.packingCode, "label/purchase-label/by-code")
-          getDetailed(this.selectData.packingCode, "label/inventory-label/by-code")
+          // getDetailed(this.selectData.packingCode, "label/inventory-label/by-code")
+          getOneInventoryLabelByCodes(this.selectData.packingCode)
             .then(res => {
               this.pageLoading = false
               this.flexTableData = []

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

@@ -52,6 +52,7 @@ 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"
 export default {
   name: "PutawayNote",
   mixins: [
@@ -99,12 +100,15 @@ 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) => {