From 346d8baddff15bebed6594e088378ccb64f62df4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 03 九月 2025 10:07:41 +0800
Subject: [PATCH] 调整 条码拆码2 模块

---
 pages/tiaomachaima/tiaomachaima.vue                            |    4 
 components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue |   10 
 pages/xiaoshouchuku/form.vue                                   |    6 
 pages/tiaomachaima/tiaomachaima2.vue                           |  963 +++++++++++++++++++++++++++++--------------------------
 pages/caigouruku/form.vue                                      |    8 
 5 files changed, 524 insertions(+), 467 deletions(-)

diff --git a/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue b/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue
index 2b2570f..330fa92 100644
--- a/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue
+++ b/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue
@@ -3,16 +3,16 @@
         <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
             <view class="content">
                 <view class="search-condition">
-                    <view class="title"><text>鍑哄簱閫氱煡鍗曞彿: </text></view>
-                    <view class="right"><input type="text" v-model="HBillNo" /></view>
+                    <view class="title"><text>鍙戣揣閫氱煡鍗曞彿: </text></view>
+                    <view class="right"><input type="text" v-model="HBillNo" @confirm="search" /></view>
                 </view>
                 <view class="search-condition">
                     <view class="title"><text>瀹㈡埛: </text></view>
-                    <view class="right"><input type="text" v-model="HCustomer" /></view>
+                    <view class="right"><input type="text" v-model="HCustomer" @confirm="search" /></view>
                 </view>
                 <view class="search-condition">
                     <view class="title"><text>閿�鍞憳: </text></view>
-                    <view class="right"><input type="text" v-model="HSeller" /></view>
+                    <view class="right"><input type="text" v-model="HSeller" @confirm="search" /></view>
                 </view>
                 <view class="search-condition">
                     <view class="title">
@@ -233,7 +233,7 @@
                 }
 
                 if (!CommonUtils.isEmpty(this.HBillNo)) {
-                    sWhere += ` and 鍗曟嵁鍙� like N'%${this.HMaterialID}%'`
+                    sWhere += ` and 鍗曟嵁鍙� like N'%${this.HBillNo}%'`
                 }
                 if (!CommonUtils.isEmpty(this.HCustomer)) {
                     sWhere += ` and 瀹㈡埛 like N'%${this.HCustomer}%'`
diff --git a/pages/caigouruku/form.vue b/pages/caigouruku/form.vue
index 53c5947..f51aa2a 100644
--- a/pages/caigouruku/form.vue
+++ b/pages/caigouruku/form.vue
@@ -555,7 +555,8 @@
 				} else {
 					inputVal = this.hform.HSourceBillNo
 				}
