From 8024deba5db85072bf95aa9d740a53b7ea94d3b1 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 23 十二月 2025 16:13:15 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 utils/common.js                                      |    5 
 pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue | 1934 ++++++++++++++++++++++++++++++++-------------------------
 pages.json                                           |    3 
 3 files changed, 1,090 insertions(+), 852 deletions(-)

diff --git a/pages.json b/pages.json
index 2d44d81..13fad90 100644
--- a/pages.json
+++ b/pages.json
@@ -1110,8 +1110,7 @@
         {
             "path": "pages/MJGL/mujulingliaochukudan/MouldProdOutBill",
             "style": {
-                "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�",
-                "enablePullDownRefresh": true
+                "navigationBarTitleText": "妯″叿棰嗘枡鍑哄簱鍗�"
             }
         },
         {
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index c3146c4..4ad6601 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -1,855 +1,1097 @@
 <template>
-    <view>
-        <view class="form">
-            <view class="form-item">
-                <view class="title">鏉$爜</view>
-                <view class="right" style="width: 350rpx;">
-                    <input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)"
-                        @blur="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">
-                    <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
-                        @input="HWHNameChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">浠撲綅:</view>
-                <view class="right" v-show="showHStockPlaceName">
-                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
-                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
-                </view>
-                <view class="righton" v-show="!showHStockPlaceName">
-                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">鍙戞枡:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HSactterUser"
-                        @input="HScatterUserChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">棰嗘枡:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗘枡浜�" v-model="hform.HCollectUser"
-                        @input="HCollectUserChange"></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">
-                    <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
-                        @input="HSelectTypeChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">寰�鏉ュ崟浣�:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.Selection"
-                        @input=""></uni-combox>
-                </view>
-            </view>
-            <view class="tabs">
-                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
-                <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">妯″叿鍒楄〃</view>
-                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
-            </view>
-            <view v-if="tabs == 0">
-                <view class="form-item">
-                    <view class="title">鏃ユ湡:</view>
-                    <view class="right">
-                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
-                            <view class="picker-overlay"></view>
-                            <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
-                        </picker>
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒跺崟浜�:</view>
-                    <view class="righton">
-                        <input name="HMaker" disabled v-model="hform.HMaker" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁鍙�:</view>
-                    <view class="righton">
-                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍗曟嵁ID:</view>
-                    <view class="righton">
-                        <input name="HInterID" disabled v-model="hform.HInterID" />
-                    </view>
-                </view>
-            </view>
-            <view v-if="tabs==2">
-                鍣ㄥ叿鍒楄〃
-            </view>
-            <view v-if="tabs==1">
-<!--                <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.HMouldName_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍣ㄥ叿鍙�:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HMouldID_B" />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鏁伴噺:</view>
-                    <view class="righton">
-                        <input disabled v-model="hform.HMouldCount_B" />
-                    </view>
-                </view>
-            </view>
-            <view class="bottom-btn">
-                <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-                <button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-                <!-- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button> -->
-                <button v-if="btnType != 1 " class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-            </view>
-        </view>
-    </view>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<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">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+						@input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName">
+					<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName"
+						placeholder="涓嶅彲鎿嶄綔" /></view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍙戞枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HKeeperName"
+						@input="HScatterUserChange"></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="HCollectUserChange"></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="showHSourceBillNo">
+			        <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+			            @input="HSelectTypeChange"></uni-combox>
+			    </view>
+				<view class="right" v-show="!showHSourceBillNo">
+				    <input name="TypeName" disabled v-model="hform.TypeName" placeholder="" />
+				</view>
+			</view>
+			<view class="form-item">
+			    <view class="title">寰�鏉ュ崟浣�:</view>
+			    <view class="right" v-show="showHSourceBillNo">
+			        <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.HSupName"
+			            @input="" ></uni-combox>
+			    </view>
+				<view class="right" v-show="!showHSourceBillNo">
+				    <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+				</view>
+			</view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<view class="picker-overlay"></view>
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+					</view>
+				</view>
+				<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="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+				
+				    </view>
+				    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+				        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+				    </view>
+				
+				    <view class="righton" v-show="!showHSourceBillNo">
+				        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+				    </view>
+				    <!-- <view class="right" v-show="showHSourceBillNo">
+						<uni-combox ref="uniComboxSourceBill" :isFocus="HSourceBillNoFocus"
+							:confirm-call="onSourceBillBlurHandler" v-if="reHSourceBillNo"
+							:candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" v-model="hform.HSourceBillNo"
+							@input="HSourceBillNoChange"></uni-combox>
+					</view>
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view> -->
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs==1">
+				<view class="list" v-for="(item,index) in HMouldList" :key="index">
+				     <uni-card :title="item.鍣ㄥ叿鍚嶇О" style="margin: 10px;" @tap="delMater(item, $event)">
+				                <!-- 鍣ㄥ叿浠g爜浣滀负鍙偣鍑婚摼鎺� -->
+				                <view class="card-header">
+				                    <text class="link-text">鍣ㄥ叿鍙凤細{{item.鍣ㄥ叿鍙穧}</text>
+				                </view>
+				                
+				                <view class="card-detail">
+				                    <view class="detail">
+				                        <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+				                    </view>
+				                    <view class="detail">
+				                        <text>鍣ㄥ叿鏉$爜锛�</text>{{item.鍣ㄥ叿鏉$爜}}
+				                    </view>
+				                </view>
+				            </uni-card>
+				</view>
+				<view class="over" v-if="HMouldList.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
+			<view class="bottom-btn">
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+				<button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<!-- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button> -->
+				<button v-if="btnType != 1 " class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			</view>
+		</view>	
+		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+		    :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+	</view>
 </template>
 
 <script>
-    import getDateTime from '@/utils/getdateTime.js';
-    import {
-        getUserInfo
-    } from "@/utils/auth.js";
-    import {
-        CommonUtils
-    } from '@/utils/common';
-import { List } from 'echarts';
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import { CommonUtils } from '@/utils/common';
+	import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
+	export default {
+		data() {
+			return {
+				HSourceBillNoFocus: false,
+				barCodeFocus: true,//鏉$爜鍏夋爣
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				btnType:1,//1鏂板锛�3淇敼
+				linterid:'',
+				arrayHEmpName: [],
+				HEmpNameList: [],
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHCusName: [], //瀹㈡埛
+				HCusNameList: [],
+				arrayHSupplierName:[],//渚涘簲鍟�
+				HSuplierList:[],
+				linterid: '',
+				HBillNo: '',
+				arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
+				HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
+				showHStockPlaceName: true, 
+				HMouldList:[],
+				isEdit: false,
+				
+				showHMainSourceBillType: true,
+				showHSourceBillNo: true,
+				HMainSourceBillType: uni.getStorageSync('billTypeName_3802') ? uni.getStorageSync('billTypeName_3802'):'棰嗙敤鐢宠鍗�',
+				arrayHMainSourceBillType: ['棰嗙敤鐢宠鍗�', '鎵嬪伐褰曞叆'],
+				arrayHMainSourceBillValue: ['3849', '-1'],
+				
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3802,
+					HWHName: getUserInfo().HWHName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+					HKeeperName: getUserInfo().User,
+					HKeeperID: getUserInfo().User,//鍙戞枡浜�
+					HSecManagerName: getUserInfo().HEmpName,
+					HSecManagerID: getUserInfo().HEmpID,//棰嗘枡浜�
+					HDeptName: getUserInfo().HDept,
+					HDeptID: getUserInfo().HDeptID,
+					//婧愬崟淇℃伅
+					HMainSourceBillType: uni.getStorageSync('billType_3802') ? uni.getStorageSync('billType_3802'):3849,
+					HSourceBillNo: '', //CGDD000200
+					//寰�鏉ョ被鍨�
+					TypeName:uni.getStorageSync('typeName_3802'),
+					HSupName: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+					HSupID: '' ,// 寰�鏉ュ崟浣嶅搴旂殑ID
+					HSupTypeID:uni.getStorageSync('typeID_3802')?uni.getStorageSync('typeID_3802'):0,
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+					
+					HRedBlueFlag:'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID:uni.getStorageSync('OrganizationID'),
+					HBarCode_B:'',
+					HMouldName_B:'',
+					HMouldID_B:'',
+					HMouldCount_B:'',
+				}
+			}
+		},
+		components: {
+		    BillListPopupVue
+		},
+		methods: {
+			
+			//鎵爜
+			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
+					}
 
-    export default {
-        data() {
-            return {
-                userInfo: getUserInfo(),
-                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-                tabs: 0,
-                btnType: 1, //1鏂板锛�3淇敼
-                linterid: '',
-                arrayHEmpName: [],
-                HEmpNameList: [],
-                arrayHWHName: [], //浠撳簱
-                HWHNameList: [],
-                arrayHStockPlaceName: [], //浠撲綅
-                HStockPlaceNameList: [],
-                arrayHDeptName: [], //閮ㄩ棬
-                HDeptNameList: [],
-                arrayHSupName: [], //瀹㈡埛
-                HSupNameList: [],
-                arrayHSupplierName: [], //渚涘簲鍟�
-                HSuplierList: [],
-                linterid: '',
-                HBillNo: '',
-                arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
-                HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
-                showHStockPlaceName: true,
-                HMouldList: [],
-                HMouldFields: [], // 妯″叿瀛楁缂撳瓨
-                isEdit: false,
-                hform: {
-                    HBarCode: '',
-                    HInterID: '',
-                    HBillType: 3802,
-                    HWHName: getUserInfo().HWHName,
-                    HWHID: getUserInfo().HWhID,
-                    HStockPlaceName: getUserInfo().HSPName,
-                    HStockPlaceID: getUserInfo().HSPID,
-                    HSactterUserName: getUserInfo().User,
-                    HSactterUserID: getUserInfo().User,
-                    HCollectUserName: getUserInfo().User,
-                    HCollectUserID: getUserInfo().User,
-                    HDeptName: getUserInfo().HDept,
-                    HDeptID: getUserInfo().HDeptID,
-                    HSupName: '',
-                    HSupID: '',
-                    HSecManagerID: '',
-                    HKeeperID: '',
-                    //寰�鏉ョ被鍨�
-                    TypeName: '',
-                    TypeID: '',
-                    Selection: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
-                    SelectionID: '', // 寰�鏉ュ崟浣嶅搴旂殑ID
-                    HSupTypeID: '',
-                    HDate: getDateTime.dateTimeStr('y-m-d'),
-                    HMaker: uni.getStorageSync('HUserName'),
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			getNewData() {
+				CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						let res1 = res.data;
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					})
+			},
+			async getCode(HBarCode) { 
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sOldBarCode = HBarCode; 
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo = this.hform.HSourceBillNo
+				var sSourceBillType =this.hform.HMainSourceBillType
+				if(sSourceBillType != -1&&sSourceBillNo==""){
+					
+					uni.showToast({
+						title: "璇峰厛閫夋嫨婧愬崟",
+						icon: 'none'
+					})
+					return
+				}
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						try {
+						    let res = await CommonUtils.doRequest2Sync({
+						        url: '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+						        data: {
+						            HInterID: this.hform.HInterID,
+						            HBillType: this.hform.HBillType,
+						            HBarCode: sBarCode
+						        },
+						    })
+						
+						    if (!res) {
+						        return
+						    }
+						
+						    console.log('鍒犻櫎鏉$爜', res.data);
+						    this.hform.HBarCode = ''; 
+						    if (res.data.count == 1) {
+						    	this.hform.HQty = ''
+						    } else {
+						    	uni.showToast({
+						    		title: res.data.Message,
+						    		icon: 'none'
+						    	})
+						    }
+						    
+						
+						} catch (err) {
+						    console.log(res);
+						    uni.showToast({
+						    	title: '鎺ュ彛璇锋眰澶辫触',
+						    	icon: 'none'
+						    })
+						}
+					}
+				}else
+				{
+					var sBarCode = this.hform.HBarCode
+					try {
+					    let res = await CommonUtils.doRequest2Sync({
+					        url: '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+					        data: {
+					            sBarCode: sBarCode,
+					            HInterID: this.hform.HInterID,
+					            HBillType: this.hform.HBillType,
+					            HBillNo: this.hform.HBillNo,
+					            HMaker: this.hform.HMaker,
+					            HWhID: sHWHID,
+					            HSPID: sHSPID,
+					            HSCWhID:0,
+					            HSCSPID: 0,
+					            HRedBlueFlag: this.hform.HRedBlueFlag,
+					            HSourceBillNo: sSourceBillNo,
+					            HSourceBillType: sSourceBillType,
+					            HStockOrgID: this.hform.HStockOrgID,
+					            HStockOutOrgID: this.hform.HStockOutOrgID,
+					        },
+					    })
+					
+					    if (!res) {
+					        return
+					    }
+					
+					    console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+					    this.hform.HBarCode=''
+					    if(res.data.count==1){
+					    	this.tabs = 1
+					    	this.DisBillEntryList()
+							this.showHMainSourceBillType = false
+							this.showHSourceBillNo = false
+					    }
+					    else {
+					    	uni.showToast({
+					    		title: res.data.Message,
+					    		icon: 'none'
+					    	})
+					    }
+					    
+					
+					} catch (err) {
+					    console.log(res);
+					    uni.showToast({
+					    	title: '鎺ュ彛璇锋眰澶辫触',
+					    	icon: 'none'
+					    })
+					}
+				}
+			}, 
+			//浠撳簱鐩戝惉浜嬩欢
+			HWHNameChange(e) {
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i]["HName"] == e) {
+						this.hform.HWHName = this.HWHNameList[i]["HName"]
+						this.hform.HWHID = this.HWHNameList[i].HItemID
 
-                    HRedBlueFlag: 'false',
-                    HStockOrgName: uni.getStorageSync('Organization'),
-                    HStockOrgID: uni.getStorageSync('OrganizationID'),
-                    HStockOutOrgID: uni.getStorageSync('OrganizationID'),
-                    HBarCode_B: '',
-                    HMouldName_B: '',
-                    HMouldID_B: '',
-                    HMouldCount_B: '',
-                }
-            }
-        },
-        methods: {
-
-            //鎵爜
-            toScanCode() {
-                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-                mpaasScanModule.mpaasScan({
-                    'hideAlbum': true,
-                    'timeoutInterval': '10', //瓒呮椂鏃堕棿
-                    'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-                }, (ret) => {
-                    console.log(ret.resp_result)
-                    if (this.hform.HBarCode == '*') {
-                        this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
-                    } else {
-                        this.hform.HBarCode = ret.resp_result
-                    }
-
-                    this.getCode(this.hform.HBarCode)
-                })
-            },
-            getNewData() {
-                CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
-                        HBillType: this.hform.HBillType
-                    },
-                    (res) => {
-                        let res1 = res.data;
-                        let {
-                            data,
-                            count
-                        } = res1
-                        if (count == 1) {
-                            this.hform.HInterID = data[0].HInterID
-                            this.hform.HBillNo = data[0].HBillNo
-                        } else {
-                            uni.showToast({
-                                title: data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    })
-            },
-            async getCode(HBarCode) {
-                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-                if (!this.hform.HWHName) {
-                    this.hform.HWHID = 0
-                }
-                if (!this.hform.HStockPlaceName) {
-                    this.hform.HStockPlaceID = 0
-                }
-                var sHWHID = this.hform.HWHID
-                var sHSPID = this.hform.HStockPlaceID
-                var sOldBarCode = HBarCode;
-                var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
-                var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
-                var sSourceBillNo = ""
-                var sSourceBillType = "-1"
-                if (HDeleteFlag == '*') {
-                    if (sBarCode == "") {
-                        uni.showToast({
-                            title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
-                            icon: 'none'
-                        });
-                    } else {
-                        try{
-                            let res = await CommonUtils.doRequest2Sync({
-                                url: "/MouldController/set_DelMouldStockBillMain_Temp_Json",
-                                data: {
-                                    HInterID: this.hform.HInterID,
-                                    HBillType: this.hform.HBillType,
-                                    HBarCode: sBarCode
-                                }
-                            })
-                            // 鍑虹幇绔炴�佹椂 鐩存帴閫�鍑洪潪棣栨鎻愪氦鐨勫悗缁鐞�
-                            if(!res){
-                                return
-                            }
-                            
-                            console.log('鍒犻櫎鏉$爜', res.data);
-                            this.hform.HBarCode = '';
-                            if (res.data.count == 1) {
-                                this.hform.HQty = ''
-                            } else {
-                                uni.showToast({
-                                    title: res.data.Message,
-                                    icon: 'none'
-                                })
-                            }
-                        }catch(error) {
-                            console.log(error);
-                            uni.showToast({
-                                title: '鎺ュ彛璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    }
-                } else {
-                    try {
-                        var sBarCode = this.hform.HBarCode
-                        // 鍚屾璇锋眰纭繚 @confirm 鍜� @blur 璇锋眰鍙細瑙﹀彂涓�娆�(閬垮厤绔炴��)
-                        let res = await CommonUtils.doRequest2Sync({
-                            url: '/MouldController/Get_CheckTypeByMouldBarCode_Json',
-                            data: {
-                                sBarCode: sBarCode,
-                                HInterID: this.hform.HInterID,
-                                HBillType: this.hform.HBillType,
-                                HBillNo: this.hform.HBillNo,
-                                HMaker: this.hform.HMaker,
-                                HWhID: sHWHID,
-                                HSPID: sHSPID,
-                                HSCWhID: 0,
-                                HSCSPID: 0,
-                                HRedBlueFlag: this.hform.HRedBlueFlag,
-                                HSourceBillNo: sSourceBillNo,
-                                HSourceBillType: sSourceBillType,
-                                HStockOrgID: this.hform.HStockOrgID,
-                                HStockOutOrgID: this.hform.HStockOutOrgID,
-                            }
-                        })
-
-                        if (!res) {
-                            // 褰撹Е鍙戠珵鎬佹椂锛屽悗瑙﹀彂鐨勮姹備細琚洿鎺ヨ绂佹鍙戦�侊紝骞惰繑鍥炵┖鍊�
-                            return
-                        }
-
-                        console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
-                        this.hform.HBarCode = ''
-                        if (res.data.count == 1) {
-                            this.tabs = 1
-                            this.DisBillEntryList()
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    } catch (error) {
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    }
-
-                }
-            },
-            //浠撳簱鐩戝惉浜嬩欢
-            HWHNameChange(e) {
-                for (var i = 0; i < this.HWHNameList.length; i++) {
-                    if (this.HWHNameList[i]["HName"] == e) {
-                        this.hform.HWHName = this.HWHNameList[i]["HName"]
-                        this.hform.HWHID = this.HWHNameList[i].HItemID
-
-                        this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
-                    }
-                }
-            },
-            HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i]["HWhName"] == e) {
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
-                    }
-                }
-            },
-            HScatterUserChange(e) {
-                for (var i = 0; i < this.HEmpNameList.length; i++) {
-                    if (this.HEmpNameList[i].HName == e) {
-                        this.hform.HSactterUserID = this.HEmpNameList[i].HItemID
-                        this.hform.HSactterUserName = this.HEmpNameList[i].HName
-                        this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
-                    }
-                }
-            },
-            HCollectUserChange(e) {
-                for (var i = 0; i < this.HEmpNameList.length; i++) {
-                    if (this.HEmpNameList[i].HName == e) {
-                        this.hform.HCollectUserID = this.HEmpNameList[i].HItemID
-                        this.hform.HCollectUserName = this.HEmpNameList[i].HName
-                        this.hform.HKeeperID = this.HEmpNameList[i].HItemID
-                    }
-                }
-            },
-            /* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
-            getHBaseList() {
-                CommonUtils.doRequest(
-                    "/Web/GetWarehouseList_Json_New", {
-                        Warehouse: "",
-                        HOrgID: uni.getStorageSync('OrganizationID')
-                    },
-                    (res) => {
-                        let res1 = res.data
-                        let {
-                            data,
-                            count
-                        } = res1
-                        if (count == 1) {
-                            this.HWHNameList = data
-                            for (var i = 0; i < data.length; i++) {
-                                this.arrayHWHName[i] = data[i]["HName"]
-                            }
-                        } else {
-                            uni.showToast({
-                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                )
-                CommonUtils.doRequest(
-                    "/WEBSController/GetStockPlaceList_Json", {
-                        StockPlace: '',
-                        HWhID: this.hform.HWHID,
-                        HStockOrgID: uni.getStorageSync('OrganizationID')
-                    },
-                    (res) => {
-                        let res1 = res.data
-                        console.log(res1)
-                        let {
-                            data,
-                            count
-                        } = res1
-                        if (count == 1) {
-                            this.HStockPlaceNameList = data
-                            for (var i = 0; i < data.length; i++) {
-                                this.arrayHStockPlaceName[i] = data[i]["HWhName"]
-                            }
-                        } else {
-                            uni.showToast({
-                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                )
-            },
-            /* #endregion */
-            getHEmpList() {
-                CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
-                        Employee: '',
-                        HGroupID: 0
-                    },
-                    (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'
-                            })
-                        }
-                    },
-                )
-            },
-            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-            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'
-                        })
-                    },
-                });
-            },
-            getHSupList() {
-                CommonUtils.doRequest(
-                    "/Gy_Customer/list", {
-                        sWhere: "",
-                        user: uni.getStorageSync('HUserName'),
-                        Organization: uni.getStorageSync('Organization')
-                    },
-                    (res) => {
-                        let res1 = res.data
-                        let {
-                            data,
-                            count
-                        } = res1
-                        if (count == 1) {
-                            this.HSupNameList = data
-                            for (var i = 0; i < data.length; i++) {
-                                this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    }
-                )
-            },
-            getSupplier() {
-                CommonUtils.doRequest(
-                    "/WEBSController/GetSupplier_Json", {
-                        HBarCode: uni.getStorageSync(''),
-                        Organization: uni.getStorageSync('Organization')
-                    },
-                    (res) => {
-                        let res1 = res.data
-                        let {
-                            data,
-                            count
-                        } = res1
-                        if (count == 1) {
-                            this.HSupNameList = data
-                            for (var i = 0; i < data.length; i++) {
-                                this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: data.Message,
-                                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].閮ㄩ棬鍚嶇О
-                    }
-                }
-            },
-            //閫夋嫨瀹㈡埛
-            HSupNameChange(e) {
-                for (var i = 0; i < this.HSupNameList.length; i++) {
-                    if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
-                        this.hform.HSupID = this.HSupNameList[i].HItemID
-                        this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
-                    }
-                }
-            },
-            HDateChange(e) {
-                console.log(e.detail.value)
-                this.hform.HDate = e.detail.value
-            },
-            HSelectTypeChange(e) {
-                this.hform.TypeName = e;
-                this.hform.Selection = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
-                this.hform.SelectionID = '';
-                if (e == '閮ㄩ棬') {
-                    this.hform.HSupTypeID = 3;
-                    this.arrayHSelectType = this.arrayHDeptName;
-                    this.HSelectTypeList = this.HDeptNameList;
-                } else if (e === '渚涘簲鍟�') {
-                    this.hform.HSupTypeID = 1;
-                    this.arrayHSelectType = [];
-                    this.HSelectTypeList = [];
-                } else if (e === '瀹㈡埛') {
-                    // 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
-                    this.hform.HSupTypeID = 2;
-                    this.arrayHSelectType = this.arrayHSupName;
-                    this.HSelectTypeList = this.HSupNameList;
-                } else {
-                    this.arrayHSelectType = [];
-                    this.HSelectTypeList = [];
-                }
-            },
-            //鍣ㄥ叿淇℃伅
-            DisBillEntryList() {
-                CommonUtils.doRequest(
-                    "/MouldController/GetMouldBillEntryTmpList_Json", {
-                        HInterID: this.hform.HInterID,
-                        HBillNo: this.hform.HBillNo,
-                        HBillType: this.hform.HBillType
-                    },
-                    (res) => {
-                        console.log('鍣ㄥ叿', res.data)
-                        var data = res.data.data
-                        this.HMouldList = data
-                        if(this.HMouldFields.length != res.data.list.length) {
-                            this.HMouldFields =  CommonUtils.fieldListFilterRole({
-                                FieldList: res.data.list,
-                            })
-                        }
-                        console.log('this.HMouldFields: ',this.HMouldFields);
-                        if (data.count == 0) {
-                            this.hform.HMouldCount_B = ''
-                            this.hform.HMouldID_B = ''
-                            this.hform.HMouldName_B = ''
-
-                        } else {
-                            this.hform.HMouldCount_B = data[0]['鏁伴噺']
-                            this.hform.HMouldID_B = data[0].HMouldID
-                            this.hform.HMouldName_B = data[0]['鍣ㄥ叿鍚嶇О']
-                            // this.hform.HBarCode_B = data[0]['鍣ㄥ叿鏉$爜']
-                        }
-                    },
-
-                )
-            },
-            goBack() {
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                            uni.redirectTo({
-                                url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
-                            })
-                        } else if (res.cancel) {
-                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                        }
-                    }
-                });
-            },
-            ifEdit() {
-                this.isEdit = true
-                this.hform.eventType = 'Modify'
-            },
-            //缂栬緫鍥炴樉
-            getEditData(linterid, HBillNo) {
-                //涓昏〃
-                var sWhere = " and hmainid='" + linterid + "'";
-                uni.request({
-                    url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage',
-                    data: {
-                        sWhere: this.sWhere,
-                        user: uni.getStorageSync('HUserName'),
-                        Organization: uni.getStorageSync('Organization'),
-                        page: 1,
-                        size: 100
-                    },
-                    success: (res) => {
-                        console.log(1, res.data.data[0]);
-                        if (res.data.code == 1) {
-                            var data = res.data.data[0]
-                            this.btnType = 3
-                            this.hform.HInterID = data.hmainid
-                            this.hform.HBillNo = data.鍗曟嵁鍙�
-                            // this.hform.HBarCode= data.鏉″舰鐮� 瑙嗗浘涓病鏈夎瀛楁
-                            this.hform.HDeptID = data.HDeptID
-                            this.hform.HDeptName = data.閮ㄩ棬
-                            this.hform.HCollectUserName = data.鍙戞枡浜�
-                            this.hform.HCollectUserID = data.hkeeperid
-                            this.hform.HKeeperID = data.hkeeperid
-                            this.hform.HSactterUserName = data.棰嗘枡浜�
-                            this.hform.HSactterUserID = data.hsecmanagerid
-                            this.hform.HSecManagerID = data.hsecmanagerid
-                            this.hform.HMangerName = data.璐熻矗浜�
-                            // this.hform.HRemark= data.琛ㄥご澶囨敞						
-                            this.hform.HDate = data.鏃ユ湡.substr(0, 10)
-
-                            this.hform.HWHID = data.HWHID,
-                                this.hform.HWHName = data.浠撳簱,
-                                this.hform.HStockPlaceID = data.HSPID,
-                                this.hform.HStockPlaceName = data.浠撲綅,
-
-                                this.hform.Selection = data.寰�鏉ュ崟浣�,
-                                this.hform.SelectionID = data.HSupID,
-                                this.hform.TypeName = data.寰�鏉ョ被鍨嬪悕绉�,
-                                this.hform.HSupTypeID = data.寰�鏉ョ被鍨�,
-                                this.hform.TypeID = data.寰�鏉ョ被鍨�,
-
-                                this.hform.HMouldID_B = data.hmaterid,
-                                // this.hform.HMouldID_B=data.妯″叿浠g爜,
-                                this.hform.HMouldName_B = data.妯″叿鍚嶇О,
-                                // this.hform.HMouldModel=data.妯″叿瑙勬牸,
-                                this.hform.HMouldCount_B = 1,
-                                this.hform.HRedBlueFlag = data.绾㈣摑鍗曟爣璁� == '钃濆瓧' ? false : true,
-
-
-                                this.hform.HStockOrgID = data.HStockOrgID,
-                                this.hform.HStockOrgName = data.搴撳瓨缁勭粐,
-                                // this.hform.HICMOEntryID=data.HICMOEntryID,
-                                // this.hform.HProcExchBillNo=data.HProcExchBillNo,
-                                // this.hform.HProcExchInterID=data.HProcExchInterID,
-                                // this.hform.HProcExchEntryID=data.HProcExchEntryID,
-                                // this.hform.HOrgID=data.HOrgID,
-
-                                this.hform.HMaker = data.鍒跺崟浜�
-                            //this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
-                            //this.hform.HUpDater= data.淇敼浜�
-                            //this.hform.HUpDateDate= data.淇敼鏃ユ湡
-                            // this.hform.HChecker= data.瀹℃牳浜�
-                            // this.hform.HCheckDate= data.瀹℃牳鏃ユ湡							
-                            // this.hform.HDeleteMan= data.浣滃簾浜�
-                            // this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            submit() {
-                //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
-                if (!this.hform.HWHName) {
-                    this.hform.HWHID = 0
-                }
-                if (!this.hform.HStockPlaceName) {
-                    this.hform.HStockPlaceID = 0
-                }
-                if (!this.hform.HSactterUserName) {
-                    this.hform.HSactterUserID = 0
-                } else {
-                    this.HSecManagerID = this.hform.HSactterUserID
-                }
-                if (!this.hform.HCollectUserName) {
-                    this.hform.HCollectUserID = 0
-                } else {
-                    this.HKeeperID = this.hform.HCollectUserID
-                }
-                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.hform.HMouldID_B == 0 || this.hform.HMouldID_B == null) {
-                        uni.showToast({
-                            title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-                            icon: 'none'
-                        })
-                    } else {
-                        uni.showLoading({
-                            title: '璇风◢鍊�'
-                        })
-
-
-                        let sMainStr = JSON.stringify(this.hform);
-                        console.log("涓昏〃锛�" + sMainStr)
-
-                        CommonUtils.doRequest(
-                            '/MouldController/set_SaveMouldProdOutBill_Json', {
-                                oMain: sMainStr
-                            },
-                            (res) => {
-                                console.log(1, res);
-                                uni.hideLoading()
-                                if (res.data.count == 1) {
-                                    uni.showModal({
-                                        title: '鎻愮ず',
-                                        content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-                                        success: (res) => {
-                                            if (res.confirm) {
-                                                console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                                                uni.redirectTo({
-                                                    url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBill?OperationType=1'
-                                                })
-                                            } else if (res.cancel) {
-                                                console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                                setTimeout(() => {
-                                                    uni.navigateBack();
-                                                }, 50)
-                                            }
-                                        }
-                                    });
-                                } else {
-                                    // uni.showToast({
-                                    // 	title: res.data.Message,
-                                    // 	icon: 'none'
-                                    // })
-                                    uni.showModal({
-                                        content: res.data.Message,
-                                        showCancel: false,
-                                        complete() {
-                                            uni.hideLoading()
-                                        }
-                                    })
-                                }
-                            },
-                            null,
-                            "POST"
-                        )
-                    }
-                }
-            },
-            onLoad(e) {
-                console.log(e, this.userInfo)
-
-                if (e.linterid) {
-                    this.btnType = 3
-                    this.linterid = e.linterid
-                    this.HBillNo = e.HBillNo
-                    this.getEditData(e.linterid, e.HBillNo)
-                } else {
-                    this.getNewData()
-                }
-
-                this.getHBaseList()
-                this.getHSupList()
-                this.getHEmpList()
-                this.getHDeptList()
-                //this.getHEmpList()
-            }
-        }
-    }
+						this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+					}
+				}
+			},
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+					}
+				}
+			},
+			HScatterUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+						this.hform.HKeeperName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			HCollectUserChange(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
+					}
+				}
+			},
+			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+			getHBaseList() {
+				CommonUtils.doRequest(
+					"/Web/GetWarehouseList_Json_New", {
+						Warehouse: "",
+						HOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HWHNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHWHName[i] = data[i]["HName"]
+							}
+						} else {
+							uni.showToast({
+								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+				CommonUtils.doRequest(
+					"/WEBSController/GetStockPlaceList_Json", {
+						StockPlace: '',
+						HWhID: this.hform.HWHID,
+						HStockOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						console.log(res1)
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HStockPlaceNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+							}
+						} else {
+							uni.showToast({
+								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			/* #endregion */
+			getHEmpList() {
+				CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+						Employee: '',
+						HGroupID: 0
+					},
+					(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'
+							})
+						}
+					},
+				)
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			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'
+						})
+					},
+				});
+			},
+			getHCusList() {
+				CommonUtils.doRequest(
+					"/Gy_Customer/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HCusNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHCusName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			getHSupList()
+			{
+				CommonUtils.doRequest(
+					"/Gy_Supplier/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSuplierList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupplierName[i] = data[i].渚涘簲鍟嗗悕绉�
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								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].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			HSelectTypeChange(e)
+			{
+				this.hform.TypeName=e;
+				this.hform.HSupName = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+				this.hform.HSupID = '';
+				uni.setStorageSync("typeName_3802",e);
+				if(e=='閮ㄩ棬')
+				{
+					this.hform.HSupTypeID=3;
+					uni.setStorageSync("typeID_3802",3);
+					this.arrayHSelectType = this.arrayHDeptName;
+					this.HSelectTypeList = this.HDeptNameList;
+				}
+				else if(e === '渚涘簲鍟�') {
+					this.hform.HSupTypeID=1;
+					uni.setStorageSync("typeID_3802",1);
+					this.arrayHSelectType = this.arrayHSupplierName;
+					this.HSelectTypeList = this.HSuplierList;
+				} else if(e === '瀹㈡埛') {
+				// 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
+					this.hform.HSupTypeID=2;
+					uni.setStorageSync("typeID_3802",2);
+					this.arrayHSelectType =this.arrayHCusName;
+					this.HSelectTypeList = this.HCusNameList;
+				} else {
+					uni.setStorageSync("typeID_3802",0);
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				}	
+			},
+			//鍣ㄥ叿淇℃伅
+			DisBillEntryList() {
+				CommonUtils.doRequest(
+					"/MouldController/GetMouldBillEntryTmpList_Json", {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						console.log('鍣ㄥ叿', res.data)
+						var data = res.data.data
+						this.HMouldList = data;
+						if (res.data.count==0) {
+							this.HMouldList = [];
+							this.hform.HMouldCount_B = ''
+							this.hform.HMouldID_B = ''
+							this.hform.HMouldName_B = ''
+							
+						} else {
+							this.hform.HMouldCount_B = data[0].HQty
+							this.hform.HMouldID_B = data[0].HMouldID
+							this.hform.HMouldName_B = data[0].HMouldName
+							this.hform.HBarCode_B=data[0].HBarCode
+						}
+					},
+			
+				)
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/MJGL/mujulingliaochukudan/MouldProdOutBillList'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			ifEdit(){
+				this.isEdit = true
+				this.hform.eventType = 'Modify'
+			},
+			//缂栬緫鍥炴樉
+			getEditData(linterid,HBillNo){				
+				//涓昏〃
+				var sWhere = " and hmainid='" + linterid + "'";
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage', 
+					data: { sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page:1,
+						size:100 },
+				    success: (res) => {
+				        console.log(1,res.data.data[0]);
+						if(res.data.code == 1){
+							var data = res.data.data[0]							
+							this.btnType=3
+							this.hform.HInterID= data.hmainid
+							this.hform.HBillNo= data.鍗曟嵁鍙�
+							// this.hform.HBarCode= data.鏉″舰鐮� 瑙嗗浘涓病鏈夎瀛楁
+							this.hform.HDeptID= data.HDeptID
+							this.hform.HDeptName= data.閮ㄩ棬
+							this.hform.HSecManagerName= data.棰嗘枡浜�
+							this.hform.HSecManagerID= data.hsecmanagerid
+							this.hform.HKeeperID= data.hkeeperid
+							this.hform.HKeeperName= data.鍙戞枡浜�
+							// this.hform.HRemark= data.琛ㄥご澶囨敞						
+							this.hform.HDate = data.鏃ユ湡.substr(0,10)
+							
+							this.hform.HWHID=data.HWHID,
+							this.hform.HWHName=data.浠撳簱,
+							this.hform.HStockPlaceID=data.HSPID,
+							this.hform.HStockPlaceName=data.浠撲綅,
+							
+							this.hform.HSupName=data.寰�鏉ュ崟浣�,
+							this.hform.HSupID=data.HSupID,
+							this.hform.TypeName=data.寰�鏉ョ被鍨嬪悕绉�,				
+							this.hform.HSupTypeID=data.寰�鏉ョ被鍨�,					
+														
+							this.hform.HMouldID_B=data.hmaterid,
+							// this.hform.HMouldID_B=data.妯″叿浠g爜,
+							this.hform.HMouldName_B=data.妯″叿鍚嶇О,
+							// this.hform.HMouldModel=data.妯″叿瑙勬牸,
+							this.hform.HMouldCount_B=1,
+							this.hform.HRedBlueFlag=data.绾㈣摑鍗曟爣璁�=='钃濆瓧'?false:true,
+							
+							
+							this.hform.HStockOrgID=data.HStockOrgID,
+							this.hform.HStockOrgName=data.搴撳瓨缁勭粐,
+							// this.hform.HICMOEntryID=data.HICMOEntryID,
+							// this.hform.HProcExchBillNo=data.HProcExchBillNo,
+							// this.hform.HProcExchInterID=data.HProcExchInterID,
+							// this.hform.HProcExchEntryID=data.HProcExchEntryID,
+							// this.hform.HOrgID=data.HOrgID,
+																				
+							this.hform.HMaker= data.鍒跺崟浜�
+							//this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
+							//this.hform.HUpDater= data.淇敼浜�
+							//this.hform.HUpDateDate= data.淇敼鏃ユ湡
+							// this.hform.HChecker= data.瀹℃牳浜�
+							// this.hform.HCheckDate= data.瀹℃牳鏃ユ湡							
+							// this.hform.HDeleteMan= data.浣滃簾浜�
+							// this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});				
+			},
+			async 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.hform.HMouldID_B == 0||this.hform.HMouldID_B ==null) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+			
+			
+						let sMainStr = JSON.stringify(this.hform);
+						console.log("涓昏〃锛�" + sMainStr)
+						try {
+						    let res = await CommonUtils.doRequest2Sync({
+						        url: '/MouldController/set_SaveMouldProdOutBill_Json',
+						        method: 'POST',
+						        data: {
+						           oMain: sMainStr
+						        },
+						    })
+						
+						    if (!res) {
+						        return
+						    }
+						
+						    console.log(1, res);
+						    uni.hideLoading()
+						    if (res.data.count == 1) {
+						    	uni.showModal({
+						    		title: '鎻愮ず',
+						    		content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+						    		success: (res) => {
+						    			if (res.confirm) {
+						    				console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+						    				uni.redirectTo({
+						    					url: '/pages/caigouruku/POStockInBill?OperationType=1'
+						    				})
+						    			} else if (res.cancel) {
+						    				console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						    				setTimeout(() => {
+						    					uni.navigateBack();
+						    				}, 50)
+						    			}
+						    		}
+						    	});
+						    } else {
+						    	// uni.showToast({
+						    	// 	title: res.data.Message,
+						    	// 	icon: 'none'
+						    	// })
+						    	uni.showModal({
+						    		content: res.data.Message,
+						    		showCancel: false,
+						    		complete() {
+						    			uni.hideLoading()
+						    		}
+						    	})
+						    }
+						} catch (err) {
+						    console.warn(err);
+						    uni.showToast({
+						        title: '鎺ュ彛璇锋眰澶辫触:' + err,
+						        icon: 'none'
+						    })
+						}
+					}
+				}
+			},
+			showBillList() {
+			    this.$refs.billList.showPopup()
+			},
+			//閫夋嫨婧愬崟绫诲瀷
+			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()
+			    }
+				console.log(this.hform.HMainSourceBillType)
+				uni.setStorageSync("billType_3802",this.hform.HMainSourceBillType);
+				uni.setStorageSync("billTypeName_3802",this.HMainSourceBillType);
+			},
+			//閫変腑婧愬崟
+			getHBarCodeData(HBarCode) {
+			    uni.request({
+			        url: this.serverUrl + '/MouldController/Get_SourceBarCode_ProdOut_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[0]
+			                console.log(2, data);
+			                
+			                this.hform.HSourceBillNo = data.HSourceBillNo
+			                this.showHMainSourceBillType = false
+			                //榛樿闈炲婧愬崟
+			                this.showHSourceBillNo = false
+			                //璁剧疆寰�鏉ュ崟浣�
+							this.hform.HSupTypeID = data.HCorrespondentTypeID
+							this.hform.HSupID = data.HCorrespondentID
+							this.hform.HSupName = data.HCorrespondentName
+							if(data.HCorrespondentTypeID==1){
+								this.hform.TypeName = "渚涘簲鍟�"
+							}else if(data.HCorrespondentTypeID==2){
+								this.hform.TypeName = "閮ㄩ棬"
+							}else{
+								this.hform.TypeName = "瀹㈡埛"
+							}
+							
+							
+			                this.tabs = 1
+			                CommonUtils.playSound(1)
+							//鍏夋爣瀵瑰噯鏉$爜
+							this.refreshBarCodeState()
+			                this.DisBillEntryList()
+			            } else {
+			                console.log('res.data.Message: ', res.data.Message);
+			                CommonUtils.playSound(0)
+			                uni.showToast({
+			                    title: res.data.Message,
+			                    icon: 'none'
+			                })
+			            }
+			        },
+			        fail: (res) => {
+			            CommonUtils.playSound(0)
+			            console.log(res);
+			            uni.showToast({
+			                title: '鎺ュ彛璇锋眰澶辫触',
+			                icon: 'none'
+			            })
+			        },
+			    });
+			},
+			async refreshBarCodeState() {
+			    this.barCodeFocus = false
+			    await this.$nextTick(() => {
+			        this.barCodeFocus = true
+			        this.hform.HBarCode = ""
+			    })
+			},
+			delMater(item) {
+				if (event && event.target.classList && event.target.classList.contains('link-text')) {
+				            return; // 濡傛灉鏄摼鎺ョ偣鍑伙紝涓嶆墽琛屽垹闄�
+				        }
+				        
+			    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'
+			                        })
+			                    }
+			                });
+			            }
+			        }
+			    });
+			},
+			delMater(item) {   
+			    uni.showModal({
+			        title: '鎻愮ず',
+			        content: '纭瑕佸垹闄� "' + item.鍣ㄥ叿鍙� + '" 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+			        success: (res) => {
+			            if (res.confirm) {
+			                uni.request({
+			                    url: this.serverUrl +
+			                        '/MouldController/set_DelMouldStockBillMain_Temp_Json',
+			                    data: {
+			                        HInterID: this.hform.HInterID,
+			                        HBarCode: item.HBarCode,
+			                        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'
+			                        })
+			                    }
+			                });
+			            }
+			        }
+			    });
+			},
+			onLoad(e) {
+				console.log(e, this.userInfo)
+				console.log(getUserInfo().HEmpName)
+				if(e.linterid){
+					this.btnType = 3
+					this.linterid = e.linterid
+					this.HBillNo = e.HBillNo
+					this.getEditData(e.linterid, e.HBillNo)
+				}else{
+					this.getNewData()
+				}
+			
+				this.getHBaseList()
+				this.getHCusList()
+				this.getHEmpList()
+				this.getHDeptList()
+				this.getHSupList()
+				setTimeout(() => {
+				  this.HSelectTypeChange(this.hform.TypeName)
+				  //鍒濆鍖栧線鏉ュ崟浣�
+				  if(this.hform.TypeName=='閮ㄩ棬')
+				  {
+				  	this.hform.HSupName = getUserInfo().HDept; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+				  	this.hform.HSupID = getUserInfo().HDeptID;
+				  }
+				  else if(this.hform.TypeName === '渚涘簲鍟�') {
+				  	this.hform.HSupName = getUserInfo().HSupName; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+				  	this.hform.HSupID = getUserInfo().HSupID;
+				  } else if(this.hform.TypeName === '瀹㈡埛') {
+					
+				  }
+				  
+				}, 300);
+				uni.$on('BillSelectComplete', (e) => {
+				    console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+				    this.getHBarCodeData(e.HBillNo)
+				    this.$refs.billList.exit()
+				})
+				//this.getHEmpList()
+			},
+			//閲嶈閫夋嫨婧愬崟蹇呴』娣诲姞杩欎釜鍚﹀垯鍑虹幇涓ラ噸bug
+			onUnload() {
+			    uni.$off('BillSelectComplete')
+			},
+		}
+	}
 </script>
 <style lang="scss" scoped>
     .form {
diff --git a/utils/common.js b/utils/common.js
index f7526e9..9553dec 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -395,10 +395,7 @@
             console.log('鎾斁鏆傚仠锛岄攢姣�');
             innerAudioContext.destroy();
         });
-		innerAudioContext.onStop(function() {
-		    console.log('鎾斁鏆傚仠锛岄攢姣�');
-		    innerAudioContext.destroy();
-		})
+		
     }
     // playSound(e) {
     //     // 鍏ㄥ眬缁存姢涓�涓煶棰戝疄渚嬶紝闃叉缂撳瓨婧㈠嚭

--
Gitblit v1.9.1