From f0adb26941c51a442b8e201ce384819e7a5c37f0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 30 九月 2025 14:10:57 +0800
Subject: [PATCH] 所有模块添加 仓库/仓位扫码功能,添加仓库扫码时自动筛选仓位信息

---
 pages/zutuosaoma/form.vue                |    2 
 pages/zhijiediaobo/form.vue              |   20 
 pages/shengchanrukushengdan/form.vue     |   48 
 pages.json                               |   12 
 pages/shengchantuiliao/form.vue          |   29 
 pages/xiaoshouchuku/form.vue             |   52 
 pages/qitaruku_v2/form.vue               | 3377 +++++++-------
 pages/caigoutuiliao/form.vue             |   49 
 pages/xiaoshoutuihuo/form.vue            | 2837 ++++++------
 pages/weiwairuku/form.vue                |   62 
 pages/qitachuku_v2/form.vue              |  127 
 pages/weiwailingliao/form.vue            | 3248 +++++++-------
 pages/caigouruku/form.vue                |   45 
 pages/index/index.vue                    |   14 
 pages/shengchanbuliao/form.vue           |   32 
 pages/shengchanlingliaoshengdan/form.vue | 3294 +++++++-------
 16 files changed, 6,833 insertions(+), 6,415 deletions(-)

diff --git a/pages.json b/pages.json
index a0221e0..860ac2c 100644
--- a/pages.json
+++ b/pages.json
@@ -710,6 +710,18 @@
             "style": {
                 "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
             }
+        },{
+            "path": "pages/weiwairuku/table",
+            "style": {
+                "navigationBarTitleText": "濮斿鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwairuku/form",
+            "style": {
+                "navigationBarTitleText": "濮斿鍏ュ簱鍗�"
+            }
         },
         {
             "path": "pages/zhijiediaobo/table",
diff --git a/pages/caigouruku/form.vue b/pages/caigouruku/form.vue
index 15650a8..dcc6b5b 100644
--- a/pages/caigouruku/form.vue
+++ b/pages/caigouruku/form.vue
@@ -27,7 +27,7 @@
             <view class="form-item">
                 <view class="title">浠撲綅:</view>
                 <view class="right" v-show="showHStockPlaceName">
-                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                    <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
                         v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                         @confirm="HStockPlaceNameScan"></uni-combox>
                 </view>
@@ -371,6 +371,16 @@
             BillListPopupVue,
             BarCodePopupVue
         },
+        computed: {
+            arrayHStockPlaceNameComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                    .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                    .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
+        },
         onLoad(e) {
             console.log(e, this.userInfo)
             this.OperationType = e.OperationType
@@ -409,12 +419,12 @@
                 // 鎵弿浠撳簱鐮�
                 console.log('浠撳簱鐮�: ', e);
                 let index = this.HWHNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
-                if(index == -1){
+                if (index == -1) {
                     uni.showToast({
-                        icon:'none',
+                        icon: 'none',
                         title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
                     })
-                }else {
+                } else {
                     this.HWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
                 }
             },
@@ -422,13 +432,13 @@
                 // 鎵弿浠撲綅鐮�
                 console.log('浠撲綅鐮�: ', e);
                 let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
-                console.log('index: ',index);
-                if(index == -1){
+                console.log('index: ', index);
+                if (index == -1) {
                     uni.showToast({
-                        icon:'none',
+                        icon: 'none',
                         title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
                     })
-                }else {
+                } else {
                     this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
                 }
             },
@@ -775,12 +785,21 @@
             },
             //閫夋嫨浠撲綅
             HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
-                    }
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
                 }
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                //     if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                //         this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                //         this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                //     }
+                // }
             },
             //閫夋嫨婧愬崟
             HSourceBillNoChange(e) {
diff --git a/pages/caigoutuiliao/form.vue b/pages/caigoutuiliao/form.vue
index 7699225..4661135 100644
--- a/pages/caigoutuiliao/form.vue
+++ b/pages/caigoutuiliao/form.vue
@@ -27,8 +27,9 @@
             <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" @confirm="HStockPlaceNameScan"></uni-combox>
+                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
+                        @confirm="HStockPlaceNameScan"></uni-combox>
                 </view>
                 <view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
                         placeholder="涓嶅彲鎿嶄綔" disabled="" /></view>
@@ -353,6 +354,16 @@
                 }
             }
         },
+        computed: {
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                    .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                    .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
+        },
         onLoad(e) {
             console.log(e, this.userInfo)
             this.OperationType = e.OperationType
@@ -385,12 +396,12 @@
                 // 鎵弿浠撳簱鐮�
                 console.log('浠撳簱鐮�: ', e);
                 let index = this.HWHNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
-                if(index == -1){
+                if (index == -1) {
                     uni.showToast({
-                        icon:'none',
+                        icon: 'none',
                         title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
                     })
-                }else {
+                } else {
                     this.HWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
                 }
             },
@@ -398,13 +409,13 @@
                 // 鎵弿浠撲綅鐮�
                 console.log('浠撲綅鐮�: ', e);
                 let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
-                console.log('index: ',index);
-                if(index == -1){
+                console.log('index: ', index);
+                if (index == -1) {
                     uni.showToast({
-                        icon:'none',
+                        icon: 'none',
                         title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
                     })
-                }else {
+                } else {
                     this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
                 }
             },
@@ -706,12 +717,20 @@
             },
             //閫夋嫨浠撲綅
             HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
-                    }
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
                 }
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                //     if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                //         this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                //         this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                //     }
+                // }
             },
             //閫夋嫨婧愬崟
             HSourceBillNoChange(e) {
@@ -1293,7 +1312,7 @@
                                 this.hform.HMainSourceBillType = 1102
                                 this.HMainSourceBillType = '閲囪喘璁㈠崟'
                                 this.showHSupName = false
-                            }else if (data.HSourceBillType == 1201) {
+                            } else if (data.HSourceBillType == 1201) {
                                 this.hform.HMainSourceBillType = 1201
                                 this.HMainSourceBillType = '閲囪喘鍏ュ簱鍗�'
                                 this.showHSupName = false
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 28ec481..732476a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -122,6 +122,12 @@
                         id: 8,
                         hidden: false,
                     }, {
+                        img: '../../static/icon/icon8.png',
+                        text: '鐢熶骇閫�鏂欐柊澧�',
+                        url: `/pages/shengchantuiliao/form`,
+                        id: 27,
+                        hidden: false,
+                    }, {
                         img: '../../static/icon/icon17.png',
                         text: '鐢熶骇鍏ュ簱鏂板',
                         url: '/pages/shengchanrukushengdan/form?OperationType=1',
@@ -233,13 +239,7 @@
                         id: 26,
                         hidden: false,
                     },
-                    {
-                        img: '../../static/icon/icon8.png',
-                        text: '鐢熶骇閫�鏂欐柊澧�',
-                        url: `/pages/shengchantuiliao/form`,
-                        id: 27,
-                        hidden: false,
-                    }
+
                 ],
                 // itemData: [{
                 // 		img: '../../static/icon/icon1.png',
diff --git a/pages/qitachuku_v2/form.vue b/pages/qitachuku_v2/form.vue
index 45884c7..f7a40ba 100644
--- a/pages/qitachuku_v2/form.vue
+++ b/pages/qitachuku_v2/form.vue
@@ -27,7 +27,7 @@
             <view class="form-item">
                 <view class="title">浠撲綅:</view>
                 <view class="right" v-show="showHStockPlaceName">
-                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
                         v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                 </view>
                 <view class="righton" v-show="!showHStockPlaceName">
@@ -411,6 +411,16 @@
             BillListPopupVue,
             BarCodePopupVue
         },
+        computed: {
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                        .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                        .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
+        },
         onLoad(e) {
 
             console.log(e, this.userInfo)
@@ -445,6 +455,32 @@
             uni.$off('BillSelectComplete')
         },
         methods: {
+            async HWHNameScan(e) {
+                // 鎵弿浠撳簱鐮�
+                console.log('浠撳簱鐮�: ', e);
+                let index = this.HWHNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+                    })
+                } else {
+                    this.HWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
+                }
+            },
+            async HStockPlaceNameScan(e) {
+                // 鎵弿浠撲綅鐮�
+                console.log('浠撲綅鐮�: ', e);
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e.trim())
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
             async qrCodeDisplay() {
                 try {
                     this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
@@ -815,12 +851,21 @@
             },
             //閫夋嫨浠撲綅
             HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
-                    }
+
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
                 }
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                //     if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                //         this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                //         this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+                //     }
+                // }
             },
             //閫夋嫨婧愬崟
             HSourceBillNoChange(e) {
@@ -1190,41 +1235,41 @@
                                     this.HSourceFlag = true
                                     if (!this.hform.HSourceBillNo) {
                                         this.hform.SourceFlag = true
-                                    	this.hform.HSupName = data.hSupNameField
-                                    	this.hform.HSupID = data.hSupIDField
-                                    	this.hform.HSourceBillNo = data.hSourceBillNoField
-                                    	if (data.hDeptIDField != 0) {
-                                    		this.hform.HDeptID = data.hDeptIDField
-                                    		this.hform.HDeptName = data.hDeptNameField
-                                    	}
-                                    	//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙� 娌℃湁婧愬崟绫诲瀷鍒欓粯璁や负鎵嬪伐褰曞叆
-                                    	this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
-                                    
-                                    	let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
-                                    		.hSourceBillTypeField)
-                                    	if (index != -1) {
-                                    		this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-                                    		this.hform.HMainSourceBillType = data.hSourceBillTypeField
-                                    		this.showHMainSourceBillType = false
-                                    	}
-                                    	// if (data.hSourceBillTypeField == "1103") {
-                                    	// 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-                                    	// 	this.hform.HMainSourceBillType = 1103
-                                    	// 	this.showHMainSourceBillType = false
-                                    	// } else if (data.hSourceBillTypeField == "1102") {
-                                    	// 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-                                    	// 	this.hform.HMainSourceBillType = 1102
-                                    	// 	this.showHMainSourceBillType = false
-                                    	// } else {
-                                    	// 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-                                    	// 	this.hform.HMainSourceBillType = -1
-                                    	// 	this.showHMainSourceBillType = false
-                                    	// }
-                                    	if (data.hMulSourceFlagField == 0) {
-                                    		this.showHSourceBillNo = false
-                                    	}
-                                    	//渚涘簲鍟嗕笉鍙紪杈�
-                                    	this.showHSupName = false
+                                        this.hform.HSupName = data.hSupNameField
+                                        this.hform.HSupID = data.hSupIDField
+                                        this.hform.HSourceBillNo = data.hSourceBillNoField
+                                        if (data.hDeptIDField != 0) {
+                                            this.hform.HDeptID = data.hDeptIDField
+                                            this.hform.HDeptName = data.hDeptNameField
+                                        }
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙� 娌℃湁婧愬崟绫诲瀷鍒欓粯璁や负鎵嬪伐褰曞叆
+                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
+
+                                        let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                            .hSourceBillTypeField)
+                                        if (index != -1) {
+                                            this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                            this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                            this.showHMainSourceBillType = false
+                                        }
+                                        // if (data.hSourceBillTypeField == "1103") {
+                                        // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+                                        // 	this.hform.HMainSourceBillType = 1103
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else if (data.hSourceBillTypeField == "1102") {
+                                        // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
+                                        // 	this.hform.HMainSourceBillType = 1102
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else {
+                                        // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                        // 	this.hform.HMainSourceBillType = -1
+                                        // 	this.showHMainSourceBillType = false
+                                        // }
+                                        if (data.hMulSourceFlagField == 0) {
+                                            this.showHSourceBillNo = false
+                                        }
+                                        //渚涘簲鍟嗕笉鍙紪杈�
+                                        this.showHSupName = false
                                     }
                                 }
                                 //鏄剧ず琛ㄤ綋鏄庣粏
diff --git a/pages/qitaruku_v2/form.vue b/pages/qitaruku_v2/form.vue
index 4e37446..d8b521b 100644
--- a/pages/qitaruku_v2/form.vue
+++ b/pages/qitaruku_v2/form.vue
@@ -1,444 +1,494 @@
 <template>
-	<view>
-		<view class="form">
-			<view class="form-item">
-				<view class="title">鏉$爜:</view>
-				<view class="right" style="width: 380rpx;">
-					<input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
-						@confirm="getCode(hform.HBarCode)" />
-				</view>
-				<view class="icon-wrapper">
-					<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鏁伴噺:</view>
-				<view class="right">
-					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撳簱:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
-						@input="HWHNameChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撲綅:</view>
-				<view class="right" v-show="showHStockPlaceName">
-					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
-						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
-				</view>
-				<view class="righton" v-show="!showHStockPlaceName">
-					<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
-				</view>
-			</view>
+    <view>
+        <view class="form">
+            <view class="form-item">
+                <view class="title">鏉$爜:</view>
+                <view class="right" style="width: 380rpx;">
+                    <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+                        @confirm="getCode(hform.HBarCode)" />
+                </view>
+                <view class="icon-wrapper">
+                    <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鏁伴噺:</view>
+                <view class="right">
+                    <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">浠撳簱:</view>
+                <view class="right">
+                    <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+                        @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">浠撲綅:</view>
+                <view class="right" v-show="showHStockPlaceName">
+                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
+                        @confirm='HStockPlaceNameScan'></uni-combox>
+                </view>
+                <view class="righton" v-show="!showHStockPlaceName">
+                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
+                </view>
+            </view>
 
-			<view class="tabs">
-				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
-				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
-				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
-				<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
-				<view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
-			</view>
+            <view class="tabs">
+                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
+                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
+                <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
+                <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
+                <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
+            </view>
 
-			<view v-if="tabs == 0">
-				<view class="form-item">
-					<view class="title">婧愬崟绫诲瀷:</view>
-					<view class="right" v-show="showHMainSourceBillType">
-						<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
-							@change="HMainSourceBillTypeChange">
+            <view v-if="tabs == 0">
+                <view class="form-item">
+                    <view class="title">婧愬崟绫诲瀷:</view>
+                    <view class="right" v-show="showHMainSourceBillType">
+                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
+                            @change="HMainSourceBillTypeChange">
 
-							<input disabled name="HMainSourceBillType" 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="璇疯緭鍏ユ簮鍗曞崟鍙�"
+                            <input disabled name="HMainSourceBillType" 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" @confirm="onHSourceBillNoConfirmHandler" type="text"
-							name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                        <input :focus="HSourceBillNoFocus" @confirm="onHSourceBillNoConfirmHandler" type="text"
+                            name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 
-					</view>
-					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
-						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
-					</view>
+                    </view>
+                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType == -1">
+                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+                    </view>
 
-					<view class="righton" v-show="!showHSourceBillNo">
-						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-					</view>
-				</view>
+                    <view class="righton" v-show="!showHSourceBillNo">
+                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                    </view>
+                </view>
 
-				<view class="form-item">
-					<view class="title">鍗曟嵁瀛愮被鍨�:</view>
-					<view class="right">
-						<picker :range="arrayHBillSubType" v-model="hform.HBillSubType" @change="HBillSubTypeChange">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁瀛愮被鍨�:</view>
+                    <view class="right">
+                        <picker :range="arrayHBillSubType" v-model="hform.HBillSubType" @change="HBillSubTypeChange">
 
-							<input disabled name="HMainSourceBillType" v-model="HBillSubType" placeholder="璇烽�夋嫨鍗曟嵁瀛愮被鍨�" />
-							<view class="picker-overlay"></view>
-						</picker>
-					</view>
-				</view>
+                            <input disabled name="HMainSourceBillType" v-model="HBillSubType" placeholder="璇烽�夋嫨鍗曟嵁瀛愮被鍨�" />
+                            <view class="picker-overlay"></view>
+                        </picker>
+                    </view>
+                </view>
 
-				<view class="form-item">
-					<view class="title">鍏堣繘鍏堝嚭浠�:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
-							@input="HFIFOWHNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鏃ユ湡:</view>
-					<view class="right">
-						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
-							<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 class="form-item">
+                    <view class="title">鍏堣繘鍏堝嚭浠�:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
+                            @input="HFIFOWHNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏃ユ湡:</view>
+                    <view class="right">
+                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+                            <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 class="icon-wrapper">
                         <uni-icons type="scan" size="20" @click="qrCodeDisplay"></uni-icons>
                     </view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曟嵁ID:</view>
-					<view class="righton">
-						<input name="HInterID" disabled v-model="hform.HInterID" />
-					</view>
-				</view>
-			</view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁ID:</view>
+                    <view class="righton">
+                        <input name="HInterID" disabled v-model="hform.HInterID" />
+                    </view>
+                </view>
+            </view>
 
-			<view v-if="tabs == 1">
-				<view class="form-item">
-					<view class="title">淇濈:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
-							@input="HKeeperNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">楠屾敹:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
-							@input="HSecManagerNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">閮ㄩ棬:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
-							@input="HDeptNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">渚涘簲鍟�:</view>
-					<!-- <view class="right" v-show="showHSupName">
+            <view v-if="tabs == 1">
+                <view class="form-item">
+                    <view class="title">淇濈:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+                            @input="HKeeperNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">楠屾敹:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+                            @input="HSecManagerNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">閮ㄩ棬:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+                            @input="HDeptNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">渚涘簲鍟�:</view>
+                    <!-- <view class="right" v-show="showHSupName">
 						<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName"
 							@input="HSupNameChange"></uni-combox>
 					</view> -->
-					<view class="righton">
-						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">缁勭粐:</view>
-					<view class="righton">
-						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
-					</view>
-				</view>
-			</view>
+                    <view class="righton">
+                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁勭粐:</view>
+                    <view class="righton">
+                        <input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+                    </view>
+                </view>
+            </view>
 
-			<view v-if="tabs == 2">
-				<view class="list" v-for="(item,index) in Materlist" :key="index">
-					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
-						<view class="card-detail">
-							<view class="detail">
-								<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
-							</view>
-							<view class="detail">
-								<text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
-							</view>
-							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
-								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
-							</view>
-							<view class="detail" v-if="item.杈呭姪灞炴��">
-								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
-							</view>
-						</view>
-					</uni-card>
-				</view>
-				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
-			</view>
+            <view v-if="tabs == 2">
+                <view class="list" v-for="(item,index) in Materlist" :key="index">
+                    <uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+                            </view>
+                            <view class="detail">
+                                <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+                            </view>
+                            <view class="detail">
+                                <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+                            </view>
+                            <view class="detail">
+                                <text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
+                            </view>
+                            <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+                                <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+                            </view>
+                            <view class="detail" v-if="item.杈呭姪灞炴��">
+                                <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+                            </view>
+                        </view>
+                    </uni-card>
+                </view>
+                <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+            </view>
 
-			<view v-if="tabs == 4">
-				<view class="list" v-for="(item,index) in FIFOlist" :key="index">
-					<uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
-						@tap="delMater(item)">
-						<view class="card-detail">
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{item.HQty}}
-							</view>
-							<view class="detail">
-								<text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
-							</view>
-							<view class="detail">
-								<text>浠撳簱锛�</text>{{item.HWhName}}
-							</view>
-							<view class="detail">
-								<text>浠撲綅锛�</text>{{item.HSPName}}
-							</view>
-							<view class="detail">
-								<text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
-							</view>
-							<view class="detail" v-if="item.HBatchNo">
-								<text>鎵瑰彿锛�</text>{{item.HBatchNo}}
-							</view>
-							<view class="detail" v-if="item.HAuxPropName">
-								<text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
-							</view>
-						</view>
-					</uni-card>
-				</view>
-				<view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
-			</view>
+            <view v-if="tabs == 4">
+                <view class="list" v-for="(item,index) in FIFOlist" :key="index">
+                    <uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
+                        @tap="delMater(item)">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>鏁伴噺锛�</text>{{item.HQty}}
+                            </view>
+                            <view class="detail">
+                                <text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
+                            </view>
+                            <view class="detail">
+                                <text>浠撳簱锛�</text>{{item.HWhName}}
+                            </view>
+                            <view class="detail">
+                                <text>浠撲綅锛�</text>{{item.HSPName}}
+                            </view>
+                            <view class="detail">
+                                <text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
+                            </view>
+                            <view class="detail" v-if="item.HBatchNo">
+                                <text>鎵瑰彿锛�</text>{{item.HBatchNo}}
+                            </view>
+                            <view class="detail" v-if="item.HAuxPropName">
+                                <text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
+                            </view>
+                        </view>
+                    </uni-card>
+                </view>
+                <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+            </view>
 
-			<view v-if="tabs == 3">
-				<view class="form-item">
-					<view class="title">鏉$爜:</view>
-					<view class="righton">
-						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鐗╂枡:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HMaterName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瑙勬牸:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HMaterModel_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鎵规:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HBatchNo_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曚綅:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HUnitName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鏁伴噺:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HQty_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹归噺:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HTMQty_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">浠撳簱:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HWHName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">浠撲綅:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HSPName_B" />
-					</view>
-				</view>
-			</view>
+            <view v-if="tabs == 3">
+                <view class="form-item">
+                    <view class="title">鏉$爜:</view>
+                    <view class="righton">
+                        <input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鐗╂枡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HMaterName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瑙勬牸:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HMaterModel_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鎵规:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBatchNo_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曚綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HUnitName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏁伴噺:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HQty_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹归噺:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HTMQty_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浠撳簱:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HWHName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浠撲綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HSPName_B" />
+                    </view>
+                </view>
+            </view>
 
-			<view class="bottom-btn">
-				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-				<view style="flex: 1;"></view>
-				<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-			</view>
-		</view>
-		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
-			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+            <view class="bottom-btn">
+                <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+                <view style="flex: 1;"></view>
+                <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+                <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+            </view>
+        </view>
+        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
         <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
     </view>
 </template>
 <script>
-	import getDateTime from '@/utils/getdateTime.js';
-	import {
-		getUserInfo
-	} from "@/utils/auth.js";
-	import {
-		CommonUtils
-	} from '../../utils/common';
-	import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
-	import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
-    import { getUserStockRelation } from '../../utils/userRelationManager';
-	export default {
-		data() {
-			return {
-				userInfo: getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				HModName: 'Kf_OtherInBill_PDA',
-				ModRightName: 'CE_OtherIn',
-				OperationType: 1,
-				HInterID_Temp: '',
+    import getDateTime from '@/utils/getdateTime.js';
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import {
+        CommonUtils
+    } from '../../utils/common';
+    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    import {
+        getUserStockRelation
+    } from '../../utils/userRelationManager';
+    export default {
+        data() {
+            return {
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                HModName: 'Kf_OtherInBill_PDA',
+                ModRightName: 'CE_OtherIn',
+                OperationType: 1,
+                HInterID_Temp: '',
 
-				showHStockPlaceName: false,
-				showHMainSourceBillType: true,
-				showHSourceBillNo: true,
-				reHSourceBillNo: true,
-				showHSupName: true,
-				barCodeFocus: false,
-				HSourceBillNoFocus: false,
+                showHStockPlaceName: false,
+                showHMainSourceBillType: true,
+                showHSourceBillNo: true,
+                reHSourceBillNo: true,
+                showHSupName: true,
+                barCodeFocus: false,
+                HSourceBillNoFocus: false,
 
 
-				tabs: 0,
-				HMainSourceBillType: '鎵嬪伐褰曞叆',
-				arrayHMainSourceBillType: ['鍏ュ簱鐢宠鍗�', '鎵嬪伐褰曞叆'],
-				arrayHMainSourceBillValue: [1241, -1],
-				linterid: '',
-				HBillNo: '',
-				btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
-				showmore: false,
+                tabs: 0,
+                HMainSourceBillType: '鎵嬪伐褰曞叆',
+                arrayHMainSourceBillType: ['鍏ュ簱鐢宠鍗�', '鎵嬪伐褰曞叆'],
+                arrayHMainSourceBillValue: [1241, -1],
+                linterid: '',
+                HBillNo: '',
+                btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+                showmore: false,
 
-				arrayHWHName: [], //浠撳簱
-				HWHNameList: [],
-				arrayHStockPlaceName: [], //浠撲綅
-				HStockPlaceNameList: [],
-				arrayHSourceBillNo: [], //婧愬崟鍗曞彿
-				HSourceBillNoList: [],
+                arrayHWHName: [], //浠撳簱
+                HWHNameList: [],
+                arrayHStockPlaceName: [], //浠撲綅
+                HStockPlaceNameList: [],
+                arrayHSourceBillNo: [], //婧愬崟鍗曞彿
+                HSourceBillNoList: [],
 
-				arrayHBillSubType: [],
-				arrayHBillSubTypeValue: [],
-				HBillSubType: '',
+                arrayHBillSubType: [],
+                arrayHBillSubTypeValue: [],
+                HBillSubType: '',
 
-				arrayHEmpName: [], //鎿嶄綔鍛�
-				HEmpNameList: [],
-				arrayHDeptName: [], //閮ㄩ棬
-				HDeptNameList: [],
-				arrayHSupName: [], //渚涘簲鍟�
-				HSupNameList: [],
+                arrayHEmpName: [], //鎿嶄綔鍛�
+                HEmpNameList: [],
+                arrayHDeptName: [], //閮ㄩ棬
+                HDeptNameList: [],
+                arrayHSupName: [], //渚涘簲鍟�
+                HSupNameList: [],
 
-				Materlist: [],
-				FIFOlist: [],
-				hform: {
-					HBillType: 1203,
-					HBillSubType: '',
-					HBillerID: uni.getStorageSync('HBillerID'),
-					HRedBlueFlag: false,
-                    
+                Materlist: [],
+                FIFOlist: [],
+                hform: {
+                    HBillType: 1203,
+                    HBillSubType: '',
+                    HBillerID: uni.getStorageSync('HBillerID'),
+                    HRedBlueFlag: false,
+
                     SourceFlag: false,
-                    
-					HBarCode: '',
-					HQty: '',
-					HWHName: getUserInfo().HWHName,
-					HWHID: getUserInfo().HWhID,
-					HStockPlaceName: getUserInfo().HSPName,
-					HStockPlaceID: getUserInfo().HSPID,
 
-					HMainSourceBillType: -1,
-					HSourceBillNo: '', //CGDD000200
-					HFIFOWHName: '',
-					HFIFOWHID: '',
-					HDate: getDateTime.dateTimeStr('y-m-d'),
-					HMaker: uni.getStorageSync('HUserName'),
-					HBillNo: '',
-					HInterID: '',
+                    HBarCode: '',
+                    HQty: '',
+                    HWHName: getUserInfo().HWHName,
+                    HWHID: getUserInfo().HWhID,
+                    HStockPlaceName: getUserInfo().HSPName,
+                    HStockPlaceID: getUserInfo().HSPID,
 
-					HKeeperName: getUserInfo().HKeeper,
-					HKeeperID: getUserInfo().HKeeperID,
-					HSecManagerName: getUserInfo().HSecManager,
-					HSecManagerID: getUserInfo().HSecManagerID,
-					HDeptName: getUserInfo().HDept,
-					HDeptID: getUserInfo().HDeptID,
-					HSupName: '',
-					HSupID: '',
-					HStockOrgName: uni.getStorageSync('Organization'),
-					HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    HMainSourceBillType: -1,
+                    HSourceBillNo: '', //CGDD000200
+                    HFIFOWHName: '',
+                    HFIFOWHID: '',
+                    HDate: getDateTime.dateTimeStr('y-m-d'),
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HBillNo: '',
+                    HInterID: '',
 
-					HBarCode_B: '',
-					HMaterName_B: '',
-					HMaterModel_B: '',
-					HBatchNo_B: '',
-					HUnitName_B: '',
-					HQty_B: '',
-					HTMQty_B: '',
-					HWHName_B: '',
-					HSPName_B: '',
-				}
-			}
-		},
-		components: {
-			BillListPopupVue, BarCodePopupVue
-		},
-		onLoad(e) {
-			console.log(e, this.userInfo)
-			this.OperationType = e.OperationType
-			if (e.HInterID) {
-				this.HInterID_Temp = e.HInterID
+                    HKeeperName: getUserInfo().HKeeper,
+                    HKeeperID: getUserInfo().HKeeperID,
+                    HSecManagerName: getUserInfo().HSecManager,
+                    HSecManagerID: getUserInfo().HSecManagerID,
+                    HDeptName: getUserInfo().HDept,
+                    HDeptID: getUserInfo().HDeptID,
+                    HSupName: '',
+                    HSupID: '',
+                    HStockOrgName: uni.getStorageSync('Organization'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+
+                    HBarCode_B: '',
+                    HMaterName_B: '',
+                    HMaterModel_B: '',
+                    HBatchNo_B: '',
+                    HUnitName_B: '',
+                    HQty_B: '',
+                    HTMQty_B: '',
+                    HWHName_B: '',
+                    HSPName_B: '',
+                }
+            }
+        },
+        components: {
+            BillListPopupVue,
+            BarCodePopupVue
+        },
+        computed: {
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                        .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                        .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
+        },
+        computed: {
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                        .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                        .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
+        },
+        onLoad(e) {
+            console.log(e, this.userInfo)
+            this.OperationType = e.OperationType
+            if (e.HInterID) {
+                this.HInterID_Temp = e.HInterID
                 this.hform.HSourceFlag = true
-				// this.btnType = 1
-				this.refreshBarCodeState()
-				this.RoadBillMain(e.HInterID)
-			} else {
+                // this.btnType = 1
+                this.refreshBarCodeState()
+                this.RoadBillMain(e.HInterID)
+            } else {
                 this.hform.HSourceFlag = false
-				this.getNewData()
-				this.refreshHSourceBillState()
-			}
-			// this.getHBaseList()
-			this.getHSupList()
-			this.getHEmpList()
-			this.getHDeptList()
-			this.set_InitBillSubType();
-			
-			this.GetSourceBillType()
-			this.getRelationStore()
-			
-			uni.$on('BillSelectComplete', (e) => {
-				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
-				this.getHBarCodeData(e.HBillNo)
-				this.$refs.billList.exit()
-			})
-		},
-		onUnload() {
-			uni.$off('BillSelectComplete')
-		},
-		methods: {
+                this.getNewData()
+                this.refreshHSourceBillState()
+            }
+            // this.getHBaseList()
+            this.getHSupList()
+            this.getHEmpList()
+            this.getHDeptList()
+            this.set_InitBillSubType();
+
+            this.GetSourceBillType()
+            this.getRelationStore()
+
+            uni.$on('BillSelectComplete', (e) => {
+                console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+                this.getHBarCodeData(e.HBillNo)
+                this.$refs.billList.exit()
+            })
+        },
+        onUnload() {
+            uni.$off('BillSelectComplete')
+        },
+        methods: {
+            async HWHNameScan(e) {
+                // 鎵弿浠撳簱鐮�
+                console.log('浠撳簱鐮�: ', e);
+                let index = this.HWHNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+                    })
+                } else {
+                    this.HWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
+                }
+            },
+            async HStockPlaceNameScan(e) {
+                // 鎵弿浠撲綅鐮�
+                console.log('浠撲綅鐮�: ', e);
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e.trim())
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
             async qrCodeDisplay() {
                 try {
                     this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
@@ -451,1301 +501,1314 @@
                     })
                 }
             },
-			async getRelationStore() {
-				let {
-					data,
-					count
-				} = await getUserStockRelation()
-				if (count == 1) {
-					let WHIDList = []
-					
-					Array.from(data).forEach(elem => {			
-						WHIDList.push(elem.HItemID)			
-					})
-					
-					let sWhere = ` and HItemID in (${WHIDList.join(",")})`
-					this.getHBaseList({
-						sWhere: sWhere
-					})
-					
-				} else {
-					this.getHBaseList()
-				}
-			},
-			async refreshHSourceBillState() {
-				this.HSourceBillNoFocus = false
-				await this.$nextTick(() => {
-					this.hform.HSourceBillNo = ""
-					this.HSourceBillNoFocus = true
-				})
-				if (this.hform.HMainSourceBillType == -1) {
-					await this.refreshBarCodeState()
-				}
-			},
-			async refreshBarCodeState() {
-				this.barCodeFocus = false
-				await this.$nextTick(() => {
-					this.hform.HBarCode = ""
-					this.barCodeFocus = true
-				})
-			},
-			onHSourceBillNoConfirmHandler() {
-				if (this.hform.HMainSourceBillType == -1) {
-					this.playSound(1)
-					this.barCodeFocus = true
-					return
-				}
-				this.getHBarCodeData(this.hform.HSourceBillNo)
-			},
-			playSound(e) {
-				const innerAudioContext = uni.createInnerAudioContext();
-				if (e == 1) {
-					innerAudioContext.src = '/static/success.wav';
-				} else {
-					innerAudioContext.src = '/static/jingbao.wav';
-				}
-				innerAudioContext.play(); // 鎾斁闊抽
-			},
-			set_InitBillSubType() {
-				this.arrayHBillSubType = []
-				this.arrayHBillSubTypeValue = []
-				CommonUtils.doRequest(
-					"/WEBSController/GetBillSubType_Json", {
-						HBillType: this.hform.HBillType,
-						HStockOrgID: this.hform.HStockOrgID
-					},
-					(res) => {
-						let {
-							data,
-							count,
-							Message
-						} = res.data
-						if (count == 1) {
-							Array.from(data).forEach(item => {
-								this.arrayHBillSubType.push(item['HName'])
-								this.arrayHBillSubTypeValue.push(item['HNumber'])
-							})
+            async getRelationStore() {
+                let {
+                    data,
+                    count
+                } = await getUserStockRelation()
+                if (count == 1) {
+                    let WHIDList = []
 
-							this.HBillSubType = this.arrayHBillSubType[0]
-							this.hform.HBillSubType = this.arrayHBillSubTypeValue[0]
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: Message
-							})
-						}
-					}
-				)
-			},
-			//鎵爜
-			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
-					}
+                    Array.from(data).forEach(elem => {
+                        WHIDList.push(elem.HItemID)
+                    })
 
