From d739200a9fd6b80db9d4300a5744dc7afdd36da1 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 21 Oct 2025 14:36:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/zw/confirm-quhuo.vue      |  2 +-
 pages/zw/ll-instore.vue         |  6 ++++++
 pages/zw/manual-returnmater.vue | 18 +++++++++++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pages/zw/confirm-quhuo.vue b/pages/zw/confirm-quhuo.vue
index 7221926..27bc890 100644
--- a/pages/zw/confirm-quhuo.vue
+++ b/pages/zw/confirm-quhuo.vue
@@ -53,7 +53,7 @@
 				title: '',
 				val1: '',
 				val2: '',
-				options: [{text:'空点位', value:'1'}, {text:'空托盘', value: '2'}, {text:'托盘绑定', value: '3'}],
+				options: [{text:'空位', value:'1'}, {text:'空载具', value: '2'}, {text:'托盘绑定', value: '3'}],
 				index: '',
 				disabled: false
 			};
diff --git a/pages/zw/ll-instore.vue b/pages/zw/ll-instore.vue
index a105c56..b47f8cb 100644
--- a/pages/zw/ll-instore.vue
+++ b/pages/zw/ll-instore.vue
@@ -140,6 +140,11 @@
 			this.title = options.title
 			this.id = options.id
 		},
+		onShow() {
+			if (this.$store.getters.dataList !== []) {
+				this.dataList = this.$store.getters.publicArr
+			}
+		},
 		created () {
 		},
 		methods: {
@@ -155,6 +160,7 @@
 				this.dataList.map(el => {
 					this.$set(el, 'checked', false)
 				})
+				this.$store.dispatch('setPublicArr', this.dataList)
 			},
 			// async _getPlate () {
 			// 	try {
diff --git a/pages/zw/manual-returnmater.vue b/pages/zw/manual-returnmater.vue
index b97ba03..4fb1288 100644
--- a/pages/zw/manual-returnmater.vue
+++ b/pages/zw/manual-returnmater.vue
@@ -81,6 +81,14 @@
 					</view>
 				</view> -->
 				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">供应商</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<uni-data-select v-model="index5" :localdata="options5" @change="selectChange5"></uni-data-select>
+					</view>
+				</view>
+				<!-- <view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label filter_input_disabled">供应商编码</span>
 					</view>
@@ -95,7 +103,7 @@
 					<view class="zd-col-17">
 						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.supp_name" disabled>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			</view>
 		</view>
@@ -111,7 +119,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import NumberInput from '@/components/NumberInput.vue'
-	import {suppList, getMaterialSuppByVehicleCode, checkoutbillBackMaterial} from '@/utils/getData4.js'
+	import {supplierdroplist, getMaterialSuppByVehicleCode, checkoutbillBackMaterial} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -138,12 +146,12 @@
 		onShow() {
 		},
 		created () {
-			this._suppList()
+			this._supplierdroplist()
 		},
 		methods: {
-			async _suppList () {
+			async _supplierdroplist () {
 				try {
-					let res = await suppList()
+					let res = await supplierdroplist()
 					if (res) {
 						this.options5 = res.data
 					} else {