From 9d9ff9c596e7389ad88a7204c187705389c36742 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Thu, 24 Apr 2025 11:13:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20=E9=80=80=E6=96=99=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E3=80=81=E4=BA=A7=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../features/ProduceReturnPage/index.vue      | 54 ++++++++-----------
 .../features/ProductStockIn/index.vue         | 45 ++++++++--------
 2 files changed, 42 insertions(+), 57 deletions(-)

diff --git a/pages/material/features/ProduceReturnPage/index.vue b/pages/material/features/ProduceReturnPage/index.vue
index 4eb6d15..7b6eee7 100644
--- a/pages/material/features/ProduceReturnPage/index.vue
+++ b/pages/material/features/ProduceReturnPage/index.vue
@@ -11,20 +11,11 @@
 				<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>
 				 <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>
->>>>>>> c596f28377050fefce42433c3bcbb7d676e49713
-			</u-form-item>
 			
 			<!-- <u-form-item :border-bottom="false">
 				<label>选择库位：</label>
@@ -864,31 +855,28 @@
 			getLocationName() {
 				this.items_Location = []
 				this.items_Location = []
-				if (this.ERPLOCATION != '') {
-					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
-					}).then(res => {
-						if (res.data.success) {
-							for (let i = 0; i < res.data.resultObj.length; i++) {
-								var _Arr = res.data.resultObj[i];
-								this.items_Location.push({
-									text: _Arr.DESCRIPTION,
-									value: _Arr.STORAGENAME
-								});
-							}
-							console.log(this.items_Location)
-							this.getitems_LocationAll('');
-						} else {
-							this.$showMessage(res.data.message)
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
+				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
+					ERPLocation: ERPFACTORY
+				}).then(res => {
+					if (res.data.success) {
+						for (let i = 0; i < res.data.resultObj.length; i++) {
+							var _Arr = res.data.resultObj[i];
+							this.items_Location.push({
+								text: _Arr.DESCRIPTION,
+								value: _Arr.STORAGENAME
+							});
 						}
-						this.focusBarCode = true
-						this.focusShipRequest = false
-					}).catch(err => {
-						this.$showMessage(err)
-					});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
+						console.log(this.items_Location)
+						this.getitems_LocationAll('');
+					} else {
+						this.$showMessage(res.data.message)
+					}
+					this.focusBarCode = true
+					this.focusShipRequest = false
+				}).catch(err => {
+					this.$showMessage(err)
+				});
 			
 			},
 			getitems_LocationAll(query) {
diff --git a/pages/material/features/ProductStockIn/index.vue b/pages/material/features/ProductStockIn/index.vue
index c242d51..2f2529c 100644
--- a/pages/material/features/ProductStockIn/index.vue
+++ b/pages/material/features/ProductStockIn/index.vue
@@ -417,31 +417,28 @@
 			getLocationName() {
 				this.items_Location = []
 				this.items_LocationAll = []
-				if (this.ERPLOCATION != '') {
-					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
-					}).then(res => {
-						if (res.data.success) {
-							for (let i = 0; i < res.data.resultObj.length; i++) {
-								var _Arr = res.data.resultObj[i];
-								this.items_LocationAll.push({
-									text: _Arr.DESCRIPTION,
-									value: _Arr.STORAGENAME
-								});
-							}
-							console.log(this.items_LocationAll)
-							this.getitems_LocationAll('');
-						} else {
-							this.$showMessage(res.data.message)
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
+				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
+					ERPLocation: ERPFACTORY
+				}).then(res => {
+					if (res.data.success) {
+						for (let i = 0; i < res.data.resultObj.length; i++) {
+							var _Arr = res.data.resultObj[i];
+							this.items_LocationAll.push({
+								text: _Arr.DESCRIPTION,
+								value: _Arr.STORAGENAME
+							});
 						}
-						this.focusBarCode = true
-						this.focusShipRequest = false
-					}).catch(err => {
-						this.$showMessage(err)
-					});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
+						console.log(this.items_LocationAll)
+						this.getitems_LocationAll('');
+					} else {
+						this.$showMessage(res.data.message)
+					}
+					this.focusBarCode = true
+					this.focusShipRequest = false
+				}).catch(err => {
+					this.$showMessage(err)
+				});
 
 			},
 			getitems_LocationAll(query) {

From df44ebc7c92b170e033de52669548612f5faa2dc Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Thu, 24 Apr 2025 11:48:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E8=B0=83?=
 =?UTF-8?q?=E6=8B=A8=E5=85=A5=E5=BA=93=E3=80=81=E9=94=80=E5=94=AE=E9=80=80?=
 =?UTF-8?q?=E5=BA=93=E5=85=A5=E5=BA=93=E3=80=81=E5=85=B6=E5=AE=83=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E3=80=81=E9=80=80=E6=96=99=E5=85=A5=E5=BA=93=E3=80=81?=
 =?UTF-8?q?=E7=AB=8B=E5=BA=93=E5=85=A5=E5=BA=93=E3=80=81=E7=AB=8B=E5=BA=93?=
 =?UTF-8?q?=E8=BD=AC=E5=BA=93=E3=80=81=E7=9B=98=E7=82=B9=E3=80=81=E6=97=A0?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=BD=AC=E5=BA=93=E3=80=81=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?/=E8=BD=AC=E8=B4=A7=E4=BD=8D=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E4=B8=8B=E6=8B=89=E6=A1=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ErpLocationMoveNoInvoice.vue              |  3 +-
 pages/checkplan/InventPage/index.vue          |  3 +-
 .../ModifyLocationName/ModifyLocationName.vue |  3 +-
 .../material/features/OtherStockIn/index.vue  | 43 +++++++++----------
 .../features/ProductSaleReturn/index.vue      | 43 +++++++++----------
 .../features/TransferReceivePage/index.vue    | 43 +++++++++----------
 .../features/LIbraryStockInOpt/index.vue      |  3 +-
 .../features/LIbraryStockTransfer/index.vue   |  3 +-
 8 files changed, 70 insertions(+), 74 deletions(-)

diff --git a/pages/checkplan/ErpLocationMoveNoInvoice/ErpLocationMoveNoInvoice.vue b/pages/checkplan/ErpLocationMoveNoInvoice/ErpLocationMoveNoInvoice.vue
index b8b083d..79ed2f5 100644
--- a/pages/checkplan/ErpLocationMoveNoInvoice/ErpLocationMoveNoInvoice.vue
+++ b/pages/checkplan/ErpLocationMoveNoInvoice/ErpLocationMoveNoInvoice.vue
@@ -372,9 +372,10 @@
 			getLocationName() {
 				this.items_Location = []
 				this.BoxListInfo = [];
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				if (this.ERPLOCATION != '') {
 					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+						ERPLocation: ERPFACTORY
 					}).then(res => {
 						if (res.data.success) {
 							for (let i = 0; i < res.data.resultObj.length; i++) {
diff --git a/pages/checkplan/InventPage/index.vue b/pages/checkplan/InventPage/index.vue
index 3f05679..bd08e50 100644
--- a/pages/checkplan/InventPage/index.vue
+++ b/pages/checkplan/InventPage/index.vue
@@ -172,9 +172,10 @@
 			},
 			getLocationName() {
 				this.items_Location = []
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				if (this.ERPLOCATION1 != '') {
 					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION1,
+						ERPLocation: ERPFACTORY,
 					}).then(res => {
 						console.log(res.data.resultObj)
 						if (res.data.success) {
diff --git a/pages/checkplan/ModifyLocationName/ModifyLocationName.vue b/pages/checkplan/ModifyLocationName/ModifyLocationName.vue
index 66a6bc9..32e20df 100644
--- a/pages/checkplan/ModifyLocationName/ModifyLocationName.vue
+++ b/pages/checkplan/ModifyLocationName/ModifyLocationName.vue
@@ -362,9 +362,10 @@
 			},
 			getLocationName2() {
 				this.items_Location = []
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				if (this.ERPLOCATION != '') {
 					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+						ERPLocation: ERPFACTORY
 					}).then(res => {
 						if (res.data.success) {
 							for (let i = 0; i < res.data.resultObj.length; i++) {
diff --git a/pages/material/features/OtherStockIn/index.vue b/pages/material/features/OtherStockIn/index.vue
index 7a09688..2232d9b 100644
--- a/pages/material/features/OtherStockIn/index.vue
+++ b/pages/material/features/OtherStockIn/index.vue
@@ -295,30 +295,27 @@
 			},
 			getLocationName() {
 				this.items_Location = []
-				if (this.ERPLOCATION != '') {
-					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
-					}).then(res => {
-						if (res.data.success) {
-							for (let i = 0; i < res.data.resultObj.length; i++) {
-								var _Arr = res.data.resultObj[i];
-								this.items_Location.push({
-									text: _Arr.DESCRIPTION,
-									value: _Arr.STORAGENAME
-								});
-
-							}
-						} else {
-							this.$showMessage(res.data.message)
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
+				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
+					ERPLocation: ERPFACTORY
+				}).then(res => {
+					if (res.data.success) {
+						for (let i = 0; i < res.data.resultObj.length; i++) {
+							var _Arr = res.data.resultObj[i];
+							this.items_Location.push({
+								text: _Arr.DESCRIPTION,
+								value: _Arr.STORAGENAME
+							});
+				
 						}
-						this.focusBarCode = true
-						this.focusShipRequest = false
-					}).catch(err => {
-						this.$showMessage(err)
-					});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
+					} else {
+						this.$showMessage(res.data.message)
+					}
+					this.focusBarCode = true
+					this.focusShipRequest = false
+				}).catch(err => {
+					this.$showMessage(err)
+				});
 
 			},
 			selConfirm(e) {
diff --git a/pages/material/features/ProductSaleReturn/index.vue b/pages/material/features/ProductSaleReturn/index.vue
index 7dfde1f..6d4ffe2 100644
--- a/pages/material/features/ProductSaleReturn/index.vue
+++ b/pages/material/features/ProductSaleReturn/index.vue
@@ -322,30 +322,27 @@
 			},
 			getLocationName() {
 				this.items_Location = []
-				if (this.ERPLOCATION != '') {
-					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
-					}).then(res => {
-						if (res.data.success) {
-							for (let i = 0; i < res.data.resultObj.length; i++) {
-								var _Arr = res.data.resultObj[i];
-								this.items_Location.push({
-									text: _Arr.DESCRIPTION,
-									value: _Arr.STORAGENAME
-								});
-
-							}
-						} else {
-							this.$showMessage(res.data.message)
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
+				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
+					ERPLocation: ERPFACTORY
+				}).then(res => {
+					if (res.data.success) {
+						for (let i = 0; i < res.data.resultObj.length; i++) {
+							var _Arr = res.data.resultObj[i];
+							this.items_Location.push({
+								text: _Arr.DESCRIPTION,
+								value: _Arr.STORAGENAME
+							});
+				
 						}
-						this.focusBarCode = true
-						this.focusShipRequest = false
-					}).catch(err => {
-						this.$showMessage(err)
-					});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
+					} else {
+						this.$showMessage(res.data.message)
+					}
+					this.focusBarCode = true
+					this.focusShipRequest = false
+				}).catch(err => {
+					this.$showMessage(err)
+				});
 
 			},
 
diff --git a/pages/material/features/TransferReceivePage/index.vue b/pages/material/features/TransferReceivePage/index.vue
index d7a60a9..456154a 100644
--- a/pages/material/features/TransferReceivePage/index.vue
+++ b/pages/material/features/TransferReceivePage/index.vue
@@ -348,30 +348,27 @@
 			},
 			getLocationName() {
 				this.items_Location = []
-				if (this.ERPLOCATION != '') {
-					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
-					}).then(res => {
-						if (res.data.success) {
-							for (let i = 0; i < res.data.resultObj.length; i++) {
-								var _Arr = res.data.resultObj[i];
-								this.items_LocationAll.push({
-									text: _Arr.DESCRIPTION,
-									value: _Arr.STORAGENAME
-								});
-							}
-							this.getitems_LocationAll('')
-						} else {
-							this.$showMessage(res.data.message)
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
+				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
+					ERPLocation: ERPFACTORY
+				}).then(res => {
+					if (res.data.success) {
+						for (let i = 0; i < res.data.resultObj.length; i++) {
+							var _Arr = res.data.resultObj[i];
+							this.items_LocationAll.push({
+								text: _Arr.DESCRIPTION,
+								value: _Arr.STORAGENAME
+							});
 						}
-						this.focusBarCode = true
-						this.focusShipRequest = false
-					}).catch(err => {
-						this.$showMessage(err)
-					});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
+						this.getitems_LocationAll('')
+					} else {
+						this.$showMessage(res.data.message)
+					}
+					this.focusBarCode = true
+					this.focusShipRequest = false
+				}).catch(err => {
+					this.$showMessage(err)
+				});
 
 			},
 			getitems_LocationAll(query){
diff --git a/pages/product/features/LIbraryStockInOpt/index.vue b/pages/product/features/LIbraryStockInOpt/index.vue
index c3b454a..2f33383 100644
--- a/pages/product/features/LIbraryStockInOpt/index.vue
+++ b/pages/product/features/LIbraryStockInOpt/index.vue
@@ -414,9 +414,10 @@
 			},
 			getLocationName() {
 				this.items_Location = []
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				if (this.ERPLOCATION != '') {
 					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+						ERPLocation: ERPFACTORY
 					}).then(res => {
 						if (res.data.success) {
 							for (let i = 0; i < res.data.resultObj.length; i++) {
diff --git a/pages/product/features/LIbraryStockTransfer/index.vue b/pages/product/features/LIbraryStockTransfer/index.vue
index 68a5117..2cf6e8c 100644
--- a/pages/product/features/LIbraryStockTransfer/index.vue
+++ b/pages/product/features/LIbraryStockTransfer/index.vue
@@ -652,9 +652,10 @@
 			},
 			getLocationName() {
 				this.items_Location = []
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				if (this.ERPLOCATION != '') {
 					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+						ERPLocation: ERPFACTORY
 					}).then(res => {
 						if (res.data.success) {
 							for (let i = 0; i < res.data.resultObj.length; i++) {