diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 8fec1895..8c453cd3 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -17,7 +17,7 @@ "type" : "uni-app:h5" }, { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" } ] diff --git a/src/api/request2.js b/src/api/request2.js index 028a6e71..b4cce1fa 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -377,6 +377,24 @@ export function getPackageByNumber(number) { }); } +/**包装 + * 获取包装信息 + * @param {*} + * + */ +export function getPackageListByNumber(number) { + var params = { + number: number, + pageNo: 1, + pageSize: 100 + } + return request({ + url: baseApi + "/wms/package/queryPackageInfo", + method: "get", + data: params, + }); +} + /** @@ -423,7 +441,7 @@ export function validateItemAndLocation(parmas) { export function getPutawayRecommendLocation(params) { return request({ - url: baseApi + "/wms/location/recommendLocation", + url: baseApi + "/wms/location/recommendLocationNew", method: "post", data: params, }); @@ -488,6 +506,24 @@ export function getProductionlineItem(params) { }); } +/** + * 通过物料查询包装规格 + * @param {*} itemCode + * + */ +export function getPackUnitByItemCode(itemCode) { + var params = { + itemCode: itemCode, + pageNo: 1, + pageSize: 100 + } + return request({ + url: baseApi + "/wms/itempackage/page", + method: "get", + data: params, + }); +} + /** * 查询生产线-车间-工位 * @param {*} @@ -2011,6 +2047,74 @@ export function productPutawayRecordSubmit(params) { } +/** + * 直接备货 任务 + * status 任务状态 + * 开始日期 + * 结束日期 + * 获取日期任务列表 + * @param {*} + */ +export function getStockUpJobList(params) { + return request({ + url: baseApi + "/wms/stockup-main-job/senior", + method: "post", + data: params, + }); +} + +/** + * 直接备货 获取任务明细 + * @param {*} id 任务id + * + */ +export function getStockUpJobDetail(id) { + return request({ + url: baseApi + "/wms/stockup-main-job/getStockupMainJobById?id=" + id, + method: "get", + data: {}, + }); +} + +/** + * 直接备货任务 承接 + * @param {*} id + * + */ +export function takeStockUpJob(id) { + return request({ + url: baseApi + "/wms/stockup-main-job/accept?id=" + id, + method: "put", + data: {}, + }); +} + +/** + * 直接备货任务 放弃承接 + * @param {*} id + * + */ +export function cancleTakeStockUpJob(id) { + return request({ + url: baseApi + "/wms/stockup-main-job/abandon?id=" + id, + method: "put", + data: {}, + }); +} + +/** + * 直接备货任务 提交 + * @param {*} params + */ +export function stockUpJobsubmit(params) { + return request({ + url: baseApi + "/wms/stockup-main-job/execute", + method: "put", + data: params, + }); +} + + /** * 制品拆解 任务 * status 任务状态 @@ -3499,19 +3603,17 @@ export function mergePackageRecordSubmit(params) { } /** - * 翻包 提交 + * 翻包直接生成记录 提交 * @param {*} params */ export function overPackageRecordSubmit(params) { return request({ - url: baseApi + "/wms/packageover-main/create", + url: baseApi + "/wms/packageover-record-main/create", method: "post", data: params, }); } - - /** * "itemCodes": [], "locationCode":"INSPECT" @@ -3662,4 +3764,71 @@ export function getPackageUnitList(params) { method: "post", data: params, }); +} + +/** + * 翻包 任务承接 + * @param {*} id + * + */ +export function takeOverPageJob(id) { + return request({ + url: baseApi + "/wms/packageover-job-main/accept?id=" + id, + method: "put", + data: {}, + }); +} + +/** + * 翻包 放弃承接 + * @param {*} id + * + */ +export function cancleTakeOverPageJob(id) { + return request({ + url: baseApi + "/wms/packageover-job-main/abandon?id=" + id, + method: "put", + data: {}, + }); +} + +/** + * 翻包任务 列表 + * status 任务状态 + * 开始日期 + * 结束日期 + * 获取日期任务列表 + * @param {*} + */ +export function getOverPageJobList(params) { + return request({ + url: baseApi + "/wms/packageover-job-main/senior", + method: "post", + data: params, + }); +} + +/** + * 翻包任务明细 + * @param {*} 任务id + * + */ +export function getOverPageJobDetail(id) { + return request({ + url: baseApi + "/wms/packageover-job-main/getPackageoverJobById?id=" + id, + method: "get", + data: {}, + }); +} + +/** + * 翻包任务 提交 + * @param {*} params + */ +export function overPageSubmit(params) { + return request({ + url: baseApi + "/wms/packageover-job-main/execute", + method: "put", + data: params, + }); } \ No newline at end of file diff --git a/src/common/basic.js b/src/common/basic.js index 2c70dc66..d770a26d 100644 --- a/src/common/basic.js +++ b/src/common/basic.js @@ -7,7 +7,7 @@ import { calc } from '@/common/calc' let jobStatusList = []; let itemStatusList = []; -let locationTypeList = []; +let locationAreaTypeList = []; let uomList = []; let inventoryStatusList = []; let containerTypeList = []; @@ -24,7 +24,7 @@ let inspectFailedReasonList = []; export function clearCacheData() { jobStatusList = []; itemStatusList = []; - locationTypeList = []; + locationAreaTypeList = []; uomList = []; inventoryStatusList = []; containerTypeList = []; @@ -152,11 +152,11 @@ export function getItemStateInfo(value) { //获取库位类型 export function getLocationTypeInfo(value) { var resultInfo = ""; - if (locationTypeList.length == 0) { - locationTypeList = getDirectoryInfo("location_type") + if (locationAreaTypeList.length == 0) { + locationAreaTypeList = getDirectoryInfo("location_type") } - if (locationTypeList.length > 0) { - for (let item of locationTypeList) { + if (locationAreaTypeList.length > 0) { + for (let item of locationAreaTypeList) { if (item.value == value) { resultInfo = item break; @@ -191,7 +191,7 @@ export function getUomInfo(value) { } //获取包装单位 -export function getStdPackUnitInfo(value) { +export function getPackUnitInfo(value) { var resultInfo = ""; if (packUnitList.length == 0) { packUnitList = getDirectoryInfo("pack_unit") @@ -957,8 +957,8 @@ export function createItemInfo(res) { let item = { itemCode: res.itemCode, itemName: res.itemName, - stdPackQty: Number(res.stdPackQty), - stdPackUnit: res.stdPackUnit, + packQty: Number(res.packQty), + packUnit: res.packUnit, qty: Number(res.qty), handleQty: 0, uom: res.uom, diff --git a/src/common/detail.js b/src/common/detail.js index 993f2fb8..9cfb545f 100644 --- a/src/common/detail.js +++ b/src/common/detail.js @@ -67,8 +67,8 @@ export function createItemInfo(detail) { let item = { itemCode: detail.itemCode, itemName: detail.itemName, - stdPackQty: Number(detail.stdPackQty) || undefined, - stdPackUnit: detail.stdPackUnit, + packQty: Number(detail.packQty) || undefined, + packUnit: detail.packUnit, qty: Number(detail.qty), handleQty: 0, uom: detail.uom, @@ -118,10 +118,12 @@ export function calcTreeHandleQty(detailSource) { for (let detail of item.subList) { if (detail != undefined && detail.scaned) { - detail.handleQty = new Decimal(0).toNumber(); - for (let pack of detail.packList){ - if(pack!=undefined&&pack.scaned){ - detail.handleQty = calc.add(detail.handleQty, pack.handleQty); + if(detail.packList.length>0){ + detail.handleQty = new Decimal(0).toNumber(); + for (let pack of detail.packList){ + if(pack!=undefined&&pack.scaned){ + detail.handleQty = calc.add(detail.handleQty, pack.handleQty); + } } } item.handleQty = calc.add(item.handleQty, detail.handleQty); diff --git a/src/common/directory.js b/src/common/directory.js index e7aa2ebc..5eae6dcb 100644 --- a/src/common/directory.js +++ b/src/common/directory.js @@ -6,6 +6,7 @@ let uomList = []; let inventoryStatusList = []; let containerTypeList = []; let packUnitList = []; +let packUnitInfoList = []; let requestStatusList = []; let unplannedReceiptReasonList = []; let unplannedIssueReasonList = []; @@ -18,6 +19,8 @@ let inspectTypeList = []; let sampleMethodList = []; let transferModeList = []; let countStageList = []; +let locationAreaTypeList = []; + // 获取业务类型字典项 @@ -43,6 +46,7 @@ export function clearCacheData() { inventoryStatusList = []; containerTypeList = []; packUnitList = []; + packUnitInfoList = []; requestStatusList = []; unplannedReceiptReasonList = []; unplannedIssueReasonList = []; @@ -55,6 +59,7 @@ export function clearCacheData() { sampleMethodList = []; transferModeList = []; countStageList = []; + locationAreaTypeList=[] } //获取字典信息 @@ -142,6 +147,16 @@ export function getJobStateStyle(value) { } } +//获取库区描述（多个库区） +export function getListLocationAreaTypeDesc(list) { + let desc = ''; + list.forEach(res => { + desc += getLocationAreaTypeInfo(res).label + "," + }) + desc = desc.slice(0, -1); + return desc; +} + //获取库位描述（多个库位） export function getListLocationTypeDesc(list) { let desc = ''; @@ -210,6 +225,23 @@ export function getItemStateInfo(value) { return resultInfo } +//获取库区类型 +export function getLocationAreaTypeInfo(value) { + var resultInfo = ""; + if (locationAreaTypeList.length == 0) { + locationAreaTypeList = getDirectoryInfo("area_type") + } + if (locationAreaTypeList.length > 0) { + for (let item of locationAreaTypeList) { + if (item.value == value) { + resultInfo = item + break; + } + } + } + return resultInfo +} + //获取库位类型 export function getLocationTypeInfo(value) { var resultInfo = ""; @@ -226,6 +258,13 @@ export function getLocationTypeInfo(value) { } return resultInfo } +//获取库区类型名称 +export function getLocationAreaTypeName(value) { + let location = getLocationAreaTypeInfo(value); + + return location == '' ? value : location.label; +} + //获取库位类型名称 export function getLocationTypeName(value) { @@ -263,7 +302,7 @@ export function getUomInfo(value) { } //获取包装单位 -export function getStdPackUnitInfo(value) { +export function getPackUnitInfo(value) { var resultInfo = ""; if (packUnitList.length == 0) { packUnitList = getDirectoryInfo("pack_unit") @@ -515,11 +554,11 @@ export function getCountStageName(value) { //获取包装规格 export function getPackUnitName(value) { var resultInfo = ""; - if (packUnitList.length == 0) { - packUnitList = uni.getStorageSync('packunit'); + if (packUnitInfoList.length == 0) { + packUnitInfoList = uni.getStorageSync('packunit'); } - if (packUnitList.length > 0) { - for (let item of packUnitList) { + if (packUnitInfoList.length > 0) { + for (let item of packUnitInfoList) { if (item.code == value) { resultInfo = item.name break; @@ -527,4 +566,7 @@ export function getPackUnitName(value) { } } return resultInfo -} \ No newline at end of file +} + + +locationAreaTypeList \ No newline at end of file diff --git a/src/common/label.js b/src/common/label.js index 7ffefd7e..03e65b84 100644 --- a/src/common/label.js +++ b/src/common/label.js @@ -2,7 +2,7 @@ let labelDic = []; import { getLabelByHeader, - getPackageByNumber + getPackageListByNumber } from '../api/request2.js'; import { @@ -49,17 +49,18 @@ export function getLabelInfo(scanMsg,headerType, callBack) { getBarCodeInfo('text', 'V1.0', scanMsg, callBack); } }else { - let labelResult = { - label: { - labelType: "", - barType: '', - code:"" - }, - package: null, - success: false, - message: '标签格式不正确', - } - callBack(labelResult); + getBarCodeInfo('text', 'V1.0', scanMsg, callBack); + // let labelResult = { + // label: { + // labelType: "", + // barType: '', + // code:"" + // }, + // package: null, + // success: false, + // message: '标签格式不正确', + // } + // callBack(labelResult); } } @@ -106,13 +107,15 @@ export function getLabelItems(labelItem, scanMsg, callBack) { //查询包装信息 let packingNumber = labelResult.label.packingNumber if (packingNumber != undefined) { - getPackageByNumber(packingNumber).then(pack => { - if (pack.data.list.length == 0) { + getPackageListByNumber(packingNumber).then(pack => { + if (pack.data.reqPackage) { + labelResult.package = pack.data.reqPackage; + labelResult.package.subList = pack.data.subList; + console.log('包装信息', JSON.stringify(labelResult.package)) + + } else { labelResult.success = false; labelResult.message = '包装号[' + packingNumber + ']没有包装信息'; - } else { - labelResult.package = pack.data.list[0]; - console.log('包装信息', JSON.stringify(labelResult.package)) } callBack(labelResult); }).catch(err => { diff --git a/src/common/record.js b/src/common/record.js index f4a988c1..ab5d0c9a 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -15,8 +15,8 @@ export function createItemInfo(balance, pack) { let item = { itemCode: pack.itemCode, itemName: pack.itemName, - stdPackQty: pack.stdPackQty, - stdPackUnit: pack.stdPackUnit, + packQty: pack.packQty, + packUnit: pack.packUnit, qty: new Decimal(balance.qty).toNumber(), handleQty:new Decimal(0).toNumber(), uom: pack.uom, @@ -32,8 +32,8 @@ export function createDetailInfo(balance, pack) { let detail = deepCopyData(balance); detail.balanceQty = new Decimal(detail.qty).toNumber() detail.qty = new Decimal(detail.qty).toNumber(); - detail.stdPackQty = new Decimal(pack.stdPackQty).toNumber() - detail.stdPackUnit = pack.stdPackUnit + detail.packQty = new Decimal(pack.packQty).toNumber() + detail.packUnit = pack.packUnit detail.handleQty = new Decimal(detail.qty).toNumber() ; detail.package = pack; @@ -56,12 +56,30 @@ export function calcHandleQty(detailSource) { } } +export function calcTreeHandleQty(detailSource) { + for (let item of detailSource) { + item.handleQty = new Decimal(0).toNumber(); + + for (let detail of item.subList) { + if (detail != undefined && detail.scaned) { + detail.handleQty = new Decimal(0).toNumber(); + for (let pack of detail.packList){ + if(pack!=undefined&&pack.scaned){ + detail.handleQty = calc.add(detail.handleQty, pack.handleQty); + } + } + item.handleQty = calc.add(item.handleQty, detail.handleQty); + } + } + } +} + export function getBusinessType(typeCode, callback) { let result = { success: true, businessType: '', - fromlocationTypeList: '', - tolocationTypeList: '', + fromLocationAreaTypeList:'', + toLocationAreaTypeList:'', itemCodeTypeList:"", useOnTheWay:"FALSE", fromInventoryStatuses: '', @@ -71,8 +89,8 @@ export function getBusinessType(typeCode, callback) { getBusinesstypeByCode(typeCode).then(res => { if (res.data.total > 0) { result.businessType = res.data.list[0]; - result.fromlocationTypeList = getDirectoryItemArray(res.data.list[0].outLocationTypes) - result.tolocationTypeList = getDirectoryItemArray(res.data.list[0].inLocationTypes) + result.fromLocationAreaTypeList = getDirectoryItemArray(res.data.list[0].outAreaTypes) ; + result.toLocationAreaTypeList = getDirectoryItemArray(res.data.list[0].inAreaTypes) ; result.itemCodeTypeList = getDirectoryItemArray(res.data.list[0].itemTypes) result.fromInventoryStatuses = res.data.list[0].outInventoryStatuses; result.toInventoryStatuses = res.data.list[0].inInventoryStatuses; diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue index e6e2fda6..708a35d4 100644 --- a/src/mycomponents/detail/comDetailCard.vue +++ b/src/mycomponents/detail/comDetailCard.vue @@ -7,7 +7,7 @@ - + + :locationAreaTypeList="locationAreaTypeList"> @@ -47,11 +47,11 @@ props: { dataContent: { type: Object, - default: {} + default: null }, settingParam: { type: Object, - default: {} + default: null }, isShowPack: { type: Boolean, @@ -65,9 +65,9 @@ type: Boolean, default: true }, - locationTypeList: { + locationAreaTypeList: { type: Array, - default: [] + default: null }, }, watch: { diff --git a/src/mycomponents/detail/comJobDetailCard.vue b/src/mycomponents/detail/comJobDetailCard.vue new file mode 100644 index 00000000..7f1d1111 --- /dev/null +++ b/src/mycomponents/detail/comJobDetailCard.vue @@ -0,0 +1,161 @@ + + + + + \ No newline at end of file diff --git a/src/mycomponents/detail/detailBalanceInfo.vue b/src/mycomponents/detail/detailBalanceInfo.vue index 573e393f..43cfb89b 100644 --- a/src/mycomponents/detail/detailBalanceInfo.vue +++ b/src/mycomponents/detail/detailBalanceInfo.vue @@ -32,7 +32,7 @@ \ No newline at end of file diff --git a/src/mycomponents/package/packageRecordList.vue b/src/mycomponents/package/packageRecordList.vue new file mode 100644 index 00000000..1ecdac3b --- /dev/null +++ b/src/mycomponents/package/packageRecordList.vue @@ -0,0 +1,195 @@ + + + + + + \ No newline at end of file diff --git a/src/mycomponents/partCode/partCode.vue b/src/mycomponents/partCode/partCode.vue index 915106b8..da585785 100644 --- a/src/mycomponents/partCode/partCode.vue +++ b/src/mycomponents/partCode/partCode.vue @@ -17,7 +17,7 @@ @@ -96,7 +96,7 @@ type: Number, default: 0 }, - stdPackQty: { + packQty: { type: Number, default: 0, }, diff --git a/src/mycomponents/qty/balanceQty.vue b/src/mycomponents/qty/balanceQty.vue index f0b80e10..11fa2ed9 100644 --- a/src/mycomponents/qty/balanceQty.vue +++ b/src/mycomponents/qty/balanceQty.vue @@ -6,24 +6,26 @@ {{Number(dataContent.qty)}} - + - + + + + diff --git a/src/mycomponents/qty/qty.vue b/src/mycomponents/qty/qty.vue index f2d55dcc..06a4a5fc 100644 --- a/src/mycomponents/qty/qty.vue +++ b/src/mycomponents/qty/qty.vue @@ -5,25 +5,27 @@ {{Number(dataContent.qty)}} - + - + - - - diff --git a/src/mycomponents/qty/stdUom.vue b/src/mycomponents/qty/stdUom.vue index 03508a7f..7a495d07 100644 --- a/src/mycomponents/qty/stdUom.vue +++ b/src/mycomponents/qty/stdUom.vue @@ -1,13 +1,13 @@ + + \ No newline at end of file diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue index f2727923..9a408e09 100644 --- a/src/mycomponents/scan/winComScan.vue +++ b/src/mycomponents/scan/winComScan.vue @@ -108,8 +108,8 @@ document.querySelector('textarea').setAttribute('inputmode', 'none') } // #endif - // #ifdef APP-PLUS this.hide() + // #ifdef APP-PLUS // // this.hide() // uni.onKeyboardHeightChange(res => { @@ -146,6 +146,7 @@ }, methods: { hide() { + // #ifdef APP-PLUS // 只是解决软键盘的闪现 var interval = setInterval(function() { uni.hideKeyboard(); //隐藏软键盘 @@ -155,6 +156,7 @@ clearInterval(interval); console.log('停止刷新') }, 1000); + // #endif }, getValue() { return this.scanMsg @@ -221,6 +223,7 @@ this.$nextTick(r => { that.boxfocus = true; }); + this.hide() }, losefocus() { let that = this; diff --git a/src/mycomponents/scan/winScanJobNumber.vue b/src/mycomponents/scan/winScanJobNumber.vue index 9dbab854..96cfe6c7 100644 --- a/src/mycomponents/scan/winScanJobNumber.vue +++ b/src/mycomponents/scan/winScanJobNumber.vue @@ -13,7 +13,13 @@ - + diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue index 8f40ed87..3b4b460d 100644 --- a/src/mycomponents/scan/winScanLocation.vue +++ b/src/mycomponents/scan/winScanLocation.vue @@ -27,8 +27,8 @@ getBasicLocationByCode, } from '@/api/request2.js'; import { - getLocationTypeName, - getListLocationTypeDesc, + getLocationAreaTypeName, + getListLocationAreaTypeDesc, checkDirectoryItemExist } from '@/common/directory.js'; import winComScan from '@/mycomponents/scan/winComScan.vue' @@ -42,9 +42,9 @@ type: String, default: '' }, - locationTypeList: { + locationAreaTypeList: { type: Array, - default: [] + default: null }, isShowHistory: { type: Boolean, @@ -98,15 +98,16 @@ if (res.data.total > 0) { let result = res.data.list[0]; var type = result.type; + var areaType = result.areaType var available = result.available; if (available == "TRUE") { - if (checkDirectoryItemExist(this.locationTypeList, type)) { + if (checkDirectoryItemExist(this.locationAreaTypeList, areaType)) { this.location = result; this.callBack(); } else { - var hint = getListLocationTypeDesc(this.locationTypeList); + var hint = getListLocationAreaTypeDesc(this.locationAreaTypeList); this.showErrorMessage("扫描库位[" + this.code + "]是[" + - getLocationTypeName(type) + "],需要的库位类型是[" + hint + "]") + getLocationAreaTypeName(areaType) + "],需要的库区是[" + hint + "]") } } else { this.showErrorMessage("扫描库位[" + this.code + "]不可用") @@ -126,10 +127,10 @@ }, checkLocationType(type) { var isPass = false; - if (this.locationTypeList.length == 0) { + if (this.locationAreaTypeList.length == 0) { isPass = true; } else { - var temp = this.locationTypeList.filter(res => { + var temp = this.locationAreaTypeList.filter(res => { if (res == type) { return res } diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index 976e827a..adb7be78 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -62,10 +62,10 @@ } from '@/api/request2.js'; import { - getListLocationTypeDesc, + getListLocationAreaTypeDesc, checkDirectoryItemExist, getDirectoryItemArray, - getLocationTypeName, + getLocationAreaTypeName, getInventoryStatusDesc } from '@/common/directory.js'; export default { @@ -114,7 +114,7 @@ fromLocationCode: '', fromLocation: '', fromLocationList: [], - fromLocationTypeArray: [], + fromLocationAreaTypeList: [], locationOnFocus: false, businessType: {}, inventoryStatus: [], @@ -138,7 +138,7 @@ } this.fromInventoryStatuses = this.businessType.outInventoryStatuses this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态 - this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态 + this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区 setTimeout(res => { this.$refs.popup.open('bottom') }, 500) @@ -162,7 +162,7 @@ }, 500) this.fromInventoryStatuses = jobContent.outInventoryStatuses this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 - this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态 + this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaCodes); //出库库存状态 }, closeScanPopup(content) { @@ -194,25 +194,22 @@ mask: true }); getBasicLocationByCode(this.fromLocationCode).then(res => { + uni.hideLoading(); if (res.data.total > 0) { let result = res.data.list[0]; var type = result.type; var available = result.available; if (available == "TRUE") { - if (checkDirectoryItemExist(this.fromLocationTypeArray, type)) { + if (checkDirectoryItemExist(this.fromLocationAreaTypeList, type)) { this.location = result; // this.packGetFocus(); this.checkPackage(scanResult); } else { - uni.hideLoading(); - var hint = getListLocationTypeDesc(this.fromLocationTypeArray); - this.showErrorMessage("库位[" + this.fromLocationCode + "]是" + - getLocationTypeName(type) + ",
需要的库位类型是[" + hint + "]", callback => { - this.locationGetFocus(); - }) + var hint = getListLocationAreaTypeDesc(this.fromLocationAreaTypeList); + this.showErrorMessage("扫描库位[" + this.code + "]是[" + + getLocationAreaTypeName(areaType) + "],需要的库区是[" + hint + "]") } } else { - uni.hideLoading(); this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]不可用", res => { this.locationGetFocus(); }) diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue new file mode 100644 index 00000000..9c1b4781 --- /dev/null +++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue @@ -0,0 +1,454 @@ + + + + + diff --git a/src/mycomponents/wincom/basicCom/winHint.vue b/src/mycomponents/wincom/basicCom/winHint.vue index e9945cb3..2d77a475 100644 --- a/src/mycomponents/wincom/basicCom/winHint.vue +++ b/src/mycomponents/wincom/basicCom/winHint.vue @@ -21,7 +21,7 @@ 数量{{dataContent.recommendQty}} - 标包数量{{dataContent.stdPackQty}} + 标包数量{{dataContent.packQty}} 推荐单位{{dataContent.recommendUom}} diff --git a/src/pages.json b/src/pages.json index 2f1c55ee..e60e9da7 100644 --- a/src/pages.json +++ b/src/pages.json @@ -340,6 +340,13 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/inspect/job/inspectResult", + "style": { + "navigationBarTitleText": "检验详情", + "enablePullDownRefresh": true + } + }, { "path": "pages/putaway/job/putawayJob", "style": { @@ -465,6 +472,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/issue/request/issueScanRequest", + "style": { + "navigationBarTitleText": "扫描叫料申请", + "enablePullDownRefresh": false + } + }, { "path": "pages/issue/job/issueJob", @@ -1130,6 +1144,75 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/productReceipt/job/completeReceiveJob", + "style": { + "navigationBarTitleText": "完工收货任务", + "enablePullDownRefresh": true, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] + } + } + }, + { + "path": "pages/productReceipt/job/completeReceiveJobDetail", + "style": { + "navigationBarTitleText": "完工收货任务详情", + "enablePullDownRefresh": true + } + }, + + { + "path": "pages/stockUp/job/stockUpJob", + "style": { + "navigationBarTitleText": "直接备货任务", + "enablePullDownRefresh": true, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] + } + } + }, + { + "path": "pages/stockUp/job/stockUpJobDetail", + "style": { + "navigationBarTitleText": "直接备货任务详情", + "enablePullDownRefresh": true + } + }, { "path": "pages/scrap/record/scrapRecord", "style": { @@ -1382,6 +1465,13 @@ "enablePullDownRefresh": true } }, + { + "path": "pages/inventoryMove/record/scrapToHoldRecord", + "style": { + "navigationBarTitleText": "报废转隔离记录", + "enablePullDownRefresh": true + } + }, { "path": "pages/inventoryMove/record/okToHoldRecord", "style": { @@ -1734,7 +1824,45 @@ "navigationBarTitleText": "翻包", "enablePullDownRefresh": false } + }, + + { + "path": "pages/package/job/overPackageJob", + "style": { + "navigationBarTitleText": "翻包任务", + "enablePullDownRefresh": false, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + }, + { + + "float": "right", + "fontSize": "52rpx", //按钮上文字的大小 + "text": "\ue6e2", + "fontSrc": "/static/ali_icon/iconfont.ttf" + } + ] + } + } + }, + { + "path": "pages/package/job/overPackageJobDetail", + "style": { + "navigationBarTitleText": "翻包任务详情", + "enablePullDownRefresh": false + } } + + ], diff --git a/src/pages/container/record/containerBindRecord.vue b/src/pages/container/record/containerBindRecord.vue index eb52e26f..64e0d7e7 100644 --- a/src/pages/container/record/containerBindRecord.vue +++ b/src/pages/container/record/containerBindRecord.vue @@ -98,14 +98,10 @@ id: '', scanCount: 0, detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], toLocationInfo: {}, fromLocationInfo: {}, - toLocationInfo: {}, containerCode: "", containerInfo: {}, - fromlocationTypeList: [], - tolocationTypeList: [], allowModifyLocation: false, inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 @@ -130,8 +126,6 @@ getBusinessType('ContainerBind', res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.showContainerPopup(); } else { this.showErrorMessage(res.message) @@ -248,8 +242,8 @@ let item = { itemCode: res.itemCode, itemName: res.itemName, - stdPackQty: res.stdPackQty, - stdPackUnit: res.stdPackUnit, + packQty: res.packQty, + packUnit: res.packUnit, qty: res.qty, handleQty: 0, uom: res.uom, diff --git a/src/pages/container/record/containerUnBindRecord.vue b/src/pages/container/record/containerUnBindRecord.vue index 435abfc6..c985da11 100644 --- a/src/pages/container/record/containerUnBindRecord.vue +++ b/src/pages/container/record/containerUnBindRecord.vue @@ -61,7 +61,6 @@ } from '@/common/directory.js'; import { - getBusinessType, createItemInfo, createDetailInfo, calcHandleQty @@ -193,8 +192,8 @@ let item = { itemCode: res.itemCode, itemName: res.itemName, - stdPackQty: res.stdPackQty, - stdPackUnit: res.stdPackUnit, + packQty: res.packQty, + packUnit: res.packUnit, qty: res.qty, handleQty: 0, uom: res.uom, diff --git a/src/pages/count/job/countDetail.vue b/src/pages/count/job/countDetail.vue index c3a37327..9976045e 100644 --- a/src/pages/count/job/countDetail.vue +++ b/src/pages/count/job/countDetail.vue @@ -224,8 +224,8 @@ let item = { itemCode: res.itemCode, itemName: res.itemName, - stdPackQty: res.stdPackQty, - stdPackUnit: res.stdPackUnit, + packQty: res.packQty, + packUnit: res.packUnit, qty: Number(res.qty), handleQty: 0, uom: res.uom, @@ -503,8 +503,8 @@ // this.balance.qty = 0 this.balance.handleQty = Number(this.label.qty); this.balance.balanceQty = this.balance.qty; - this.balance.stdPackQty = this.package.stdPackQty; - this.balance.stdPackUnit = this.package.stdPackUnit; + this.balance.packQty = this.package.packQty; + this.balance.packUnit = this.package.packUnit; this.$refs.countQtyEdit.openEditPopupShowSeconds(this.balance, null); }, @@ -539,8 +539,8 @@ itemEditInfo.handleQty = qty; itemEditInfo.inventoryStatus = inventoryStatus; itemEditInfo.balanceQty = that.balance.qty; - itemEditInfo.stdPackQty = that.package.stdPackQty; - itemEditInfo.stdPackUnit = that.package.stdPackUnit; + itemEditInfo.packQty = that.package.packQty; + itemEditInfo.packUnit = that.package.packUnit; } } @@ -599,8 +599,8 @@ let item = { itemCode: this.package.itemCode, itemName: this.package.itemName, - stdPackQty: this.package.stdPackQty, - stdPackUnit: this.package.stdPackUnit, + packQty: this.package.packQty, + packUnit: this.package.packUnit, // qty: Number(qty), qty: 0, handleQty: 0, @@ -625,8 +625,8 @@ itemName: this.package.itemName, itemDesc1: this.package.itemDesc1, itemDesc2: this.package.itemDesc2, - stdPackQty: this.package.stdPackQty, - stdPackUnit: this.package.stdPackUnit, + packQty: this.package.packQty, + packUnit: this.package.packUnit, projectCode: "", qty: 0, handleQty: qty, diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index 7c3e2bd6..d25a1bd1 100644 --- a/src/pages/count/job/countJob.vue +++ b/src/pages/count/job/countJob.vue @@ -157,6 +157,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("盘点(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -164,7 +165,6 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("盘点(" + this.totalCount + ")"); }).catch(error => { if (type === "refresh") { diff --git a/src/pages/count/record/countRecord.vue b/src/pages/count/record/countRecord.vue index 0cafeade..d3dd04f6 100644 --- a/src/pages/count/record/countRecord.vue +++ b/src/pages/count/record/countRecord.vue @@ -6,7 +6,7 @@ + :locationAreaTypeList="locationAreaTypeList"> @@ -37,8 +37,8 @@ - + :locationAreaTypeList="locationAreaTypeList"> + @@ -74,6 +74,7 @@ import comBlankView from '@/mycomponents/common/comBlankView.vue' import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" + import countQtyEdit from "@/mycomponents/qty/countQtyEdit.vue" export default { name: 'receipt_detail', @@ -85,7 +86,7 @@ comBlankView, winScanPackAndLocation, winScanLocation, - CountQtyEdit + countQtyEdit }, data() { return { @@ -97,10 +98,9 @@ jobContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], + locationAreaTypeList: [], toLocationInfo: {}, businessTypeInfo: {}, - fromLocationTypeArray: [], toLocationTypeArray: [], fromLocationInfo: {}, fromLocationCode: "", @@ -113,8 +113,6 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) @@ -265,7 +263,7 @@ this.$refs.comMessage.showSelectMessageModal("箱码【" + packingNumber + "】已经完成盘点,是否要编辑数量", res => { if (res) { - this.$refs.CountQtyEdit.openEditPopup(this.itemEditInfo, + this.$refs.countQtyEdit.openEditPopup(this.itemEditInfo, detail.subList); } else { this.scanPopupGetFocus(); @@ -273,10 +271,10 @@ }) } else { this.itemEditInfo.scaned = true; - this.itemEditInfo.stdPackQty = result.package.stdPackQty; - this.itemEditInfo.stdPackUnit = result.package.stdPackUnit; + this.itemEditInfo.packQty = result.package.packQty; + this.itemEditInfo.packUnit = result.package.packUnit; this.itemEditInfo.record = this.createRecordInfo(this.itemEditInfo, result.balance); - this.$refs.CountQtyEdit.openEditPopupShowSeconds(this.itemEditInfo); + this.$refs.countQtyEdit.openEditPopupShowSeconds(this.itemEditInfo); this.calcHandleQty(); } } @@ -314,8 +312,8 @@ let item = { itemCode: balance.itemCode, itemName: pack.itemName, - stdPackQty: pack.stdPackQty, - stdPackUnit: pack.stdPackUnit, + packQty: pack.packQty, + packUnit: pack.packUnit, qty: balance.qty, handleQty: 0, uom: pack.uom, @@ -358,7 +356,7 @@ editItem(val) { var detail = this.detailSource.find(r => r.itemCode == val.itemCode); - this.$refs.CountQtyEdit.openEditPopup(val, + this.$refs.countQtyEdit.openEditPopup(val, detail.subList); }, diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue index 21ef0149..785c5ea2 100644 --- a/src/pages/customerReturn/job/returnDetail.vue +++ b/src/pages/customerReturn/job/returnDetail.vue @@ -6,7 +6,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -20,7 +20,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -87,7 +87,7 @@ managementList: [], fromLocationCode: "", toLocationCode: "", - tolocationTypeList: [], + toLocationAreaTypeList: [], jobStatus:"", jobToLocationCode:"" }; @@ -169,7 +169,7 @@ that.detailSource = getDataSource(that.subList) that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) } else { that.showMessage('列表数据为0'); } @@ -268,8 +268,8 @@ itemDetail.inventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty) - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } else { this.scanPopupGetFocus(); @@ -288,8 +288,8 @@ itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty) - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } } diff --git a/src/pages/customerReturn/job/returnJob.vue b/src/pages/customerReturn/job/returnJob.vue index 960f382d..12b9634f 100644 --- a/src/pages/customerReturn/job/returnJob.vue +++ b/src/pages/customerReturn/job/returnJob.vue @@ -153,6 +153,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("客户退货(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -160,7 +161,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("客户退货(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue index 45dd23fc..44a8d4ef 100644 --- a/src/pages/customerReturn/record/returnRecord.vue +++ b/src/pages/customerReturn/record/returnRecord.vue @@ -21,7 +21,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList"> @@ -35,7 +35,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -55,7 +55,6 @@ } from '@/common/balance.js'; import { goHome, - updateTitle, getPackingNumberAndBatchByList, deepCopyData } from '@/common/basic.js'; @@ -98,12 +97,11 @@ dataContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], + fromLocationAreaTypeList:[], businessType: {}, fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + toLocationAreaTypeList: [], managementList: [], toWarehouseCode: '', }; @@ -113,8 +111,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/customerReturn/request/customerReturnRequest.vue b/src/pages/customerReturn/request/customerReturnRequest.vue index 0feb080f..e6d5c04b 100644 --- a/src/pages/customerReturn/request/customerReturnRequest.vue +++ b/src/pages/customerReturn/request/customerReturnRequest.vue @@ -158,6 +158,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("客户退货申请(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -168,9 +169,7 @@ res.options = options; }) this.requestList = type === "refresh" ? list : this.requestList.concat(list); - this.pageNo++; - updateTitle("客户退货申请(" + this.totalCount + ")"); }).catch(error => { if (type === "refresh") { diff --git a/src/pages/customerReturn/request/customerReturnRequestCreate.vue b/src/pages/customerReturn/request/customerReturnRequestCreate.vue index d9727036..b5311965 100644 --- a/src/pages/customerReturn/request/customerReturnRequestCreate.vue +++ b/src/pages/customerReturn/request/customerReturnRequestCreate.vue @@ -34,7 +34,7 @@ @@ -49,7 +49,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -72,7 +72,6 @@ } from '@/common/balance.js'; import { goHome, - updateTitle, deepCopyData, getPackingNumberAndBatchByList } from '@/common/basic.js'; @@ -112,19 +111,17 @@ dataContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], businessType: {}, fromLocationCode: "", fromLocation: {}, toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], toWarehouseCode: '', customerCode: '', showCustomer: false, customerList: [], customerName: "请选择退货客户", - customerCode: "" }; }, onLoad(option) { @@ -132,8 +129,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/deliver/coms/comDeliverRequestPopup.vue b/src/pages/deliver/coms/comDeliverRequestPopup.vue index 84f61013..046c5de4 100644 --- a/src/pages/deliver/coms/comDeliverRequestPopup.vue +++ b/src/pages/deliver/coms/comDeliverRequestPopup.vue @@ -47,7 +47,7 @@ diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue index 4339befe..eecd97d4 100644 --- a/src/pages/deliver/coms/comScanDeliverPack.vue +++ b/src/pages/deliver/coms/comScanDeliverPack.vue @@ -385,8 +385,8 @@ }, creatRecord(label, balance, packageInfo) { - balance.stdPackQty = packageInfo.stdPackQty - balance.stdPackUnit = packageInfo.stdPackUnit + balance.packQty = packageInfo.packQty + balance.packUnit = packageInfo.packUnit let record = { itemCode: label.itemCode, packingNumber: label.packingNumber, diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue index 26c89794..29182aa2 100644 --- a/src/pages/deliver/job/deliverDetail.vue +++ b/src/pages/deliver/job/deliverDetail.vue @@ -61,7 +61,6 @@ import { goHome, - updateTitle, navigateBack, getRemoveOption, getCurrDateTime, diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue index 8d514430..be9e63a7 100644 --- a/src/pages/deliver/job/deliverJob.vue +++ b/src/pages/deliver/job/deliverJob.vue @@ -154,6 +154,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("制品发货任务(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -161,7 +162,6 @@ } this.jobList = type === "refresh" ? list : this.receiptList.concat(list); this.pageNo++; - updateTitle("制品发货任务(" + this.totalCount + ")"); }).catch(error => { if (type === "refresh") { diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue index b8b13599..71e76b70 100644 --- a/src/pages/deliver/record/deliverRecord.vue +++ b/src/pages/deliver/record/deliverRecord.vue @@ -35,7 +35,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -48,7 +48,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -105,11 +105,10 @@ id: '', subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], businessType: {}, customerList: [], customerText: "", @@ -124,8 +123,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/deliver/request/deliverRequest.vue b/src/pages/deliver/request/deliverRequest.vue index d770dfc8..4633935d 100644 --- a/src/pages/deliver/request/deliverRequest.vue +++ b/src/pages/deliver/request/deliverRequest.vue @@ -158,6 +158,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("成品发货申请(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -169,7 +170,7 @@ }) this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle("成品发货申请(" + this.totalCount + ")"); + }).catch(error => { updateTitle("成品发货申请"); diff --git a/src/pages/deliver/request/deliverRequestCreate.vue b/src/pages/deliver/request/deliverRequestCreate.vue index d697fbff..853cc3aa 100644 --- a/src/pages/deliver/request/deliverRequestCreate.vue +++ b/src/pages/deliver/request/deliverRequestCreate.vue @@ -35,7 +35,6 @@ import { goHome, - updateTitle, getRemoveOption, getISODateTime } from '@/common/basic.js'; diff --git a/src/pages/demo/demo.vue b/src/pages/demo/demo.vue index b9e7dbd6..1a87fe6a 100644 --- a/src/pages/demo/demo.vue +++ b/src/pages/demo/demo.vue @@ -449,8 +449,8 @@ itemCode: "LJH16540NAA", itemName: "门板金属螺丝钉", itemDesc1: "门板金属螺丝", - stdPackQty: 1000, - stdPackUnit: '箱', + packQty: 1000, + packUnit: '箱', uom: 'EA', qty: 3000, inventoryStatus: 2, @@ -468,8 +468,8 @@ itemCode: "LJH16540NAA", itemName: "门板金属螺丝钉", itemDesc1: "门板金属螺丝", - stdPackQty: 1000, - stdPackUnit: 'EA', + packQty: 1000, + packUnit: 'EA', uom: 'EA', qty: 500, inventoryStatus: 2, @@ -482,8 +482,8 @@ itemCode: "LJH16540NAA", itemName: "门板金属螺丝钉", itemDesc1: "门板金属螺丝", - stdPackQty: 1000, - stdPackUnit: 'EA', + packQty: 1000, + packUnit: 'EA', uom: 'EA', qty: 1000, UsableQty: 500, diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 3ae14fe0..62a6be11 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -35,12 +35,12 @@ - + {{item.name}} - + @@ -93,7 +93,6 @@ forcedLogin: false, count: 1, position: [-10, -10], - timer: null, menusCount: {}, filterList: [], serchval: "" @@ -109,7 +108,7 @@ uni.hideLoading() if (res.menus.length > 0) { var menus = res.menus.filter(item => item.name == "PDA菜单管理") - if (menus.length > 0) { + if (menus!=undefined&&menus.length > 0) { var tab = menus[0].children.filter(res => res.visible == true) tab.forEach(res => { for (var i = 0; i < res.children.length; i++) { @@ -337,7 +336,7 @@ "inventory_status", "container_type", "pack_unit", "unplanned_receipt_reason", "unplanned_issue_reason", "scrap_reason", "inspect_failed_reason", "request_status", "inspect_type", "next_action", "sample_method", "transfer_mode", - "count_stage", "inspect_result" + "count_stage", "inspect_result","area_type" ] } getDictionaryItem(params).then(res => { diff --git a/src/pages/inspect/job/inspectJob.vue b/src/pages/inspect/job/inspectJob.vue index 2cb2ab9b..fa093d52 100644 --- a/src/pages/inspect/job/inspectJob.vue +++ b/src/pages/inspect/job/inspectJob.vue @@ -150,6 +150,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("到货检验(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -157,7 +158,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("到货检验(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/inspect/request/inspectRequest.vue b/src/pages/inspect/request/inspectRequest.vue index bd7b966a..27e32769 100644 --- a/src/pages/inspect/request/inspectRequest.vue +++ b/src/pages/inspect/request/inspectRequest.vue @@ -169,6 +169,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("检验单申请(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -181,7 +182,7 @@ this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle("检验单申请(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/inventoryMove/coms/comMove.vue b/src/pages/inventoryMove/coms/comMove.vue index 8ed05bfe..7bc3165e 100644 --- a/src/pages/inventoryMove/coms/comMove.vue +++ b/src/pages/inventoryMove/coms/comMove.vue @@ -24,7 +24,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationTypeArray" :isShowEdit="toLocationCode==''"> @@ -36,7 +36,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -120,8 +120,8 @@ title: "", dataContent: {}, toWarehouseCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], } }, @@ -129,8 +129,8 @@ getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 652f54eb..946aaced 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -23,7 +23,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList" :isShowEdit="isShowEditLocation"> @@ -35,7 +35,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -121,8 +121,8 @@ detailSource: [], //绑定在页面上的数据源 title: "", dataContent: {}, - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], isShowEditLocation:false } }, @@ -131,8 +131,8 @@ getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index 2996e0f0..84019b17 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -60,7 +60,6 @@ } from '@/common/detail.js'; import { goHome, - updateTitle, navigateBack, getCurrDateTime, getPackingNumberAndBatchByList, @@ -94,7 +93,6 @@ detailSource: [], //绑定在页面上的数据源 toLocationInfo: {}, businessTypeInfo: {}, - locationTypeList: [], managementList: [], businessTypeCode: '', toLocationCode: '', @@ -312,8 +310,8 @@ itemDetail.fromInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty); - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } else { this.scanPopupGetFocus(); @@ -332,8 +330,8 @@ itemDetail.fromInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty); - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } } diff --git a/src/pages/inventoryMove/job/inventoryMoveJob.vue b/src/pages/inventoryMove/job/inventoryMoveJob.vue index f3f08737..8d7d6a5c 100644 --- a/src/pages/inventoryMove/job/inventoryMoveJob.vue +++ b/src/pages/inventoryMove/job/inventoryMoveJob.vue @@ -143,6 +143,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("库存转移(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -150,7 +151,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("库存转移(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/issue-按批次推荐/job/issueDetail.vue b/src/pages/issue-按批次推荐/job/issueDetail.vue index ea198665..0cb6e61f 100644 --- a/src/pages/issue-按批次推荐/job/issueDetail.vue +++ b/src/pages/issue-按批次推荐/job/issueDetail.vue @@ -226,8 +226,8 @@ let item = { itemCode: detail.itemCode, itemName: detail.itemName, - stdPackQty: detail.stdPackQty, - stdPackUnit: detail.stdPackUnit, + packQty: detail.packQty, + packUnit: detail.packUnit, qty: detail.qty, uom: detail.uom, handleQty: 0, diff --git a/src/pages/issue-按批次推荐/job/issueJob.vue b/src/pages/issue-按批次推荐/job/issueJob.vue index 4993edb2..cdb3ca74 100644 --- a/src/pages/issue-按批次推荐/job/issueJob.vue +++ b/src/pages/issue-按批次推荐/job/issueJob.vue @@ -164,6 +164,7 @@ var list = res.data.list; this.totalCount = res.data.total + this.updateTitle(); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -171,7 +172,6 @@ } that.issueList = type === "refresh" ? list : this.issueList.concat(list); that.pageIndex++; - this.updateTitle(); }).catch(error => { this.loadingType = ""; diff --git a/src/pages/issue/coms/comIssueRequestPopup.vue b/src/pages/issue/coms/comIssueRequestPopup.vue index bbd6dd95..32d1923e 100644 --- a/src/pages/issue/coms/comIssueRequestPopup.vue +++ b/src/pages/issue/coms/comIssueRequestPopup.vue @@ -62,7 +62,7 @@ - () + () @@ -97,7 +97,7 @@ checkDirectoryItemExist } from '@/common/directory.js'; import uom from '@/mycomponents/qty/uom.vue' - import stdPackQty from '@/mycomponents/qty/stdPackQty.vue' + import packQty from '@/mycomponents/qty/packQty.vue' import balanceStatus from '@/mycomponents/status/balanceStatus.vue' import winScanItem from '@/mycomponents/scan/winScanItem.vue' @@ -106,7 +106,7 @@ uom, balanceStatus, winScanItem, - stdPackQty, + packQty, }, data() { return { diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 0572aa58..d65f9681 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -382,8 +382,8 @@ }, creatRecord(label, balance, packageInfo) { - balance.stdPackQty = packageInfo.stdPackQty - balance.stdPackUnit = packageInfo.stdPackUnit + balance.packQty = packageInfo.packQty + balance.packUnit = packageInfo.packUnit let record = { scaned: true, itemCode: label.itemCode, diff --git a/src/pages/issue/coms/jobInfoPopup.vue b/src/pages/issue/coms/jobInfoPopup.vue index 89710769..f654d6b4 100644 --- a/src/pages/issue/coms/jobInfoPopup.vue +++ b/src/pages/issue/coms/jobInfoPopup.vue @@ -40,7 +40,10 @@ methods: { openPopup(val) { this.dataContent = val; - this.$refs.popup.open('bottom') + setTimeout(res=>{ + this.$refs.popup.open('bottom') + },100) + }, closePopup() { this.$refs.popup.close() diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 12f9c788..bfba40ea 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -49,7 +49,6 @@ import { goHome, - updateTitle, navigateBack, getRemoveOption, getCurrDateTime, @@ -73,7 +72,6 @@ import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue' import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue' - import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue' import jobTop from '@/mycomponents/job/jobTop.vue' import workStation from '@/mycomponents/workStation/workStation.vue' @@ -83,7 +81,6 @@ jobDetailPopup, winScanButton, comIssueDetailCard, - comIssueRequestInfo, comScanIssuePack, jobTop, workStation diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index d2873878..e7784bed 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -1,16 +1,11 @@ @@ -88,11 +88,9 @@ id: '', scanCount: 0, detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", isShowLocation: false, - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -107,8 +105,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 475ed2ee..e2273eb4 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -9,8 +9,18 @@ - + + 来源库位 : {{item.subList[0].locationCode}} + + 来源包装规格 : + {{fromPackUnit}}/{{item.subList[0].packQty}}{{getUomInfo(item.subList[0].uom)}} + + + + + @@ -22,7 +32,19 @@ - + + 目标包装规格 : + + + {{toPackUnitShow}} + + + + + + + @@ -35,14 +57,15 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> + + diff --git a/src/pages/productReceipt/job/completeReceiveJobDetail.vue b/src/pages/productReceipt/job/completeReceiveJobDetail.vue new file mode 100644 index 00000000..1b3fb8fa --- /dev/null +++ b/src/pages/productReceipt/job/completeReceiveJobDetail.vue @@ -0,0 +1,418 @@ + + + + + diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 6759a483..b3baa289 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -15,7 +15,7 @@ + @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @@ -29,7 +29,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -101,7 +101,7 @@ jobContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - toLocationTypeList: [], + toLocationAreaTypeList: [], managementList: [], jobStatus:"", jobToLocationCode:"" @@ -184,7 +184,7 @@ that.subList = res.data.subList; that.jobStatus = res.data.status that.jobToLocationCode = that.subList[0].toLocationCode - that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) } else { that.showMessage('列表数据为0'); diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index c5e524a7..c047a1ba 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -155,6 +155,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("制品收货(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -162,7 +163,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("制品收货(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/productReceipt/record/productReceiptRecord.vue b/src/pages/productReceipt/record/productReceiptRecord.vue index f34e5fc9..87aca59e 100644 --- a/src/pages/productReceipt/record/productReceiptRecord.vue +++ b/src/pages/productReceipt/record/productReceiptRecord.vue @@ -91,8 +91,6 @@ data() { return { detailSource: [], //绑定在页面上的数据源 - toLocationTypeList: [], - toLocationInfo: {}, toLocationCode: "", fromLocationTypeList: [], fromLocationCode: "", @@ -117,8 +115,6 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.openScanPopup(); } else { this.showErrorMessage(res.message) @@ -182,8 +178,8 @@ let item = { itemCode: label.itemCode, itemName: pack.itemName, - stdPackQty: pack.stdPackQty, - stdPackUnit: pack.stdPackUnit, + packQty: pack.packQty, + packUnit: pack.packUnit, qty: new Decimal(label.qty).toNumber(), handleQty: new Decimal(0).toNumber(), uom: pack.uom, @@ -198,8 +194,8 @@ detail.qty = new Decimal(label.qty).toNumber(); detail.handleQty = new Decimal(label.qty).toNumber(); detail.inventoryStatus = "OK" - detail.stdPackQty = pack.stdPackQty; - detail.stdPackUnit = pack.stdPackUnit; + detail.packQty = pack.packQty; + detail.packUnit = pack.packUnit; detail.package = pack; detail.label = label; diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index 21ec7a62..6a28d995 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -15,7 +15,7 @@ + :locationAreaTypeList='toLocationAreaTypeList'> @@ -30,7 +30,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -60,7 +60,6 @@ } from '@/api/request2.js'; import { goHome, - updateTitle, navigateBack, getCurrDateTime, getPackingNumberAndBatch, @@ -105,7 +104,7 @@ managementList: [], fromLocationCode: "", toLocationCode: "", - tolocationTypeList: [], + toLocationAreaTypeList: [], jobStatus:"", jobToLocationCode: "", }; @@ -181,9 +180,8 @@ that.subList = res.data.subList; that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) - // updateTitle(this.jobContent.number); } else { that.showMessage('列表数据为0'); } @@ -289,8 +287,8 @@ itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty) - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } else { this.scanPopupGetFocus(); @@ -311,8 +309,8 @@ itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty) - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } } diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index f5ed5c5f..d0265058 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -156,6 +156,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("生产收料(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -163,7 +164,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("生产收料(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/productionReceipt/record/productionReceiptRecord.vue b/src/pages/productionReceipt/record/productionReceiptRecord.vue index d373181a..424e01ad 100644 --- a/src/pages/productionReceipt/record/productionReceiptRecord.vue +++ b/src/pages/productionReceipt/record/productionReceiptRecord.vue @@ -19,7 +19,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -88,13 +88,12 @@ scanCount: 0, jobContent: {}, //任务内容 detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], businessTypeInfo: {}, fromLocationCode: "", toLocationCode: "", isShowLocation: false, - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], allowModifyLocation: false, inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 @@ -107,8 +106,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/productionReturn/coms/comReturn.vue b/src/pages/productionReturn/coms/comReturn.vue index b879d6ec..a4baeb6d 100644 --- a/src/pages/productionReturn/coms/comReturn.vue +++ b/src/pages/productionReturn/coms/comReturn.vue @@ -115,7 +115,7 @@ fromLocationCode: '', fromLocationTypeList: [], toLocationCode: '', - tolocationTypeList: [], + toLocationAreaTypeList: [], businessType: {}, inventoryStatus: '', managementList: [], @@ -138,8 +138,7 @@ getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.openScanPopup(); } else { this.showErrorMessage(res.message) @@ -210,8 +209,8 @@ let item = { itemCode: label.itemCode, itemName: pack.itemName, - stdPackQty: pack.stdPackQty, - stdPackUnit: pack.stdPackUnit, + packQty: pack.packQty, + packUnit: pack.packUnit, qty: Number(label.qty), handleQty: 0, uom: pack.uom, @@ -226,8 +225,8 @@ detail.scaned = true; detail.qty = Number(label.qty); detail.inventoryStatus = this.businessTypeCode == 'ReturnToStore' ? "OK" : "HOLD" - detail.stdPackQty = pack.stdPackQty; - detail.stdPackUnit = pack.stdPackUnit; + detail.packQty = pack.packQty; + detail.packUnit = pack.packUnit; detail.handleQty = 0; detail.package = pack; detail.label = label; diff --git a/src/pages/productionReturn/coms/comReturnCommonRequest.vue b/src/pages/productionReturn/coms/comReturnCommonRequest.vue index f22e12d1..0a88f667 100644 --- a/src/pages/productionReturn/coms/comReturnCommonRequest.vue +++ b/src/pages/productionReturn/coms/comReturnCommonRequest.vue @@ -183,6 +183,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle(this.title + "(" + this.totalCount + ")") this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -195,7 +196,7 @@ this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle(this.title + "(" + this.totalCount + ")") + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/productionReturn/coms/comReturnDetailCard.vue b/src/pages/productionReturn/coms/comReturnDetailCard.vue index eec41e63..a8b5c6c3 100644 --- a/src/pages/productionReturn/coms/comReturnDetailCard.vue +++ b/src/pages/productionReturn/coms/comReturnDetailCard.vue @@ -22,7 +22,7 @@ @confirm="confirm"> + :locationAreaTypeList="locationAreaTypeList"> @@ -53,15 +53,15 @@ props: { dataContent: { type: Object, - default: {} + default: null }, settingParam: { type: Object, - default: {} + default: null }, - locationTypeList: { + locationAreaTypeList: { type: Array, - default: [] + default: null }, diff --git a/src/pages/productionReturn/coms/comReturnRequestPopup.vue b/src/pages/productionReturn/coms/comReturnRequestPopup.vue index 1206fa20..c55dc974 100644 --- a/src/pages/productionReturn/coms/comReturnRequestPopup.vue +++ b/src/pages/productionReturn/coms/comReturnRequestPopup.vue @@ -51,7 +51,7 @@ - () + () @@ -85,7 +85,7 @@ checkDirectoryItemExist } from '@/common/directory.js'; import uom from '@/mycomponents/qty/uom.vue' - import stdPackQty from '@/mycomponents/qty/stdPackQty.vue' + import packQty from '@/mycomponents/qty/packQty.vue' import balanceStatus from '@/mycomponents/status/balanceStatus.vue' import winScanItem from '@/mycomponents/scan/winScanItem.vue' @@ -93,7 +93,7 @@ export default { components: { uom, - stdPackQty, + packQty, balanceStatus, winScanItem }, diff --git a/src/pages/productionReturn/coms/comScanReturnPack.vue b/src/pages/productionReturn/coms/comScanReturnPack.vue index b9175d36..2f11c595 100644 --- a/src/pages/productionReturn/coms/comScanReturnPack.vue +++ b/src/pages/productionReturn/coms/comScanReturnPack.vue @@ -367,8 +367,8 @@ }, creatRecord(label, balance, packageInfo) { - balance.stdPackQty = packageInfo.stdPackQty - balance.stdPackUnit = packageInfo.stdPackUnit + balance.packQty = packageInfo.packQty + balance.packUnit = packageInfo.packUnit let record = { itemCode: label.itemCode, packingNumber: label.packingNumber, diff --git a/src/pages/productionReturn/coms/returnDetailInfoPopup.vue b/src/pages/productionReturn/coms/returnDetailInfoPopup.vue index 4e1973e2..4aae7781 100644 --- a/src/pages/productionReturn/coms/returnDetailInfoPopup.vue +++ b/src/pages/productionReturn/coms/returnDetailInfoPopup.vue @@ -6,11 +6,11 @@ 标包数量 : - {{dataContent.stdPackQty}} + {{dataContent.packQty}} 标包单位 : - {{getStdPackUnitInfo(dataContent.stdPackUnit)}} + {{getPackUnitInfo(dataContent.packUnit)}} @@ -22,7 +22,7 @@ + + diff --git a/src/pages/stockUp/coms/comStockUpDetailCard.vue b/src/pages/stockUp/coms/comStockUpDetailCard.vue new file mode 100644 index 00000000..78531c49 --- /dev/null +++ b/src/pages/stockUp/coms/comStockUpDetailCard.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/src/pages/stockUp/coms/comStockUpJobCard.vue b/src/pages/stockUp/coms/comStockUpJobCard.vue new file mode 100644 index 00000000..6daab45f --- /dev/null +++ b/src/pages/stockUp/coms/comStockUpJobCard.vue @@ -0,0 +1,50 @@ + + + + + diff --git a/src/pages/stockUp/coms/jobInfoPopup.vue b/src/pages/stockUp/coms/jobInfoPopup.vue new file mode 100644 index 00000000..831b56ea --- /dev/null +++ b/src/pages/stockUp/coms/jobInfoPopup.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/pages/stockUp/coms/jobListPopup.vue b/src/pages/stockUp/coms/jobListPopup.vue new file mode 100644 index 00000000..f58edcf5 --- /dev/null +++ b/src/pages/stockUp/coms/jobListPopup.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/pages/stockUp/coms/stockUpDetailInfoPopup.vue b/src/pages/stockUp/coms/stockUpDetailInfoPopup.vue new file mode 100644 index 00000000..046c093d --- /dev/null +++ b/src/pages/stockUp/coms/stockUpDetailInfoPopup.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/src/pages/stockUp/job/stockUpJob.vue b/src/pages/stockUp/job/stockUpJob.vue new file mode 100644 index 00000000..1915108f --- /dev/null +++ b/src/pages/stockUp/job/stockUpJob.vue @@ -0,0 +1,286 @@ + + + + + diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue new file mode 100644 index 00000000..6c5cd4e2 --- /dev/null +++ b/src/pages/stockUp/job/stockUpJobDetail.vue @@ -0,0 +1,461 @@ + + + + + diff --git a/src/pages/supplierDeliver/coms/recordDetailInfoPopup.vue b/src/pages/supplierDeliver/coms/recordDetailInfoPopup.vue index 7ef4023c..bb2033d6 100644 --- a/src/pages/supplierDeliver/coms/recordDetailInfoPopup.vue +++ b/src/pages/supplierDeliver/coms/recordDetailInfoPopup.vue @@ -94,11 +94,11 @@ }, { title: '标包数量', - content: this.dataContent.stdPackQty + content: this.dataContent.packQty }, { title: '标包单位', - content: this.dataContent.stdPackUnit + content: this.dataContent.packUnit },{ title: '供应商计量数量', content: this.dataContent.supplierQty diff --git a/src/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue b/src/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue index 7a5ba512..987db207 100644 --- a/src/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue +++ b/src/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue @@ -6,11 +6,11 @@ 标包数量 : - {{dataContent.stdPackQty}} + {{dataContent.packQty}} 标包单位 : - {{dataContent.stdPackUnit}} + {{dataContent.packUnit}} 供应商计量数量 : diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue index 16313ac0..333ec1e5 100644 --- a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue +++ b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue @@ -142,6 +142,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("供应商发货记录(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -149,7 +150,7 @@ } this.recordList = type === "refresh" ? list : this.recordList.concat(list); this.pageNo++; - updateTitle("供应商发货记录(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue b/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue index 9dc93624..793bd58c 100644 --- a/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue +++ b/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue @@ -79,7 +79,6 @@ dataContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], toLocationCode: '', toLocationInfo: {}, businessTypeInfo: {}, diff --git a/src/pages/transfer/coms/comReceiptDetailCard.vue b/src/pages/transfer/coms/comReceiptDetailCard.vue index 3ffa47a1..60d60586 100644 --- a/src/pages/transfer/coms/comReceiptDetailCard.vue +++ b/src/pages/transfer/coms/comReceiptDetailCard.vue @@ -22,7 +22,7 @@ @confirm="confirm"> + :locationAreaTypeList="locationAreaTypeList"> @@ -34,7 +34,6 @@ import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue' import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue' - import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import { getDetailOption, @@ -47,24 +46,23 @@ recommend, recommendQtyEdit, detailInfoPopup, - winScanLocation }, props: { dataContent: { type: Object, - default: {} + default: null }, settingParam: { type: Object, - default: {} + default:null }, isShowLocation: { type: Boolean, default: false }, - locationTypeList: { + locationAreaTypeList: { type: Object, - default: {} + default: null }, }, watch: { diff --git a/src/pages/transfer/coms/comTransferRecord.vue b/src/pages/transfer/coms/comTransferRecord.vue index cf58ebca..f190e416 100644 --- a/src/pages/transfer/coms/comTransferRecord.vue +++ b/src/pages/transfer/coms/comTransferRecord.vue @@ -22,7 +22,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList"> @@ -35,7 +35,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -96,11 +96,10 @@ id: '', subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -121,8 +120,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/transfer/job/issueDetail.vue b/src/pages/transfer/job/issueDetail.vue index 909ffdb8..d8d4f544 100644 --- a/src/pages/transfer/job/issueDetail.vue +++ b/src/pages/transfer/job/issueDetail.vue @@ -14,7 +14,7 @@ + :locationAreaTypeList='toLocationAreaTypeList'> @@ -28,7 +28,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -97,7 +97,7 @@ toLocationCode: "", businessTypeInfo: {}, managementList: [], - tolocationTypeList:[], + toLocationAreaTypeList:[], jobStatus:"", jobToLocationCode:"" }; @@ -185,7 +185,7 @@ that.detailSource = getDataSource(that.subList) that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) } else { that.showMessage('列表数据为0'); } @@ -277,8 +277,8 @@ itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty) ; - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } else { this.scanPopupGetFocus(); @@ -297,8 +297,8 @@ itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty) ; - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } } diff --git a/src/pages/transfer/job/issueJob.vue b/src/pages/transfer/job/issueJob.vue index 674c191b..cb4660b7 100644 --- a/src/pages/transfer/job/issueJob.vue +++ b/src/pages/transfer/job/issueJob.vue @@ -156,6 +156,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("调拨出库任务(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -163,7 +164,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("调拨出库任务(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/transfer/job/receiptDetail.vue b/src/pages/transfer/job/receiptDetail.vue index 87d04990..036358b1 100644 --- a/src/pages/transfer/job/receiptDetail.vue +++ b/src/pages/transfer/job/receiptDetail.vue @@ -18,7 +18,7 @@ + @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @@ -31,7 +31,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -106,7 +106,7 @@ toLocationCode: "", businessTypeInfo: {}, managementList: [], - toLocationTypeList: [], + toLocationAreaTypeList: [], jobStatus:"", jobToLocationCode:"" }; @@ -195,7 +195,7 @@ that.detailSource = getDataSource(that.subList) that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode - that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) } else { that.showMessage('列表数据为0'); } @@ -258,7 +258,7 @@ this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序 itemDetail.handleQty = Number(result.label.qty); itemDetail.toLocationCode = this.toLocationCode; - itemDetail.stdPackQty = result.package.stdPackQty + itemDetail.packQty = result.package.packQty itemDetail.labelQty = Number(result.label.qty); calcHandleQty(this.detailSource); this.continueScan() @@ -304,8 +304,8 @@ itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty); - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } else { this.scanPopupGetFocus(); @@ -326,8 +326,8 @@ itemDetail.toInventoryStatus = result.balance.inventoryStatus itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty); - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } } diff --git a/src/pages/transfer/job/receiptJob.vue b/src/pages/transfer/job/receiptJob.vue index 87c65a88..9e4d7d6f 100644 --- a/src/pages/transfer/job/receiptJob.vue +++ b/src/pages/transfer/job/receiptJob.vue @@ -155,6 +155,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("调拨入库任务(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -162,7 +163,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("调拨入库任务(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { uni.stopPullDownRefresh(); diff --git a/src/pages/transfer/job/transferDetail.vue b/src/pages/transfer/job/transferDetail.vue index 9d674530..53f29c5e 100644 --- a/src/pages/transfer/job/transferDetail.vue +++ b/src/pages/transfer/job/transferDetail.vue @@ -91,7 +91,6 @@ detailSource: [], //绑定在页面上的数据源 toLocationInfo: {}, businessTypeInfo: {}, - locationTypeList: [], managementList: [], }; @@ -208,8 +207,8 @@ let item = { itemCode: res.itemCode, itemName: res.itemName, - stdPackQty: res.stdPackQty, - stdPackUnit: res.stdPackUnit, + packQty: res.packQty, + packUnit: res.packUnit, qty: res.qty, handleQty: 0, uom: res.uom, diff --git a/src/pages/transfer/record/deliverRecord.vue b/src/pages/transfer/record/deliverRecord.vue index a99a719c..4248dbbc 100644 --- a/src/pages/transfer/record/deliverRecord.vue +++ b/src/pages/transfer/record/deliverRecord.vue @@ -22,7 +22,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList"> @@ -35,7 +35,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -89,11 +89,10 @@ id: '', subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -108,8 +107,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/transfer/record/receiptRecord.vue b/src/pages/transfer/record/receiptRecord.vue index 51c6e5a1..d3af90da 100644 --- a/src/pages/transfer/record/receiptRecord.vue +++ b/src/pages/transfer/record/receiptRecord.vue @@ -23,7 +23,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList"> @@ -83,10 +83,8 @@ id: '', subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -102,8 +100,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.openScanPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/unPlanned/coms/comReceiptDetailCard.vue b/src/pages/unPlanned/coms/comReceiptDetailCard.vue index 6c50a268..59820522 100644 --- a/src/pages/unPlanned/coms/comReceiptDetailCard.vue +++ b/src/pages/unPlanned/coms/comReceiptDetailCard.vue @@ -22,7 +22,7 @@ + :locationAreaTypeList="locationAreaTypeList"> @@ -62,9 +62,9 @@ type: Boolean, default: false }, - locationTypeList: { + locationAreaTypeList: { type: Object, - default: {} + default: null }, }, watch: { diff --git a/src/pages/unPlanned/coms/comReceiptRequestPopup.vue b/src/pages/unPlanned/coms/comReceiptRequestPopup.vue index 583541fa..b2c04afd 100644 --- a/src/pages/unPlanned/coms/comReceiptRequestPopup.vue +++ b/src/pages/unPlanned/coms/comReceiptRequestPopup.vue @@ -53,7 +53,7 @@ - () + () @@ -85,7 +85,7 @@ checkDirectoryItemExist } from '@/common/directory.js'; import uom from '@/mycomponents/qty/uom.vue' - import stdPackQty from '@/mycomponents/qty/stdPackQty.vue' + import packQty from '@/mycomponents/qty/packQty.vue' import balanceStatus from '@/mycomponents/status/balanceStatus.vue' import winScanItem from '@/mycomponents/scan/winScanItem.vue' import winScanLocation from '@/mycomponents/scan/winScanLocation.vue' @@ -93,7 +93,7 @@ export default { components: { uom, - stdPackQty, + packQty, balanceStatus, winScanItem, winScanLocation diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue index c5ef37ff..8655c4d8 100644 --- a/src/pages/unPlanned/job/issueJob.vue +++ b/src/pages/unPlanned/job/issueJob.vue @@ -158,6 +158,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("计划外出库(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -165,7 +166,6 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("计划外出库(" + this.totalCount + ")"); }).catch(error => { if (type === "refresh") { diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue index 44832a2c..dfcb508d 100644 --- a/src/pages/unPlanned/job/issueJobDetail.vue +++ b/src/pages/unPlanned/job/issueJobDetail.vue @@ -241,8 +241,8 @@ itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty); - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } else { this.scanPopupGetFocus(); @@ -262,8 +262,8 @@ itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty); - itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) - itemDetail.balance.stdPackUnit = result.package.stdPackUnit + itemDetail.balance.packQty = Number(result.package.packQty) + itemDetail.balance.packUnit = result.package.packUnit this.calcHandleQty(); } } diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue index 9a9b713d..dafe8b88 100644 --- a/src/pages/unPlanned/job/receiptJob.vue +++ b/src/pages/unPlanned/job/receiptJob.vue @@ -145,6 +145,7 @@ } var list = res.data.list; this.totalCount = res.data.total + updateTitle("计划外入库(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -152,7 +153,7 @@ } this.jobList = type === "refresh" ? list : this.jobList.concat(list); this.pageNo++; - updateTitle("计划外入库(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue index dbf95fcf..e794e623 100644 --- a/src/pages/unPlanned/job/receiptJobDetail.vue +++ b/src/pages/unPlanned/job/receiptJobDetail.vue @@ -15,7 +15,7 @@ + @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @@ -29,7 +29,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -90,7 +90,7 @@ jobContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - toLocationTypeList: [], + toLocationAreaTypeList: [], toLocationCode: '', toLocationInfo: {}, businessTypeInfo: {}, @@ -166,7 +166,7 @@ if (res.data.subList.length > 0) { that.jobContent = res.data; that.jobStatus = res.data.status - that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes); + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes); that.subList = res.data.subList; that.jobToLocationCode = that.subList[0].toLocationCode that.detailSource = getDataSource(that.subList) @@ -233,7 +233,7 @@ itemDetail.scaned = true; itemDetail.handleQty = Number(result.label.qty); itemDetail.toLocationCode = this.toLocationCode; - itemDetail.stdPackQty = result.package.stdPackQty + itemDetail.packQty = result.package.packQty itemDetail.labelQty = Number(result.label.qty); calcHandleQty(this.detailSource); this.continueScan() diff --git a/src/pages/unPlanned/record/issueRecord.vue b/src/pages/unPlanned/record/issueRecord.vue index 412dddbf..5b963c07 100644 --- a/src/pages/unPlanned/record/issueRecord.vue +++ b/src/pages/unPlanned/record/issueRecord.vue @@ -36,7 +36,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -69,7 +69,6 @@ import { goHome, - updateTitle, deepCopyData } from '@/common/basic.js'; @@ -86,7 +85,7 @@ data() { return { fromLocationCode: "", - fromLocationTypeArray: [], + fromLocationAreaTypeList: [], fromInventoryStatus: [], toInventoryStatus: [], businessType: {}, //业务类型 @@ -104,7 +103,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromLocationTypeArray = res.fromlocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/unPlanned/record/receiptRecord.vue b/src/pages/unPlanned/record/receiptRecord.vue index cec98b3d..cc6e8f6e 100644 --- a/src/pages/unPlanned/record/receiptRecord.vue +++ b/src/pages/unPlanned/record/receiptRecord.vue @@ -28,7 +28,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList"> @@ -48,7 +48,6 @@ import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import comReceiptRecord from '@/pages/unPlanned/coms/comReceiptRecord.vue' import comBlankView from '@/mycomponents/common/comBlankView.vue' - import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import winScanPack from "@/mycomponents/scan/winScanPack.vue" import { @@ -73,7 +72,6 @@ } from 'decimal.js'; //引入 import { goHome, - updateTitle, deepCopyData, getPackingNumberAndBatchByList } from '@/common/basic.js'; @@ -90,7 +88,6 @@ requiredLocation, comReceiptRecord, comBlankView, - winScanLocation, winScanPack, }, props: { @@ -107,7 +104,8 @@ reasonCode: "", reasonList: [], dataContent: {}, - managementList: [] + managementList: [], + toLocationAreaTypeList:[] } }, @@ -116,8 +114,7 @@ getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.openScanPopup(); } else { this.showErrorMessage(res.message) @@ -173,8 +170,8 @@ let item = { itemCode: pack.itemCode, itemName: pack.itemName, - stdPackQty: pack.stdPackQty, - stdPackUnit: pack.stdPackUnit, + packQty: pack.packQty, + packUnit: pack.packUnit, qty: new Decimal(label.qty).toNumber(), handleQty: new Decimal(0).toNumber(), uom: label.uom, @@ -190,8 +187,8 @@ detail.qty = new Decimal(label.qty).toNumber(); detail.handleQty = new Decimal(label.qty).toNumber(); detail.inventoryStatus = "OK" - detail.stdPackQty = pack.stdPackQty; - detail.stdPackUnit = pack.stdPackUnit; + detail.packQty = pack.packQty; + detail.packUnit = pack.packUnit; label.inventoryStatus = "OK"; detail.package = pack; detail.label = label; diff --git a/src/pages/unPlanned/request/issueRequest.vue b/src/pages/unPlanned/request/issueRequest.vue index 03357c79..4e04af98 100644 --- a/src/pages/unPlanned/request/issueRequest.vue +++ b/src/pages/unPlanned/request/issueRequest.vue @@ -159,6 +159,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("计划外出库申请(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -171,7 +172,7 @@ this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle("计划外出库申请(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/unPlanned/request/issueRequestCreate.vue b/src/pages/unPlanned/request/issueRequestCreate.vue index e95c04d0..b85ed4f2 100644 --- a/src/pages/unPlanned/request/issueRequestCreate.vue +++ b/src/pages/unPlanned/request/issueRequestCreate.vue @@ -42,7 +42,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -75,7 +75,6 @@ import { goHome, - updateTitle, deepCopyData, getCurrDateTimes, getCurrDateOneMonthsTimes, @@ -96,7 +95,7 @@ return { fromLocationCode: "", fromLocationInfo: {}, - fromLocationTypeArray: [], + fromLocationAreaTypeList: [], fromInventoryStatus: [], toInventoryStatus: [], businessType: {}, //业务类型 @@ -118,7 +117,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromLocationTypeArray = res.fromlocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/unPlanned/request/receiptRequest.vue b/src/pages/unPlanned/request/receiptRequest.vue index 5cdfb5ff..27f73e0e 100644 --- a/src/pages/unPlanned/request/receiptRequest.vue +++ b/src/pages/unPlanned/request/receiptRequest.vue @@ -157,6 +157,7 @@ var list = res.data.list; this.totalCount = res.data.total + updateTitle("计划外入库申请(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -168,7 +169,7 @@ }) this.requestList = type === "refresh" ? list : this.requestList.concat(list); this.pageNo++; - updateTitle("计划外入库申请(" + this.totalCount + ")"); + }).catch(error => { if (type === "refresh") { diff --git a/src/pages/unPlanned/request/receiptRequestCreate.vue b/src/pages/unPlanned/request/receiptRequestCreate.vue index 5fbcc64a..0a3aaba4 100644 --- a/src/pages/unPlanned/request/receiptRequestCreate.vue +++ b/src/pages/unPlanned/request/receiptRequestCreate.vue @@ -56,7 +56,6 @@ import { goHome, - updateTitle, getRemoveOption, getISODateTime, navigateBack, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ea66dfdf..dab7585d 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,6 +5,7 @@ import { getPermissionInfo, getTenantInfo } from '@/api/request2' +// import picUrl from "../../static/images/profile.jpg"; const user = { @@ -81,8 +82,9 @@ const user = { getPermissionInfo().then(res => { res = res.data; // 读取 data 数据 const user = res.user - const avatar = (user == null || user.avatar === "" || user.avatar == null) ? - require("@/static/images/profile.jpg") : user.avatar + const avatar="" + // const avatar = (user == null || user.avatar == "" || user.avatar == null||user.avatar == undefined) ? + // picUrl: user.avatar const nickname = (user == null || user.nickname === "" || user.nickname == null) ? "" : user.nickname if (res.roles && res.roles.length > 0) { diff --git a/src/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/src/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue index 6f8393a8..8d255fbb 100644 --- a/src/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue +++ b/src/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue @@ -1,14 +1,12 @@ @@ -28,9 +26,7 @@ * @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象 * @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象 */ - import { - Decimal - } from 'decimal.js'; //引入 + export default { name: "UniNumberBox", emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'], @@ -66,63 +62,30 @@ disabled: { type: Boolean, default: false - }, - focus: { - type: Boolean, - default: true } }, data() { return { - inputValue: 0, - maxlength: 10 + inputValue: 0 }; }, watch: { value(val) { - this.inputValue = this.add(this.inputValue, val) + this.inputValue = +val; }, modelValue(val) { - this.inputValue = this.add(this.inputValue, val) + this.inputValue = +val; } }, created() { if (this.value === 1) { - this.inputValue = this.add(this.inputValue, this.modelValue) + this.inputValue = +this.modelValue; } if (this.modelValue === 1) { - this.inputValue = this.add(this.inputValue, this.value) + this.inputValue = +this.value; } }, methods: { - add(num1, num2) { - return new Decimal(num1).add(new Decimal(num2)) - }, - - sub(num1, num2) { - return new Decimal(num1).sub(new Decimal(num2)) - }, - - mul(num1,num2) { - return new Decimal(num1).mul(new Decimal(num2)) - }, - div(num1,num2) { - return new Decimal(num1).div(new Decimal(num2)) - }, - checkNum(e) { - let value = e.detail.value; - let dot = value.indexOf('.'); //鍖呭惈灏忔暟鐐 - let reg = /^[0-9]+$/; //姝ｆ暣鏁 - if (dot > -1) { - this.maxlength = dot + 7; //闀垮害鏄¯灏忔暟鐐瑰悗涓や綅 - if (value.length > dot + 7) { - - } - } - if (reg.test(value)) { //濡傛灉鏄¯姝ｆ暣鏁颁笉鍖呭惈灏忔暟鐐 - this.maxlength = 10; - } - }, _calcValue(type) { if (this.disabled) { return; @@ -131,7 +94,7 @@ let value = this.inputValue * scale; let step = this.step * scale; if (type === "minus") { - value = this.sub(value - step) + value -= step; if (value < (this.min * scale)) { return; } @@ -141,54 +104,53 @@ } if (type === "plus") { - value = this.add(value, step) - - if (value > (this.max * scale)) { - return; - } - if (value < (this.min * scale)) { - value = this.min * scale + value += step; + if (value > (this.max * scale)) { + return; + } + if (value < (this.min * scale)) { + value = this.min * scale + } } - } - this.inputValue = (value / scale).toFixed(String(scale).length - 1); - this.$emit("change", +this.inputValue); - // TODO vue2 兼容 - this.$emit("input", +this.inputValue); - // TODO vue3 兼容 - this.$emit("update:modelValue", +this.inputValue); - }, - _getDecimalScale() { + this.inputValue = (value / scale).toFixed(String(scale).length - 1); + this.$emit("change", +this.inputValue); + // TODO vue2 兼容 + this.$emit("input", +this.inputValue); + // TODO vue3 兼容 + this.$emit("update:modelValue", +this.inputValue); + }, + _getDecimalScale() { - let scale = 1; - // 浮点型 - if (~~this.step !== this.step) { - scale = Math.pow(10, String(this.step).split(".")[1].length); - } - return scale; - }, - _onBlur(event) { - this.$emit('blur', event) - let value = event.detail.value; - if (!value) { - // this.inputValue = 0; - return; - } - value = +value; - if (value > this.max) { - value = this.max; - } else if (value < this.min) { - value = this.min; + let scale = 1; + // 浮点型 + if (~~this.step !== this.step) { + scale = Math.pow(10, String(this.step).split(".")[1].length); + } + return scale; + }, + _onBlur(event) { + this.$emit('blur', event) + let value = event.detail.value; + if (!value) { + // this.inputValue = 0; + return; + } + value = +value; + if (value > this.max) { + value = this.max; + } else if (value < this.min) { + value = this.min; + } + const scale = this._getDecimalScale(); + this.inputValue = value.toFixed(String(scale).length - 1); + this.$emit("change", +this.inputValue); + this.$emit("input", +this.inputValue); + }, + _onFocus(event) { + this.$emit('focus', event) } - const scale = this._getDecimalScale(); - this.inputValue = value.toFixed(String(scale).length - 1); - this.$emit("change", +this.inputValue); - this.$emit("input", +this.inputValue); - }, - _onFocus(event) { - this.$emit('focus', event) } - } };