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,22 +21,7 @@
 			<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>
-				<downSelect 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> -->
-			
-			<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>
@@ -533,7 +516,6 @@
           this.items_Location = []
           this.$MyRequest('/api/wareHouse/search', {
             storageName: val,
-			siteName: 'SDK',
             orgNo: this.orgObject.ERPFACTORY
           }).then(res => {
             if (res.data.resultObj) {
@@ -855,54 +837,7 @@
 				this.SPECNAME = "";
 				this.DESC_CN = "";
 				this.CHARGE = "";
-			},
-			change(e) {
-				this.ERPLOCATION = e.value;
-				this.LOCATIONNAME = ""
-				this.getLocationName();
-			},
-			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)
-						}
-						this.focusBarCode = true
-						this.focusShipRequest = false
-					}).catch(err => {
-						this.$showMessage(err)
-					});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
-			
-			},
-			getitems_LocationAll(query) {
-				console.log(query + "&&&&&&&&&&&&&&")
-				var arr = this.items_LocationAll.filter(item => {
-					return (item.text.includes(query)) || (item.value.includes(query))
-				})
-				if (arr.length > 50) {
-					this.items_Location = arr.slice(0, 50)
-				} else {
-					this.items_Location = arr
-				}
-				console.log(this.items_Location)
-			},
 		}
 	}
 </script>