diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue index dc6ff20..93ce7d4 100644 --- a/src/pages/raw/handover/feeding/Location.vue +++ b/src/pages/raw/handover/feeding/Location.vue @@ -131,6 +131,7 @@ export default class RawReceiptDetail extends BasePage { }; form2 = { operatorPass: '', // 接收人 + rfPwd:'' }; /** * 表单校验 diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue index 7be13e8..917965e 100644 --- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue +++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue @@ -44,11 +44,12 @@ {{ $t('message.DemandQuantity') }} - + {{ $t('message.Cumulative') }} - + + @@ -59,7 +60,7 @@ {{ $t('message.CommissionedThisNumber') }} - + @@ -129,15 +130,6 @@ export default class dnReceiptDom extends BasePage { poNo: any = null; // 需求数量 requestAmount: number = null; - //receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0]; - async onReady() { - // this.model.DNReceivingList = []; - this.resetForm(); - //this.initLocation(); - } - input() { - this.receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0]; - } // 页面初始化 // 页面需要清空仓库,因此需要复用该方法 async initLocation(condition): Promise { @@ -561,39 +553,39 @@ export default class dnReceiptDom extends BasePage { } } } - // .library { - // width: 100%; - // height: 100rpx; - // display: flex; - // .library-left { - // width: 50%; - // height: 100%; - // display: flex; - // view { - // width: 100rpx; - // line-height: 100rpx; - // } - // .search { - // padding-left: 30px; - // } - // } - // .library-right { - // width: 50%; - // height: 100%; - // display: flex; - // .library-right-title { - // width: 120rpx; - // height: 100%; - // line-height: 100rpx; - // } - // .input { - // width: 200rpx; - // height: 70rpx; - // margin-top: 15rpx; - // margin-left: 15rpx; - // } - // } - // } + .library { + width: 100%; + height: 100rpx; + display: flex; + .library-left { + width: 50%; + height: 100%; + display: flex; + view { + width: 100rpx; + line-height: 100rpx; + } + .search { + padding-left: 20px; + } + } + .library-right { + width: 50%; + height: 100%; + display: flex; + .library-right-title { + width: 120rpx; + height: 100%; + padding-left: 4px; + line-height: 100rpx; + } + .input { + width: 200rpx; + height: 70rpx; + margin-top: 15rpx; + } + } + } .add { width: 100%; height: 100rpx;