From e5cc05545e0f67d96ab78054d1be41cced613a51 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 11 九月 2025 09:18:52 +0800
Subject: [PATCH] 生产领料单 一键打印 生成条码 过滤空白数据

---
 pages/shouliaotongzhi/table.vue     |   14 
 manifest.json                       |    4 
 pages/shouliaotongzhi/table_son.vue |    6 
 pages/caigouruku/form.vue           | 3180 +++++++++++++++++++++++++++++-----------------------------
 4 files changed, 1,601 insertions(+), 1,603 deletions(-)

diff --git a/manifest.json b/manifest.json
index 351d099..96829e0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "鏅轰簯LMES",
     "appid" : "__UNI__B002F49",
     "description" : "",
-    "versionName" : "1.0.72",
-    "versionCode" : 172,
+    "versionName" : "1.0.74",
+    "versionCode" : 174,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/caigouruku/form.vue b/pages/caigouruku/form.vue
index ef6bc55..dd86f7b 100644
--- a/pages/caigouruku/form.vue
+++ b/pages/caigouruku/form.vue
@@ -1,79 +1,79 @@
 <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="涓嶅彲鎿嶄綔" :disabled="!showHStockPlaceName" /></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"
+                        placeholder="涓嶅彲鎿嶄綔" :disabled="!showHStockPlaceName" /></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>
+            <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>
 
-			<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" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
+            <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" :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="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                        <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>
+                    <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">
+                    <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"
@@ -82,1406 +82,1400 @@
 					<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">
-						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
-							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
-							<view class="picker-overlay"></view>
-						</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 class="icon-wrapper">
-                    	<uni-icons type="scan" size="20" @click="qrCodeDisplay"></uni-icons>
+                </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="璇烽�夋嫨鏃ユ湡" />
+                            <view class="picker-overlay"></view>
+                        </picker>
                     </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>
+                <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 class="icon-wrapper">
+                        <uni-icons type="scan" size="20" @click="qrCodeDisplay"></uni-icons>
+                    </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">
+            <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 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 class="detail" v-if="item.娆惧彿">
-								<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 class="detail" v-if="item.娆惧彿">
+                                <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 == 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>
-		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
-			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+            <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>
         <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
     </view>
 </template>
 <script>
