From c596f28377050fefce42433c3bcbb7d676e49713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= <guofei2922@boe.com.cn>
Date: Wed, 23 Apr 2025 16:28:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/down-select/down-select.vue        |  2 +-
 .../features/ProduceReturnPage/index.vue      | 35 ++++++++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/components/down-select/down-select.vue b/components/down-select/down-select.vue
index 0263bb3..94fa14d 100644
--- a/components/down-select/down-select.vue
+++ b/components/down-select/down-select.vue
@@ -1,6 +1,6 @@
 <template>
   <view class='layout-column'>
-    <view id="parent" style="width:fit-content;">
+    <view id="parent" class="parent-view" style="width:fit-content;">
       <slot></slot>
     </view>
     <view
diff --git a/pages/material/features/ProduceReturnPage/index.vue b/pages/material/features/ProduceReturnPage/index.vue
index 2a97a92..2686716 100644
--- a/pages/material/features/ProduceReturnPage/index.vue
+++ b/pages/material/features/ProduceReturnPage/index.vue
@@ -2,23 +2,25 @@
 	<view style="margin: 10rpx;">
 		<u-navbar back-text="返回" title="退库入库" :background="background"></u-navbar>
 		<u-form ref="testForm">
-	<!-- 		<u-row align="left" style="margin-left: 54rpx;margin-top: 20rpx">
+			<!-- <u-row align="left" style="margin-left: 54rpx;margin-top: 20rpx">
 				<u-col style="display: contents;"><label>组织:</label> </u-col>
 				<u-col span="10"><label>{{ERPFACTORYNAME}} {{ERPFACTORY}}</label> </u-col>
 				
 			</u-row> -->
-			<!-- <u-form-item :border-bottom="false">
+			<u-form-item :border-bottom="false">
 				<label>选择仓库:</label>&nbsp;&nbsp;&nbsp;&nbsp;
 				<zxzUniDataSelect filterable v-model="ERPLOCATION" :localdata="items" @change="change">
 				</zxzUniDataSelect>
-			</u-form-item> -->
-			<u-form-item :border-bottom="false">
+			</u-form-item>
+	<!--		<u-form-item :border-bottom="false">
 				<label>选择库位：</label>
-<!--				 <zxzUniDataSelect filterable v-model="LOCATIONNAME" :localdata="items_Location"-->
-<!--					:disabled="Locatiaon_state"></zxzUniDataSelect>-->
-        <downSelect ref='selectRef' showKey="storageName" mode='single' :dataList="items_Location" @resultBack="resultBack">
-          <u-input :border="true" v-model="LOCATIONNAME" placeholder="请输入" @input="handleInput"/>
-        </downSelect>
+				 <zxzUniDataSelect filterable v-model="LOCATIONNAME" :localdata="items_Location"-->
+					<!-- :disabled="Locatiaon_state"></zxzUniDataSelect> -->
+			<u-form-item :border-bottom="false">
+			<label>选择库位:   </label>
+			<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>
 			</u-form-item>
 			<!-- <br /> -->
 			<!-- <u-row align="left">
@@ -391,7 +393,7 @@
 			})
 			this.orgObject = JSON.parse(uni.getStorageSync('orgObject'))
 
-			// this.getERPLocation();
+			this.getERPLocation();
 			this.getTimeData();
 			// let Things = 20
 			// for (var i = 0; i < Things; i++) {
@@ -587,11 +589,11 @@
 				var materialSpecName = barCodeArr[0];
 
 				this.$MyRequest('/ProduceReturn/getBarCode', {
-					MATERIALPACKINGNAME: this.MATERIALPACKINGNAME/* ,
+					MATERIALPACKINGNAME: this.MATERIALPACKINGNAME,
 					ERPLOCATION: this.ERPLOCATION,
 					ERPFACTORY: this.ERPFACTORY,
 					LOCATIONNAME: this.LOCATIONNAME,
-					materialSpecName: materialSpecName */
+					materialSpecName: materialSpecName
 				}).then(res => {
 					if (res.data.success) {
 						var _Arr = res.data.resultObj;
@@ -839,8 +841,15 @@
 		}
 	}
 </script>
-
 <style lang="scss">
+	.downSelect-col {
+		width: 83.5%;
+		::v-deep .parent-view {
+			width: 100% !important
+		}
+	}
+	
+
 	switch {
 		color: #FFCC33;
 	}