diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css index 22eed396..6d3bf4ca 100644 --- a/src/common/style/new_style.css +++ b/src/common/style/new_style.css @@ -62,6 +62,10 @@ uni-page-head .uni-page-head__title { font-size: 1.125rem; } +.font_default { + font-size: 1rem; +} + .margin_top { margin-top: 20rpx; } @@ -2748,3 +2752,9 @@ button[disabled] { padding: 10rpx 20rpx 10rpx 20rpx; border-radius: 10rpx; } + +.split_line { + background-color: #e0e0e0; + height: 1px; + margin: 10rpx; +} \ No newline at end of file diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue index 1ff47dd8..bce3ab2e 100644 --- a/src/mycomponents/item/itemCompareQty.vue +++ b/src/mycomponents/item/itemCompareQty.vue @@ -5,10 +5,10 @@ - + :isShowPackUnit ="isShowPackUnit"> + @@ -45,7 +45,7 @@ type: Number, default: 0 }, - isShowStdPack:{ + isShowPackUnit:{ type: Boolean, default: true } diff --git a/src/mycomponents/qty/compareQty.vue b/src/mycomponents/qty/compareQty.vue index f0515364..aa19d8af 100644 --- a/src/mycomponents/qty/compareQty.vue +++ b/src/mycomponents/qty/compareQty.vue @@ -28,13 +28,13 @@ - + - + @@ -83,7 +83,7 @@ type: Boolean, default: true }, - isShowStdPack: { + isShowPackUnit: { type: Boolean, default: true }, diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue index da34e490..80ea9853 100644 --- a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue +++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue @@ -3,9 +3,9 @@ - + - diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index c938646e..90b1257f 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -4,19 +4,21 @@ - - + + + 整单收货 - - + + - + @@ -33,8 +35,9 @@ - + @@ -46,7 +49,6 @@ - @@ -88,7 +90,7 @@ import locationCompare from '@/mycomponents/location/locationCompare.vue' import comReceiptDetailCard from '@/pages/purchaseReceipt/coms/comReceiptDetailCard.vue' import jobTopAsn from '@/mycomponents/job/jobTopAsn.vue' - + export default { name: 'receipt_detail', @@ -114,7 +116,7 @@ businessTypeInfo: {}, managementList: [], jobStatus: "", - isAllReceived:false + isAllReceived: false }; }, onLoad(option) { @@ -200,7 +202,7 @@ that.jobStatus = res.data.status that.jobToLocationCode = that.subList[0].toLocationCode that.detailSource = getDataSource(that.subList) - console.log(JSON.stringify(this.detailSource)) + console.log(JSON.stringify(this.detailSource)) } else { that.showMessage('列表数据为0'); } @@ -250,7 +252,7 @@ this.showMessage("物料号【" + itemCode + "】不在列表中") } else { var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == - batch); + batch); if (itemDetail == undefined) { this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中") } else { @@ -291,16 +293,16 @@ }, scanLocationCode(location, code) { - if(this.jobContent.allowModifyLocation == 'TRUE'){ + if (this.jobContent.allowModifyLocation == 'TRUE') { this.toLocationCode = code; - }else { - if(code==this.jobToLocationCode){ - this.toLocationCode =code; - }else { - this.showErrorMessage("任务设置中不允许修改库位,扫描的库位【"+code+"】与推荐的库位【"+this.jobToLocationCode+"】不一致") + } else { + if (code == this.jobToLocationCode) { + this.toLocationCode = code; + } else { + this.showErrorMessage("任务设置中不允许修改库位,扫描的库位【" + code + "】与推荐的库位【" + this.jobToLocationCode + "】不一致") } } - + // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { // this.toLocationCode = code // this.detailSource.forEach(item => { @@ -434,23 +436,22 @@ // } return isPass; }, - - switchChange(isOn){ - this.isAllReceived =isOn - if(this.isAllReceived){ + + switchChange(isOn) { + this.isAllReceived = isOn + if (this.isAllReceived) { this.detailSource.forEach(item => { item.subList.forEach(detail => { - detail.scaned =true + detail.scaned = true detail.handleQty = detail.qty; detail.toLocationCode = this.toLocationCode; detail.labelQty = detail.qty; - + }) }) console.log(JSON.stringify(this.detailSource)) calcHandleQty(this.detailSource); - this.continueScan() - }else { + } else { this.getDetail() } }, @@ -543,4 +544,4 @@ background: #e0e0e0; } - + \ No newline at end of file