~jhz/STUWMS.git

			@@ -450,7 +450,7 @@
			HWHName: getUserInfo().HWHName,
			HWHID: getUserInfo().HWhID,

			HStockStyle: '',
			HStockStyle: '组织内调拨',
			HOutStockPlaceName: getUserInfo().HSPName,
			HOutStockPlaceID: getUserInfo().HSPID,
			HStockPlaceName: getUserInfo().HSPName,
			@@ -643,6 +643,10 @@
			console.log('仓位码: ', e);
			let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
			console.log('index: ', index);
			// 不先置空的话，数据再次扫描相同的仓位码不会触发组件内的刷新
			this.hform.HStockPlaceID = 0
			this.hform.HStockPlaceName = ''
			await this.$nextTick()
			if (index == -1) {
			uni.showToast({
			icon: 'none',
			@@ -670,6 +674,10 @@
			console.log('仓位码: ', e);
			let index = this.HStockPlaceInNameList.findIndex(elem => elem['条码编号'] == e)
			console.log('index: ', index);
			// 不先置空的话，数据再次扫描相同的仓位码不会触发组件内的刷新
			this.hform.HStockPlaceID = 0
			this.hform.HStockPlaceName = ''
			await this.$nextTick()
			if (index == -1) {
			uni.showToast({
			icon: 'none',
			@@ -813,7 +821,7 @@
			onHSourceBillNoConfirmHandler() {
			if (this.hform.HMainSourceBillType == -1) {
			// 手工录入不进行提交
			this.playSound(1)
			CommonUtils.playSound(1)
			return
			}

			@@ -1270,7 +1278,8 @@
			url: this.serverUrl + '/Web/GetEmployeeList_Json',
			data: {
			Employee: '',
			HGroupID: 0
			HGroupID: 0,
			HDeptID: uni.getStorageSync("HDeptID")
			},
			success: (res) => {
			if (res.data.count == 1) {
			@@ -1355,10 +1364,10 @@
			this.tabs = 2
			this.showHSupName = false
			this.barCodeFocus = true
			this.playSound(1)
			CommonUtils.playSound(1)
			this.DisBillEntryList()
			} else {
			this.playSound(0)
			CommonUtils.playSound(0)
			console.log('res: ', res);

			uni.showToast({
			@@ -1374,7 +1383,7 @@
			},
			fail: (err) => {
			console.log('err: ', err);
			this.playSound(0)
			CommonUtils.playSound(0)
			uni.showToast({
			title: '接口请求失败',
			icon: 'none'
			@@ -1411,7 +1420,7 @@
			console.log(this.hform.HSourceBillNo, HSourceFlag)
			if (HDeleteFlag == "*") {
			if (sBarCode == "") {
			this.playSound(0)
			CommonUtils.playSound(0)
			uni.showToast({
			title: '请扫描要删除的条码',
			icon: 'none'
			@@ -1433,11 +1442,11 @@
			console.log('删除条码', res.data);
			this.hform.HBarCode = ''
			if (res.data.count == 1) {
			this.playSound(1)
			CommonUtils.playSound(1)
			this.hform.HQty = ''
			this.DisBillEntryList()
			} else {
			this.playSound(0)
			CommonUtils.playSound(0)
			this.refreshBarCodeState()
			uni.showToast({
			title: res.data.Message,
			@@ -1446,7 +1455,7 @@
			}
			} catch (err) {
			this.refreshBarCodeState()
			this.playSound(0)
			CommonUtils.playSound(0)
			uni.showToast({
			title: '接口请求失败: ' + err,
			icon: 'none'
			@@ -1464,11 +1473,11 @@
			// console.log('删除条码', res.data);
			// this.hform.HBarCode = ''
			// if (res.data.count == 1) {
			// this.playSound(1)
			// CommonUtils.playSound(1)
			// this.hform.HQty = ''
			// this.DisBillEntryList()
			// } else {
			// this.playSound(0)
			// CommonUtils.playSound(0)
			//
			// uni.showToast({
			// title: res.data.Message,
			@@ -1482,7 +1491,7 @@
			// }
			// },
			// fail: (res) => {
			// this.playSound(0)
			// CommonUtils.playSound(0)
			// this.barCodeFocus = true
			// console.log(res);
			// uni.showToast({
			@@ -1536,7 +1545,7 @@
			console.log('扫码返回', res.data);
			this.hform.HBarCode = ''
			if (res.data.count == 1) {
			this.playSound(1)
			CommonUtils.playSound(1)
			var data = res.data.data
			if (data.hBarTypeField == '仓库条码') {
			this.hform.HWHName = data.hWhNameField
			@@ -1670,7 +1679,7 @@
			this.hform.HBarCode = ""
			})
			} else {
			this.playSound(0)
			CommonUtils.playSound(0)
			uni.showToast({
			title: res.data.Message,
			icon: 'none'
			@@ -1683,7 +1692,7 @@
			}

			} catch (err) {
			this.playSound(0)
			CommonUtils.playSound(0)
			this.barCodeFocus = true
			console.log(err);
			uni.showToast({
			@@ -1726,7 +1735,7 @@
			// console.log('扫码返回', res.data);
			// this.hform.HBarCode = ''
			// if (res.data.count == 1) {
			// this.playSound(1)
			// CommonUtils.playSound(1)
			// var data = res.data.data
			// if (data.hBarTypeField == '仓库条码') {
			// this.hform.HWHName = data.hWhNameField
			@@ -1862,7 +1871,7 @@
			// this.hform.HBarCode = ""
			// })
			// } else {
			// this.playSound(0)
			// CommonUtils.playSound(0)
			// uni.showToast({
			// title: res.data.Message,
			// icon: 'none'
			@@ -1875,7 +1884,7 @@
			// }
			// },
			// fail: (res) => {
			// this.playSound(0)
			// CommonUtils.playSound(0)
			// this.barCodeFocus = true
			// console.log(res);
			// uni.showToast({
			@@ -2181,7 +2190,7 @@

			try {
			let res = await CommonUtils.doRequest2Sync({
			url: '/WEBSController/set_SaveMoveStockBill_Json',
			url: '/WEBSController/set_SaveMoveStockStepInBill_Json',
			method: 'POST',
			data: {
			oMain: sMainStr