-	import getDateTime from '@/utils/getdateTime.js';
-	import {
-		getUserInfo
-	} from "@/utils/auth.js";
-	import {
-		CommonUtils
-	} from '../../utils/common';
-	import {
-		getUserStockRelation
-	} from "@/utils/userRelationManager.js"
-	import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
-	import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    import getDateTime from '@/utils/getdateTime.js';
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import {
+        CommonUtils
+    } from '../../utils/common';
+    import {
+        getUserStockRelation
+    } from "@/utils/userRelationManager.js"
+    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
     export default {
-		data() {
-			return {
-				HSourceBillNoFocus: false,
-				barCodeFocus: false,
-				userInfo: getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				HModName: 'Kf_POStockInBill_PDA',
-				ModRightName: 'CE_POStockIn',
-				OperationType: 1,
-				HInterID_Temp: '',
-				HPageTitle: '閲囪喘鍏ュ簱鍗�',
+        data() {
+            return {
+                HSourceBillNoFocus: false,
+                barCodeFocus: false,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                HModName: 'Kf_POStockInBill_PDA',
+                ModRightName: 'CE_POStockIn',
+                OperationType: 1,
+                HInterID_Temp: '',
+                HPageTitle: '閲囪喘鍏ュ簱鍗�',
 
 
                 materMeta: [
-                    
+
                 ],
-                
-				showHStockPlaceName: false,
-				showHMainSourceBillType: true,
-				showHSourceBillNo: true,
-				reHSourceBillNo: true,
-				showHSupName: true,
 
-				tabs: 0,
-				HMainSourceBillType: '鏀舵枡閫氱煡鍗�',
-				arrayHMainSourceBillType: ['鏀舵枡閫氱煡鍗�', '閲囪喘璁㈠崟', '鎵嬪伐褰曞叆'],
-				arrayHMainSourceBillValue: ['1103', '1101', '-1'],
+                showHStockPlaceName: false,
+                showHMainSourceBillType: true,
+                showHSourceBillNo: true,
+                reHSourceBillNo: true,
+                showHSupName: true,
 
-				linterid: '',
-				HBillNo: '',
-				btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
-				showmore: false,
+                tabs: 0,
+                HMainSourceBillType: '鏀舵枡閫氱煡鍗�',
+                arrayHMainSourceBillType: ['鏀舵枡閫氱煡鍗�', '閲囪喘璁㈠崟', '鎵嬪伐褰曞叆'],
+                arrayHMainSourceBillValue: ['1103', '1101', '-1'],
 
-				arrayHWHName: [], //浠撳簱
-				HWHNameList: [],
-				arrayHStockPlaceName: [], //浠撲綅
-				HStockPlaceNameList: [],
-				arrayHSourceBillNo: [], //婧愬崟鍗曞彿
-				HSourceBillNoList: [],
+                linterid: '',
+                HBillNo: '',
+                btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+                showmore: false,
 
-				arrayHEmpName: [], //鎿嶄綔鍛�
-				HEmpNameList: [],
-				arrayHDeptName: [], //閮ㄩ棬
-				HDeptNameList: [],
-				arrayHSupName: [], //渚涘簲鍟�
-				HSupNameList: [],
+                arrayHWHName: [], //浠撳簱
+                HWHNameList: [],
+                arrayHStockPlaceName: [], //浠撲綅
+                HStockPlaceNameList: [],
+                arrayHSourceBillNo: [], //婧愬崟鍗曞彿
+                HSourceBillNoList: [],
 
-				Materlist: [],
-				hform: {
-					HBillType: 1201,
-					HBillerID: uni.getStorageSync('HBillerID'),
-					HRedBlueFlag: false,
+                arrayHEmpName: [], //鎿嶄綔鍛�
+                HEmpNameList: [],
+                arrayHDeptName: [], //閮ㄩ棬
+                HDeptNameList: [],
+                arrayHSupName: [], //渚涘簲鍟�
+                HSupNameList: [],
 
-					HBarCode: '',
-					HQty: '',
-					HWHName: getUserInfo().HWHName,
-					HWHID: getUserInfo().HWhID,
-					HStockPlaceName: getUserInfo().HSPName,
-					HStockPlaceID: getUserInfo().HSPID,
+                Materlist: [],
+                hform: {
+                    HBillType: 1201,
+                    HBillerID: uni.getStorageSync('HBillerID'),
+                    HRedBlueFlag: false,
 
-					HMainSourceBillType: 1103,
-					HSourceBillNo: '', //CGDD000200
-					HDate: getDateTime.dateTimeStr('y-m-d'),
-					HMaker: uni.getStorageSync('HUserName'),
-					HBillNo: '',
-					HInterID: '',
+                    HBarCode: '',
+                    HQty: '',
+                    HWHName: getUserInfo().HWHName,
+                    HWHID: getUserInfo().HWhID,
+                    HStockPlaceName: getUserInfo().HSPName,
+                    HStockPlaceID: getUserInfo().HSPID,
 
-					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'),
+                    HMainSourceBillType: 1103,
+                    HSourceBillNo: '', //CGDD000200
+                    HDate: getDateTime.dateTimeStr('y-m-d'),
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HBillNo: '',
+                    HInterID: '',
 
-					HBarCode_B: '',
-					HMaterName_B: '',
-					HMaterModel_B: '',
-					HBatchNo_B: '',
-					HUnitName_B: '',
-					HQty_B: '',
-					HTMQty_B: '',
-					HWHName_B: '',
-					HSPName_B: '',
-				}
-			}
-		},
-		components: {
-			BillListPopupVue, BarCodePopupVue
-		},
-		onLoad(e) {
-			console.log(e, this.userInfo)
-			this.OperationType = e.OperationType
-			if (e.HInterID) {
-				this.HInterID_Temp = e.HInterID
-				// this.btnType = 1
-				this.RoadBillMain(e.HInterID)
-				this.barCodeFocus = true
-			} else {
-				this.getNewData()
-				this.HSourceBillNoFocus = true
-			}
+                    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'),
 
-			this.getHSupList()
-			this.getHEmpList()
-			this.getHDeptList()
-			this.GetSourceBillType()
-			this.getRelationStore()
-			uni.$on('BillSelectComplete', (e) => {
-				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
-				this.getHBarCodeData(e.HBillNo)
-				this.$refs.billList.exit()
-			})
-		},
-		onUnload() {
-			uni.$off('BillSelectComplete')
-		},
-		methods: {
+                    HBarCode_B: '',
+                    HMaterName_B: '',
+                    HMaterModel_B: '',
+                    HBatchNo_B: '',
+                    HUnitName_B: '',
+                    HQty_B: '',
+                    HTMQty_B: '',
+                    HWHName_B: '',
+                    HSPName_B: '',
+                }
+            }
+        },
+        components: {
+            BillListPopupVue,
+            BarCodePopupVue
+        },
+        onLoad(e) {
+            console.log(e, this.userInfo)
+            this.OperationType = e.OperationType
+            if (e.HInterID) {
+                this.HInterID_Temp = e.HInterID
+                // this.btnType = 1
+                this.RoadBillMain(e.HInterID)
+                this.barCodeFocus = true
+            } else {
+                this.getNewData()
+                this.HSourceBillNoFocus = true
+            }
+
+            this.getHSupList()
+            this.getHEmpList()
+            this.getHDeptList()
+            this.GetSourceBillType()
+            this.getRelationStore()
+            uni.$on('BillSelectComplete', (e) => {
+                console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+                this.getHBarCodeData(e.HBillNo)
+                this.$refs.billList.exit()
+            })
+        },
+        onUnload() {
+            uni.$off('BillSelectComplete')
+        },
+        methods: {
             async qrCodeDisplay() {
                 try {
                     this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
                     await this.$nextTick()
                     this.$refs.barcodePopup.open()
-                }catch(err) {
+                } catch (err) {
                     uni.showToast({
                         icon: 'none',
                         title: err
                     })
                 }
             },
-			async getRelationStore() {
-				let {
-					data,
-					count
-				} = await getUserStockRelation()
-				console.log('count: ', count);
-				if (count == 1) {
-					let WHIDList = []
+            async getRelationStore() {
+                let {
+                    data,
+                    count
+                } = await getUserStockRelation()
+                console.log('count: ', count);
+                if (count == 1) {
+                    let WHIDList = []
 
-					Array.from(data).forEach(elem => {
-						WHIDList.push(elem.HItemID)
-					})
+                    Array.from(data).forEach(elem => {
+                        WHIDList.push(elem.HItemID)
+                    })
 
-					let sWhere = ` and HItemID in (${WHIDList.join(",")})`
-					this.getHBaseList({
-						sWhere: sWhere
-					})
+                    let sWhere = ` and HItemID in (${WHIDList.join(",")})`
+                    this.getHBaseList({
+                        sWhere: sWhere
+                    })
 
-				} else {
-					this.getHBaseList()
-				}
-			},
-			async refreshHSourceBillState() {
-				this.HSourceBillNoFocus = false
-				await this.$nextTick(() => {
-					this.HSourceBillNoFocus = true
-					this.hform.HSourceBillNo = ""
-					
-				})
-			},
-			async refreshBarCodeState() {
-				this.barCodeFocus = false
-				await this.$nextTick(() => {
-					this.barCodeFocus = true
-					this.hform.HBarCode = ""
-				})
-			},
-			playSound(e) {
-				const innerAudioContext = uni.createInnerAudioContext();
-				if (e == 1) {
-					innerAudioContext.src = '/static/success.wav';
-				} else {
-					innerAudioContext.src = '/static/jingbao.wav';
-				}
-				innerAudioContext.play(); // 鎾斁闊抽
-			},
-			//鎵爜
-			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
-					}
+                } else {
+                    this.getHBaseList()
+                }
+            },
+            async refreshHSourceBillState() {
+                this.HSourceBillNoFocus = false
+                await this.$nextTick(() => {
+                    this.HSourceBillNoFocus = true
+                    this.hform.HSourceBillNo = ""
 
-					this.getCode(this.hform.HBarCode)
-				})
-			},
+                })
+            },
+            async refreshBarCodeState() {
+                this.barCodeFocus = false
+                await this.$nextTick(() => {
+                    this.barCodeFocus = true
+                    this.hform.HBarCode = ""
+                })
+            },
+            playSound(e) {
+                const innerAudioContext = uni.createInnerAudioContext();
+                if (e == 1) {
+                    innerAudioContext.src = '/static/success.wav';
+                } else {
+                    innerAudioContext.src = '/static/jingbao.wav';
+                }
+                innerAudioContext.play(); // 鎾斁闊抽
+            },
+            //鎵爜
+            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
+                    }
 
