~jhz/STUWMS.git

			@@ -20,19 +20,19 @@
			<view class="form-item">
			<view class="title">仓库:</view>
			<view class="right">
			<uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
			<uni-combox :candidates="arrayHWHName" placeholder="请选择仓库" v-model="hform.HWHName"
			@input="HWHNameChange"></uni-combox>
			</view>
			</view>
			<view class="form-item">
			<view class="title">仓位:</view>
			<view class="right" v-show="showHStockPlaceName">
			<uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
			v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
			<view class="right" v-show="true">
			<uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="请输入(或扫描)仓位"
			v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
			@confirm="HStockPlaceNameScan"></uni-combox>
			</view>
			<view class="righton" v-show="!showHStockPlaceName">
			<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="不可操作" />
			</view>
			<view class="righton" v-show="false"><input v-model="hform.HStockPlaceName" placeholder="不可操作"
			:disabled="!showHStockPlaceName" /></view>
			</view>


			@@ -252,6 +252,16 @@
			}
			}
			},
			computed: {
			arrayHStockPlaceNameComputed: {
			get() {
			// 动态计算对应仓库的仓位
			return this.HStockPlaceNameList
			.filter(e => e['所属仓库'] == this.hform.HWHName)
			.map(e => e['仓位名称'])
			}
			}
			},
			onLoad(e) {
			console.log(e, this.userInfo)
			this.OperationType = e.OperationType
			@@ -264,6 +274,73 @@
			this.getHBaseList()
			},
			methods: {
			// 获取仓位
			async getStockPlaceRemote(HSPGroupID) {
			try {
			let res = await CommonUtils.doRequest2Async({
			url: '/Gy_StockPlace/list',
			data: {
			sWhere: ` and HSPGroupID = ${HSPGroupID}`,
			user: uni.getStorageSync('HUserName'),
			Organization: uni.getStorageSync('Organization')
			},
			})

			if (res.data.count == 1) {
			this.HStockPlaceNameList = res.data.data
			for (var i = 0; i < res.data.data.length; i++) {
			this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
			}
			} else {
			uni.showToast({
			title: '仓位数据请求失败',
			icon: 'none'
			})
			}

			} catch (err) {
			uni.showToast({
			title: '仓位数据请求失败',
			icon: 'none'
			})
			}
			},
			async HStockPlaceNameScan(e) {
			// 扫描仓位码
			console.log('Code: ', e);
			// 不先置空的话，数据再次扫描相同的仓位码不会触发组件内的刷新
			this.hform.HStockPlaceID = 0
			this.hform.HStockPlaceName = ''
			try {
			let res = await CommonUtils.doRequest2Async({
			url: '/Gy_StockPlace/list',
			data: {
			sWhere: ` and 条码编号 = '${e}'`,
			user: uni.getStorageSync('HUserName'),
			Organization: uni.getStorageSync('Organization')
			},
			})

			if (res.data.count == 1) {

			this.hform.HStockPlaceID = res.data.data[0].HMainID
			this.hform.HStockPlaceName = res.data.data[0].仓位名称
			this.hform.HWHID = res.data.data[0].HWHID
			this.hform.HWHName = res.data.data[0].所属仓库
			} else {
			uni.showToast({
			title: '仓位数据请求失败',
			icon: 'none'
			})
			}

			} catch (err) {
			uni.showToast({
			title: '仓位数据请求失败',
			icon: 'none'
			})
			}
			},
			async refreshHBarCodeFocus() {
			this.HBarCodeFocus = false
			await this.$nextTick()
			@@ -343,13 +420,12 @@
			if (this.HWHNameList[i].仓库名称 == e) {
			this.hform.HWHName = this.HWHNameList[i].仓库名称
			this.hform.HWHID = this.HWHNameList[i].HItemID

			this.HStockPlaceNameChange(null)
			this.showHStockPlaceName = false
			if (this.HWHNameList[i]['启用仓位'] == 'Y') {
			this.showHStockPlaceName = true
			} else {
			this.hform.HStockPlaceName = ''
			this.showHStockPlaceName = false
			}
			this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
			}
			}
			}
			},