diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js index e6714f5e..0b362130 100644 --- a/src/api/httpRequest3.js +++ b/src/api/httpRequest3.js @@ -21,6 +21,7 @@ function service(options = {}) { "content-type": "application/json", "Authorization": "Bearer "+token, "dataType":"json", + "dataSource":"PDA", "tenant-id":tenantId }; options.timeout = 300000 @@ -36,6 +37,7 @@ function service(options = {}) { }else { if(res.data.code==401){ uni.clearStorageSync() + uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位 removeToken(); uni.reLaunch({ url: '/pages/login/index' diff --git a/src/api/request2.js b/src/api/request2.js index 9cecc192..bff958ec 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -1314,6 +1314,14 @@ export function getIssueJobList(params) { data: params, }); } +export function getIssueJobByProductionline() { + return request({ + url: baseApi + "/wms/issue-job-main/getIssueJobByProductionline", + method: "get", + data: {}, + }); +} + /** * 发料任务明细 * @param {*} 任务id @@ -1563,7 +1571,7 @@ export function inventoryMoveRecordSubmit(params) { */ export function getCountJobList(params) { return request({ - url: baseApi + "/wms/count-job-detail/senior", + url: baseApi + "/wms/count-job-main/senior", method: "post", data: params, }); @@ -2296,9 +2304,9 @@ export function productDismantleRecordSubmit(params) { */ export function productDismantleJobClose(params) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/refusal?id="+params, - method: "put", - data: {}, + url: baseApi + "/wms/purchasereceipt-job-main/refusal", + method: "post", + data: params, }); } @@ -4154,9 +4162,10 @@ export function isCheckMesCode(code) { * 获取上架任务打印明细 * @param {*} */ -export function getJimuPutawayJobDetail(ids) { +export function getJimuPutawayJobDetail(data) { return request({ - url: baseApi + "/wms/jimu-report/getPutawayJobDetailForPDA?masterIds="+ids, - method: "get", + url: baseApi + "/wms/jimu-report/getPutawayJobDetailForPDA", + method: "post", + data:data }); } diff --git a/src/common/balance.js b/src/common/balance.js index 30ee40ad..460e9bf4 100644 --- a/src/common/balance.js +++ b/src/common/balance.js @@ -131,8 +131,58 @@ export function getManagementPrecisions(itemCodes, locationCode, callback) { callback(result); }) } +//通过父包装查询 +export function getBalanceByManagementPrecisionByPacking(label, packageInfo,locationCode, fromInventoryStatuses, callback) { + let result = { + list: [], + success: true, + message: '' + }; + let params = { + itemCodes: [label.itemCode], + locationCode: locationCode + }; + // let jsonParem = JSON.stringify(param) + getManagementPrecision(params).then(res => { + let managementPrecision = res.data[0].ManagementPrecision; + switch (managementPrecision) { + case 'BY_PACKAGING': + byPacking(label, packageInfo,locationCode, fromInventoryStatuses, res => { + res.managementPrecision = managementPrecision; + callback(res); + }); + break; + case 'BY_BATCH': + byBatch(label, locationCode, fromInventoryStatuses, res => { + res.managementPrecision = managementPrecision; + callback(res); + }); + break; + case 'BY_QUANTITY': + byQuantity(label, locationCode, fromInventoryStatuses, res => { + res.managementPrecision = managementPrecision; + callback(res); + }); + break; + case 'BY_UNIQUEID': + byUniqueId(label, fromInventoryStatuses, res => { + res.managementPrecision = managementPrecision; + callback(res); + }); + break; + } + }).catch(error => { + let result = { + success: false, + message: error + }; + callback(result); + }) +} + + -export function getBalanceByManagementPrecision(label, locationCode, fromInventoryStatuses, callback) { +export function getBalanceByManagementPrecision(label,locationCode, fromInventoryStatuses, callback) { let result = { list: [], success: true, @@ -147,7 +197,7 @@ export function getBalanceByManagementPrecision(label, locationCode, fromInvento let managementPrecision = res.data[0].ManagementPrecision; switch (managementPrecision) { case 'BY_PACKAGING': - byPacking(label, locationCode, fromInventoryStatuses, res => { + byPacking(label, "",locationCode, fromInventoryStatuses, res => { res.managementPrecision = managementPrecision; callback(res); }); @@ -184,18 +234,30 @@ export function getBalanceByManagementPrecision(label, locationCode, fromInvento * @param {Object} locationCode * @param {Object} callback */ -export function byPacking(label, locationCode, fromInventoryStatuses, callback) { +export function byPacking(label, packageInfo,locationCode, fromInventoryStatuses, callback) { let result = { success: true, message: '', data: {} }; var filters = [] - filters.push({ - column: "packingNumber", - action: "==", - value: label.packingNumber - }) + + if (packageInfo&&packageInfo.parentNumber) { + var packingNumber = packageInfo.parentNumber + "," + label.packingNumber; + filters.push({ + column: "packingNumber", + action: "in", + value: packingNumber + }) + } else { + filters.push({ + column: "packingNumber", + action: "==", + value: label.packingNumber + }) + } + + filters.push({ column: "itemCode", action: "==", @@ -212,11 +274,7 @@ export function byPacking(label, locationCode, fromInventoryStatuses, callback) value: locationCode }) if (fromInventoryStatuses) { - var status = "" - fromInventoryStatuses.forEach(res => { - status = res + "," - }) - + var status = fromInventoryStatuses.join(','); filters.push({ column: "inventoryStatus", action: "in", @@ -281,9 +339,11 @@ export function byBatch(label, locationCode, fromInventoryStatuses, callback) { }) if (fromInventoryStatuses) { - var status = "" - fromInventoryStatuses.forEach(res => { - status = res + "," + var status = fromInventoryStatuses.join(','); + filters.push({ + column: "inventoryStatus", + action: "in", + value: status }) filters.push({ @@ -358,9 +418,11 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback) }) if (fromInventoryStatuses) { - var status = "" - fromInventoryStatuses.forEach(res => { - status = res + "," + var status = fromInventoryStatuses.join(','); + filters.push({ + column: "inventoryStatus", + action: "in", + value: status }) filters.push({ @@ -417,9 +479,11 @@ export function byUniqueId(label, locationCode, fromInventoryStatuses, callback) }) if (fromInventoryStatuses) { - var status = "" - fromInventoryStatuses.forEach(res => { - status = res + "," + var status = fromInventoryStatuses.join(','); + filters.push({ + column: "inventoryStatus", + action: "in", + value: status }) filters.push({ diff --git a/src/hybrid/html/point.html b/src/hybrid/html/point.html index bd147d80..82a76ddb 100644 --- a/src/hybrid/html/point.html +++ b/src/hybrid/html/point.html @@ -17,6 +17,7 @@ .box { font-size: 14px; display: flex; + margin-top: 60px; } @@ -35,38 +36,41 @@ border-right: 1px solid #b1b1b1; width: 60px; padding: 0px 5px; - height: 67px; - line-height: 67px; + height: 58px; + line-height: 58px; } .value { border-bottom: 1px solid #b1b1b1; border-right: 1px solid #b1b1b1; padding: 0px 5px; - height: 67px; + height: 58px; flex: 1; width: 0px; display: flex; align-items: center; - word-wrap: break-word; + word-break: break-all; } .right { - width: 200px; + width: 300px; } .image { - width: 100%; - height: 202px; + width: calc(100% - 1px); + height: 176px; border-bottom: 1px solid #b1b1b1; border-top: 1px solid #b1b1b1; border-right: 1px solid #b1b1b1; } .image img { - width: calc(100% - 4px); - height: calc(100% - 4px); - margin: 2px; + width: 172px; + height: 172px; + border: 1px solid #b1b1b1; + /* width: calc(100% - 4px); + height: calc(100% - 4px); */ + margin: 1px; } diff --git a/src/hybrid/html/pointPutawayJob.html b/src/hybrid/html/pointPutawayJob.html index 4b675aeb..06c908fc 100644 --- a/src/hybrid/html/pointPutawayJob.html +++ b/src/hybrid/html/pointPutawayJob.html @@ -15,8 +15,8 @@ mainBody - + \ No newline at end of file diff --git a/src/manifest.json b/src/manifest.json index 4622e0a5..330a0796 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "wms", "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.5", - "versionCode" : 5, + "versionName" : "1.0.12", + "versionCode" : 12, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue index 86762135..a1e31de1 100644 --- a/src/mycomponents/balance/balance.vue +++ b/src/mycomponents/balance/balance.vue @@ -2,27 +2,40 @@ + - - - - - + + - - 复制 + + + + + + + + + 复制 + + + + + + + + @@ -37,6 +50,7 @@ import recommendQty from '@/mycomponents/qty/recommendQty.vue' import compareQty from '@/mycomponents/qty/compareQty.vue' import config from '@/static/config.js' + import moveStatus from '@/mycomponents/balance/moveStatus.vue' export default { components: { @@ -47,6 +61,7 @@ qty, recommendQty, compareQty, + moveStatus }, data() { diff --git a/src/mycomponents/balance/balanceSelect.vue b/src/mycomponents/balance/balanceSelect.vue index 0b63c993..15589b5b 100644 --- a/src/mycomponents/balance/balanceSelect.vue +++ b/src/mycomponents/balance/balanceSelect.vue @@ -37,7 +37,13 @@ }, methods: { openPopup(items) { - this.balanceItems = items; + if(Array.isArray(items)){ + this.balanceItems = items; + }else{ + this.balanceItems = [items]; + } + + this.$refs['popupItems'].open("center"); }, diff --git a/src/mycomponents/balance/handleBalance.vue b/src/mycomponents/balance/handleBalance.vue index cb3ea9f1..4aac011d 100644 --- a/src/mycomponents/balance/handleBalance.vue +++ b/src/mycomponents/balance/handleBalance.vue @@ -2,7 +2,7 @@ - diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue index 62f2c9b4..e9beb857 100644 --- a/src/mycomponents/common/comMessage.vue +++ b/src/mycomponents/common/comMessage.vue @@ -2,6 +2,12 @@ + + + 版本号 : {{version}} + + + @@ -9,7 +15,6 @@ - @@ -56,13 +61,40 @@ cancel: false, //为 true 时，表示用户点击了取消 isDisabled: true, //为 true 时，表示用户可以点击，反之则不可以 seconds: 0, - success: () => {} // 回调方法 + success: () => {} ,// 回调方法 + version:"" } }, + + mounted() { + // const systemInfo = uni.getSystemInfoSync(); + // // #ifdef H5 + // this.version = systemInfo.appVersion; + // console.log(systemInfo.appVersion, '版本号'); + // // #endif + + // // #ifdef APP + // this.version = systemInfo.appWgtVersion; + // // #endif + }, methods: { + + getVersionCode(){ + const systemInfo = uni.getSystemInfoSync(); + // #ifdef H5 + this.version = systemInfo.appVersion; + console.log(systemInfo.appVersion, '版本号'); + // #endif + + // #ifdef APP + this.version = systemInfo.appWgtVersion; + // #endif + }, + open() { + this.getVersionCode() this.show = true; this.isDisabled = true; }, diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue index e0e547f6..64c3df42 100644 --- a/src/mycomponents/job/jobComMainDetailCard.vue +++ b/src/mycomponents/job/jobComMainDetailCard.vue @@ -1,8 +1,9 @@ @@ -67,8 +69,15 @@ this.$refs.popup.open('bottom') }, 500) }, + openScanPopupSimulate(location) { + this.$refs.comscansimulate.setItemCodeSimulate(location) + this.$refs.comscansimulate.clickScanMsg(); + }, closeScanPopup() { - this.$refs.popup.close() + if(this.$refs.popup){ + this.$refs.popup.close() + } + }, scanClick() { this.$refs.scan.clickScanMsg(); @@ -77,6 +86,7 @@ this.$refs.scan.clearScanValue(); }, getScanResult(result) { + uni.showLoading({ title: '扫描中...', mask: true @@ -94,9 +104,14 @@ } getBasicLocationByCode(this.code).then(res => { + uni.hideLoading(); if (res.data.total > 0) { let result = res.data.list[0]; + if(result.code!=this.code){ + this.showErrorMessage('未查询到库位[' + this.code + ']') + return; + } var type = result.type; var areaType = result.areaType var available = result.available; @@ -142,10 +157,14 @@ return isPass }, getfocus() { - this.$refs.scan.getfocus(); + if(this.$refs.scan){ + this.$refs.scan.getfocus(); + } }, losefocus() { - this.$refs.scan.losefocus(); + if(this.$refs.scan){ + this.$refs.scan.losefocus(); + } }, showErrorMessage(message) { setTimeout(r => { diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue index 8913073f..44a08fc3 100644 --- a/src/mycomponents/scan/winScanPack.vue +++ b/src/mycomponents/scan/winScanPack.vue @@ -20,6 +20,8 @@ + + @@ -55,6 +57,10 @@ }, methods: { + simulateScan(item){ + this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent) + this.$refs.comscansimulate.clickScanMsg(); + }, openScanPopup() { setTimeout(res => { this.$refs.popup.open('bottom') @@ -67,11 +73,16 @@ }, scanClick() { - this.$refs.comscan.clickScanMsg(); + if(this.$refs.comscan){ + this.$refs.comscan.clickScanMsg(); + } + }, cancelClick() { - this.$refs.comscan.clearScanValue(); + if(this.$refs.comscan){ + this.$refs.comscan.clearScanValue(); + } }, getScanResult(result) { diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index eef6b720..30f9daf1 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -1,468 +1,522 @@ - - - - - + + + + + \ No newline at end of file diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue index 216f6dcd..843346f0 100644 --- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue +++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue @@ -198,6 +198,10 @@ getBasicLocationByCode(this.fromLocationCode).then(res => { if (res.data.total > 0) { let result = res.data.list[0]; + if(result.code!=this.fromLocationCode){ + this.showErrorMessage('未查询到库位[' + this.fromLocationCode + ']') + return; + } var type = result.type; var available = result.available; if (available == "TRUE") { diff --git a/src/mycomponents/scan/winScanPackJob.vue b/src/mycomponents/scan/winScanPackJob.vue index 3fbb6e07..e0b66aad 100644 --- a/src/mycomponents/scan/winScanPackJob.vue +++ b/src/mycomponents/scan/winScanPackJob.vue @@ -29,7 +29,6 @@ } from '@/common/balance.js'; import { - getBasicLocationByCode, getPutawayJobList } from '@/api/request2.js'; diff --git a/src/pages.json b/src/pages.json index ec171383..39cfa49e 100644 --- a/src/pages.json +++ b/src/pages.json @@ -896,7 +896,7 @@ { "path": "pages/productPutaway/job/fgProductPutawayJob", "style": { - "navigationBarTitleText": "装配上架任务", + "navigationBarTitleText": "成品入库任务", "enablePullDownRefresh": true, "titleNView": { // "autoBackButton": "true", diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index c90694ae..41cf32d2 100644 --- a/src/pages/count/job/countJob.vue +++ b/src/pages/count/job/countJob.vue @@ -143,6 +143,11 @@ value: this.status }) + // filters.push({ + // column: "accept_user_id", + // action: "==", + // value: this.$store.state.user.id + // }) var params = { filters: filters, pageNo: this.pageNo, @@ -179,7 +184,7 @@ openJobDetail(item) { uni.navigateTo({ - url: './countDetail?id=' + item.masterId + '&status=' + item.status + url: './countDetail?id=' + item.id + '&status=' + item.status }); }, @@ -198,7 +203,7 @@ this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?", res => { if (res) { - this.cancleJob(dataContent.masterId); + this.cancleJob(dataContent.id); } }); } diff --git a/src/pages/count/record/countRecord.vue b/src/pages/count/record/countRecord.vue index 7b1e4679..7260c414 100644 --- a/src/pages/count/record/countRecord.vue +++ b/src/pages/count/record/countRecord.vue @@ -151,8 +151,8 @@ calcHandleQty() { for (let item of this.detailSource) { - item.handleQty = new Decimal(0).toNumber(); - item.qty = new Decimal(0).toNumber(); + item.handleQty = 0; + item.qty = 0; for (let detail of item.subList) { if(detail!=undefined){ if(detail.scaned){ diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue index 7d3cf5a3..070a6bee 100644 --- a/src/pages/customerReturn/job/returnDetail.vue +++ b/src/pages/customerReturn/job/returnDetail.vue @@ -43,7 +43,6 @@ import { getCustomerReturnJobDetail, - getBasicLocationByCode, takeCustomerReturnJob, cancleTakeCustomerReturnJob, customerReturnJobSubmit diff --git a/src/pages/customerReturn/job/returnJob.vue b/src/pages/customerReturn/job/returnJob.vue index b68544ea..11a76e11 100644 --- a/src/pages/customerReturn/job/returnJob.vue +++ b/src/pages/customerReturn/job/returnJob.vue @@ -140,6 +140,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/deliver/coms/comDeliverRequestPopup.vue b/src/pages/deliver/coms/comDeliverRequestPopup.vue index 14e332b3..30a55974 100644 --- a/src/pages/deliver/coms/comDeliverRequestPopup.vue +++ b/src/pages/deliver/coms/comDeliverRequestPopup.vue @@ -70,7 +70,6 @@ diff --git a/src/pages/issue/js/issue.js b/src/pages/issue/js/issue.js index 696ff895..97b8b8b5 100644 --- a/src/pages/issue/js/issue.js +++ b/src/pages/issue/js/issue.js @@ -53,6 +53,7 @@ export function createItemInfo(detail) { let item = { itemCode: detail.itemCode, itemName: detail.itemName, + onTheWayLocationCode:detail.onTheWayLocationCode, productionLineCode: detail.productionLineCode, workStationCode: detail.workStationCode, packQty: detail.packQty, diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue index 69f04a56..46aee81a 100644 --- a/src/pages/issue/request/issueScanRequest.vue +++ b/src/pages/issue/request/issueScanRequest.vue @@ -83,6 +83,12 @@ methods: { goScan() { this.$refs.scanPopup.openScanPopup(); + setTimeout(res => { + if (this.$refs.scanPopup != undefined) { + this.$refs.scanPopup.getfocus(); + } + }, 400) + }, getScanResult(data){ this.detailSource = { diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue index 77c38a5c..ad52c55b 100644 --- a/src/pages/package/job/overPackageJob.vue +++ b/src/pages/package/job/overPackageJob.vue @@ -134,6 +134,11 @@ value: this.status }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id + }) var params = { filters: filters, pageNo: this.pageNo, diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index 2cb32dd4..2141be16 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -272,22 +272,24 @@ itemCodes.push(item.itemCode) }) }) + + this.checkSubmit(); //使用在途库，不查询管理模式 - if (this.jobContent.useOnTheWayLocation == 'TRUE') { - this.checkSubmit(); - } else { - //获取管理模式，封装参数 - getManagementPrecisions(itemCodes, locationCode, res => { - if (res.success) { - this.managementList = res.list; - this.checkSubmit(); - } else { - uni.hideLoading(); - this.showErrorMessage(res.message); - } - }); - } + // if (this.jobContent.useOnTheWayLocation == 'TRUE') { + // this.checkSubmit(); + // } else { + // //获取管理模式，封装参数 + // getManagementPrecisions(itemCodes, locationCode, res => { + // if (res.success) { + // this.managementList = res.list; + // this.checkSubmit(); + // } else { + // uni.hideLoading(); + // this.showErrorMessage(res.message); + // } + // }); + // } }, checkSubmit() { var tempHandleQty = this.detailSource[0].Items[0].Locations[0].Batchs[0].handleQty @@ -531,7 +533,7 @@ showCommitSuccessMessage(hint, pointData) { this.$refs.comMessage.showSuccessMessage(hint, res => { if (pointData.length > 0) { - uni.navigateTo({ + uni.redirectTo({ url: `/pages/point/index?points=${JSON.stringify(pointData)}` }); } else { diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index b066203f..a535f606 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -60,8 +60,8 @@ - - + + @@ -139,7 +139,7 @@ itemCode: "" }; }, - onLoad(option) { + onShow(){ var typeCode = "OverPackage" getBusinessType(typeCode, res => { if (res.success) { @@ -209,7 +209,10 @@ this.toPackQty = pack.packQty; this.toPackUnitShow = e[0].label }, - + //修改库位 + handleConfirm(fromLocationCode){ + this.$refs.scanLocationCode.openScanPopupSimulate(fromLocationCode) + }, getScanResult(result) { let balance = result.balance; let label = result.label; @@ -289,7 +292,13 @@ }, showFromLocationPopup() { this.$nextTick(() => { - this.$refs.scanLocationCode.openScanPopup(); + let overPackageRecord = uni.getStorageSync('overPackageRecord') + + if(overPackageRecord){ + this.$refs.scanLocationCode.openScanPopupSimulate(overPackageRecord) + }else{ + this.$refs.scanLocationCode.openScanPopup(); + } }) }, @@ -429,6 +438,9 @@ this.scanPopupGetFocus(); }, getLocation(location, code) { + if(code){ + uni.setStorageSync('overPackageRecord', code) + } this.getFromLocationCode(location, code) }, getFromLocationCode(location, code) { @@ -443,7 +455,7 @@ this.fromLocationCode = ''; this.dataContent = {} if (pointData.length > 0) { - uni.navigateTo({ + uni.redirectTo({ url: `/pages/point/index?points=${JSON.stringify(pointData)}` }); } diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue index 62bbe201..33d42430 100644 --- a/src/pages/point/index.vue +++ b/src/pages/point/index.vue @@ -185,35 +185,19 @@ async onShow() { // 获取数据 // this.data = [{ - // itemNumber: '555555', - // itemName: 'hahah', - // referenceOrderRow: '55', - // referenceOrderCode: '55', - // supplierCode: '555', - // packageCode: '9999-8888', - // amount: '55', + // itemCode:'065.051-01M', // 物品代码 + // itemName: 'PCCLARNATEA1225BLACK9999', // 物品名称 + // packName: '包装名称',// 包装名称 + // packageCode: 'PS0513-000003', // 包装号 + // batch:'20240514',//批次 + // parentNumber:'PS0513-000003',//父包装号 + // itemType:'物料类型',//物料类型 + // asnNumber:'123232',//ASN + // supplierCode: 'Fewewq', // 供应商 + // qty: '100', // 数量 + // printTimes:'2019-09-09 09:09:00', // 打印时间 // barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;', // barcodeBase64: '' - // }, { - // itemNumber: '66', - // itemName: 'hahah', - // referenceOrderRow: '66', - // referenceOrderCode: '666', - // supplierCode: '66', - // packageCode: '66666', - // amount: '666666', - // barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;', - // barcodeBase64: '' - // }, { - // itemNumber: '66', - // itemName: 'hahah', - // referenceOrderRow: '66', - // referenceOrderCode: '666', - // supplierCode: '66', - // packageCode: '66666', - // amount: '666666', - // barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;', - // barcodeBase64: '' // }] this.$nextTick(async () => { // 获取二维码图片临时路径 @@ -280,7 +264,7 @@ width: 0px; display: flex; align-items: center; - word-wrap: break-word; + word-break: break-all; } .right { diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index 7147a978..64438dcb 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -2,22 +2,28 @@ - + - 目标库位：{{data.toLocationCode}} + 目标库位：{{item.toLocationCode}} - - 任务编号：{{data.number}} + + + + 物料号：{{item.itemCode}} + + + 托包装号：{{item.packingNumber}} + - - 创建人：{{data.creator||''}} + + + 数量：{{item.qty}}个 + - - 创建时间：{{data.createTime}} - +