-			//鎵叾浠�(浠撳簱锛屼粨浣�)
-			// 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
-			},
-			async onSourceBillBlurHandler() {
-				if (this.hform.HMainSourceBillType == -1) {
-					this.playSound(1)
-					this.barCodeFocus = true
-					return
-				}
+                    this.getCode(this.hform.HBarCode)
+                })
+            },
 
-				let inputVal = ''
-				if (this.$refs.uniComboxSourceBill) {
-					inputVal = this.$refs.uniComboxSourceBill.inputVal || this.hform.HSourceBillNo
-				} else {
-					inputVal = this.hform.HSourceBillNo
-				}
-                
-                console.log('inputVal: ',inputVal);
-				if (inputVal == '') {
-					CommonUtils.playSound(0)
-					this.refreshHSourceBillState()
-					return uni.showToast({
-						icon: 'none',
-						Message: '婧愬崟鍗曞彿涓嶅緱涓虹┖...'
-					})
-				}
-				this.getHBarCodeData(inputVal)
+            //鎵叾浠�(浠撳簱锛屼粨浣�)
+            // 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
+            },
+            async onSourceBillBlurHandler() {
+                if (this.hform.HMainSourceBillType == -1) {
+                    this.playSound(1)
+                    this.barCodeFocus = true
+                    return
+                }
 
-			},
-			//鍩虹浠撳簱璧勬枡
-			getHBaseList({
-				sWhere = ""
-			} = {}) {
-				uni.request({
-					url: this.serverUrl + '/Gy_Warehouse/list',
-					data: {
-						sWhere: 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'
-						})
-					},
-				});
+                let inputVal = ''
+                if (this.$refs.uniComboxSourceBill) {
+                    inputVal = this.$refs.uniComboxSourceBill.inputVal || this.hform.HSourceBillNo
+                } else {
+                    inputVal = this.hform.HSourceBillNo
+                }
 
