From 1ba069485e9f8dead3bed630f0a629aeae1f292e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 12 八月 2025 10:35:06 +0800
Subject: [PATCH] 修改 源单单号下拉框为点击按钮查询 修改直接调拨单 页面样式/布局

---
 pages/zhijiediaobo/form.vue  |  119 +
 pages/index/tab2.vue         |   46 
 pages/xiaoshouchuku/form.vue | 2974 ++++++++++++++++++++++++++++--------------------------
 pages/caigouruku/form.vue    |   79 +
 utils/userRelationManager.js |    3 
 5 files changed, 1,737 insertions(+), 1,484 deletions(-)

diff --git a/pages/caigouruku/form.vue b/pages/caigouruku/form.vue
index 5957db4..88ebac6 100644
--- a/pages/caigouruku/form.vue
+++ b/pages/caigouruku/form.vue
@@ -31,7 +31,7 @@
 						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
 				</view>
 				<view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
-						placeholder="涓嶅彲鎿嶄綔" /></view>
+						placeholder="涓嶅彲鎿嶄綔" :disabled="!showHStockPlaceName" /></view>
 			</view>
 
 			<view class="tabs">
@@ -60,6 +60,20 @@
 				<view class="form-item">
 					<view class="title">婧愬崟鍗曞彿:</view>
 					<view class="right" v-show="showHSourceBillNo">
+						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
+							v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
+						<input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
+							v-model="hform.HSourceBillNo" @confirm="onSourceBillBlurHandler" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+
+					</view>
+					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+					</view>
+
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view>
+					<!-- <view class="right" v-show="showHSourceBillNo">
 						<uni-combox ref="uniComboxSourceBill" :isFocus="HSourceBillNoFocus"
 							:confirm-call="onSourceBillBlurHandler" v-if="reHSourceBillNo"
 							:candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" v-model="hform.HSourceBillNo"
@@ -67,7 +81,7 @@
 					</view>
 					<view class="righton" v-show="!showHSourceBillNo">
 						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-					</view>
+					</view> -->
 				</view>
 				<view class="form-item">
 					<view class="title">鏃ユ湡:</view>
@@ -121,12 +135,12 @@
 				</view>
 				<view class="form-item">
 					<view class="title">渚涘簲鍟�:</view>
-					<view class="right" v-show="showHSupName">
+					<!-- <view class="right" v-show="showHSupName">
 						<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName"
 							@input="HSupNameChange"></uni-combox>
-					</view>
-					<view class="righton" v-show="!showHSupName">
-						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" />
+					</view> -->
+					<view class="righton">
+						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
 					</view>
 				</view>
 				<view class="form-item">
@@ -229,6 +243,8 @@
 				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
 			</view>
 		</view>
+		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
 	</view>
 </template>
 <script>
@@ -242,6 +258,7 @@
 	import {
 		getUserStockRelation
 	} from "@/utils/userRelationManager.js"
+	import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
 	export default {
 		data() {
 			return {
@@ -254,8 +271,9 @@
 				OperationType: 1,
 				HInterID_Temp: '',
 				HPageTitle: '閲囪喘鍏ュ簱鍗�',
+				
 
-				showHStockPlaceName: true,
+				showHStockPlaceName: false,
 				showHMainSourceBillType: true,
 				showHSourceBillNo: true,
 				reHSourceBillNo: true,
@@ -328,6 +346,7 @@
 				}
 			}
 		},
+		components: {BillListPopupVue},
 		onLoad(e) {
 			console.log(e, this.userInfo)
 			this.OperationType = e.OperationType
@@ -346,6 +365,12 @@
 			this.getHDeptList()
 			this.GetSourceBillType()
 			this.getRelationStore()
+			
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+				this.getHBarCodeData(e.HBillNo)
+				this.$refs.billList.exit()
+			})
 		},
 		methods: {
 			async getRelationStore() {
@@ -568,7 +593,7 @@
 					},
 				});
 
-				this.getHYDList()
+				// this.getHYDList()
 			},
 			// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
 			async GetSourceBillType() {
@@ -656,6 +681,13 @@
 					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
 						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
 						this.hform.HWHID = this.HWHNameList[i].HItemID
+						
+						if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+							this.showHStockPlaceName = true
+						} else {
+							this.hform.HStockPlaceName = ''
+							this.showHStockPlaceName = false
+						}
 					}
 				}
 			},
@@ -685,7 +717,7 @@
 				let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
 				if (index != -1) {
 					this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
-					this.getHYDList()
+					// this.getHYDList()
 				}
 			},
 
@@ -1380,6 +1412,10 @@
 					}
 				}
 			},