-
+                
+                console.log('inputVal: ',inputVal);
 				if (inputVal == '') {
 					CommonUtils.playSound(0)
 					this.refreshHSourceBillState()
@@ -1408,7 +1409,8 @@
 						uni.request({
 							url: this.serverUrl + '/WEBSController/set_SavePOStockInBill_Json',
 							method: 'POST',
-							dataType: "json",
+							dataType: "json", 
+                            timeout: 10000,
 							data: {
 								oMain: sMainStr
 							},
@@ -1416,7 +1418,7 @@
 								console.log(1, res);
 								uni.hideLoading()
 								if (res.data.count == 1) {
-                                    let sMain = JSON.stringify(this.materMeta) + ';' + this.hform.HBillType + ';' + this.hform.HBillNo
+                                    let sMain = JSON.stringify(this.materMeta) + ';' + this.hform.HBillType + ';' + this.hform.HSourceBillNo
                                     try {
                                         // 涓烘潯鐮佽缃嚭搴撳崟鍙峰拰鍑哄簱娆℃暟
                                         await this.Set_BarCodeBill(sMain)
diff --git a/pages/tiaomachaima/tiaomachaima.vue b/pages/tiaomachaima/tiaomachaima.vue
index 26007ba..7ff1d79 100644
--- a/pages/tiaomachaima/tiaomachaima.vue
+++ b/pages/tiaomachaima/tiaomachaima.vue
@@ -4,8 +4,8 @@
 			<view class="item">
 				<view class="left">鏉$爜缂栧彿锛�</view>
 				<view class="right">
-					<input name="HBarCode" disabled v-model="barCodeInfoMeta.barCodeNo" placeholder="璇锋壂鎻忚澶�"
-						@blur="searchbarCodeInfo" />
+					<input name="HBarCode" v-model="barCodeInfoMeta.barCodeNo" placeholder="璇锋壂鎻忔潯鐮�"
+						@confirm="searchbarCodeInfo" />
 				</view>
 				<view>
 					<uni-icons type="scan"
diff --git a/pages/tiaomachaima/tiaomachaima2.vue b/pages/tiaomachaima/tiaomachaima2.vue
index 92c2982..52c9299 100644
--- a/pages/tiaomachaima/tiaomachaima2.vue
+++ b/pages/tiaomachaima/tiaomachaima2.vue
@@ -1,113 +1,114 @@
 <template>
-	<view class="container">
-		<view class="header">
-			<view class="item">
-				<view class="left">鏉$爜缂栧彿锛�</view>
-				<view class="right">
-					<input name="HBarCode"  v-model="barCodeInfoMeta.barCodeNo" placeholder="璇锋壂鎻忔潯鐮�"
-						@blur="searchbarCodeInfo" />
-				</view>
-				<view>
-					<uni-icons type="scan"
-						style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
-						size="20" @click="toScanCode"></uni-icons>
-				</view>
-			</view>
-			<view class="item">
-				<view class="left">鎷嗙爜鏁伴噺锛�</view>
-				<view class="right">
-					<input type="number" name="HSplitNum" v-model="barCodeInfoMeta.splitNum" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�" />
-				</view>
-			</view>
-			<view class="item">
-				<view class="left">鍒跺崟浜猴細</view>
-				<view class="right">
-					<input type="text" disabled name="HMaker" v-model="barCodeInfoMeta.billMaker"
-						placeholder="璇疯緭鍏ュ埗鍗曚汉" />
-				</view>
-			</view>
-			<view class="operation-zone">
-				<button class="btn-c" @click="searchbarCodeInfoMeta">鎷嗙爜</button>
-				<button type="default" :class="cantGenerate?'':'btn-c'" @click="SaveBarCodeCreate"
-					:disabled="cantGenerate">鐢熸垚</button>
-				<button type="default" :class="cantPrint?'':'btn-c'" @click="PrintHBarCode" :disabled="cantPrint" >鎵撳嵃</button>
-			</view>
-		</view>
-		<view class="divide"></view>
-		<view class="content">
-			<view class="barcode-detail" v-show="CommonUtils.isEmpty(Object.assign(barCodeInfo, {})) === false">
-				<view class="title">鏉$爜淇℃伅</view>
-				<uni-card>
-					<view class="detail" style="display: none;">
-						<text>鏉$爜ID锛�</text>{{barCodeInfo['HItemID'] || '0'}}
-					</view>
-					<view class="detail">
-						<text>鏉$爜缂栧彿锛�</text>{{barCodeInfo['鏉$爜缂栧彿'] || ''}}
-					</view>
-					<view class="detail">
-						<text>鏉$爜鍘熸暟閲忥細</text>{{barCodeInfo['鏁伴噺'] || '0'}}
-					</view>
-					<view class="detail">
-						<text>鍓╀綑鏁伴噺锛�</text>{{barCodeInfo['鍓╀綑鏁伴噺'] || '0'}}
-					</view>
-					<view class="dWetail">
-						<text>鐗╂枡缂栫爜锛�</text>{{barCodeInfo['鐗╂枡浠g爜'] || ''}}
-					</view>
-					<view class="detail">
-						<text>鐗╂枡鍚嶇О锛�</text>{{barCodeInfo['鐗╂枡鍚嶇О'] || ''}}
-					</view>
-					<view class="detail">
-						<text>瑙勬牸鍨嬪彿锛�</text>{{barCodeInfo['瑙勬牸鍨嬪彿'] || ''}}
-					</view>
-					<view class="detail">
-						<text>璁¢噺鍗曚綅锛�</text>{{barCodeInfo['璁¢噺鍗曚綅'] || ''}}
-					</view>
-				</uni-card>
-			</view>
-			<view class="divide"></view>
-			<view class="barcode-split" v-show="barCodeSplitInfo.length>0">
-				<view class="title">鏉$爜鎷嗙爜</view>
-				<view class="barcode-split-list" v-for="(item,index) in barCodeSplitInfo" :key="index">
-					<uni-card @tap="ModityHQty(item)">
-						<view class="detail">
-							<text>鏉$爜缂栧彿锛�</text>{{item['HBarCode'] || ''}}
-						</view>
-						<view class="detail split-num">
-							<text>鎷嗗垎鏁伴噺锛�</text>{{item['HSplitNum'] || '0'}}
-						</view>
-						<view class="detail">
-							<text>鐗╂枡浠g爜锛�</text>{{item['HNumber'] || ''}}
-						</view>
-						<view class="detail">
-							<text>鐗╂枡鍚嶇О锛�</text>{{item['HName'] || ''}}
-						</view>
-						<view class="detail">
-							<text>瑙勬牸鍨嬪彿锛�</text>{{item['HModel'] || ''}}
-						</view>
-						<view class="detail">
-							<text>璁¢噺鍗曚綅锛�</text>{{barCodeInfo['璁¢噺鍗曚綅'] || ''}}
-						</view>
-					</uni-card>
-				</view>
-			</view>
-		</view>
-		<view class="over" v-if="barCodeSplitInfo.length == 0">鏆傛棤鏁版嵁</view>
-		<view class="over" v-if="barCodeSplitInfo.length != 0">宸插埌搴�</view>
-		<view>
-			<!-- 杈撳叆妗嗙ず渚� -->
-			<uni-popup ref="inputDialog" type="dialog">
-				<uni-popup-dialog ref="inputClose" mode="input" title="璇疯緭鍏ユ媶鐮佹暟閲�" :value="dialogVal" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�"
-					@confirm="dialogInputConfirm"></uni-popup-dialog>
-			</uni-popup>
-		</view>
-		<labelPrinterComponentVue ref="labelPrinter" :printInfo="printInfo" :printMode="'cpcl'">
-		</labelPrinterComponentVue>
-	</view>
+    <view class="container">
+        <view class="header">
+            <view class="item">
+                <view class="left">鏉$爜缂栧彿锛�</view>
+                <view class="right">
+                    <input name="HBarCode" v-model="barCodeInfoMeta.barCodeNo" placeholder="璇锋壂鎻忔潯鐮�"
+                        @blur="searchbarCodeInfo" />
+                </view>
+                <view>
+                    <uni-icons type="scan"
+                        style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
+                        size="20" @click="toScanCode"></uni-icons>
+                </view>
+            </view>
+            <view class="item">
+                <view class="left">鎷嗙爜鏁伴噺锛�</view>
+                <view class="right">
+                    <input type="number" name="HSplitNum" v-model="barCodeInfoMeta.splitNum" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�" />
+                </view>
+            </view>
+            <view class="item">
+                <view class="left">鍒跺崟浜猴細</view>
+                <view class="right">
+                    <input type="text" disabled name="HMaker" v-model="barCodeInfoMeta.billMaker"
+                        placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+                </view>
+            </view>
+            <view class="operation-zone">
+                <button class="btn-c" @click="searchbarCodeInfoMeta">鎷嗙爜</button>
+                <button type="default" :class="cantGenerate?'':'btn-c'" @click="SaveBarCodeCreate"
+                    :disabled="cantGenerate = false">鐢熸垚</button>
+                <button type="default" :class="cantPrint?'':'btn-c'" @click="PrintHBarCode"
+                    :disabled="cantPrint = false">鎵撳嵃</button>
+            </view>
+        </view>
+        <view class="divide"></view>
+        <view class="content">
+            <view class="barcode-detail" v-show="CommonUtils.isEmpty(Object.assign(barCodeInfo, {})) === false">
+                <view class="title">鏉$爜淇℃伅</view>
+                <uni-card>
+                    <view class="detail" style="display: none;">
+                        <text>鏉$爜ID锛�</text>{{barCodeInfo['HItemID'] || '0'}}
+                    </view>
+                    <view class="detail">
+                        <text>鏉$爜缂栧彿锛�</text>{{barCodeInfo['鏉$爜缂栧彿'] || ''}}
+                    </view>
+                    <view class="detail">
+                        <text>鏉$爜鍘熸暟閲忥細</text>{{barCodeInfo['鏁伴噺'] || '0'}}
+                    </view>
+                    <view class="detail">
+                        <text>鍓╀綑鏁伴噺锛�</text>{{barCodeInfo['鍓╀綑鏁伴噺'] || '0'}}
+                    </view>
+                    <view class="dWetail">
+                        <text>鐗╂枡缂栫爜锛�</text>{{barCodeInfo['鐗╂枡浠g爜'] || ''}}
+                    </view>
+                    <view class="detail">
+                        <text>鐗╂枡鍚嶇О锛�</text>{{barCodeInfo['鐗╂枡鍚嶇О'] || ''}}
+                    </view>
+                    <view class="detail">
+                        <text>瑙勬牸鍨嬪彿锛�</text>{{barCodeInfo['瑙勬牸鍨嬪彿'] || ''}}
+                    </view>
+                    <view class="detail">
+                        <text>璁¢噺鍗曚綅锛�</text>{{barCodeInfo['璁¢噺鍗曚綅'] || ''}}
+                    </view>
+                </uni-card>
+            </view>
+            <view class="divide"></view>
+            <view class="barcode-split" v-show="barCodeSplitInfo.length>0">
+                <view class="title">鏉$爜鎷嗙爜</view>
+                <view class="barcode-split-list" v-for="(item,index) in barCodeSplitInfo" :key="index">
+                    <uni-card @tap="ModityHQty(item)">
+                        <view class="detail">
+                            <text>鏉$爜缂栧彿锛�</text>{{item['HBarCode'] || ''}}
+                        </view>
+                        <view class="detail split-num">
+                            <text>鎷嗗垎鏁伴噺锛�</text>{{item['HSplitNum'] || '0'}}
+                        </view>
+                        <view class="detail">
+                            <text>鐗╂枡浠g爜锛�</text>{{item['HNumber'] || ''}}
+                        </view>
+                        <view class="detail">
+                            <text>鐗╂枡鍚嶇О锛�</text>{{item['HName'] || ''}}
+                        </view>
+                        <view class="detail">
+                            <text>瑙勬牸鍨嬪彿锛�</text>{{item['HModel'] || ''}}
+                        </view>
+                        <view class="detail">
+                            <text>璁¢噺鍗曚綅锛�</text>{{barCodeInfo['璁¢噺鍗曚綅'] || ''}}
+                        </view>
+                    </uni-card>
+                </view>
+            </view>
+        </view>
+        <view class="over" v-if="barCodeSplitInfo.length == 0">鏆傛棤鏁版嵁</view>
+        <view class="over" v-if="barCodeSplitInfo.length != 0">宸插埌搴�</view>
+        <view>
+            <!-- 杈撳叆妗嗙ず渚� -->
+            <uni-popup ref="inputDialog" type="dialog">
+                <uni-popup-dialog ref="inputClose" mode="input" title="璇疯緭鍏ユ媶鐮佹暟閲�" :value="dialogVal" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�"
+                    @confirm="dialogInputConfirm"></uni-popup-dialog>
+            </uni-popup>
+        </view>
+        <labelPrinterComponentVue ref="labelPrinter" :printInfo="printInfo" :printMode="'cpcl'">
+        </labelPrinterComponentVue>
+    </view>
 </template>
 
 <script>
-	import labelPrinterComponentVue from '../../components/labelPrinterComponent/labelPrinterComponent.vue';
-	import {
+    import labelPrinterComponentVue from '../../components/labelPrinterComponent/labelPrinterComponent.vue';
+    import {
         CBar,
         CBox,
         CForm,
@@ -128,370 +129,424 @@
         CStatus,
         CPCL,
     } from "@psdk/cpcl";
-	import {
-		getUserInfo
-	} from "@/utils/auth.js";
-	import {
-		CommonUtils
-	} from "@/utils/common.js"
-	export default {
-		data() {
-			return {
-				CommonUtils,
-				userInfo: getUserInfo(),
-				serverUrl: 'http://192.168.2.227:8082/API',
-				barCodeInfoMeta: {
-					barCodeNo: "",
-					splitNum: "",
-					billMaker: getUserInfo().HEmpName,
-					billMakerID: getUserInfo().HEmpID
-				},
-				barCodeInfo: {
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import {
+        CommonUtils
+    } from "@/utils/common.js"
+    export default {
+        data() {
+            return {
+                CommonUtils,
+                userInfo: getUserInfo(),
+                serverUrl: 'http://192.168.2.227:8082/API',
+                // serverUrl: 'http://47.96.97.237/API/',
+                barCodeInfoMeta: {
+                    barCodeNo: "",
+                    splitNum: "",
+                    billMaker: getUserInfo().HEmpName,
+                    billMakerID: getUserInfo().HEmpID
+                },
+                barCodeInfo: {
 
-				},
-				barCodeSplitInfo: [],
-				dialogVal: 0,
-				itemCache: {},
-				cantGenerate: true,
-				cantPrint:true,
-				 printInfo: ""//鎵撳嵃
-			};
-		},
-		components: {
-		    labelPrinterComponentVue
-		},
-		methods: {
-			doRequest(url, data, resFunction, errFunction, method) {
-				uni.showLoading({
-					title: '鍔犺浇涓�...'
-				})
-				uni.request({
-					method: method || "GET",
-					url: this.serverUrl + url,
-					data: data || "",
-					success: (res) => {
-						if (typeof resFunction === 'function') {
-							resFunction.call(this, res)
-						} else if (typeof errFunction === 'undefined') {
-							return
-						} else {
-							throw new TypeError("璁块棶鎴愬姛鍥炶皟鍑芥暟绫诲瀷寮傚父!")
-						}
-					},
-					fail: (err) => {
-						uni.showToast({
-							icon: "error",
-							title: "鎺ュ彛璁块棶寮傚父!",
-							duration: 2000
-						})
-						if (typeof errFunction === 'function') {
-							errFunction.call(this, err)
-						} else if (typeof errFunction === 'undefined') {
-							return
-						} else {
-							throw new TypeError("璁块棶澶辫触鍥炶皟鍑芥暟绫诲瀷寮傚父!")
-						}
-					}
-				})
-				uni.hideLoading()
-			},
-			//鎽勫儚澶磋皟鐢�
-			async searchbarCodeInfo() {
-				await this.$nextTick()
-				let urlEncode =
-					`/Gy_BarCodeBillList/page?sWhere= and 鏉$爜缂栧彿=\'\'${this.barCodeInfoMeta.barCodeNo}\'\'&user=${this.userInfo.HEmpName}&page=1&size=1`
-					.toString()
-				if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) == true) {
-					return uni.showToast({
-						icon: "fail",
-						title: "鏉$爜缂栧彿涓嶈兘涓虹┖!"
-					})
-				}
-				this.doRequest(
-					urlEncode,
-					null,
-					function(res) {
-						console.log(res)
-						let res1 = res.data
-						let {data,count} = res1
-						if (count > 0) {
-							this.barCodeInfo = data[0]
-							this.barCodeSplitInfo= []
-						}
-					},
-					function(err) {
-						console.err(err)
-					}
-				)
-			},
-			//鎷嗙爜鎸夐挳璋冪敤
-			async searchbarCodeInfoMeta() {
-				this.cantGenerate = true
-				this.cantPrint=true
-				if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) === true) {
-					return uni.showToast({
-						icon: 'none',
-						title: '鏉$爜缂栧彿涓嶅緱涓虹┖!'
-					});
-				}
-				if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
-					return uni.showToast({
-						icon: 'none',
-						title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
-					});
-				}
-				if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
-					return uni.showToast({
-						icon: 'none',
-						title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
-					});
-				}
-				if (parseFloat(this.barCodeInfoMeta.splitNum) > parseFloat(this.barCodeInfo['鏁伴噺'])) {
-				    return uni.showToast({
-				        icon: 'none',
-				        title: '鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉$爜鍘熸暟閲�!'
-					});
-				}
-				this.doRequest(
-					"/Sc_BarCode/SplitBarCode_Sub", {
-						HBarCodeNo: this.barCodeInfoMeta.barCodeNo
-					},
-					function(res) {
-						console.log(res)
-						this.barCodeSplitInfo = []
-						if (res.data.count > 0) {
-			
-							if (res.data.data.length < 1) {
-								return uni.showToast({
-									icon: 'none',
-									title: Message
-								});
-							}
-							
-							//鎷嗗垎鏉$爜锛氭暟閲忎负 splitNum
-							let barCodeItem1 = JSON.parse(JSON.stringify(res.data.data.SubBarCodes[0]));
-							barCodeItem1.HSplitNum = this.barCodeInfoMeta.splitNum;
-							barCodeItem1.HBarCode = res.data.data.NextBarCode;
-							this.barCodeSplitInfo.push(barCodeItem1);
-							
-							//鏇存柊鍘熷厛鏉$爜鏁伴噺
-							this.barCodeInfo['鍓╀綑鏁伴噺'] = this.barCodeInfo['鏁伴噺'] - this.barCodeInfoMeta.splitNum;
-							
-							this.cantGenerate = false;
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: '娌℃湁鎵惧埌瀵瑰簲鐨勫崟鎹�'
-							});
-						}
-					},
-					function(err) {
-						console.error(err)
-					}
-				)
-			},
-			//淇濆瓨鏂规硶
-			SaveBarCodeCreate() {
-				// 鏍¢獙鎷嗙爜鏁伴噺
-				let sum = this.barCodeSplitInfo.reduce((acc, obj) => {
-					return acc + obj["HSplitNum"]
-				}, 0)
+                },
+                barCodeSplitInfo: [],
+                dialogVal: 0,
+                itemCache: {},
+                cantGenerate: true,
+                cantPrint: true,
+                printInfo: "" //鎵撳嵃
+            };
+        },
+        components: {
+            labelPrinterComponentVue
+        },
+        methods: {
+            doRequest(url, data, resFunction, errFunction, method) {
+                uni.showLoading({
+                    title: '鍔犺浇涓�...'
+                })
+                uni.request({
+                    method: method || "GET",
+                    url: this.serverUrl + url,
+                    data: data || "",
+                    success: (res) => {
+                        if (typeof resFunction === 'function') {
+                            resFunction.call(this, res)
+                        } else if (typeof errFunction === 'undefined') {
+                            return
+                        } else {
+                            throw new TypeError("璁块棶鎴愬姛鍥炶皟鍑芥暟绫诲瀷寮傚父!")
+                        }
+                    },
+                    fail: (err) => {
+                        uni.showToast({
+                            icon: "error",
+                            title: "鎺ュ彛璁块棶寮傚父!",
+                            duration: 2000
+                        })
+                        if (typeof errFunction === 'function') {
+                            errFunction.call(this, err)
+                        } else if (typeof errFunction === 'undefined') {
+                            return
+                        } else {
+                            throw new TypeError("璁块棶澶辫触鍥炶皟鍑芥暟绫诲瀷寮傚父!")
+                        }
+                    }
+                })
+                uni.hideLoading()
+            },
+            //鎽勫儚澶磋皟鐢�
+            async searchbarCodeInfo() {
+                await this.$nextTick()
+                let urlEncode =
+                    `/Gy_BarCodeBillList/page?sWhere= and 鏉$爜缂栧彿=\'\'${this.barCodeInfoMeta.barCodeNo}\'\'&user=${this.userInfo.HEmpName}&page=1&size=1`
+                    .toString()
+                if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) == true) {
+                    return uni.showToast({
+                        icon: "fail",
+                        title: "鏉$爜缂栧彿涓嶈兘涓虹┖!"
+                    })
+                }
+                this.doRequest(
+                    urlEncode, {},
+                    (res) => {
+                        console.log(res)
+                        let res1 = res.data
+                        let {
+                            data,
+                            count
+                        } = res1
+                        if (count > 0) {
+                            this.barCodeInfo = data[0]
+                            this.barCodeSplitInfo = []
+                        }
+                    },
+                    (err) => {
+                        console.err(err)
+                    }
+                )
+            },
+            dialogInputConfirm(val) {
+                this.itemCache["HSplitNum"] = val
 
-				if (sum > this.barCodeInfo["HQty"]) {
-					return uni.showToast({
-						icon: 'none',
-						title: '鎷嗙爜鏁伴噺鍜屼笉寰楀ぇ浜庢潯鐮佹暟閲�'
-					});
-				}
-				let msg =
-					`${this.barCodeInfoMeta["barCodeNo"]};${this.barCodeInfoMeta["splitNum"]};${JSON.stringify(this.barCodeSplitInfo)};${this.userInfo["HEmpName"]}`
-				this.doRequest(
-					"/Sc_BarCode/SplitBarCode_Save", {
-						msg: msg
-					},
-					function(res) {
-						if (res.data.code == 1) {
-							this.cantGenerate = true
-							this.cantPrint=false
-							uni.showToast({
-								title: '鐢熸垚鎴愬姛!'
-							});
-						}else{
-							this.cantGenerate = false
-							uni.showToast({
-								title: res.data.Message
-							});
-						}
-						
-					},
-					function(err) {
-						console.err(err)
-					},
-					"POST"
-				)
+                // 鍏抽棴绐楀彛鍚庯紝鎭㈠榛樿鍐呭
+                this.$refs.inputDialog.close()
 
-			},
-			//鎵撳嵃鎸夐挳
-			async PrintHBarCode() {
-				if (this.$printer.isConnected() === false) {
-					this.$refs.labelPrinter.openPopup()
-				} 
-				else
-				{
-				let HBarCodeNoStr =`${this.barCodeSplitInfo[0]['HBarCode']}`
-				this.printInfo = `! 0 200 200 400 1
-					PAGE-WIDTH 608
-					SETQRVER 3
-					B QR 475 15 Q 0 U 3
-					LA,${HBarCodeNoStr}
-					ENDQR
-					T 24 0 0 30 渚涘簲鍟�: ${this.lailiaoInfo.HSupName}
-					T 55 0 0 55 (Supplier)
-					T 24 0 0 75 渚涘簲鍟嗘枡鍙�:  ${this.lailiaoInfo.HMaterNumber}
-					T 55 0 0 100 (Supplier Sku No.)
-					T 24 0 0 120 鐗╂枡鍚嶇О: ${this.lailiaoInfo.HMaterName}
-					T 55 0 0 145 (Material Code)
-					T 24 0 0 165 娆惧彿: ${this.lailiaoInfo.HCoilNO}
-					T 55 0 0 190 (Style No.)
-					T 24 0 300 165 瀹㈡埛缂栧彿: ${this.lailiaoInfo.HFactory}
-					T 55 0 300 190 (Consumer No.)
-					T 24 0 0 210 鍒嗙粍: ${this.lailiaoInfo.HFurnaceNO || ''}
-					T 55 0 0 235 (Group) 
-					T 24 0 300 210 瑙勬牸: ${this.lailiaoInfo.HMaterModel}
-					T 55 0 300 235 (SKU NO.) 
-					T 24 0 0 255 鏁伴噺:  ${ parseFloat(this.lailiaoInfo.HQty || 0).toFixed(0) } ${pcsInfo}
-					T 55 0 0 280 (Quantity) 
-					T 24 0 300 255 鏃ユ湡: ${this.lailiaoInfo.HDate || ''}
-					T 55 0 300 280 (Date) 
-					T 24 0 0 300 妫�楠屽憳: 
-					T 55 0 0 325 (QC)  
-					T 24 0 300 300 閲囪喘鍗曞彿: ${this.lailiaoInfo.HBillNo || ''}
-					T 55 0 300 325 (Purchase Order No.)  
-					T 24 0 0 345 妫�楠岀粨鏋�: 
-					T 55 0 0 370 (Inspection status) 
-					BOX 240 345 260 365 4
-					T 24 0 270 345 鍚堟牸
-					T 55 0 250 370 (Pass) 
-					BOX 340 345 360 365 4
-					T 24 0 370 345 涓嶅悎鏍�
-					T 55 0 370 370 (Fail) 
-					BOX 460 345 480 365 4
-					T 24 0 490 345 鐗归噰
-					T 55 0 440 370 (Spec. accepted) 
-					FORM
-					PRINT`
-					await this.$nextTick(() => {
-					this.$refs.labelPrinter.execPrint()
-					})
-				}
-			},
-			toScanCode() {
-				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-				mpaasScanModule.mpaasScan({
-					'hideAlbum': true,
-					'timeoutInterval':'10', //瓒呮椂鏃堕棿
-					'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				},(ret) => {
-					console.log(ret.resp_result)
-					if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
-						console.log('鏉$爜鍐呭锛�' + ret.resp_result);
-						this.barCodeInfoMeta.barCodeNo = ret.resp_result
-					
-						this.searchbarCodeInfo()
-					}
-				})
-			}
-		},
-		onLoad() {
-		}
-	}
+            },
+            //鎷嗙爜鎸夐挳璋冪敤
+            async searchbarCodeInfoMeta() {
+                this.cantGenerate = true
+                this.cantPrint = true
+                if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) === true) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鏉$爜缂栧彿涓嶅緱涓虹┖!'
+                    });
+                }
+                if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
+                    });
+                }
+                if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
+                    });
+                }
+                if (parseFloat(this.barCodeInfoMeta.splitNum) > parseFloat(this.barCodeInfo['鏁伴噺'])) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉$爜鍘熸暟閲�!'
+                    });
+                }
+                
+                uni.request({
+                    url: this.serverUrl + '/Sc_BarCode/SplitBarCode_Sub',
+                    data: {
+                        HBarCodeNo: this.barCodeInfoMeta.barCodeNo,
+                    },
+                    success: (res) => {
+                        this.barCodeSplitInfo = []
+                        if (res.data.count > 0) {
+
+                            if (res.data.data.length < 1) {
+                                return uni.showToast({
+                                    icon: 'none',
+                                    title: Message
+                                });
+                            }
+
+                            //鎷嗗垎鏉$爜锛氭暟閲忎负 splitNum
+                            // let barCodeItem1 = JSON.parse(JSON.stringify(res.data.data.SubBarCodes[0]));
+                            let HSplitNum = this.barCodeInfoMeta.splitNum;
+                            let HBarCode = res.data.data.NextBarCode;
+                            console.log('HBarCode: ',HBarCode);
+                            this.barCodeSplitInfo.push({
+                                HSplitNum: this.barCodeInfoMeta.splitNum,
+                                HBarCode: res.data.data.NextBarCode
+                            });
+
+                            //鏇存柊鍘熷厛鏉$爜鏁伴噺
+                            this.barCodeInfo['鍓╀綑鏁伴噺'] = this.barCodeInfo['鏁伴噺'] - this.barCodeInfoMeta.splitNum;
+
+                            this.cantGenerate = false;
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: '娌℃湁鎵惧埌瀵瑰簲鐨勫崟鎹�'
+                            });
+                        }
+                    },
+                    fail: (err) => {
+                        console.error(err)
+                    }
+                })
+
+                // this.doRequest(
+                //     "/Sc_BarCode/SplitBarCode_Sub", 
+                //     {
+                //         HBarCodeNo: this.barCodeInfoMeta.barCodeNo,
+                //     },
+                //     (res) => {
+                //         this.barCodeSplitInfo = []
+                //         if (res.data.count > 0) {
+
+                //             if (res.data.data.length < 1) {
+                //                 return uni.showToast({
+                //                     icon: 'none',
+                //                     title: Message
+                //                 });
+                //             }
+
+                //             //鎷嗗垎鏉$爜锛氭暟閲忎负 splitNum
+                //             let barCodeItem1 = JSON.parse(JSON.stringify(res.data.data.SubBarCodes[0]));
+                //             HSplitNum = this.barCodeInfoMeta.splitNum;
+                //             HBarCode = res.data.NextBarCode;
+                //             this.barCodeSplitInfo.push({
+                //                 HSplitNum: this.barCodeInfoMeta.splitNum,
+                //                 HBarCode: res.data.NextBarCode
+                //             });
+
+                //             //鏇存柊鍘熷厛鏉$爜鏁伴噺
+                //             this.barCodeInfo['鍓╀綑鏁伴噺'] = this.barCodeInfo['鏁伴噺'] - this.barCodeInfoMeta.splitNum;
+
+                //             this.cantGenerate = false;
+                //         } else {
+                //             uni.showToast({
+                //                 icon: 'none',
+                //                 title: '娌℃湁鎵惧埌瀵瑰簲鐨勫崟鎹�'
+                //             });
+                //         }
+                //     },
+                //     (err) => {
+                //         console.error(err)
+                //     }
+                // )
+            },
+            //淇濆瓨鏂规硶
+            SaveBarCodeCreate() {
+                // 鏍¢獙鎷嗙爜鏁伴噺
+                let sum = this.barCodeSplitInfo.reduce((acc, obj) => {
+                    return acc + obj["HSplitNum"]
+                }, 0)
+
+                if (sum > this.barCodeInfo["HQty"]) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鎷嗙爜鏁伴噺鍜屼笉寰楀ぇ浜庢潯鐮佹暟閲�'
+                    });
+                }
+                let msg =
+                	`${this.barCodeInfoMeta["barCodeNo"]};${this.barCodeInfoMeta["splitNum"]};${JSON.stringify(this.barCodeSplitInfo)};${this.userInfo["HEmpName"]}`
+                this.doRequest(
+                    "/Sc_BarCode/SplitBarCode_Save", {
+                        msg: msg
+                    },
+                    (res) => {
+                        if (res.data.code == 1) {
+                            this.cantGenerate = true
+                            this.cantPrint = false
+                            uni.showToast({
+                                title: '鐢熸垚鎴愬姛!'
+                            });
+                        } else {
+                            this.cantGenerate = false
+                            uni.showToast({
+                                title: res.data.Message
+                            });
+                        }
+
+                    },
+                    (err) => {
+                        console.err(err)
+                    },
+                    "POST"
+                )
+
+            },
+            //鎵撳嵃鎸夐挳
+            async PrintHBarCode() {
+                if (this.$printer.isConnected() === false) {
+                    this.$refs.labelPrinter.openPopup()
+                } else {
+                    let HBarCodeNoStr = `${this.barCodeSplitInfo[0]['HBarCode']}`
+                    this.printInfo = `! 0 200 200 400 1
+	PAGE-WIDTH 608
+	SETQRVER 3
+	B QR 475 15 Q 0 U 3
+	LA,${HBarCodeNoStr}
+	ENDQR
+	T 24 0 0 30 渚涘簲鍟�: 
+	T 55 0 0 55 (Supplier)
+	T 24 0 0 75 渚涘簲鍟嗘枡鍙�:  
+	T 55 0 0 100 (Supplier Sku No.)
+	T 24 0 0 120 鐗╂枡鍚嶇О: 
+	T 55 0 0 145 (Material Code)
+	T 24 0 0 165 娆惧彿: 
+	T 55 0 0 190 (Style No.)
+	T 24 0 300 165 瀹㈡埛缂栧彿: 
+	T 55 0 300 190 (Consumer No.)
+	T 24 0 0 210 鍒嗙粍: 
+	T 55 0 0 235 (Group) 
+	T 24 0 300 210 瑙勬牸: 
+	T 55 0 300 235 (SKU NO.) 
+	T 24 0 0 255 鏁伴噺:  
+	T 55 0 0 280 (Quantity) 
+	T 24 0 300 255 鏃ユ湡: 
+	T 55 0 300 280 (Date) 
+	T 24 0 0 300 妫�楠屽憳: 
+	T 55 0 0 325 (QC)  
+	T 24 0 300 300 閲囪喘鍗曞彿: 
+	T 55 0 300 325 (Purchase Order No.)  
+	T 24 0 0 345 妫�楠岀粨鏋�: 
+	T 55 0 0 370 (Inspection status) 
+	BOX 240 345 260 365 4
+	T 24 0 270 345 鍚堟牸
+	T 55 0 250 370 (Pass) 
+	BOX 340 345 360 365 4
+	T 24 0 370 345 涓嶅悎鏍�
+	T 55 0 370 370 (Fail) 
+	BOX 460 345 480 365 4
+	T 24 0 490 345 鐗归噰
+	T 55 0 440 370 (Spec. accepted) 
+	FORM
+	PRINT`
+                console.log('printInfo: ',this.printInfo);
+                    await this.$nextTick(() => {
+                        this.$refs.labelPrinter.execPrint()
+                    })
+                }
+            },
+            toScanCode() {
+                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+                mpaasScanModule.mpaasScan({
+                    'hideAlbum': true,
+                    'timeoutInterval': '10', //瓒呮椂鏃堕棿
+                    'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+                }, (ret) => {
+                    console.log(ret.resp_result)
+                    if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
+                        console.log('鏉$爜鍐呭锛�' + ret.resp_result);
+                        this.barCodeInfoMeta.barCodeNo = ret.resp_result
+
+                        this.searchbarCodeInfo()
+                    }
+                })
+            }
+        },
+        onLoad() {}
+    }
 </script>
 
 <style lang="scss">