-					this.getCode(this.hform.HBarCode)
-				})
-			},
-			showBillList() {
-				this.$refs.billList.showPopup()
-			},
-			//鎵叾浠�(浠撳簱锛屼粨浣�)
-			// toScanData(e){
-			// 	uni.scanCode({
-			// 	    onlyFromCamera: true,
-			// 	    success: (res) => {
-			// 	        console.log('鏉$爜鍐呭锛�' + res.result);
-			// 			var code = res.result
-			// 			if(e == 1){
-			// 				uni.request({
-			// 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
-			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
-			// 					success: (res) => {
-			// 						this.hform.HStockPlaceID = 0
-			// 						this.hform.HStockPlaceName = ''
-			// 						this.showHStockPlaceName = true
-			// 						if(res.data.count == 1){
-			// 							var data = res.data.data[0]
-			// 							this.hform.HWHID = data.HItemID
-			// 							this.hform.HWHName = data.HName
-			// 							if (data.HSPFlag == 0) {
-			// 							    this.showHStockPlaceName = false
-			// 							}
-			// 						}else{
-			// 							this.hform.HWHID = 0
-			// 							this.hform.HWHName = ''
-			// 							uni.showToast({
-			// 								title:res.data.Message,
-			// 								icon:'none'
-			// 							})
-			// 						}
-			// 					},
-			// 					fail: (res) => {
-			// 						console.log(res);
-			// 						uni.showToast({
-			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-			// 							icon:'none'
-			// 						})
-			// 					},
-			// 				});
-			// 			}else if(e == 2){
-			// 				uni.request({
-			// 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
-			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
-			// 					success: (res) => {
-			// 						if(res.data.count == 1){
-			// 							var data = res.data.data[0]
-			// 							this.hform.HWHID = data.HWHID
-			// 							this.hform.HWHName = data.HWhName
-			// 							this.hform.HStockPlaceID = data.HItemID
-			// 							this.hform.HStockPlaceName = data.HName
-			// 						}else{
-			// 							this.hform.HWHID = 0
-			// 							this.hform.HWHName = ''
-			// 							this.hform.HStockPlaceID = 0
-			// 							this.hform.HStockPlaceName = ''
-			// 							uni.showToast({
-			// 								title:res.data.Message,
-			// 								icon:'none'
-			// 							})
-			// 						}
-			// 					},
-			// 					fail: (res) => {
-			// 						console.log(res);
-			// 						uni.showToast({
-			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-			// 							icon:'none'
-			// 						})
-			// 					},
-			// 				});
-			// 			}
-			// 	    }
-			// 	});
-			// },
-			HBillSubTypeChange(e) {
-				let index = e.target.value
-				this.HBillSubType = this.arrayHBillSubType[index]
-				this.hform.HBillSubType = this.arrayHBillSubTypeValue[index]
-			},
-			//鏃ユ湡
-			HDateChange(e) {
-				console.log(e.detail.value)
-				this.hform.HDate = e.detail.value
-			},
-			//鍩虹浠撳簱璧勬枡
-			getHBaseList({sWhere=''} = {}) {
-				uni.request({
-					url: this.serverUrl + '/Gy_Warehouse/list',
-					data: {
-						sWhere: sWhere,
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HWHNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
-							}
-						} else {
-							uni.showToast({
-								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
+                    let sWhere = ` and HItemID in (${WHIDList.join(",")})`
+                    this.getHBaseList({
+                        sWhere: sWhere
+                    })
 
-				uni.request({
-					url: this.serverUrl + '/Gy_StockPlace/list',
-					data: {
-						sWhere: "",
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HStockPlaceNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
-							}
-						} else {
-							uni.showToast({
-								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
+                } else {
+                    this.getHBaseList()
+                }
+            },
+            async refreshHSourceBillState() {
+                this.HSourceBillNoFocus = false
+                await this.$nextTick(() => {
+                    this.hform.HSourceBillNo = ""
+                    this.HSourceBillNoFocus = true
+                })
+                if (this.hform.HMainSourceBillType == -1) {
+                    await this.refreshBarCodeState()
+                }
+            },
+            async refreshBarCodeState() {
+                this.barCodeFocus = false
+                await this.$nextTick(() => {
+                    this.hform.HBarCode = ""
+                    this.barCodeFocus = true
+                })
+            },
+            onHSourceBillNoConfirmHandler() {
+                if (this.hform.HMainSourceBillType == -1) {
+                    this.playSound(1)
+                    this.barCodeFocus = true
+                    return
+                }
+                this.getHBarCodeData(this.hform.HSourceBillNo)
+            },
+            playSound(e) {
+                const innerAudioContext = uni.createInnerAudioContext();
+                if (e == 1) {
+                    innerAudioContext.src = '/static/success.wav';
+                } else {
+                    innerAudioContext.src = '/static/jingbao.wav';
+                }
+                innerAudioContext.play(); // 鎾斁闊抽
+            },
+            set_InitBillSubType() {
+                this.arrayHBillSubType = []
+                this.arrayHBillSubTypeValue = []
+                CommonUtils.doRequest(
+                    "/WEBSController/GetBillSubType_Json", {
+                        HBillType: this.hform.HBillType,
+                        HStockOrgID: this.hform.HStockOrgID
+                    },
+                    (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            Array.from(data).forEach(item => {
+                                this.arrayHBillSubType.push(item['HName'])
+                                this.arrayHBillSubTypeValue.push(item['HNumber'])
+                            })
 
-				// this.getHYDList()
-			},
-			// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
-			async GetSourceBillType() {
-				CommonUtils.doRequest2({
-					url: '/Web/GetHSourceBillTypeByBillType',
-					data: {
-						HBillType: this.hform.HBillType,
-						Num: 2
-					},
-					resFunction: (res) => {
-						let {
-							data,
-							count,
-							Message
-						} = res.data
-						if (count == 1) {
-							console.log('data: ', data);
-							this.arrayHMainSourceBillType = []
-							this.arrayHMainSourceBillValue = []
-							Array.from(data).forEach(e => {
-								this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
-								this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
-							})
+                            this.HBillSubType = this.arrayHBillSubType[0]
+                            this.hform.HBillSubType = this.arrayHBillSubTypeValue[0]
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                )
+            },
+            //鎵爜
+            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.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
-							this.arrayHMainSourceBillValue.push('-1')
+                    this.getCode(this.hform.HBarCode)
+                })
+            },
+            showBillList() {
+                this.$refs.billList.showPopup()
+            },
+            //鎵叾浠�(浠撳簱锛屼粨浣�)
+            // toScanData(e){
+            // 	uni.scanCode({
+            // 	    onlyFromCamera: true,
+            // 	    success: (res) => {
+            // 	        console.log('鏉$爜鍐呭锛�' + res.result);
+            // 			var code = res.result
+            // 			if(e == 1){
+            // 				uni.request({
+            // 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
+            // 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
+            // 					success: (res) => {
+            // 						this.hform.HStockPlaceID = 0
+            // 						this.hform.HStockPlaceName = ''
+            // 						this.showHStockPlaceName = true
+            // 						if(res.data.count == 1){
+            // 							var data = res.data.data[0]
+            // 							this.hform.HWHID = data.HItemID
+            // 							this.hform.HWHName = data.HName
+            // 							if (data.HSPFlag == 0) {
+            // 							    this.showHStockPlaceName = false
+            // 							}
+            // 						}else{
+            // 							this.hform.HWHID = 0
+            // 							this.hform.HWHName = ''
+            // 							uni.showToast({
+            // 								title:res.data.Message,
+            // 								icon:'none'
+            // 							})
+            // 						}
+            // 					},
+            // 					fail: (res) => {
+            // 						console.log(res);
+            // 						uni.showToast({
+            // 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+            // 							icon:'none'
+            // 						})
+            // 					},
+            // 				});
+            // 			}else if(e == 2){
+            // 				uni.request({
+            // 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
+            // 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
+            // 					success: (res) => {
+            // 						if(res.data.count == 1){
+            // 							var data = res.data.data[0]
+            // 							this.hform.HWHID = data.HWHID
+            // 							this.hform.HWHName = data.HWhName
+            // 							this.hform.HStockPlaceID = data.HItemID
+            // 							this.hform.HStockPlaceName = data.HName
+            // 						}else{
+            // 							this.hform.HWHID = 0
+            // 							this.hform.HWHName = ''
+            // 							this.hform.HStockPlaceID = 0
+            // 							this.hform.HStockPlaceName = ''
+            // 							uni.showToast({
+            // 								title:res.data.Message,
+            // 								icon:'none'
+            // 							})
+            // 						}
+            // 					},
+            // 					fail: (res) => {
+            // 						console.log(res);
+            // 						uni.showToast({
+            // 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+            // 							icon:'none'
+            // 						})
+            // 					},
+            // 				});
+            // 			}
+            // 	    }
+            // 	});
+            // },
+            HBillSubTypeChange(e) {
+                let index = e.target.value
+                this.HBillSubType = this.arrayHBillSubType[index]
+                this.hform.HBillSubType = this.arrayHBillSubTypeValue[index]
+            },
+            //鏃ユ湡
+            HDateChange(e) {
+                console.log(e.detail.value)
+                this.hform.HDate = e.detail.value
+            },
+            //鍩虹浠撳簱璧勬枡
+            getHBaseList({
+                sWhere = ''
+            } = {}) {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Warehouse/list',
+                    data: {
+                        sWhere: sWhere,
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HWHNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
 
-							this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
-							this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: Message
-							})
-						}
-					}
+                uni.request({
+                    url: this.serverUrl + '/Gy_StockPlace/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HStockPlaceNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
 
-				})
-			},
-			//婧愬崟璧勬枡
-			getHYDList() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSourceBillList_Json',
-					data: {
-						HBillType: this.hform.HBillType,
-						HSourceBillType: this.hform.HMainSourceBillType,
-						HStockOrgID: this.hform.HStockOrgID,
-						HSourceBillNo: "",
-						HMater: "",
-						HCustom: ""
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HSourceBillNoList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
-							}
-							this.reHSourceBillNo = false
-							this.$nextTick(() => {
-								this.reHSourceBillNo = true
-							})
-						} else {
-							uni.showToast({
-								title: '婧愬崟鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浠撳簱
-			HWHNameChange(e) {
-				// var name = e.split("(")
-				for (var i = 0; i < this.HWHNameList.length; i++) {
-					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
-						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HWHID = this.HWHNameList[i].HItemID
+                // this.getHYDList()
+            },
+            // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
+            async GetSourceBillType() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetHSourceBillTypeByBillType',
+                    data: {
+                        HBillType: this.hform.HBillType,
+                        Num: 2
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            console.log('data: ', data);
+                            this.arrayHMainSourceBillType = []
+                            this.arrayHMainSourceBillValue = []
+                            Array.from(data).forEach(e => {
+                                this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+                                this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+                            })
 
-						if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
-							this.showHStockPlaceName = true
-						} else {
-							this.hform.HStockPlaceName = ''
-							this.showHStockPlaceName = false
-						}
-					}
-				}
-			},
-			HFIFOWHNameChange(e) {
-				for (var i = 0; i < this.HWHNameList.length; i++) {
-					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
-						this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨浠撲綅
-			HStockPlaceNameChange(e) {
-				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-					if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨婧愬崟
-			HSourceBillNoChange(e) {
-				this.hform.HSourceBillNo = e
-				this.getHBarCodeData(e)
-				// for(var i=0;i<this.HSourceBillNoList.length;i++){
-				// 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
-				// 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
-				// 	}
-				// }
-			},
-			//閫夋嫨婧愬崟绫诲瀷
-			HMainSourceBillTypeChange(e) {
-				console.log('婧愬崟绫诲瀷: ', e.detail.value);
-				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 || 0]
-					// this.getHYDList()
-				}
-			},
+                            this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+                            this.arrayHMainSourceBillValue.push('-1')
 
-			//鑾峰彇瀹㈡埛鏁版嵁
-			getHSupList() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSupplierList_Json',
-					data: {
-						Supplier: '',
-						HStockOrgID: this.hform.HStockOrgID
-					},
-					success: (res) => {
-						console.log(res.data)
-						if (res.data.count == 1) {
-							this.HSupNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHSupName[i] = res.data.data[i]['HName']
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨瀹㈡埛
-			HSupNameChange(e) {
-				for (var i = 0; i < this.HSupNameList.length; i++) {
-					if (this.HSupNameList[i]['HName'] == e) {
-						this.hform.HSupID = this.HSupNameList[i].HItemID
-						this.hform.HSupName = this.HSupNameList[i]['HName']
-					}
-				}
-			},
-			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-			getHDeptList() {
-				uni.request({
-					url: this.serverUrl + '/Gy_Department/list',
-					data: {
-						sWhere: "",
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HDeptNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浣跨敤閮ㄩ棬
-			HDeptNameChange(e) {
-				for (var i = 0; i < this.HDeptNameList.length; i++) {
-					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
-						this.hform.HDeptID = this.HDeptNameList[i].HItemID
-						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
-					}
-				}
-			},
-			//鎿嶄綔鍛�
-			getHEmpList() {
-				uni.request({
-					url: this.serverUrl + '/Web/GetEmployeeList_Json',
-					data: {
-						Employee: '',
-						HGroupID: 0
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HEmpNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHEmpName[i] = res.data.data[i].HName
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//淇濈
-			HKeeperNameChange(e) {
-				for (var i = 0; i < this.HEmpNameList.length; i++) {
-					if (this.HEmpNameList[i].HName == e) {
-						console.log(this.HEmpNameList[i])
-						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
-						this.hform.HKeeperName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//楠屾敹
-			HSecManagerNameChange(e) {
-				for (var i = 0; i < this.HEmpNameList.length; i++) {
-					if (this.HEmpNameList[i].HName == e) {
-						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
-						this.hform.HSecManagerName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//閫変腑婧愬崟
-			getHBarCodeData(HBarCode) {
-				if (!this.hform.HFIFOWHName) {
-					this.hform.HFIFOWHID = 0
-				}
-				uni.request({
-					url: this.serverUrl + '/WEBSController/Get_SourceBarCode_OtherIn_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,
-						HFIFOWHID: this.hform.HFIFOWHID,
-						HPTQty: this.hform.HPTQty || 0,
-						HPlanMode: this.hform.HPlanMode || 0
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
+                            this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+                            this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+
+                })
+            },
+            //婧愬崟璧勬枡
+            getHYDList() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetSourceBillList_Json',
+                    data: {
+                        HBillType: this.hform.HBillType,
+                        HSourceBillType: this.hform.HMainSourceBillType,
+                        HStockOrgID: this.hform.HStockOrgID,
+                        HSourceBillNo: "",
+                        HMater: "",
+                        HCustom: ""
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HSourceBillNoList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
+                            }
+                            this.reHSourceBillNo = false
+                            this.$nextTick(() => {
+                                this.reHSourceBillNo = true
+                            })
+                        } else {
+                            uni.showToast({
+                                title: '婧愬崟鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨浠撳簱
+            HWHNameChange(e) {
+                // var name = e.split("(")
+                for (var i = 0; i < this.HWHNameList.length; i++) {
+                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+                        this.hform.HWHID = this.HWHNameList[i].HItemID
+
+                        if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+                            this.showHStockPlaceName = true
+                        } else {
+                            this.hform.HStockPlaceName = ''
+                            this.showHStockPlaceName = false
+                        }
+                    }
+                }
+            },
+            HFIFOWHNameChange(e) {
+                for (var i = 0; i < this.HWHNameList.length; i++) {
+                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+                        this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
+                    }
+                }
+            },
+            //閫夋嫨浠撲綅
+            HStockPlaceNameChange(e) {
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
+                }
+
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                //     if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                //         this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                //         this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+                //     }
+                // }
+            },
+            //閫夋嫨婧愬崟
+            HSourceBillNoChange(e) {
+                this.hform.HSourceBillNo = e
+                this.getHBarCodeData(e)
+                // for(var i=0;i<this.HSourceBillNoList.length;i++){
+                // 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
+                // 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
+                // 	}
+                // }
+            },
+            //閫夋嫨婧愬崟绫诲瀷
+            HMainSourceBillTypeChange(e) {
+                console.log('婧愬崟绫诲瀷: ', e.detail.value);
+                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 || 0]
+                    // this.getHYDList()
+                }
+            },
+
+            //鑾峰彇瀹㈡埛鏁版嵁
+            getHSupList() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetSupplierList_Json',
+                    data: {
+                        Supplier: '',
+                        HStockOrgID: this.hform.HStockOrgID
+                    },
+                    success: (res) => {
+                        console.log(res.data)
+                        if (res.data.count == 1) {
+                            this.HSupNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHSupName[i] = res.data.data[i]['HName']
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨瀹㈡埛
+            HSupNameChange(e) {
+                for (var i = 0; i < this.HSupNameList.length; i++) {
+                    if (this.HSupNameList[i]['HName'] == e) {
+                        this.hform.HSupID = this.HSupNameList[i].HItemID
+                        this.hform.HSupName = this.HSupNameList[i]['HName']
+                    }
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            getHDeptList() {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Department/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HDeptNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨浣跨敤閮ㄩ棬
+            HDeptNameChange(e) {
+                for (var i = 0; i < this.HDeptNameList.length; i++) {
+                    if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+                        this.hform.HDeptID = this.HDeptNameList[i].HItemID
+                        this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+                    }
+                }
+            },
+            //鎿嶄綔鍛�
+            getHEmpList() {
+                uni.request({
+                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
+                    data: {
+                        Employee: '',
+                        HGroupID: 0
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HEmpNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHEmpName[i] = res.data.data[i].HName
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //淇濈
+            HKeeperNameChange(e) {
+                for (var i = 0; i < this.HEmpNameList.length; i++) {
+                    if (this.HEmpNameList[i].HName == e) {
+                        console.log(this.HEmpNameList[i])
+                        this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+                        this.hform.HKeeperName = this.HEmpNameList[i].HName
+                    }
+                }
+            },
+            //楠屾敹
+            HSecManagerNameChange(e) {
+                for (var i = 0; i < this.HEmpNameList.length; i++) {
+                    if (this.HEmpNameList[i].HName == e) {
+                        this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+                        this.hform.HSecManagerName = this.HEmpNameList[i].HName
+                    }
+                }
+            },
+            //閫変腑婧愬崟
+            getHBarCodeData(HBarCode) {
+                if (!this.hform.HFIFOWHName) {
+                    this.hform.HFIFOWHID = 0
+                }
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/Get_SourceBarCode_OtherIn_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,
+                        HFIFOWHID: this.hform.HFIFOWHID,
+                        HPTQty: this.hform.HPTQty || 0,
+                        HPlanMode: this.hform.HPlanMode || 0
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
                             this.hform.SourceFlag = true
-							var data = res.data.data
-							console.log(2, data);
-							this.hform.HSupName = data.hSupNameField
-							this.hform.HSupID = data.hSupIDField
-							if (data.hDeptIDField != 0) {
-								this.hform.HDeptID = data.hDeptIDField
-								this.hform.HDeptName = data.hDeptNameField
-							}
-							this.hform.HSourceBillNo = data.hSourceBillNoField
-							this.showHMainSourceBillType = false
-							if (data.hMulSourceFlagField == 0) {
-								this.showHSourceBillNo = false
-							}
-							this.tabs = 2
-							this.showHSupName = false
-							this.barCodeFocus = true
-							this.playSound(1)
-							this.DisBillEntryList()
-						} else {
-							this.playSound(0)
-							this.refreshHSourceBillState()
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						this.playSound(0)
-						this.refreshHSourceBillState()
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//鎵潯鐮佸鐞�
-			getCode(HBarCode) {
-				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
-				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
-				}
-				var sOldBarCode = HBarCode
-				var HDeleteFlag = sOldBarCode.substring(0, 1);
-				var sBarCode = sOldBarCode.slice(1);
+                            var data = res.data.data
+                            console.log(2, data);
+                            this.hform.HSupName = data.hSupNameField
+                            this.hform.HSupID = data.hSupIDField
+                            if (data.hDeptIDField != 0) {
+                                this.hform.HDeptID = data.hDeptIDField
+                                this.hform.HDeptName = data.hDeptNameField
+                            }
+                            this.hform.HSourceBillNo = data.hSourceBillNoField
+                            this.showHMainSourceBillType = false
+                            if (data.hMulSourceFlagField == 0) {
+                                this.showHSourceBillNo = false
+                            }
+                            this.tabs = 2
+                            this.showHSupName = false
+                            this.barCodeFocus = true
+                            this.playSound(1)
+                            this.DisBillEntryList()
+                        } else {
+                            this.playSound(0)
+                            this.refreshHSourceBillState()
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        this.playSound(0)
+                        this.refreshHSourceBillState()
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //鎵潯鐮佸鐞�
+            getCode(HBarCode) {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HWHName) {
+                    this.hform.HWHID = 0
+                }
+                if (!this.hform.HStockPlaceName) {
+                    this.hform.HStockPlaceID = 0
+                }
+                var sOldBarCode = HBarCode
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
 
-				var sHWHID = this.hform.HWHID
-				var sHSPID = this.hform.HStockPlaceID
-				var sHQty = this.hform.HQty
-				var sSourceBillNo = this.hform.HSourceBillNo
-				var sSourceBillType = this.hform.HMainSourceBillType
-				var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
-				console.log(this.hform.HSourceBillNo, HSourceFlag)
-				if (HDeleteFlag == "*") {
-					if (sBarCode == "") {
-						this.playSound(0)
-						uni.showToast({
-							title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
-							icon: 'none'
-						})
-					} else {
-						uni.request({
-							url: this.serverUrl +
-								'/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
-							data: {
-								HInterID: this.hform.HInterID,
-								HBillType: this.hform.HBillType,
-								HBarCode: sBarCode
-							},
-							success: (res) => {
-								console.log('鍒犻櫎鏉$爜', res.data);
-								this.hform.HBarCode = ''
-								if (res.data.count == 1) {
-									this.playSound(1)
-									this.hform.HQty = ''
-									this.DisBillEntryList()
-								} else {
-									this.playSound(0)
-									this.refreshBarCodeState()
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								this.playSound(0)
-								this.refreshBarCodeState()
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									icon: 'none'
-								})
-							},
-						});
-					}
-				} else {
-					var sBarCode = this.hform.HBarCode
-					if (sHQty == "") {
-						sHQty = 0;
-					}
-					uni.request({
-						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
-						data: {
-							sBarCode: sBarCode,
-							HInterID: this.hform.HInterID,
-							HBillType: this.hform.HBillType,
-							HBillNo: this.hform.HBillNo,
-							HMaker: this.hform.HMaker,
-							HWhID: sHWHID,
-							HSPID: sHSPID,
-							HQty: sHQty,
-							HRedBlueFlag: this.hform.HRedBlueFlag,
-							SourceFlag: this.hform.SourceFlag,
-							HSourceBillNo: sSourceBillNo,
-							HSourceBillType: sSourceBillType,
-							HStockOrgID: this.hform.HStockOrgID,
-							HScanStyle: "",
-							HCustom1: "",
-							HCustom2: ""
-						},
-						success: (res) => {
-							console.log('鎵爜杩斿洖', res.data);
-							this.hform.HBarCode = ''
-							if (res.data.count == 1) {
-								this.playSound(1)
-								var data = res.data.data
-								if (data.hBarTypeField == '浠撳簱鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = ''
-									this.hform.HStockPlaceID = 0
-									if (data.hSPFlagField == 0) {
-										this.showHStockPlaceName = false
-									} else {
-										this.showHStockPlaceName = true
-									}
-								} else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = data.hSPNameField
-									this.hform.HStockPlaceID = data.hSPIDField
-								} else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-									this.hform.HDeptName = data.hDeptNameField
-									this.hform.HDeptID = data.hDeptIDField
-									this.tabs = 1
-								} else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-									this.hform.HSupName = data.hSupNameField
-									this.hform.HSupID = data.hSupIDField
+                var sHWHID = this.hform.HWHID
+                var sHSPID = this.hform.HStockPlaceID
+                var sHQty = this.hform.HQty
+                var sSourceBillNo = this.hform.HSourceBillNo
+                var sSourceBillType = this.hform.HMainSourceBillType
+                var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
+                console.log(this.hform.HSourceBillNo, HSourceFlag)
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        this.playSound(0)
+                        uni.showToast({
+                            title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+                            icon: 'none'
+                        })
+                    } else {
+                        uni.request({
+                            url: this.serverUrl +
+                                '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+                            data: {
+                                HInterID: this.hform.HInterID,
+                                HBillType: this.hform.HBillType,
+                                HBarCode: sBarCode
+                            },
+                            success: (res) => {
+                                console.log('鍒犻櫎鏉$爜', res.data);
+                                this.hform.HBarCode = ''
+                                if (res.data.count == 1) {
+                                    this.playSound(1)
+                                    this.hform.HQty = ''
+                                    this.DisBillEntryList()
+                                } else {
+                                    this.playSound(0)
+                                    this.refreshBarCodeState()
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                }
+                            },
+                            fail: (res) => {
+                                this.playSound(0)
+                                this.refreshBarCodeState()
+                                console.log(res);
+                                uni.showToast({
+                                    title: '鎺ュ彛璇锋眰澶辫触',
+                                    icon: 'none'
+                                })
+                            },
+                        });
+                    }
+                } else {
+                    var sBarCode = this.hform.HBarCode
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+                    uni.request({
+                        url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+                        data: {
+                            sBarCode: sBarCode,
+                            HInterID: this.hform.HInterID,
+                            HBillType: this.hform.HBillType,
+                            HBillNo: this.hform.HBillNo,
+                            HMaker: this.hform.HMaker,
+                            HWhID: sHWHID,
+                            HSPID: sHSPID,
+                            HQty: sHQty,
+                            HRedBlueFlag: this.hform.HRedBlueFlag,
+                            SourceFlag: this.hform.SourceFlag,
+                            HSourceBillNo: sSourceBillNo,
+                            HSourceBillType: sSourceBillType,
+                            HStockOrgID: this.hform.HStockOrgID,
+                            HScanStyle: "",
+                            HCustom1: "",
+                            HCustom2: ""
+                        },
+                        success: (res) => {
+                            console.log('鎵爜杩斿洖', res.data);
+                            this.hform.HBarCode = ''
+                            if (res.data.count == 1) {
+                                this.playSound(1)
+                                var data = res.data.data
+                                if (data.hBarTypeField == '浠撳簱鏉$爜') {
+                                    this.hform.HWHName = data.hWhNameField
+                                    this.hform.HWHID = data.hWhIDField
+                                    this.hform.HStockPlaceName = ''
+                                    this.hform.HStockPlaceID = 0
+                                    if (data.hSPFlagField == 0) {
+                                        this.showHStockPlaceName = false
+                                    } else {
+                                        this.showHStockPlaceName = true
+                                    }
+                                } else if (data.hBarTypeField == '浠撲綅鏉$爜') {
+                                    this.hform.HWHName = data.hWhNameField
+                                    this.hform.HWHID = data.hWhIDField
+                                    this.hform.HStockPlaceName = data.hSPNameField
+                                    this.hform.HStockPlaceID = data.hSPIDField
+                                } else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
+                                    this.hform.HDeptName = data.hDeptNameField
+                                    this.hform.HDeptID = data.hDeptIDField
+                                    this.tabs = 1
+                                } else if (data.hBarTypeField == '婧愬崟鏉$爜') {
+                                    this.hform.HSupName = data.hSupNameField
+                                    this.hform.HSupID = data.hSupIDField
                                     this.hform.SourceFlag = true
-									if (data.hDeptIDField != 0) {
-										this.hform.HDeptID = data.hDeptIDField
-										this.hform.HDeptName = data.hDeptNameField
-									}
-									this.hform.HSourceBillNo = data.hSourceBillNoField
-									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-									this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                    if (data.hDeptIDField != 0) {
+                                        this.hform.HDeptID = data.hDeptIDField
+                                        this.hform.HDeptName = data.hDeptNameField
+                                    }
+                                    this.hform.HSourceBillNo = data.hSourceBillNoField
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                    this.hform.HMainSourceBillType = data.hSourceBillTypeField
 
-									let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
-										.hSourceBillTypeField)
-									if (index != -1) {
-										this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-										this.hform.HMainSourceBillType = data.hSourceBillTypeField
-										this.showHMainSourceBillType = false
-									}
-									// if (data.hSourceBillTypeField == "1241") {
-									// 	this.HMainSourceBillType = '鍏ュ簱鐢宠鍗�'
-									// 	this.hform.HMainSourceBillType = 1241
-									// 	this.showHMainSourceBillType = false
-									// } else {
-									// 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-									// 	this.hform.HMainSourceBillType = -1
-									// 	this.showHMainSourceBillType = false
-									// }
-									if (data.hMulSourceFlagField == 0) {
-										this.showHSourceBillNo = false
-									}
-									//瀹㈡埛涓嶅彲缂栬緫
-									this.showHSupName = false
-									this.tabs = 2
-								} else { //鐗╂枡鏉$爜
-									this.tabs = 2
-									if (!this.hform.HSourceBillNo) {
+                                    let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                        .hSourceBillTypeField)
+                                    if (index != -1) {
+                                        this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                        this.showHMainSourceBillType = false
+                                    }
+                                    // if (data.hSourceBillTypeField == "1241") {
+                                    // 	this.HMainSourceBillType = '鍏ュ簱鐢宠鍗�'
+                                    // 	this.hform.HMainSourceBillType = 1241
+                                    // 	this.showHMainSourceBillType = false
+                                    // } else {
+                                    // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                    // 	this.hform.HMainSourceBillType = -1
+                                    // 	this.showHMainSourceBillType = false
+                                    // }
+                                    if (data.hMulSourceFlagField == 0) {
+                                        this.showHSourceBillNo = false
+                                    }
+                                    //瀹㈡埛涓嶅彲缂栬緫
+                                    this.showHSupName = false
+                                    this.tabs = 2
+                                } else { //鐗╂枡鏉$爜
+                                    this.tabs = 2
+                                    if (!this.hform.HSourceBillNo) {
                                         this.hform.SourceFlag = true
-										this.hform.HSupName = data.hSupNameField
-										this.hform.HSupID = data.hSupIDField
-										this.hform.HSourceBillNo = data.hSourceBillNoField
-										if (data.hDeptIDField != 0) {
-											this.hform.HDeptID = data.hDeptIDField
-											this.hform.HDeptName = data.hDeptNameField
-										}
-										//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙� 娌℃湁婧愬崟绫诲瀷鍒欓粯璁や负鎵嬪伐褰曞叆
-										this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
-									
-										let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
-											.hSourceBillTypeField)
-										if (index != -1) {
-											this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-											this.hform.HMainSourceBillType = data.hSourceBillTypeField
-											this.showHMainSourceBillType = false
-										}
-										// if (data.hSourceBillTypeField == "1103") {
-										// 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-										// 	this.hform.HMainSourceBillType = 1103
-										// 	this.showHMainSourceBillType = false
-										// } else if (data.hSourceBillTypeField == "1102") {
-										// 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-										// 	this.hform.HMainSourceBillType = 1102
-										// 	this.showHMainSourceBillType = false
-										// } else {
-										// 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-										// 	this.hform.HMainSourceBillType = -1
-										// 	this.showHMainSourceBillType = false
-										// }
-										if (data.hMulSourceFlagField == 0) {
-											this.showHSourceBillNo = false
-										}
-										//渚涘簲鍟嗕笉鍙紪杈�
-										this.showHSupName = false
-									}
-								}
-								//鏄剧ず琛ㄤ綋鏄庣粏
-								this.DisBillEntryList()
-								//娓呯┖鏁伴噺
-								this.hform.HQty = ''
-								this.refreshBarCodeState()
-							} else {
-								this.playSound(0)
-								this.refreshBarCodeState()
-								uni.showToast({
-									title: res.data.Message,
-									icon: 'none'
-								})
-							}
-						},
-						fail: (res) => {
-							this.playSound(0)
-							this.refreshBarCodeState()
-							console.log(res);
-							uni.showToast({
-								title: '鎺ュ彛璇锋眰澶辫触',
-								icon: 'none'
-							})
-						},
-					});
-				}
-			},
-			//鐗╂枡淇℃伅
-			DisBillEntryList() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
-					data: {
-						HInterID: this.hform.HInterID,
-						HBillNo: this.hform.HBillNo,
-						HBillType: this.hform.HBillType,
-						HStockOrgID: this.hform.HStockOrgID
-					},
-					success: (res) => {
-						console.log('鐗╂枡', res.data)
-						if (res.data.count == 1) {
-							var data = res.data.data
-							this.Materlist = data.Materlist
-							if (data.FIFOlist.length != 0) {
-								if (data.FIFOlist[0].HMaterID != 0) {
-									this.FIFOlist = data.FIFOlist
-								}
-							}
-							if (!data.BarCodeDetailslist[0].HBarCode) {
-								this.hform.HMaterName_B = ''
-								this.hform.HMaterModel_B = ''
-								this.hform.HBatchNo_B = ''
-								this.hform.HUnitName_B = ''
-								this.hform.HQty_B = ''
-								this.hform.HTMQty_B = ''
-								this.hform.HWHName_B = ''
-								this.hform.HSPName_B = ''
-							} else {
-								this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
-								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
-								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
-								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
-								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
-								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
-								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
-								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
-								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
-							}
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//鍒犻櫎鐗╂枡鐮�
-			delMater(item) {
-				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-					success: (res) => {
-						if (res.confirm) {
-							uni.request({
-								url: this.serverUrl +
-									'/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
-								data: {
-									HInterID: this.hform.HInterID,
-									HMaterID: item.HMaterID,
-									HAuxPropID: item.HAuxPropID,
-									HMTONo: item.HMTONo,
-									HSourceInterID: item.HSourceInterID,
-									HSourceEntryID: item.HSourceEntryID,
-									HBillType: this.hform.HBillType
-								},
-								success: (res) => {
-									if (res.data.count == 1) {
-										this.DisBillEntryList()
-									} else {
-										uni.showToast({
-											title: res.data.Message,
-											icon: 'none'
-										})
-									}
-								},
-								fail: (res) => {
-									console.log(res);
-									uni.showToast({
-										title: '鎺ュ彛璇锋眰澶辫触',
-										icon: 'none'
-									})
-								},
-							});
-						}
-					}
-				});
-			},
-			//鏂板
-			getNewData() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json',
-					data: {
-						HBillType: this.hform.HBillType
-					},
-					success: (res) => {
-						// console.log(res.data)
-						if (res.data.count == 1) {
-							this.hform.HInterID = res.data.data[0].HInterID
-							this.hform.HBillNo = res.data.data[0].HBillNo
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//淇敼鍥炲~鏁版嵁
-			RoadBillMain(HInterID) {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
-					data: {
-						HInterID: HInterID,
-						HBillType: this.hform.HBillType
-					},
-					success: (res) => {
-						console.log(33, res.data.data[0]);
-						if (res.data.count == 1) {
-							var data = res.data.data[0]
-							this.hform.HInterID = data.HInterID
-							this.hform.HBillNo = data.HBillNo
-							this.hform.HMainSourceBillType = data.HSourceBillType
-							this.hform.HSourceBillNo = data.HSourceBillNo
+                                        this.hform.HSupName = data.hSupNameField
+                                        this.hform.HSupID = data.hSupIDField
+                                        this.hform.HSourceBillNo = data.hSourceBillNoField
+                                        if (data.hDeptIDField != 0) {
+                                            this.hform.HDeptID = data.hDeptIDField
+                                            this.hform.HDeptName = data.hDeptNameField
+                                        }
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙� 娌℃湁婧愬崟绫诲瀷鍒欓粯璁や负鎵嬪伐褰曞叆
+                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
 
-							let index = this.arrayHMainSourceBillValue.findIndex(e => e == data.HSourceBillType)
-							if (index != -1) {
-								this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-								this.hform.HMainSourceBillType = data.HSourceBillType
-								if (this.HMainSourceBillType != -1) {
-									this.showHSupName = false
-								}
-							}
-							// if (data.HSourceBillType == 1241) {
-							// 	this.hform.HMainSourceBillType = 1241
-							// 	this.HMainSourceBillType = '鍏ュ簱鐢宠鍗�'
-							// 	this.showHSupName = false
-							// } else {
-							// 	this.hform.HMainSourceBillType = -1
-							// 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-							// }
-							this.showHMainSourceBillType = false
+                                        let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                            .hSourceBillTypeField)
+                                        if (index != -1) {
+                                            this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                            this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                            this.showHMainSourceBillType = false
+                                        }
+                                        // if (data.hSourceBillTypeField == "1103") {
+                                        // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+                                        // 	this.hform.HMainSourceBillType = 1103
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else if (data.hSourceBillTypeField == "1102") {
+                                        // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
+                                        // 	this.hform.HMainSourceBillType = 1102
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else {
+                                        // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                        // 	this.hform.HMainSourceBillType = -1
+                                        // 	this.showHMainSourceBillType = false
+                                        // }
+                                        if (data.hMulSourceFlagField == 0) {
+                                            this.showHSourceBillNo = false
+                                        }
+                                        //渚涘簲鍟嗕笉鍙紪杈�
+                                        this.showHSupName = false
+                                    }
+                                }
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                this.DisBillEntryList()
+                                //娓呯┖鏁伴噺
+                                this.hform.HQty = ''
+                                this.refreshBarCodeState()
+                            } else {
+                                this.playSound(0)
+                                this.refreshBarCodeState()
+                                uni.showToast({
+                                    title: res.data.Message,
+                                    icon: 'none'
+                                })
+                            }
+                        },
+                        fail: (res) => {
+                            this.playSound(0)
+                            this.refreshBarCodeState()
+                            console.log(res);
+                            uni.showToast({
+                                title: '鎺ュ彛璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        },
+                    });
+                }
+            },
+            //鐗╂枡淇℃伅
+            DisBillEntryList() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
+                    data: {
+                        HInterID: this.hform.HInterID,
+                        HBillNo: this.hform.HBillNo,
+                        HBillType: this.hform.HBillType,
+                        HStockOrgID: this.hform.HStockOrgID
+                    },
+                    success: (res) => {
+                        console.log('鐗╂枡', res.data)
+                        if (res.data.count == 1) {
+                            var data = res.data.data
+                            this.Materlist = data.Materlist
+                            if (data.FIFOlist.length != 0) {
+                                if (data.FIFOlist[0].HMaterID != 0) {
+                                    this.FIFOlist = data.FIFOlist
+                                }
+                            }
+                            if (!data.BarCodeDetailslist[0].HBarCode) {
+                                this.hform.HMaterName_B = ''
+                                this.hform.HMaterModel_B = ''
+                                this.hform.HBatchNo_B = ''
+                                this.hform.HUnitName_B = ''
+                                this.hform.HQty_B = ''
+                                this.hform.HTMQty_B = ''
+                                this.hform.HWHName_B = ''
+                                this.hform.HSPName_B = ''
+                            } else {
+                                this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
+                                this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+                                this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+                                this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+                                this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+                                this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+                                this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+                                this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+                                this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+                            }
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //鍒犻櫎鐗╂枡鐮�
+            delMater(item) {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
+                                data: {
+                                    HInterID: this.hform.HInterID,
+                                    HMaterID: item.HMaterID,
+                                    HAuxPropID: item.HAuxPropID,
+                                    HMTONo: item.HMTONo,
+                                    HSourceInterID: item.HSourceInterID,
+                                    HSourceEntryID: item.HSourceEntryID,
+                                    HBillType: this.hform.HBillType
+                                },
+                                success: (res) => {
+                                    if (res.data.count == 1) {
+                                        this.DisBillEntryList()
+                                    } else {
+                                        uni.showToast({
+                                            title: res.data.Message,
+                                            icon: 'none'
+                                        })
+                                    }
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        }
+                    }
+                });
+            },
+            //鏂板
+            getNewData() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json',
+                    data: {
+                        HBillType: this.hform.HBillType
+                    },
+                    success: (res) => {
+                        // console.log(res.data)
+                        if (res.data.count == 1) {
+                            this.hform.HInterID = res.data.data[0].HInterID
+                            this.hform.HBillNo = res.data.data[0].HBillNo
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //淇敼鍥炲~鏁版嵁
+            RoadBillMain(HInterID) {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
+                    data: {
+                        HInterID: HInterID,
+                        HBillType: this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(33, res.data.data[0]);
+                        if (res.data.count == 1) {
+                            var data = res.data.data[0]
+                            this.hform.HInterID = data.HInterID
+                            this.hform.HBillNo = data.HBillNo
+                            this.hform.HMainSourceBillType = data.HSourceBillType
+                            this.hform.HSourceBillNo = data.HSourceBillNo
 
-							//闈炲婧愬崟妯″紡
-							if (data.HMulSourceBill == 0) {
-								this.showHSourceBillNo = false
-							}
-							this.hform.HDeptID = data.HDeptID
-							this.hform.HDeptName = data.HDeptName
-							this.hform.HSupID = data.HCusID
-							this.hform.HSupName = data.HCusName
-							this.DisBillEntryList()
-							this.tabs = 2
-						} else {
-							uni.showToast({
-								title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			addNew() {
-				uni.redirectTo({
-					url: '/pages/qitaruku_v2/form?OperationType=1'
-				})
-			},
-			submit() {
-				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
-				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
-				}
-				if (!this.hform.HKeeperName) {
-					this.hform.HKeeperID = 0
-				}
-				if (!this.hform.HSecManagerName) {
-					this.hform.HSecManagerID = 0
-				}
-				if (!this.hform.HDeptName) {
-					this.hform.HDeptID = 0
-				}
-				if (!this.hform.HSupName) {
-					this.hform.HSupID = 0
-				}
-				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
-					uni.showToast({
-						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
-						icon: 'none'
-					})
-				} else if (!this.hform.HBillNo) {
-					uni.showToast({
-						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
-						icon: 'none'
-					})
-				} else if (!this.Materlist || this.Materlist.length == 0) {
-					uni.showToast({
-						title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-						icon: 'none'
-					})
-				} else {
-					var s = 0;
-					for (var i = 0; i < this.Materlist.length; i++) {
-						if (this.Materlist[i].鏁伴噺 > 0) {
-							s = 1;
-						}
-					}
-					if (s == 0) {
-						uni.showToast({
-							title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-							icon: 'none'
-						})
-					} else {
-						uni.showLoading({
-							title: '璇风◢鍊�'
-						})
-						var sMainStr = JSON.stringify(this.hform);
-						uni.request({
-							url: this.serverUrl + '/WEBSController/set_SaveOtherInBill_Json',
-							method: 'POST',
-							dataType: "json",
-							data: {
-								oMain: sMainStr
-							},
-							success: (res) => {
-								console.log(1, res);
-								uni.hideLoading()
-								if (res.data.count == 1) {
-									uni.showModal({
-										title: '鎻愮ず',
-										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-										success: (res) => {
-											if (res.confirm) {
-												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-												uni.redirectTo({
-													url: '/pages/qitaruku_v2/form?OperationType=1'
-												})
-											} else if (res.cancel) {
-												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-												setTimeout(() => {
-													uni.navigateBack();
-												}, 500)
-											}
-										}
-									});
-								} else {
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									icon: 'none'
-								})
-							},
-						});
-					}
-				}
-			},
+                            let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                .HSourceBillType)
+                            if (index != -1) {
+                                this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                this.hform.HMainSourceBillType = data.HSourceBillType
+                                if (this.HMainSourceBillType != -1) {
+                                    this.showHSupName = false
+                                }
+                            }
+                            // if (data.HSourceBillType == 1241) {
+                            // 	this.hform.HMainSourceBillType = 1241
+                            // 	this.HMainSourceBillType = '鍏ュ簱鐢宠鍗�'
+                            // 	this.showHSupName = false
+                            // } else {
+                            // 	this.hform.HMainSourceBillType = -1
+                            // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                            // }
+                            this.showHMainSourceBillType = false
 
-			goBack() {
-				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
-					success: (res) => {
-						if (res.confirm) {
-							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							uni.navigateBack({
-								url: '/pages/shengchanlingliaoshengdan/table'
-							})
-						} else if (res.cancel) {
-							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-						}
-					}
-				});
-			}
-		}
-	}
+                            //闈炲婧愬崟妯″紡
+                            if (data.HMulSourceBill == 0) {
+                                this.showHSourceBillNo = false
+                            }
+                            this.hform.HDeptID = data.HDeptID
+                            this.hform.HDeptName = data.HDeptName
+                            this.hform.HSupID = data.HCusID
+                            this.hform.HSupName = data.HCusName
+                            this.DisBillEntryList()
+                            this.tabs = 2
+                        } else {
+                            uni.showToast({
+                                title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: '/pages/qitaruku_v2/form?OperationType=1'
+                })
+            },
+            submit() {
+                //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HWHName) {
+                    this.hform.HWHID = 0
+                }
+                if (!this.hform.HStockPlaceName) {
+                    this.hform.HStockPlaceID = 0
+                }
+                if (!this.hform.HKeeperName) {
+                    this.hform.HKeeperID = 0
+                }
+                if (!this.hform.HSecManagerName) {
+                    this.hform.HSecManagerID = 0
+                }
+                if (!this.hform.HDeptName) {
+                    this.hform.HDeptID = 0
+                }
+                if (!this.hform.HSupName) {
+                    this.hform.HSupID = 0
+                }
+                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+                    uni.showToast({
+                        title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+                        icon: 'none'
+                    })
+                } else if (!this.hform.HBillNo) {
+                    uni.showToast({
+                        title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+                        icon: 'none'
+                    })
+                } else if (!this.Materlist || this.Materlist.length == 0) {
+                    uni.showToast({
+                        title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+                        icon: 'none'
+                    })
+                } else {
+                    var s = 0;
+                    for (var i = 0; i < this.Materlist.length; i++) {
+                        if (this.Materlist[i].鏁伴噺 > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        uni.showToast({
+                            title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+                            icon: 'none'
+                        })
+                    } else {
+                        uni.showLoading({
+                            title: '璇风◢鍊�'
+                        })
+                        var sMainStr = JSON.stringify(this.hform);
+                        uni.request({
+                            url: this.serverUrl + '/WEBSController/set_SaveOtherInBill_Json',
+                            method: 'POST',
+                            dataType: "json",
+                            data: {
+                                oMain: sMainStr
+                            },
+                            success: (res) => {
+                                console.log(1, res);
+                                uni.hideLoading()
+                                if (res.data.count == 1) {
+                                    uni.showModal({
+                                        title: '鎻愮ず',
+                                        content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                                        success: (res) => {
+                                            if (res.confirm) {
+                                                console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                                uni.redirectTo({
+                                                    url: '/pages/qitaruku_v2/form?OperationType=1'
+                                                })
+                                            } else if (res.cancel) {
+                                                console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                                setTimeout(() => {
+                                                    uni.navigateBack();
+                                                }, 500)
+                                            }
+                                        }
+                                    });
+                                } else {
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                }
+                            },
+                            fail: (res) => {
+                                console.log(res);
+                                uni.showToast({
+                                    title: '鎺ュ彛璇锋眰澶辫触',
+                                    icon: 'none'
+                                })
+                            },
+                        });
+                    }
+                }
+            },
+
+            goBack() {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.navigateBack({
+                                url: '/pages/shengchanlingliaoshengdan/table'
+                            })
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            }
+        }
+    }
 </script>
 
 <style lang="scss" scoped>
-	.form {
-		width: 668rpx;
-		margin: 20rpx auto;
-		padding-bottom: 240rpx;
-	}
+    .form {
+        width: 668rpx;
+        margin: 20rpx auto;
+        padding-bottom: 240rpx;
+    }
 
-	.tab_area {
-		width: 100%;
-		height: 50rpx;
-	}
+    .tab_area {
+        width: 100%;
+        height: 50rpx;
+    }
 
-	.other {
-		margin-top: 8rpx;
-		text-align: center;
-		font-size: 28rpx;
-		padding: 4rpx 18rpx;
-		color: #1890FF;
-	}
+    .other {
+        margin-top: 8rpx;
+        text-align: center;
+        font-size: 28rpx;
+        padding: 4rpx 18rpx;
+        color: #1890FF;
+    }
 
-	.tabs {
-		width: 100%;
-		display: flex;
-		border-bottom: 1px solid #ddd;
-		margin: 20rpx 0;
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
 
-		view {
-			width: 25%;
-			font-size: 30rpx;
-			color: #555;
-			text-align: center;
-			padding: 16rpx 0;
-		}
+        view {
+            width: 25%;
+            font-size: 30rpx;
+            color: #555;
+            text-align: center;
+            padding: 16rpx 0;
+        }
 
-		.on {
-			color: #3a78ff;
-			font-weight: bold;
-			border-bottom: 3px solid #3a78ff;
-		}
-	}
+        .on {
+            color: #3a78ff;
+            font-weight: bold;
+            border-bottom: 3px solid #3a78ff;
+        }
+    }
 
-	.form-item {
-		display: flex;
-		align-items: center;
-		font-size: 30rpx;
-		padding: 6rpx 0;
-		gap: 12rpx;
+    .form-item {
+        display: flex;
+        align-items: center;
+        font-size: 30rpx;
+        padding: 6rpx 0;
+        gap: 12rpx;
 
-		.title {
-			width: 208rpx;
-            flex-shrink: 0;
-			text {
-				color: red;
-				font-weight: bold;
-			}
-		}
-
-		.right {
-			// width: 450rpx;
-			flex: 1;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-			position: relative;
-			display: flex;
-			
-			picker {
-				width: 100%;
-			}
-
-			.uni-combox {
-				width: 100%
-			}
-		}
-
-		.righton {
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
-
-		input {
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-
-		textarea {
-			width: 98%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-
-		.icon-wrapper {
-			background-color: #3A78FF;
-			width: 52rpx;
-			height: 52rpx;
-			border-radius: 100%;
-			display: flex;
-			justify-content: center;
-			align-items: center;
+        .title {
+            width: 208rpx;
             flex-shrink: 0;
 
-			.uni-icons {
-				color: #fff !important;
-			}
-		}
+            text {
+                color: red;
+                font-weight: bold;
+            }
+        }
 
-		.icon-wrapper[disabled] {
-			background-color: rgba(228, 228, 228, 1);
-			pointer-events: none;
-			touch-action: none;
-		}
+        .right {
+            // width: 450rpx;
+            flex: 1;
+            border-radius: 22rpx;
+            border: 1px solid #acacac;
+            position: relative;
+            display: flex;
 
-	}
+            picker {
+                width: 100%;
+            }
 
-	.bottom-btn {
-		width: 100%;
-		box-sizing: border-box;
-		// height: 120rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #fff;
-		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-		padding: 30rpx 40rpx 40rpx 40rpx;
-		display: flex;
-		flex-direction: row;
-		gap: 10rpx;
+            .uni-combox {
+                width: 100%
+            }
+        }
 
-		button {
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-		}
+        .righton {
+            width: 450rpx;
+            border-radius: 22rpx;
+            border: 1px solid #e4e4e4;
+            background-color: #e4e4e4;
+        }
 
-		.btn-a {
-			background-color: #3A78FF;
-			color: #fff;
-		}
+        input {
+            width: 100%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
 
-		.btn-b {
-			background-color: #41a863;
-			color: #fff;
-		}
+        textarea {
+            width: 98%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
 
-		.btn-c {
-			background-color: #acacac;
-			color: #fff;
-			// position: absolute;
-			// right: 120rpx;
-		}
+        .icon-wrapper {
+            background-color: #3A78FF;
+            width: 52rpx;
+            height: 52rpx;
+            border-radius: 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-shrink: 0;
 
-		.btn-d {
-			background-color: #ff8901;
-			color: #fff;
-		}
-	}
+            .uni-icons {
+                color: #fff !important;
+            }
+        }
 
-	.list {
-		width: 100%;
+        .icon-wrapper[disabled] {
+            background-color: rgba(228, 228, 228, 1);
+            pointer-events: none;
+            touch-action: none;
+        }
 
-		.card-detail {
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
+    }
 
-			.detail {
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
+    .bottom-btn {
+        width: 100%;
+        box-sizing: border-box;
+        // height: 120rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 30rpx 40rpx 40rpx 40rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
 
-				text {
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
 
-		.more {
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
 
-			.part {
-				width: 50%;
-				text-align: center;
-			}
-		}
-	}
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+            // position: absolute;
+            // right: 120rpx;
+        }
+
+        .btn-d {
+            background-color: #ff8901;
+            color: #fff;
+        }
+    }
+
+    .list {
+        width: 100%;
+
+        .card-detail {
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            line-height: 120%;
+
+            .detail {
+                // width: 50%;
+                font-size: 26rpx;
+                margin-bottom: 12rpx;
+                color: #555;
+                margin-right: 20rpx;
+
+                text {
+                    color: #999;
+                    font-size: 26rpx;
+                }
+            }
+        }
+
+        .more {
+            color: #888;
+            font-size: 24rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                text-align: center;
+            }
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/pages/shengchanbuliao/form.vue b/pages/shengchanbuliao/form.vue
index 74d9478..9a64420 100644
--- a/pages/shengchanbuliao/form.vue
+++ b/pages/shengchanbuliao/form.vue
@@ -28,7 +28,7 @@
             <view class="form-item">
             	<view class="title">浠撲綅:</view>
             	<view class="right" v-show="showHStockPlaceName">
-            		<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+            		<uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
             			v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange" @confirm='HStockPlaceNameScan'></uni-combox>
             	</view>
             	<view class="righton" v-show="!showHStockPlaceName">
@@ -390,6 +390,16 @@
         components: {
             BillListPopupVue, BarCodePopupVue
         },
+        computed: {
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                    .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                    .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
+        },
         onLoad(e) {
             console.log(e, this.userInfo)
             this.OperationType = e.OperationType
@@ -733,12 +743,22 @@
             },
             //閫夋嫨浠撲綅
             HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
-                    }
+                
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+                
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
                 }
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                //     if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                //         this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                //         this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                //     }
+                // }
             },
             //閫夋嫨婧愬崟
             HSourceBillNoChange(e) {
diff --git a/pages/shengchanlingliaoshengdan/form.vue b/pages/shengchanlingliaoshengdan/form.vue
index 80f7086..2b0ce3d 100644
--- a/pages/shengchanlingliaoshengdan/form.vue
+++ b/pages/shengchanlingliaoshengdan/form.vue
@@ -1,143 +1,144 @@
 <template>
-	<view>
-		<view class="form">
-			<view class="form-item">
-				<view class="title">鏉$爜:</view>
-				<view class="right" style="width: 380rpx;">
-					<input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
-						@confirm="getCode(hform.HBarCode)" />
-				</view>
-				<view class="icon-wrapper">
-					<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鏁伴噺:</view>
-				<view class="right">
-					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撳簱:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
-						@input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撲綅:</view>
-				<view class="right" v-show="HIsStockMgr">
-					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
-						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange" @confirm='HStockPlaceNameScan'></uni-combox>
-				</view>
-				<view class="righton" v-show="!HIsStockMgr">
-					<input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
-				</view>
-			</view>
+    <view>
+        <view class="form">
+            <view class="form-item">
+                <view class="title">鏉$爜:</view>
+                <view class="right" style="width: 380rpx;">
+                    <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+                        @confirm="getCode(hform.HBarCode)" />
+                </view>
+                <view class="icon-wrapper">
+                    <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鏁伴噺:</view>
+                <view class="right">
+                    <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">浠撳簱:</view>
+                <view class="right">
+                    <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+                        @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">浠撲綅:</view>
+                <view class="right" v-show="HIsStockMgr">
+                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
+                        @confirm='HStockPlaceNameScan'></uni-combox>
+                </view>
+                <view class="righton" v-show="!HIsStockMgr">
+                    <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+                </view>
+            </view>
 
-			<view class="tabs">
-				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
-				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
-				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
-				<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
-				<view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
-			</view>
+            <view class="tabs">
+                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
+                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
+                <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
+                <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
+                <view :class="tabs == 4 ? 'on':''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
+            </view>
 
-			<view v-if="tabs == 0">
-				<view class="form-item">
-					<view class="title">婧愬崟绫诲瀷:</view>
-					<view class="right" v-show="showHMainSourceBillType">
-						<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
-							@change="HMainSourceBillTypeChange">
-							<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
-								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-							<view class="picker-overlay"></view>
-						</picker>
-					</view>
-					<view class="righton" v-show="!showHMainSourceBillType">
-						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
-							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">婧愬崟鍗曞彿:</view>
-					<view class="right" v-show="showHSourceBillNo">
-						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
+            <view v-if="tabs == 0">
+                <view class="form-item">
+                    <view class="title">婧愬崟绫诲瀷:</view>
+                    <view class="right" v-show="showHMainSourceBillType">
+                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
+                            @change="HMainSourceBillTypeChange">
+                            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+                                placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+                            <view class="picker-overlay"></view>
+                        </picker>
+                    </view>
+                    <view class="righton" v-show="!showHMainSourceBillType">
+                        <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+                            placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">婧愬崟鍗曞彿:</view>
+                    <view class="right" v-show="showHSourceBillNo">
+                        <!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
 							v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
-						<input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
-							v-model="hform.HSourceBillNo" @confirm="onSourceBillBlurHandler" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                        <input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
+                            v-model="hform.HSourceBillNo" @confirm="onSourceBillBlurHandler" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 
-					</view>
-					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
-						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
-					</view>
+                    </view>
+                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+                    </view>
 
-					<view class="righton" v-show="!showHSourceBillNo">
-						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍏堣繘鍏堝嚭浠�:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
-							@input="HFIFOWHNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鏃ユ湡:</view>
-					<view class="right">
-						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
-							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
-							<view class="picker-overlay"></view>
-						</picker>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍒跺崟浜�:</view>
-					<view class="righton">
-						<input name="HMaker" disabled v-model="hform.HMaker" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曟嵁鍙�:</view>
-					<view class="righton">
-						<input name="HBillNo" disabled v-model="hform.HBillNo" />
-					</view>
+                    <view class="righton" v-show="!showHSourceBillNo">
+                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍏堣繘鍏堝嚭浠�:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
+                            @input="HFIFOWHNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏃ユ湡:</view>
+                    <view class="right">
+                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+                            <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+                            <view class="picker-overlay"></view>
+                        </picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒跺崟浜�:</view>
+                    <view class="righton">
+                        <input name="HMaker" disabled v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
+                    </view>
                     <view class="icon-wrapper">
                         <uni-icons type="scan" size="20" @click="qrCodeDisplay"></uni-icons>
                     </view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曟嵁ID:</view>
-					<view class="righton">
-						<input name="HInterID" disabled v-model="hform.HInterID" />
-					</view>
-				</view>
-			</view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁ID:</view>
+                    <view class="righton">
+                        <input name="HInterID" disabled v-model="hform.HInterID" />
+                    </view>
+                </view>
+            </view>
 
-			<view v-if="tabs == 1">
-				<view class="form-item">
-					<view class="title">淇濈:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
-							@input="HKeeperNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">楠屾敹:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
-							@input="HSecManagerNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">閮ㄩ棬:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
-							@input="HDeptNameChange"></uni-combox>
-					</view>
-				</view>
-				<!-- <view class="form-item">
+            <view v-if="tabs == 1">
+                <view class="form-item">
+                    <view class="title">淇濈:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+                            @input="HKeeperNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">楠屾敹:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+                            @input="HSecManagerNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">閮ㄩ棬:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+                            @input="HDeptNameChange"></uni-combox>
+                    </view>
+                </view>
+                <!-- <view class="form-item">
 					<view class="title">瀹㈡埛:</view>
 					<view class="right" v-show="showHSupName">
 						<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName"
@@ -147,286 +148,289 @@
 						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
 					</view>
 				</view> -->
-				<view class="form-item">
-					<view class="title">缁勭粐:</view>
-					<view class="righton">
-						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
-					</view>
-				</view>
-			</view>
+                <view class="form-item">
+                    <view class="title">缁勭粐:</view>
+                    <view class="righton">
+                        <input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+                    </view>
+                </view>
+            </view>
 
-			<view v-if="tabs == 2">
-				<view class="list" v-for="(item,index) in Materlist" :key="index">
-					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
-						<view class="card-detail">
-							<view class="detail">
-								<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
-							</view>
-							<view class="detail">
-								<text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-							</view>
-							<view class="detail" v-if="item.鍚堣鏁伴噺">
-								<text>鍚堣鏁伴噺锛�</text>{{item.鍚堣鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
-							</view>
-							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
-								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
-							</view>
-							<view class="detail" v-if="item.杈呭姪灞炴��">
-								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
-							</view>
-							<view class="detail" v-if="item.娆惧彿">
-								<text>娆惧彿锛�</text>{{item.娆惧彿}}
-							</view>
-						</view>
-					</uni-card>
-				</view>
-				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
-			</view>
+            <view v-if="tabs == 2">
+                <view class="list" v-for="(item,index) in Materlist" :key="index">
+                    <uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+                            </view>
+                            <view class="detail">
+                                <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+                            </view>
+                            <view class="detail">
+                                <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+                            </view>
+                            <view class="detail" v-if="item.鍚堣鏁伴噺">
+                                <text>鍚堣鏁伴噺锛�</text>{{item.鍚堣鏁伴噺}}
+                            </view>
+                            <view class="detail">
+                                <text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
+                            </view>
+                            <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+                                <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+                            </view>
+                            <view class="detail" v-if="item.杈呭姪灞炴��">
+                                <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+                            </view>
+                            <view class="detail" v-if="item.娆惧彿">
+                                <text>娆惧彿锛�</text>{{item.娆惧彿}}
+                            </view>
+                        </view>
+                    </uni-card>
+                </view>
+                <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+            </view>
 
-			<view v-if="tabs == 4">
-				<view class="list" v-for="(item,index) in FIFOlist" :key="index">
-					<uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
-						@tap="delMater(item)">
-						<view class="card-detail">
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{item.HQty}}
-							</view>
-							<view class="detail">
-								<text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
-							</view>
-							<view class="detail">
-								<text>浠撳簱锛�</text>{{item.HWhName}}
-							</view>
-							<view class="detail">
-								<text>浠撲綅锛�</text>{{item.HSPName}}
-							</view>
-							<view class="detail">
-								<text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
-							</view>
-							<view class="detail" v-if="item.HBatchNo">
-								<text>鎵瑰彿锛�</text>{{item.HBatchNo}}
-							</view>
-							<view class="detail" v-if="item.HAuxPropName">
-								<text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
-							</view>
-							
-						</view>
-					</uni-card>
-				</view>
-				<view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
-			</view>
+            <view v-if="tabs == 4">
+                <view class="list" v-for="(item,index) in FIFOlist" :key="index">
+                    <uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
+                        @tap="delMater(item)">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>鏁伴噺锛�</text>{{item.HQty}}
+                            </view>
+                            <view class="detail">
+                                <text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
+                            </view>
+                            <view class="detail">
+                                <text>浠撳簱锛�</text>{{item.HWhName}}
+                            </view>
+                            <view class="detail">
+                                <text>浠撲綅锛�</text>{{item.HSPName}}
+                            </view>
+                            <view class="detail">
+                                <text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
+                            </view>
+                            <view class="detail" v-if="item.HBatchNo">
+                                <text>鎵瑰彿锛�</text>{{item.HBatchNo}}
+                            </view>
+                            <view class="detail" v-if="item.HAuxPropName">
+                                <text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
+                            </view>
 
-			<view v-if="tabs == 3">
-				<view class="form-item">
-					<view class="title">鏉$爜:</view>
-					<view class="righton">
-						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鐗╂枡:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HMaterName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瑙勬牸:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HMaterModel_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鎵规:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HBatchNo_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曚綅:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HUnitName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鏁伴噺:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HQty_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹归噺:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HTMQty_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">浠撳簱:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HWHName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">浠撲綅:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HSPName_B" />
-					</view>
-				</view>
-			</view>
+                        </view>
+                    </uni-card>
+                </view>
+                <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+            </view>
 
-			<view class="bottom-btn">
-				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-				<view style="flex: 1;"></view>
-				<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-			</view>
-		</view>
-		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
-			:HStockOrgID="hform.HStockOrgID" :MultiSourceBill="enableMultiSourceBill"></BillListPopupVue>
+            <view v-if="tabs == 3">
+                <view class="form-item">
+                    <view class="title">鏉$爜:</view>
+                    <view class="righton">
+                        <input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鐗╂枡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HMaterName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瑙勬牸:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HMaterModel_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鎵规:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBatchNo_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曚綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HUnitName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏁伴噺:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HQty_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹归噺:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HTMQty_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浠撳簱:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HWHName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浠撲綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HSPName_B" />
+                    </view>
+                </view>
+            </view>
+
+            <view class="bottom-btn">
+                <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+                <view style="flex: 1;"></view>
+                <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+                <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+            </view>
+        </view>
+        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+            :HStockOrgID="hform.HStockOrgID" :MultiSourceBill="enableMultiSourceBill"></BillListPopupVue>
         <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
     </view>
 </template>
 <script>
-	import getDateTime from '@/utils/getdateTime.js';
-	import {
-		getUserInfo
-	} from "@/utils/auth.js";
-	import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
-	import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    import getDateTime from '@/utils/getdateTime.js';
     import {
-		CommonUtils
-	} from '../../utils/common';
-	import { getUserStockRelation } from '../../utils/userRelationManager';
-	export default {
-		data() {
-			return {
-				userInfo: getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				HModName: 'Kf_MateOutBill_PDA',
-				ModRightName: 'CE_MateOut',
-				OperationType: 1,
-				HInterID_Temp: '',
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from '../../utils/common';
+    import {
+        getUserStockRelation
+    } from '../../utils/userRelationManager';
+    export default {
+        data() {
+            return {
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                HModName: 'Kf_MateOutBill_PDA',
+                ModRightName: 'CE_MateOut',
+                OperationType: 1,
+                HInterID_Temp: '',
 
-				HIsStockMgr: false,
-				showHStockPlaceName: true,
-				showHMainSourceBillType: true,
-				showHSourceBillNo: true,
-				reHSourceBillNo: true,
-				showHSupName: true,
-				barCodeFocus: false,
-                HSourceFlag : false,
+                HIsStockMgr: false,
+                showHStockPlaceName: true,
+                showHMainSourceBillType: true,
+                showHSourceBillNo: true,
+                reHSourceBillNo: true,
+                showHSupName: true,
+                barCodeFocus: false,
+                HSourceFlag: false,
 
-				tabs: 0,
-				HMainSourceBillType: '鐢熶骇鐢ㄦ枡娓呭崟',
-				arrayHMainSourceBillType: ['鐢熶骇鐢ㄦ枡娓呭崟', '鐢熶骇澶囨枡鍗�',
-					'鐢熶骇鍙戞枡閫氱煡鍗�', '鐢熶骇璁㈠崟', '鎵嬪伐褰曞叆'
-				],
+                tabs: 0,
+                HMainSourceBillType: '鐢熶骇鐢ㄦ枡娓呭崟',
+                arrayHMainSourceBillType: ['鐢熶骇鐢ㄦ枡娓呭崟', '鐢熶骇澶囨枡鍗�',
+                    '鐢熶骇鍙戞枡閫氱煡鍗�', '鐢熶骇璁㈠崟', '鎵嬪伐褰曞叆'
+                ],
 
-				linterid: '',
-				HBillNo: '',
-				btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
-				showmore: false,
+                linterid: '',
+                HBillNo: '',
+                btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+                showmore: false,
 
-				arrayHWHName: [], //浠撳簱
-				HWHNameList: [],
-				arrayHStockPlaceName: [], //浠撲綅
-				HStockPlaceNameList: [],
-				arrayHSourceBillNo: [], //婧愬崟鍗曞彿
-				HSourceBillNoList: [],
+                arrayHWHName: [], //浠撳簱
+                HWHNameList: [],
+                arrayHStockPlaceName: [], //浠撲綅
+                HStockPlaceNameList: [],
+                arrayHSourceBillNo: [], //婧愬崟鍗曞彿
+                HSourceBillNoList: [],
 
-				HSourceBillNoFocus: false,
-				barCodeFocus: false,
+                HSourceBillNoFocus: false,
+                barCodeFocus: false,
 
-				arrayHEmpName: [], //鎿嶄綔鍛�
-				HEmpNameList: [],
-				arrayHDeptName: [], //閮ㄩ棬
-				HDeptNameList: [],
-				arrayHSupName: [], //瀹㈡埛
-				HSupNameList: [],
+                arrayHEmpName: [], //鎿嶄綔鍛�
+                HEmpNameList: [],
+                arrayHDeptName: [], //閮ㄩ棬
+                HDeptNameList: [],
+                arrayHSupName: [], //瀹㈡埛
+                HSupNameList: [],
 
-				Materlist: [],
-				FIFOlist: [],
-				hform: {
-					HBillType: 1204,
-					HBillerID: uni.getStorageSync('HBillerID'),
-					HRedBlueFlag: false,
+                Materlist: [],
+                FIFOlist: [],
+                hform: {
+                    HBillType: 1204,
+                    HBillerID: uni.getStorageSync('HBillerID'),
+                    HRedBlueFlag: false,
 
-					HBarCode: '',
-					HQty: '',
-					HWHName: getUserInfo().HWHName,
-					HWHID: getUserInfo().HWhID,
-					HStockPlaceName: getUserInfo().HSPName,
-					HStockPlaceID: getUserInfo().HSPID,
+                    HBarCode: '',
+                    HQty: '',
+                    HWHName: getUserInfo().HWHName,
+                    HWHID: getUserInfo().HWhID,
+                    HStockPlaceName: getUserInfo().HSPName,
+                    HStockPlaceID: getUserInfo().HSPID,
 
-					HMainSourceBillType: 3720,
-					HSourceBillNo: '', //CGDD000200
-					HFIFOWHName: '',
-					HFIFOWHID: '',
-					HDate: getDateTime.dateTimeStr('y-m-d'),
-					HMaker: uni.getStorageSync('HUserName'),
-					HBillNo: '',
-					HInterID: '',
+                    HMainSourceBillType: 3720,
+                    HSourceBillNo: '', //CGDD000200
+                    HFIFOWHName: '',
+                    HFIFOWHID: '',
+                    HDate: getDateTime.dateTimeStr('y-m-d'),
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HBillNo: '',
+                    HInterID: '',
 
-					HKeeperName: getUserInfo().HKeeper,
-					HKeeperID: getUserInfo().HKeeperID,
-					HSecManagerName: getUserInfo().HSecManager,
-					HSecManagerID: getUserInfo().HSecManagerID,
-					HDeptName: getUserInfo().HDept,
-					HDeptID: getUserInfo().HDeptID,
-					HSupName: '',
-					HSupID: '',
-					HStockOrgName: uni.getStorageSync('Organization'),
-					HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    HKeeperName: getUserInfo().HKeeper,
+                    HKeeperID: getUserInfo().HKeeperID,
+                    HSecManagerName: getUserInfo().HSecManager,
+                    HSecManagerID: getUserInfo().HSecManagerID,
+                    HDeptName: getUserInfo().HDept,
+                    HDeptID: getUserInfo().HDeptID,
+                    HSupName: '',
+                    HSupID: '',
+                    HStockOrgName: uni.getStorageSync('Organization'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
 
-					HBarCode_B: '',
-					HMaterName_B: '',
-					HMaterModel_B: '',
-					HBatchNo_B: '',
-					HUnitName_B: '',
-					HQty_B: '',
-					HTMQty_B: '',
-					HWHName_B: '',
-					HSPName_B: '',
-				}
-			}
-		},
-		components: {
-			BillListPopupVue, BarCodePopupVue
-		},
-		onLoad(e) {
-			console.log(e, this.userInfo)
-			this.OperationType = e.OperationType
-			if (e.HInterID) {
-				this.HInterID_Temp = e.HInterID
-				// this.btnType = 1
-				this.RoadBillMain(e.HInterID)
-				this.barCodeFocus = true
+                    HBarCode_B: '',
+                    HMaterName_B: '',
+                    HMaterModel_B: '',
+                    HBatchNo_B: '',
+                    HUnitName_B: '',
+                    HQty_B: '',
+                    HTMQty_B: '',
+                    HWHName_B: '',
+                    HSPName_B: '',
+                }
+            }
+        },
+        components: {
+            BillListPopupVue,
+            BarCodePopupVue
+        },
+        onLoad(e) {
+            console.log(e, this.userInfo)
+            this.OperationType = e.OperationType
+            if (e.HInterID) {
+                this.HInterID_Temp = e.HInterID
+                // this.btnType = 1
+                this.RoadBillMain(e.HInterID)
+                this.barCodeFocus = true
                 this.hform.HSourceFlag = true
-			} else {
-				this.getNewData()
-				this.HSourceBillNoFocus = true
+            } else {
+                this.getNewData()
+                this.HSourceBillNoFocus = true
                 this.hform.HSourceFlag = true
-			}
-			// this.getHBaseList()
-			this.getHSupList()
-			this.getHEmpList()
-			this.getHDeptList()
-			
-			this.getRelationStore()
+            }
+            // this.getHBaseList()
+            this.getHSupList()
+            this.getHEmpList()
+            this.getHDeptList()
 
-			uni.$on('BillSelectComplete', async (e) => {
+            this.getRelationStore()
+
+            uni.$on('BillSelectComplete', async (e) => {
                 console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
                 console.log("鏄惁搴旂敤澶氭簮鍗�: ", e.enableMultiSourceBill)
-                if(e.enableMultiSourceBill){
-                    for(let item of e.MultiSourceBillList) {
-                        try{
+                if (e.enableMultiSourceBill) {
+                    for (let item of e.MultiSourceBillList) {
+                        try {
                             await this.getHBarCodeData(item.HBillNo)
-                        }catch {
+                        } catch {
                             return
                         }
                     }
@@ -434,43 +438,54 @@
                     // if(e.MultiSourceBillList.length != 0){
                     //      this.showHSourceBillNo = false
                     // }
-                   
-                }else {
+
+                } else {
                     this.getHBarCodeData(e.HBillNo)
                     this.$refs.billList.exit()
                 }
-                
-				
-				
-			})
-		},
-		onUnload() {
-			uni.$off('BillSelectComplete')
-		},
+
+
+
+            })
+        },
+        onUnload() {
+            uni.$off('BillSelectComplete')
+        },
         computed: {
             enableMultiSourceBill: {
                 get() {
-                    
-                    if(uni.getStorageSync("Organization").includes("娴疯瘹") &&  this.hform.HMainSourceBillType ==  3720){
+
+                    if (uni.getStorageSync("Organization").includes("娴疯瘹") && this.hform.HMainSourceBillType ==
+                        3720) {
                         return true
                     }
                     return false
                 }
+            },
+
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                        .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                        .map(e => e['浠撲綅鍚嶇О'])
+                }
             }
+
         },
-		methods: {
-            
-            
+        methods: {
+
+
             async HWHNameScan(e) {
                 // 鎵弿浠撳簱鐮�
                 console.log('浠撳簱鐮�: ', e);
                 let index = this.HWHNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
-                if(index == -1){
+                if (index == -1) {
                     uni.showToast({
-                        icon:'none',
+                        icon: 'none',
                         title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
                     })
-                }else {
+                } else {
                     this.HWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
                 }
             },
@@ -478,13 +493,13 @@
                 // 鎵弿浠撲綅鐮�
                 console.log('浠撲綅鐮�: ', e);
                 let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
-                console.log('index: ',index);
-                if(index == -1){
+                console.log('index: ', index);
+                if (index == -1) {
                     uni.showToast({
-                        icon:'none',
+                        icon: 'none',
                         title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
                     })
-                }else {
+                } else {
                     this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
                 }
             },
@@ -493,1285 +508,1288 @@
                     this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
                     await this.$nextTick()
                     this.$refs.barcodePopup.open()
-                }catch(err) {
+                } catch (err) {
                     uni.showToast({
                         icon: 'none',
                         title: err
                     })
                 }
             },
-			async getRelationStore() {
-				let {
-					data,
-					count
-				} = await getUserStockRelation()
-				if (count == 1) {
-					let WHIDList = []
-					
-					Array.from(data).forEach(elem => {			
-						WHIDList.push(elem.HItemID)			
-					})
-					
-					let sWhere = ` and HItemID in (${WHIDList.join(",")})`
-					this.getHBaseList({
-						sWhere: sWhere
-					})
-					
-				} else {
-					this.getHBaseList()
-				}
-			},
-			async refreshHSourceBillState() {
-				this.HSourceBillNoFocus = false
-				await this.$nextTick(() => {
-					this.hform.HSourceBillNo = ""
-					this.HSourceBillNoFocus = true
-				})
-			},
-			async refreshBarCodeState() {
-				this.barCodeFocus = false
-				await this.$nextTick(() => {
-					this.hform.HBarCode = ""
-					this.barCodeFocus = true
-				})
-			},
-			onSourceBillBlurHandler() {
-				if (CommonUtils.isEmpty(this.hform.HSourceBillNo) === true) {
-					return
-				}
-				this.getHBarCodeData(this.hform.HSourceBillNo)
-			},
-			playSound(e) {
-				const innerAudioContext = uni.createInnerAudioContext();
-				if (e == 1) {
-					innerAudioContext.src = '/static/success.wav';
-				} else {
-					innerAudioContext.src = '/static/jingbao.wav';
-				}
-				innerAudioContext.play(); // 鎾斁闊抽
-			},
-			//鎵爜
-			toScanCode() {
-				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-				mpaasScanModule.mpaasScan({
-					'hideAlbum': true,
-					'timeoutInterval': '10', //瓒呮椂鏃堕棿
-					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				}, (ret) => {
-					console.log(ret.resp_result)
-					if (this.hform.HBarCode == '*') {
-						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
-					} else {
-						this.hform.HBarCode = ret.resp_result
-					}
+            async getRelationStore() {
+                let {
+                    data,
+                    count
+                } = await getUserStockRelation()
+                if (count == 1) {
+                    let WHIDList = []
 
-					this.getCode(this.hform.HBarCode)
-				})
-			},
-			showBillList() {
-				this.$refs.billList.showPopup()
-			},
-			//鎵叾浠�(浠撳簱锛屼粨浣�)
-			// toScanData(e){
-			// 	uni.scanCode({
-			// 	    onlyFromCamera: true,
-			// 	    success: (res) => {
-			// 	        console.log('鏉$爜鍐呭锛�' + res.result);
-			// 			var code = res.result
-			// 			if(e == 1){
-			// 				uni.request({
-			// 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
-			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
-			// 					success: (res) => {
-			// 						this.hform.HStockPlaceID = 0
-			// 						this.hform.HStockPlaceName = ''
-			// 						this.showHStockPlaceName = true
-			// 						if(res.data.count == 1){
-			// 							var data = res.data.data[0]
-			// 							this.hform.HWHID = data.HItemID
-			// 							this.hform.HWHName = data.HName
-			// 							if (data.HSPFlag == 0) {
-			// 							    this.showHStockPlaceName = false
-			// 							}
-			// 						}else{
-			// 							this.hform.HWHID = 0
-			// 							this.hform.HWHName = ''
-			// 							uni.showToast({
-			// 								title:res.data.Message,
-			// 								icon:'none'
-			// 							})
-			// 						}
-			// 					},
-			// 					fail: (res) => {
-			// 						console.log(res);
-			// 						uni.showToast({
-			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-			// 							icon:'none'
-			// 						})
-			// 					},
-			// 				});
-			// 			}else if(e == 2){
-			// 				uni.request({
-			// 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
-			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
-			// 					success: (res) => {
-			// 						if(res.data.count == 1){
-			// 							var data = res.data.data[0]
-			// 							this.hform.HWHID = data.HWHID
-			// 							this.hform.HWHName = data.HWhName
-			// 							this.hform.HStockPlaceID = data.HItemID
-			// 							this.hform.HStockPlaceName = data.HName
-			// 						}else{
-			// 							this.hform.HWHID = 0
-			// 							this.hform.HWHName = ''
-			// 							this.hform.HStockPlaceID = 0
-			// 							this.hform.HStockPlaceName = ''
-			// 							uni.showToast({
-			// 								title:res.data.Message,
-			// 								icon:'none'
-			// 							})
-			// 						}
-			// 					},
-			// 					fail: (res) => {
-			// 						console.log(res);
-			// 						uni.showToast({
-			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-			// 							icon:'none'
-			// 						})
-			// 					},
-			// 				});
-			// 			}
-			// 	    }
-			// 	});
-			// },
-			//鏃ユ湡
-			HDateChange(e) {
-				console.log(e.detail.value)
-				this.hform.HDate = e.detail.value
-			},
-			//鍩虹浠撳簱璧勬枡
-			getHBaseList({sWhere=""} = {}) {
-				uni.request({
-					url: this.serverUrl + '/Gy_Warehouse/list',
-					data: {
-						sWhere: sWhere,
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HWHNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
-							}
-						} else {
-							uni.showToast({
-								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
+                    Array.from(data).forEach(elem => {
+                        WHIDList.push(elem.HItemID)
+                    })
 
-				uni.request({
-					url: this.serverUrl + '/Gy_StockPlace/list',
-					data: {
-						sWhere: "",
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HStockPlaceNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
-							}
-						} else {
-							uni.showToast({
-								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
+                    let sWhere = ` and HItemID in (${WHIDList.join(",")})`
+                    this.getHBaseList({
+                        sWhere: sWhere
+                    })
 
-				// this.getHYDList()
-			},
-			// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
-			async GetSourceBillType() {
-				return new Promise((resolve, reject) => {
-					CommonUtils.doRequest2({
-						url: '/Web/GetHSourceBillType',
-						data: {
-							HName: this.HMainSourceBillType,
-							Num: 2
-						},
-						resFunction: (res) => {
-							let {
-								data,
-								count,
-								Message
-							} = res.data
-							if (count == 1) {
-								resolve({
-									data1: data
-								})
-							} else {
-								reject(Message)
-							}
-						}
-					})
-				})
-			},
-			//婧愬崟璧勬枡
-			async getHYDList() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSourceBillList_Json',
-					data: {
-						HBillType: this.hform.HBillType,
-						HSourceBillType: this.hform.HMainSourceBillType,
-						HStockOrgID: this.hform.HStockOrgID,
-						HSourceBillNo: "",
-						HMater: "",
-						HCustom: ""
-					},
-					success: (res) => {
-						let {
-							count,
-							data,
-							Message
-						} = res.data
-						if (res.data.count == 1) {
-							this.HSourceBillNoList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
-							}
-							this.reHSourceBillNo = false
-							this.$nextTick(() => {
-								this.reHSourceBillNo = true
-							})
-						} else {
-							uni.showToast({
-								title: Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浠撳簱
-			HWHNameChange(e) {
-				// var name = e.split("(")
-				for (var i = 0; i < this.HWHNameList.length; i++) {
-					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
-						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HWHID = this.HWHNameList[i].HItemID
+                } else {
+                    this.getHBaseList()
+                }
+            },
+            async refreshHSourceBillState() {
+                this.HSourceBillNoFocus = false
+                await this.$nextTick(() => {
+                    this.hform.HSourceBillNo = ""
+                    this.HSourceBillNoFocus = true
+                })
+            },
+            async refreshBarCodeState() {
+                this.barCodeFocus = false
+                await this.$nextTick(() => {
+                    this.hform.HBarCode = ""
+                    this.barCodeFocus = true
+                })
+            },
+            onSourceBillBlurHandler() {
+                if (CommonUtils.isEmpty(this.hform.HSourceBillNo) === true) {
+                    return
+                }
+                this.getHBarCodeData(this.hform.HSourceBillNo)
+            },
+            playSound(e) {
+                const innerAudioContext = uni.createInnerAudioContext();
+                if (e == 1) {
+                    innerAudioContext.src = '/static/success.wav';
+                } else {
+                    innerAudioContext.src = '/static/jingbao.wav';
+                }
+                innerAudioContext.play(); // 鎾斁闊抽
+            },
+            //鎵爜
+            toScanCode() {
+                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+                mpaasScanModule.mpaasScan({
+                    'hideAlbum': true,
+                    'timeoutInterval': '10', //瓒呮椂鏃堕棿
+                    'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+                }, (ret) => {
+                    console.log(ret.resp_result)
+                    if (this.hform.HBarCode == '*') {
+                        this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+                    } else {
+                        this.hform.HBarCode = ret.resp_result
+                    }
 
-						if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
-							this.HIsStockMgr = true
-						} else {
-							this.hform.HStockPlaceName = ''
-							this.HIsStockMgr = false
-						}
-					}
-				}
-			},
-			HFIFOWHNameChange(e) {
-				for (var i = 0; i < this.HWHNameList.length; i++) {
-					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
-						this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨浠撲綅
-			HStockPlaceNameChange(e) {
-				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-					if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
-					}
-				}
-                console.log('this.hform.HStockPlaceID: ',this.hform.HStockPlaceID);
-			},
-			//閫夋嫨婧愬崟
-			HSourceBillNoChange(e) {
-				this.hform.HSourceBillNo = e
-				this.getHBarCodeData(e)
-				// for(var i=0;i<this.HSourceBillNoList.length;i++){
-				// 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
-				// 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
-				// 	}
-				// }
-			},
-			//閫夋嫨婧愬崟绫诲瀷
-			HMainSourceBillTypeChange(e) {
-				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
-				if (this.HMainSourceBillType == '鐢熶骇鐢ㄦ枡娓呭崟') {
-					this.hform.HMainSourceBillType = 3720
-					// this.getHYDList()
-				} else if (this.HMainSourceBillType == '鐢熶骇澶囨枡鍗�') {
-					this.hform.HMainSourceBillType = 3721
-					// this.getHYDList()
-				} else if (this.HMainSourceBillType == '鐢熶骇鍙戞枡閫氱煡鍗�') {
-					this.hform.HMainSourceBillType = 1214
-					// this.getHYDList()
-				} else if (this.HMainSourceBillType == '鐢熶骇璁㈠崟') {
-					this.hform.HMainSourceBillType = 3710
-					// this.getHYDList()
-				} else {
-					this.hform.HMainSourceBillType = -1
-					// this.getHYDList()
-				}
-			},
+                    this.getCode(this.hform.HBarCode)
+                })
+            },
+            showBillList() {
+                this.$refs.billList.showPopup()
+            },
+            //鎵叾浠�(浠撳簱锛屼粨浣�)
+            // toScanData(e){
+            // 	uni.scanCode({
+            // 	    onlyFromCamera: true,
+            // 	    success: (res) => {
+            // 	        console.log('鏉$爜鍐呭锛�' + res.result);
+            // 			var code = res.result
+            // 			if(e == 1){
+            // 				uni.request({
+            // 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
+            // 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
+            // 					success: (res) => {
+            // 						this.hform.HStockPlaceID = 0
+            // 						this.hform.HStockPlaceName = ''
+            // 						this.showHStockPlaceName = true
+            // 						if(res.data.count == 1){
+            // 							var data = res.data.data[0]
+            // 							this.hform.HWHID = data.HItemID
+            // 							this.hform.HWHName = data.HName
+            // 							if (data.HSPFlag == 0) {
+            // 							    this.showHStockPlaceName = false
+            // 							}
+            // 						}else{
+            // 							this.hform.HWHID = 0
+            // 							this.hform.HWHName = ''
+            // 							uni.showToast({
+            // 								title:res.data.Message,
+            // 								icon:'none'
+            // 							})
+            // 						}
+            // 					},
+            // 					fail: (res) => {
+            // 						console.log(res);
+            // 						uni.showToast({
+            // 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+            // 							icon:'none'
+            // 						})
+            // 					},
+            // 				});
+            // 			}else if(e == 2){
+            // 				uni.request({
+            // 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
+            // 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
+            // 					success: (res) => {
+            // 						if(res.data.count == 1){
+            // 							var data = res.data.data[0]
+            // 							this.hform.HWHID = data.HWHID
+            // 							this.hform.HWHName = data.HWhName
+            // 							this.hform.HStockPlaceID = data.HItemID
+            // 							this.hform.HStockPlaceName = data.HName
+            // 						}else{
+            // 							this.hform.HWHID = 0
+            // 							this.hform.HWHName = ''
+            // 							this.hform.HStockPlaceID = 0
+            // 							this.hform.HStockPlaceName = ''
+            // 							uni.showToast({
+            // 								title:res.data.Message,
+            // 								icon:'none'
+            // 							})
+            // 						}
+            // 					},
+            // 					fail: (res) => {
+            // 						console.log(res);
+            // 						uni.showToast({
+            // 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+            // 							icon:'none'
+            // 						})
+            // 					},
+            // 				});
+            // 			}
+            // 	    }
+            // 	});
+            // },
+            //鏃ユ湡
+            HDateChange(e) {
+                console.log(e.detail.value)
+                this.hform.HDate = e.detail.value
+            },
+            //鍩虹浠撳簱璧勬枡
+            getHBaseList({
+                sWhere = ""
+            } = {}) {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Warehouse/list',
+                    data: {
+                        sWhere: sWhere,
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HWHNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
 
-			//鑾峰彇瀹㈡埛鏁版嵁
-			getHSupList() {
-				uni.request({
-					url: this.serverUrl + '/Gy_Customer/list',
-					data: {
-						sWhere: "",
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HSupNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHSupName[i] = res.data.data[i].瀹㈡埛鍚嶇О
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨瀹㈡埛
-			HSupNameChange(e) {
-				for (var i = 0; i < this.HSupNameList.length; i++) {
-					if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
-						this.hform.HSupID = this.HSupNameList[i].HItemID
-						this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
-					}
-				}
-			},
-			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-			getHDeptList() {
-				uni.request({
-					url: this.serverUrl + '/Gy_Department/list',
-					data: {
-						sWhere: "",
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HDeptNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浣跨敤閮ㄩ棬
-			HDeptNameChange(e) {
-				for (var i = 0; i < this.HDeptNameList.length; i++) {
-					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
-						this.hform.HDeptID = this.HDeptNameList[i].HItemID
-						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
-					}
-				}
-			},
-			//鎿嶄綔鍛�
-			getHEmpList() {
-				uni.request({
-					url: this.serverUrl + '/Web/GetEmployeeList_Json',
-					data: {
-						Employee: '',
-						HGroupID: 0
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HEmpNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHEmpName[i] = res.data.data[i].HName
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//淇濈
-			HKeeperNameChange(e) {
-				for (var i = 0; i < this.HEmpNameList.length; i++) {
-					if (this.HEmpNameList[i].HName == e) {
-						console.log(this.HEmpNameList[i])
-						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
-						this.hform.HKeeperName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//楠屾敹
-			HSecManagerNameChange(e) {
-				for (var i = 0; i < this.HEmpNameList.length; i++) {
-					if (this.HEmpNameList[i].HName == e) {
-						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
-						this.hform.HSecManagerName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//閫変腑婧愬崟
-			async getHBarCodeData(HBarCode) {
-				if (!this.hform.HFIFOWHName) {
-					this.hform.HFIFOWHID = 0
-				}
+                uni.request({
+                    url: this.serverUrl + '/Gy_StockPlace/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HStockPlaceNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+
+                // this.getHYDList()
+            },
+            // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
+            async GetSourceBillType() {
+                return new Promise((resolve, reject) => {
+                    CommonUtils.doRequest2({
+                        url: '/Web/GetHSourceBillType',
+                        data: {
+                            HName: this.HMainSourceBillType,
+                            Num: 2
+                        },
+                        resFunction: (res) => {
+                            let {
+                                data,
+                                count,
+                                Message
+                            } = res.data
+                            if (count == 1) {
+                                resolve({
+                                    data1: data
+                                })
+                            } else {
+                                reject(Message)
+                            }
+                        }
+                    })
+                })
+            },
+            //婧愬崟璧勬枡
+            async getHYDList() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetSourceBillList_Json',
+                    data: {
+                        HBillType: this.hform.HBillType,
+                        HSourceBillType: this.hform.HMainSourceBillType,
+                        HStockOrgID: this.hform.HStockOrgID,
+                        HSourceBillNo: "",
+                        HMater: "",
+                        HCustom: ""
+                    },
+                    success: (res) => {
+                        let {
+                            count,
+                            data,
+                            Message
+                        } = res.data
+                        if (res.data.count == 1) {
+                            this.HSourceBillNoList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
+                            }
+                            this.reHSourceBillNo = false
+                            this.$nextTick(() => {
+                                this.reHSourceBillNo = true
+                            })
+                        } else {
+                            uni.showToast({
+                                title: Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨浠撳簱
+            HWHNameChange(e) {
+                // var name = e.split("(")
+                for (var i = 0; i < this.HWHNameList.length; i++) {
+                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+                        this.hform.HWHID = this.HWHNameList[i].HItemID
+
+                        if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+                            this.HIsStockMgr = true
+                        } else {
+                            this.hform.HStockPlaceName = ''
+                            this.HIsStockMgr = false
+                        }
+                    }
+                }
+            },
+            HFIFOWHNameChange(e) {
+                for (var i = 0; i < this.HWHNameList.length; i++) {
+                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+                        this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
+                    }
+                }
+            },
+            //閫夋嫨浠撲綅
+            HStockPlaceNameChange(e) {
+                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                    }
+                }
+                console.log('this.hform.HStockPlaceID: ', this.hform.HStockPlaceID);
+            },
+            //閫夋嫨婧愬崟
+            HSourceBillNoChange(e) {
+                this.hform.HSourceBillNo = e
+                this.getHBarCodeData(e)
+                // for(var i=0;i<this.HSourceBillNoList.length;i++){
+                // 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
+                // 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
+                // 	}
+                // }
+            },
+            //閫夋嫨婧愬崟绫诲瀷
+            HMainSourceBillTypeChange(e) {
+                this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+                if (this.HMainSourceBillType == '鐢熶骇鐢ㄦ枡娓呭崟') {
+                    this.hform.HMainSourceBillType = 3720
+                    // this.getHYDList()
+                } else if (this.HMainSourceBillType == '鐢熶骇澶囨枡鍗�') {
+                    this.hform.HMainSourceBillType = 3721
+                    // this.getHYDList()
+                } else if (this.HMainSourceBillType == '鐢熶骇鍙戞枡閫氱煡鍗�') {
+                    this.hform.HMainSourceBillType = 1214
+                    // this.getHYDList()
+                } else if (this.HMainSourceBillType == '鐢熶骇璁㈠崟') {
+                    this.hform.HMainSourceBillType = 3710
+                    // this.getHYDList()
+                } else {
+                    this.hform.HMainSourceBillType = -1
+                    // this.getHYDList()
+                }
+            },
+
+            //鑾峰彇瀹㈡埛鏁版嵁
+            getHSupList() {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Customer/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HSupNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHSupName[i] = res.data.data[i].瀹㈡埛鍚嶇О
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨瀹㈡埛
+            HSupNameChange(e) {
+                for (var i = 0; i < this.HSupNameList.length; i++) {
+                    if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+                        this.hform.HSupID = this.HSupNameList[i].HItemID
+                        this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+                    }
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            getHDeptList() {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Department/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HDeptNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨浣跨敤閮ㄩ棬
+            HDeptNameChange(e) {
+                for (var i = 0; i < this.HDeptNameList.length; i++) {
+                    if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+                        this.hform.HDeptID = this.HDeptNameList[i].HItemID
+                        this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+                    }
+                }
+            },
+            //鎿嶄綔鍛�
+            getHEmpList() {
+                uni.request({
+                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
+                    data: {
+                        Employee: '',
+                        HGroupID: 0
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HEmpNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHEmpName[i] = res.data.data[i].HName
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //淇濈
+            HKeeperNameChange(e) {
+                for (var i = 0; i < this.HEmpNameList.length; i++) {
+                    if (this.HEmpNameList[i].HName == e) {
+                        console.log(this.HEmpNameList[i])
+                        this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+                        this.hform.HKeeperName = this.HEmpNameList[i].HName
+                    }
+                }
+            },
+            //楠屾敹
+            HSecManagerNameChange(e) {
+                for (var i = 0; i < this.HEmpNameList.length; i++) {
+                    if (this.HEmpNameList[i].HName == e) {
+                        this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+                        this.hform.HSecManagerName = this.HEmpNameList[i].HName
+                    }
+                }
+            },
+            //閫変腑婧愬崟
+            async getHBarCodeData(HBarCode) {
+                if (!this.hform.HFIFOWHName) {
+                    this.hform.HFIFOWHID = 0
+                }
                 return new Promise((resolve, reject) => {
                     uni.request({
-                    	url: this.serverUrl + '/WEBSController/get_SourceBarCode_MateOut_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,
-                    		HFIFOWHID: this.hform.HFIFOWHID,
-                    		HPTQty: this.hform.HPTQty || 0,
-                    		HPlanMode: this.hform.HPlanMode || 0
-                    	},
-                    	success: (res) => {
-                    		if (res.data.count == 1) {
+                        url: this.serverUrl + '/WEBSController/get_SourceBarCode_MateOut_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,
+                            HFIFOWHID: this.hform.HFIFOWHID,
+                            HPTQty: this.hform.HPTQty || 0,
+                            HPlanMode: this.hform.HPlanMode || 0
+                        },
+                        success: (res) => {
+                            if (res.data.count == 1) {
                                 this.hform.HSourceFlag = true
-                    			var data = res.data.data
-                    			console.log(2, data);
-                    			this.hform.HSupName = data.hSupNameField
-                    			this.hform.HSupID = data.hSupIDField
-                    			if (data.hDeptIDField != 0) {
-                    				this.hform.HDeptID = data.hDeptIDField
-                    				this.hform.HDeptName = data.hDeptNameField
-                    			}
-                    			this.hform.HSourceBillNo = data.hSourceBillNoField
-                    			this.showHMainSourceBillType = false
-                    			if (data.hMulSourceFlagField == 0) {
-                    				this.showHSourceBillNo = false
-                    			}
-                    			this.tabs = 2
-                    			this.showHSupName = false
-                    			this.barCodeFocus = true
-                    			this.playSound(1)
-                    			this.DisBillEntryList()
+                                var data = res.data.data
+                                console.log(2, data);
+                                this.hform.HSupName = data.hSupNameField
+                                this.hform.HSupID = data.hSupIDField
+                                if (data.hDeptIDField != 0) {
+                                    this.hform.HDeptID = data.hDeptIDField
+                                    this.hform.HDeptName = data.hDeptNameField
+                                }
+                                this.hform.HSourceBillNo = data.hSourceBillNoField
+                                this.showHMainSourceBillType = false
+                                if (data.hMulSourceFlagField == 0) {
+                                    this.showHSourceBillNo = false
+                                }
+                                this.tabs = 2
+                                this.showHSupName = false
+                                this.barCodeFocus = true
+                                this.playSound(1)
+                                this.DisBillEntryList()
                                 resolve()
-                    		} else {
-                    			this.playSound(0)
-                    			this.refreshHSourceBillState()
-                    			uni.showToast({
-                    				title: res.data.Message,
-                    				icon: 'none'
-                    			})
+                            } else {
+                                this.playSound(0)
+                                this.refreshHSourceBillState()
+                                uni.showToast({
+                                    title: res.data.Message,
+                                    icon: 'none'
+                                })
                                 reject()
-                    		}
-                    	},
-                    	fail: (res) => {
-                    		this.playSound(0)
-                    		this.refreshHSourceBillState()
-                    		console.log(res);
-                    		uni.showToast({
-                    			title: '鎺ュ彛璇锋眰澶辫触',
-                    			icon: 'none'
-                    		})
+                            }
+                        },
+                        fail: (res) => {
+                            this.playSound(0)
+                            this.refreshHSourceBillState()
+                            console.log(res);
+                            uni.showToast({
+                                title: '鎺ュ彛璇锋眰澶辫触',
+                                icon: 'none'
+                            })
                             reject()
-                    	},
+                        },
                     });
                 })
-				
-			},
-			//鎵潯鐮佸鐞�
-			getCode(HBarCode) {
-				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
-				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
-				}
-				var sOldBarCode = HBarCode
-				var HDeleteFlag = sOldBarCode.substring(0, 1);
-				var sBarCode = sOldBarCode.slice(1);
 
-				var sHWHID = this.hform.HWHID
-				var sHSPID = this.hform.HStockPlaceID
-				var sHQty = this.hform.HQty
-				var sSourceBillNo = this.hform.HSourceBillNo
-				var sSourceBillType = this.hform.HMainSourceBillType
-				var HSourceFlag = this.hform.HSourceFlag
-				console.log(this.hform.HSourceBillNo, HSourceFlag)
-				if (HDeleteFlag == "*") {
-					if (sBarCode == "") {
-						this.playSound(0)
-						this.refreshBarCodeState()
-						uni.showToast({
-							title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
-							icon: 'none'
-						})
-					} else {
-						uni.request({
-							url: this.serverUrl +
-								'/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
-							data: {
-								HInterID: this.hform.HInterID,
-								HBillType: this.hform.HBillType,
-								HBarCode: sBarCode
-							},
-							success: (res) => {
-								console.log('鍒犻櫎鏉$爜', res.data);
-								this.hform.HBarCode = ''
-								if (res.data.count == 1) {
-									this.playSound(1)
-									this.hform.HQty = ''
-									this.DisBillEntryList()
-								} else {
-									this.playSound(0)
-									this.refreshBarCodeState()
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								this.playSound(0)
-								this.refreshBarCodeState()
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									icon: 'none'
-								})
-							},
-						});
-					}
-				} else {
-					var sBarCode = this.hform.HBarCode
-					if (sHQty == "") {
-						sHQty = 0;
-					}
-					uni.request({
-						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
-						data: {
-							sBarCode: sBarCode,
-							HInterID: this.hform.HInterID,
-							HBillType: this.hform.HBillType,
-							HBillNo: this.hform.HBillNo,
-							HMaker: this.hform.HMaker,
-							HWhID: sHWHID,
-							HSPID: sHSPID,
-							HQty: sHQty,
-							HRedBlueFlag: this.hform.HRedBlueFlag,
-							SourceFlag: HSourceFlag,
-							HSourceBillNo: sSourceBillNo,
-							HSourceBillType: sSourceBillType,
-							HStockOrgID: this.hform.HStockOrgID,
-							HScanStyle: "",
-							HCustom1: "",
-							HCustom2: ""
-						},
-						success: (res) => {
-							console.log('鎵爜杩斿洖', res.data);
-							this.hform.HBarCode = ''
-							if (res.data.count == 1) {
-								this.playSound(1)
-								var data = res.data.data
-								if (data.hBarTypeField == '浠撳簱鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = ''
-									this.hform.HStockPlaceID = 0
-									if (data.hSPFlagField == 0) {
-										this.showHStockPlaceName = false
-									} else {
-										this.showHStockPlaceName = true
-									}
-								} else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = data.hSPNameField
-									this.hform.HStockPlaceID = data.hSPIDField
-								} else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-									this.hform.HDeptName = data.hDeptNameField
-									this.hform.HDeptID = data.hDeptIDField
-									this.tabs = 1
-								} else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-									this.hform.HSupName = data.hSupNameField
-									this.hform.HSupID = data.hSupIDField
+            },
+            //鎵潯鐮佸鐞�
+            getCode(HBarCode) {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HWHName) {
+                    this.hform.HWHID = 0
+                }
+                if (!this.hform.HStockPlaceName) {
+                    this.hform.HStockPlaceID = 0
+                }
+                var sOldBarCode = HBarCode
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+
+                var sHWHID = this.hform.HWHID
+                var sHSPID = this.hform.HStockPlaceID
+                var sHQty = this.hform.HQty
+                var sSourceBillNo = this.hform.HSourceBillNo
+                var sSourceBillType = this.hform.HMainSourceBillType
+                var HSourceFlag = this.hform.HSourceFlag
+                console.log(this.hform.HSourceBillNo, HSourceFlag)
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        this.playSound(0)
+                        this.refreshBarCodeState()
+                        uni.showToast({
+                            title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+                            icon: 'none'
+                        })
+                    } else {
+                        uni.request({
+                            url: this.serverUrl +
+                                '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+                            data: {
+                                HInterID: this.hform.HInterID,
+                                HBillType: this.hform.HBillType,
+                                HBarCode: sBarCode
+                            },
+                            success: (res) => {
+                                console.log('鍒犻櫎鏉$爜', res.data);
+                                this.hform.HBarCode = ''
+                                if (res.data.count == 1) {
+                                    this.playSound(1)
+                                    this.hform.HQty = ''
+                                    this.DisBillEntryList()
+                                } else {
+                                    this.playSound(0)
+                                    this.refreshBarCodeState()
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                }
+                            },
+                            fail: (res) => {
+                                this.playSound(0)
+                                this.refreshBarCodeState()
+                                console.log(res);
+                                uni.showToast({
+                                    title: '鎺ュ彛璇锋眰澶辫触',
+                                    icon: 'none'
+                                })
+                            },
+                        });
+                    }
+                } else {
+                    var sBarCode = this.hform.HBarCode
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+                    uni.request({
+                        url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+                        data: {
+                            sBarCode: sBarCode,
+                            HInterID: this.hform.HInterID,
+                            HBillType: this.hform.HBillType,
+                            HBillNo: this.hform.HBillNo,
+                            HMaker: this.hform.HMaker,
+                            HWhID: sHWHID,
+                            HSPID: sHSPID,
+                            HQty: sHQty,
+                            HRedBlueFlag: this.hform.HRedBlueFlag,
+                            SourceFlag: HSourceFlag,
+                            HSourceBillNo: sSourceBillNo,
+                            HSourceBillType: sSourceBillType,
+                            HStockOrgID: this.hform.HStockOrgID,
+                            HScanStyle: "",
+                            HCustom1: "",
+                            HCustom2: ""
+                        },
+                        success: (res) => {
+                            console.log('鎵爜杩斿洖', res.data);
+                            this.hform.HBarCode = ''
+                            if (res.data.count == 1) {
+                                this.playSound(1)
+                                var data = res.data.data
+                                if (data.hBarTypeField == '浠撳簱鏉$爜') {
+                                    this.hform.HWHName = data.hWhNameField
+                                    this.hform.HWHID = data.hWhIDField
+                                    this.hform.HStockPlaceName = ''
+                                    this.hform.HStockPlaceID = 0
+                                    if (data.hSPFlagField == 0) {
+                                        this.showHStockPlaceName = false
+                                    } else {
+                                        this.showHStockPlaceName = true
+                                    }
+                                } else if (data.hBarTypeField == '浠撲綅鏉$爜') {
+                                    this.hform.HWHName = data.hWhNameField
+                                    this.hform.HWHID = data.hWhIDField
+                                    this.hform.HStockPlaceName = data.hSPNameField
+                                    this.hform.HStockPlaceID = data.hSPIDField
+                                } else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
+                                    this.hform.HDeptName = data.hDeptNameField
+                                    this.hform.HDeptID = data.hDeptIDField
+                                    this.tabs = 1
+                                } else if (data.hBarTypeField == '婧愬崟鏉$爜') {
+                                    this.hform.HSupName = data.hSupNameField
+                                    this.hform.HSupID = data.hSupIDField
                                     this.hform.HSourceFlag = true
-									if (data.hDeptIDField != 0) {
-										this.hform.HDeptID = data.hDeptIDField
-										this.hform.HDeptName = data.hDeptNameField
-									}
-									this.hform.HSourceBillNo = data.hSourceBillNoField
-									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-									this.hform.HMainSourceBillType = data.hSourceBillTypeField
-									if (data.hSourceBillTypeField == "3720") {
-										this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
-										this.hform.HMainSourceBillType = 3720
-										this.showHMainSourceBillType = false
-									} else if (data.hSourceBillTypeField == "3721") {
-										this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
-										this.hform.HMainSourceBillType = 3721
-										this.showHMainSourceBillType = false
-									} else if (data.hSourceBillTypeField == "1214") {
-										this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
-										this.hform.HMainSourceBillType = 1214
-										this.showHMainSourceBillType = false
-									} else if (data.hSourceBillTypeField == "3720") {
-										this.HMainSourceBillType = '鐢熶骇璁㈠崟'
-										this.hform.HMainSourceBillType = 3720
-										this.showHMainSourceBillType = false
-									} else {
-										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-										this.hform.HMainSourceBillType = -1
-										this.showHMainSourceBillType = false
-									}
-									if (data.hMulSourceFlagField == 0) {
-										this.showHSourceBillNo = false
-									}
-									//瀹㈡埛涓嶅彲缂栬緫
-									this.showHSupName = false
-									this.tabs = 2
-								} else { //鐗╂枡鏉$爜
-									this.tabs = 2
-									if (!this.hform.HSourceBillNo) {
-										this.hform.HSupName = data.hSupNameField
-										this.hform.HSupID = data.hSupIDField
-										this.hform.HSourceBillNo = data.hSourceBillNoField
-										if (data.hDeptIDField != 0) {
-											this.hform.HDeptID = data.hDeptIDField
-											this.hform.HDeptName = data.hDeptNameField
-										}
-										console.log(data)
-										//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-										this.hform.HMainSourceBillType = data.hSourceBillTypeField
-									
-										let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
-											.hSourceBillTypeField)
-										if (index != -1) {
-											this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-											this.hform.HMainSourceBillType = data.hSourceBillTypeField
-											this.showHMainSourceBillType = false
-										}
-										// if (data.hSourceBillTypeField == "1103") {
-										// 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-										// 	this.hform.HMainSourceBillType = 1103
-										// 	this.showHMainSourceBillType = false
-										// } else if (data.hSourceBillTypeField == "1102") {
-										// 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-										// 	this.hform.HMainSourceBillType = 1102
-										// 	this.showHMainSourceBillType = false
-										// } else {
-										// 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-										// 	this.hform.HMainSourceBillType = -1
-										// 	this.showHMainSourceBillType = false
-										// }
-										if (data.hMulSourceFlagField == 0) {
-											this.showHSourceBillNo = false
-										}
-										//渚涘簲鍟嗕笉鍙紪杈�
-										this.showHSupName = false
-									}
-								}
-								//鏄剧ず琛ㄤ綋鏄庣粏
-								this.DisBillEntryList()
-								//娓呯┖鏁伴噺
-								this.hform.HQty = ''
-								this.refreshBarCodeState()
-							} else {
-								this.playSound(0)
-								this.refreshBarCodeState()
-								uni.showToast({
-									title: res.data.Message,
-									icon: 'none'
-								})
-							}
-						},
-						fail: (res) => {
-							this.playSound(0)
-							this.refreshBarCodeState()
-							console.log(res);
-							uni.showToast({
-								title: '鎺ュ彛璇锋眰澶辫触',
-								icon: 'none'
-							})
-						},
-					});
-				}
-			},
-			//鐗╂枡淇℃伅
-			DisBillEntryList() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
-					data: {
-						HInterID: this.hform.HInterID,
-						HBillNo: this.hform.HBillNo,
-						HBillType: this.hform.HBillType,
-						HStockOrgID: this.hform.HStockOrgID
-					},
-					success: (res) => {
-						console.log('鐗╂枡', res.data)
-						if (res.data.count == 1) {
-							var data = res.data.data
-							this.Materlist = data.Materlist
-							if (data.FIFOlist.length != 0) {
-								if (data.FIFOlist[0].HMaterID != 0) {
-									this.FIFOlist = data.FIFOlist
-								}
-							}
-							if (!data.BarCodeDetailslist[0].HBarCode) {
-								this.hform.HMaterName_B = ''
-								this.hform.HMaterModel_B = ''
-								this.hform.HBatchNo_B = ''
-								this.hform.HUnitName_B = ''
-								this.hform.HQty_B = ''
-								this.hform.HTMQty_B = ''
-								this.hform.HWHName_B = ''
-								this.hform.HSPName_B = ''
-							} else {
-								this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
-								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
-								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
-								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
-								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
-								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
-								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
-								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
-								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
-							}
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//鍒犻櫎鐗╂枡鐮�
-			delMater(item) {
-				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-					success: (res) => {
-						if (res.confirm) {
-							uni.request({
-								url: this.serverUrl +
-									'/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
-								data: {
-									HInterID: this.hform.HInterID,
-									HMaterID: item.HMaterID,
-									HAuxPropID: item.HAuxPropID,
-									HMTONo: item.HMTONo,
-									HSourceInterID: item.HSourceInterID,
-									HSourceEntryID: item.HSourceEntryID,
-									HBillType: this.hform.HBillType
-								},
-								success: (res) => {
-									if (res.data.count == 1) {
-										this.DisBillEntryList()
-									} else {
-										uni.showToast({
-											title: res.data.Message,
-											icon: 'none'
-										})
-									}
-								},
-								fail: (res) => {
-									console.log(res);
-									uni.showToast({
-										title: '鎺ュ彛璇锋眰澶辫触',
-										icon: 'none'
-									})
-								},
-							});
-						}
-					}
-				});
-			},
-			//鏂板
-			getNewData() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json',
-					data: {
-						HBillType: this.hform.HBillType
-					},
-					success: (res) => {
-						// console.log(res.data)
-						if (res.data.count == 1) {
-							this.hform.HInterID = res.data.data[0].HInterID
-							this.hform.HBillNo = res.data.data[0].HBillNo
+                                    if (data.hDeptIDField != 0) {
+                                        this.hform.HDeptID = data.hDeptIDField
+                                        this.hform.HDeptName = data.hDeptNameField
+                                    }
+                                    this.hform.HSourceBillNo = data.hSourceBillNoField
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                    this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                    if (data.hSourceBillTypeField == "3720") {
+                                        this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
+                                        this.hform.HMainSourceBillType = 3720
+                                        this.showHMainSourceBillType = false
+                                    } else if (data.hSourceBillTypeField == "3721") {
+                                        this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+                                        this.hform.HMainSourceBillType = 3721
+                                        this.showHMainSourceBillType = false
+                                    } else if (data.hSourceBillTypeField == "1214") {
+                                        this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+                                        this.hform.HMainSourceBillType = 1214
+                                        this.showHMainSourceBillType = false
+                                    } else if (data.hSourceBillTypeField == "3720") {
+                                        this.HMainSourceBillType = '鐢熶骇璁㈠崟'
+                                        this.hform.HMainSourceBillType = 3720
+                                        this.showHMainSourceBillType = false
+                                    } else {
+                                        this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                        this.hform.HMainSourceBillType = -1
+                                        this.showHMainSourceBillType = false
+                                    }
+                                    if (data.hMulSourceFlagField == 0) {
+                                        this.showHSourceBillNo = false
+                                    }
+                                    //瀹㈡埛涓嶅彲缂栬緫
+                                    this.showHSupName = false
+                                    this.tabs = 2
+                                } else { //鐗╂枡鏉$爜
+                                    this.tabs = 2
+                                    if (!this.hform.HSourceBillNo) {
+                                        this.hform.HSupName = data.hSupNameField
+                                        this.hform.HSupID = data.hSupIDField
+                                        this.hform.HSourceBillNo = data.hSourceBillNoField
+                                        if (data.hDeptIDField != 0) {
+                                            this.hform.HDeptID = data.hDeptIDField
+                                            this.hform.HDeptName = data.hDeptNameField
+                                        }
+                                        console.log(data)
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
+
+                                        let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                            .hSourceBillTypeField)
+                                        if (index != -1) {
+                                            this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                            this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                            this.showHMainSourceBillType = false
+                                        }
+                                        // if (data.hSourceBillTypeField == "1103") {
+                                        // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+                                        // 	this.hform.HMainSourceBillType = 1103
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else if (data.hSourceBillTypeField == "1102") {
+                                        // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
+                                        // 	this.hform.HMainSourceBillType = 1102
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else {
+                                        // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                        // 	this.hform.HMainSourceBillType = -1
+                                        // 	this.showHMainSourceBillType = false
+                                        // }
+                                        if (data.hMulSourceFlagField == 0) {
+                                            this.showHSourceBillNo = false
+                                        }
+                                        //渚涘簲鍟嗕笉鍙紪杈�
+                                        this.showHSupName = false
+                                    }
+                                }
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                this.DisBillEntryList()
+                                //娓呯┖鏁伴噺
+                                this.hform.HQty = ''
+                                this.refreshBarCodeState()
+                            } else {
+                                this.playSound(0)
+                                this.refreshBarCodeState()
+                                uni.showToast({
+                                    title: res.data.Message,
+                                    icon: 'none'
+                                })
+                            }
+                        },
+                        fail: (res) => {
+                            this.playSound(0)
+                            this.refreshBarCodeState()
+                            console.log(res);
+                            uni.showToast({
+                                title: '鎺ュ彛璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        },
+                    });
+                }
+            },
+            //鐗╂枡淇℃伅
+            DisBillEntryList() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
+                    data: {
+                        HInterID: this.hform.HInterID,
+                        HBillNo: this.hform.HBillNo,
+                        HBillType: this.hform.HBillType,
+                        HStockOrgID: this.hform.HStockOrgID
+                    },
+                    success: (res) => {
+                        console.log('鐗╂枡', res.data)
+                        if (res.data.count == 1) {
+                            var data = res.data.data
+                            this.Materlist = data.Materlist
+                            if (data.FIFOlist.length != 0) {
+                                if (data.FIFOlist[0].HMaterID != 0) {
+                                    this.FIFOlist = data.FIFOlist
+                                }
+                            }
+                            if (!data.BarCodeDetailslist[0].HBarCode) {
+                                this.hform.HMaterName_B = ''
+                                this.hform.HMaterModel_B = ''
+                                this.hform.HBatchNo_B = ''
+                                this.hform.HUnitName_B = ''
+                                this.hform.HQty_B = ''
+                                this.hform.HTMQty_B = ''
+                                this.hform.HWHName_B = ''
+                                this.hform.HSPName_B = ''
+                            } else {
+                                this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
+                                this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+                                this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+                                this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+                                this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+                                this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+                                this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+                                this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+                                this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+                            }
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //鍒犻櫎鐗╂枡鐮�
+            delMater(item) {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
+                                data: {
+                                    HInterID: this.hform.HInterID,
+                                    HMaterID: item.HMaterID,
+                                    HAuxPropID: item.HAuxPropID,
+                                    HMTONo: item.HMTONo,
+                                    HSourceInterID: item.HSourceInterID,
+                                    HSourceEntryID: item.HSourceEntryID,
+                                    HBillType: this.hform.HBillType
+                                },
+                                success: (res) => {
+                                    if (res.data.count == 1) {
+                                        this.DisBillEntryList()
+                                    } else {
+                                        uni.showToast({
+                                            title: res.data.Message,
+                                            icon: 'none'
+                                        })
+                                    }
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        }
+                    }
+                });
+            },
+            //鏂板
+            getNewData() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json',
+                    data: {
+                        HBillType: this.hform.HBillType
+                    },
+                    success: (res) => {
+                        // console.log(res.data)
+                        if (res.data.count == 1) {
+                            this.hform.HInterID = res.data.data[0].HInterID
+                            this.hform.HBillNo = res.data.data[0].HBillNo
                             this.hform.HSourceFlag = false
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//淇敼鍥炲~鏁版嵁
-			RoadBillMain(HInterID) {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
-					data: {
-						HInterID: HInterID,
-						HBillType: this.hform.HBillType
-					},
-					success: (res) => {
-						console.log(33, res.data.data[0]);
-						if (res.data.count == 1) {
-							var data = res.data.data[0]
-							this.hform.HInterID = data.HInterID
-							this.hform.HBillNo = data.HBillNo
-							this.hform.HMainSourceBillType = data.HSourceBillType
-							this.hform.HSourceBillNo = data.HSourceBillNo
-							if (data.HSourceBillType == 3720) {
-								this.hform.HMainSourceBillType = 3720
-								this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
-								this.showHSupName = false
-							} else if (data.HSourceBillType == 3721) {
-								this.hform.HMainSourceBillType = 3721
-								this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
-								this.showHSupName = false
-							} else if (data.HSourceBillType == 1214) {
-								this.hform.HMainSourceBillType = 1214
-								this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
-								this.showHSupName = false
-							} else if (data.HSourceBillType == 3710) {
-								this.hform.HMainSourceBillType = 3710
-								this.HMainSourceBillType = '鐢熶骇璁㈠崟'
-								this.showHSupName = false
-							} else {
-								this.hform.HMainSourceBillType = -1
-								this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-							}
-							this.showHMainSourceBillType = false
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //淇敼鍥炲~鏁版嵁
+            RoadBillMain(HInterID) {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
+                    data: {
+                        HInterID: HInterID,
+                        HBillType: this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(33, res.data.data[0]);
+                        if (res.data.count == 1) {
+                            var data = res.data.data[0]
+                            this.hform.HInterID = data.HInterID
+                            this.hform.HBillNo = data.HBillNo
+                            this.hform.HMainSourceBillType = data.HSourceBillType
+                            this.hform.HSourceBillNo = data.HSourceBillNo
+                            if (data.HSourceBillType == 3720) {
+                                this.hform.HMainSourceBillType = 3720
+                                this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
+                                this.showHSupName = false
+                            } else if (data.HSourceBillType == 3721) {
+                                this.hform.HMainSourceBillType = 3721
+                                this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+                                this.showHSupName = false
+                            } else if (data.HSourceBillType == 1214) {
+                                this.hform.HMainSourceBillType = 1214
+                                this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+                                this.showHSupName = false
+                            } else if (data.HSourceBillType == 3710) {
+                                this.hform.HMainSourceBillType = 3710
+                                this.HMainSourceBillType = '鐢熶骇璁㈠崟'
+                                this.showHSupName = false
+                            } else {
+                                this.hform.HMainSourceBillType = -1
+                                this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                            }
+                            this.showHMainSourceBillType = false
 
-							//闈炲婧愬崟妯″紡
-							if (data.HMulSourceBill == 0) {
-								this.showHSourceBillNo = false
-							}
-							this.hform.HDeptID = data.HDeptID
-							this.hform.HDeptName = data.HDeptName
-							this.hform.HSupID = data.HCusID
-							this.hform.HSupName = data.HCusName || ''
-							this.DisBillEntryList()
-							this.tabs = 2
-						} else {
-							uni.showToast({
-								title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			addNew() {
-				uni.redirectTo({
-					url: '/pages/shengchanlingliaoshengdan/form?OperationType=1'
-				})
-			},
-			submit() {
-				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
-				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
-				}
-				if (!this.hform.HKeeperName) {
-					this.hform.HKeeperID = 0
-				}
-				if (!this.hform.HSecManagerName) {
-					this.hform.HSecManagerID = 0
-				}
-				if (!this.hform.HDeptName) {
-					this.hform.HDeptID = 0
-				}
-				if (!this.hform.HSupName) {
-					this.hform.HSupID = 0
-				}
-				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
-					uni.showToast({
-						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
-						icon: 'none'
-					})
-				} else if (!this.hform.HBillNo) {
-					uni.showToast({
-						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
-						icon: 'none'
-					})
-				} else if (!this.Materlist || this.Materlist.length == 0) {
-					uni.showToast({
-						title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-						icon: 'none'
-					})
-				} else {
-					var s = 0;
-					for (var i = 0; i < this.Materlist.length; i++) {
-						if (this.Materlist[i].鏁伴噺 > 0) {
-							s = 1;
-						}
-					}
-					if (s == 0) {
-						uni.showToast({
-							title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-							icon: 'none'
-						})
-					} else {
-						uni.showLoading({
-							title: '璇风◢鍊�'
-						})
-						var sMainStr = JSON.stringify(this.hform);
-						uni.request({
-							url: this.serverUrl + '/WEBSController/set_SaveMateOutBill_Json',
-							method: 'POST',
-							dataType: "json",
-							data: {
-								oMain: sMainStr
-							},
-							success: (res) => {
-								console.log(1, res);
-								uni.hideLoading()
-								if (res.data.count == 1) {
-									uni.showModal({
-										title: '鎻愮ず',
-										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-										success: (res) => {
-											if (res.confirm) {
-												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-												uni.redirectTo({
-													url: '/pages/shengchanlingliaoshengdan/form?OperationType=1'
-												})
-											} else if (res.cancel) {
-												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-												// setTimeout(() => {
-												// 	uni.navigateBack();
-												// }, 500)
-											}
-										}
-									});
-								} else {
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									icon: 'none'
-								})
-							},
-						});
-					}
-				}
-			},
+                            //闈炲婧愬崟妯″紡
+                            if (data.HMulSourceBill == 0) {
+                                this.showHSourceBillNo = false
+                            }
+                            this.hform.HDeptID = data.HDeptID
+                            this.hform.HDeptName = data.HDeptName
+                            this.hform.HSupID = data.HCusID
+                            this.hform.HSupName = data.HCusName || ''
+                            this.DisBillEntryList()
+                            this.tabs = 2
+                        } else {
+                            uni.showToast({
+                                title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: '/pages/shengchanlingliaoshengdan/form?OperationType=1'
+                })
+            },
+            submit() {
+                //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HWHName) {
+                    this.hform.HWHID = 0
+                }
+                if (!this.hform.HStockPlaceName) {
+                    this.hform.HStockPlaceID = 0
+                }
+                if (!this.hform.HKeeperName) {
+                    this.hform.HKeeperID = 0
+                }
+                if (!this.hform.HSecManagerName) {
+                    this.hform.HSecManagerID = 0
+                }
+                if (!this.hform.HDeptName) {
+                    this.hform.HDeptID = 0
+                }
+                if (!this.hform.HSupName) {
+                    this.hform.HSupID = 0
+                }
+                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+                    uni.showToast({
+                        title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+                        icon: 'none'
+                    })
+                } else if (!this.hform.HBillNo) {
+                    uni.showToast({
+                        title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+                        icon: 'none'
+                    })
+                } else if (!this.Materlist || this.Materlist.length == 0) {
+                    uni.showToast({
+                        title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+                        icon: 'none'
+                    })
+                } else {
+                    var s = 0;
+                    for (var i = 0; i < this.Materlist.length; i++) {
+                        if (this.Materlist[i].鏁伴噺 > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        uni.showToast({
+                            title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+                            icon: 'none'
+                        })
+                    } else {
+                        uni.showLoading({
+                            title: '璇风◢鍊�'
+                        })
+                        var sMainStr = JSON.stringify(this.hform);
+                        uni.request({
+                            url: this.serverUrl + '/WEBSController/set_SaveMateOutBill_Json',
+                            method: 'POST',
+                            dataType: "json",
+                            data: {
+                                oMain: sMainStr
+                            },
+                            success: (res) => {
+                                console.log(1, res);
+                                uni.hideLoading()
+                                if (res.data.count == 1) {
+                                    uni.showModal({
+                                        title: '鎻愮ず',
+                                        content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                                        success: (res) => {
+                                            if (res.confirm) {
+                                                console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                                uni.redirectTo({
+                                                    url: '/pages/shengchanlingliaoshengdan/form?OperationType=1'
+                                                })
+                                            } else if (res.cancel) {
+                                                console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                                // setTimeout(() => {
+                                                // 	uni.navigateBack();
+                                                // }, 500)
+                                            }
+                                        }
+                                    });
+                                } else {
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                }
+                            },
+                            fail: (res) => {
+                                console.log(res);
+                                uni.showToast({
+                                    title: '鎺ュ彛璇锋眰澶辫触',
+                                    icon: 'none'
+                                })
+                            },
+                        });
+                    }
+                }
+            },
 
-			goBack() {
-				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
-					success: (res) => {
-						if (res.confirm) {
-							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							uni.navigateBack({
-								url: '/pages/shengchanlingliaoshengdan/table'
-							})
-						} else if (res.cancel) {
-							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-						}
-					}
-				});
-			}
-		}
-	}
+            goBack() {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.navigateBack({
+                                url: '/pages/shengchanlingliaoshengdan/table'
+                            })
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            }
+        }
+    }
 </script>
 
 <style lang="scss" scoped>
-	.form {
-		width: 668rpx;
-		margin: 20rpx auto;
-		padding-bottom: 240rpx;
-	}
+    .form {
+        width: 668rpx;
+        margin: 20rpx auto;
+        padding-bottom: 240rpx;
+    }
 
-	.tab_area {
-		width: 100%;
-		height: 50rpx;
-	}
+    .tab_area {
+        width: 100%;
+        height: 50rpx;
+    }
 
-	.other {
-		margin-top: 8rpx;
-		text-align: center;
-		font-size: 28rpx;
-		padding: 4rpx 18rpx;
-		color: #1890FF;
-	}
+    .other {
+        margin-top: 8rpx;
+        text-align: center;
+        font-size: 28rpx;
+        padding: 4rpx 18rpx;
+        color: #1890FF;
+    }
 
-	.tabs {
-		width: 100%;
-		display: flex;
-		border-bottom: 1px solid #ddd;
-		margin: 20rpx 0;
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
 
-		view {
-			width: 25%;
-			font-size: 30rpx;
-			color: #555;
-			text-align: center;
-			padding: 16rpx 0;
-		}
+        view {
+            width: 25%;
+            font-size: 30rpx;
+            color: #555;
+            text-align: center;
+            padding: 16rpx 0;
+        }
 
-		.on {
-			color: #3a78ff;
-			font-weight: bold;
-			border-bottom: 3px solid #3a78ff;
-		}
-	}
+        .on {
+            color: #3a78ff;
+            font-weight: bold;
+            border-bottom: 3px solid #3a78ff;
+        }
+    }
 
-	.form-item {
-		display: flex;
-		align-items: center;
-		font-size: 30rpx;
-		padding: 6rpx 0;
-		gap: 12rpx;
+    .form-item {
+        display: flex;
+        align-items: center;
+        font-size: 30rpx;
+        padding: 6rpx 0;
+        gap: 12rpx;
 
-		.title {
-			width: 208rpx;
-            flex-shrink: 0;
-			text {
-				color: red;
-				font-weight: bold;
-			}
-		}
-
-		.right {
-			// width: 450rpx;
-			flex: 1;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-			position: relative;
-			display: flex;
-			
-			picker {
-				width: 100%;
-			}
-
-			.uni-combox {
-				width: 100%;
-			}
-		}
-
-		.righton {
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
-
-		input {
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-
-		textarea {
-			width: 98%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
-
-		.icon-wrapper {
-			background-color: #3A78FF;
-			border-radius: 100%;
-			width: 52rpx;
-			height: 52rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
+        .title {
+            width: 208rpx;
             flex-shrink: 0;
 
-			.uni-icons {
-				color: #fff !important;
-			}
-		}
+            text {
+                color: red;
+                font-weight: bold;
+            }
+        }
 
-		.icon-wrapper[disabled] {
-			background-color: rgba(228, 228, 228, 1);
-			pointer-events: none;
-			touch-action: none;
-		}
-	}
+        .right {
+            // width: 450rpx;
+            flex: 1;
+            border-radius: 22rpx;
+            border: 1px solid #acacac;
+            position: relative;
+            display: flex;
 
-	.bottom-btn {
-		width: 100%;
-		box-sizing: border-box;
-		// height: 120rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #fff;
-		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-		padding: 30rpx 40rpx 40rpx 40rpx;
-		display: flex;
-		flex-direction: row;
-		gap: 10rpx;
+            picker {
+                width: 100%;
+            }
 
-		button {
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-		}
+            .uni-combox {
+                width: 100%;
+            }
+        }
 
-		.btn-a {
-			background-color: #3A78FF;
-			color: #fff;
-		}
+        .righton {
+            width: 450rpx;
+            border-radius: 22rpx;
+            border: 1px solid #e4e4e4;
+            background-color: #e4e4e4;
+        }
 
-		.btn-b {
-			background-color: #41a863;
-			color: #fff;
-		}
+        input {
+            width: 100%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
 
-		.btn-c {
-			background-color: #acacac;
-			color: #fff;
-			// position: absolute;
-			// right: 120rpx;
-		}
+        textarea {
+            width: 98%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
 
-		.btn-d {
-			background-color: #ff8901;
-			color: #fff;
-		}
-	}
+        .icon-wrapper {
+            background-color: #3A78FF;
+            border-radius: 100%;
+            width: 52rpx;
+            height: 52rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-shrink: 0;
 
-	.list {
-		width: 100%;
+            .uni-icons {
+                color: #fff !important;
+            }
+        }
 
-		.card-detail {
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
+        .icon-wrapper[disabled] {
+            background-color: rgba(228, 228, 228, 1);
+            pointer-events: none;
+            touch-action: none;
+        }
+    }
 
-			.detail {
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
+    .bottom-btn {
+        width: 100%;
+        box-sizing: border-box;
+        // height: 120rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 30rpx 40rpx 40rpx 40rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
 
-				text {
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
 
-		.more {
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
 
-			.part {
-				width: 50%;
-				text-align: center;
-			}
-		}
-	}
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+            // position: absolute;
+            // right: 120rpx;
+        }
+
+        .btn-d {
+            background-color: #ff8901;
+            color: #fff;
+        }
+    }
+
+    .list {
+        width: 100%;
+
+        .card-detail {
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            line-height: 120%;
+
+            .detail {
+                // width: 50%;
+                font-size: 26rpx;
+                margin-bottom: 12rpx;
+                color: #555;
+                margin-right: 20rpx;
+
+                text {
+                    color: #999;
+                    font-size: 26rpx;
+                }
+            }
+        }
+
+        .more {
+            color: #888;
+            font-size: 24rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                text-align: center;
+            }
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/pages/shengchanrukushengdan/form.vue b/pages/shengchanrukushengdan/form.vue
index a741bf2..d545c34 100644
--- a/pages/shengchanrukushengdan/form.vue
+++ b/pages/shengchanrukushengdan/form.vue
@@ -27,7 +27,7 @@
             <view class="form-item">
                 <view class="title">浠撲綅:</view>
                 <view class="right" v-show="showHStockPlaceName">
-                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
                         v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                         @confirm="HStockPlaceNameScan"></uni-combox>
                 </view>
@@ -282,10 +282,10 @@
                 <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
             </view>
         </view>
-        <BillSelectPopupXiaoWeiVue v-if="enableModule == 1" ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
-            :HStockOrgID="hform.HStockOrgID"></BillSelectPopupXiaoWeiVue>
-        <BillListPopupVue v-else-if="enableModule == 2" ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
-            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+        <BillSelectPopupXiaoWeiVue v-if="enableModule == 1" ref="billList" :HBillType="hform.HBillType"
+            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"></BillSelectPopupXiaoWeiVue>
+        <BillListPopupVue v-else-if="enableModule == 2" ref="billList" :HBillType="hform.HBillType"
+            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
         <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
     </view>
 </template>
@@ -398,18 +398,26 @@
         computed: {
             enableModule: {
                 get() {
-                    if (this.hform.HMainSourceBillType == 3710 && 
-                      /灏忓崼|鏅轰簯/.test(uni.getStorageSync('Organization')) 
+                    if (this.hform.HMainSourceBillType == 3710 &&
+                        /灏忓崼|鏅轰簯/.test(uni.getStorageSync('Organization'))
                     ) {
-                        
+
                         return 1
                     } else {
                         return 2
                     }
                 }
-        
+
                 // 鍏朵粬鏉′欢
             },
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                        .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                        .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
         },
         onLoad(e) {
             console.log(e, this.userInfo)
@@ -799,12 +807,22 @@
             },
             //閫夋嫨浠撲綅
             HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
-                    }
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
                 }
+
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                //     if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                //         this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                //         this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                //     }
+                // }
             },
             //閫夋嫨婧愬崟
             HSourceBillNoChange(e) {
@@ -1216,7 +1234,7 @@
                                 this.DisBillEntryList()
                                 //娓呯┖鏁伴噺
                                 this.hform.HQty = ''
-								this.refreshBarCodeState()
+                                this.refreshBarCodeState()
                             } else {
                                 this.playSound(0)
                                 this.refreshBarCodeState()
diff --git a/pages/shengchantuiliao/form.vue b/pages/shengchantuiliao/form.vue
index 409ff74..69b0767 100644
--- a/pages/shengchantuiliao/form.vue
+++ b/pages/shengchantuiliao/form.vue
@@ -27,7 +27,7 @@
             <view class="form-item">
                 <view class="title">浠撲綅:</view>
                 <view class="right" v-show="showHStockPlaceName">
-                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
                         v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                         @confirm="HStockPlaceNameScan"></uni-combox>
                 </view>
@@ -410,6 +410,14 @@
 
                 // 鍏朵粬鏉′欢
             },
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                        .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                        .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
         },
         onLoad(e) {
             console.log(e, this.userInfo)
@@ -799,12 +807,21 @@
             },
             //閫夋嫨浠撲綅
             HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
-                    }
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
                 }
+
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                //     if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                //         this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                //         this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                //     }
+                // }
             },
             //閫夋嫨婧愬崟
             HSourceBillNoChange(e) {
diff --git a/pages/weiwailingliao/form.vue b/pages/weiwailingliao/form.vue
index 95940c4..a203fd2 100644
--- a/pages/weiwailingliao/form.vue
+++ b/pages/weiwailingliao/form.vue
@@ -1,425 +1,466 @@
 <template>
-	<view>
-		<view class="form">
-			<view class="form-item">
-				<view class="title">鏉$爜:</view>
-				<view class="right" style="width: 380rpx;">
-					<input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
-						@confirm="getCode(hform.HBarCode)" />
-				</view>
-				<view class="icon-wrapper" @click="toScanCode">
-					<uni-icons type="scan" size="20"></uni-icons>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">鏁伴噺:</view>
-				<view class="right">
-					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撳簱:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
-						@input="HWHNameChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撲綅:</view>
-				<view class="right" v-show="showHStockPlaceName">
-					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
-						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
-				</view>
-				<view class="righton" v-show="!showHStockPlaceName">
-					<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
-				</view>
-			</view>
+    <view>
+        <view class="form">
+            <view class="form-item">
+                <view class="title">鏉$爜:</view>
+                <view class="right" style="width: 380rpx;">
+                    <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+                        @confirm="getCode(hform.HBarCode)" />
+                </view>
+                <view class="icon-wrapper" @click="toScanCode">
+                    <uni-icons type="scan" size="20"></uni-icons>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鏁伴噺:</view>
+                <view class="right">
+                    <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">浠撳簱:</view>
+                <view class="right">
+                    <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+                        @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">浠撲綅:</view>
+                <view class="right" v-show="showHStockPlaceName">
+                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
+                        @confirm='HStockPlaceNameScan'></uni-combox>
+                </view>
+                <view class="righton" v-show="!showHStockPlaceName">
+                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
+                </view>
+            </view>
 
-			<view class="tabs">
-				<view :class="tabs == 0 ? 'on' : ''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
-				<view :class="tabs == 1 ? 'on' : ''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
-				<view :class="tabs == 2 ? 'on' : ''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
-				<view :class="tabs == 3 ? 'on' : ''" @tap="tabs = 3">鏉$爜淇℃伅</view>
-				<view :class="tabs == 4 ? 'on' : ''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
-			</view>
 
-			<view v-if="tabs == 0">
-				<view class="form-item">
-					<view class="title">婧愬崟绫诲瀷:</view>
-					<view class="right" v-show="showHMainSourceBillType">
-						<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
-							@change="HMainSourceBillTypeChange">
-							<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
-								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-							<view class="picker-overlay"></view>
-						</picker>
-					</view>
-					<view class="righton" v-show="!showHMainSourceBillType">
-						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
-							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">婧愬崟鍗曞彿:</view>
-					<view class="right" v-show="showHSourceBillNo">
-						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
+            <view class="tabs">
+                <view :class="tabs == 0 ? 'on' : ''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
+                <view :class="tabs == 1 ? 'on' : ''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
+                <view :class="tabs == 2 ? 'on' : ''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
+                <view :class="tabs == 3 ? 'on' : ''" @tap="tabs = 3">鏉$爜淇℃伅</view>
+                <view :class="tabs == 4 ? 'on' : ''" @tap="tabs = 4">涓嬫灦淇℃伅</view>
+            </view>
+
+            <view v-if="tabs == 0">
+                <view class="form-item">
+                    <view class="title">婧愬崟绫诲瀷:</view>
+                    <view class="right" v-show="showHMainSourceBillType">
+                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
+                            @change="HMainSourceBillTypeChange">
+                            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+                                placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+                            <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" @confirm="getHBarCodeData(hform.HSourceBillNo)" type="text"
-							name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                        <input :focus="HSourceBillNoFocus" @confirm="getHBarCodeData(hform.HSourceBillNo)" type="text"
+                            name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 
-					</view>
-					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
-						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
-					</view>
+                    </view>
+                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+                    </view>
 
-					<view class="righton" v-show="!showHSourceBillNo">
-						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍏堣繘鍏堝嚭浠�:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
-							@input="HFIFOWHNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鏃ユ湡:</view>
-					<view class="right">
-						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
-							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
-							<view class="picker-overlay"></view>
-						</picker>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍒跺崟浜�:</view>
-					<view class="righton">
-						<input name="HMaker" disabled v-model="hform.HMaker" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曟嵁鍙�:</view>
-					<view class="righton">
-						<input name="HBillNo" disabled v-model="hform.HBillNo" />
-					</view>
+                    <view class="righton" v-show="!showHSourceBillNo">
+                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍏堣繘鍏堝嚭浠�:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName"
+                            @input="HFIFOWHNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏃ユ湡:</view>
+                    <view class="right">
+                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+                            <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+                            <view class="picker-overlay"></view>
+                        </picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒跺崟浜�:</view>
+                    <view class="righton">
+                        <input name="HMaker" disabled v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
+                    </view>
                     <view class="icon-wrapper">
                         <uni-icons type="scan" size="20" @click="qrCodeDisplay"></uni-icons>
                     </view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曟嵁ID:</view>
-					<view class="righton">
-						<input name="HInterID" disabled v-model="hform.HInterID" />
-					</view>
-				</view>
-			</view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁ID:</view>
+                    <view class="righton">
+                        <input name="HInterID" disabled v-model="hform.HInterID" />
+                    </view>
+                </view>
+            </view>
 
-			<view v-if="tabs == 1">
-				<view class="form-item">
-					<view class="title">淇濈:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
-							@input="HKeeperNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">楠屾敹:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
-							@input="HSecManagerNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">閮ㄩ棬:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
-							@input="HDeptNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">渚涘簲鍟�:</view>
-					<!-- <view class="right" v-show="showHSupName">
+            <view v-if="tabs == 1">
+                <view class="form-item">
+                    <view class="title">淇濈:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+                            @input="HKeeperNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">楠屾敹:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+                            @input="HSecManagerNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">閮ㄩ棬:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+                            @input="HDeptNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">渚涘簲鍟�:</view>
+                    <!-- <view class="right" v-show="showHSupName">
 						<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName"
 							@input="HSupNameChange"></uni-combox>
 					</view> -->
-					<view class="righton">
-						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">缁勭粐:</view>
-					<view class="righton">
-						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
-					</view>
-				</view>
-			</view>
+                    <view class="righton">
+                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁勭粐:</view>
+                    <view class="righton">
+                        <input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+                    </view>
+                </view>
+            </view>
 
-			<view v-if="tabs == 2">
-				<view class="list" v-for="(item, index) in Materlist" :key="index">
-					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
-						<view class="card-detail">
-							<view class="detail">
-								<text>婧愬崟鍗曞彿锛�</text>{{ item.婧愬崟鍗曞彿 }}
-							</view>
-							<view class="detail">
-								<text>婧愬崟鏁伴噺锛�</text>{{ item.婧愬崟鏁伴噺 }}
-							</view>
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{ item.鏁伴噺 }}
-							</view>
-							<view class="detail" v-if="item.鍚堣鏁伴噺">
-								<text>鍚堣鏁伴噺锛�</text>{{item.鍚堣鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏉$爜涓暟锛�</text>{{ item.鏉$爜涓暟 }}
-							</view>
-							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
-								<text>瑙勬牸鍨嬪彿锛�</text>{{ item.瑙勬牸鍨嬪彿 }}
-							</view>
-							<view class="detail" v-if="item.杈呭姪灞炴��">
-								<text>杈呭姪灞炴�э細</text>{{ item.杈呭姪灞炴�� }}
-							</view>
-							<view class="detail" v-if="item.娆惧彿">
-								<text>娆惧彿锛�</text>{{item.娆惧彿}}
-							</view>
-						</view>
-					</uni-card>
-				</view>
-				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
-			</view>
+            <view v-if="tabs == 2">
+                <view class="list" v-for="(item, index) in Materlist" :key="index">
+                    <uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>婧愬崟鍗曞彿锛�</text>{{ item.婧愬崟鍗曞彿 }}
+                            </view>
+                            <view class="detail">
+                                <text>婧愬崟鏁伴噺锛�</text>{{ item.婧愬崟鏁伴噺 }}
+                            </view>
+                            <view class="detail">
+                                <text>鏁伴噺锛�</text>{{ item.鏁伴噺 }}
+                            </view>
+                            <view class="detail" v-if="item.鍚堣鏁伴噺">
+                                <text>鍚堣鏁伴噺锛�</text>{{item.鍚堣鏁伴噺}}
+                            </view>
+                            <view class="detail">
+                                <text>鏉$爜涓暟锛�</text>{{ item.鏉$爜涓暟 }}
+                            </view>
+                            <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+                                <text>瑙勬牸鍨嬪彿锛�</text>{{ item.瑙勬牸鍨嬪彿 }}
+                            </view>
+                            <view class="detail" v-if="item.杈呭姪灞炴��">
+                                <text>杈呭姪灞炴�э細</text>{{ item.杈呭姪灞炴�� }}
+                            </view>
+                            <view class="detail" v-if="item.娆惧彿">
+                                <text>娆惧彿锛�</text>{{item.娆惧彿}}
+                            </view>
+                        </view>
+                    </uni-card>
+                </view>
+                <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+            </view>
 
-			<view v-if="tabs == 4">
-				<view class="list" v-for="(item, index) in FIFOlist" :key="index">
-					<uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
-						@tap="delMater(item)">
-						<view class="card-detail">
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{ item.HQty }}
-							</view>
-							<view class="detail">
-								<text>涓嬫灦鏁伴噺锛�</text>{{ item.HQtyMust }}
-							</view>
-							<view class="detail">
-								<text>浠撳簱锛�</text>{{ item.HWhName }}
-							</view>
-							<view class="detail">
-								<text>浠撲綅锛�</text>{{ item.HSPName }}
-							</view>
-							<view class="detail">
-								<text>瑙勬牸鍨嬪彿锛�</text>{{ item.HMaterModel }}
-							</view>
-							<view class="detail" v-if="item.HBatchNo">
-								<text>鎵瑰彿锛�</text>{{ item.HBatchNo }}
-							</view>
-							<view class="detail" v-if="item.HAuxPropName">
-								<text>杈呭姪灞炴�э細</text>{{ item.HAuxPropName }}
-							</view>
-						</view>
-					</uni-card>
-				</view>
-				<view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
-			</view>
+            <view v-if="tabs == 4">
+                <view class="list" v-for="(item, index) in FIFOlist" :key="index">
+                    <uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;"
+                        @tap="delMater(item)">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>鏁伴噺锛�</text>{{ item.HQty }}
+                            </view>
+                            <view class="detail">
+                                <text>涓嬫灦鏁伴噺锛�</text>{{ item.HQtyMust }}
+                            </view>
+                            <view class="detail">
+                                <text>浠撳簱锛�</text>{{ item.HWhName }}
+                            </view>
+                            <view class="detail">
+                                <text>浠撲綅锛�</text>{{ item.HSPName }}
+                            </view>
+                            <view class="detail">
+                                <text>瑙勬牸鍨嬪彿锛�</text>{{ item.HMaterModel }}
+                            </view>
+                            <view class="detail" v-if="item.HBatchNo">
+                                <text>鎵瑰彿锛�</text>{{ item.HBatchNo }}
+                            </view>
+                            <view class="detail" v-if="item.HAuxPropName">
+                                <text>杈呭姪灞炴�э細</text>{{ item.HAuxPropName }}
+                            </view>
+                        </view>
+                    </uni-card>
+                </view>
+                <view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+            </view>
 
-			<view v-if="tabs == 3">
-				<view class="form-item">
-					<view class="title">鏉$爜:</view>
-					<view class="righton">
-						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鐗╂枡:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HMaterName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瑙勬牸:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HMaterModel_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鎵规:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HBatchNo_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曚綅:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HUnitName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鏁伴噺:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HQty_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹归噺:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HTMQty_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">浠撳簱:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HWHName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">浠撲綅:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HSPName_B" />
-					</view>
-				</view>
-			</view>
+            <view v-if="tabs == 3">
+                <view class="form-item">
+                    <view class="title">鏉$爜:</view>
+                    <view class="righton">
+                        <input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鐗╂枡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HMaterName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瑙勬牸:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HMaterModel_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鎵规:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBatchNo_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曚綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HUnitName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏁伴噺:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HQty_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹归噺:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HTMQty_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浠撳簱:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HWHName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浠撲綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HSPName_B" />
+                    </view>
+                </view>
+            </view>
 
-			<view class="bottom-btn">
-				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-				<view style="flex: 1;">
-				</view>
+            <view class="bottom-btn">
+                <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+                <view style="flex: 1;">
+                </view>
 
-				<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-			</view>
-		</view>
-		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
-			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+                <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+                <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+            </view>
+        </view>
+        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
         <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
     </view>
 </template>
 <script>
-	import getDateTime from '@/utils/getdateTime.js';
-	import {
-		getUserInfo
-	} from "@/utils/auth.js";
-	import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
-	import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
-    import { getUserStockRelation } from '../../utils/userRelationManager';
-	export default {
-		data() {
-			return {
-				userInfo: getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				HModName: 'Kf_EntrustOutBillList_PDA',
-				ModRightName: 'CE_EntrustOut',
-				OperationType: 1,
-				HInterID_Temp: '',
+    import getDateTime from '@/utils/getdateTime.js';
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    import {
+        getUserStockRelation
+    } from '../../utils/userRelationManager';
+    export default {
+        data() {
+            return {
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                HModName: 'Kf_EntrustOutBillList_PDA',
+                ModRightName: 'CE_EntrustOut',
+                OperationType: 1,
+                HInterID_Temp: '',
 
-				showHStockPlaceName: false,
-				showHMainSourceBillType: true,
-				showHSourceBillNo: true,
-				reHSourceBillNo: true,
-				showHSupName: true,
-				barCodeFocus: false,
-				HSourceBillNoFocus: false,
+                showHStockPlaceName: false,
+                showHMainSourceBillType: true,
+                showHSourceBillNo: true,
+                reHSourceBillNo: true,
+                showHSupName: true,
+                barCodeFocus: false,
+                HSourceBillNoFocus: false,
 
-				tabs: 0,
-				HMainSourceBillType: '濮斿鐢ㄦ枡娓呭崟',
-				arrayHMainSourceBillType: ['濮斿鐢ㄦ枡娓呭崟', '鎵嬪伐褰曞叆'],
-				arrayHMainSourceBillValue: [1604, -1],
+                tabs: 0,
+                HMainSourceBillType: '濮斿鐢ㄦ枡娓呭崟',
+                arrayHMainSourceBillType: ['濮斿鐢ㄦ枡娓呭崟', '鎵嬪伐褰曞叆'],
+                arrayHMainSourceBillValue: [1604, -1],
 
-				linterid: '',
-				HBillNo: '',
-				btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
-				showmore: false,
+                linterid: '',
+                HBillNo: '',
+                btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+                showmore: false,
 
-				arrayHWHName: [], //浠撳簱
-				HWHNameList: [],
-				arrayHStockPlaceName: [], //浠撲綅
-				HStockPlaceNameList: [],
-				arrayHSourceBillNo: [], //婧愬崟鍗曞彿
-				HSourceBillNoList: [],
+                arrayHWHName: [], //浠撳簱
+                HWHNameList: [],
+                arrayHStockPlaceName: [], //浠撲綅
+                HStockPlaceNameList: [],
+                arrayHSourceBillNo: [], //婧愬崟鍗曞彿
+                HSourceBillNoList: [],
 
-				arrayHEmpName: [], //鎿嶄綔鍛�
-				HEmpNameList: [],
-				arrayHDeptName: [], //閮ㄩ棬
-				HDeptNameList: [],
-				arrayHSupName: [], //瀹㈡埛
-				HSupNameList: [],
+                arrayHEmpName: [], //鎿嶄綔鍛�
+                HEmpNameList: [],
+                arrayHDeptName: [], //閮ㄩ棬
+                HDeptNameList: [],
+                arrayHSupName: [], //瀹㈡埛
+                HSupNameList: [],
 
-				Materlist: [],
-				FIFOlist: [],
-				hform: {
-					HBillType: 1211,
-					HBillerID: uni.getStorageSync('HBillerID'),
-					HRedBlueFlag: false,
+                Materlist: [],
+                FIFOlist: [],
+                hform: {
+                    HBillType: 1211,
+                    HBillerID: uni.getStorageSync('HBillerID'),
+                    HRedBlueFlag: false,
 
-					HBarCode: '',
-					HQty: '',
-					HWHName: getUserInfo().HWHName,
-					HWHID: getUserInfo().HWhID,
-					HStockPlaceName: getUserInfo().HSPName,
-					HStockPlaceID: getUserInfo().HSPID,
+                    HBarCode: '',
+                    HQty: '',
+                    HWHName: getUserInfo().HWHName,
+                    HWHID: getUserInfo().HWhID,
+                    HStockPlaceName: getUserInfo().HSPName,
+                    HStockPlaceID: getUserInfo().HSPID,
 
-					HMainSourceBillType: 1604,
-					HSourceBillNo: '', //CGDD000200
-					HFIFOWHName: '',
-					HFIFOWHID: '',
-					HDate: getDateTime.dateTimeStr('y-m-d'),
-					HMaker: uni.getStorageSync('HUserName'),
-					HBillNo: '',
-					HInterID: '',
+                    HMainSourceBillType: 1604,
+                    HSourceBillNo: '', //CGDD000200
+                    HFIFOWHName: '',
+                    HFIFOWHID: '',
+                    HDate: getDateTime.dateTimeStr('y-m-d'),
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HBillNo: '',
+                    HInterID: '',
 
-					HKeeperName: getUserInfo().HKeeper,
-					HKeeperID: getUserInfo().HKeeperID,
-					HSecManagerName: getUserInfo().HSecManager,
-					HSecManagerID: getUserInfo().HSecManagerID,
-					HDeptName: getUserInfo().HDept,
-					HDeptID: getUserInfo().HDeptID,
-					HSupName: '',
-					HSupID: '',
-					HStockOrgName: uni.getStorageSync('Organization'),
-					HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    HKeeperName: getUserInfo().HKeeper,
+                    HKeeperID: getUserInfo().HKeeperID,
+                    HSecManagerName: getUserInfo().HSecManager,
+                    HSecManagerID: getUserInfo().HSecManagerID,
+                    HDeptName: getUserInfo().HDept,
+                    HDeptID: getUserInfo().HDeptID,
+                    HSupName: '',
+                    HSupID: '',
+                    HStockOrgName: uni.getStorageSync('Organization'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
 
-					HBarCode_B: '',
-					HMaterName_B: '',
-					HMaterModel_B: '',
-					HBatchNo_B: '',
-					HUnitName_B: '',
-					HQty_B: '',
-					HTMQty_B: '',
-					HWHName_B: '',
-					HSPName_B: '',
-				}
-			}
-		},
-		components: {
-			BillListPopupVue, BarCodePopupVue
-		},
-		onLoad(e) {
-			console.log(e, this.userInfo)
-			this.OperationType = e.OperationType
-			if (e.HInterID) {
-				this.HInterID_Temp = e.HInterID
-				// this.btnType = 1
-				this.RoadBillMain(e.HInterID)
-				this.barCodeFocus = true
-			} else {
-				this.getNewData()
-				this.HSourceBillNoFocus = true;
-			}
-			// this.getHBaseList()
-			this.getHSupList()
-			this.getHEmpList()
-			this.getHDeptList()
-			
-			this.getRelationStore()
+                    HBarCode_B: '',
+                    HMaterName_B: '',
+                    HMaterModel_B: '',
+                    HBatchNo_B: '',
+                    HUnitName_B: '',
+                    HQty_B: '',
+                    HTMQty_B: '',
+                    HWHName_B: '',
+                    HSPName_B: '',
+                }
+            }
+        },
+        components: {
+            BillListPopupVue,
+            BarCodePopupVue
+        },
+        computed: {
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                    .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                    .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
+        },
+        onLoad(e) {
+            console.log(e, this.userInfo)
+            this.OperationType = e.OperationType
+            if (e.HInterID) {
+                this.HInterID_Temp = e.HInterID
+                // this.btnType = 1
+                this.RoadBillMain(e.HInterID)
+                this.barCodeFocus = true
+            } else {
+                this.getNewData()
+                this.HSourceBillNoFocus = true;
+            }
+            // this.getHBaseList()
+            this.getHSupList()
+            this.getHEmpList()
+            this.getHDeptList()
 
-			uni.$on('BillSelectComplete', (e) => {
-				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
-				this.getHBarCodeData(e.HBillNo)
-				this.$refs.billList.exit()
-			})
-		},
-		onUnload() {
-			uni.$off('BillSelectComplete')
-		},
-		methods: {
+            this.getRelationStore()
+
+            uni.$on('BillSelectComplete', (e) => {
+                console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+                this.getHBarCodeData(e.HBillNo)
+                this.$refs.billList.exit()
+            })
+        },
+        onUnload() {
+            uni.$off('BillSelectComplete')
+        },
+        methods: {
+            async HWHNameScan(e) {
+                // 鎵弿浠撳簱鐮�
+                console.log('浠撳簱鐮�: ', e);
+                let index = this.HWHNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+                    })
+                } else {
+                    this.HWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
+                }
+            },
+            async HStockPlaceNameScan(e) {
+                // 鎵弿浠撲綅鐮�
+                console.log('浠撲綅鐮�: ', e);
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e.trim())
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
             async qrCodeDisplay() {
                 try {
                     this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
@@ -432,1259 +473,1272 @@
                     })
                 }
             },
-			async getRelationStore() {
-				let {
-					data,
-					count
-				} = await getUserStockRelation()
-				if (count == 1) {
-					let WHIDList = []
-					
-					Array.from(data).forEach(elem => {			
-						WHIDList.push(elem.HItemID)			
-					})
-					
-					let sWhere = ` and HItemID in (${WHIDList.join(",")})`
-					this.getHBaseList({
-						sWhere: sWhere
-					})
-					
-				} else {
-					this.getHBaseList()
-				}
-			},
-			async refreshHSourceBillState() {
-				this.HSourceBillNoFocus = false
-				await this.$nextTick(() => {
-					this.hform.HSourceBillNo = ""
-					this.HSourceBillNoFocus = true
+            async getRelationStore() {
+                let {
+                    data,
+                    count
+                } = await getUserStockRelation()
+                if (count == 1) {
+                    let WHIDList = []
 
-				})
-			},
-			async refreshBarCodeState() {
-				this.barCodeFocus = false
-				await this.$nextTick(() => {
-					this.hform.HBarCode = ""
-					this.barCodeFocus = true
-				})
-			},
-			playSound(e) {
-				const innerAudioContext = uni.createInnerAudioContext();
-				if (e == 1) {
-					innerAudioContext.src = '/static/success.wav';
-				} else {
-					innerAudioContext.src = '/static/jingbao.wav';
-				}
-				innerAudioContext.play(); // 鎾斁闊抽
-			},
-			//鎵爜
-			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
-					}
+                    Array.from(data).forEach(elem => {
+                        WHIDList.push(elem.HItemID)
+                    })
 
-					this.getCode(this.hform.HBarCode)
-				})
-			},
-			showBillList() {
-				this.$refs.billList.showPopup()
-			},
-			//鎵叾浠�(浠撳簱锛屼粨浣�)
-			// toScanData(e){
-			// 	uni.scanCode({
-			// 	    onlyFromCamera: true,
-			// 	    success: (res) => {
-			// 	        console.log('鏉$爜鍐呭锛�' + res.result);
-			// 			var code = res.result
-			// 			if(e == 1){
-			// 				uni.request({
-			// 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
-			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
-			// 					success: (res) => {
-			// 						this.hform.HStockPlaceID = 0
-			// 						this.hform.HStockPlaceName = ''
-			// 						this.showHStockPlaceName = true
-			// 						if(res.data.count == 1){
-			// 							var data = res.data.data[0]
-			// 							this.hform.HWHID = data.HItemID
-			// 							this.hform.HWHName = data.HName
-			// 							if (data.HSPFlag == 0) {
-			// 							    this.showHStockPlaceName = false
-			// 							}
-			// 						}else{
-			// 							this.hform.HWHID = 0
-			// 							this.hform.HWHName = ''
-			// 							uni.showToast({
-			// 								title:res.data.Message,
-			// 								icon:'none'
-			// 							})
-			// 						}
-			// 					},
-			// 					fail: (res) => {
-			// 						console.log(res);
-			// 						uni.showToast({
-			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-			// 							icon:'none'
-			// 						})
-			// 					},
-			// 				});
-			// 			}else if(e == 2){
-			// 				uni.request({
-			// 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
-			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
-			// 					success: (res) => {
-			// 						if(res.data.count == 1){
-			// 							var data = res.data.data[0]
-			// 							this.hform.HWHID = data.HWHID
-			// 							this.hform.HWHName = data.HWhName
-			// 							this.hform.HStockPlaceID = data.HItemID
-			// 							this.hform.HStockPlaceName = data.HName
-			// 						}else{
-			// 							this.hform.HWHID = 0
-			// 							this.hform.HWHName = ''
-			// 							this.hform.HStockPlaceID = 0
-			// 							this.hform.HStockPlaceName = ''
-			// 							uni.showToast({
-			// 								title:res.data.Message,
-			// 								icon:'none'
-			// 							})
-			// 						}
-			// 					},
-			// 					fail: (res) => {
-			// 						console.log(res);
-			// 						uni.showToast({
-			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
-			// 							icon:'none'
-			// 						})
-			// 					},
-			// 				});
-			// 			}
-			// 	    }
-			// 	});
-			// },
-			//鏃ユ湡
-			HDateChange(e) {
-				console.log(e.detail.value)
-				this.hform.HDate = e.detail.value
-			},
-			//鍩虹浠撳簱璧勬枡
-			getHBaseList({sWhere = ''} = {}) {
-				uni.request({
-					url: this.serverUrl + '/Gy_Warehouse/list',
-					data: {
-						sWhere: sWhere,
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HWHNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
-							}
-						} else {
-							uni.showToast({
-								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
+                    let sWhere = ` and HItemID in (${WHIDList.join(",")})`
+                    this.getHBaseList({
+                        sWhere: sWhere
+                    })
 
-				uni.request({
-					url: this.serverUrl + '/Gy_StockPlace/list',
-					data: {
-						sWhere: "",
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HStockPlaceNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
-							}
-						} else {
-							uni.showToast({
-								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
+                } else {
+                    this.getHBaseList()
+                }
+            },
+            async refreshHSourceBillState() {
+                this.HSourceBillNoFocus = false
+                await this.$nextTick(() => {
+                    this.hform.HSourceBillNo = ""
+                    this.HSourceBillNoFocus = true
 
-				// this.getHYDList()
-			},
-			// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
-			async GetSourceBillType() {
-				CommonUtils.doRequest2({
-					url: '/Web/GetHSourceBillTypeByBillType',
-					data: {
-						HBillType: this.hform.HBillType,
-						Num: 2
-					},
-					resFunction: (res) => {
-						let {
-							data,
-							count,
-							Message
-						} = res.data
-						if (count == 1) {
-							console.log('data: ', data);
-							this.arrayHMainSourceBillType = []
-							this.arrayHMainSourceBillValue = []
-							Array.from(data).forEach(e => {
-								this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
-								this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
-							})
+                })
+            },
+            async refreshBarCodeState() {
+                this.barCodeFocus = false
+                await this.$nextTick(() => {
+                    this.hform.HBarCode = ""
+                    this.barCodeFocus = true
+                })
+            },
+            playSound(e) {
+                const innerAudioContext = uni.createInnerAudioContext();
+                if (e == 1) {
+                    innerAudioContext.src = '/static/success.wav';
+                } else {
+                    innerAudioContext.src = '/static/jingbao.wav';
+                }
+                innerAudioContext.play(); // 鎾斁闊抽
+            },
+            //鎵爜
+            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.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
-							this.arrayHMainSourceBillValue.push('-1')
+                    this.getCode(this.hform.HBarCode)
+                })
+            },
+            showBillList() {
+                this.$refs.billList.showPopup()
+            },
+            //鎵叾浠�(浠撳簱锛屼粨浣�)
+            // toScanData(e){
+            // 	uni.scanCode({
+            // 	    onlyFromCamera: true,
+            // 	    success: (res) => {
+            // 	        console.log('鏉$爜鍐呭锛�' + res.result);
+            // 			var code = res.result
+            // 			if(e == 1){
+            // 				uni.request({
+            // 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
+            // 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
+            // 					success: (res) => {
+            // 						this.hform.HStockPlaceID = 0
+            // 						this.hform.HStockPlaceName = ''
+            // 						this.showHStockPlaceName = true
+            // 						if(res.data.count == 1){
+            // 							var data = res.data.data[0]
+            // 							this.hform.HWHID = data.HItemID
+            // 							this.hform.HWHName = data.HName
+            // 							if (data.HSPFlag == 0) {
+            // 							    this.showHStockPlaceName = false
+            // 							}
+            // 						}else{
+            // 							this.hform.HWHID = 0
+            // 							this.hform.HWHName = ''
+            // 							uni.showToast({
+            // 								title:res.data.Message,
+            // 								icon:'none'
+            // 							})
+            // 						}
+            // 					},
+            // 					fail: (res) => {
+            // 						console.log(res);
+            // 						uni.showToast({
+            // 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+            // 							icon:'none'
+            // 						})
+            // 					},
+            // 				});
+            // 			}else if(e == 2){
+            // 				uni.request({
+            // 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
+            // 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
+            // 					success: (res) => {
+            // 						if(res.data.count == 1){
+            // 							var data = res.data.data[0]
+            // 							this.hform.HWHID = data.HWHID
+            // 							this.hform.HWHName = data.HWhName
+            // 							this.hform.HStockPlaceID = data.HItemID
+            // 							this.hform.HStockPlaceName = data.HName
+            // 						}else{
+            // 							this.hform.HWHID = 0
+            // 							this.hform.HWHName = ''
+            // 							this.hform.HStockPlaceID = 0
+            // 							this.hform.HStockPlaceName = ''
+            // 							uni.showToast({
+            // 								title:res.data.Message,
+            // 								icon:'none'
+            // 							})
+            // 						}
+            // 					},
+            // 					fail: (res) => {
+            // 						console.log(res);
+            // 						uni.showToast({
+            // 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+            // 							icon:'none'
+            // 						})
+            // 					},
+            // 				});
+            // 			}
+            // 	    }
+            // 	});
+            // },
+            //鏃ユ湡
+            HDateChange(e) {
+                console.log(e.detail.value)
+                this.hform.HDate = e.detail.value
+            },
+            //鍩虹浠撳簱璧勬枡
+            getHBaseList({
+                sWhere = ''
+            } = {}) {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Warehouse/list',
+                    data: {
+                        sWhere: sWhere,
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HWHNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
 
-							this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
-							this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: Message
-							})
-						}
-					}
+                uni.request({
+                    url: this.serverUrl + '/Gy_StockPlace/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HStockPlaceNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
 
-				})
-			},
-			//婧愬崟璧勬枡
-			getHYDList() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSourceBillList_Json',
-					data: {
-						HBillType: this.hform.HBillType,
-						HSourceBillType: this.hform.HMainSourceBillType,
-						HStockOrgID: this.hform.HStockOrgID,
-						HSourceBillNo: "",
-						HMater: "",
-						HCustom: ""
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HSourceBillNoList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
-							}
-							this.reHSourceBillNo = false
-							this.$nextTick(() => {
-								this.reHSourceBillNo = true
-							})
-						} else {
-							uni.showToast({
-								title: '婧愬崟鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浠撳簱
-			HWHNameChange(e) {
-				// var name = e.split("(")
-				for (var i = 0; i < this.HWHNameList.length; i++) {
-					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
-						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HWHID = this.HWHNameList[i].HItemID
+                // this.getHYDList()
+            },
+            // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
+            async GetSourceBillType() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetHSourceBillTypeByBillType',
+                    data: {
+                        HBillType: this.hform.HBillType,
+                        Num: 2
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            console.log('data: ', data);
+                            this.arrayHMainSourceBillType = []
+                            this.arrayHMainSourceBillValue = []
+                            Array.from(data).forEach(e => {
+                                this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+                                this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+                            })
 
-						if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
-							this.showHStockPlaceName = true
-						} else {
-							this.hform.HStockPlaceName = ''
-							this.showHStockPlaceName = false
-						}
-					}
-				}
-			},
-			HFIFOWHNameChange(e) {
-				for (var i = 0; i < this.HWHNameList.length; i++) {
-					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
-						this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨浠撲綅
-			HStockPlaceNameChange(e) {
-				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-					if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨婧愬崟
-			HSourceBillNoChange(e) {
-				this.hform.HSourceBillNo = e
-				this.getHBarCodeData(e)
-				// for(var i=0;i<this.HSourceBillNoList.length;i++){
-				// 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
-				// 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
-				// 	}
-				// }
-			},
-			//閫夋嫨婧愬崟绫诲瀷
-			HMainSourceBillTypeChange(e) {
-				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
-				let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
-				if (index != -1) {
-					this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
-					// this.getHYDList()
-				}
-			},
+                            this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+                            this.arrayHMainSourceBillValue.push('-1')
 
-			//鑾峰彇瀹㈡埛鏁版嵁
-			getHSupList() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSupplierList_Json',
-					data: {
-						Supplier: '',
-						HStockOrgID: this.hform.HStockOrgID
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HSupNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHSupName[i] = res.data.data[i]['HName']
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨
-			HSupNameChange(e) {
-				for (var i = 0; i < this.HSupNameList.length; i++) {
-					if (this.HSupNameList[i]['HName'] == e) {
-						this.hform.HSupID = this.HSupNameList[i].HItemID
-						this.hform.HSupName = this.HSupNameList[i]['HName']
-					}
-				}
-			},
-			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-			getHDeptList() {
-				uni.request({
-					url: this.serverUrl + '/Gy_Department/list',
-					data: {
-						sWhere: "",
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HDeptNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浣跨敤閮ㄩ棬
-			HDeptNameChange(e) {
-				for (var i = 0; i < this.HDeptNameList.length; i++) {
-					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
-						this.hform.HDeptID = this.HDeptNameList[i].HItemID
-						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
-					}
-				}
-			},
-			//鎿嶄綔鍛�
-			getHEmpList() {
-				uni.request({
-					url: this.serverUrl + '/Web/GetEmployeeList_Json',
-					data: {
-						Employee: '',
-						HGroupID: 0
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HEmpNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHEmpName[i] = res.data.data[i].HName
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//淇濈
-			HKeeperNameChange(e) {
-				for (var i = 0; i < this.HEmpNameList.length; i++) {
-					if (this.HEmpNameList[i].HName == e) {
-						console.log(this.HEmpNameList[i])
-						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
-						this.hform.HKeeperName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//楠屾敹
-			HSecManagerNameChange(e) {
-				for (var i = 0; i < this.HEmpNameList.length; i++) {
-					if (this.HEmpNameList[i].HName == e) {
-						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
-						this.hform.HSecManagerName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//閫変腑婧愬崟
-			getHBarCodeData(HBarCode) {
-				if(this.hform.HMainSourceBillType == -1) {
-					this.playSound(1)
-					this.barCodeFocus = true
-					return
-				}
-				if (!this.hform.HFIFOWHName) {
-					this.hform.HFIFOWHID = 0
-				}
-				uni.request({
-					url: this.serverUrl + '/WEBSController/get_SourceBarCode_EntrustOut_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,
-						HFIFOWHID: this.hform.HFIFOWHID,
-						HPTQty: this.hform.HPTQty || 0,
-						HPlanMode: this.hform.HPlanMode || 0
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							var data = res.data.data
-							console.log(2, data);
-							this.hform.HSupName = data.hSupNameField
-							this.hform.HSupID = data.hSupIDField
-							if (data.hDeptIDField != 0) {
-								this.hform.HDeptID = data.hDeptIDField
-								this.hform.HDeptName = data.hDeptNameField
-							}
-							this.hform.HSourceBillNo = data.hSourceBillNoField
-							this.showHMainSourceBillType = false
-							if (data.hMulSourceFlagField == 0) {
-								this.showHSourceBillNo = false
-							}
-							this.tabs = 2
-							this.showHSupName = false
-							this.playSound(1)
-							this.barCodeFocus = true
-							this.DisBillEntryList()
-						} else {
-							this.playSound(0)
-							this.refreshHSourceBillState()
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						this.playSound(0)
-						this.refreshHSourceBillState()
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//鎵潯鐮佸鐞�
-			getCode(HBarCode) {
-				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
-				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
-				}
-				var sOldBarCode = HBarCode
-				var HDeleteFlag = sOldBarCode.substring(0, 1);
-				var sBarCode = sOldBarCode.slice(1);
+                            this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+                            this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
 
-				var sHWHID = this.hform.HWHID
-				var sHSPID = this.hform.HStockPlaceID
-				var sHQty = this.hform.HQty
-				var sSourceBillNo = this.hform.HSourceBillNo
-				var sSourceBillType = this.hform.HMainSourceBillType
-				var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
-				console.log(this.hform.HSourceBillNo, HSourceFlag)
-				if (HDeleteFlag == "*") {
-					if (sBarCode == "") {
-						this.playSound(0)
-						uni.showToast({
-							title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
-							icon: 'none'
-						})
-					} else {
-						uni.request({
-							url: this.serverUrl +
-								'/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
-							data: {
-								HInterID: this.hform.HInterID,
-								HBillType: this.hform.HBillType,
-								HBarCode: sBarCode
-							},
-							success: (res) => {
-								console.log('鍒犻櫎鏉$爜', res.data);
-								this.hform.HBarCode = ''
-								if (res.data.count == 1) {
-									this.playSound(1)
-									this.hform.HQty = ''
-									this.DisBillEntryList()
-								} else {
-									this.playSound(0)
-									this.refreshBarCodeState()
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								this.playSound(0)
-								this.refreshBarCodeState()
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									icon: 'none'
-								})
-							},
-						});
-					}
-				} else {
-					var sBarCode = this.hform.HBarCode
-					if (sHQty == "") {
-						sHQty = 0;
-					}
-					uni.request({
-						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
-						data: {
-							sBarCode: sBarCode,
-							HInterID: this.hform.HInterID,
-							HBillType: this.hform.HBillType,
-							HBillNo: this.hform.HBillNo,
-							HMaker: this.hform.HMaker,
-							HWhID: sHWHID,
-							HSPID: sHSPID,
-							HQty: sHQty,
-							HRedBlueFlag: this.hform.HRedBlueFlag,
-							SourceFlag: HSourceFlag,
-							HSourceBillNo: sSourceBillNo,
-							HSourceBillType: sSourceBillType,
-							HStockOrgID: this.hform.HStockOrgID,
-							HScanStyle: "",
-							HCustom1: "",
-							HCustom2: ""
-						},
-						success: (res) => {
-							console.log('鎵爜杩斿洖', res.data);
-							this.hform.HBarCode = ''
-							if (res.data.count == 1) {
-								this.playSound(1)
-								var data = res.data.data
-								if (data.hBarTypeField == '浠撳簱鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = ''
-									this.hform.HStockPlaceID = 0
-									if (data.hSPFlagField == 0) {
-										this.showHStockPlaceName = false
-									} else {
-										this.showHStockPlaceName = true
-									}
-								} else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = data.hSPNameField
-									this.hform.HStockPlaceID = data.hSPIDField
-								} else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-									this.hform.HDeptName = data.hDeptNameField
-									this.hform.HDeptID = data.hDeptIDField
-									this.tabs = 1
-								} else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-									this.hform.HSupName = data.hSupNameField
-									this.hform.HSupID = data.hSupIDField
-									if (data.hDeptIDField != 0) {
-										this.hform.HDeptID = data.hDeptIDField
-										this.hform.HDeptName = data.hDeptNameField
-									}
-									this.hform.HSourceBillNo = data.hSourceBillNoField
-									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-									this.hform.HMainSourceBillType = data.hSourceBillTypeField
-									
-									let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
-										.hSourceBillTypeField)
-									if (index != -1) {
-										this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-										this.hform.HMainSourceBillType = data.hSourceBillTypeField
-										this.showHMainSourceBillType = false
-									}
-									// if (data.hSourceBillTypeField == "1604") {
-									// 	this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
-									// 	this.hform.HMainSourceBillType = 1604
-									// 	this.showHMainSourceBillType = false
-									// } else {
-									// 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-									// 	this.hform.HMainSourceBillType = -1
-									// 	this.showHMainSourceBillType = false
-									// }
-									if (data.hMulSourceFlagField == 0) {
-										this.showHSourceBillNo = false
-									}
-									//瀹㈡埛涓嶅彲缂栬緫
-									this.showHSupName = false
-									this.tabs = 2
-								} else { //鐗╂枡鏉$爜
-									this.tabs = 2
-									if (!this.hform.HSourceBillNo) {
-										this.hform.HSupName = data.hSupNameField
-										this.hform.HSupID = data.hSupIDField
-										this.hform.HSourceBillNo = data.hSourceBillNoField
-										if (data.hDeptIDField != 0) {
-											this.hform.HDeptID = data.hDeptIDField
-											this.hform.HDeptName = data.hDeptNameField
-										}
-										console.log(data)
-										//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-										this.hform.HMainSourceBillType = data.hSourceBillTypeField
-									
-										let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
-											.hSourceBillTypeField)
-										if (index != -1) {
-											this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-											this.hform.HMainSourceBillType = data.hSourceBillTypeField
-											this.showHMainSourceBillType = false
-										}
-										// if (data.hSourceBillTypeField == "1103") {
-										// 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-										// 	this.hform.HMainSourceBillType = 1103
-										// 	this.showHMainSourceBillType = false
-										// } else if (data.hSourceBillTypeField == "1102") {
-										// 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-										// 	this.hform.HMainSourceBillType = 1102
-										// 	this.showHMainSourceBillType = false
-										// } else {
-										// 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-										// 	this.hform.HMainSourceBillType = -1
-										// 	this.showHMainSourceBillType = false
-										// }
-										if (data.hMulSourceFlagField == 0) {
-											this.showHSourceBillNo = false
-										}
-										//渚涘簲鍟嗕笉鍙紪杈�
-										this.showHSupName = false
-									}
-								}
-								//鏄剧ず琛ㄤ綋鏄庣粏
-								this.DisBillEntryList()
-								//娓呯┖鏁伴噺
-								this.hform.HQty = ''
-								this.refreshBarCodeState()
-							} else {
-								this.playSound(0)
-								this.refreshBarCodeState()
-								uni.showToast({
-									title: res.data.Message,
-									icon: 'none'
-								})
-							}
-						},
-						fail: (res) => {
-							this.playSound(0)
-							this.refreshBarCodeState()
-							console.log(res);
-							uni.showToast({
-								title: '鎺ュ彛璇锋眰澶辫触',
-								icon: 'none'
-							})
-						},
-					});
-				}
-			},
-			//鐗╂枡淇℃伅
-			DisBillEntryList() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
-					data: {
-						HInterID: this.hform.HInterID,
-						HBillNo: this.hform.HBillNo,
-						HBillType: this.hform.HBillType,
-						HStockOrgID: this.hform.HStockOrgID
-					},
-					success: (res) => {
-						console.log('鐗╂枡', res.data)
-						if (res.data.count == 1) {
-							var data = res.data.data
-							this.Materlist = data.Materlist
-							if (data.FIFOlist.length != 0) {
-								if (data.FIFOlist[0].HMaterID != 0) {
-									this.FIFOlist = data.FIFOlist
-								}
-							}
-							if (!data.BarCodeDetailslist[0].HBarCode) {
-								this.hform.HMaterName_B = ''
-								this.hform.HMaterModel_B = ''
-								this.hform.HBatchNo_B = ''
-								this.hform.HUnitName_B = ''
-								this.hform.HQty_B = ''
-								this.hform.HTMQty_B = ''
-								this.hform.HWHName_B = ''
-								this.hform.HSPName_B = ''
-							} else {
-								this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
-								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
-								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
-								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
-								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
-								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
-								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
-								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
-								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
-							}
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//鍒犻櫎鐗╂枡鐮�
-			delMater(item) {
-				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-					success: (res) => {
-						if (res.confirm) {
-							uni.request({
-								url: this.serverUrl +
-									'/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
-								data: {
-									HInterID: this.hform.HInterID,
-									HMaterID: item.HMaterID,
-									HAuxPropID: item.HAuxPropID,
-									HMTONo: item.HMTONo,
-									HSourceInterID: item.HSourceInterID,
-									HSourceEntryID: item.HSourceEntryID,
-									HBillType: this.hform.HBillType
-								},
-								success: (res) => {
-									if (res.data.count == 1) {
-										this.DisBillEntryList()
-									} else {
-										uni.showToast({
-											title: res.data.Message,
-											icon: 'none'
-										})
-									}
-								},
-								fail: (res) => {
-									console.log(res);
-									uni.showToast({
-										title: '鎺ュ彛璇锋眰澶辫触',
-										icon: 'none'
-									})
-								},
-							});
-						}
-					}
-				});
-			},
-			//鏂板
-			getNewData() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json',
-					data: {
-						HBillType: this.hform.HBillType
-					},
-					success: (res) => {
-						// console.log(res.data)
-						if (res.data.count == 1) {
-							this.hform.HInterID = res.data.data[0].HInterID
-							this.hform.HBillNo = res.data.data[0].HBillNo
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//淇敼鍥炲~鏁版嵁
-			RoadBillMain(HInterID) {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
-					data: {
-						HInterID: HInterID,
-						HBillType: this.hform.HBillType
-					},
-					success: (res) => {
-						console.log(33, res.data.data[0]);
-						if (res.data.count == 1) {
-							var data = res.data.data[0]
-							this.hform.HInterID = data.HInterID
-							this.hform.HBillNo = data.HBillNo
-							this.hform.HMainSourceBillType = data.HSourceBillType
-							this.hform.HSourceBillNo = data.HSourceBillNo
-							
-							let index = this.arrayHMainSourceBillValue.findIndex(e => e == data.HSourceBillType)
-							if (index != -1) {
-								this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-								this.hform.HMainSourceBillType = data.HSourceBillType
-								if (this.HMainSourceBillType != -1) {
-									this.showHSupName = false
-								}
-							}
-							// if (data.HSourceBillType == 1604) {
-							// 	this.hform.HMainSourceBillType = 1604
-							// 	this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
-							// 	this.showHSupName = false
-							// } else {
-							// 	this.hform.HMainSourceBillType = -1
-							// 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-							// }
-							this.showHMainSourceBillType = false
+                })
+            },
+            //婧愬崟璧勬枡
+            getHYDList() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetSourceBillList_Json',
+                    data: {
+                        HBillType: this.hform.HBillType,
+                        HSourceBillType: this.hform.HMainSourceBillType,
+                        HStockOrgID: this.hform.HStockOrgID,
+                        HSourceBillNo: "",
+                        HMater: "",
+                        HCustom: ""
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HSourceBillNoList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
+                            }
+                            this.reHSourceBillNo = false
+                            this.$nextTick(() => {
+                                this.reHSourceBillNo = true
+                            })
+                        } else {
+                            uni.showToast({
+                                title: '婧愬崟鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨浠撳簱
+            HWHNameChange(e) {
+                // var name = e.split("(")
+                for (var i = 0; i < this.HWHNameList.length; i++) {
+                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+                        this.hform.HWHID = this.HWHNameList[i].HItemID
 
-							//闈炲婧愬崟妯″紡
-							if (data.HMulSourceBill == 0) {
-								this.showHSourceBillNo = false
-							}
-							this.hform.HDeptID = data.HDeptID
-							this.hform.HDeptName = data.HDeptName
-							this.hform.HSupID = data.HCusID
-							this.hform.HSupName = data.HCusName
-							this.DisBillEntryList()
-							this.tabs = 2
-						} else {
-							uni.showToast({
-								title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			addNew() {
-				uni.redirectTo({
-					url: '/pages/weiwailingliao/form?OperationType=1'
-				})
-			},
-			submit() {
-				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
-				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
-				}
-				if (!this.hform.HKeeperName) {
-					this.hform.HKeeperID = 0
-				}
-				if (!this.hform.HSecManagerName) {
-					this.hform.HSecManagerID = 0
-				}
-				if (!this.hform.HDeptName) {
-					this.hform.HDeptID = 0
-				}
-				if (!this.hform.HSupName) {
-					this.hform.HSupID = 0
-				}
-				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
-					uni.showToast({
-						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
-						icon: 'none'
-					})
-				} else if (!this.hform.HBillNo) {
-					uni.showToast({
-						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
-						icon: 'none'
-					})
-				} else if (!this.Materlist || this.Materlist.length == 0) {
-					uni.showToast({
-						title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-						icon: 'none'
-					})
-				} else {
-					var s = 0;
-					for (var i = 0; i < this.Materlist.length; i++) {
-						if (this.Materlist[i].鏁伴噺 > 0) {
-							s = 1;
-						}
-					}
-					if (s == 0) {
-						uni.showToast({
-							title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-							icon: 'none'
-						})
-					} else {
-						uni.showLoading({
-							title: '璇风◢鍊�'
-						})
-						var sMainStr = JSON.stringify(this.hform);
-						uni.request({
-							url: this.serverUrl + '/WEBSController/set_SaveEntrustOutBill_Json',
-							method: 'POST',
-							dataType: "json",
-							data: {
-								oMain: sMainStr
-							},
-							success: (res) => {
-								console.log(1, res);
-								uni.hideLoading()
-								if (res.data.count == 1) {
-									uni.showModal({
-										title: '鎻愮ず',
-										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-										success: (res) => {
-											if (res.confirm) {
-												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-												uni.redirectTo({
-													url: '/pages/weiwailingliao/form?OperationType=1'
-												})
-											} else if (res.cancel) {
-												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-												// setTimeout(() => {
-												// 	uni.navigateBack();
-												// }, 500)
-											}
-										}
-									});
-								} else {
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									icon: 'none'
-								})
-							},
-						});
-					}
-				}
-			},
+                        if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+                            this.showHStockPlaceName = true
+                        } else {
+                            this.hform.HStockPlaceName = ''
+                            this.showHStockPlaceName = false
+                        }
+                    }
+                }
+            },
+            HFIFOWHNameChange(e) {
+                for (var i = 0; i < this.HWHNameList.length; i++) {
+                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+                        this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
+                    }
+                }
+            },
+            //閫夋嫨浠撲綅
+            HStockPlaceNameChange(e) {
 
-			goBack() {
-				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
-					success: (res) => {
-						if (res.confirm) {
-							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							uni.navigateBack({
-								url: '/pages/shengchanlingliaoshengdan/table'
-							})
-						} else if (res.cancel) {
-							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-						}
-					}
-				});
-			}
-		}
-	}
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
+                }
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                // 	if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                // 		this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                // 		this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                // 	}
+                // }
+            },
+            //閫夋嫨婧愬崟
+            HSourceBillNoChange(e) {
+                this.hform.HSourceBillNo = e
+                this.getHBarCodeData(e)
+                // for(var i=0;i<this.HSourceBillNoList.length;i++){
+                // 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
+                // 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
+                // 	}
+                // }
+            },
+            //閫夋嫨婧愬崟绫诲瀷
+            HMainSourceBillTypeChange(e) {
+                this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+                let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
+                if (index != -1) {
+                    this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
+                    // this.getHYDList()
+                }
+            },
+
+            //鑾峰彇瀹㈡埛鏁版嵁
+            getHSupList() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetSupplierList_Json',
+                    data: {
+                        Supplier: '',
+                        HStockOrgID: this.hform.HStockOrgID
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HSupNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHSupName[i] = res.data.data[i]['HName']
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨
+            HSupNameChange(e) {
+                for (var i = 0; i < this.HSupNameList.length; i++) {
+                    if (this.HSupNameList[i]['HName'] == e) {
+                        this.hform.HSupID = this.HSupNameList[i].HItemID
+                        this.hform.HSupName = this.HSupNameList[i]['HName']
+                    }
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            getHDeptList() {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Department/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HDeptNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨浣跨敤閮ㄩ棬
+            HDeptNameChange(e) {
+                for (var i = 0; i < this.HDeptNameList.length; i++) {
+                    if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+                        this.hform.HDeptID = this.HDeptNameList[i].HItemID
+                        this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+                    }
+                }
+            },
+            //鎿嶄綔鍛�
+            getHEmpList() {
+                uni.request({
+                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
+                    data: {
+                        Employee: '',
+                        HGroupID: 0
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HEmpNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHEmpName[i] = res.data.data[i].HName
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //淇濈
+            HKeeperNameChange(e) {
+                for (var i = 0; i < this.HEmpNameList.length; i++) {
+                    if (this.HEmpNameList[i].HName == e) {
+                        console.log(this.HEmpNameList[i])
+                        this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+                        this.hform.HKeeperName = this.HEmpNameList[i].HName
+                    }
+                }
+            },
+            //楠屾敹
+            HSecManagerNameChange(e) {
+                for (var i = 0; i < this.HEmpNameList.length; i++) {
+                    if (this.HEmpNameList[i].HName == e) {
+                        this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+                        this.hform.HSecManagerName = this.HEmpNameList[i].HName
+                    }
+                }
+            },
+            //閫変腑婧愬崟
+            getHBarCodeData(HBarCode) {
+                if (this.hform.HMainSourceBillType == -1) {
+                    this.playSound(1)
+                    this.barCodeFocus = true
+                    return
+                }
+                if (!this.hform.HFIFOWHName) {
+                    this.hform.HFIFOWHID = 0
+                }
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/get_SourceBarCode_EntrustOut_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,
+                        HFIFOWHID: this.hform.HFIFOWHID,
+                        HPTQty: this.hform.HPTQty || 0,
+                        HPlanMode: this.hform.HPlanMode || 0
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            var data = res.data.data
+                            console.log(2, data);
+                            this.hform.HSupName = data.hSupNameField
+                            this.hform.HSupID = data.hSupIDField
+                            if (data.hDeptIDField != 0) {
+                                this.hform.HDeptID = data.hDeptIDField
+                                this.hform.HDeptName = data.hDeptNameField
+                            }
+                            this.hform.HSourceBillNo = data.hSourceBillNoField
+                            this.showHMainSourceBillType = false
+                            if (data.hMulSourceFlagField == 0) {
+                                this.showHSourceBillNo = false
+                            }
+                            this.tabs = 2
+                            this.showHSupName = false
+                            this.playSound(1)
+                            this.barCodeFocus = true
+                            this.DisBillEntryList()
+                        } else {
+                            this.playSound(0)
+                            this.refreshHSourceBillState()
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        this.playSound(0)
+                        this.refreshHSourceBillState()
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //鎵潯鐮佸鐞�
+            getCode(HBarCode) {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HWHName) {
+                    this.hform.HWHID = 0
+                }
+                if (!this.hform.HStockPlaceName) {
+                    this.hform.HStockPlaceID = 0
+                }
+                var sOldBarCode = HBarCode
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+
+                var sHWHID = this.hform.HWHID
+                var sHSPID = this.hform.HStockPlaceID
+                var sHQty = this.hform.HQty
+                var sSourceBillNo = this.hform.HSourceBillNo
+                var sSourceBillType = this.hform.HMainSourceBillType
+                var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
+                console.log(this.hform.HSourceBillNo, HSourceFlag)
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        this.playSound(0)
+                        uni.showToast({
+                            title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+                            icon: 'none'
+                        })
+                    } else {
+                        uni.request({
+                            url: this.serverUrl +
+                                '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+                            data: {
+                                HInterID: this.hform.HInterID,
+                                HBillType: this.hform.HBillType,
+                                HBarCode: sBarCode
+                            },
+                            success: (res) => {
+                                console.log('鍒犻櫎鏉$爜', res.data);
+                                this.hform.HBarCode = ''
+                                if (res.data.count == 1) {
+                                    this.playSound(1)
+                                    this.hform.HQty = ''
+                                    this.DisBillEntryList()
+                                } else {
+                                    this.playSound(0)
+                                    this.refreshBarCodeState()
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                }
+                            },
+                            fail: (res) => {
+                                this.playSound(0)
+                                this.refreshBarCodeState()
+                                console.log(res);
+                                uni.showToast({
+                                    title: '鎺ュ彛璇锋眰澶辫触',
+                                    icon: 'none'
+                                })
+                            },
+                        });
+                    }
+                } else {
+                    var sBarCode = this.hform.HBarCode
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+                    uni.request({
+                        url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+                        data: {
+                            sBarCode: sBarCode,
+                            HInterID: this.hform.HInterID,
+                            HBillType: this.hform.HBillType,
+                            HBillNo: this.hform.HBillNo,
+                            HMaker: this.hform.HMaker,
+                            HWhID: sHWHID,
+                            HSPID: sHSPID,
+                            HQty: sHQty,
+                            HRedBlueFlag: this.hform.HRedBlueFlag,
+                            SourceFlag: HSourceFlag,
+                            HSourceBillNo: sSourceBillNo,
+                            HSourceBillType: sSourceBillType,
+                            HStockOrgID: this.hform.HStockOrgID,
+                            HScanStyle: "",
+                            HCustom1: "",
+                            HCustom2: ""
+                        },
+                        success: (res) => {
+                            console.log('鎵爜杩斿洖', res.data);
+                            this.hform.HBarCode = ''
+                            if (res.data.count == 1) {
+                                this.playSound(1)
+                                var data = res.data.data
+                                if (data.hBarTypeField == '浠撳簱鏉$爜') {
+                                    this.hform.HWHName = data.hWhNameField
+                                    this.hform.HWHID = data.hWhIDField
+                                    this.hform.HStockPlaceName = ''
+                                    this.hform.HStockPlaceID = 0
+                                    if (data.hSPFlagField == 0) {
+                                        this.showHStockPlaceName = false
+                                    } else {
+                                        this.showHStockPlaceName = true
+                                    }
+                                } else if (data.hBarTypeField == '浠撲綅鏉$爜') {
+                                    this.hform.HWHName = data.hWhNameField
+                                    this.hform.HWHID = data.hWhIDField
+                                    this.hform.HStockPlaceName = data.hSPNameField
+                                    this.hform.HStockPlaceID = data.hSPIDField
+                                } else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
+                                    this.hform.HDeptName = data.hDeptNameField
+                                    this.hform.HDeptID = data.hDeptIDField
+                                    this.tabs = 1
+                                } else if (data.hBarTypeField == '婧愬崟鏉$爜') {
+                                    this.hform.HSupName = data.hSupNameField
+                                    this.hform.HSupID = data.hSupIDField
+                                    if (data.hDeptIDField != 0) {
+                                        this.hform.HDeptID = data.hDeptIDField
+                                        this.hform.HDeptName = data.hDeptNameField
+                                    }
+                                    this.hform.HSourceBillNo = data.hSourceBillNoField
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                    this.hform.HMainSourceBillType = data.hSourceBillTypeField
+
+                                    let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                        .hSourceBillTypeField)
+                                    if (index != -1) {
+                                        this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                        this.showHMainSourceBillType = false
+                                    }
+                                    // if (data.hSourceBillTypeField == "1604") {
+                                    // 	this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
+                                    // 	this.hform.HMainSourceBillType = 1604
+                                    // 	this.showHMainSourceBillType = false
+                                    // } else {
+                                    // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                    // 	this.hform.HMainSourceBillType = -1
+                                    // 	this.showHMainSourceBillType = false
+                                    // }
+                                    if (data.hMulSourceFlagField == 0) {
+                                        this.showHSourceBillNo = false
+                                    }
+                                    //瀹㈡埛涓嶅彲缂栬緫
+                                    this.showHSupName = false
+                                    this.tabs = 2
+                                } else { //鐗╂枡鏉$爜
+                                    this.tabs = 2
+                                    if (!this.hform.HSourceBillNo) {
+                                        this.hform.HSupName = data.hSupNameField
+                                        this.hform.HSupID = data.hSupIDField
+                                        this.hform.HSourceBillNo = data.hSourceBillNoField
+                                        if (data.hDeptIDField != 0) {
+                                            this.hform.HDeptID = data.hDeptIDField
+                                            this.hform.HDeptName = data.hDeptNameField
+                                        }
+                                        console.log(data)
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
+
+                                        let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                            .hSourceBillTypeField)
+                                        if (index != -1) {
+                                            this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                            this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                            this.showHMainSourceBillType = false
+                                        }
+                                        // if (data.hSourceBillTypeField == "1103") {
+                                        // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+                                        // 	this.hform.HMainSourceBillType = 1103
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else if (data.hSourceBillTypeField == "1102") {
+                                        // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
+                                        // 	this.hform.HMainSourceBillType = 1102
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else {
+                                        // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                        // 	this.hform.HMainSourceBillType = -1
+                                        // 	this.showHMainSourceBillType = false
+                                        // }
+                                        if (data.hMulSourceFlagField == 0) {
+                                            this.showHSourceBillNo = false
+                                        }
+                                        //渚涘簲鍟嗕笉鍙紪杈�
+                                        this.showHSupName = false
+                                    }
+                                }
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                this.DisBillEntryList()
+                                //娓呯┖鏁伴噺
+                                this.hform.HQty = ''
+                                this.refreshBarCodeState()
+                            } else {
+                                this.playSound(0)
+                                this.refreshBarCodeState()
+                                uni.showToast({
+                                    title: res.data.Message,
+                                    icon: 'none'
+                                })
+                            }
+                        },
+                        fail: (res) => {
+                            this.playSound(0)
+                            this.refreshBarCodeState()
+                            console.log(res);
+                            uni.showToast({
+                                title: '鎺ュ彛璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        },
+                    });
+                }
+            },
+            //鐗╂枡淇℃伅
+            DisBillEntryList() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
+                    data: {
+                        HInterID: this.hform.HInterID,
+                        HBillNo: this.hform.HBillNo,
+                        HBillType: this.hform.HBillType,
+                        HStockOrgID: this.hform.HStockOrgID
+                    },
+                    success: (res) => {
+                        console.log('鐗╂枡', res.data)
+                        if (res.data.count == 1) {
+                            var data = res.data.data
+                            this.Materlist = data.Materlist
+                            if (data.FIFOlist.length != 0) {
+                                if (data.FIFOlist[0].HMaterID != 0) {
+                                    this.FIFOlist = data.FIFOlist
+                                }
+                            }
+                            if (!data.BarCodeDetailslist[0].HBarCode) {
+                                this.hform.HMaterName_B = ''
+                                this.hform.HMaterModel_B = ''
+                                this.hform.HBatchNo_B = ''
+                                this.hform.HUnitName_B = ''
+                                this.hform.HQty_B = ''
+                                this.hform.HTMQty_B = ''
+                                this.hform.HWHName_B = ''
+                                this.hform.HSPName_B = ''
+                            } else {
+                                this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
+                                this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+                                this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+                                this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+                                this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+                                this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+                                this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+                                this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+                                this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+                            }
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //鍒犻櫎鐗╂枡鐮�
+            delMater(item) {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
+                                data: {
+                                    HInterID: this.hform.HInterID,
+                                    HMaterID: item.HMaterID,
+                                    HAuxPropID: item.HAuxPropID,
+                                    HMTONo: item.HMTONo,
+                                    HSourceInterID: item.HSourceInterID,
+                                    HSourceEntryID: item.HSourceEntryID,
+                                    HBillType: this.hform.HBillType
+                                },
+                                success: (res) => {
+                                    if (res.data.count == 1) {
+                                        this.DisBillEntryList()
+                                    } else {
+                                        uni.showToast({
+                                            title: res.data.Message,
+                                            icon: 'none'
+                                        })
+                                    }
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        }
+                    }
+                });
+            },
+            //鏂板
+            getNewData() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json',
+                    data: {
+                        HBillType: this.hform.HBillType
+                    },
+                    success: (res) => {
+                        // console.log(res.data)
+                        if (res.data.count == 1) {
+                            this.hform.HInterID = res.data.data[0].HInterID
+                            this.hform.HBillNo = res.data.data[0].HBillNo
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //淇敼鍥炲~鏁版嵁
+            RoadBillMain(HInterID) {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
+                    data: {
+                        HInterID: HInterID,
+                        HBillType: this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(33, res.data.data[0]);
+                        if (res.data.count == 1) {
+                            var data = res.data.data[0]
+                            this.hform.HInterID = data.HInterID
+                            this.hform.HBillNo = data.HBillNo
+                            this.hform.HMainSourceBillType = data.HSourceBillType
+                            this.hform.HSourceBillNo = data.HSourceBillNo
+
+                            let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                .HSourceBillType)
+                            if (index != -1) {
+                                this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                this.hform.HMainSourceBillType = data.HSourceBillType
+                                if (this.HMainSourceBillType != -1) {
+                                    this.showHSupName = false
+                                }
+                            }
+                            // if (data.HSourceBillType == 1604) {
+                            // 	this.hform.HMainSourceBillType = 1604
+                            // 	this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
+                            // 	this.showHSupName = false
+                            // } else {
+                            // 	this.hform.HMainSourceBillType = -1
+                            // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                            // }
+                            this.showHMainSourceBillType = false
+
+                            //闈炲婧愬崟妯″紡
+                            if (data.HMulSourceBill == 0) {
+                                this.showHSourceBillNo = false
+                            }
+                            this.hform.HDeptID = data.HDeptID
+                            this.hform.HDeptName = data.HDeptName
+                            this.hform.HSupID = data.HCusID
+                            this.hform.HSupName = data.HCusName
+                            this.DisBillEntryList()
+                            this.tabs = 2
+                        } else {
+                            uni.showToast({
+                                title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: '/pages/weiwailingliao/form?OperationType=1'
+                })
+            },
+            submit() {
+                //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HWHName) {
+                    this.hform.HWHID = 0
+                }
+                if (!this.hform.HStockPlaceName) {
+                    this.hform.HStockPlaceID = 0
+                }
+                if (!this.hform.HKeeperName) {
+                    this.hform.HKeeperID = 0
+                }
+                if (!this.hform.HSecManagerName) {
+                    this.hform.HSecManagerID = 0
+                }
+                if (!this.hform.HDeptName) {
+                    this.hform.HDeptID = 0
+                }
+                if (!this.hform.HSupName) {
+                    this.hform.HSupID = 0
+                }
+                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+                    uni.showToast({
+                        title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+                        icon: 'none'
+                    })
+                } else if (!this.hform.HBillNo) {
+                    uni.showToast({
+                        title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+                        icon: 'none'
+                    })
+                } else if (!this.Materlist || this.Materlist.length == 0) {
+                    uni.showToast({
+                        title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+                        icon: 'none'
+                    })
+                } else {
+                    var s = 0;
+                    for (var i = 0; i < this.Materlist.length; i++) {
+                        if (this.Materlist[i].鏁伴噺 > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        uni.showToast({
+                            title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+                            icon: 'none'
+                        })
+                    } else {
+                        uni.showLoading({
+                            title: '璇风◢鍊�'
+                        })
+                        var sMainStr = JSON.stringify(this.hform);
+                        uni.request({
+                            url: this.serverUrl + '/WEBSController/set_SaveEntrustOutBill_Json',
+                            method: 'POST',
+                            dataType: "json",
+                            data: {
+                                oMain: sMainStr
+                            },
+                            success: (res) => {
+                                console.log(1, res);
+                                uni.hideLoading()
+                                if (res.data.count == 1) {
+                                    uni.showModal({
+                                        title: '鎻愮ず',
+                                        content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                                        success: (res) => {
+                                            if (res.confirm) {
+                                                console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                                uni.redirectTo({
+                                                    url: '/pages/weiwailingliao/form?OperationType=1'
+                                                })
+                                            } else if (res.cancel) {
+                                                console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                                // setTimeout(() => {
+                                                // 	uni.navigateBack();
+                                                // }, 500)
+                                            }
+                                        }
+                                    });
+                                } else {
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                }
+                            },
+                            fail: (res) => {
+                                console.log(res);
+                                uni.showToast({
+                                    title: '鎺ュ彛璇锋眰澶辫触',
+                                    icon: 'none'
+                                })
+                            },
+                        });
+                    }
+                }
+            },
+
+            goBack() {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.navigateBack({
+                                url: '/pages/shengchanlingliaoshengdan/table'
+                            })
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            }
+        }
+    }
 </script>
 
 <style lang="scss" scoped>
-	.form {
-		width: 668rpx;
-		margin: 20rpx auto;
-		padding-bottom: 240rpx;
-	}
+    .form {
+        width: 668rpx;
+        margin: 20rpx auto;
+        padding-bottom: 240rpx;
+    }
 
-	.tab_area {
-		width: 100%;
-		height: 50rpx;
-	}
+    .tab_area {
+        width: 100%;
+        height: 50rpx;
+    }
 
-	.other {
-		margin-top: 8rpx;
-		text-align: center;
-		font-size: 28rpx;
-		padding: 4rpx 18rpx;
-		color: #1890FF;
-	}
+    .other {
+        margin-top: 8rpx;
+        text-align: center;
+        font-size: 28rpx;
+        padding: 4rpx 18rpx;
+        color: #1890FF;
+    }
 
-	.tabs {
-		width: 100%;
-		display: flex;
-		border-bottom: 1px solid #ddd;
-		margin: 20rpx 0;
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
 
-		view {
-			width: 25%;
-			font-size: 30rpx;
-			color: #555;
-			text-align: center;
-			padding: 16rpx 0;
-		}
+        view {
+            width: 25%;
+            font-size: 30rpx;
+            color: #555;
+            text-align: center;
+            padding: 16rpx 0;
+        }
 
-		.on {
-			color: #3a78ff;
-			font-weight: bold;
-			border-bottom: 3px solid #3a78ff;
-		}
-	}
+        .on {
+            color: #3a78ff;
+            font-weight: bold;
+            border-bottom: 3px solid #3a78ff;
+        }
+    }
 
-	.form-item {
-		display: flex;
-		align-items: center;
-		font-size: 30rpx;
-		padding: 6rpx 0;
-		gap: 12rpx;
+    .form-item {
+        display: flex;
+        align-items: center;
+        font-size: 30rpx;
+        padding: 6rpx 0;
+        gap: 12rpx;
 
-		.title {
-			width: 208rpx;
+        .title {
+            width: 208rpx;
             flex-shrink: 0;
 
-			text {
-				color: red;
-				font-weight: bold;
-			}
-		}
+            text {
+                color: red;
+                font-weight: bold;
+            }
+        }
 
-		.right {
-			// width: 450rpx;
-			flex: 1;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-			position: relative;
-			display: flex;
-			
-			picker {
-				width: 100%;
-			}
+        .right {
+            // width: 450rpx;
+            flex: 1;
+            border-radius: 22rpx;
+            border: 1px solid #acacac;
+            position: relative;
+            display: flex;
 
-			.uni-combox {
-				width: 100%;
-			}
-		}
+            picker {
+                width: 100%;
+            }
 
-		.righton {
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
+            .uni-combox {
+                width: 100%;
+            }
+        }
 
-		input {
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
+        .righton {
+            width: 450rpx;
+            border-radius: 22rpx;
+            border: 1px solid #e4e4e4;
+            background-color: #e4e4e4;
+        }
 
-		textarea {
-			width: 98%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
+        input {
+            width: 100%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
 
-		.icon-wrapper {
-			background-color: #3A78FF;
+        textarea {
+            width: 98%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
 
-			border-radius: 100%;
-			width: 52rpx;
-			height: 52rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
+        .icon-wrapper {
+            background-color: #3A78FF;
+
+            border-radius: 100%;
+            width: 52rpx;
+            height: 52rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
             flex-shrink: 0;
 
-			.uni-icons {
-				color: #fff !important;
-			}
-		}
+            .uni-icons {
+                color: #fff !important;
+            }
+        }
 
-		.icon-wrapper[disabled] {
-			background-color: rgba(228, 228, 228, 1);
-			;
-			pointer-events: none;
-			touch-action: none;
-		}
+        .icon-wrapper[disabled] {
+            background-color: rgba(228, 228, 228, 1);
+            ;
+            pointer-events: none;
+            touch-action: none;
+        }
 
-	}
+    }
 
-	.bottom-btn {
-		width: 100%;
-		box-sizing: border-box;
-		// height: 120rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #fff;
-		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-		padding: 30rpx 40rpx 40rpx 40rpx;
-		display: flex;
-		flex-direction: row;
-		gap: 10rpx;
+    .bottom-btn {
+        width: 100%;
+        box-sizing: border-box;
+        // height: 120rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 30rpx 40rpx 40rpx 40rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
 
-		button {
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-		}
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
 
-		.btn-a {
-			background-color: #3A78FF;
-			color: #fff;
-		}
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
 
-		.btn-b {
-			background-color: #41a863;
-			color: #fff;
-		}
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
 
-		.btn-c {
-			background-color: #acacac;
-			color: #fff;
-			// position: absolute;
-			// right: 120rpx;
-		}
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+            // position: absolute;
+            // right: 120rpx;
+        }
 
-		.btn-d {
-			background-color: #ff8901;
-			color: #fff;
-		}
-	}
+        .btn-d {
+            background-color: #ff8901;
+            color: #fff;
+        }
+    }
 
-	.list {
-		width: 100%;
+    .list {
+        width: 100%;
 
-		.card-detail {
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
+        .card-detail {
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            line-height: 120%;
 
-			.detail {
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
+            .detail {
+                // width: 50%;
+                font-size: 26rpx;
+                margin-bottom: 12rpx;
+                color: #555;
+                margin-right: 20rpx;
 
-				text {
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
+                text {
+                    color: #999;
+                    font-size: 26rpx;
+                }
+            }
+        }
 
-		.more {
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
+        .more {
+            color: #888;
+            font-size: 24rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
 
-			.part {
-				width: 50%;
-				text-align: center;
-			}
-		}
-	}
+            .part {
+                width: 50%;
+                text-align: center;
+            }
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/pages/weiwairuku/form.vue b/pages/weiwairuku/form.vue
index 49d416d..92b57c8 100644
--- a/pages/weiwairuku/form.vue
+++ b/pages/weiwairuku/form.vue
@@ -21,14 +21,15 @@
                 <view class="title">浠撳簱:</view>
                 <view class="right">
                     <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
-                        @input="HWHNameChange"></uni-combox>
+                        @input="HWHNameChange" @confirm="HWHNameScan"></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>
+                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
+                        @confirm='HStockPlaceNameScan'></uni-combox>
                 </view>
                 <view class="righton" v-show="!showHStockPlaceName">
                     <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="涓嶅彲鎿嶄綔" />
@@ -391,6 +392,16 @@
             BillListPopupVue,
             BarCodePopupVue
         },
+        computed: {
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                        .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                        .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
+        },
         onLoad(e) {
             console.log(e, this.userInfo)
             this.OperationType = e.OperationType
@@ -420,6 +431,32 @@
             uni.$off('BillSelectComplete')
         },
         methods: {
+            async HWHNameScan(e) {
+                // 鎵弿浠撳簱鐮�
+                console.log('浠撳簱鐮�: ', e);
+                let index = this.HWHNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+                    })
+                } else {
+                    this.HWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
+                }
+            },
+            async HStockPlaceNameScan(e) {
+                // 鎵弿浠撲綅鐮�
+                console.log('浠撲綅鐮�: ', e);
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e.trim())
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
             async qrCodeDisplay() {
                 try {
                     this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
@@ -743,12 +780,21 @@
             },
             //閫夋嫨浠撲綅
             HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
-                    }
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
                 }
+
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                //     if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                //         this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                //         this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+                //     }
+                // }
             },
             //閫夋嫨婧愬崟
             HSourceBillNoChange(e) {
diff --git a/pages/xiaoshouchuku/form.vue b/pages/xiaoshouchuku/form.vue
index e1c6964..971e669 100644
--- a/pages/xiaoshouchuku/form.vue
+++ b/pages/xiaoshouchuku/form.vue
@@ -27,7 +27,7 @@
             <view class="form-item">
                 <view class="title">浠撲綅:</view>
                 <view class="right" v-show="showHStockPlaceName">
-                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
                         v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                         @confirm="HStockPlaceNameScan"></uni-combox>
                 </view>
@@ -319,7 +319,7 @@
                 ModRightName: 'CE_SellOut',
                 OperationType: 1,
                 HInterID_Temp: '',
-                
+
                 showHStockPlaceName: false,
                 showHMainSourceBillType: true,
                 showHSourceBillNo: true,
@@ -334,7 +334,7 @@
                 tabs: 0,
                 HMainSourceBillType: '鍙戣揣閫氱煡鍗�',
                 arrayHMainSourceBillType: ['鍙戣揣閫氱煡鍗�', '閿�鍞鍗�', '鎵嬪伐褰曞叆'],
-                arrayHMainSourceBillValue: ['1402','1401','-1'],
+                arrayHMainSourceBillValue: ['1402', '1401', '-1'],
                 linterid: '',
                 HBillNo: '',
                 btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
@@ -408,10 +408,10 @@
         computed: {
             enableModule: {
                 get() {
-                    if (this.hform.HMainSourceBillType == 1402 && 
-                      /鍏磋揪|鏉$爜娴嬭瘯/.test(uni.getStorageSync('Organization')) 
+                    if (this.hform.HMainSourceBillType == 1402 &&
+                        /鍏磋揪|鏉$爜娴嬭瘯/.test(uni.getStorageSync('Organization'))
                     ) {
-                        
+
                         return 1
                     } else {
                         return 2
@@ -420,6 +420,14 @@
 
                 // 鍏朵粬鏉′欢
             },
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                        .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                        .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
         },
         onLoad(e) {
             console.log(e, this.userInfo)
@@ -548,7 +556,7 @@
                 } else {
                     inputVal = this.hform.HSourceBillNo
                 }
-                
+
                 if (inputVal == '') {
                     CommonUtils.playSound(0)
                     return uni.showToast({
@@ -790,12 +798,21 @@
             },
             //閫夋嫨浠撲綅
             HStockPlaceNameChange(e) {
-                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
-                    }
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
                 }
+
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                //     if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                //         this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                //         this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                //     }
+                // }
             },
             //閫夋嫨婧愬崟
             HSourceBillNoChange(e) {
@@ -1472,11 +1489,12 @@
                                 uni.hideLoading()
                                 if (res.data.count == 1) {
                                     try {
-                                        if(this.hform.HMainSourceBillType == '1402') {
-                                            if(/鍏磋揪|鏅轰簯/.test(uni.getStorageSync('Organization'))){
-                                                let sMain = JSON.stringify(this.materMeta) + ';' + this.hform
+                                        if (this.hform.HMainSourceBillType == '1402') {
+                                            if (/鍏磋揪|鏅轰簯/.test(uni.getStorageSync('Organization'))) {
+                                                let sMain = JSON.stringify(this.materMeta) + ';' + this
+                                                    .hform
                                                     .HBillType + ';' + this.hform.HSourceBillNo + ';鍏磋揪'
-                                                this.Set_BarCodeBill(sMain) 
+                                                this.Set_BarCodeBill(sMain)
                                             }
                                         }
                                         uni.showModal({
@@ -1538,7 +1556,7 @@
                                 resolve()
                             } else {
                                 uni.showToast({
-                                    icon:'none',
+                                    icon: 'none',
                                     title: Message
                                 })
                                 reject(Message)
diff --git a/pages/xiaoshoutuihuo/form.vue b/pages/xiaoshoutuihuo/form.vue
index 1a51a65..9be163c 100644
--- a/pages/xiaoshoutuihuo/form.vue
+++ b/pages/xiaoshoutuihuo/form.vue
@@ -1,356 +1,396 @@
 <template>
-	<view>
-		<view class="form">
-			<view class="form-item">
-				<view class="title">鏉$爜:</view>
-				<view class="right" style="width: 380rpx;">
-					<input :focus="BarCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
-						@confirm="getCode(hform.HBarCode)" />
-				</view>
-				<uni-icons type="scan"
-					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
-					size="20" @click="toScanCode"></uni-icons>
-			</view>
-			<view class="form-item">
-				<view class="title">鏁伴噺:</view>
-				<view class="right">
-					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撳簱:</view>
-				<view class="right">
-					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
-						@input="HWHNameChange"></uni-combox>
-				</view>
-			</view>
-			<view class="form-item">
-				<view class="title">浠撲綅:</view>
-				<view class="right" v-show="showHStockPlaceName">
-					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
-						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
-				</view>
-				<view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
-						placeholder="涓嶅彲鎿嶄綔" /></view>
-			</view>
+    <view>
+        <view class="form">
+            <view class="form-item">
+                <view class="title">鏉$爜:</view>
+                <view class="right" style="width: 380rpx;">
+                    <input :focus="BarCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+                        @confirm="getCode(hform.HBarCode)" />
+                </view>
+                <uni-icons type="scan"
+                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+                    size="20" @click="toScanCode"></uni-icons>
+            </view>
+            <view class="form-item">
+                <view class="title">鏁伴噺:</view>
+                <view class="right">
+                    <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">浠撳簱:</view>
+                <view class="right">
+                    <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+                        @input="HWHNameChange"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">浠撲綅:</view>
+                <view class="right" v-show="showHStockPlaceName">
+                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+                </view>
+                <view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
+                        placeholder="涓嶅彲鎿嶄綔" /></view>
+            </view>
 
-			<view class="tabs">
-				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
-				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
-				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
-				<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
-			</view>
+            <view class="tabs">
+                <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view>
+                <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
+                <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
+                <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
+            </view>
 
-			<view v-if="tabs == 0">
-				<view class="form-item">
-					<view class="title">婧愬崟绫诲瀷:</view>
-					<view class="right" v-show="showHMainSourceBillType">
-						<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
-							@change="HMainSourceBillTypeChange">
-							<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
-								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-							<view class="picker-overlay"></view>
-						</picker>
-					</view>
-					<view class="righton" v-show="!showHMainSourceBillType">
-						<input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
-							placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">婧愬崟鍗曞彿:</view>
-					<view class="right" style="width: 380rpx;" v-show="showHSourceBillNo">
-						<input v-model="hform.HSourceBillNo" :focus="HSourceBillNoFocus"
-							@confirm="onHSourceBillNoConfirmHandler" placeholder="璇锋壂鎻�(鎴栬緭鍏�)婧愬崟鍗曞彿" />
-					</view>
-					<uni-icons v-show="showHSourceBillNo" type="scan"
-						style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
-						size="20" @click="toScanCodeA()"></uni-icons>
-					<view class="righton" v-show="!showHSourceBillNo">
-						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鏃ユ湡:</view>
-					<view class="right">
-						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
-							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
-							<view class="picker-overlay"></view>
-						</picker>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍒跺崟浜�:</view>
-					<view class="righton">
-						<input name="HMaker" disabled v-model="hform.HMaker" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曟嵁鍙�:</view>
-					<view class="righton">
-						<input name="HBillNo" disabled v-model="hform.HBillNo" />
-					</view>
+            <view v-if="tabs == 0">
+                <view class="form-item">
+                    <view class="title">婧愬崟绫诲瀷:</view>
+                    <view class="right" v-show="showHMainSourceBillType">
+                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
+                            @change="HMainSourceBillTypeChange">
+                            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+                                placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+                            <view class="picker-overlay"></view>
+                        </picker>
+                    </view>
+                    <view class="righton" v-show="!showHMainSourceBillType">
+                        <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
+                            placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">婧愬崟鍗曞彿:</view>
+                    <view class="right" style="width: 380rpx;" v-show="showHSourceBillNo">
+                        <input v-model="hform.HSourceBillNo" :focus="HSourceBillNoFocus"
+                            @confirm="onHSourceBillNoConfirmHandler" placeholder="璇锋壂鎻�(鎴栬緭鍏�)婧愬崟鍗曞彿" />
+                    </view>
+                    <uni-icons v-show="showHSourceBillNo" type="scan"
+                        style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+                        size="20" @click="toScanCodeA()"></uni-icons>
+                    <view class="righton" v-show="!showHSourceBillNo">
+                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏃ユ湡:</view>
+                    <view class="right">
+                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+                            <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+                            <view class="picker-overlay"></view>
+                        </picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒跺崟浜�:</view>
+                    <view class="righton">
+                        <input name="HMaker" disabled v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
+                    </view>
                     <uni-icons type="scan"
-                    	style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
-                    	size="20" @click="qrCodeDisplay"></uni-icons>
-                   
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曟嵁ID:</view>
-					<view class="righton">
-						<input name="HInterID" disabled v-model="hform.HInterID" />
-					</view>
-				</view>
-			</view>
+                        style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+                        size="20" @click="qrCodeDisplay"></uni-icons>
 
-			<view v-if="tabs == 1">
-				<view class="form-item">
-					<view class="title">淇濈:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
-							@input="HKeeperNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">楠屾敹:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
-							@input="HSecManagerNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">閮ㄩ棬:</view>
-					<view class="right">
-						<uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
-							@input="HDeptNameChange"></uni-combox>
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹㈡埛:</view>
-					<!-- <view class="right" v-show="showHSupName">
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁ID:</view>
+                    <view class="righton">
+                        <input name="HInterID" disabled v-model="hform.HInterID" />
+                    </view>
+                </view>
+            </view>
+
+            <view v-if="tabs == 1">
+                <view class="form-item">
+                    <view class="title">淇濈:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨淇濈鍛�" v-model="hform.HKeeperName"
+                            @input="HKeeperNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">楠屾敹:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨楠屾敹鍛�" v-model="hform.HSecManagerName"
+                            @input="HSecManagerNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">閮ㄩ棬:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+                            @input="HDeptNameChange"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹㈡埛:</view>
+                    <!-- <view class="right" v-show="showHSupName">
 						<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨瀹㈡埛" v-model="hform.HSupName"
 							@input="HSupNameChange"></uni-combox>
 					</view> -->
-					<view class="righton">
-						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">缁勭粐:</view>
-					<view class="righton">
-						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
-					</view>
-				</view>
-			</view>
+                    <view class="righton">
+                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">缁勭粐:</view>
+                    <view class="righton">
+                        <input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+                    </view>
+                </view>
+            </view>
 
-			<view v-if="tabs == 2">
-				<view class="list" v-for="(item,index) in Materlist" :key="index">
-					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
-						<view class="card-detail">
-							<view class="detail">
-								<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
-							</view>
-							<view class="detail">
-								<text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
-							</view>
-							<view class="detail">
-								<text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
-							</view>
-							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
-								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
-							</view>
-							<view class="detail" v-if="item.杈呭姪灞炴��">
-								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
-							</view>
-						</view>
-					</uni-card>
-				</view>
-				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
-			</view>
+            <view v-if="tabs == 2">
+                <view class="list" v-for="(item,index) in Materlist" :key="index">
+                    <uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+                            </view>
+                            <view class="detail">
+                                <text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+                            </view>
+                            <view class="detail">
+                                <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+                            </view>
+                            <view class="detail">
+                                <text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
+                            </view>
+                            <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+                                <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+                            </view>
+                            <view class="detail" v-if="item.杈呭姪灞炴��">
+                                <text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+                            </view>
+                        </view>
+                    </uni-card>
+                </view>
+                <view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+            </view>
 
-			<view v-if="tabs == 3">
-				<view class="form-item">
-					<view class="title">鏉$爜:</view>
-					<view class="righton">
-						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鐗╂枡:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HMaterName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瑙勬牸:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HMaterModel_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鎵规:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HBatchNo_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鍗曚綅:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HUnitName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">鏁伴噺:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HQty_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">瀹归噺:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HTMQty_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">浠撳簱:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HWHName_B" />
-					</view>
-				</view>
-				<view class="form-item">
-					<view class="title">浠撲綅:</view>
-					<view class="righton">
-						<input disabled v-model="hform.HSPName_B" />
-					</view>
-				</view>
-			</view>
+            <view v-if="tabs == 3">
+                <view class="form-item">
+                    <view class="title">鏉$爜:</view>
+                    <view class="righton">
+                        <input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鐗╂枡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HMaterName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瑙勬牸:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HMaterModel_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鎵规:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBatchNo_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曚綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HUnitName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏁伴噺:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HQty_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹归噺:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HTMQty_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浠撳簱:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HWHName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浠撲綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HSPName_B" />
+                    </view>
+                </view>
+            </view>
 
-			<view class="bottom-btn">
-				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-				<view style="flex: 1;"></view>
-				<button class="btn-a" size="mini" @tap="addNew">鏂板</button>
-				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-			</view>
-		</view>
+            <view class="bottom-btn">
+                <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+                <view style="flex: 1;"></view>
+                <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+                <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+            </view>
+        </view>
         <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
     </view>
 </template>
 <script>
-	import getDateTime from '@/utils/getdateTime.js';
-	import {
-		getUserInfo
-	} from "@/utils/auth.js";
-	import { getUserStockRelation } from '../../utils/userRelationManager';
-	import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    import getDateTime from '@/utils/getdateTime.js';
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import {
+        getUserStockRelation
+    } from '../../utils/userRelationManager';
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
     export default {
-        components: {BarCodePopupVue},
-		data() {
-			return {
-				userInfo: getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				HModName: 'Kf_SellOutBackBill_PDA',
-				ModRightName: 'CE_SellOutBack',
-				OperationType: 1,
-				HInterID_Temp: '',
+        components: {
+            BarCodePopupVue
+        },
+        computed: {
+            HStockPlaceNameListComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴斾粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                        .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                        .map(e => e['浠撲綅鍚嶇О'])
+                }
+            }
+        },
+        data() {
+            return {
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                HModName: 'Kf_SellOutBackBill_PDA',
+                ModRightName: 'CE_SellOutBack',
+                OperationType: 1,
+                HInterID_Temp: '',
 
-				showHStockPlaceName: false,
-				showHMainSourceBillType: true,
-				showHSourceBillNo: true,
-				reHSourceBillNo: true,
-				showHSupName: true,
-				BarCodeFocus: false,
-				HSourceBillNoFocus: false,
+                showHStockPlaceName: false,
+                showHMainSourceBillType: true,
+                showHSourceBillNo: true,
+                reHSourceBillNo: true,
+                showHSupName: true,
+                BarCodeFocus: false,
+                HSourceBillNoFocus: false,
 
 
-				tabs: 0,
-				HMainSourceBillType: '閫�璐ч�氱煡鍗�',
-				arrayHMainSourceBillType: ['閫�璐ч�氱煡鍗�', '閿�鍞鍗�', '鎵嬪伐褰曞叆'],
+                tabs: 0,
+                HMainSourceBillType: '閫�璐ч�氱煡鍗�',
+                arrayHMainSourceBillType: ['閫�璐ч�氱煡鍗�', '閿�鍞鍗�', '鎵嬪伐褰曞叆'],
 
-				linterid: '',
-				HBillNo: '',
-				btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
-				showmore: false,
+                linterid: '',
+                HBillNo: '',
+                btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+                showmore: false,
 
-				arrayHWHName: [], //浠撳簱
-				HWHNameList: [],
-				arrayHStockPlaceName: [], //浠撲綅
-				HStockPlaceNameList: [],
-				arrayHSourceBillNo: [], //婧愬崟鍗曞彿
-				HSourceBillNoList: [],
+                arrayHWHName: [], //浠撳簱
+                HWHNameList: [],
+                arrayHStockPlaceName: [], //浠撲綅
+                HStockPlaceNameList: [],
+                arrayHSourceBillNo: [], //婧愬崟鍗曞彿
+                HSourceBillNoList: [],
 
-				arrayHEmpName: [], //鎿嶄綔鍛�
-				HEmpNameList: [],
-				arrayHDeptName: [], //閮ㄩ棬
-				HDeptNameList: [],
-				arrayHSupName: [], //瀹㈡埛
-				HSupNameList: [],
+                arrayHEmpName: [], //鎿嶄綔鍛�
+                HEmpNameList: [],
+                arrayHDeptName: [], //閮ㄩ棬
+                HDeptNameList: [],
+                arrayHSupName: [], //瀹㈡埛
+                HSupNameList: [],
 
-				Materlist: [],
-				hform: {
-					HBillType: 1247,
-					HBillerID: uni.getStorageSync('HBillerID'),
-					HRedBlueFlag: false,
+                Materlist: [],
+                hform: {
+                    HBillType: 1247,
+                    HBillerID: uni.getStorageSync('HBillerID'),
+                    HRedBlueFlag: false,
 
-					HBarCode: '',
-					HQty: '',
-					HWHName: getUserInfo().HWHName,
-					HWHID: getUserInfo().HWhID,
-					HStockPlaceName: getUserInfo().HSPName,
-					HStockPlaceID: getUserInfo().HSPID,
+                    HBarCode: '',
+                    HQty: '',
+                    HWHName: getUserInfo().HWHName,
+                    HWHID: getUserInfo().HWhID,
+                    HStockPlaceName: getUserInfo().HSPName,
+                    HStockPlaceID: getUserInfo().HSPID,
 
-					HMainSourceBillType: 1403,
-					HSourceBillNo: '', //CGDD000200
-					HDate: getDateTime.dateTimeStr('y-m-d'),
-					HMaker: uni.getStorageSync('HUserName'),
-					HBillNo: '',
-					HInterID: '',
+                    HMainSourceBillType: 1403,
+                    HSourceBillNo: '', //CGDD000200
+                    HDate: getDateTime.dateTimeStr('y-m-d'),
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HBillNo: '',
+                    HInterID: '',
 
-					HKeeperName: getUserInfo().HKeeper,
-					HKeeperID: getUserInfo().HKeeperID,
-					HSecManagerName: getUserInfo().HSecManager,
-					HSecManagerID: getUserInfo().HSecManagerID,
-					HDeptName: getUserInfo().HDept,
-					HDeptID: getUserInfo().HDeptID,
-					HSupName: '',
-					HSupID: '',
-					HStockOrgName: uni.getStorageSync('Organization'),
-					HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    HKeeperName: getUserInfo().HKeeper,
+                    HKeeperID: getUserInfo().HKeeperID,
+                    HSecManagerName: getUserInfo().HSecManager,
+                    HSecManagerID: getUserInfo().HSecManagerID,
+                    HDeptName: getUserInfo().HDept,
+                    HDeptID: getUserInfo().HDeptID,
+                    HSupName: '',
+                    HSupID: '',
+                    HStockOrgName: uni.getStorageSync('Organization'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
 
-					HBarCode_B: '',
-					HMaterName_B: '',
-					HMaterModel_B: '',
-					HBatchNo_B: '',
-					HUnitName_B: '',
-					HQty_B: '',
-					HTMQty_B: '',
-					HWHName_B: '',
-					HSPName_B: '',
-				}
-			}
-		},
-		onLoad(e) {
-			console.log(e, this.userInfo)
-			this.OperationType = e.OperationType
-			if (e.HInterID) {
-				this.HInterID_Temp = e.HInterID
-				// this.btnType = 1
-				this.RoadBillMain(e.HInterID)
-				this.refreshBarCodeState()
-			} else {
-				this.getNewData()
-				this.refreshHSourceBillState()
-			}
-			// this.getHBaseList()
-			this.getHSupList()
-			this.getHEmpList()
-			this.getHDeptList()
-			
-			this.getRelationStore()
-		},
-		methods: {
+                    HBarCode_B: '',
+                    HMaterName_B: '',
+                    HMaterModel_B: '',
+                    HBatchNo_B: '',
+                    HUnitName_B: '',
+                    HQty_B: '',
+                    HTMQty_B: '',
+                    HWHName_B: '',
+                    HSPName_B: '',
+                }
+            }
+        },
+        onLoad(e) {
+            console.log(e, this.userInfo)
+            this.OperationType = e.OperationType
+            if (e.HInterID) {
+                this.HInterID_Temp = e.HInterID
+                // this.btnType = 1
+                this.RoadBillMain(e.HInterID)
+                this.refreshBarCodeState()
+            } else {
+                this.getNewData()
+                this.refreshHSourceBillState()
+            }
+            // this.getHBaseList()
+            this.getHSupList()
+            this.getHEmpList()
+            this.getHDeptList()
+
+            this.getRelationStore()
+        },
+        methods: {
+            async HWHNameScan(e) {
+                // 鎵弿浠撳簱鐮�
+                console.log('浠撳簱鐮�: ', e);
+                let index = this.HWHNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+                    })
+                } else {
+                    this.HWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
+                }
+            },
+            async HStockPlaceNameScan(e) {
+                // 鎵弿浠撲綅鐮�
+                console.log('浠撲綅鐮�: ', e);
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e.trim())
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
             async qrCodeDisplay() {
                 try {
                     this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
@@ -363,1108 +403,1119 @@
                     })
                 }
             },
-			async getRelationStore() {
-				let {
-					data,
-					count
-				} = await getUserStockRelation()
-				if (count == 1) {
-					let WHIDList = []
-					
-					Array.from(data).forEach(elem => {			
-						WHIDList.push(elem.HItemID)			
-					})
-					
-					let sWhere = ` and HItemID in (${WHIDList.join(",")})`
-					this.getHBaseList({
-						sWhere: sWhere
-					})
-					
-				} else {
-					this.getHBaseList()
-				}
-			},
-			async refreshHSourceBillState() {
-				this.HSourceBillNoFocus = false
-				await this.$nextTick(() => {
-					this.hform.HSourceBillNo = ""
-					this.HSourceBillNoFocus = true
-				})
-				if (this.hform.HMainSourceBillType == -1) {
-					await this.refreshBarCodeState()
-				}
-			},
-			async refreshBarCodeState() {
-				this.BarCodeFocus = false
-				await this.$nextTick(() => {
-					this.hform.HBarCode = ""
-					this.BarCodeFocus = true
-				})
-			},
-			playSound(e) {
-				const innerAudioContext = uni.createInnerAudioContext();
-				if (e == 1) {
-					innerAudioContext.src = '/static/success.wav';
-				} else {
-					innerAudioContext.src = '/static/jingbao.wav';
-				}
-				innerAudioContext.play(); // 鎾斁闊抽
-			},
-			onHSourceBillNoConfirmHandler() {
-				if (this.hform.HMainSourceBillType == -1) {
-					this.playSound(1)
-					this.BarCodeFocus = true
-					return
-				}
-				this.getHBarCodeData(this.hform.HSourceBillNo)
-			},
-			//鎵爜
-			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
-					}
+            async getRelationStore() {
+                let {
+                    data,
+                    count
+                } = await getUserStockRelation()
+                if (count == 1) {
+                    let WHIDList = []
 
-					this.getCode(this.hform.HBarCode)
-				})
-			},
-			toScanCodeA() {
-				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-				mpaasScanModule.mpaasScan({
-					'hideAlbum': true,
-					'timeoutInterval': '10', //瓒呮椂鏃堕棿
-					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				}, (ret) => {
-					console.log(ret.resp_result)
-					this.hform.HSourceBillNo = ret.resp_result
-					this.getHBarCodeData(ret.resp_result)
-				})
-			},
-			//鏃ユ湡
-			HDateChange(e) {
-				console.log(e.detail.value)
-				this.hform.HDate = e.detail.value
-			},
-			//鍩虹浠撳簱璧勬枡
-			getHBaseList({sWhere= ''} = {}) {
-				uni.request({
-					url: this.serverUrl + '/Gy_Warehouse/list',
-					data: {
-						sWhere: sWhere,
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HWHNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
-							}
-						} else {
-							uni.showToast({
-								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
+                    Array.from(data).forEach(elem => {
+                        WHIDList.push(elem.HItemID)
+                    })
 
-				uni.request({
-					url: this.serverUrl + '/Gy_StockPlace/list',
-					data: {
-						sWhere: "",
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HStockPlaceNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
-							}
-						} else {
-							uni.showToast({
-								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
+                    let sWhere = ` and HItemID in (${WHIDList.join(",")})`
+                    this.getHBaseList({
+                        sWhere: sWhere
+                    })
 
-				this.getHYDList()
-			},
-			//婧愬崟璧勬枡
-			getHYDList() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSourceBillList_Json',
-					data: {
-						HBillType: this.hform.HBillType,
-						HSourceBillType: this.hform.HMainSourceBillType,
-						HStockOrgID: this.hform.HStockOrgID,
-						HSourceBillNo: "",
-						HMater: "",
-						HCustom: ""
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HSourceBillNoList = res.data.data
-							console.log(this.HSourceBillNoList)
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
-							}
-							this.reHSourceBillNo = false
-							this.$nextTick(() => {
-								this.reHSourceBillNo = true
-							})
-						} else {
-							uni.showToast({
-								title: '婧愬崟鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浠撳簱
-			HWHNameChange(e) {
-				// var name = e.split("(")
-				for (var i = 0; i < this.HWHNameList.length; i++) {
-					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
-						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
-						this.hform.HWHID = this.HWHNameList[i].HItemID
-					
-						if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
-							this.showHStockPlaceName = true
-						} else {
-							this.hform.HStockPlaceName = ''
-							this.showHStockPlaceName = false
-						}
-					}
-				}
-			},
-			//閫夋嫨浠撲綅
-			HStockPlaceNameChange(e) {
-				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
-					if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
-						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
-						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
-					}
-				}
-			},
-			//閫夋嫨婧愬崟绫诲瀷
-			HMainSourceBillTypeChange(e) {
-				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
-				if (this.HMainSourceBillType == '閫�璐ч�氱煡鍗�') {
-					this.hform.HMainSourceBillType = 1403
-					this.getHYDList()
-				} else if (this.HMainSourceBillType == '閿�鍞鍗�') {
-					this.hform.HMainSourceBillType = 1401
-					this.getHYDList()
-				} else {
-					this.hform.HMainSourceBillType = -1
-					this.getHYDList()
-				}
-			},
+                } else {
+                    this.getHBaseList()
+                }
+            },
+            async refreshHSourceBillState() {
+                this.HSourceBillNoFocus = false
+                await this.$nextTick(() => {
+                    this.hform.HSourceBillNo = ""
+                    this.HSourceBillNoFocus = true
+                })
+                if (this.hform.HMainSourceBillType == -1) {
+                    await this.refreshBarCodeState()
+                }
+            },
+            async refreshBarCodeState() {
+                this.BarCodeFocus = false
+                await this.$nextTick(() => {
+                    this.hform.HBarCode = ""
+                    this.BarCodeFocus = true
+                })
+            },
+            playSound(e) {
+                const innerAudioContext = uni.createInnerAudioContext();
+                if (e == 1) {
+                    innerAudioContext.src = '/static/success.wav';
+                } else {
+                    innerAudioContext.src = '/static/jingbao.wav';
+                }
+                innerAudioContext.play(); // 鎾斁闊抽
+            },
+            onHSourceBillNoConfirmHandler() {
+                if (this.hform.HMainSourceBillType == -1) {
+                    this.playSound(1)
+                    this.BarCodeFocus = true
+                    return
+                }
+                this.getHBarCodeData(this.hform.HSourceBillNo)
+            },
+            //鎵爜
+            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
+                    }
 
-			//鑾峰彇瀹㈡埛鏁版嵁
-			getHSupList() {
-				uni.request({
-					url: this.serverUrl + '/Gy_Customer/list',
-					data: {
-						sWhere: "",
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HSupNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHSupName[i] = res.data.data[i].瀹㈡埛鍚嶇О
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨瀹㈡埛
-			HSupNameChange(e) {
-				for (var i = 0; i < this.HSupNameList.length; i++) {
-					if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
-						this.hform.HSupID = this.HSupNameList[i].HItemID
-						this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
-					}
-				}
-			},
-			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
-			getHDeptList() {
-				uni.request({
-					url: this.serverUrl + '/Gy_Department/list',
-					data: {
-						sWhere: "",
-						user: uni.getStorageSync('HUserName'),
-						Organization: uni.getStorageSync('Organization')
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HDeptNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//閫夋嫨浣跨敤閮ㄩ棬
-			HDeptNameChange(e) {
-				for (var i = 0; i < this.HDeptNameList.length; i++) {
-					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
-						this.hform.HDeptID = this.HDeptNameList[i].HItemID
-						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
-					}
-				}
-			},
-			//鎿嶄綔鍛�
-			getHEmpList() {
-				uni.request({
-					url: this.serverUrl + '/Web/GetEmployeeList_Json',
-					data: {
-						Employee: '',
-						HGroupID: 0
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							this.HEmpNameList = res.data.data
-							for (var i = 0; i < res.data.data.length; i++) {
-								this.arrayHEmpName[i] = res.data.data[i].HName
-							}
-							this.$forceUpdate();
-						} else {
-							uni.showToast({
-								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//淇濈
-			HKeeperNameChange(e) {
-				for (var i = 0; i < this.HEmpNameList.length; i++) {
-					if (this.HEmpNameList[i].HName == e) {
-						console.log(this.HEmpNameList[i])
-						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
-						this.hform.HKeeperName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//楠屾敹
-			HSecManagerNameChange(e) {
-				for (var i = 0; i < this.HEmpNameList.length; i++) {
-					if (this.HEmpNameList[i].HName == e) {
-						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
-						this.hform.HSecManagerName = this.HEmpNameList[i].HName
-					}
-				}
-			},
-			//閫変腑婧愬崟
-			getHBarCodeData(HBarCode) {
-				console.log({
-					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
-				})
-				uni.request({
-					url: this.serverUrl + '/WEBSController/Get_SourceBarCode_SellOutBack_Json',
-					data: {
-						HInterID: this.hform.HInterID,
-						HBillNo: this.hform.HBillNo,
-						HBillType: this.hform.HBillType,
-						HSourceBillNo: HBarCode,
-						HSourceBillType: this.hform.HMainSourceBillType,
-						HMaker: this.hform.HMaker,
-						HStockOrgID: this.hform.HStockOrgID
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
-							var data = res.data.data
-							console.log(2, data);
-							this.hform.HSupName = data.hSupNameField
-							this.hform.HSupID = data.hSupIDField
-							if (data.hDeptIDField != 0) {
-								this.hform.HDeptID = data.hDeptIDField
-								this.hform.HDeptName = data.hDeptNameField
-							}
-							this.hform.HSourceBillNo = data.hSourceBillNoField
-							this.showHMainSourceBillType = false
-							if (data.hMulSourceFlagField == 0) {
-								this.showHSourceBillNo = false
-							}
-							this.tabs = 2
-							this.showHSupName = false
-							this.playSound(1)
-							this.BarCodeFocus = true
-							this.DisBillEntryList()
-						} else {
-							this.playSound(0)
-							this.refreshHSourceBillState()
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						this.playSound(0)
-						this.refreshHSourceBillState()
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//鎵潯鐮佸鐞�
-			getCode(HBarCode) {
-				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
-				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
-				}
-				var sOldBarCode = HBarCode
-				var HDeleteFlag = sOldBarCode.substring(0, 1);
-				var sBarCode = sOldBarCode.slice(1);
+                    this.getCode(this.hform.HBarCode)
+                })
+            },
+            toScanCodeA() {
+                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+                mpaasScanModule.mpaasScan({
+                    'hideAlbum': true,
+                    'timeoutInterval': '10', //瓒呮椂鏃堕棿
+                    'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+                }, (ret) => {
+                    console.log(ret.resp_result)
+                    this.hform.HSourceBillNo = ret.resp_result
+                    this.getHBarCodeData(ret.resp_result)
+                })
+            },
+            //鏃ユ湡
+            HDateChange(e) {
+                console.log(e.detail.value)
+                this.hform.HDate = e.detail.value
+            },
+            //鍩虹浠撳簱璧勬枡
+            getHBaseList({
+                sWhere = ''
+            } = {}) {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Warehouse/list',
+                    data: {
+                        sWhere: sWhere,
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HWHNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
 
-				var sHWHID = this.hform.HWHID
-				var sHSPID = this.hform.HStockPlaceID
-				var sHQty = this.hform.HQty
-				var sSourceBillNo = this.hform.HSourceBillNo
-				var sSourceBillType = this.hform.HMainSourceBillType
-				var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
-				console.log(this.hform.HSourceBillNo, HSourceFlag)
-				if (HDeleteFlag == "*") {
-					if (sBarCode == "") {
-						this.playSound(0)
-						this.refreshBarCodeState()
-						uni.showToast({
-							title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
-							icon: 'none'
-						})
-					} else {
-						uni.request({
-							url: this.serverUrl +
-								'/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
-							data: {
-								HInterID: this.hform.HInterID,
-								HBillType: this.hform.HBillType,
-								HBarCode: sBarCode
-							},
-							success: (res) => {
-								console.log('鍒犻櫎鏉$爜', res.data);
-								this.hform.HBarCode = ''
-								if (res.data.count == 1) {
-									this.playSound(1)
-									this.hform.HQty = ''
-									this.DisBillEntryList()
-								} else {
-									this.playSound(0)
-									this.refreshBarCodeState()
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								this.playSound(0)
-								this.refreshBarCodeState()
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									icon: 'none'
-								})
-							},
-						});
-					}
-				} else {
-					var sBarCode = this.hform.HBarCode
-					if (sHQty == "") {
-						sHQty = 0;
-					}
-					uni.request({
-						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
-						data: {
-							sBarCode: sBarCode,
-							HInterID: this.hform.HInterID,
-							HBillType: this.hform.HBillType,
-							HBillNo: this.hform.HBillNo,
-							HMaker: this.hform.HMaker,
-							HWhID: sHWHID,
-							HSPID: sHSPID,
-							HQty: sHQty,
-							HRedBlueFlag: this.hform.HRedBlueFlag,
-							SourceFlag: HSourceFlag,
-							HSourceBillNo: sSourceBillNo,
-							HSourceBillType: sSourceBillType,
-							HStockOrgID: this.hform.HStockOrgID,
-							HScanStyle: "",
-							HCustom1: "",
-							HCustom2: ""
-						},
-						success: (res) => {
-							console.log('鎵爜杩斿洖', res.data);
-							this.hform.HBarCode = ''
-							if (res.data.count == 1) {
-								this.playSound(1)
-								var data = res.data.data
-								if (data.hBarTypeField == '浠撳簱鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = ''
-									this.hform.HStockPlaceID = 0
-									if (data.hSPFlagField == 0) {
-										this.showHStockPlaceName = false
-									} else {
-										this.showHStockPlaceName = true
-									}
-								} else if (data.hBarTypeField == '浠撲綅鏉$爜') {
-									this.hform.HWHName = data.hWhNameField
-									this.hform.HWHID = data.hWhIDField
-									this.hform.HStockPlaceName = data.hSPNameField
-									this.hform.HStockPlaceID = data.hSPIDField
-								} else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
-									this.hform.HDeptName = data.hDeptNameField
-									this.hform.HDeptID = data.hDeptIDField
-									this.tabs = 1
-								} else if (data.hBarTypeField == '婧愬崟鏉$爜') {
-									this.hform.HSupName = data.hSupNameField
-									this.hform.HSupID = data.hSupIDField
-									if (data.hDeptIDField != 0) {
-										this.hform.HDeptID = data.hDeptIDField
-										this.hform.HDeptName = data.hDeptNameField
-									}
-									this.hform.HSourceBillNo = data.hSourceBillNoField
-									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-									this.hform.HMainSourceBillType = data.hSourceBillTypeField
-									if (data.hSourceBillTypeField == "1403") {
-										this.HMainSourceBillType = '閫�璐ч�氱煡鍗�'
-										this.hform.HMainSourceBillType = 1403
-										this.showHMainSourceBillType = false
-									} else if (data.hSourceBillTypeField == "1401") {
-										this.HMainSourceBillType = '閿�鍞鍗�'
-										this.hform.HMainSourceBillType = 1401
-										this.showHMainSourceBillType = false
-									} else {
-										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-										this.hform.HMainSourceBillType = -1
-										this.showHMainSourceBillType = false
-									}
-									if (data.hMulSourceFlagField == 0) {
-										this.showHSourceBillNo = false
-									}
-									//瀹㈡埛涓嶅彲缂栬緫
-									this.showHSupName = false
-									this.tabs = 2
-								} else { //鐗╂枡鏉$爜
-									this.tabs = 2
-									if (!this.hform.HSourceBillNo) {
-										this.hform.HSupName = data.hSupNameField
-										this.hform.HSupID = data.hSupIDField
-										this.hform.HSourceBillNo = data.hSourceBillNoField
-										if (data.hDeptIDField != 0) {
-											this.hform.HDeptID = data.hDeptIDField
-											this.hform.HDeptName = data.hDeptNameField
-										}
-										console.log(data)
-										//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
-										this.hform.HMainSourceBillType = data.hSourceBillTypeField
-									
-										let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
-											.hSourceBillTypeField)
-										if (index != -1) {
-											this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
-											this.hform.HMainSourceBillType = data.hSourceBillTypeField
-											this.showHMainSourceBillType = false
-										}
-										// if (data.hSourceBillTypeField == "1103") {
-										// 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
-										// 	this.hform.HMainSourceBillType = 1103
-										// 	this.showHMainSourceBillType = false
-										// } else if (data.hSourceBillTypeField == "1102") {
-										// 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
-										// 	this.hform.HMainSourceBillType = 1102
-										// 	this.showHMainSourceBillType = false
-										// } else {
-										// 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-										// 	this.hform.HMainSourceBillType = -1
-										// 	this.showHMainSourceBillType = false
-										// }
-										if (data.hMulSourceFlagField == 0) {
-											this.showHSourceBillNo = false
-										}
-										//渚涘簲鍟嗕笉鍙紪杈�
-										this.showHSupName = false
-									}
-								}
-								//鏄剧ず琛ㄤ綋鏄庣粏
-								this.DisBillEntryList()
-								//娓呯┖鏁伴噺
-								this.hform.HQty = ''
-							} else {
-								this.playSound(0)
-								this.refreshBarCodeState()
-								uni.showToast({
-									title: res.data.Message,
-									icon: 'none'
-								})
-							}
-						},
-						fail: (res) => {
-							this.playSound(0)
-							this.refreshBarCodeState()
-							console.log(res);
-							uni.showToast({
-								title: '鎺ュ彛璇锋眰澶辫触',
-								icon: 'none'
-							})
-						},
-					});
-				}
-			},
-			//鐗╂枡淇℃伅
-			DisBillEntryList() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
-					data: {
-						HInterID: this.hform.HInterID,
-						HBillNo: this.hform.HBillNo,
-						HBillType: this.hform.HBillType,
-						HStockOrgID: this.hform.HStockOrgID
-					},
-					success: (res) => {
-						console.log('鐗╂枡', res.data)
-						if (res.data.count == 1) {
-							var data = res.data.data
-							this.Materlist = data.Materlist
-							if (!data.BarCodeDetailslist[0].HBarCode) {
-								this.hform.HMaterName_B = ''
-								this.hform.HMaterModel_B = ''
-								this.hform.HBatchNo_B = ''
-								this.hform.HUnitName_B = ''
-								this.hform.HQty_B = ''
-								this.hform.HTMQty_B = ''
-								this.hform.HWHName_B = ''
-								this.hform.HSPName_B = ''
-							} else {
-								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
-								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
-								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
-								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
-								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
-								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
-								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
-								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
-							}
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//鍒犻櫎鐗╂枡鐮�
-			delMater(item) {
-				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
-					success: (res) => {
-						if (res.confirm) {
-							uni.request({
-								url: this.serverUrl +
-									'/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
-								data: {
-									HInterID: this.hform.HInterID,
-									HMaterID: item.HMaterID,
-									HAuxPropID: item.HAuxPropID,
-									HMTONo: item.HMTONo,
-									HSourceInterID: item.HSourceInterID,
-									HSourceEntryID: item.HSourceEntryID,
-									HBillType: this.hform.HBillType
-								},
-								success: (res) => {
-									if (res.data.count == 1) {
-										this.DisBillEntryList()
-									} else {
-										uni.showToast({
-											title: res.data.Message,
-											icon: 'none'
-										})
-									}
-								},
-								fail: (res) => {
-									console.log(res);
-									uni.showToast({
-										title: '鎺ュ彛璇锋眰澶辫触',
-										icon: 'none'
-									})
-								},
-							});
-						}
-					}
-				});
-			},
-			//鏂板
-			getNewData() {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json',
-					data: {
-						HBillType: this.hform.HBillType
-					},
-					success: (res) => {
-						// console.log(res.data)
-						if (res.data.count == 1) {
-							this.hform.HInterID = res.data.data[0].HInterID
-							this.hform.HBillNo = res.data.data[0].HBillNo
-						} else {
-							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			//淇敼鍥炲~鏁版嵁
-			RoadBillMain(HInterID) {
-				uni.request({
-					url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
-					data: {
-						HInterID: HInterID,
-						HBillType: this.hform.HBillType
-					},
-					success: (res) => {
-						console.log(33, res.data.data[0]);
-						if (res.data.count == 1) {
-							var data = res.data.data[0]
-							this.hform.HInterID = data.HInterID
-							this.hform.HBillNo = data.HBillNo
-							this.hform.HMainSourceBillType = data.HSourceBillType
-							this.hform.HSourceBillNo = data.HSourceBillNo
-							if (data.HSourceBillType == 1403) {
-								this.hform.HMainSourceBillType = 1403
-								this.HMainSourceBillType = '閫�璐ч�氱煡鍗�'
-								this.showHSupName = false
-							} else if (data.HSourceBillType == 1401) {
-								this.hform.HMainSourceBillType = 1401
-								this.HMainSourceBillType = '閿�鍞鍗�'
-								this.showHSupName = false
-							} else {
-								this.hform.HMainSourceBillType = -1
-								this.HMainSourceBillType = '鎵嬪伐褰曞叆'
-							}
-							this.showHMainSourceBillType = false
+                uni.request({
+                    url: this.serverUrl + '/Gy_StockPlace/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HStockPlaceNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
 
-							//闈炲婧愬崟妯″紡
-							if (data.HMulSourceBill == 0) {
-								this.showHSourceBillNo = false
-							}
-							this.hform.HDeptID = data.HDeptID
-							this.hform.HDeptName = data.HDeptName
-							this.hform.HSupID = data.HCusID
-							this.hform.HSupName = data.HCusName
-							this.DisBillEntryList()
-							this.tabs = 2
-						} else {
-							uni.showToast({
-								title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
-								icon: 'none'
-							})
-						}
-					},
-					fail: (res) => {
-						console.log(res);
-						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
-						})
-					},
-				});
-			},
-			addNew() {
-				uni.redirectTo({
-					url: '/pages/xiaoshoutuihuo/form?OperationType=1'
-				})
-			},
-			submit() {
-				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
-				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
-				}
-				if (!this.hform.HKeeperName) {
-					this.hform.HKeeperID = 0
-				}
-				if (!this.hform.HSecManagerName) {
-					this.hform.HSecManagerID = 0
-				}
-				if (!this.hform.HDeptName) {
-					this.hform.HDeptID = 0
-				}
-				if (!this.hform.HSupName) {
-					this.hform.HSupID = 0
-				}
-				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
-					uni.showToast({
-						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
-						icon: 'none'
-					})
-				} else if (!this.hform.HBillNo) {
-					uni.showToast({
-						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
-						icon: 'none'
-					})
-				} else if (!this.Materlist || this.Materlist.length == 0) {
-					uni.showToast({
-						title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-						icon: 'none'
-					})
-				} else {
-					var s = 0;
-					for (var i = 0; i < this.Materlist.length; i++) {
-						if (this.Materlist[i].鏁伴噺 > 0) {
-							s = 1;
-						}
-					}
-					if (s == 0) {
-						uni.showToast({
-							title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
-							icon: 'none'
-						})
-					} else {
-						uni.showLoading({
-							title: '璇风◢鍊�'
-						})
-						var sMainStr = JSON.stringify(this.hform);
-						uni.request({
-							url: this.serverUrl + '/WEBSController/set_SaveSellOutBackBill_Json',
-							method: 'POST',
-							dataType: "json",
-							data: {
-								oMain: sMainStr
-							},
-							success: (res) => {
-								console.log(1, res);
-								uni.hideLoading()
-								if (res.data.count == 1) {
-									uni.showModal({
-										title: '鎻愮ず',
-										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-										success: (res) => {
-											if (res.confirm) {
-												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-												uni.redirectTo({
-													url: '/pages/xiaoshoutuihuo/form?OperationType=1'
-												})
-											} else if (res.cancel) {
-												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-												// setTimeout(() => {
-												// 	uni.navigateBack();
-												// }, 50)
-											}
-										}
-									});
-								} else {
-									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
-									})
-								}
-							},
-							fail: (res) => {
-								console.log(res);
-								uni.showToast({
-									title: '鎺ュ彛璇锋眰澶辫触',
-									icon: 'none'
-								})
-							},
-						});
-					}
-				}
-			},
+                this.getHYDList()
+            },
+            //婧愬崟璧勬枡
+            getHYDList() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetSourceBillList_Json',
+                    data: {
+                        HBillType: this.hform.HBillType,
+                        HSourceBillType: this.hform.HMainSourceBillType,
+                        HStockOrgID: this.hform.HStockOrgID,
+                        HSourceBillNo: "",
+                        HMater: "",
+                        HCustom: ""
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HSourceBillNoList = res.data.data
+                            console.log(this.HSourceBillNoList)
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
+                            }
+                            this.reHSourceBillNo = false
+                            this.$nextTick(() => {
+                                this.reHSourceBillNo = true
+                            })
+                        } else {
+                            uni.showToast({
+                                title: '婧愬崟鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨浠撳簱
+            HWHNameChange(e) {
+                // var name = e.split("(")
+                for (var i = 0; i < this.HWHNameList.length; i++) {
+                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+                        this.hform.HWHID = this.HWHNameList[i].HItemID
 
-			goBack() {
-				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
-					success: (res) => {
-						if (res.confirm) {
-							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							uni.redirectTo({
-								url: '/pages/xiaoshoutuihuo/table'
-							})
-						} else if (res.cancel) {
-							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-						}
-					}
-				});
-			}
-		}
-	}
+                        if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+                            this.showHStockPlaceName = true
+                        } else {
+                            this.hform.HStockPlaceName = ''
+                            this.showHStockPlaceName = false
+                        }
+                    }
+                }
+            },
+            //閫夋嫨浠撲綅
+            HStockPlaceNameChange(e) {
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['浠撲綅鍚嶇О'] == e)
+                if (index != -1) {
+                    this.hform.HStockPlaceName = this.HStockPlaceNameList[index].浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = this.HStockPlaceNameList[index].HMainID
+                } else {
+                    this.hform.HStockPlaceName = ''
+                    this.hform.HStockPlaceID = 0
+                }
+                // for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                //     if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                //         this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                //         this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+                //     }
+                // }
+            },
+            //閫夋嫨婧愬崟绫诲瀷
+            HMainSourceBillTypeChange(e) {
+                this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+                if (this.HMainSourceBillType == '閫�璐ч�氱煡鍗�') {
+                    this.hform.HMainSourceBillType = 1403
+                    this.getHYDList()
+                } else if (this.HMainSourceBillType == '閿�鍞鍗�') {
+                    this.hform.HMainSourceBillType = 1401
+                    this.getHYDList()
+                } else {
+                    this.hform.HMainSourceBillType = -1
+                    this.getHYDList()
+                }
+            },
+
+            //鑾峰彇瀹㈡埛鏁版嵁
+            getHSupList() {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Customer/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HSupNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHSupName[i] = res.data.data[i].瀹㈡埛鍚嶇О
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨瀹㈡埛
+            HSupNameChange(e) {
+                for (var i = 0; i < this.HSupNameList.length; i++) {
+                    if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+                        this.hform.HSupID = this.HSupNameList[i].HItemID
+                        this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+                    }
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            getHDeptList() {
+                uni.request({
+                    url: this.serverUrl + '/Gy_Department/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HDeptNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨浣跨敤閮ㄩ棬
+            HDeptNameChange(e) {
+                for (var i = 0; i < this.HDeptNameList.length; i++) {
+                    if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+                        this.hform.HDeptID = this.HDeptNameList[i].HItemID
+                        this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+                    }
+                }
+            },
+            //鎿嶄綔鍛�
+            getHEmpList() {
+                uni.request({
+                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
+                    data: {
+                        Employee: '',
+                        HGroupID: 0
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HEmpNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHEmpName[i] = res.data.data[i].HName
+                            }
+                            this.$forceUpdate();
+                        } else {
+                            uni.showToast({
+                                title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //淇濈
+            HKeeperNameChange(e) {
+                for (var i = 0; i < this.HEmpNameList.length; i++) {
+                    if (this.HEmpNameList[i].HName == e) {
+                        console.log(this.HEmpNameList[i])
+                        this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+                        this.hform.HKeeperName = this.HEmpNameList[i].HName
+                    }
+                }
+            },
+            //楠屾敹
+            HSecManagerNameChange(e) {
+                for (var i = 0; i < this.HEmpNameList.length; i++) {
+                    if (this.HEmpNameList[i].HName == e) {
+                        this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+                        this.hform.HSecManagerName = this.HEmpNameList[i].HName
+                    }
+                }
+            },
+            //閫変腑婧愬崟
+            getHBarCodeData(HBarCode) {
+                console.log({
+                    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
+                })
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/Get_SourceBarCode_SellOutBack_Json',
+                    data: {
+                        HInterID: this.hform.HInterID,
+                        HBillNo: this.hform.HBillNo,
+                        HBillType: this.hform.HBillType,
+                        HSourceBillNo: HBarCode,
+                        HSourceBillType: this.hform.HMainSourceBillType,
+                        HMaker: this.hform.HMaker,
+                        HStockOrgID: this.hform.HStockOrgID
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            var data = res.data.data
+                            console.log(2, data);
+                            this.hform.HSupName = data.hSupNameField
+                            this.hform.HSupID = data.hSupIDField
+                            if (data.hDeptIDField != 0) {
+                                this.hform.HDeptID = data.hDeptIDField
+                                this.hform.HDeptName = data.hDeptNameField
+                            }
+                            this.hform.HSourceBillNo = data.hSourceBillNoField
+                            this.showHMainSourceBillType = false
+                            if (data.hMulSourceFlagField == 0) {
+                                this.showHSourceBillNo = false
+                            }
+                            this.tabs = 2
+                            this.showHSupName = false
+                            this.playSound(1)
+                            this.BarCodeFocus = true
+                            this.DisBillEntryList()
+                        } else {
+                            this.playSound(0)
+                            this.refreshHSourceBillState()
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        this.playSound(0)
+                        this.refreshHSourceBillState()
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //鎵潯鐮佸鐞�
+            getCode(HBarCode) {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HWHName) {
+                    this.hform.HWHID = 0
+                }
+                if (!this.hform.HStockPlaceName) {
+                    this.hform.HStockPlaceID = 0
+                }
+                var sOldBarCode = HBarCode
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+
+                var sHWHID = this.hform.HWHID
+                var sHSPID = this.hform.HStockPlaceID
+                var sHQty = this.hform.HQty
+                var sSourceBillNo = this.hform.HSourceBillNo
+                var sSourceBillType = this.hform.HMainSourceBillType
+                var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
+                console.log(this.hform.HSourceBillNo, HSourceFlag)
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        this.playSound(0)
+                        this.refreshBarCodeState()
+                        uni.showToast({
+                            title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+                            icon: 'none'
+                        })
+                    } else {
+                        uni.request({
+                            url: this.serverUrl +
+                                '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+                            data: {
+                                HInterID: this.hform.HInterID,
+                                HBillType: this.hform.HBillType,
+                                HBarCode: sBarCode
+                            },
+                            success: (res) => {
+                                console.log('鍒犻櫎鏉$爜', res.data);
+                                this.hform.HBarCode = ''
+                                if (res.data.count == 1) {
+                                    this.playSound(1)
+                                    this.hform.HQty = ''
+                                    this.DisBillEntryList()
+                                } else {
+                                    this.playSound(0)
+                                    this.refreshBarCodeState()
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                }
+                            },
+                            fail: (res) => {
+                                this.playSound(0)
+                                this.refreshBarCodeState()
+                                console.log(res);
+                                uni.showToast({
+                                    title: '鎺ュ彛璇锋眰澶辫触',
+                                    icon: 'none'
+                                })
+                            },
+                        });
+                    }
+                } else {
+                    var sBarCode = this.hform.HBarCode
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+                    uni.request({
+                        url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+                        data: {
+                            sBarCode: sBarCode,
+                            HInterID: this.hform.HInterID,
+                            HBillType: this.hform.HBillType,
+                            HBillNo: this.hform.HBillNo,
+                            HMaker: this.hform.HMaker,
+                            HWhID: sHWHID,
+                            HSPID: sHSPID,
+                            HQty: sHQty,
+                            HRedBlueFlag: this.hform.HRedBlueFlag,
+                            SourceFlag: HSourceFlag,
+                            HSourceBillNo: sSourceBillNo,
+                            HSourceBillType: sSourceBillType,
+                            HStockOrgID: this.hform.HStockOrgID,
+                            HScanStyle: "",
+                            HCustom1: "",
+                            HCustom2: ""
+                        },
+                        success: (res) => {
+                            console.log('鎵爜杩斿洖', res.data);
+                            this.hform.HBarCode = ''
+                            if (res.data.count == 1) {
+                                this.playSound(1)
+                                var data = res.data.data
+                                if (data.hBarTypeField == '浠撳簱鏉$爜') {
+                                    this.hform.HWHName = data.hWhNameField
+                                    this.hform.HWHID = data.hWhIDField
+                                    this.hform.HStockPlaceName = ''
+                                    this.hform.HStockPlaceID = 0
+                                    if (data.hSPFlagField == 0) {
+                                        this.showHStockPlaceName = false
+                                    } else {
+                                        this.showHStockPlaceName = true
+                                    }
+                                } else if (data.hBarTypeField == '浠撲綅鏉$爜') {
+                                    this.hform.HWHName = data.hWhNameField
+                                    this.hform.HWHID = data.hWhIDField
+                                    this.hform.HStockPlaceName = data.hSPNameField
+                                    this.hform.HStockPlaceID = data.hSPIDField
+                                } else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
+                                    this.hform.HDeptName = data.hDeptNameField
+                                    this.hform.HDeptID = data.hDeptIDField
+                                    this.tabs = 1
+                                } else if (data.hBarTypeField == '婧愬崟鏉$爜') {
+                                    this.hform.HSupName = data.hSupNameField
+                                    this.hform.HSupID = data.hSupIDField
+                                    if (data.hDeptIDField != 0) {
+                                        this.hform.HDeptID = data.hDeptIDField
+                                        this.hform.HDeptName = data.hDeptNameField
+                                    }
+                                    this.hform.HSourceBillNo = data.hSourceBillNoField
+                                    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                    this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                    if (data.hSourceBillTypeField == "1403") {
+                                        this.HMainSourceBillType = '閫�璐ч�氱煡鍗�'
+                                        this.hform.HMainSourceBillType = 1403
+                                        this.showHMainSourceBillType = false
+                                    } else if (data.hSourceBillTypeField == "1401") {
+                                        this.HMainSourceBillType = '閿�鍞鍗�'
+                                        this.hform.HMainSourceBillType = 1401
+                                        this.showHMainSourceBillType = false
+                                    } else {
+                                        this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                        this.hform.HMainSourceBillType = -1
+                                        this.showHMainSourceBillType = false
+                                    }
+                                    if (data.hMulSourceFlagField == 0) {
+                                        this.showHSourceBillNo = false
+                                    }
+                                    //瀹㈡埛涓嶅彲缂栬緫
+                                    this.showHSupName = false
+                                    this.tabs = 2
+                                } else { //鐗╂枡鏉$爜
+                                    this.tabs = 2
+                                    if (!this.hform.HSourceBillNo) {
+                                        this.hform.HSupName = data.hSupNameField
+                                        this.hform.HSupID = data.hSupIDField
+                                        this.hform.HSourceBillNo = data.hSourceBillNoField
+                                        if (data.hDeptIDField != 0) {
+                                            this.hform.HDeptID = data.hDeptIDField
+                                            this.hform.HDeptName = data.hDeptNameField
+                                        }
+                                        console.log(data)
+                                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
+
+                                        let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
+                                            .hSourceBillTypeField)
+                                        if (index != -1) {
+                                            this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                            this.hform.HMainSourceBillType = data.hSourceBillTypeField
+                                            this.showHMainSourceBillType = false
+                                        }
+                                        // if (data.hSourceBillTypeField == "1103") {
+                                        // 	this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+                                        // 	this.hform.HMainSourceBillType = 1103
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else if (data.hSourceBillTypeField == "1102") {
+                                        // 	this.HMainSourceBillType = '閲囪喘璁㈠崟'
+                                        // 	this.hform.HMainSourceBillType = 1102
+                                        // 	this.showHMainSourceBillType = false
+                                        // } else {
+                                        // 	this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                                        // 	this.hform.HMainSourceBillType = -1
+                                        // 	this.showHMainSourceBillType = false
+                                        // }
+                                        if (data.hMulSourceFlagField == 0) {
+                                            this.showHSourceBillNo = false
+                                        }
+                                        //渚涘簲鍟嗕笉鍙紪杈�
+                                        this.showHSupName = false
+                                    }
+                                }
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                this.DisBillEntryList()
+                                //娓呯┖鏁伴噺
+                                this.hform.HQty = ''
+                            } else {
+                                this.playSound(0)
+                                this.refreshBarCodeState()
+                                uni.showToast({
+                                    title: res.data.Message,
+                                    icon: 'none'
+                                })
+                            }
+                        },
+                        fail: (res) => {
+                            this.playSound(0)
+                            this.refreshBarCodeState()
+                            console.log(res);
+                            uni.showToast({
+                                title: '鎺ュ彛璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        },
+                    });
+                }
+            },
+            //鐗╂枡淇℃伅
+            DisBillEntryList() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
+                    data: {
+                        HInterID: this.hform.HInterID,
+                        HBillNo: this.hform.HBillNo,
+                        HBillType: this.hform.HBillType,
+                        HStockOrgID: this.hform.HStockOrgID
+                    },
+                    success: (res) => {
+                        console.log('鐗╂枡', res.data)
+                        if (res.data.count == 1) {
+                            var data = res.data.data
+                            this.Materlist = data.Materlist
+                            if (!data.BarCodeDetailslist[0].HBarCode) {
+                                this.hform.HMaterName_B = ''
+                                this.hform.HMaterModel_B = ''
+                                this.hform.HBatchNo_B = ''
+                                this.hform.HUnitName_B = ''
+                                this.hform.HQty_B = ''
+                                this.hform.HTMQty_B = ''
+                                this.hform.HWHName_B = ''
+                                this.hform.HSPName_B = ''
+                            } else {
+                                this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+                                this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+                                this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+                                this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+                                this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+                                this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+                                this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+                                this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+                            }
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //鍒犻櫎鐗╂枡鐮�
+            delMater(item) {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
+                                data: {
+                                    HInterID: this.hform.HInterID,
+                                    HMaterID: item.HMaterID,
+                                    HAuxPropID: item.HAuxPropID,
+                                    HMTONo: item.HMTONo,
+                                    HSourceInterID: item.HSourceInterID,
+                                    HSourceEntryID: item.HSourceEntryID,
+                                    HBillType: this.hform.HBillType
+                                },
+                                success: (res) => {
+                                    if (res.data.count == 1) {
+                                        this.DisBillEntryList()
+                                    } else {
+                                        uni.showToast({
+                                            title: res.data.Message,
+                                            icon: 'none'
+                                        })
+                                    }
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        }
+                    }
+                });
+            },
+            //鏂板
+            getNewData() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json',
+                    data: {
+                        HBillType: this.hform.HBillType
+                    },
+                    success: (res) => {
+                        // console.log(res.data)
+                        if (res.data.count == 1) {
+                            this.hform.HInterID = res.data.data[0].HInterID
+                            this.hform.HBillNo = res.data.data[0].HBillNo
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //淇敼鍥炲~鏁版嵁
+            RoadBillMain(HInterID) {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
+                    data: {
+                        HInterID: HInterID,
+                        HBillType: this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(33, res.data.data[0]);
+                        if (res.data.count == 1) {
+                            var data = res.data.data[0]
+                            this.hform.HInterID = data.HInterID
+                            this.hform.HBillNo = data.HBillNo
+                            this.hform.HMainSourceBillType = data.HSourceBillType
+                            this.hform.HSourceBillNo = data.HSourceBillNo
+                            if (data.HSourceBillType == 1403) {
+                                this.hform.HMainSourceBillType = 1403
+                                this.HMainSourceBillType = '閫�璐ч�氱煡鍗�'
+                                this.showHSupName = false
+                            } else if (data.HSourceBillType == 1401) {
+                                this.hform.HMainSourceBillType = 1401
+                                this.HMainSourceBillType = '閿�鍞鍗�'
+                                this.showHSupName = false
+                            } else {
+                                this.hform.HMainSourceBillType = -1
+                                this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+                            }
+                            this.showHMainSourceBillType = false
+
+                            //闈炲婧愬崟妯″紡
+                            if (data.HMulSourceBill == 0) {
+                                this.showHSourceBillNo = false
+                            }
+                            this.hform.HDeptID = data.HDeptID
+                            this.hform.HDeptName = data.HDeptName
+                            this.hform.HSupID = data.HCusID
+                            this.hform.HSupName = data.HCusName
+                            this.DisBillEntryList()
+                            this.tabs = 2
+                        } else {
+                            uni.showToast({
+                                title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: '/pages/xiaoshoutuihuo/form?OperationType=1'
+                })
+            },
+            submit() {
+                //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HWHName) {
+                    this.hform.HWHID = 0
+                }
+                if (!this.hform.HStockPlaceName) {
+                    this.hform.HStockPlaceID = 0
+                }
+                if (!this.hform.HKeeperName) {
+                    this.hform.HKeeperID = 0
+                }
+                if (!this.hform.HSecManagerName) {
+                    this.hform.HSecManagerID = 0
+                }
+                if (!this.hform.HDeptName) {
+                    this.hform.HDeptID = 0
+                }
+                if (!this.hform.HSupName) {
+                    this.hform.HSupID = 0
+                }
+                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+                    uni.showToast({
+                        title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+                        icon: 'none'
+                    })
+                } else if (!this.hform.HBillNo) {
+                    uni.showToast({
+                        title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+                        icon: 'none'
+                    })
+                } else if (!this.Materlist || this.Materlist.length == 0) {
+                    uni.showToast({
+                        title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+                        icon: 'none'
+                    })
+                } else {
+                    var s = 0;
+                    for (var i = 0; i < this.Materlist.length; i++) {
+                        if (this.Materlist[i].鏁伴噺 > 0) {
+                            s = 1;
+                        }
+                    }
+                    if (s == 0) {
+                        uni.showToast({
+                            title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+                            icon: 'none'
+                        })
+                    } else {
+                        uni.showLoading({
+                            title: '璇风◢鍊�'
+                        })
+                        var sMainStr = JSON.stringify(this.hform);
+                        uni.request({
+                            url: this.serverUrl + '/WEBSController/set_SaveSellOutBackBill_Json',
+                            method: 'POST',
+                            dataType: "json",
+                            data: {
+                                oMain: sMainStr
+                            },
+                            success: (res) => {
+                                console.log(1, res);
+                                uni.hideLoading()
+                                if (res.data.count == 1) {
+                                    uni.showModal({
+                                        title: '鎻愮ず',
+                                        content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                                        success: (res) => {
+                                            if (res.confirm) {
+                                                console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                                uni.redirectTo({
+                                                    url: '/pages/xiaoshoutuihuo/form?OperationType=1'
+                                                })
+                                            } else if (res.cancel) {
+                                                console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                                // setTimeout(() => {
+                                                // 	uni.navigateBack();
+                                                // }, 50)
+                                            }
+                                        }
+                                    });
+                                } else {
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                }
+                            },
+                            fail: (res) => {
+                                console.log(res);
+                                uni.showToast({
+                                    title: '鎺ュ彛璇锋眰澶辫触',
+                                    icon: 'none'
+                                })
+                            },
+                        });
+                    }
+                }
+            },
+
+            goBack() {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.redirectTo({
+                                url: '/pages/xiaoshoutuihuo/table'
+                            })
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            }
+        }
+    }
 </script>
 
 <style lang="scss" scoped>
-	.form {
-		width: 668rpx;
-		margin: 20rpx auto;
-		padding-bottom: 240rpx;
-	}
+    .form {
+        width: 668rpx;
+        margin: 20rpx auto;
+        padding-bottom: 240rpx;
+    }
 
-	.tab_area {
-		width: 100%;
-		height: 50rpx;
-	}
+    .tab_area {
+        width: 100%;
+        height: 50rpx;
+    }
 
-	.other {
-		margin-top: 8rpx;
-		text-align: center;
-		font-size: 28rpx;
-		padding: 4rpx 18rpx;
-		color: #1890FF;
-	}
+    .other {
+        margin-top: 8rpx;
+        text-align: center;
+        font-size: 28rpx;
+        padding: 4rpx 18rpx;
+        color: #1890FF;
+    }
 
-	.tabs {
-		width: 100%;
-		display: flex;
-		border-bottom: 1px solid #ddd;
-		margin: 20rpx 0;
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
 
-		view {
-			width: 25%;
-			font-size: 30rpx;
-			color: #555;
-			text-align: center;
-			padding: 16rpx 0;
-		}
+        view {
+            width: 25%;
+            font-size: 30rpx;
+            color: #555;
+            text-align: center;
+            padding: 16rpx 0;
+        }
 
-		.on {
-			color: #3a78ff;
-			font-weight: bold;
-			border-bottom: 3px solid #3a78ff;
-		}
-	}
+        .on {
+            color: #3a78ff;
+            font-weight: bold;
+            border-bottom: 3px solid #3a78ff;
+        }
+    }
 
-	.form-item {
-		display: flex;
-		align-items: center;
-		font-size: 30rpx;
-		padding: 6rpx 0;
+    .form-item {
+        display: flex;
+        align-items: center;
+        font-size: 30rpx;
+        padding: 6rpx 0;
 
-		.title {
-			width: 208rpx;
+        .title {
+            width: 208rpx;
             flex-shrink: 0;
-			text {
-				color: red;
-				font-weight: bold;
-			}
-		}
 
-		.right {
-			flex: 1;
-			border-radius: 22rpx;
-			border: 1px solid #acacac;
-			display: flex;
-			position: relative;
-		}
+            text {
+                color: red;
+                font-weight: bold;
+            }
+        }
 
-		.righton {
-			width: 450rpx;
-			border-radius: 22rpx;
-			border: 1px solid #e4e4e4;
-			background-color: #e4e4e4;
-		}
+        .right {
+            flex: 1;
+            border-radius: 22rpx;
+            border: 1px solid #acacac;
+            display: flex;
+            position: relative;
+        }
 
-		input {
-			width: 100%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
+        .righton {
+            width: 450rpx;
+            border-radius: 22rpx;
+            border: 1px solid #e4e4e4;
+            background-color: #e4e4e4;
+        }
 
-		textarea {
-			width: 98%;
-			padding: 8rpx 20rpx;
-			font-size: 30rpx;
-		}
+        input {
+            width: 100%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
 
-	}
+        textarea {
+            width: 98%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
 
-	.bottom-btn {
-		width: 100%;
-		box-sizing: border-box;
-		// height: 120rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #fff;
-		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-		padding: 30rpx 40rpx 40rpx 40rpx;
-		display: flex;
-		flex-direction: row;
-		gap: 10rpx;
+    }
 
-		button {
-			border-radius: 50rpx;
-			width: 180rpx;
-			height: 66rpx;
-			line-height: 66rpx;
-			font-size: 28rpx;
-		}
+    .bottom-btn {
+        width: 100%;
+        box-sizing: border-box;
+        // height: 120rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 30rpx 40rpx 40rpx 40rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
 
-		.btn-a {
-			background-color: #3A78FF;
-			color: #fff;
-		}
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
 
-		.btn-b {
-			background-color: #41a863;
-			color: #fff;
-		}
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
 
-		.btn-c {
-			background-color: #acacac;
-			color: #fff;
-			// position: absolute;
-			// right: 120rpx;
-		}
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
 
-		.btn-d {
-			background-color: #ff8901;
-			color: #fff;
-		}
-	}
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+            // position: absolute;
+            // right: 120rpx;
+        }
 
-	.list {
-		width: 100%;
+        .btn-d {
+            background-color: #ff8901;
+            color: #fff;
+        }
+    }
 
-		.card-detail {
-			width: 100%;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			line-height: 120%;
+    .list {
+        width: 100%;
 
-			.detail {
-				// width: 50%;
-				font-size: 26rpx;
-				margin-bottom: 12rpx;
-				color: #555;
-				margin-right: 20rpx;
+        .card-detail {
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            line-height: 120%;
 
-				text {
-					color: #999;
-					font-size: 26rpx;
-				}
-			}
-		}
+            .detail {
+                // width: 50%;
+                font-size: 26rpx;
+                margin-bottom: 12rpx;
+                color: #555;
+                margin-right: 20rpx;
 
-		.more {
-			color: #888;
-			font-size: 24rpx;
-			display: flex;
-			border-top: 1px solid #eee;
-			padding-top: 20rpx;
+                text {
+                    color: #999;
+                    font-size: 26rpx;
+                }
+            }
+        }
 
-			.part {
-				width: 50%;
-				text-align: center;
-			}
-		}
-	}
-    
+        .more {
+            color: #888;
+            font-size: 24rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                text-align: center;
+            }
+        }
+    }
+
     .uni-combox {
         width: 100%;
     }
diff --git a/pages/zhijiediaobo/form.vue b/pages/zhijiediaobo/form.vue
index 5b3770f..0c06df4 100644
--- a/pages/zhijiediaobo/form.vue
+++ b/pages/zhijiediaobo/form.vue
@@ -27,7 +27,7 @@
             <view class="form-item">
                 <view class="title">璋冨嚭浠撲綅:</view>
                 <view class="right" v-show="HSCIsStockMgr">
-                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                    <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
                         v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
                         @confirm="HStockPlaceOutNameScan"></uni-combox>
                 </view>
@@ -166,7 +166,7 @@
                 <view class="form-item">
                     <view class="title">璋冨叆浠撲綅:</view>
                     <view class="right" v-show="HIsStockMgr">
-                        <uni-combox :candidates="arrayHStockPlaceInName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                        <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
                             v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
                             @confirm="HStockPlaceNameInScan"></uni-combox>
                     </view>
@@ -549,6 +549,22 @@
                     }
                     return false
                 }
+            },
+            arrayHStockPlaceNameComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴旇皟鍑轰粨搴撶殑浠撲綅
+                    return this.HStockPlaceNameList
+                    .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HSCWHName)
+                    .map(e => e['浠撲綅鍚嶇О'])
+                }
+            },
+            arrayHStockPlaceInNameComputed: {
+                get() {
+                    // 鍔ㄦ�佽绠楀搴旇皟鍏ヤ粨搴撶殑浠撲綅
+                    return this.HStockPlaceInNameList
+                    .filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+                    .map(e => e['浠撲綅鍚嶇О'])
+                }
             }
         },
         methods: {
diff --git a/pages/zutuosaoma/form.vue b/pages/zutuosaoma/form.vue
index 1639741..75c0471 100644
--- a/pages/zutuosaoma/form.vue
+++ b/pages/zutuosaoma/form.vue
@@ -562,6 +562,8 @@
             // #endif
         },
         onLoad(e) {
+            // 1涓� 瑁呯 2涓� 缁勬墭
+            this.BarCodeType = e.BarCodeType || 1
             this.OperationType = e.OperationType || 1
             this.HBarCode_Pack_Temp = e.CommonUtils || ""
 

--
Gitblit v1.9.1