~jhz/STUWMS.git

			@@ -142,6 +142,9 @@
			<view class="righton">
			<input name="HBillNo" disabled v-model="hform.HBillNo" />
			</view>
			<view class="icon-wrapper">
			<uni-icons type="scan" size="20" @click="qrCodeDisplay"></uni-icons>
			</view>
			</view>
			<view class="form-item">
			<view class="title">单据ID:</view>
			@@ -357,6 +360,7 @@
			</view>
			<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
			<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
			</view>
			</template>
			<script>
			@@ -372,6 +376,7 @@
			import {
			getUserStockRelation
			} from '../../utils/userRelationManager';
			import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
			export default {
			data() {
			return {
			@@ -496,7 +501,8 @@
			}
			},
			components: {
			BillListPopupVue
			BillListPopupVue,
			BarCodePopupVue
			},
			async onLoad(e) {
			await this.getOrganization()
			@@ -544,6 +550,18 @@
			}
			},
			methods: {
			async qrCodeDisplay() {
			try {
			this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
			await this.$nextTick()
			this.$refs.barcodePopup.open()
			} catch (err) {
			uni.showToast({
			icon: 'none',
			title: err
			})
			}
			},
			async getRelationStore() {
			let {
			data,
			@@ -848,7 +866,9 @@
			});
			},
			//基础仓库资料
			getHBaseList({sWhere=''} = {}) {
			getHBaseList({
			sWhere = ''
			} = {}) {
			uni.request({
			url: this.serverUrl + '/Gy_Warehouse/list',
			data: {
			@@ -1748,7 +1768,8 @@
			this.hform.HMainSourceBillType = data.HSourceBillType
			this.hform.HSourceBillNo = data.HSourceBillNo

			let index = this.arrayHMainSourceBillValue.findIndex(e => e == data.HSourceBillType)
			let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
			.HSourceBillType)
			if (index != -1) {
			this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
			this.hform.HMainSourceBillType = data.HSourceBillType
			@@ -1800,7 +1821,8 @@
			this.hform.HSupName = data.HCusName
			this.hform.HStockStyle = data.HStockStyle

			let HStockInOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.HStockInOrgID)
			let HStockInOrgIndex = this.arrayHOrgValue.findIndex(e => e == data
			.HStockInOrgID)
			let HStockOutOrgIndex = this.arrayHOrgValue.findIndex(e => e == data
			.HStockOutOrgID)
			this.hform.HStockInOrgID = data.HStockInOrgID
			@@ -1909,9 +1931,9 @@
			})
			} else if (res.cancel) {
			console.log('用户点击取消');
			setTimeout(() => {
			uni.navigateBack();
			}, 500)
			// setTimeout(() => {
			// uni.navigateBack();
			// }, 500)
			}
			}
			});
			@@ -2004,6 +2026,7 @@

			.title {
			width: 208rpx;
			flex-shrink: 0;

			text {
			color: red;
			@@ -2018,6 +2041,7 @@
			border: 1px solid #acacac;
			position: relative;
			display: flex;


			picker {
			width: 100%;
			@@ -2055,6 +2079,7 @@
			display: flex;
			justify-content: center;
			align-items: center;
			flex-shrink: 0;

			.uni-icons {
			color: #fff !important;