+			
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
 
 			goBack() {
 				uni.showModal({
@@ -1447,6 +1483,7 @@
 		align-items: center;
 		font-size: 30rpx;
 		padding: 6rpx 0;
+		gap: 12rpx;
 
 		.title {
 			width: 208rpx;
@@ -1458,13 +1495,13 @@
 		}
 
 		.right {
-			width: 450rpx;
+			flex: 1;
 			border-radius: 22rpx;
 			border: 1px solid #acacac;
 		}
 
 		.righton {
-			width: 450rpx;
+			flex: 1;
 			border-radius: 22rpx;
 			border: 1px solid #e4e4e4;
 			background-color: #e4e4e4;
@@ -1564,4 +1601,24 @@
 			}
 		}
 	}
+	
+	.icon-wrapper {
+		background-color: #3A78FF;
+		border-radius: 100%;
+		width: 52rpx;
+		height: 52rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	
+		.uni-icons {
+			color: #fff !important;
+		}
+	}
+	
+	.icon-wrapper[disabled] {
+		background-color: rgba(228, 228, 228, 1);
+		pointer-events: none;
+		touch-action: none;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index d5f8310..5df57cf 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -194,7 +194,51 @@
 					url: '/pages/tiaomachaima/tiaomachaima',
 					id: 26,
 					hidden: false,
-				}]
+				},
+				// , {
+				// 	img: '../../static/icon/icon1.png',
+				// 	text: '璁惧妗f鏌ヨ',
+				// 	tip: '鏌ョ湅璇︽儏',
+				// 	url: '/pages/shebeidangan/table',
+				// 	id: 9,
+				// }, {
+				// 	img: '../../static/icon/icon8.png',
+				// 	text: '璁惧灞ュ巻鏌ヨ',
+				// 	tip: '鏌ョ湅璇︽儏',
+				// 	url: '/pages/shebeilvli/table',
+				// 	id: 10,
+				// }, {
+				// 	img: '../../static/icon/icon14.png',
+				// 	text: '鎴戠殑鎶ュ伐骞冲彴',
+				// 	tip: '鐐瑰嚮杩涘叆',
+				// 	url: '/pages/baogong/table',
+				// 	id: 11,
+				// }, {
+				// 	img: '../../static/icon/icon13.png',
+				// 	text: '涓婃ā鍗�',
+				// 	tip: '鏌ョ湅璇︽儏',
+				// 	url: '/pages/MJGL/shangmudan/table',
+				// 	id: 12,
+				// }, {
+				// 	img: '../../static/icon/icon13.png',
+				// 	text: '涓嬫ā鍗�',
+				// 	tip: '鏌ョ湅璇︽儏',
+				// 	url: '',
+				// 	id: 13,
+				// }, {
+				// 	img: '../../static/icon/icon32.png',
+				// 	text: '璁惧杩愯鐘舵��',
+				// 	tip: '鏌ョ湅璇︽儏',
+				// 	url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
+				// 	id: 14,
+				// }, {
+				// 	img: '../../static/icon/icon6.png',
+				// 	text: '妯″叿鐘舵�佸垎鏋�',
+				// 	tip: '鏌ョ湅璇︽儏',
+				// 	url: '/pages/mujvzhuangtai/mujvzhuangtai',
+				// 	id: 15,
+				// },
+				]
 			}
 		},
 		onLoad() {
diff --git a/pages/xiaoshouchuku/form.vue b/pages/xiaoshouchuku/form.vue
index 95a3542..627081b 100644
--- a/pages/xiaoshouchuku/form.vue
+++ b/pages/xiaoshouchuku/form.vue
@@ -1,1508 +1,1578 @@
 <template>
-    <view>
-        <view class="form">
-            <view class="form-item">
-                <view class="title">鏉$爜:</view>
-                <view class="right" style="width: 380rpx;">
-                    <input :focus="BarCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
-                        @confirm="getCode(hform.HBarCode)" />
-                </view>
-                <uni-icons type="scan"
-                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
-                    size="20" @click="toScanCode"></uni-icons>
-            </view>
-            <view class="form-item">
-                <view class="title">鏁伴噺:</view>
-                <view class="right">
-                    <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">浠撳簱:</view>
-                <view class="right">
-                    <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>
-                <view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
-                        placeholder="涓嶅彲鎿嶄綔" /></view>
-            </view>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜:</view>
+				<view class="right" style="width: 380rpx;">
+					<input :focus="BarCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+						@confirm="getCode(hform.HBarCode)" />
+				</view>
+				<uni-icons type="scan"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20" @click="toScanCode"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title">鏁伴噺:</view>
+				<view class="right">
+					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撳簱:</view>
+				<view class="right">
+					<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>
+				<view class="righton" v-show="!showHStockPlaceName">
+					<input v-model="hform.HStockPlaceName" disabled placeholder="涓嶅彲鎿嶄綔" />
+						</view>
+			</view>
 
-            <view class="tabs">
-                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
-                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
-                <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
-                <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
-                <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
-            </view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
+				<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
+				<view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
+			</view>
 
-            <view v-if="tabs == 0">
-                <view class="form-item">
-                    <view class="title">婧愬崟绫诲瀷:</view>
-                    <view class="right" v-show="showHMainSourceBillType">
-                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
-                            @change="HMainSourceBillTypeChange">
-                            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
-                                placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-                        </picker>
-                    </view>
-                    <view class="righton" v-show="!showHMainSourceBillType">
-                        <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
-                            placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">婧愬崟鍗曞彿:</view>
-                    <view class="right" v-show="showHSourceBillNo">
-                        <uni-combox v-if="reHSourceBillNo" :isFocus="HSourceBillNoFocus" ref="uniComboxSourceBill"
-                            :confirm-call="onSourceBillConfirmHandler" :candidates="arrayHSourceBillNo"
-                            placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" v-model="hform.HSourceBillNo"
-                            @input="HSourceBillNoChange"></uni-combox>
-                    </view>
-                    <view class="righton" v-show="!showHSourceBillNo">
-                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍏堣繘鍏堝嚭浠�:</view>
-                    <view class="right">
-                        <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
-                            @input="HFIFOWHNameChange"></uni-combox>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鏃ユ湡:</view>
-                    <view class="right">
-                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
-                            <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
-                        </picker>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒跺崟浜�:</view>
-                    <view class="righton">
-                        <input name="HMaker" disabled v-model="hform.HMaker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鍙�:</view>
-                    <view class="righton">
-                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁ID:</view>
-                    <view class="righton">
-                        <input name="HInterID" disabled v-model="hform.HInterID" />
-                    </view>
-                </view>
-            </view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">婧愬崟绫诲瀷:</view>
+					<view class="right" v-show="showHMainSourceBillType">
+						<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
+							@change="HMainSourceBillTypeChange">
+							<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+							<view class="picker-overlay"></view>
+						</picker>
+					</view>
+					<view class="righton" v-show="!showHMainSourceBillType">
+						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">婧愬崟鍗曞彿:</view>
+					<!-- <view class="right" v-show="showHSourceBillNo">
+						<uni-combox v-if="reHSourceBillNo" :isFocus="HSourceBillNoFocus" ref="uniComboxSourceBill"
+							:confirm-call="onSourceBillConfirmHandler" :candidates="arrayHSourceBillNo"
+							placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" v-model="hform.HSourceBillNo"
+							@input="HSourceBillNoChange"></uni-combox>
+					</view>
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view> -->
+					<view class="right" v-show="showHSourceBillNo">
+						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
+							v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
+						<input :focus="HSourceBillNoFocus" type="text" @confirm="onSourceBillConfirmHandler"
+							name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					
+					</view>
+					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+					</view>
+					
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍏堣繘鍏堝嚭浠�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
+							@input="HFIFOWHNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+						<view class="picker-overlay"></view>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
 
-            <view v-if="tabs == 1">
-                <view class="form-item">
-                    <view class="title">淇濈:</view>
-                    <view class="right">
-                        <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
-                            @input="HKeeperNameChange"></uni-combox>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">楠屾敹:</view>
-                    <view class="right">
-                        <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
-                            @input="HSecManagerNameChange"></uni-combox>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">閮ㄩ棬:</view>
-                    <view class="right">
-                        <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
-                            @input="HDeptNameChange"></uni-combox>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹㈡埛:</view>
-                    <view class="right" v-show="showHSupName">
-                        <uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName"
-                            @input="HSupNameChange"></uni-combox>
-                    </view>
-                    <view class="righton" v-show="!showHSupName">
-                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">缁勭粐:</view>
-                    <view class="righton">
-                        <input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
-                    </view>
-                </view>
-            </view>
+			<view v-if="tabs == 1">
+				<view class="form-item">
+					<view class="title">淇濈:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+							@input="HKeeperNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">楠屾敹:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+							@input="HSecManagerNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">閮ㄩ棬:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+							@input="HDeptNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹㈡埛:</view>
+					<!-- <view class="right" v-show="showHSupName">
+						<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName"
+							@input="HSupNameChange"></uni-combox>
+					</view> -->
+					<view class="righton">
+						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁勭粐:</view>
+					<view class="righton">
+						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+					</view>
+				</view>
+			</view>
 
-            <view v-if="tabs == 2">
-                <view class="list" v-for="(item,index) in Materlist" :key="index">
-                    <uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
-                        <view class="card-detail">
-                            <view class="detail">
-                                <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
-                            </view>
-                            <view class="detail">
-                                <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
-                            </view>
-                            <view class="detail">
-                                <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-                            </view>
-                            <view class="detail">
-                                <text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
-                            </view>
-                            <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
-                                <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
-                            </view>
-                            <view class="detail" v-if="item.杈呭姪灞炴��">
-                                <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
-                            </view>
-                        </view>
-                    </uni-card>
-                </view>
-                <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
-            </view>
+			<view v-if="tabs == 2">
+				<view class="list" v-for="(item,index) in Materlist" :key="index">
+					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
+						<view class="card-detail">
+							<view class="detail">
+								<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+							</view>
+							<view class="detail">
+								<text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
+							</view>
+							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+							</view>
+							<view class="detail" v-if="item.杈呭姪灞炴��">
+								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
 
-            <view v-if="tabs == 4">
-                <view class="list" v-for="(item,index) in FIFOlist" :key="index">
-                    <uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
-                        @tap="delMater(item)">
-                        <view class="card-detail">
-                            <view class="detail">
-                                <text>鏁伴噺锛�</text>{{item.HQty}}
-                            </view>
-                            <view class="detail">
-                                <text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
-                            </view>
-                            <view class="detail">
-                                <text>浠撳簱锛�</text>{{item.HWhName}}
-                            </view>
-                            <view class="detail">
-                                <text>浠撲綅锛�</text>{{item.HSPName}}
-                            </view>
-                            <view class="detail">
-                                <text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
-                            </view>
-                            <view class="detail" v-if="item.HBatchNo">
-                                <text>鎵瑰彿锛�</text>{{item.HBatchNo}}
-                            </view>
-                            <view class="detail" v-if="item.HAuxPropName">
-                                <text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
-                            </view>
-                        </view>
-                    </uni-card>
-                </view>
-                <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
-            </view>
+			<view v-if="tabs == 4">
+				<view class="list" v-for="(item,index) in FIFOlist" :key="index">
+					<uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
+						@tap="delMater(item)">
+						<view class="card-detail">
+							<view class="detail">
+								<text>鏁伴噺锛�</text>{{item.HQty}}
+							</view>
+							<view class="detail">
+								<text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
+							</view>
+							<view class="detail">
+								<text>浠撳簱锛�</text>{{item.HWhName}}
+							</view>
+							<view class="detail">
+								<text>浠撲綅锛�</text>{{item.HSPName}}
+							</view>
+							<view class="detail">
+								<text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
+							</view>
+							<view class="detail" v-if="item.HBatchNo">
+								<text>鎵瑰彿锛�</text>{{item.HBatchNo}}
+							</view>
+							<view class="detail" v-if="item.HAuxPropName">
+								<text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
 
-            <view v-if="tabs == 3">
-                <view class="form-item">
-                    <view class="title">鏉$爜:</view>
-                    <view class="righton">
-                        <input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鐗╂枡:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HMaterName_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瑙勬牸:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HMaterModel_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鎵规:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HBatchNo_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曚綅:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HUnitName_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鏁伴噺:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HQty_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹归噺:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HTMQty_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浠撳簱:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HWHName_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浠撲綅:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HSPName_B" />
-                    </view>
-                </view>
-            </view>
+			<view v-if="tabs == 3">
+				<view class="form-item">
+					<view class="title">鏉$爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐗╂枡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMaterName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瑙勬牸:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMaterModel_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎵规:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBatchNo_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曚綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HUnitName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏁伴噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HQty_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹归噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HTMQty_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浠撳簱:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HWHName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浠撲綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HSPName_B" />
+					</view>
+				</view>
+			</view>
 
-            <view class="bottom-btn">
-                <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-                <view style="flex: 1;"></view>
-                <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-                <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-            </view>
-        </view>
-    </view>
+			<view class="bottom-btn">
+				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<view style="flex: 1;"></view>
+				<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+			</view>
+		</view>
+		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+	</view>
 </template>
 <script>
-    import getDateTime from '@/utils/getdateTime.js';
-    import {
-        getUserInfo
-    } from "@/utils/auth.js";
-    export default {
-        data() {
-            return {
-                userInfo: getUserInfo(),
-                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-                HModName: 'Kf_SellOutBill_PDA',
-                ModRightName: 'CE_SellOut',
-                OperationType: 1,
-                HInterID_Temp: '',
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				HModName: 'Kf_SellOutBill_PDA',
+				ModRightName: 'CE_SellOut',
+				OperationType: 1,
+				HInterID_Temp: '',
 
-                showHStockPlaceName: true,
-                showHMainSourceBillType: true,
-                showHSourceBillNo: true,
-                reHSourceBillNo: true,
-                showHSupName: true,
-                BarCodeFocus: false,
-                HSourceBillNoFocus: false,
+				showHStockPlaceName: false,
+				showHMainSourceBillType: true,
+				showHSourceBillNo: true,
+				reHSourceBillNo: true,
+				showHSupName: true,
+				BarCodeFocus: false,
+				HSourceBillNoFocus: false,
 
-                tabs: 0,
-                HMainSourceBillType: '鍙戣揣閫氱煡鍗�',
-                arrayHMainSourceBillType: ['鍙戣揣閫氱煡鍗�', '閿�鍞鍗�', '鎵嬪伐褰曞叆'],
+				tabs: 0,
+				HMainSourceBillType: '鍙戣揣閫氱煡鍗�',
+				arrayHMainSourceBillType: ['鍙戣揣閫氱煡鍗�', '閿�鍞鍗�', '鎵嬪伐褰曞叆'],
 
-                linterid: '',
-                HBillNo: '',
-                btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
-                showmore: false,
+				linterid: '',
+				HBillNo: '',
+				btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+				showmore: false,
 
-                arrayHWHName: [], //浠撳簱
-                HWHNameList: [],
-                arrayHStockPlaceName: [], //浠撲綅
-                HStockPlaceNameList: [],
-                arrayHSourceBillNo: [], //婧愬崟鍗曞彿
-                HSourceBillNoList: [],
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+				arrayHSourceBillNo: [], //婧愬崟鍗曞彿
+				HSourceBillNoList: [],
 
-                arrayHEmpName: [], //鎿嶄綔鍛�
-                HEmpNameList: [],
-                arrayHDeptName: [], //閮ㄩ棬
-                HDeptNameList: [],
-                arrayHSupName: [], //瀹㈡埛
-                HSupNameList: [],
+				arrayHEmpName: [], //鎿嶄綔鍛�
+				HEmpNameList: [],
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHSupName: [], //瀹㈡埛
+				HSupNameList: [],
 
-                Materlist: [],
-                FIFOlist: [],
-                hform: {
-                    HBillType: 1205,
-                    HBillerID: uni.getStorageSync('HBillerID'),
-                    HRedBlueFlag: false,
+				Materlist: [],
+				FIFOlist: [],
+				hform: {
+					HBillType: 1205,
+					HBillerID: uni.getStorageSync('HBillerID'),
+					HRedBlueFlag: false,
 
-                    HBarCode: '',
-                    HQty: '',
-                    HWHName: getUserInfo().HWHName,
-                    HWHID: getUserInfo().HWhID,
-                    HStockPlaceName: getUserInfo().HSPName,
-                    HStockPlaceID: getUserInfo().HSPID,
+					HBarCode: '',
+					HQty: '',
+					HWHName: getUserInfo().HWHName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
 
-                    HMainSourceBillType: 1402,
-                    HSourceBillNo: '', //CGDD000200
-                    HFIFOWHName: '',
-                    HFIFOWHID: '',
-                    HDate: getDateTime.dateTimeStr('y-m-d'),
-                    HMaker: uni.getStorageSync('HUserName'),
-                    HBillNo: '',
-                    HInterID: '',
+					HMainSourceBillType: 1402,
+					HSourceBillNo: '', //CGDD000200
+					HFIFOWHName: '',
+					HFIFOWHID: '',
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+					HBillNo: '',
+					HInterID: '',
 
-                    HKeeperName: getUserInfo().HKeeper,
-                    HKeeperID: getUserInfo().HKeeperID,
-                    HSecManagerName: getUserInfo().HSecManager,
-                    HSecManagerID: getUserInfo().HSecManagerID,
-                    HDeptName: getUserInfo().HDept,
-                    HDeptID: getUserInfo().HDeptID,
-                    HSupName: '',
-                    HSupID: '',
-                    HStockOrgName: uni.getStorageSync('Organization'),
-                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HKeeperName: getUserInfo().HKeeper,
+					HKeeperID: getUserInfo().HKeeperID,
+					HSecManagerName: getUserInfo().HSecManager,
+					HSecManagerID: getUserInfo().HSecManagerID,
+					HDeptName: getUserInfo().HDept,
+					HDeptID: getUserInfo().HDeptID,
+					HSupName: '',
+					HSupID: '',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
 
-                    HBarCode_B: '',
-                    HMaterName_B: '',
-                    HMaterModel_B: '',
-                    HBatchNo_B: '',
-                    HUnitName_B: '',
-                    HQty_B: '',
-                    HTMQty_B: '',
-                    HWHName_B: '',
-                    HSPName_B: '',
-                }
-            }
-        },
-        onLoad(e) {
-            console.log(e, this.userInfo)
-            this.OperationType = e.OperationType
-            if (e.HInterID) {
-                this.HInterID_Temp = e.HInterID
-                // this.btnType = 1
-                this.refreshBarCodeState()
-                this.RoadBillMain(e.HInterID)
-            } else {
-                this.refreshHSourceBillState()
-                this.getNewData()
-            }
-            this.getHBaseList()
-            this.getHSupList()
-            this.getHEmpList()
-            this.getHDeptList()
-        },
-        methods: {
-            async refreshHSourceBillState() {
-                this.HSourceBillNoFocus = false
-                await this.$nextTick(() => {
-                    this.hform.HSourceBillNo = ""
-                    this.HSourceBillNoFocus = true
-                })
-                if (this.hform.HMainSourceBillType == -1) {
-                    await this.refreshBarCodeState()
-                }
-            },
-            async refreshBarCodeState() {
-                this.BarCodeFocus = false
-                await this.$nextTick(() => {
-                    this.hform.HBarCode = ""
-                    this.BarCodeFocus = true
-                })
-            },
-            playSound(e) {
-                const innerAudioContext = uni.createInnerAudioContext();
-                if (e == 1) {
-                    innerAudioContext.src = '/static/success.wav';
-                } else {
-                    innerAudioContext.src = '/static/jingbao.wav';
-                }
-                innerAudioContext.play(); // 鎾斁闊抽
-            },
-            onSourceBillConfirmHandler() {
-                if (this.hform.HMainSourceBillType == -1) {
-                    this.playSound(1)
-                    this.BarCodeFocus = true
-                    return
-                }
-                let inputVal = this.$refs.uniComboxSourceBill.inputVal
-                if (inputVal == '') {
-                    CommonUtils.playSound(0)
-                    return uni.showToast({
-                        icon: 'none',
-                        Message: '婧愬崟鍗曞彿涓嶅緱涓虹┖...'
-                    })
-                }
-                this.getHBarCodeData(inputVal)
-            },
-            //鎵爜
-            toScanCode() {
-                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-                mpaasScanModule.mpaasScan({
-                    'hideAlbum': true,
-                    'timeoutInterval': '10', //瓒呮椂鏃堕棿
-                    'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-                }, (ret) => {
-                    console.log(ret.resp_result)
-                    if (this.hform.HBarCode == '*') {
-                        this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
-                    } else {
-                        this.hform.HBarCode = ret.resp_result
-                    }
+					HBarCode_B: '',
+					HMaterName_B: '',
+					HMaterModel_B: '',
+					HBatchNo_B: '',
+					HUnitName_B: '',
+					HQty_B: '',
+					HTMQty_B: '',
+					HWHName_B: '',
+					HSPName_B: '',
+				}
+			}
+		},
+		components: {BillListPopupVue},
+		onLoad(e) {
+			console.log(e, this.userInfo)
+			this.OperationType = e.OperationType
+			if (e.HInterID) {
+				this.HInterID_Temp = e.HInterID
+				// this.btnType = 1
+				this.refreshBarCodeState()
+				this.RoadBillMain(e.HInterID)
+			} else {
+				this.refreshHSourceBillState()
+				this.getNewData()
+			}
+			this.getHBaseList()
+			// this.getHSupList()
+			this.getHEmpList()
+			this.getHDeptList()
+			
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+				this.getHBarCodeData(e.HBillNo)
+				this.$refs.billList.exit()
+			})
+		},
+		beforeDestroy() {
+			uni.$off('BillSelectComplete')
+		},
+		methods: {
+			async refreshHSourceBillState() {
+				this.HSourceBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HSourceBillNo = ""
+					this.HSourceBillNoFocus = true
+				})
+				if (this.hform.HMainSourceBillType == -1) {
+					await this.refreshBarCodeState()
+				}
+			},
+			async refreshBarCodeState() {
+				this.BarCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.BarCodeFocus = true
+				})
+			},
+			playSound(e) {
+				const innerAudioContext = uni.createInnerAudioContext();
+				if (e == 1) {
+					innerAudioContext.src = '/static/success.wav';
+				} else {
+					innerAudioContext.src = '/static/jingbao.wav';
+				}
+				innerAudioContext.play(); // 鎾斁闊抽
+			},
+			onSourceBillConfirmHandler() {
+				if (this.hform.HMainSourceBillType == -1) {
+					this.playSound(1)
+					this.BarCodeFocus = true
+					return
+				}
+				let inputVal = this.$refs.uniComboxSourceBill.inputVal
+				if (inputVal == '') {
+					CommonUtils.playSound(0)
+					return uni.showToast({
+						icon: 'none',
+						Message: '婧愬崟鍗曞彿涓嶅緱涓虹┖...'
+					})
+				}
+				this.getHBarCodeData(inputVal)
+			},
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					if (this.hform.HBarCode == '*') {
+						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+					} else {
+						this.hform.HBarCode = ret.resp_result
+					}
 