-				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'
-						})
-					},
-				});
+                console.log('inputVal: ', inputVal);
+                if (inputVal == '') {
+                    CommonUtils.playSound(0)
+                    this.refreshHSourceBillState()
+                    return uni.showToast({
+                        icon: 'none',
+                        Message: '婧愬崟鍗曞彿涓嶅緱涓虹┖...'
+                    })
+                }
+                this.getHBarCodeData(inputVal)
 
-				// this.getHYDList()
-			},
-			// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
-			async GetSourceBillType() {
-				CommonUtils.doRequest2({
-					url: '/Web/GetHSourceBillTypeByBillType',
-					data: {
-						HBillType: this.hform.HBillType,
-						Num: 2
-					},
-					resFunction: (res) => {
-						let {
-							data,
-							count,
-							Message
-						} = res.data
-						if (count == 1) {
-							// console.log('data: ', data);
-							this.arrayHMainSourceBillType = []
-							this.arrayHMainSourceBillValue = []
-							Array.from(data).forEach(e => {
-								this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
-								this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
-							})
+            },
+            //鍩虹浠撳簱璧勬枡
+            getHBaseList({
+                sWhere = ""
+            } = {}) {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Warehouse/list',
+                    data: {
+                        sWhere: 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.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
-							this.arrayHMainSourceBillValue.push('-1')
+                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.HMainSourceBillType = this.arrayHMainSourceBillType[0]
-							this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: Message
-							})
-						}
-					}
-				})
-			},
-			//婧愬崟璧勬枡
-			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 = []
-							this.arrayHSourceBillNo = []
-							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'
-						})
-					},
-				});
+                // this.getHYDList()
+            },
+            // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
+            async GetSourceBillType() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetHSourceBillTypeByBillType',
+                    data: {
+                        HBillType: this.hform.HBillType,
+                        Num: 2
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            // console.log('data: ', data);
+                            this.arrayHMainSourceBillType = []
+                            this.arrayHMainSourceBillValue = []
+                            Array.from(data).forEach(e => {
+                                this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+                                this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+                            })
+
+                            this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+                            this.arrayHMainSourceBillValue.push('-1')
+
+                            this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+                            this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            //婧愬崟璧勬枡
+            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 = []
+                            this.arrayHSourceBillNo = []
+                            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
+            },
+            //閫夋嫨浠撳簱
+            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
 
-						if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
-							this.showHStockPlaceName = true
-						} else {
-							this.hform.HStockPlaceName = ''
-							this.showHStockPlaceName = false
-						}
-					}
-				}
-			},
-			//閫夋嫨浠撲綅
-			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.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+                            this.showHStockPlaceName = true
+                        } else {
+                            this.hform.HStockPlaceName = ''
+                            this.showHStockPlaceName = false
+                        }
+                    }
+                }
+            },
+            //閫夋嫨浠撲綅
+            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]
 
-				let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
-				if (index != -1) {
-					this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
-					// this.getHYDList()
-				}
-			},
+                let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
+                if (index != -1) {
+                    this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
+                    // this.getHYDList()
+                }
+            },
 
