From 68c857a073aae04451dddb5add17b9f7f3a1d7b9 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Fri, 21 Jan 2022 09:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/ingoods/dnReceipt/dnReceiving.vue | 3 ---
 1 file changed, 3 deletions(-)

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