From 8730a4fcdf4cc4c23927f02b8ce5b5355c6800d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= <guofei2922@boe.com.cn>
Date: Thu, 24 Apr 2025 13:35:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/material/features/ProduceReturnPage/index.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pages/material/features/ProduceReturnPage/index.vue b/pages/material/features/ProduceReturnPage/index.vue
index 4eb6d15..234cab1 100644
--- a/pages/material/features/ProduceReturnPage/index.vue
+++ b/pages/material/features/ProduceReturnPage/index.vue
@@ -11,8 +11,6 @@
 				<label>选择仓库:</label>&nbsp;&nbsp;&nbsp;&nbsp;
 				<zxzUniDataSelect filterable v-model="ERPLOCATION" :localdata="items" @change="change">
 				</zxzUniDataSelect>
-<<<<<<< HEAD
-=======
 			</u-form-item>
 	<!--		<u-form-item :border-bottom="false">
 				<label>选择库位：</label>
@@ -23,7 +21,6 @@
 			<downSelect class="downSelect-col" ref='selectRef' showKey="storageName" mode='single' :dataList="items_Location" @resultBack="resultBack">
 			  <u-input :border="true" v-model="LOCATIONNAME" placeholder="请输入" @input="handleInput"/>
 			</downSelect>
->>>>>>> c596f28377050fefce42433c3bcbb7d676e49713
 			</u-form-item>
 			
 			<!-- <u-form-item :border-bottom="false">
@@ -33,12 +30,6 @@
 				</downSelect>
 			</u-form-item> -->
 			
-			<u-form-item :border-bottom="false">
-				<label>选择库位:</label>&nbsp;&nbsp;&nbsp;&nbsp;
-				<zxzUniDataSelect filterable v-model="LOCATIONNAME" :localdata="items_Location"
-				@inputChange="getitems_LocationAll"></zxzUniDataSelect>
-			</u-form-item>
-			
 			<!-- <br /> -->
 			<!-- <u-row align="left">
 				<u-col span="2"><label>组织：</label> </u-col>