-                    this.getCode(this.hform.HBarCode)
-                })
-            },
-            //鎵叾浠�(浠撳簱锛屼粨浣�)
-            // toScanData(e){
-            // 	uni.scanCode({
-            // 	    onlyFromCamera: true,
-            // 	    success: (res) => {
-            // 	        console.log('鏉$爜鍐呭锛�' + res.result);
-            // 			var code = res.result
-            // 			if(e == 1){
-            // 				uni.request({
-            // 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
-            // 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
-            // 					success: (res) => {
-            // 						this.hform.HStockPlaceID = 0
-            // 						this.hform.HStockPlaceName = ''
-            // 						this.showHStockPlaceName = true
-            // 						if(res.data.count == 1){
-            // 							var data = res.data.data[0]
-            // 							this.hform.HWHID = data.HItemID
-            // 							this.hform.HWHName = data.HName
-            // 							if (data.HSPFlag == 0) {
-            // 							    this.showHStockPlaceName = false
-            // 							}
-            // 						}else{
-            // 							this.hform.HWHID = 0
-            // 							this.hform.HWHName = ''
-            // 							uni.showToast({
-            // 								title:res.data.Message,
-            // 								icon:'none'
-            // 							})
-            // 						}
-            // 					},
-            // 					fail: (res) => {
-            // 						console.log(res);
-            // 						uni.showToast({
-            // 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-            // 							icon:'none'
-            // 						})
-            // 					},
-            // 				});
-            // 			}else if(e == 2){
-            // 				uni.request({
-            // 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
-            // 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
-            // 					success: (res) => {
-            // 						if(res.data.count == 1){
-            // 							var data = res.data.data[0]
-            // 							this.hform.HWHID = data.HWHID
-            // 							this.hform.HWHName = data.HWhName
-            // 							this.hform.HStockPlaceID = data.HItemID
-            // 							this.hform.HStockPlaceName = data.HName
-            // 						}else{
-            // 							this.hform.HWHID = 0
-            // 							this.hform.HWHName = ''
-            // 							this.hform.HStockPlaceID = 0
-            // 							this.hform.HStockPlaceName = ''
-            // 							uni.showToast({
-            // 								title:res.data.Message,
-            // 								icon:'none'
-            // 							})
-            // 						}
-            // 					},
-            // 					fail: (res) => {
-            // 						console.log(res);
-            // 						uni.showToast({
-            // 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-            // 							icon:'none'
-            // 						})
-            // 					},
-            // 				});
-            // 			}
-            // 	    }
-            // 	});
-            // },
-            //鏃ユ湡
-            HDateChange(e) {
-                console.log(e.detail.value)
-                this.hform.HDate = e.detail.value
-            },
-            //鍩虹浠撳簱璧勬枡
-            getHBaseList() {
-                uni.request({
-                    url: this.serverUrl + '/Gy_Warehouse/list',
-                    data: {
-                        sWhere: "",
-                        user: uni.getStorageSync('HUserName'),
-                        Organization: uni.getStorageSync('Organization')
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            this.HWHNameList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
-                            }
-                        } else {
-                            uni.showToast({
-                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+			//鎵叾浠�(浠撳簱锛屼粨浣�)
+			// toScanData(e){
+			// 	uni.scanCode({
+			// 	    onlyFromCamera: true,
+			// 	    success: (res) => {
+			// 	        console.log('鏉$爜鍐呭锛�' + res.result);
+			// 			var code = res.result
+			// 			if(e == 1){
+			// 				uni.request({
+			// 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
+			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
+			// 					success: (res) => {
+			// 						this.hform.HStockPlaceID = 0
+			// 						this.hform.HStockPlaceName = ''
+			// 						this.showHStockPlaceName = true
+			// 						if(res.data.count == 1){
+			// 							var data = res.data.data[0]
+			// 							this.hform.HWHID = data.HItemID
+			// 							this.hform.HWHName = data.HName
+			// 							if (data.HSPFlag == 0) {
+			// 							    this.showHStockPlaceName = false
+			// 							}
+			// 						}else{
+			// 							this.hform.HWHID = 0
+			// 							this.hform.HWHName = ''
+			// 							uni.showToast({
+			// 								title:res.data.Message,
+			// 								icon:'none'
+			// 							})
+			// 						}
+			// 					},
+			// 					fail: (res) => {
+			// 						console.log(res);
+			// 						uni.showToast({
+			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+			// 							icon:'none'
+			// 						})
+			// 					},
+			// 				});
+			// 			}else if(e == 2){
+			// 				uni.request({
+			// 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
+			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
+			// 					success: (res) => {
+			// 						if(res.data.count == 1){
+			// 							var data = res.data.data[0]
+			// 							this.hform.HWHID = data.HWHID
+			// 							this.hform.HWHName = data.HWhName
+			// 							this.hform.HStockPlaceID = data.HItemID
+			// 							this.hform.HStockPlaceName = data.HName
+			// 						}else{
+			// 							this.hform.HWHID = 0
+			// 							this.hform.HWHName = ''
+			// 							this.hform.HStockPlaceID = 0
+			// 							this.hform.HStockPlaceName = ''
+			// 							uni.showToast({
+			// 								title:res.data.Message,
+			// 								icon:'none'
+			// 							})
+			// 						}
+			// 					},
+			// 					fail: (res) => {
+			// 						console.log(res);
+			// 						uni.showToast({
+			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+			// 							icon:'none'
+			// 						})
+			// 					},
+			// 				});
+			// 			}
+			// 	    }
+			// 	});
+			// },
+			//鏃ユ湡
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			//鍩虹浠撳簱璧勬枡
+			getHBaseList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Warehouse/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HWHNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+							}
+							
+							this.HStockPlaceNameChange(res.data.data[0].浠撳簱鍚嶇О)
+						} else {
+							uni.showToast({
+								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
 
-                uni.request({
-                    url: this.serverUrl + '/Gy_StockPlace/list',
-                    data: {
-                        sWhere: "",
-                        user: uni.getStorageSync('HUserName'),
-                        Organization: uni.getStorageSync('Organization')
-                    },
-                    success: (res) => {
-                        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'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
+				uni.request({
+					url: this.serverUrl + '/Gy_StockPlace/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						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'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
 
-                this.getHYDList()
-            },
-            //婧愬崟璧勬枡
-            getHYDList() {
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/GetSourceBillList_Json',
-                    data: {
-                        HBillType: this.hform.HBillType,
-                        HSourceBillType: this.hform.HMainSourceBillType,
-                        HStockOrgID: this.hform.HStockOrgID,
-                        HSourceBillNo: "",
-                        HMater: "",
-                        HCustom: ""
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            this.HSourceBillNoList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
-                            }
-                            this.reHSourceBillNo = false
-                            this.$nextTick(() => {
-                                this.reHSourceBillNo = true
-                            })
-                        } else {
-                            uni.showToast({
-                                title: '婧愬崟鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //閫夋嫨浠撳簱
-            HWHNameChange(e) {
-                // var name = e.split("(")
-                for (var i = 0; i < this.HWHNameList.length; i++) {
-                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
-                        this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-                        this.hform.HWHID = this.HWHNameList[i].HItemID
-                    }
-                }
-            },
-            HFIFOWHNameChange(e) {
-                for (var i = 0; i < this.HWHNameList.length; i++) {
-                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
-                        this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-                        this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
-                    }
-                }
-            },
-            //閫夋嫨浠撲綅
-            HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
-                    }
-                }
-            },
-            //閫夋嫨婧愬崟
-            HSourceBillNoChange(e) {
-                this.hform.HSourceBillNo = e
-                this.getHBarCodeData(e)
-                // for(var i=0;i<this.HSourceBillNoList.length;i++){
-                // 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
-                // 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
-                // 	}
-                // }
-            },
-            //閫夋嫨婧愬崟绫诲瀷
-            HMainSourceBillTypeChange(e) {
-                this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
-                if (this.HMainSourceBillType == '鍙戣揣閫氱煡鍗�') {
-                    this.hform.HMainSourceBillType = 1402
-                    this.getHYDList()
-                } else if (this.HMainSourceBillType == '閿�鍞鍗�') {
-                    this.hform.HMainSourceBillType = 1401
-                    this.getHYDList()
-                } else {
-                    this.hform.HMainSourceBillType = -1
-                    this.getHYDList()
-                }
-            },
+				// this.getHYDList()
+			},
+			//婧愬崟璧勬枡
+			getHYDList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetSourceBillList_Json',
+					data: {
+						HBillType: this.hform.HBillType,
+						HSourceBillType: this.hform.HMainSourceBillType,
+						HStockOrgID: this.hform.HStockOrgID,
+						HSourceBillNo: "",
+						HMater: "",
+						HCustom: ""
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HSourceBillNoList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
+							}
+							this.reHSourceBillNo = false
+							this.$nextTick(() => {
+								this.reHSourceBillNo = true
+							})
+						} else {
+							uni.showToast({
+								title: '婧愬崟鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨浠撳簱
+			HWHNameChange(e) {
+				// var name = e.split("(")
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+						
+						console.log(this.HWHNameList[i]['鍚敤浠撲綅'])
+						
+						if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+							this.showHStockPlaceName = true
+						} else {
+							this.hform.HStockPlaceName = ''
+							this.showHStockPlaceName = false
+						}
+					}
+				}
+			},
+			HFIFOWHNameChange(e) {
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+						this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+						this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨浠撲綅
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨婧愬崟
+			HSourceBillNoChange(e) {
+				this.hform.HSourceBillNo = e
+				this.getHBarCodeData(e)
+				// for(var i=0;i<this.HSourceBillNoList.length;i++){
+				// 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
+				// 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
+				// 	}
+				// }
+			},
+			//閫夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e) {
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+				if (this.HMainSourceBillType == '鍙戣揣閫氱煡鍗�') {
+					this.hform.HMainSourceBillType = 1402
+					this.getHYDList()
+				} else if (this.HMainSourceBillType == '閿�鍞鍗�') {
+					this.hform.HMainSourceBillType = 1401
+					this.getHYDList()
+				} else {
+					this.hform.HMainSourceBillType = -1
+					this.getHYDList()
+				}
+			},
 
-            //鑾峰彇瀹㈡埛鏁版嵁
-            getHSupList() {
-                uni.request({
-                    url: this.serverUrl + '/Gy_Customer/list',
-                    data: {
-                        sWhere: "",
-                        user: uni.getStorageSync('HUserName'),
-                        Organization: uni.getStorageSync('Organization')
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            this.HSupNameList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHSupName[i] = res.data.data[i].瀹㈡埛鍚嶇О
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //閫夋嫨瀹㈡埛
-            HSupNameChange(e) {
-                for (var i = 0; i < this.HSupNameList.length; i++) {
-                    if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
-                        this.hform.HSupID = this.HSupNameList[i].HItemID
-                        this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
-                    }
-                }
-            },
-            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-            getHDeptList() {
-                uni.request({
-                    url: this.serverUrl + '/Gy_Department/list',
-                    data: {
-                        sWhere: "",
-                        user: uni.getStorageSync('HUserName'),
-                        Organization: uni.getStorageSync('Organization')
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            this.HDeptNameList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //閫夋嫨浣跨敤閮ㄩ棬
-            HDeptNameChange(e) {
-                for (var i = 0; i < this.HDeptNameList.length; i++) {
-                    if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
-                        this.hform.HDeptID = this.HDeptNameList[i].HItemID
-                        this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
-                    }
-                }
-            },
-            //鎿嶄綔鍛�
-            getHEmpList() {
-                uni.request({
-                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
-                    data: {
-                        Employee: '',
-                        HGroupID: 0
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            this.HEmpNameList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHEmpName[i] = res.data.data[i].HName
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: '浜哄憳鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //淇濈
-            HKeeperNameChange(e) {
-                for (var i = 0; i < this.HEmpNameList.length; i++) {
-                    if (this.HEmpNameList[i].HName == e) {
-                        console.log(this.HEmpNameList[i])
-                        this.hform.HKeeperID = this.HEmpNameList[i].HItemID
-                        this.hform.HKeeperName = this.HEmpNameList[i].HName
-                    }
-                }
-            },
-            //楠屾敹
-            HSecManagerNameChange(e) {
-                for (var i = 0; i < this.HEmpNameList.length; i++) {
-                    if (this.HEmpNameList[i].HName == e) {
-                        this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
-                        this.hform.HSecManagerName = this.HEmpNameList[i].HName
-                    }
-                }
-            },
-            //閫変腑婧愬崟
-            getHBarCodeData(HBarCode) {
-                if (!this.hform.HFIFOWHName) {
-                    this.hform.HFIFOWHID = 0
-                }
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/get_SourceBarCode_SellOut_Json',
-                    data: {
-                        HInterID: this.hform.HInterID,
-                        HBillNo: this.hform.HBillNo,
-                        HBillType: this.hform.HBillType,
-                        HSourceBillNo: HBarCode,
-                        HSourceBillType: this.hform.HMainSourceBillType,
-                        HMaker: this.hform.HMaker,
-                        HOWNERID: this.hform.HStockOrgID,
-                        HFIFOWhID: this.hform.HFIFOWHID,
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            var data = res.data.data
-                            console.log(2, data);
-                            this.hform.HSupName = data.hSupNameField
-                            this.hform.HSupID = data.hSupIDField
-                            if (data.hDeptIDField != 0) {
-                                this.hform.HDeptID = data.hDeptIDField
-                                this.hform.HDeptName = data.hDeptNameField
-                            }
-                            this.hform.HSourceBillNo = data.hSourceBillNoField
-                            this.showHMainSourceBillType = false
-                            if (data.hMulSourceFlagField == 0) {
-                                this.showHSourceBillNo = false
-                            }
-                            this.tabs = 2
-                            this.showHSupName = false
-                            this.BarCodeFocus = true
-                            this.playSound(1)
-                            this.DisBillEntryList()
-                        } else {
-                            this.playSound(0)
-                            this.refreshHSourceBillState()
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        this.playSound(0)
-                        this.refreshHSourceBillState()
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //鎵潯鐮佸鐞�
-            getCode(HBarCode) {
-                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-                if (!this.hform.HWHName) {
-                    this.hform.HWHID = 0
-                }
-                if (!this.hform.HStockPlaceName) {
-                    this.hform.HStockPlaceID = 0
-                }
-                var sOldBarCode = HBarCode
-                var HDeleteFlag = sOldBarCode.substring(0, 1);
-                var sBarCode = sOldBarCode.slice(1);
+			//鑾峰彇瀹㈡埛鏁版嵁
+			getHSupList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Customer/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HSupNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHSupName[i] = res.data.data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨瀹㈡埛
+			HSupNameChange(e) {
+				for (var i = 0; i < this.HSupNameList.length; i++) {
+					if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+						this.hform.HSupID = this.HSupNameList[i].HItemID
+						this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+					}
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			//鎿嶄綔鍛�
+			getHEmpList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetEmployeeList_Json',
+					data: {
+						Employee: '',
+						HGroupID: 0
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//淇濈
+			HKeeperNameChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						console.log(this.HEmpNameList[i])
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+						this.hform.HKeeperName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			//楠屾敹
+			HSecManagerNameChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+						this.hform.HSecManagerName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			//閫変腑婧愬崟
+			getHBarCodeData(HBarCode) {
+				if (!this.hform.HFIFOWHName) {
+					this.hform.HFIFOWHID = 0
+				}
+				uni.request({
+					url: this.serverUrl + '/WEBSController/get_SourceBarCode_SellOut_Json',
+					data: {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType,
+						HSourceBillNo: HBarCode,
+						HSourceBillType: this.hform.HMainSourceBillType,
+						HMaker: this.hform.HMaker,
+						HOWNERID: this.hform.HStockOrgID,
+						HFIFOWhID: this.hform.HFIFOWHID,
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							var data = res.data.data
+							console.log(2, data);
+							this.hform.HSupName = data.hSupNameField
+							this.hform.HSupID = data.hSupIDField
+							if (data.hDeptIDField != 0) {
+								this.hform.HDeptID = data.hDeptIDField
+								this.hform.HDeptName = data.hDeptNameField
+							}
+							this.hform.HSourceBillNo = data.hSourceBillNoField
+							this.showHMainSourceBillType = false
+							if (data.hMulSourceFlagField == 0) {
+								this.showHSourceBillNo = false
+							}
+							this.tabs = 2
+							this.showHSupName = false
+							this.BarCodeFocus = true
+							this.playSound(1)
+							this.DisBillEntryList()
+						} else {
+							this.playSound(0)
+							this.refreshHSourceBillState()
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						this.playSound(0)
+						this.refreshHSourceBillState()
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鎵潯鐮佸鐞�
+			getCode(HBarCode) {
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sOldBarCode = HBarCode
+				var HDeleteFlag = sOldBarCode.substring(0, 1);
+				var sBarCode = sOldBarCode.slice(1);
 
-                var sHWHID = this.hform.HWHID
-                var sHSPID = this.hform.HStockPlaceID
-                var sHQty = this.hform.HQty
-                var sSourceBillNo = this.hform.HSourceBillNo
-                var sSourceBillType = this.hform.HMainSourceBillType
-                var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
-                console.log(this.hform.HSourceBillNo, HSourceFlag)
-                if (HDeleteFlag == "*") {
-                    if (sBarCode == "") {
-                        this.playSound(0)
-                        this.refreshBarCodeState()
-                        uni.showToast({
-                            title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
-                            icon: 'none'
-                        })
-                    } else {
-                        uni.request({
-                            url: this.serverUrl +
-                                '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
-                            data: {
-                                HInterID: this.hform.HInterID,
-                                HBillType: this.hform.HBillType,
-                                HBarCode: sBarCode
-                            },
-                            success: (res) => {
-                                console.log('鍒犻櫎鏉$爜', res.data);
-                                this.hform.HBarCode = ''
-                                if (res.data.count == 1) {
-                                    this.playSound(1)
-                                    this.hform.HQty = ''
-                                    this.DisBillEntryList()
-                                } else {
-                                    this.playSound(0)
-                                    this.refreshBarCodeState()
-                                    uni.showToast({
-                                        title: res.data.Message,
-                                        icon: 'none'
-                                    })
-                                }
-                            },
-                            fail: (res) => {
-                                this.playSound(0)
-                                this.refreshBarCodeState()
-                                console.log(res);
-                                uni.showToast({
-                                    title: '鎺ュ彛璇锋眰澶辫触',
-                                    icon: 'none'
-                                })
-                            },
-                        });
-                    }
-                } else {
-                    var sBarCode = this.hform.HBarCode
-                    if (sHQty == "") {
-                        sHQty = 0;
-                    }
-                    uni.request({
-                        url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
-                        data: {
-                            sBarCode: sBarCode,
-                            HInterID: this.hform.HInterID,
-                            HBillType: this.hform.HBillType,
-                            HBillNo: this.hform.HBillNo,
-                            HMaker: this.hform.HMaker,
-                            HWhID: sHWHID,
-                            HSPID: sHSPID,
-                            HQty: sHQty,
-                            HRedBlueFlag: this.hform.HRedBlueFlag,
-                            SourceFlag: HSourceFlag,
-                            HSourceBillNo: sSourceBillNo,
-                            HSourceBillType: sSourceBillType,
-                            HStockOrgID: this.hform.HStockOrgID,
-                            HScanStyle: "",
-                            HCustom1: "",
-                            HCustom2: ""
-                        },
-                        success: (res) => {
-                            console.log('鎵爜杩斿洖', res.data);
-                            this.hform.HBarCode = ''
-                            if (res.data.count == 1) {
-                                this.playSound(1)
-                                var data = res.data.data
-                                if (data.hBarTypeField == '浠撳簱鏉$爜') {
-                                    this.hform.HWHName = data.hWhNameField
-                                    this.hform.HWHID = data.hWhIDField
-                                    this.hform.HStockPlaceName = ''
-                                    this.hform.HStockPlaceID = 0
-                                    if (data.hSPFlagField == 0) {
-                                        this.showHStockPlaceName = false
-                                    } else {
-                                        this.showHStockPlaceName = true
-                                    }
-                                } else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-                                    this.hform.HWHName = data.hWhNameField
-                                    this.hform.HWHID = data.hWhIDField
-                                    this.hform.HStockPlaceName = data.hSPNameField
-                                    this.hform.HStockPlaceID = data.hSPIDField
-                                } else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-                                    this.hform.HDeptName = data.hDeptNameField
-                                    this.hform.HDeptID = data.hDeptIDField
-                                    this.tabs = 1
-                                } else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-                                    this.hform.HSupName = data.hSupNameField
-                                    this.hform.HSupID = data.hSupIDField
-                                    if (data.hDeptIDField != 0) {
-                                        this.hform.HDeptID = data.hDeptIDField
-                                        this.hform.HDeptName = data.hDeptNameField
-                                    }
-                                    this.hform.HSourceBillNo = data.hSourceBillNoField
-                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-                                    this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                                    if (data.hSourceBillTypeField == "1402") {
-                                        this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
-                                        this.hform.HMainSourceBillType = 1402
-                                        this.showHMainSourceBillType = false
-                                    } else if (data.hSourceBillTypeField == "1401") {
-                                        this.HMainSourceBillType = '閿�鍞鍗�'
-                                        this.hform.HMainSourceBillType = 1401
-                                        this.showHMainSourceBillType = false
-                                    } else {
-                                        this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                                        this.hform.HMainSourceBillType = -1
-                                        this.showHMainSourceBillType = false
-                                    }
-                                    if (data.hMulSourceFlagField == 0) {
-                                        this.showHSourceBillNo = false
-                                    }
-                                    //瀹㈡埛涓嶅彲缂栬緫
-                                    this.showHSupName = false
-                                    this.tabs = 2
-                                } else { //鐗╂枡鏉$爜
-                                    this.tabs = 2
-                                    if (!this.hform.HSourceBillNo) {
-                                        this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                                        this.hform.HMainSourceBillType = -1
-                                        this.showHMainSourceBillType = false
-                                        this.showHSourceBillNo = false
-                                    }
-                                }
-                                //鏄剧ず琛ㄤ綋鏄庣粏
-                                this.DisBillEntryList()
-                                //娓呯┖鏁伴噺
-                                this.hform.HQty = ''
-                            } else {
-                                this.playSound(0)
-                                this.refreshBarCodeState()
-                                uni.showToast({
-                                    title: res.data.Message,
-                                    icon: 'none'
-                                })
-                            }
-                        },
-                        fail: (res) => {
-                            this.playSound(0)
-                            this.refreshBarCodeState()
-                            console.log(res);
-                            uni.showToast({
-                                title: '鎺ュ彛璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        },
-                    });
-                }
-            },
-            //鐗╂枡淇℃伅
-            DisBillEntryList() {
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
-                    data: {
-                        HInterID: this.hform.HInterID,
-                        HBillNo: this.hform.HBillNo,
-                        HBillType: this.hform.HBillType,
-                        HStockOrgID: this.hform.HStockOrgID
-                    },
-                    success: (res) => {
-                        console.log('鐗╂枡', res.data)
-                        if (res.data.count == 1) {
-                            var data = res.data.data
-                            this.Materlist = data.Materlist
-                            if (data.FIFOlist.length != 0) {
-                                if (data.FIFOlist[0].HMaterID != 0) {
-                                    this.FIFOlist = data.FIFOlist
-                                }
-                            }
-                            if (!data.BarCodeDetailslist[0].HBarCode) {
-                                this.hform.HMaterName_B = ''
-                                this.hform.HMaterModel_B = ''
-                                this.hform.HBatchNo_B = ''
-                                this.hform.HUnitName_B = ''
-                                this.hform.HQty_B = ''
-                                this.hform.HTMQty_B = ''
-                                this.hform.HWHName_B = ''
-                                this.hform.HSPName_B = ''
-                            } else {
-                                this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
-                                this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
-                                this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
-                                this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
-                                this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
-                                this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
-                                this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
-                                this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
-                            }
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //鍒犻櫎鐗╂枡鐮�
-            delMater(item) {
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            uni.request({
-                                url: this.serverUrl +
-                                    '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
-                                data: {
-                                    HInterID: this.hform.HInterID,
-                                    HMaterID: item.HMaterID,
-                                    HAuxPropID: item.HAuxPropID,
-                                    HMTONo: item.HMTONo,
-                                    HSourceInterID: item.HSourceInterID,
-                                    HSourceEntryID: item.HSourceEntryID,
-                                    HBillType: this.hform.HBillType
-                                },
-                                success: (res) => {
-                                    if (res.data.count == 1) {
-                                        this.DisBillEntryList()
-                                    } else {
-                                        uni.showToast({
-                                            title: res.data.Message,
-                                            icon: 'none'
-                                        })
-                                    }
-                                },
-                                fail: (res) => {
-                                    console.log(res);
-                                    uni.showToast({
-                                        title: '鎺ュ彛璇锋眰澶辫触',
-                                        icon: 'none'
-                                    })
-                                },
-                            });
-                        }
-                    }
-                });
-            },
-            //鏂板
-            getNewData() {
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json',
-                    data: {
-                        HBillType: this.hform.HBillType
-                    },
-                    success: (res) => {
-                        // console.log(res.data)
-                        if (res.data.count == 1) {
-                            this.hform.HInterID = res.data.data[0].HInterID
-                            this.hform.HBillNo = res.data.data[0].HBillNo
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //淇敼鍥炲~鏁版嵁
-            RoadBillMain(HInterID) {
-                uni.request({
-                    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
-                    data: {
-                        HInterID: HInterID,
-                        HBillType: this.hform.HBillType
-                    },
-                    success: (res) => {
-                        console.log(33, res.data.data[0]);
-                        if (res.data.count == 1) {
-                            var data = res.data.data[0]
-                            this.hform.HInterID = data.HInterID
-                            this.hform.HBillNo = data.HBillNo
-                            this.hform.HMainSourceBillType = data.HSourceBillType
-                            this.hform.HSourceBillNo = data.HSourceBillNo
-                            if (data.HSourceBillType == 1402) {
-                                this.hform.HMainSourceBillType = 1402
-                                this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
-                                this.showHSupName = false
-                            } else if (data.HSourceBillType == 1401) {
-                                this.hform.HMainSourceBillType = 1401
-                                this.HMainSourceBillType = '閿�鍞鍗�'
-                                this.showHSupName = false
-                            } else {
-                                this.hform.HMainSourceBillType = -1
-                                this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                            }
-                            this.showHMainSourceBillType = false
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sHQty = this.hform.HQty
+				var sSourceBillNo = this.hform.HSourceBillNo
+				var sSourceBillType = this.hform.HMainSourceBillType
+				var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
+				console.log(this.hform.HSourceBillNo, HSourceFlag)
+				if (HDeleteFlag == "*") {
+					if (sBarCode == "") {
+						this.playSound(0)
+						this.refreshBarCodeState()
+						uni.showToast({
+							title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						})
+					} else {
+						uni.request({
+							url: this.serverUrl +
+								'/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+							data: {
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBarCode: sBarCode
+							},
+							success: (res) => {
+								console.log('鍒犻櫎鏉$爜', res.data);
+								this.hform.HBarCode = ''
+								if (res.data.count == 1) {
+									this.playSound(1)
+									this.hform.HQty = ''
+									this.DisBillEntryList()
+								} else {
+									this.playSound(0)
+									this.refreshBarCodeState()
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								this.playSound(0)
+								this.refreshBarCodeState()
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				} else {
+					var sBarCode = this.hform.HBarCode
+					if (sHQty == "") {
+						sHQty = 0;
+					}
+					uni.request({
+						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+						data: {
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HQty: sHQty,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							SourceFlag: HSourceFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HScanStyle: "",
+							HCustom1: "",
+							HCustom2: ""
+						},
+						success: (res) => {
+							console.log('鎵爜杩斿洖', res.data);
+							this.hform.HBarCode = ''
+							if (res.data.count == 1) {
+								this.playSound(1)
+								var data = res.data.data
+								if (data.hBarTypeField == '浠撳簱鏉$爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = ''
+									this.hform.HStockPlaceID = 0
+									if (data.hSPFlagField == 0) {
+										this.showHStockPlaceName = false
+									} else {
+										this.showHStockPlaceName = true
+									}
+								} else if (data.hBarTypeField == '浠撲綅鏉$爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = data.hSPNameField
+									this.hform.HStockPlaceID = data.hSPIDField
+								} else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
+									this.hform.HDeptName = data.hDeptNameField
+									this.hform.HDeptID = data.hDeptIDField
+									this.tabs = 1
+								} else if (data.hBarTypeField == '婧愬崟鏉$爜') {
+									this.hform.HSupName = data.hSupNameField
+									this.hform.HSupID = data.hSupIDField
+									if (data.hDeptIDField != 0) {
+										this.hform.HDeptID = data.hDeptIDField
+										this.hform.HDeptName = data.hDeptNameField
+									}
+									this.hform.HSourceBillNo = data.hSourceBillNoField
+									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+									this.hform.HMainSourceBillType = data.hSourceBillTypeField
+									if (data.hSourceBillTypeField == "1402") {
+										this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+										this.hform.HMainSourceBillType = 1402
+										this.showHMainSourceBillType = false
+									} else if (data.hSourceBillTypeField == "1401") {
+										this.HMainSourceBillType = '閿�鍞鍗�'
+										this.hform.HMainSourceBillType = 1401
+										this.showHMainSourceBillType = false
+									} else {
+										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+										this.showHMainSourceBillType = false
+									}
+									if (data.hMulSourceFlagField == 0) {
+										this.showHSourceBillNo = false
+									}
+									//瀹㈡埛涓嶅彲缂栬緫
+									this.showHSupName = false
+									this.tabs = 2
+								} else { //鐗╂枡鏉$爜
+									this.tabs = 2
+									if (!this.hform.HSourceBillNo) {
+										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+										this.showHMainSourceBillType = false
+										this.showHSourceBillNo = false
+									}
+								}
+								//鏄剧ず琛ㄤ綋鏄庣粏
+								this.DisBillEntryList()
+								//娓呯┖鏁伴噺
+								this.hform.HQty = ''
+							} else {
+								this.playSound(0)
+								this.refreshBarCodeState()
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							this.playSound(0)
+							this.refreshBarCodeState()
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+			//鐗╂枡淇℃伅
+			DisBillEntryList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
+					data: {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType,
+						HStockOrgID: this.hform.HStockOrgID
+					},
+					success: (res) => {
+						console.log('鐗╂枡', res.data)
+						if (res.data.count == 1) {
+							var data = res.data.data
+							this.Materlist = data.Materlist
+							if (data.FIFOlist.length != 0) {
+								if (data.FIFOlist[0].HMaterID != 0) {
+									this.FIFOlist = data.FIFOlist
+								}
+							}
+							if (!data.BarCodeDetailslist[0].HBarCode) {
+								this.hform.HMaterName_B = ''
+								this.hform.HMaterModel_B = ''
+								this.hform.HBatchNo_B = ''
+								this.hform.HUnitName_B = ''
+								this.hform.HQty_B = ''
+								this.hform.HTMQty_B = ''
+								this.hform.HWHName_B = ''
+								this.hform.HSPName_B = ''
+							} else {
+								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+							}
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鍒犻櫎鐗╂枡鐮�
+			delMater(item) {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							uni.request({
+								url: this.serverUrl +
+									'/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HMaterID: item.HMaterID,
+									HAuxPropID: item.HAuxPropID,
+									HMTONo: item.HMTONo,
+									HSourceInterID: item.HSourceInterID,
+									HSourceEntryID: item.HSourceEntryID,
+									HBillType: this.hform.HBillType
+								},
+								success: (res) => {
+									if (res.data.count == 1) {
+										this.DisBillEntryList()
+									} else {
+										uni.showToast({
+											title: res.data.Message,
+											icon: 'none'
+										})
+									}
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.showToast({
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
+									})
+								},
+							});
+						}
+					}
+				});
+			},
+			//鏂板
+			getNewData() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json',
+					data: {
+						HBillType: this.hform.HBillType
+					},
+					success: (res) => {
+						// console.log(res.data)
+						if (res.data.count == 1) {
+							this.hform.HInterID = res.data.data[0].HInterID
+							this.hform.HBillNo = res.data.data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//淇敼鍥炲~鏁版嵁
+			RoadBillMain(HInterID) {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
+					data: {
+						HInterID: HInterID,
+						HBillType: this.hform.HBillType
+					},
+					success: (res) => {
+						console.log(33, res.data.data[0]);
+						if (res.data.count == 1) {
+							var data = res.data.data[0]
+							this.hform.HInterID = data.HInterID
+							this.hform.HBillNo = data.HBillNo
+							this.hform.HMainSourceBillType = data.HSourceBillType
+							this.hform.HSourceBillNo = data.HSourceBillNo
+							if (data.HSourceBillType == 1402) {
+								this.hform.HMainSourceBillType = 1402
+								this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+								this.showHSupName = false
+							} else if (data.HSourceBillType == 1401) {
+								this.hform.HMainSourceBillType = 1401
+								this.HMainSourceBillType = '閿�鍞鍗�'
+								this.showHSupName = false
+							} else {
+								this.hform.HMainSourceBillType = -1
+								this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+							}
+							this.showHMainSourceBillType = false
 
-                            //闈炲婧愬崟妯″紡
-                            if (data.HMulSourceBill == 0) {
-                                this.showHSourceBillNo = false
-                            }
-                            this.hform.HDeptID = data.HDeptID
-                            this.hform.HDeptName = data.HDeptName
-                            this.hform.HSupID = data.HCusID
-                            this.hform.HSupName = data.HCusName
-                            this.DisBillEntryList()
-                            this.tabs = 2
-                        } else {
-                            uni.showToast({
-                                title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            addNew() {
-                uni.redirectTo({
-                    url: '/pages/xiaoshouchuku/form?OperationType=1'
-                })
-            },
-            submit() {
-                //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-                if (!this.hform.HWHName) {
-                    this.hform.HWHID = 0
-                }
-                if (!this.hform.HStockPlaceName) {
-                    this.hform.HStockPlaceID = 0
-                }
-                if (!this.hform.HKeeperName) {
-                    this.hform.HKeeperID = 0
-                }
-                if (!this.hform.HSecManagerName) {
-                    this.hform.HSecManagerID = 0
-                }
-                if (!this.hform.HDeptName) {
-                    this.hform.HDeptID = 0
-                }
-                if (!this.hform.HSupName) {
-                    this.hform.HSupID = 0
-                }
-                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
-                    uni.showToast({
-                        title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
-                        icon: 'none'
-                    })
-                } else if (!this.hform.HBillNo) {
-                    uni.showToast({
-                        title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
-                        icon: 'none'
-                    })
-                } else if (!this.Materlist || this.Materlist.length == 0) {
-                    uni.showToast({
-                        title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-                        icon: 'none'
-                    })
-                } else {
-                    var s = 0;
-                    for (var i = 0; i < this.Materlist.length; i++) {
-                        if (this.Materlist[i].鏁伴噺 > 0) {
-                            s = 1;
-                        }
-                    }
-                    if (s == 0) {
-                        uni.showToast({
-                            title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-                            icon: 'none'
-                        })
-                    } else {
-                        uni.showLoading({
-                            title: '璇风◢鍊�'
-                        })
-                        var sMainStr = JSON.stringify(this.hform);
-                        uni.request({
-                            url: this.serverUrl + '/WEBSController/set_SaveSellOutBill_Json',
-                            method: 'POST',
-                            dataType: "json",
-                            data: {
-                                oMain: sMainStr
-                            },
-                            success: (res) => {
-                                console.log(1, res);
-                                uni.hideLoading()
-                                if (res.data.count == 1) {
-                                    uni.showModal({
-                                        title: '鎻愮ず',
-                                        content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-                                        success: (res) => {
-                                            if (res.confirm) {
-                                                console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                                                uni.redirectTo({
-                                                    url: '/pages/xiaoshouchuku/form?OperationType=1'
-                                                })
-                                            } else if (res.cancel) {
-                                                console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                                setTimeout(() => {
-                                                    uni.navigateBack();
-                                                }, 500)
-                                            }
-                                        }
-                                    });
-                                } else {
-                                    uni.showToast({
-                                        title: res.data.Message,
-                                        icon: 'none'
-                                    })
-                                }
-                            },
-                            fail: (res) => {
-                                console.log(res);
-                                uni.showToast({
-                                    title: '鎺ュ彛璇锋眰澶辫触',
-                                    icon: 'none'
-                                })
-                            },
-                        });
-                    }
-                }
-            },
+							//闈炲婧愬崟妯″紡
+							if (data.HMulSourceBill == 0) {
+								this.showHSourceBillNo = false
+							}
+							this.hform.HDeptID = data.HDeptID
+							this.hform.HDeptName = data.HDeptName
+							this.hform.HSupID = data.HCusID
+							this.hform.HSupName = data.HCusName
+							this.DisBillEntryList()
+							this.tabs = 2
+						} else {
+							uni.showToast({
+								title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			addNew() {
+				uni.redirectTo({
+					url: '/pages/xiaoshouchuku/form?OperationType=1'
+				})
+			},
+			submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HKeeperName) {
+					this.hform.HKeeperID = 0
+				}
+				if (!this.hform.HSecManagerName) {
+					this.hform.HSecManagerID = 0
+				}
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else if (!this.Materlist || this.Materlist.length == 0) {
+					uni.showToast({
+						title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+						icon: 'none'
+					})
+				} else {
+					var s = 0;
+					for (var i = 0; i < this.Materlist.length; i++) {
+						if (this.Materlist[i].鏁伴噺 > 0) {
+							s = 1;
+						}
+					}
+					if (s == 0) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+						var sMainStr = JSON.stringify(this.hform);
+						uni.request({
+							url: this.serverUrl + '/WEBSController/set_SaveSellOutBill_Json',
+							method: 'POST',
+							dataType: "json",
+							data: {
+								oMain: sMainStr
+							},
+							success: (res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/xiaoshouchuku/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 500)
+											}
+										}
+									});
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}
+			},
 
-            goBack() {
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                            uni.redirectTo({
-                                url: '/pages/xiaoshouchuku/table'
-                            })
-                        } else if (res.cancel) {
-                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                        }
-                    }
-                });
-            }
-        }
-    }
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/xiaoshouchuku/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    .form {
-        width: 668rpx;
-        margin: 20rpx auto;
-        padding-bottom: 240rpx;
-    }
+	.form {
+		width: 668rpx;
+		margin: 20rpx auto;
+		padding-bottom: 240rpx;
+	}
 
-    .tab_area {
-        width: 100%;
-        height: 50rpx;
-    }
+	.tab_area {
+		width: 100%;
+		height: 50rpx;
+	}
 
-    .other {
-        margin-top: 8rpx;
-        text-align: center;
-        font-size: 28rpx;
-        padding: 4rpx 18rpx;
-        color: #1890FF;
-    }
+	.other {
+		margin-top: 8rpx;
+		text-align: center;
+		font-size: 28rpx;
+		padding: 4rpx 18rpx;
+		color: #1890FF;
+	}
 
-    .tabs {
-        width: 100%;
-        display: flex;
-        border-bottom: 1px solid #ddd;
-        margin: 20rpx 0;
+	.tabs {
+		width: 100%;
+		display: flex;
+		border-bottom: 1px solid #ddd;
+		margin: 20rpx 0;
 
-        view {
-            width: 25%;
-            font-size: 30rpx;
-            color: #555;
-            text-align: center;
-            padding: 16rpx 0;
-        }
+		view {
+			width: 25%;
+			font-size: 30rpx;
+			color: #555;
+			text-align: center;
+			padding: 16rpx 0;
+		}
 
-        .on {
-            color: #3a78ff;
-            font-weight: bold;
-            border-bottom: 3px solid #3a78ff;
-        }
-    }
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
 
-    .form-item {
-        display: flex;
-        align-items: center;
-        font-size: 30rpx;
-        padding: 6rpx 0;
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 30rpx;
+		padding: 6rpx 0;
+		gap: 12rpx;
 
-        .title {
-            width: 208rpx;
+		.title {
+			width: 208rpx;
 
-            text {
-                color: red;
-                font-weight: bold;
-            }
-        }
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
 
-        .right {
-            width: 450rpx;
-            border-radius: 22rpx;
-            border: 1px solid #acacac;
-        }
+		.right {
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+			position: relative;
+			display: flex;
+			
+			.uni-combox {
+				width: 100%;
+			}
+		}
 
-        .righton {
-            width: 450rpx;
-            border-radius: 22rpx;
-            border: 1px solid #e4e4e4;
-            background-color: #e4e4e4;
-        }
+		.righton {
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
 
-        input {
-            width: 100%;
-            padding: 8rpx 20rpx;
-            font-size: 30rpx;
-        }
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
 
-        textarea {
-            width: 98%;
-            padding: 8rpx 20rpx;
-            font-size: 30rpx;
-        }
+		textarea {
+			width: 98%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
 
-    }
+	}
 
-    .bottom-btn {
-        width: 100%;
-        box-sizing: border-box;
-        // height: 120rpx;
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        background-color: #fff;
-        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-        padding: 30rpx 40rpx 40rpx 40rpx;
-        display: flex;
-        flex-direction: row;
-        gap: 10rpx;
+	.bottom-btn {
+		width: 100%;
+		box-sizing: border-box;
+		// height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+		padding: 30rpx 40rpx 40rpx 40rpx;
+		display: flex;
+		flex-direction: row;
+		gap: 10rpx;
 
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 28rpx;
-        }
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
 
-        .btn-a {
-            background-color: #3A78FF;
-            color: #fff;
-        }
+		.btn-a {
+			background-color: #3A78FF;
+			color: #fff;
+		}
 
-        .btn-b {
-            background-color: #41a863;
-            color: #fff;
-        }
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
 
-        .btn-c {
-            background-color: #acacac;
-            color: #fff;
-            // position: absolute;
-            // right: 120rpx;
-        }
+		.btn-c {
+			background-color: #acacac;
+			color: #fff;
+			// position: absolute;
+			// right: 120rpx;
+		}
 
-        .btn-d {
-            background-color: #ff8901;
-            color: #fff;
-        }
-    }
+		.btn-d {
+			background-color: #ff8901;
+			color: #fff;
+		}
+	}
 
-    .list {
-        width: 100%;
+	.list {
+		width: 100%;
 
-        .card-detail {
-            width: 100%;
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-between;
-            line-height: 120%;
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
 
-            .detail {
-                // width: 50%;
-                font-size: 26rpx;
-                margin-bottom: 12rpx;
-                color: #555;
-                margin-right: 20rpx;
+			.detail {
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
 
-                text {
-                    color: #999;
-                    font-size: 26rpx;
-                }
-            }
-        }
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
 
-        .more {
-            color: #888;
-            font-size: 24rpx;
-            display: flex;
-            border-top: 1px solid #eee;
-            padding-top: 20rpx;
+		.more {
+			color: #888;
+			font-size: 24rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
 
-            .part {
-                width: 50%;
-                text-align: center;
-            }
-        }
-    }
+			.part {
+				width: 50%;
+				text-align: center;
+			}
+		}
+	}
+	.icon-wrapper {
+		background-color: #3A78FF;
+		border-radius: 100%;
+		width: 52rpx;
+		height: 52rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	
+		.uni-icons {
+			color: #fff !important;
+		}
+	}
+	
+	.icon-wrapper[disabled] {
+		background-color: rgba(228, 228, 228, 1);
+		pointer-events: none;
+		touch-action: none;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/zhijiediaobo/form.vue b/pages/zhijiediaobo/form.vue
index 57704d5..0382e2a 100644
--- a/pages/zhijiediaobo/form.vue
+++ b/pages/zhijiediaobo/form.vue
@@ -18,14 +18,14 @@
 				</view>
 			</view>
 			<view class="form-item">
-				<view class="title">浠撳簱:</view>
+				<view class="title">璋冨嚭浠撳簱:</view>
 				<view class="right">
 					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HSCWHName"
 						@input="HSCWHNameChange"></uni-combox>
 				</view>
 			</view>
 			<view class="form-item">
-				<view class="title">浠撲綅:</view>
+				<view class="title">璋冨嚭浠撲綅:</view>
 				<view class="right" v-show="HSCIsStockMgr">
 					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
 						v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"></uni-combox>
@@ -96,16 +96,24 @@
 				</view>
 				<view class="form-item">
 					<view class="title">璋冩嫧绫诲瀷:</view>
-					<view class="right">
+<!-- 					<view class="right" v-show="showHMainSourceBillType">
 						<uni-combox :candidates="HStockStyleArray" placeholder="璇烽�夋嫨" v-model="hform.HStockStyle"
 							@input="HStockStyleChange"></uni-combox>
+					</view> -->
+					<view class="righton" >
+						<input name="HStockStyle" disabled v-model="hform.HStockStyle"
+							placeholder="璇烽�夋嫨璋冩嫧绫诲瀷" />
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">璋冩嫧鏂瑰悜:</view>
-					<view class="right">
+					<!-- <view class="right" v-show="showHMainSourceBillType">
 						<uni-combox :candidates="arrayHTransferDirect" placeholder="璇烽�夋嫨" v-model="hform.HTransferDirect"
 							@input="HTransferDirectChange"></uni-combox>
+					</view> -->
+					<view class="righton" >
+						<input name="HTransferDirect" disabled v-model="hform.HTransferDirect"
+							placeholder="璇烽�夋嫨璋冩嫧鏂瑰悜" />
 					</view>
 				</view>
 				<view class="form-item">
@@ -186,24 +194,29 @@
 				</view>
 				<view class="form-item">
 					<view class="title">瀹㈡埛:</view>
-					<view class="right" v-show="showHSupName">
+					<!-- <view class="right" v-show="showHSupName">
 						<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName"
 							@input="HSupNameChange"></uni-combox>
-					</view>
-					<view class="righton" v-show="!showHSupName">
+					</view> -->
+					<view class="righton">
 						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
 					</view>
 				</view>
+				<!-- TODO: 璺ㄧ粍缁囪皟鐢ㄥ彲淇敼 閫変腑缁勭粐鍚庯紝浠撳簱浠撲綅涔熻鍙戠敓鍙樺寲 -->
 				<view class="form-item">
 					<view class="title">璋冨嚭缁勭粐:</view>
 					<view class="righton">
-						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+						<input name="HStockOutOrgName" disabled v-model="hform.HStockOutOrgName" />
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="title">璋冨叆缁勭粐:</view>
-					<view class="righton">
-						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+					<view class="right" v-show="!HIsStockInner">
+						<uni-combox :candidates="arrayHOrgName" placeholder="璇烽�夋嫨璋冨叆缁勭粐" v-model="hform.HStockInOrgName"
+							@input="HStockInOrgNameChange"></uni-combox>
+					</view>
+					<view class="righton" v-show="HIsStockInner">
+						<input name="HStockInOrgName" disabled v-model="hform.HStockInOrgName" />
 					</view>
 				</view>
 			</view>
@@ -404,7 +417,9 @@
 				HSourceBillNoList: [],
 				arrayHTransferDirect: [], // 璋冩嫧鏂瑰悜
 				arrayHShipType: [], // 鍑鸿揣绫诲瀷
-
+				arrayHOrgName: [], // 缁勭粐
+				arrayHOrgValue: [], // 缁勭粐瀵瑰簲ID
+				
 				arrayHBillSubType: [],
 				arrayHBillSubTypeValue: [],
 				HBillSubType: '',
@@ -423,6 +438,11 @@
 					HBillSubType: "",
 					HBillerID: uni.getStorageSync('HBillerID'),
 					HRedBlueFlag: false,
+					
+					HStockOutOrgName: uni.getStorageSync('Organization'),
+					HStockInOrgName: uni.getStorageSync('Organization'),
+					HStockInOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID: uni.getStorageSync('OrganizationID'),
 
 					HBarCode: '',
 					HQty: '',
@@ -430,7 +450,7 @@
 					HSCWHID: getUserInfo().HWhID,
 					HWHName: "",
 					HWHID: "",
-					HStockStyle: '缁勭粐鍐呰皟鎷�',
+					HStockStyle: '',
 					HOutStockPlaceName: getUserInfo().HSPName,
 					HOutStockPlaceID: getUserInfo().HSPID,
 					HStockPlaceName: getUserInfo().HSPName,
@@ -473,7 +493,8 @@
 		components: {
 			BillListPopupVue
 		},
-		onLoad(e) {
+		async onLoad(e) {
+			await this.getOrganization()
 			console.log(e, this.userInfo)
 			this.OperationType = e.OperationType
 			if (e.HInterID) {
@@ -485,6 +506,7 @@
 				this.HSourcebillNoFocus = true
 				this.getNewData()
 			}
+			
 			this.getHBaseList()
 			this.getHSupList()
 			this.getHEmpList()
@@ -492,7 +514,7 @@
 			this.set_InitBillSubType()
 			this.InitTransferDirect()
 			this.InitShipType()
-			
+
 			// this.GetSourceBillType()
 
 			uni.$on('BillSelectComplete', (e) => {
@@ -504,7 +526,50 @@
 		beforeDestroy() {
 			uni.$off('BillSelectComplete')
 		},
+		computed: {
+			HIsStockInner: {
+				get: function() {
+					if(this.hform.HStockStyle == '缁勭粐鍐呰皟鎷�') {
+						return true
+					}
+					return false
+				}
+			}
+		},
 		methods: {
+			getOrganization() {
+				return new Promise((resolve, reject) => {
+					CommonUtils.doRequest2({
+						url: '/Web/GetOrganizations',
+						resFunction: (res) => {
+							console.log("Organizations: ", res.data)
+							let {data, count, Message} = res.data
+							if(count == 1) {
+								this.arrayHOrgName = []
+								this.arrayHOrgValue = []
+								Array.from(data).forEach(e => {
+									this.arrayHOrgName.push(e.Name)
+									this.arrayHOrgValue.push(e.ID)
+								})
+								resolve()
+							}else {
+								uni.showToast({
+									icon:'none',
+									title: Message
+								})
+								reject()
+							}
+							
+						}
+					})
+				})
+			},
+			HStockInOrgNameChange(e) {
+				let index = this.arrayHOrgName.findIndex(elem => elem == e)
+				if(index != -1) {
+					this.hform.HStockInOrgID = this.arrayHOrgValue[index]
+				}
+			},
 			set_InitBillSubType() { // 鍒濆鍖栧崟鎹瓙绫诲瀷
 				this.arrayHBillSubType = []
 				this.arrayHBillSubTypeValue = []
@@ -662,7 +727,6 @@
 			},
 			// 璋冩嫧鏂瑰悜淇敼
 			HStockStyleChange(e) {
-				console.log(e)
 				this.hform.HStockStyle = e
 			},
 			//鍩虹浠撳簱璧勬枡
@@ -725,7 +789,7 @@
 					},
 				});
 
-				this.getHYDList()
+				// this.getHYDList()
 			},
 			// 璋冩嫧鏂瑰悜
 			InitTransferDirect() {
@@ -777,6 +841,8 @@
 							this.arrayHShipType = Array.from(data).map(e => {
 								return e.HName
 							})
+							
+							this.hform.HShipType = this.arrayHShipType[0]
 						} else {
 							uni.showToast({
 								icon: 'none',
@@ -814,7 +880,7 @@
 
 							this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
 							this.arrayHMainSourceBillValue.push('-1')
-							
+
 							this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
 							this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
 						} else {
@@ -1307,7 +1373,7 @@
 									this.hform.HSourceBillNo = data.hSourceBillNoField
 									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
 									this.hform.HMainSourceBillType = data.hSourceBillTypeField
-									
+
 									let index = this.arrayHMainSourceBillValue.findIndex(e => e = data
 										.hSourceBillTypeField)
 									if (index != -1) {
@@ -1546,7 +1612,7 @@
 							this.hform.HBillNo = data.HBillNo
 							this.hform.HMainSourceBillType = data.HSourceBillType
 							this.hform.HSourceBillNo = data.HSourceBillNo
-							
+
 							let index = this.arrayHMainSourceBillValue.findIndex(e => e = data.HSourceBillType)
 							if (index != -1) {
 								this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
@@ -1597,8 +1663,21 @@
 							this.hform.HDeptName = data.HDeptName
 							this.hform.HSupID = data.HCusID
 							this.hform.HSupName = data.HCusName
-							this.DisBillEntryList()
+							this.hform.HStockStyle = data.HStockStyle
+							
+							let HStockInOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.HStockInOrgID)
+							let HStockOutOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.HStockOutOrgID)
+							this.hform.HStockInOrgID = data.HStockInOrgID
+							this.hform.HStockOutOrgID = data.HStockOutOrgID
+							if(HStockInOrgIndex != -1) {
+								this.hform.HStockInOrgName = this.arrayHOrgName[HStockInOrgIndex]
+							}
+							
+							if(HStockOutOrgIndex != -1) {
+								this.hform.HStockOutOrgName = this.arrayHOrgName[HStockOutOrgIndex]
+							}
 							this.tabs = 2
+							this.DisBillEntryList()
 						} else {
 							uni.showToast({
 								title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
diff --git a/utils/userRelationManager.js b/utils/userRelationManager.js
index e2ba71f..9e7ebc2 100644
--- a/utils/userRelationManager.js
+++ b/utils/userRelationManager.js
@@ -12,6 +12,9 @@
 				console.log('getUserStockRelation res: ',res);
 				let {data, count, Message} = res.data
 				resolve({data:data, count: count})
+			},
+			errFunction: (err) => {
+				reject()
 			}
 		})
 	})

--
Gitblit v1.9.1