-			//鑾峰彇渚涘簲鍟嗘暟鎹�
-			getHSupList() {
-				if (!this.hform.HStockOrgID) {
-					var HOtherOrgID = 0;
-				} else {
-					var HOtherOrgID = this.hform.HStockOrgID
-				}
-				uni.request({
-					url: this.serverUrl + '/Web/GetSupplierList_Json',
-					data: {
-						Supplier: '',
-						HOrgID: HOtherOrgID
-					},
-					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].HName
-							}
-							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].HName == e) {
-						this.hform.HSupID = this.HSupNameList[i].HItemID
-						this.hform.HSupName = this.HSupNameList[i].HName
-					}
-				}
-			},
-			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-			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) {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/Get_SourceBarCode_POStockIn_Json',
-					data: {
-						HInterID: this.hform.HInterID,
-						HBillNo: this.hform.HBillNo,
-						HBillType: this.hform.HBillType,
-						HSourceBillNo: HBarCode,
-						HSourceBillType: this.hform.HMainSourceBillType,
-						HMaker: this.hform.HMaker,
-						HStockOrgID: this.hform.HStockOrgID
-					},
-					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 {
-							console.log('res.data.Message: ',res.data.Message);
-							this.refreshHSourceBillState()
-							this.playSound(0)
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						this.refreshHSourceBillState()
-						this.playSound(0)
-						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() {
+                if (!this.hform.HStockOrgID) {
+                    var HOtherOrgID = 0;
+                } else {
+                    var HOtherOrgID = this.hform.HStockOrgID
+                }
+                uni.request({
+                    url: this.serverUrl + '/Web/GetSupplierList_Json',
+                    data: {
+                        Supplier: '',
+                        HOrgID: HOtherOrgID
+                    },
+                    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].HName
+                            }
+                            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].HName == e) {
+                        this.hform.HSupID = this.HSupNameList[i].HItemID
+                        this.hform.HSupName = this.HSupNameList[i].HName
+                    }
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            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) {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/Get_SourceBarCode_POStockIn_Json',
+                    data: {
+                        HInterID: this.hform.HInterID,
+                        HBillNo: this.hform.HBillNo,
+                        HBillType: this.hform.HBillType,
+                        HSourceBillNo: HBarCode,
+                        HSourceBillType: this.hform.HMainSourceBillType,
+                        HMaker: this.hform.HMaker,
+                        HStockOrgID: this.hform.HStockOrgID
+                    },
+                    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 {
+                            console.log('res.data.Message: ', res.data.Message);
+                            this.refreshHSourceBillState()
+                            this.playSound(0)
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        this.refreshHSourceBillState()
+                        this.playSound(0)
+                        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) => {
-								console.log(res);
-								this.refreshBarCodeState()
-								this.playSound(0)
-								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
-									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                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) => {
+                                console.log(res);
+                                this.refreshBarCodeState()
+                                this.playSound(0)
+                                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
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
 
-									let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
-										.hSourceBillTypeField)
-									if (index != -1) {
-										this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-										this.hform.HMainSourceBillType = data.hSourceBillTypeField
-										this.showHMainSourceBillType = false
-									}
-									// if (data.hSourceBillTypeField == "1103") {
-									// 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-									// 	this.hform.HMainSourceBillType = 1103
-									// 	this.showHMainSourceBillType = false
-									// } else if (data.hSourceBillTypeField == "1102") {
-									// 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-									// 	this.hform.HMainSourceBillType = 1102
-									// 	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 { //鐗╂枡鏉$爜
+                                    let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                        .hSourceBillTypeField)
+                                    if (index != -1) {
+                                        this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                        this.showHMainSourceBillType = false
+                                    }
+                                    // if (data.hSourceBillTypeField == "1103") {
+                                    // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+                                    // 	this.hform.HMainSourceBillType = 1103
+                                    // 	this.showHMainSourceBillType = false
+                                    // } else if (data.hSourceBillTypeField == "1102") {
+                                    // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
+                                    // 	this.hform.HMainSourceBillType = 1102
+                                    // 	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.materMeta.push(data)
-									this.tabs = 2
-									if (!this.hform.HSourceBillNo) {
-										this.hform.HSupName = data.hSupNameField
-										this.hform.HSupID = data.hSupIDField
-										this.hform.HSourceBillNo = data.hSourceBillNoField
-										if (data.hDeptIDField != 0) {
-											this.hform.HDeptID = data.hDeptIDField
-											this.hform.HDeptName = data.hDeptNameField
-										}
-										console.log(data)
-										//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-										this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                    this.tabs = 2
+                                    if (!this.hform.HSourceBillNo) {
+                                        this.hform.HSupName = data.hSupNameField
+                                        this.hform.HSupID = data.hSupIDField
+                                        this.hform.HSourceBillNo = data.hSourceBillNoField
+                                        if (data.hDeptIDField != 0) {
+                                            this.hform.HDeptID = data.hDeptIDField
+                                            this.hform.HDeptName = data.hDeptNameField
+                                        }
+                                        console.log(data)
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
 
-										let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
-											.hSourceBillTypeField)
-										if (index != -1) {
-											this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-											this.hform.HMainSourceBillType = data.hSourceBillTypeField
-											this.showHMainSourceBillType = false
-										}
-										// if (data.hSourceBillTypeField == "1103") {
-										// 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-										// 	this.hform.HMainSourceBillType = 1103
-										// 	this.showHMainSourceBillType = false
-										// } else if (data.hSourceBillTypeField == "1102") {
-										// 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-										// 	this.hform.HMainSourceBillType = 1102
-										// 	this.showHMainSourceBillType = false
-										// } else {
-										// 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-										// 	this.hform.HMainSourceBillType = -1
-										// 	this.showHMainSourceBillType = false
-										// }
-										if (data.hMulSourceFlagField == 0) {
-											this.showHSourceBillNo = false
-										}
-										//渚涘簲鍟嗕笉鍙紪杈�
-										this.showHSupName = false
-										
-									}
-								}
-								//鏄剧ず琛ㄤ綋鏄庣粏
-								this.DisBillEntryList()
-								//娓呯┖鏁伴噺
-								this.hform.HQty = ''
-								//鍏夋爣瀵瑰噯鏉$爜
-								this.refreshBarCodeState()
-							} 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
+                                        let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                            .hSourceBillTypeField)
+                                        if (index != -1) {
+                                            this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                            this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                            this.showHMainSourceBillType = false
+                                        }
+                                        // if (data.hSourceBillTypeField == "1103") {
+                                        // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+                                        // 	this.hform.HMainSourceBillType = 1103
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else if (data.hSourceBillTypeField == "1102") {
+                                        // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
+                                        // 	this.hform.HMainSourceBillType = 1102
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else {
+                                        // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                        // 	this.hform.HMainSourceBillType = -1
+                                        // 	this.showHMainSourceBillType = false
+                                        // }
+                                        if (data.hMulSourceFlagField == 0) {
+                                            this.showHSourceBillNo = false
+                                        }
+                                        //渚涘簲鍟嗕笉鍙紪杈�
+                                        this.showHSupName = false
+
+                                    }
+                                }
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                this.DisBillEntryList()
+                                //娓呯┖鏁伴噺
+                                this.hform.HQty = ''
+                                //鍏夋爣瀵瑰噯鏉$爜
+                                this.refreshBarCodeState()
+                            } 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.materMeta = data.BarCodeDetailslist
-							this.Materlist = data.Materlist
-							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.Materlist = data.Materlist
+                            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.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
-								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
-
-							let index = this.arrayHMainSourceBillValue.findIndex(e => e == data.HSourceBillType)
-							if (index != -1) {
-								this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-								this.hform.HMainSourceBillType = data.HSourceBillType
-								if (this.HMainSourceBillType != -1) {
-									this.showHSupName = false
-								}
-							}
-							// if (data.HSourceBillType == 1103) {
-							// 	this.hform.HMainSourceBillType = 1103
-							// 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-							// 	this.showHSupName = false
-							// } else if (data.HSourceBillType == 1102) {
-							// 	this.hform.HMainSourceBillType = 1102
-							// 	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.HSupName
-							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/caigouruku/form?OperationType=1'
-				})
-			},
-			submit() {
-				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
-				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_SavePOStockInBill_Json',
-							method: 'POST',
-							dataType: "json", 
-                            timeout: 10000,
-							data: {
-								oMain: sMainStr
-							},
-							success: async (res) => {
-								console.log(1, res);
-								uni.hideLoading()
-								if (res.data.count == 1) {
-                                    let sMain = JSON.stringify(this.materMeta) + ';' + this.hform.HBillType + ';' + this.hform.HSourceBillNo
-                                    try {
-                                        // 涓烘潯鐮佽缃嚭搴撳崟鍙峰拰鍑哄簱娆℃暟
-                                        // await this.Set_BarCodeBill(sMain)
-                                        uni.showModal({
-                                        	title: '鎻愮ず',
-                                        	content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-                                        	success: (res) => {
-                                        		if (res.confirm) {
-                                        			console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                                        			uni.redirectTo({
-                                        				url: '/pages/caigouruku/form?OperationType=1'
-                                        			})
-                                        		} else if (res.cancel) {
-                                        			console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                        			// setTimeout(() => {
-                                        			// 	uni.navigateBack();
-                                        			// }, 50)
-                                        		}
-                                        	}
-                                        });
-                                    }catch(err) {
+                                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: err,
-                                        	icon: 'none'
+                                            title: res.data.Message,
+                                            icon: 'none'
                                         })
                                     }
-                                    
-									
-								} else {
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									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
 
-			showBillList() {
-				this.$refs.billList.showPopup()
-			},
+                            let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                .HSourceBillType)
+                            if (index != -1) {
+                                this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                this.hform.HMainSourceBillType = data.HSourceBillType
+                                if (this.HMainSourceBillType != -1) {
+                                    this.showHSupName = false
+                                }
+                            }
+                            // if (data.HSourceBillType == 1103) {
+                            // 	this.hform.HMainSourceBillType = 1103
+                            // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 1102) {
+                            // 	this.hform.HMainSourceBillType = 1102
+                            // 	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.HSupName
+                            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/caigouruku/form?OperationType=1'
+                })
+            },
+            submit() {
+                //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                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_SavePOStockInBill_Json',
+                            method: 'POST',
+                            dataType: "json",
+                            timeout: 10000,
+                            data: {
+                                oMain: sMainStr
+                            },
+                            success: (res) => {
+                                console.log(1, res);
+                                uni.hideLoading()
+                                if (res.data.count == 1) {
+                                    let sMain = JSON.stringify(this.materMeta) + ';' + this.hform
+                                        .HBillType + ';' + this.hform.HSourceBillNo
+                                    // 涓烘潯鐮佽缃嚭搴撳崟鍙峰拰鍑哄簱娆℃暟
+                                    // await this.Set_BarCodeBill(sMain)
+                                    uni.showModal({
+                                        title: '鎻愮ず',
+                                        content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                                        success: (res) => {
+                                            if (res.confirm) {
+                                                console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                                uni.redirectTo({
+                                                    url: '/pages/caigouruku/form?OperationType=1'
+                                                })
+                                            } else if (res.cancel) {
+                                                console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                                // setTimeout(() => {
+                                                // 	uni.navigateBack();
+                                                // }, 50)
+                                            }
+                                        }
+                                    });
+                                } else {
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                }
+                            },
+                            fail: (res) => {
+                                console.log(res);
+                                uni.showToast({
+                                    title: '鎺ュ彛璇锋眰澶辫触',
+                                    icon: 'none'
+                                })
+                            },
+                        });
+                    }
+                }
+            },
+
+            showBillList() {
+                this.$refs.billList.showPopup()
+            },
             Set_BarCodeBill(sMain) {
                 return new Promise((resolve, reject) => {
                     CommonUtils.doRequest2({
@@ -1491,230 +1485,234 @@
                             msg: sMain
                         },
                         resFunction: (res) => {
-                            let {data, count, Message} = res.data
-                            if(count == 1) {
+                            let {
+                                data,
+                                count,
+                                Message
+                            } = res.data
+                            if (count == 1) {
                                 resolve()
-                            }else {
+                            } else {
                                 reject(Message)
                             }
                         }
                     })
                 })
             },
