Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并冲突

Browse Source
master
guoshuang 3 years ago
parent ed7abdb01e
commit 68c857a073
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File

3
src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
Unescape Escape View File

@ -131,7 +131,6 @@ export default class dnReceiptDom extends BasePage {
poNo: any = null; poNo: any = null;
// 需求数量 // 需求数量
requestAmount: number = null; requestAmount: number = null;
<<<<<<< HEAD
//receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0]; //receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0];
async onReady() { async onReady() {
this.model.DNReceivingList = []; this.model.DNReceivingList = [];
@ -141,8 +140,6 @@ export default class dnReceiptDom extends BasePage {
input() { input() {
this.receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0]; this.receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0];
} }
=======
>>>>>>> e06fba98009bdb7923f4a67091d1f3e4224bdb07
// 页面初始化 // 页面初始化
// 页面需要清空仓库，因此需要复用该方法 // 页面需要清空仓库，因此需要复用该方法
async initLocation(condition): Promise<LocationDetail[]> { async initLocation(condition): Promise<LocationDetail[]> {

Write Preview
Loading…
Cancel
Save