【nev-pc】打印单据处理暂存

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

@@ -778,6 +778,14 @@ export function getLocationByCode(data) {
   })
 }
 
+// 通过userid获取部门相关信息
+export function getDepartByUserId(id) {
+  return request({
+    url: baseURL + 'auth/auth/department/by-userid',
+    method: 'get',
+    params:{userId:id}
+  })
+}
 
 // 客户退拆任务-完成 todo
 // export async function productionRecycleJobComplete(id) {

fe/PC/src/mixins/mixins.js

@@ -243,6 +243,7 @@ export const mixins = {
             fd.append("file", formFile[0])
             
             postImport(fd, _uploadURL, _isSpecial).then(res => {
+              console.log(246,res)
               const headers = JSON.parse(res.headers)
               // 判断是否有错误记录
               if (headers.result.ErrorNum > 0) {

fe/PC/src/mixins/printMixin.js

@@ -1,6 +1,7 @@
 // 打印功能数据整合
 import { Enum } from "@/utils/index"
 import store from '@/store/index'
+import { getDepartByUserId }from '@/api/wms-api'
 /**/
 // 打印【箱标签-单个】 (xiangbq.rdlx)
 // 使用位置：补打标签 (RepairLabels.vue)
@@ -218,7 +219,7 @@ const printEnumOption = {
  * @returns 
  */
 // 
- export function initPrintAllData(propsData,name,enumOption,options,deptInfo,url){
+ export async function initPrintAllData(propsData,name,enumOption,options,deptInfo,url){
     if(!propsData || propsData.details.length <= 0)return false
     let _printData = {details:[]}
     let _outData = {}
@@ -252,9 +253,12 @@ const printEnumOption = {
     // 部门相关信息获取
     if(deptInfo && _printData.details[0] && _printData.details[0].creatorId && _printData.details[0].creatorId != 'null'){
         // todo获取接口
+        await getDepartByUserId(_printData.details[0].creatorId)
+            .then(res=>{
                 _printData.details.forEach(item=>{
-            item.deptCode = '111'
-            item.deptName = '222'
+                    item.deptCode = res.code
+                    item.deptName = res.name
+                })
             })
     }
     let data = {

fe/PC/src/views/kittingManage/KittingIssueNote.vue

@@ -104,6 +104,7 @@
           let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
           _propsData.details.forEach(item=>{
             item.handledToLot = item.handledToLot + " "
+            item.boxQtyShow = _propsData.enumIssueSendType == 2 ? item.requestQty : ''
           })
           let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true);
           this.Print(data)

fe/PC/src/views/materialIssueBP/IssueNoteBP.vue

@@ -104,6 +104,7 @@ export default {
         let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
         _propsData.details.forEach(item=>{
           item.handledToLot = item.handledToLot + " "
+          item.boxQtyShow = _propsData.enumIssueSendType == 2 ? item.requestQty : ''
         })
         let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true);
         this.Print(data)

fe/PC/src/views/materialIssuePT/IssueNotePT.vue

@@ -104,6 +104,7 @@ export default {
         let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
         _propsData.details.forEach(item=>{
           item.handledToLot = item.handledToLot + " "
+          item.boxQtyShow = _propsData.enumIssueSendType == 2 ? item.requestQty : ''
         })
         let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true);
         this.Print(data)

fe/PC/src/views/materialIssueZP/IssueNoteZP.vue

@@ -104,6 +104,7 @@ export default {
         let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
         _propsData.details.forEach(item=>{
           item.handledToLot = item.handledToLot + " "
+          item.boxQtyShow = _propsData.enumIssueSendType == 2 ? item.requestQty : ''
         })
         let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true);
         this.Print(data)

fe/PC/src/views/materialIssueZS/IssueNoteZS.vue

@@ -104,6 +104,7 @@ export default {
         let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
         _propsData.details.forEach(item=>{
           item.handledToLot = item.handledToLot + " "
+          item.boxQtyShow = _propsData.enumIssueSendType == 2 ? item.requestQty : ''
         })
         let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true);
         this.Print(data)