-			goBack() {
-				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
-					success: (res) => {
-						if (res.confirm) {
-							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							uni.redirectTo({
-								url: '/pages/caigouruku/table'
-							})
-						} else if (res.cancel) {
-							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-						}
-					}
-				});
-			}
-		}
-	}
+            goBack() {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.redirectTo({
+                                url: '/pages/caigouruku/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;
-		gap: 12rpx;
+    .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 {
-			flex: 1;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-			position: relative;
-			display: flex;
+        .right {
+            flex: 1;
+            border-radius: 22rpx;
+            border: 1px solid #acacac;
+            position: relative;
+            display: flex;
 
-			picker {
-				width: 100%;
-			}
-			
-			.uni-combox {
-				width: 100%;
-			}
-		}
+            picker {
+                width: 100%;
+            }
 
-		.righton {
-			flex: 1;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
+            .uni-combox {
+                width: 100%;
+            }
+        }
+
+        .righton {
+            flex: 1;
+            border-radius: 22rpx;
+            border: 1px solid #e4e4e4;
+            background-color: #e4e4e4;
 
 
-		}
+        }
 
-		input {
-			width: inherit;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
+        input {
+            width: inherit;
+            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 {
-		box-sizing: border-box;
-		width: 100%;
-		// 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 {
+        box-sizing: border-box;
+        width: 100%;
+        // 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;
-		}
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+        }
 
-		.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;
+    .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;
-		}
-	}
+        .uni-icons {
+            color: #fff !important;
+        }
+    }
 
-	.icon-wrapper[disabled] {
-		background-color: rgba(228, 228, 228, 1);
-		pointer-events: none;
-		touch-action: none;
-	}
+    .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/shouliaotongzhi/table.vue b/pages/shouliaotongzhi/table.vue
index bf3f7e6..797b67b 100644
--- a/pages/shouliaotongzhi/table.vue
+++ b/pages/shouliaotongzhi/table.vue
@@ -286,10 +286,10 @@
                         HFactory: printerOne['瀹㈡埛缂栧彿'],
                     })
                     let HBarCode = this.getHBarCode({
-                        HBillNo: printInfoClone.HBillNo,
+                        HBillNo: printInfoClone.HBillNo.trim(),
                         HSubID: printInfoClone.HSubID,
-                        HMaterNumber: printInfoClone.HMaterNumber,
-                        HMTONo: printInfoClone.HMTONo,
+                        HMaterNumber: printInfoClone.HMaterNumber.trim(),
+                        HMTONo: printInfoClone.HMTONo.trim(),
                         HQty: printInfoClone.HQty
                     })
                     printInfoClone.HBarCode = HBarCode