-	* {
-		box-sizing: border-box;
-	}
+    * {
+        box-sizing: border-box;
+    }
 
-	input {
-		padding: 8rpx 20rpx;
-		font-size: 30rpx;
-		line-height: 30rpx;
-	}
-	
-	button {
-		padding: 0;
-		width: 150rpx;
-		font-size: 25rpx;
-	}
+    input {
+        padding: 8rpx 20rpx;
+        font-size: 30rpx;
+        line-height: 30rpx;
+    }
 
-	.uni-card {
-		margin: 0 !important;
-	}
+    button {
+        padding: 0;
+        width: 150rpx;
+        font-size: 25rpx;
+    }
 
-	.container {
-		.header {
-			padding: 20rpx 10rpx;
-			display: flex;
-			flex-direction: column;
-			gap: 20rpx;
+    .uni-card {
+        margin: 0 !important;
+    }
 
-			.item {
-				display: flex;
-				flex-direction: row;
-				padding: 0 10rpx;
-				gap: 20rpx;
-				font-size: 30rpx;
-				// height: 1.5rem;
-				// justify-content: center;
-				align-items: center;
+    .container {
+        .header {
+            padding: 20rpx 10rpx;
+            display: flex;
+            flex-direction: column;
+            gap: 20rpx;
 
-				.left {
-					text-align: right;
-					width: 5rem;
-				}
+            .item {
+                display: flex;
+                flex-direction: row;
+                padding: 0 10rpx;
+                gap: 20rpx;
+                font-size: 30rpx;
+                // height: 1.5rem;
+                // justify-content: center;
+                align-items: center;
 
-				.right {
-					flex: 1;
-					height: 100%;
-					padding: 6rpx 0;
-					border-radius: 22rpx;
-					border: 1px solid #e4e4e4;
-					background-color: #e4e4e4;
+                .left {
+                    text-align: right;
+                    width: 5rem;
+                }
 
-					>input {
-						height: auto;
-					}
-				}
-			}
+                .right {
+                    flex: 1;
+                    height: 100%;
+                    padding: 6rpx 0;
+                    border-radius: 22rpx;
+                    border: 1px solid #e4e4e4;
+                    background-color: #e4e4e4;
 
-			.operation-zone {
-				display: flex;
-				flex-direction: row;
-				justify-content: space-evenly;
+                    >input {
+                        height: auto;
+                    }
+                }
+            }
 
-				.btn-c {
-					background-color: #3a78ff;
-					color: #fff;
-				}
-			}
-		}
+            .operation-zone {
+                display: flex;
+                flex-direction: row;
+                justify-content: space-evenly;
 
-		.divide {
-			width: 100%;
-			height: 16rpx;
-			background-color: #e5e5e5;
-		}
+                .btn-c {
+                    background-color: #3a78ff;
+                    color: #fff;
+                }
+            }
+        }
 
-		.content {
-			flex: 1;
+        .divide {
+            width: 100%;
+            height: 16rpx;
+            background-color: #e5e5e5;
+        }
 
-			.barcode-detail,
-			.barcode-split {
-				padding: 30rpx;
-				display: flex;
-				flex-direction: column;
-				gap: 30rpx;
-			}
-		}
-	}
+        .content {
+            flex: 1;
+
+            .barcode-detail,
+            .barcode-split {
+                padding: 30rpx;
+                display: flex;
+                flex-direction: column;
+                gap: 30rpx;
+            }
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/pages/xiaoshouchuku/form.vue b/pages/xiaoshouchuku/form.vue
index d354f0f..70404d6 100644
--- a/pages/xiaoshouchuku/form.vue
+++ b/pages/xiaoshouchuku/form.vue
@@ -518,9 +518,9 @@
                 if (this.$refs.uniComboxSourceBill) {
                     inputVal = this.$refs.uniComboxSourceBill.inputVal || this.hform.HBillNo
                 } else {
-                    inputVal = this.hform.HBillNo
+                    inputVal = this.hform.HSourceBillNo
                 }
-
+                
                 if (inputVal == '') {
                     CommonUtils.playSound(0)
                     return uni.showToast({
@@ -1443,7 +1443,7 @@
                                 uni.hideLoading()
                                 if (res.data.count == 1) {
                                     let sMain = JSON.stringify(this.materMeta) + ';' + this.hform
-                                        .HBillType + ';' + this.hform.HBillNo
+                                        .HBillType + ';' + this.hform.HSourceBillNo
                                     try {
                                         await this.Set_BarCodeBill(sMain)
                                         uni.showModal({

--
Gitblit v1.9.1