@@ -355,7 +355,6 @@
                     HDate,
                     HInnerBillNo
                 } = printerInfoModel
-                console.log("HFurnaceNO", HFurnaceNO)
                 let pcsInfo = HPcsName ? '(' + HPcsName + ')' : ''
                 let HFurnaceNo = HFurnaceNO.split('.')
 
@@ -369,8 +368,8 @@
                     "ENDQR\r\n",
                     `T 24 0 0 30 渚涘簲鍟�: ${HSupNameShort}\r\n`,
                     `T 55 0 0 55 (Supplier)\r\n`,
-                    `T 24 0 220 30 瀹㈡埛缂栧彿: ${HFactory || ''}\r\n`,
-                    `T 55 0 220 55 (Consumer No.)\r\n`,
+                    `T 24 0 250 30 瀹㈡埛缂栧彿: ${HFactory || ''}\r\n`,
+                    `T 55 0 250 55 (Consumer No.)\r\n`,
                     `T 24 0 0 75 鐗╂枡缂栫爜: ${HMaterNumber}\r\n`,
                     `T 55 0 0 100 (Material Number)\r\n`,
                     `T 24 0 0 120 鐗╂枡鍚嶇О: ${HMaterName}\r\n`,
@@ -391,7 +390,7 @@
                     `L 80 325 230 325 3\r\n`,
                     `T 55 0 0 325 (QC)\r\n`,
                     `T 24 0 240 300 閲囪喘鍗曞彿: ${HInnerBillNo || ''}\r\n`,
-                    `T 55 0 300 325 (Purchase Order No.)\r\n`,
+                    `T 55 0 240 325 (Purchase Order No.)\r\n`,
                     `T 24 0 0 345 妫�楠岀粨鏋�: \r\n`,
                     `T 55 0 0 370 (Inspection status)\r\n`,
                     `BOX 240 345 260 365 4\r\n`,
@@ -450,6 +449,7 @@
                     
                 } catch (e) {
                     console.error('e: ',e);
+                    this.printInfo = "" // 娓呯┖鎵撳嵃缂撳瓨 
                     uni.showModal({
                         title: '娓╅Θ鎻愮ず',
                         content: `鐗╂枡鍚�: ${printerOne['鐗╂枡鍚嶇О']} 娆惧彿: ${printerOne['娆惧彿']} 鍑虹幇閿欒锛屽凡閫�鍑烘墦鍗版祦绋媊,
diff --git a/pages/shouliaotongzhi/table_son.vue b/pages/shouliaotongzhi/table_son.vue
index 9eea15f..6057355 100644
--- a/pages/shouliaotongzhi/table_son.vue
+++ b/pages/shouliaotongzhi/table_son.vue
@@ -403,8 +403,8 @@
 ENDQR
 T 24 0 0 30 渚涘簲鍟�: ${this.baseInfo.HSupNameShort}
 T 55 0 0 55 (Supplier)
-T 24 0 220 30 瀹㈡埛缂栧彿: ${this.baseInfo.HFactory || ''}
-T 55 0 220 55 (Consumer No.)
+T 24 0 250 30 瀹㈡埛缂栧彿: ${this.baseInfo.HFactory || ''}
+T 55 0 250 55 (Consumer No.)
 T 24 0 0 75 鐗╂枡缂栫爜: ${this.baseInfo.HMaterNumber}
 T 55 0 0 100 (Material Number)
 T 24 0 0 120 鐗╂枡鍚嶇О: ${this.baseInfo.HMaterName}
@@ -425,7 +425,7 @@
 L 80 325 230 325 3
 T 55 0 0 325 (QC)  
 T 24 0 240 300 閲囪喘鍗曞彿: ${this.baseInfo.HInnerBillNo || ''}
-T 55 0 300 325 (Purchase Order No.)  
+T 55 0 240 325 (Purchase Order No.)  
 T 24 0 0 345 妫�楠岀粨鏋�: 
 T 55 0 0 370 (Inspection status) 
 BOX 240 345 260 365 4

--
Gitblit v1.9.1