From 645a67de8fc0dcc0393ec69aee926d5677d6adea Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 31 十月 2025 12:16:49 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/fenbushidiaorudan/table.vue          |  542 ++
 pages/index/tab2.vue                       |  136 
 pages/MJGL/shangmudan/form.vue             |   10 
 pages/fenbushidiaorudan/form.vue           | 2453 ++++++++++
 pages/fenbushidiaochudan/table_out.vue     |  542 ++
 pages/shoujishouming/table.vue             |  485 ++
 pages/index/tab1.vue                       |    9 
 pages/MJGL/mujulingliaochukudan/table.vue  |  487 ++
 pages/MJGL/qijudiaobodan/table.vue         |  620 ++
 pages/MJGL/mujulingliaochukudan/form.vue   | 1035 ++++
 pages/index/_index.vue                     |    6 
 pages/fenbushidiaorudan/form_test.vue      | 1502 ++++++
 pages/MJGL/mujulingliaotuikudan/form.vue   |  943 ++++
 pages/index/login.vue                      |    4 
 pages/MJGL/qijudiaobodan/form.vue          | 1242 +++++
 pages/MJGL/mujulingliaotuikudan/table.vue  |  486 ++
 pages/fenbushidiaochudan/form_out.vue      | 2582 +++++++++++
 pages/shoujishouming/form.vue              |  733 +++
 components/BillListPopup/BillListPopup.vue |    6 
 pages/index/index.vue                      |   21 
 20 files changed, 13,793 insertions(+), 51 deletions(-)

diff --git a/components/BillListPopup/BillListPopup.vue b/components/BillListPopup/BillListPopup.vue
index 6b8d023..e89e689 100644
--- a/components/BillListPopup/BillListPopup.vue
+++ b/components/BillListPopup/BillListPopup.vue
@@ -190,6 +190,12 @@
                 this.length = 0
                 this.page = 0
                 this.curPage = 1
+				console.log("1",this.HBillType)
+				console.log("2",this.HSourceBillType)
+				console.log("3",this.HStockOrgID)
+				console.log("4",this.HSourceBillNo)
+				console.log("5",this.HMater)
+				console.log("6",this.HCustom)
                 CommonUtils.doRequest(
                     "/WEBSController/GetSourceBillList_Json", {
                         HBilltype: this.HBillType,
diff --git a/pages/MJGL/mujulingliaochukudan/form.vue b/pages/MJGL/mujulingliaochukudan/form.vue
new file mode 100644
index 0000000..a73f09e
--- /dev/null
+++ b/pages/MJGL/mujulingliaochukudan/form.vue
@@ -0,0 +1,1035 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)"/>
+				</view>
+				<uni-icons type="scan"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20" @click="toScanCode"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撳簱:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+						@input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName">
+					<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName"
+						placeholder="涓嶅彲鎿嶄綔" /></view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍙戞枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HSactterUser"
+						@input="HScatterUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">棰嗘枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗘枡浜�" v-model="hform.HCollectUser"
+						@input="HCollectUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+			    <view class="title">閮ㄩ棬:</view>
+			    <view class="right">
+			        <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+			            @input="HDeptNameChange"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">寰�鏉ョ被鍨�:</view>
+			    <view class="right">
+			        <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+			            @input="HSelectTypeChange"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">寰�鏉ュ崟浣�:</view>
+			    <view class="right">
+			        <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.Selection"
+			            @input=""></uni-combox>
+			    </view>
+			</view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<view class="picker-overlay"></view>
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs==1">
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鏉$爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍚嶇О:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldID_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏁伴噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldCount_B" />
+					</view>
+				</view>
+			</view>
+			<view class="bottom-btn">
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+				<button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<!-- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button> -->
+				<button v-if="btnType != 1 " class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			</view>
+		</view>	
+	</view>
+</template>
+
+<script>
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import { CommonUtils } from '@/utils/common';
+	
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				btnType:1,//1鏂板锛�3淇敼
+				linterid:'',
+				arrayHEmpName: [],
+				HEmpNameList: [],
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHSupName: [], //瀹㈡埛
+				HSupNameList: [],
+				arrayHSupplierName:[],//渚涘簲鍟�
+				HSuplierList:[],
+				linterid: '',
+				HBillNo: '',
+				arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
+				HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
+				showHStockPlaceName: true, 
+				HMouldList:[],
+				isEdit: false,
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3802,
+					HWHName: getUserInfo().HWHName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+					HSactterUserName: getUserInfo().User,
+					HSactterUserID: getUserInfo().User,
+					HCollectUserName: getUserInfo().User,
+					HCollectUserID: getUserInfo().User,
+					HDeptName: getUserInfo().HDept,
+					HDeptID: getUserInfo().HDeptID,
+					HSupName:'',
+					HSupID:'',
+					HSecManagerID:'',
+					HKeeperID:'',
+					//寰�鏉ョ被鍨�
+					TypeName:'',
+					TypeID:'',
+					Selection: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+					SelectionID: '' ,// 寰�鏉ュ崟浣嶅搴旂殑ID
+					HSupTypeID:'',
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+					
+					HRedBlueFlag:'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID:uni.getStorageSync('OrganizationID'),
+					HBarCode_B:'',
+					HMouldName_B:'',
+					HMouldID_B:'',
+					HMouldCount_B:'',
+				}
+			}
+		},
+		methods: {
+			
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					if (this.hform.HBarCode == '*') {
+						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+					} else {
+						this.hform.HBarCode = ret.resp_result
+					}
+
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			getNewData() {
+				CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						let res1 = res.data;
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					})
+			},
+			getCode(HBarCode) { 
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sOldBarCode = HBarCode; 
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo =""
+				var sSourceBillType ="-1" 
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						uni.request({
+							url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_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.hform.HQty = ''
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}else
+				{
+					var sBarCode = this.hform.HBarCode
+					uni.request({
+						url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+						data:{
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HSCWhID:0,
+							HSCSPID: 0,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HStockOutOrgID: this.hform.HStockOutOrgID,
+						},
+						success:(res)=> {
+							console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+							this.hform.HBarCode=''
+							if(res.data.count==1){
+								this.tabs = 1
+								this.DisBillEntryList()
+							}
+							else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					})
+				}
+			}, 
+			//浠撳簱鐩戝惉浜嬩欢
+			HWHNameChange(e) {
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i]["HName"] == e) {
+						this.hform.HWHName = this.HWHNameList[i]["HName"]
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+
+						this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+					}
+				}
+			},
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+					}
+				}
+			},
+			HScatterUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSactterUserID = this.HEmpNameList[i].HItemID
+						this.hform.HSactterUserName = this.HEmpNameList[i].HName
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			HCollectUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HCollectUserID = this.HEmpNameList[i].HItemID
+						this.hform.HCollectUserName = this.HEmpNameList[i].HName
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+			getHBaseList() {
+				CommonUtils.doRequest(
+					"/Web/GetWarehouseList_Json_New", {
+						Warehouse: "",
+						HOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HWHNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHWHName[i] = data[i]["HName"]
+							}
+						} else {
+							uni.showToast({
+								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+				CommonUtils.doRequest(
+					"/WEBSController/GetStockPlaceList_Json", {
+						StockPlace: '',
+						HWhID: this.hform.HWHID,
+						HStockOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						console.log(res1)
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HStockPlaceNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+							}
+						} else {
+							uni.showToast({
+								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			/* #endregion */
+			getHEmpList() {
+				CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+						Employee: '',
+						HGroupID: 0
+					},
+					(res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getHSupList() {
+				CommonUtils.doRequest(
+					"/Gy_Customer/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			getSupplier()
+			{
+				CommonUtils.doRequest(
+					"/WEBSController/GetSupplier_Json", {
+						HBarCode: uni.getStorageSync(''),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			//閫夋嫨瀹㈡埛
+			HSupNameChange(e) {
+			    for (var i = 0; i < this.HSupNameList.length; i++) {
+			        if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+			            this.hform.HSupID = this.HSupNameList[i].HItemID
+			            this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+			        }
+			    }
+			},
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			HSelectTypeChange(e)
+			{
+				this.hform.TypeName=e;
+				this.hform.Selection = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+				this.hform.SelectionID = '';
+				if(e=='閮ㄩ棬')
+				{
+					this.hform.HSupTypeID=3;
+					this.arrayHSelectType = this.arrayHDeptName;
+					this.HSelectTypeList = this.HDeptNameList;
+				}
+				else if(e === '渚涘簲鍟�') {
+					this.hform.HSupTypeID=1;
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				} else if(e === '瀹㈡埛') {
+				// 瀹㈡埛鏁版嵁 - 杩欓噷鐣欑┖锛屽悗缁坊鍔犺幏鍙栧鎴锋暟鎹殑閫昏緫
+					this.hform.HSupTypeID=2;
+					this.arrayHSelectType =this.arrayHSupName;
+					this.HSelectTypeList = this.HSupNameList;
+				} else {
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				}	
+			},
+			//鍣ㄥ叿淇℃伅
+			DisBillEntryList() {
+				CommonUtils.doRequest(
+					"/MouldController/GetMouldBillEntryTmpList_Json", {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						console.log('鍣ㄥ叿', res.data)
+						var data = res.data.data
+						this.HMouldList = data.HMouldList
+						if (data.count==0) {
+							this.hform.HMouldCount_B = ''
+							this.hform.HMouldID_B = ''
+							this.hform.HMouldName_B = ''
+							
+						} else {
+							this.hform.HMouldCount_B = data[0].HQty
+							this.hform.HMouldID_B = data[0].HMouldID
+							this.hform.HMouldName_B = data[0].HMouldName
+							this.hform.HBarCode_B=data[0].HBarCode
+						}
+					},
+			
+				)
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/MJGL/mujulingliaochukudan/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			ifEdit(){
+				this.isEdit = true
+				this.hform.eventType = 'Modify'
+			},
+			//缂栬緫鍥炴樉
+			getEditData(linterid,HBillNo){				
+				//涓昏〃
+				var sWhere = " and hmainid='" + linterid + "'";
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage', 
+					data: { sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page:1,
+						size:100 },
+				    success: (res) => {
+				        console.log(1,res.data.data[0]);
+						if(res.data.code == 1){
+							var data = res.data.data[0]							
+							this.btnType=3
+							this.hform.HInterID= data.hmainid
+							this.hform.HBillNo= data.鍗曟嵁鍙�
+							// this.hform.HBarCode= data.鏉″舰鐮� 瑙嗗浘涓病鏈夎瀛楁
+							this.hform.HDeptID= data.HDeptID
+							this.hform.HDeptName= data.閮ㄩ棬
+							this.hform.HCollectUserName= data.鍙戞枡浜�
+							this.hform.HCollectUserID= data.hkeeperid
+							this.hform.HKeeperID= data.hkeeperid
+							this.hform.HSactterUserName= data.棰嗘枡浜�
+							this.hform.HSactterUserID= data.hsecmanagerid
+							this.hform.HSecManagerID=data.hsecmanagerid
+							this.hform.HMangerName= data.璐熻矗浜�
+							// this.hform.HRemark= data.琛ㄥご澶囨敞						
+							this.hform.HDate = data.鏃ユ湡.substr(0,10)
+							
+							this.hform.HWHID=data.HWHID,
+							this.hform.HWHName=data.浠撳簱,
+							this.hform.HStockPlaceID=data.HSPID,
+							this.hform.HStockPlaceName=data.浠撲綅,
+							
+							this.hform.Selection=data.寰�鏉ュ崟浣�,
+							this.hform.SelectionID=data.HSupID,
+							this.hform.TypeName=data.寰�鏉ョ被鍨嬪悕绉�,				
+							this.hform.HSupTypeID=data.寰�鏉ョ被鍨�,	
+							this.hform.TypeID=data.寰�鏉ョ被鍨�,					
+														
+							this.hform.HMouldID_B=data.hmaterid,
+							// this.hform.HMouldID_B=data.妯″叿浠g爜,
+							this.hform.HMouldName_B=data.妯″叿鍚嶇О,
+							// this.hform.HMouldModel=data.妯″叿瑙勬牸,
+							this.hform.HMouldCount_B=1,
+							this.hform.HRedBlueFlag=data.绾㈣摑鍗曟爣璁�=='钃濆瓧'?false:true,
+							
+							
+							this.hform.HStockOrgID=data.HStockOrgID,
+							this.hform.HStockOrgName=data.搴撳瓨缁勭粐,
+							// this.hform.HICMOEntryID=data.HICMOEntryID,
+							// this.hform.HProcExchBillNo=data.HProcExchBillNo,
+							// this.hform.HProcExchInterID=data.HProcExchInterID,
+							// this.hform.HProcExchEntryID=data.HProcExchEntryID,
+							// this.hform.HOrgID=data.HOrgID,
+																				
+							this.hform.HMaker= data.鍒跺崟浜�
+							//this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
+							//this.hform.HUpDater= data.淇敼浜�
+							//this.hform.HUpDateDate= data.淇敼鏃ユ湡
+							// this.hform.HChecker= data.瀹℃牳浜�
+							// this.hform.HCheckDate= data.瀹℃牳鏃ユ湡							
+							// this.hform.HDeleteMan= data.浣滃簾浜�
+							// this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});				
+			},
+			submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HSactterUserName) {
+					this.hform.HSactterUserID = 0
+				}
+				else
+				{
+					this.HSecManagerID=this.hform.HSactterUserID
+				}
+				if (!this.hform.HCollectUserName) {
+					this.hform.HCollectUserID = 0
+				}
+				else
+				{
+					this.HKeeperID=this.hform.HCollectUserID 
+				}
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else {
+					if (this.hform.HMouldID_B == 0||this.hform.HMouldID_B ==null) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+			
+			
+						let sMainStr = JSON.stringify(this.hform);
+						console.log("涓昏〃锛�" + sMainStr)
+			
+						CommonUtils.doRequest(
+							'/MouldController/set_SaveMouldProdOutBill_Json', {
+								oMain: sMainStr
+							},
+							(res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/caigouruku/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+									uni.showModal({
+										content: res.data.Message,
+										showCancel: false,
+										complete() {
+											uni.hideLoading()
+										}
+									})
+								}
+							},
+							null,
+							"POST"
+						)
+					}
+				}
+			},
+			onLoad(e) {
+				console.log(e, this.userInfo)
+				
+				if(e.linterid){
+					this.btnType = 3
+					this.linterid = e.linterid
+					this.HBillNo = e.HBillNo
+					this.getEditData(e.linterid, e.HBillNo)
+				}else{
+					this.getNewData()
+				}
+			
+				this.getHBaseList()
+				this.getHSupList()
+				this.getHEmpList()
+				this.getHDeptList()
+				//this.getHEmpList()
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+    .form {
+        width: 668rpx;
+        margin: 20rpx auto;
+        padding-bottom: 240rpx;
+    }
+
+    .tab_area {
+        width: 100%;
+        height: 50rpx;
+    }
+
+    .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;
+
+        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;
+        }
+    }
+
+    .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;
+            flex-shrink: 0;
+
+            .uni-icons {
+                color: #fff !important;
+            }
+        }
+
+        .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;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
+
+        .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/MJGL/mujulingliaochukudan/table.vue b/pages/MJGL/mujulingliaochukudan/table.vue
new file mode 100644
index 0000000..2d2de72
--- /dev/null
+++ b/pages/MJGL/mujulingliaochukudan/table.vue
@@ -0,0 +1,487 @@
+<template>
+	<view class="content">
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鍗曟嵁鍙�:</view>
+				<view class="right">
+					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍒跺崟浜�:</view>
+				<view class="right">
+					<input v-model="hform.HCreateBy" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寮�濮嬫椂闂�:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
+						<view class="picker-overlay"></view>
+						<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">缁撴潫鏃堕棿:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
+						<view class="picker-overlay"></view>
+						<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			
+			<view class="buttons">
+				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+				<button class="btn-b" size="mini" type="default" @tap="creat">鏂板</button>
+				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+			</view>
+		</view>
+		
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+		
+		<view class="list" v-for="(item,index) in showList" :key="index">
+			<uni-card :title="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+				<view class="detail" v-if="item.妯″叿浠g爜">
+					<text>妯″叿浠g爜锛�</text>{{item.妯″叿浠g爜}}
+				</view>
+				<view class="detail" v-if="item.妯″叿鍚嶇О">
+					<text>妯″叿鍚嶇О锛�</text>{{item.妯″叿鍚嶇О}}
+				</view>
+				<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+					<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+				</view>
+				<view class="detail" v-if="item.鍙戞枡浜�">
+					<text>鍙戞枡浜猴細</text>{{item.鍙戞枡浜簘}
+				</view>
+				<view class="detail" v-if="item.棰嗘枡浜�">
+					<text>棰嗘枡浜猴細</text>{{item.棰嗘枡浜簘}
+				</view>
+				<view class="detail" v-if="item.閮ㄩ棬">
+					<text>閮ㄩ棬锛�</text>{{item.閮ㄩ棬}}
+				</view>
+				<view class="detail" v-if="item.寰�鏉ョ被鍨嬪悕绉�">
+					<text>寰�鏉ョ被鍨嬪悕绉帮細</text>{{item.寰�鏉ョ被鍨嬪悕绉皚}
+				</view>
+				<view class="detail" v-if="item.寰�鏉ュ崟浣�">
+					<text>寰�鏉ュ崟浣嶏細</text>{{item.寰�鏉ュ崟浣峿}
+				</view>
+				<view class="detail" v-if="item.鍣ㄥ叿浠撳簱">
+					<text>鍣ㄥ叿浠撳簱锛�</text>{{item.鍣ㄥ叿浠撳簱}}
+				</view>
+				<view class="detail" v-if="item.绾㈣摑鍗曟爣璁�">
+					<text>绾㈣摑鍗曟爣璁帮細</text>{{item.绾㈣摑鍗曟爣璁皚}
+				</view>
+				<view class="detail" v-if="item.寮�濮嬫棩鏈�">
+					<text>寮�濮嬫棩鏈燂細</text>{{item.寮�濮嬫棩鏈�.substr(0,10)}}
+				</view>
+				<view class="detail" v-if="item.缁撴潫鏃ユ湡">
+					<text>缁撴潫鏃ユ湡锛�</text>{{item.缁撴潫鏃ユ湡.substr(0,10)}}
+				</view>
+				<view class="detail" v-if="item.琛ㄤ綋澶囨敞">
+					<text>琛ㄤ綋澶囨敞锛�</text>{{item.琛ㄤ綋澶囨敞}}
+				</view>
+				<view class="detail" v-if="item.鍏抽棴绫诲瀷">
+					<text>鍏抽棴绫诲瀷锛�</text>{{item.鍏抽棴绫诲瀷}}
+				</view>
+
+				<view class="card-detail" v-if="showDetail == index">
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+						<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.瀹℃牳浜�">
+						<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+					</view>
+					<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+						<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.淇敼浜�">
+						<text>淇敼浜猴細</text>{{item.淇敼浜簘}
+					</view>
+					<view class="detail" v-if="item.淇敼鏃ユ湡">
+						<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.鍏抽棴浜�">
+						<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+					</view>
+					<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+						<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.浣滃簾浜�">
+						<text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+					</view>
+					<view class="detail" v-if="item.浣滃簾鏃ユ湡">
+						<text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+					</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.hbilltype">
+						<text>hbilltype锛�</text>{{item.hbilltype}}
+					</view>
+					<view class="detail" v-if="item.鎽樿">
+						<text>鎽樿锛�</text>{{item.鎽樿}}
+					</view>
+				</view>
+				<view class="more" v-if="showDetail == index && operations != index">
+					<view class="part" style="border-right: 1px solid #eee;">
+						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+					</view>
+					<view class="part" @tap.stop="operations = operations==index?-1:index">
+						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+					</view>
+				</view>
+				<view class="more" v-if="showDetail != index && operations != index">
+					<view class="part" style="border-right: 1px solid #eee;">
+						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+					</view>
+					<view class="part" @tap.stop="operations = operations==index?-1:index">
+						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+					</view>
+				</view>
+				
+				<view class="op" v-if="operations == index">
+					<!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+					<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+					<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+				</view>
+			</uni-card>
+		</view>
+		
+		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+	</view>
+</template>
+
+<script>
+	import { getUserInfo } from "@/utils/auth.js";
+	export default {
+	    data() {
+	        return {
+				userInfo:getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+				hform:{
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				operations:-1,
+				
+				page:1,
+				size:100
+	        }
+	    },
+		onLoad() {
+			this.getList()
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(()=>{
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+	    methods: {
+			getPage(page,list){
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex,eindex)
+				return newList
+			},
+			getList(){
+				console.log(this.sWhere)
+				uni.showLoading({
+					title:'鍔犺浇涓�...'
+				})
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage',
+					data:{ 
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page:1,
+						size:100
+					},
+				    success: (res) => {
+						console.log(1,uni.getStorageSync('Organization'));
+				        console.log(1,res);
+						if(res.data.code ==1){
+							this.listData = res.data.data
+							this.showList = this.getPage(this.page,this.listData)
+							
+							setTimeout(()=>{
+							     uni.hideLoading()
+							}, 1000)
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.hideLoading()
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			BenginHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.BenginHCreateDate = e.detail.value
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			EndHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.EndHCreateDate = e.detail.value
+			},
+			search(){
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				console.log(this.hform)
+				if (this.hform.HBillNo) {
+				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}
+				if (this.hform.HCreateBy) {
+				    this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+				}
+				if (this.hform.BenginHCreateDate) {
+				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+				}
+				if (this.hform.EndHCreateDate) {
+				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.hform.EndHCreateDate + "'";
+				}
+				
+				this.getList()
+			},
+			creat(){
+				uni.navigateTo({
+					url:'/pages/MJGL/mujulingliaochukudan/form'
+				})
+			},
+			clear(){
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				this.sWhere = ''
+				this.showDetail = -1,
+				this.operations = -1,
+				this.hform = {
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				}
+				this.getList()
+			},
+			//TODO   瀛愯〃鍒楄〃
+			// toSon(item){
+			// 	uni.navigateTo({
+			// 		url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid 
+			// 		+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О 
+			// 		+ '&璁惧浠g爜=' + item.璁惧浠g爜,
+			// 	})
+			// },
+			
+			//缂栬緫
+			edit(item){
+				console.log(item)
+				uni.navigateTo({
+					url:'/pages/MJGL/mujulingliaochukudan/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+				})
+			},
+			//鍒犻櫎
+			del(item){
+				console.log(item)
+				uni.showModal({
+				    title: '鎻愮ず',
+				    content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+				    success: (res) => {
+				        if (res.confirm) {
+				            console.log('鐢ㄦ埛鐐瑰嚮纭畾',);
+							uni.request({
+							    url: this.serverUrl + '/Sc_MouldProdOutBill/DeltetMouldProdOutBill',
+								data:{ 
+									HInterID: item.hmainid,
+									user: uni.getStorageSync('HUserName')
+								},
+							    success: (res) => {
+							        console.log(1,res);
+									if(res.data.count == 1){
+										this.clear()
+									}
+									uni.showToast({
+										title:res.data.Message,
+										icon:'none'
+									})
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.showToast({
+										title:'鎺ュ彛璇锋眰澶辫触',
+										icon:'none'
+									})
+								},
+							});
+				        } else if (res.cancel) {
+				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+				        }
+				    }
+				});
+			},
+	    }
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form{
+		width: 640rpx;
+		margin: 20rpx auto;
+	}
+    .form-item{
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+		.title{
+			width: 180rpx;
+			text{
+				color: red;
+				font-weight: bold;
+			}
+		}
+		.right{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+		.righton{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+		input{
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+	.buttons{
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+		button{
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+		.btn-a{
+			background-color: #acacac;
+			color: #fff;
+		}
+		.btn-b{
+			background-color: #41a863;
+			color: #fff;
+		}
+		.btn-c{
+			background-color: #3a78ff;
+			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;
+			}
+		}
+		.op{
+			display: flex;
+			justify-content: space-around;
+			margin-top: 20rpx;
+			button{
+				padding: 0;
+				width: 130rpx;
+				font-size: 25rpx;
+			}
+			.op1{
+				border: 1px solid #41a863;
+				color: #41a863;
+			}
+			.op2{
+				border: 1px solid #d98d00;
+				color: #d98d00;
+			}
+			.op3{
+				border: 1px solid #3a78ff;
+				color: #3a78ff;
+			}
+			.op4{
+				border: 1px solid #da0000;
+				color: #da0000;
+			}
+			.op5{
+				border: 1px solid #888;
+				color: #888;
+			}
+		}
+	}
+
+</style>
diff --git a/pages/MJGL/mujulingliaotuikudan/form.vue b/pages/MJGL/mujulingliaotuikudan/form.vue
new file mode 100644
index 0000000..37cc36d
--- /dev/null
+++ b/pages/MJGL/mujulingliaotuikudan/form.vue
@@ -0,0 +1,943 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)"/>
+				</view>
+				<uni-icons type="scan"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20" @click="toScanCode"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撳簱:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+						@input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName">
+					<input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName"
+						placeholder="涓嶅彲鎿嶄綔" /></view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍙戞枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HSactterUser"
+						@input="HScatterUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">棰嗘枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗘枡浜�" v-model="hform.HCollectUser"
+						@input="HCollectUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+			    <view class="title">閮ㄩ棬:</view>
+			    <view class="right">
+			        <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+			            @input="HDeptNameChange"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">寰�鏉ョ被鍨�:</view>
+			    <view class="right">
+			        <uni-combox :candidates="['渚涘簲鍟�','瀹㈡埛','閮ㄩ棬']" placeholder="璇烽�夋嫨绫诲瀷" v-model="hform.TypeName"
+			            @input="HSelectTypeChange"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">寰�鏉ュ崟浣�:</view>
+			    <view class="right">
+			        <uni-combox :candidates="arrayHSelectType" placeholder="璇烽�夋嫨" v-model="hform.Selection"
+			            @input=""></uni-combox>
+			    </view>
+			</view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<view class="picker-overlay"></view>
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs==1">
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鏉$爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍚嶇О:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldID_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏁伴噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldCount_B" />
+					</view>
+				</view>
+			</view>
+			<view class="bottom-btn">
+				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+			</view>
+		</view>	
+	</view>
+</template>
+
+<script>
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import { CommonUtils } from '@/utils/common';
+	
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				arrayHEmpName: [],
+				HEmpNameList: [],
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHSupName: [], //瀹㈡埛
+				HSupNameList: [],
+				arrayHSupplierName:[],//渚涘簲鍟�
+				HSuplierList:[],
+				linterid: '',
+				HBillNo: '',
+				arrayHSelectType: [], // 寰�鏉ュ崟浣嶄笅鎷夊垪琛�
+				HSelectTypeList: [], // 寰�鏉ュ崟浣嶅畬鏁存暟鎹垪琛�
+				showHStockPlaceName: true, 
+				HMouldList:[],
+				
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3802,
+					HWHName: getUserInfo().HWHName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+					HSactterUserName: getUserInfo().User,
+					HSactterUserID: getUserInfo().User,
+					HCollectUserName: getUserInfo().User,
+					HCollectUserID: getUserInfo().User,
+					HDeptName: getUserInfo().HDept,
+					HDeptID: getUserInfo().HDeptID,
+					HSupName:'',
+					HSupID:'',
+					HSecManagerID:'',
+					HKeeperID:'',
+					//寰�鏉ョ被鍨�
+					TypeName:'',
+					TypeID:'',
+					Selection: '', // 寰�鏉ュ崟浣嶉�変腑鐨勫��
+					SelectionID: '' ,// 寰�鏉ュ崟浣嶅搴旂殑ID
+					HSupTypeID:'',
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+					
+					HRedBlueFlag:'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID:uni.getStorageSync('OrganizationID'),
+					HBarCode_B:'',
+					HMouldName_B:'',
+					HMouldID_B:'',
+					HMouldCount_B:''
+				}
+			}
+		},
+		methods: {
+			
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					if (this.hform.HBarCode == '*') {
+						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+					} else {
+						this.hform.HBarCode = ret.resp_result
+					}
+
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			getNewData() {
+				CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						let res1 = res.data;
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					})
+			},
+			getCode(HBarCode) { 
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sOldBarCode = HBarCode; 
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo =""
+				var sSourceBillType ="-1" 
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						uni.request({
+							url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_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.hform.HQty = ''
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}else
+				{
+					var sBarCode = this.hform.HBarCode
+					uni.request({
+						url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+						data:{
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HSCWhID:0,
+							HSCSPID: 0,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HStockOutOrgID: this.hform.HStockOutOrgID,
+						},
+						success:(res)=> {
+							console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+							this.hform.HBarCode=''
+							if(res.data.count==1){
+								this.tabs = 1
+								this.DisBillEntryList()
+							}
+							else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					})
+				}
+			}, 
+			//浠撳簱鐩戝惉浜嬩欢
+			HWHNameChange(e) {
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i]["HName"] == e) {
+						this.hform.HWHName = this.HWHNameList[i]["HName"]
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+
+						this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+					}
+				}
+			},
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+					}
+				}
+			},
+			HScatterUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSactterUserID = this.HEmpNameList[i].HItemID
+						this.hform.HSactterUserName = this.HEmpNameList[i].HName
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			HCollectUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HCollectUserID = this.HEmpNameList[i].HItemID
+						this.hform.HCollectUserName = this.HEmpNameList[i].HName
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+			getHBaseList() {
+				CommonUtils.doRequest(
+					"/Web/GetWarehouseList_Json_New", {
+						Warehouse: "",
+						HOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HWHNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHWHName[i] = data[i]["HName"]
+							}
+						} else {
+							uni.showToast({
+								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+				CommonUtils.doRequest(
+					"/WEBSController/GetStockPlaceList_Json", {
+						StockPlace: '',
+						HWhID: this.hform.HWHID,
+						HStockOrgID: uni.getStorageSync('OrganizationID')
+					},
+					(res) => {
+						let res1 = res.data
+						console.log(res1)
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HStockPlaceNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHStockPlaceName[i] = data[i]["HWhName"]
+							}
+						} else {
+							uni.showToast({
+								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			/* #endregion */
+			getHEmpList() {
+				CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+						Employee: '',
+						HGroupID: 0
+					},
+					(res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getHSupList() {
+				CommonUtils.doRequest(
+					"/Gy_Customer/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			getSupplier()
+			{
+				CommonUtils.doRequest(
+					"/WEBSController/GetSupplier_Json", {
+						HBarCode: uni.getStorageSync(''),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			//閫夋嫨瀹㈡埛
+			HSupNameChange(e) {
+			    for (var i = 0; i < this.HSupNameList.length; i++) {
+			        if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+			            this.hform.HSupID = this.HSupNameList[i].HItemID
+			            this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+			        }
+			    }
+			},
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			HSelectTypeChange(e)
+			{
+				this.hform.TypeName=e;
+				this.hform.Selection = ''; // 娓呯┖寰�鏉ュ崟浣嶉�夋嫨
+				this.hform.SelectionID = '';
+				if(e=='閮ㄩ棬')
+				{
+					this.hform.HSupTypeID=3;
+					this.arrayHSelectType = this.arrayHDeptName;
+					this.HSelectTypeList = this.HDeptNameList;
+				}
+				else if(e === '渚涘簲鍟�') {
+					this.hform.HSupTypeID=1;
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				} else if(e === '瀹㈡埛') {
+					this.hform.HSupTypeID=2;
+					this.arrayHSelectType =this.arrayHSupName;
+					this.HSelectTypeList = this.HSupNameList;
+				} else {
+					this.arrayHSelectType = [];
+					this.HSelectTypeList = [];
+				}	
+			},
+			//鍣ㄥ叿淇℃伅
+			DisBillEntryList() {
+				CommonUtils.doRequest(
+					"/MouldController/GetMouldBillEntryTmpList_Json", {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						console.log('鍣ㄥ叿', res.data)
+						var data = res.data.data
+						this.HMouldList = data.HMouldList
+						if (data.count==0) {
+							this.hform.HMouldCount_B = ''
+							this.hform.HMouldID_B = ''
+							this.hform.HMouldName_B = ''
+							
+						} else {
+							this.hform.HMouldCount_B = data[0].HQty
+							this.hform.HMouldID_B = data[0].HMouldID
+							this.hform.HMouldName_B = data[0].HMouldName
+							this.hform.HBarCode_B=data[0].HBarCode
+						}
+					},
+			
+				)
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/MJGL/mujulingliaochukudan/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HSactterUserName) {
+					this.hform.HSactterUserID = 0
+				}
+				else
+				{
+					this.HSecManagerID=this.hform.HSactterUserID
+				}
+				if (!this.hform.HCollectUserName) {
+					this.hform.HCollectUserID = 0
+				}
+				else
+				{
+					this.HKeeperID=this.hform.HCollectUserID 
+				}
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else {
+					if (this.hform.HMouldID_B == 0||this.hform.HMouldID_B ==null) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+			
+			
+						let sMainStr = JSON.stringify(this.hform);
+						console.log("涓昏〃锛�" + sMainStr)
+			
+						CommonUtils.doRequest(
+							'/MouldController/set_SaveMouldProdBackBill_Json', {
+								oMain: sMainStr
+							},
+							(res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/caigouruku/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+									uni.showModal({
+										content: res.data.Message,
+										showCancel: false,
+										complete() {
+											uni.hideLoading()
+										}
+									})
+								}
+							},
+							null,
+							"POST"
+						)
+					}
+				}
+			},
+			onLoad(e) {
+				console.log(e, this.userInfo)
+				
+				if (e.HInterID) {
+					// this.HInterID_Temp = e.HInterID
+					// this.btnType = 1
+					this.RoadBillMain(e.HInterID)
+				} else {
+					this.getNewData()
+				}
+			
+				this.getHBaseList()
+				this.getHSupList()
+				this.getHEmpList()
+				this.getHDeptList()
+				//this.getHEmpList()
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+    .form {
+        width: 668rpx;
+        margin: 20rpx auto;
+        padding-bottom: 240rpx;
+    }
+
+    .tab_area {
+        width: 100%;
+        height: 50rpx;
+    }
+
+    .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;
+
+        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;
+        }
+    }
+
+    .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;
+            flex-shrink: 0;
+
+            .uni-icons {
+                color: #fff !important;
+            }
+        }
+
+        .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;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
+
+        .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/MJGL/mujulingliaotuikudan/table.vue b/pages/MJGL/mujulingliaotuikudan/table.vue
new file mode 100644
index 0000000..86e54a8
--- /dev/null
+++ b/pages/MJGL/mujulingliaotuikudan/table.vue
@@ -0,0 +1,486 @@
+<template>
+	<view class="content">
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鍗曟嵁鍙�:</view>
+				<view class="right">
+					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍒跺崟浜�:</view>
+				<view class="right">
+					<input v-model="hform.HCreateBy" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寮�濮嬫椂闂�:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
+						<view class="picker-overlay"></view>
+						<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">缁撴潫鏃堕棿:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
+						<view class="picker-overlay"></view>
+						<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			
+			<view class="buttons">
+				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+				<button class="btn-b" size="mini" type="default" @tap="creat">鏂板</button>
+				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+			</view>
+		</view>
+		
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+		
+		<view class="list" v-for="(item,index) in showList" :key="index">
+			<uni-card :title="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+				<view class="detail" v-if="item.妯″叿浠g爜">
+					<text>妯″叿浠g爜锛�</text>{{item.妯″叿浠g爜}}
+				</view>
+				<view class="detail" v-if="item.妯″叿鍚嶇О">
+					<text>妯″叿鍚嶇О锛�</text>{{item.妯″叿鍚嶇О}}
+				</view>
+				<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+					<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+				</view>
+				<view class="detail" v-if="item.鍙戞枡浜�">
+					<text>鍙戞枡浜猴細</text>{{item.鍙戞枡浜簘}
+				</view>
+				<view class="detail" v-if="item.棰嗘枡浜�">
+					<text>棰嗘枡浜猴細</text>{{item.棰嗘枡浜簘}
+				</view>
+				<view class="detail" v-if="item.閮ㄩ棬">
+					<text>閮ㄩ棬锛�</text>{{item.閮ㄩ棬}}
+				</view>
+				<view class="detail" v-if="item.寰�鏉ョ被鍨嬪悕绉�">
+					<text>寰�鏉ョ被鍨嬪悕绉帮細</text>{{item.寰�鏉ョ被鍨嬪悕绉皚}
+				</view>
+				<view class="detail" v-if="item.寰�鏉ュ崟浣�">
+					<text>寰�鏉ュ崟浣嶏細</text>{{item.寰�鏉ュ崟浣峿}
+				</view>
+				<view class="detail" v-if="item.鍣ㄥ叿浠撳簱">
+					<text>鍣ㄥ叿浠撳簱锛�</text>{{item.鍣ㄥ叿浠撳簱}}
+				</view>
+				<view class="detail" v-if="item.绾㈣摑鍗曟爣璁�">
+					<text>绾㈣摑鍗曟爣璁帮細</text>{{item.绾㈣摑鍗曟爣璁皚}
+				</view>
+				<view class="detail" v-if="item.寮�濮嬫棩鏈�">
+					<text>寮�濮嬫棩鏈燂細</text>{{item.寮�濮嬫棩鏈�.substr(0,10)}}
+				</view>
+				<view class="detail" v-if="item.缁撴潫鏃ユ湡">
+					<text>缁撴潫鏃ユ湡锛�</text>{{item.缁撴潫鏃ユ湡.substr(0,10)}}
+				</view>
+				<view class="detail" v-if="item.琛ㄤ綋澶囨敞">
+					<text>琛ㄤ綋澶囨敞锛�</text>{{item.琛ㄤ綋澶囨敞}}
+				</view>
+				<view class="detail" v-if="item.鍏抽棴绫诲瀷">
+					<text>鍏抽棴绫诲瀷锛�</text>{{item.鍏抽棴绫诲瀷}}
+				</view>
+
+				<view class="card-detail" v-if="showDetail == index">
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+						<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.瀹℃牳浜�">
+						<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+					</view>
+					<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+						<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.淇敼浜�">
+						<text>淇敼浜猴細</text>{{item.淇敼浜簘}
+					</view>
+					<view class="detail" v-if="item.淇敼鏃ユ湡">
+						<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.鍏抽棴浜�">
+						<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+					</view>
+					<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+						<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.浣滃簾浜�">
+						<text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+					</view>
+					<view class="detail" v-if="item.浣滃簾鏃ユ湡">
+						<text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+					</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.hbilltype">
+						<text>hbilltype锛�</text>{{item.hbilltype}}
+					</view>
+					<view class="detail" v-if="item.鎽樿">
+						<text>鎽樿锛�</text>{{item.鎽樿}}
+					</view>
+				</view>
+				<view class="more" v-if="showDetail == index && operations != index">
+					<view class="part" style="border-right: 1px solid #eee;">
+						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+					</view>
+					<view class="part" @tap.stop="operations = operations==index?-1:index">
+						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+					</view>
+				</view>
+				<view class="more" v-if="showDetail != index && operations != index">
+					<view class="part" style="border-right: 1px solid #eee;">
+						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+					</view>
+					<view class="part" @tap.stop="operations = operations==index?-1:index">
+						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+					</view>
+				</view>
+				
+				<view class="op" v-if="operations == index">
+					<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+					<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+				</view>
+			</uni-card>
+		</view>
+		
+		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+	</view>
+</template>
+
+<script>
+	import { getUserInfo } from "@/utils/auth.js";
+	export default {
+	    data() {
+	        return {
+				userInfo:getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+				hform:{
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				operations:-1,
+				
+				page:1,
+				size:100
+	        }
+	    },
+		onLoad() {
+			this.getList()
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(()=>{
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+	    methods: {
+			getPage(page,list){
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex,eindex)
+				return newList
+			},
+			getList(){
+				console.log(this.sWhere)
+				uni.showLoading({
+					title:'鍔犺浇涓�...'
+				})
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldProdBackBill/list_byPage',
+					data:{ 
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page:1,
+						size:100
+					},
+				    success: (res) => {
+						console.log(1,uni.getStorageSync('Organization'));
+				        console.log(1,res);
+						if(res.data.code ==1){
+							this.listData = res.data.data
+							this.showList = this.getPage(this.page,this.listData)
+							
+							setTimeout(()=>{
+							     uni.hideLoading()
+							}, 1000)
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.hideLoading()
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			BenginHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.BenginHCreateDate = e.detail.value
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			EndHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.EndHCreateDate = e.detail.value
+			},
+			search(){
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				console.log(this.hform)
+				if (this.hform.HBillNo) {
+				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}
+				if (this.hform.HCreateBy) {
+				    this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+				}
+				if (this.hform.BenginHCreateDate) {
+				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+				}
+				if (this.hform.EndHCreateDate) {
+				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.hform.EndHCreateDate + "'";
+				}
+				
+				this.getList()
+			},
+			creat(){
+				uni.navigateTo({
+					url:'/pages/MJGL/mujulingliaochukudan/form'
+				})
+			},
+			clear(){
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				this.sWhere = ''
+				this.showDetail = -1,
+				this.operations = -1,
+				this.hform = {
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				}
+				this.getList()
+			},
+			//TODO   瀛愯〃鍒楄〃
+			// toSon(item){
+			// 	uni.navigateTo({
+			// 		url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid 
+			// 		+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О 
+			// 		+ '&璁惧浠g爜=' + item.璁惧浠g爜,
+			// 	})
+			// },
+			
+			//缂栬緫
+			edit(item){
+				console.log(item)
+				uni.navigateTo({
+					url:'/pages/baoyangjilu/form?hmainid=' + item.hmainid 
+				})
+			},
+			//鍒犻櫎
+			del(item){
+				console.log(item)
+				uni.showModal({
+				    title: '鎻愮ず',
+				    content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+				    success: (res) => {
+				        if (res.confirm) {
+				            console.log('鐢ㄦ埛鐐瑰嚮纭畾',);
+							uni.request({
+							    url: this.serverUrl + '/Sc_MouldProdOutBill/DeltetMouldProdOutBill',
+								data:{ 
+									HInterID: item.hmainid,
+									user: uni.getStorageSync('HUserName')
+								},
+							    success: (res) => {
+							        console.log(1,res);
+									if(res.data.count == 1){
+										this.clear()
+									}
+									uni.showToast({
+										title:res.data.Message,
+										icon:'none'
+									})
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.showToast({
+										title:'鎺ュ彛璇锋眰澶辫触',
+										icon:'none'
+									})
+								},
+							});
+				        } else if (res.cancel) {
+				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+				        }
+				    }
+				});
+			},
+	    }
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form{
+		width: 640rpx;
+		margin: 20rpx auto;
+	}
+    .form-item{
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+		.title{
+			width: 180rpx;
+			text{
+				color: red;
+				font-weight: bold;
+			}
+		}
+		.right{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+		.righton{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+		input{
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+	.buttons{
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+		button{
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+		.btn-a{
+			background-color: #acacac;
+			color: #fff;
+		}
+		.btn-b{
+			background-color: #41a863;
+			color: #fff;
+		}
+		.btn-c{
+			background-color: #3a78ff;
+			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;
+			}
+		}
+		.op{
+			display: flex;
+			justify-content: space-around;
+			margin-top: 20rpx;
+			button{
+				padding: 0;
+				width: 130rpx;
+				font-size: 25rpx;
+			}
+			.op1{
+				border: 1px solid #41a863;
+				color: #41a863;
+			}
+			.op2{
+				border: 1px solid #d98d00;
+				color: #d98d00;
+			}
+			.op3{
+				border: 1px solid #3a78ff;
+				color: #3a78ff;
+			}
+			.op4{
+				border: 1px solid #da0000;
+				color: #da0000;
+			}
+			.op5{
+				border: 1px solid #888;
+				color: #888;
+			}
+		}
+	}
+
+</style>
diff --git a/pages/MJGL/qijudiaobodan/form.vue b/pages/MJGL/qijudiaobodan/form.vue
new file mode 100644
index 0000000..f651461
--- /dev/null
+++ b/pages/MJGL/qijudiaobodan/form.vue
@@ -0,0 +1,1242 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)"/>
+				</view>
+				<uni-icons type="scan"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20" @click="toScanCode"></uni-icons>
+			</view>
+			
+			<view class="form-item">
+			    <view class="title">璋冨嚭浠撳簱:</view>
+			    <view class="right">
+			        <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HSCWHName"
+			            @input="HSCWHNameChange" @confirm="HWHNameOutScan"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">璋冨嚭浠撲綅:</view>
+			    <view class="right" v-show="HSCIsStockMgr">
+			        <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+			            v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
+			            @confirm="HStockPlaceOutNameScan"></uni-combox>
+			    </view>
+			    <view class="righton" v-show="!HSCIsStockMgr">
+			        <input v-model="hform.HOutStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+			    </view>
+			</view>
+			
+			
+			<view class="form-item">
+			    <view class="title">璋冨叆浠撳簱:</view>
+			    <view class="right">
+			        <uni-combox :candidates="arrayHWHInName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+			            @input="HWHInNameChange" @confirm="HWHNameInScan"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">璋冨叆浠撲綅:</view>
+			    <view class="right" v-show="HIsStockMgr">
+			        <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+			            v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
+			            @confirm="HStockPlaceNameInScan"></uni-combox>
+			    </view>
+			    <view class="righton" v-show="!HIsStockMgr">
+			        <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+			    </view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍙戞枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)鍙戞枡浜�" v-model="hform.HSactterUser"
+						@input="HScatterUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">棰嗘枡:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)棰嗘枡浜�" v-model="hform.HCollectUser"
+						@input="HCollectUserChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+			    <view class="title">閮ㄩ棬:</view>
+			    <view class="right">
+			        <uni-combox :candidates="arrayHDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDeptName"
+			            @input="HDeptNameChange"></uni-combox>
+			    </view>
+			</view>
+			<view class="form-item">
+			    <view class="title">璋冩嫧绫诲瀷:</view>
+			    <view class="righton">
+			        <input name="HStockStyle" disabled v-model="hform.HStockStyle" placeholder="璇烽�夋嫨璋冩嫧绫诲瀷" />
+			    </view>
+			</view>
+			<view class="form-item">
+				<view class="title">璋冨嚭缁勭粐:</view>
+				<view class="right">
+					<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+				</view>
+			</view>
+			<view class="form-item">
+                    <view class="title">璋冨叆缁勭粐:</view>
+                    <view class="right" v-show="!HIsStockInner">
+                        <uni-combox :candidates="arrayHOrgName" placeholder="璇烽�夋嫨璋冨叆缁勭粐" v-model="hform.HStockInOrgName"
+                            @input="HStockInOrgNameChange"></uni-combox>
+                    </view>
+                    <view class="righton" v-show="HIsStockInner">
+                        <input name="HStockInOrgName" disabled v-model="hform.HStockInOrgName" />
+                    </view>
+            </view>
+			<view class="tabs">
+				<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">妯″叿淇℃伅</view>
+			</view>
+			<view v-if="tabs == 0">
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<view class="picker-overlay"></view>
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</picker>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input name="HMaker" disabled v-model="hform.HMaker" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="righton">
+						<input name="HBillNo" disabled v-model="hform.HBillNo" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曟嵁ID:</view>
+					<view class="righton">
+						<input name="HInterID" disabled v-model="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs==1">
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鏉$爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍚嶇О:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍣ㄥ叿鍙�:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMouldID_B" />
+					</view>
+				</view>
+			</view>
+			<view class="bottom-btn">
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+				<button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<!-- <button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button> -->
+				<button v-if="btnType != 1 " class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+			</view>
+		</view>	
+	</view>
+</template>
+
+<script>
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import { CommonUtils } from '@/utils/common';
+	
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				btnType:1,//1鏂板锛�3淇敼
+				linterid:'',
+				arrayHEmpName: [],
+				HEmpNameList: [],
+				
+				
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHWHInName:[],//璋冨叆浠撳簱浠撲綅
+				HWHInNameList: [],
+                arrayHStockPlaceInName: [], //璋冨叆浠撲綅
+				arrayHStockPlaceName:[],
+                HStockPlaceInNameList: [],
+				HStockPlaceNameList:[],
+				
+				arrayHDeptName: [], //閮ㄩ棬
+				HDeptNameList: [],
+				arrayHSupName: [], //瀹㈡埛
+				HSupNameList: [],
+				arrayHSupplierName:[],//渚涘簲鍟�
+				HSuplierList:[],
+				linterid: '',
+				HBillNo: '',
+				HStockStyleArray: ["缁勭粐鍐呰皟鎷�", "璺ㄧ粍缁囪皟鎷�"],
+				showHStockPlaceName: true, 
+				arrayHOrgName: [], // 缁勭粐
+                arrayHOrgValue: [], // 缁勭粐瀵瑰簲ID
+				
+				HSCIsStockMgr: false,
+				HIsStockMgr: false,
+				
+				HMouldList:[],
+				isEdit: false,
+				hform: {
+					HBarCode: '',
+					HInterID: '',
+					HBillType: 3814,
+					//璋冨叆浠撳簱
+					HWHName: getUserInfo().HWHName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+					//璋冨嚭浠撳簱浠撲綅
+					HSCWHName: getUserInfo().HWHName,
+					HSCWHID: getUserInfo().HWhID,
+					HOutStockPlaceName: getUserInfo().HSPName,
+					HOutStockPlaceID: getUserInfo().HSPID,
+					//
+					HSactterUserName: getUserInfo().User,
+					HSactterUserID: getUserInfo().User,
+					HCollectUserName: getUserInfo().User,
+					HCollectUserID: getUserInfo().User,
+					HDeptName: getUserInfo().HDept,
+					HDeptID: getUserInfo().HDeptID,
+					HSupName:'',
+					HSupID:'',
+					HSecManagerID:'',
+					HKeeperID:'',
+					HStockStyle: '',
+					//HSupTypeID:'',
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+					//zuzhi
+					HStockInOrgName: uni.getStorageSync('Organization'),
+					HStockInOrgID: uni.getStorageSync('OrganizationID'),
+					//
+					HRedBlueFlag:'false',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+					HStockOutOrgID:uni.getStorageSync('OrganizationID'),
+					HBarCode_B:'',
+					HMouldName_B:'',
+					HMouldID_B:'',
+				}
+			}
+		},
+		computed: {
+		  HIsStockInner: {
+			get: function() {
+			  if (this.hform.HStockStyle == '缁勭粐鍐呰皟鎷�') {
+				return true
+			  }
+			  return false
+			}
+		  },
+		  arrayHStockPlaceNameComputed: {
+			get() {
+			  if (!this.HStockPlaceNameList || !Array.isArray(this.HStockPlaceNameList)) {
+				return []
+			  }
+			  // 鍔ㄦ�佽绠楀搴旇皟鍑轰粨搴撶殑浠撲綅
+			  return this.HStockPlaceNameList
+				.filter(e => e['鎵�灞炰粨搴�'] == this.hform.HSCWHName)
+				.map(e => e['浠撲綅鍚嶇О'])
+			}
+		  },
+		  arrayHStockPlaceInNameComputed: {
+			get() {
+			  if (!this.HStockPlaceInNameList || !Array.isArray(this.HStockPlaceInNameList)) {
+				return []
+			  }
+			  // 鍔ㄦ�佽绠楀搴旇皟鍏ヤ粨搴撶殑浠撲綅
+			  return this.HStockPlaceInNameList
+				.filter(e => e['鎵�灞炰粨搴�'] == this.hform.HWHName)
+				.map(e => e['浠撲綅鍚嶇О'])
+			}
+		  }
+		},
+		methods: {
+			
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					if (this.hform.HBarCode == '*') {
+						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+					} else {
+						this.hform.HBarCode = ret.resp_result
+					}
+
+					this.getCode(this.hform.HBarCode)
+				})
+			},
+			getNewData() {
+				CommonUtils.doRequest("/WEBSController/GetMaxBillNoAndID_Json", {
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						let res1 = res.data;
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					})
+			},
+			getCode(HBarCode) { 
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sHWHID = this.hform.HWHID
+                var sHSPID = this.hform.HStockPlaceID
+                var sHSCWHID = this.hform.HSCWHID
+                var sHOUTSPID = this.hform.HOutStockPlaceID
+				var sOldBarCode = HBarCode; 
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo =""
+				var sSourceBillType ="-1" 
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						uni.request({
+							url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_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.hform.HQty = ''
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}else
+				{
+					var sBarCode = this.hform.HBarCode
+					uni.request({
+						url: this.serverUrl + '/MouldController/Get_CheckTypeByMouldBarCode_Json',
+						data:{
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HSCWhID:sHSCWHID,
+							HSCSPID: sHOUTSPID,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HStockOutOrgID: this.hform.HStockOutOrgID,
+						},
+						success:(res)=> {
+							console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+							this.hform.HBarCode=''
+							if(res.data.count==1){
+								this.tabs = 1
+								this.DisBillEntryList()
+							}
+							else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					})
+				}
+			}, 
+			//浠撳簱鐩戝惉浜嬩欢
+			HWHNameChange(e) {
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i]["HName"] == e) {
+						this.hform.HWHName = this.HWHNameList[i]["HName"]
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+						this.showHStockPlaceName = this.HWHNameList[i].HIsStockMgr
+					}
+				}
+			},
+			// 璋冨叆浠撳簱淇敼
+			HStockPlaceInNameChange(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
+			        }
+			    }
+			},
+			// 璋冨叆浠撲綅淇敼
+			HWHInNameChange(e) {
+			    console.log('e: ', e);
+			    for (var i = 0; i < this.HWHInNameList.length; i++) {
+			        if (this.HWHInNameList[i].浠撳簱鍚嶇О == e) {
+			            this.hform.HWHName = this.HWHInNameList[i].浠撳簱鍚嶇О
+			            this.hform.HWHID = this.HWHInNameList[i].HItemID
+			
+			            if (this.HWHInNameList[i]['鍚敤浠撲綅'] == 'Y') {
+			                this.HIsStockMgr = true
+			            } else {
+			                // this.hform.HStockPlaceName = ''
+			                this.HIsStockMgr = false
+			            }
+			        }
+			    }
+			},
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i]["HWhName"] == e) {
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i]["HWhName"]
+					}
+				}
+			},
+			HOutStockPlaceNameChange(e) {
+			    for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+			        if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+			            this.hform.HOutStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+			            this.hform.HOutStockPlaceID = this.HStockPlaceNameList[i].HMainID
+			        }
+			    }
+			},
+			HStockInOrgNameChange(e) {
+			    let index = this.arrayHOrgName.findIndex(elem => elem == e)
+			    if (index != -1) {
+			        this.hform.HStockInOrgID = this.arrayHOrgValue[index]
+			    }
+				//alert 锛堝湪鐩存帴璋冩嫧鍗曚腑锛屾澶勫悗杩樻洿鏀逛簡璋冨叆浠撳簱鐨勯�昏緫锛屽湪鏈鏆傛椂娌″姞锛�
+			},
+			HScatterUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSactterUserID = this.HEmpNameList[i].HItemID
+						this.hform.HSactterUserName = this.HEmpNameList[i].HName
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			HCollectUserChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HCollectUserID = this.HEmpNameList[i].HItemID
+						this.hform.HCollectUserName = this.HEmpNameList[i].HName
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			/* #region 浠撳簱浠撲綅鑾峰彇涓嬫媺妗� */
+		//鍩虹浠撳簱璧勬枡
+		getHBaseList({
+		  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
+		        this.HWHInNameList = res.data.data
+		        this.arrayHWHName = [] // 纭繚鏁扮粍鍒濆鍖�
+		        this.arrayHWHInName = [] // 纭繚鏁扮粍鍒濆鍖�
+		        for (var i = 0; i < res.data.data.length; i++) {
+		          this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+		          this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
+		        }
+		      } else {
+		        uni.showToast({
+		          title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+		          icon: 'none'
+		        })
+		      }
+		    },
+		    fail: (res) => {
+		      console.log(res);
+		      uni.showToast({
+		        title: '鎺ュ彛璇锋眰澶辫触',
+		        icon: 'none'
+		      })
+		    },
+		  });
+		
+		  uni.request({
+		    url: this.serverUrl + '/Gy_StockPlace/list',
+		    data: {
+		      sWhere: "",
+		      user: uni.getStorageSync('HUserName'),
+		      Organization: uni.getStorageSync('Organization')
+		    },
+		    success: (res) => {
+		      if (res.data.count == 1) {
+		        this.HStockPlaceNameList = res.data.data
+		        this.arrayHStockPlaceName = [] // 纭繚鏁扮粍鍒濆鍖�
+		        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'
+		      })
+		    },
+		  });
+		},
+			/* #endregion */
+			getHEmpList() {
+				CommonUtils.doRequest("/Web/GetEmployeeList_Json", {
+						Employee: '',
+						HGroupID: 0
+					},
+					(res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+				)
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getOrganization() {
+			    return new Promise((resolve, reject) => {
+			        CommonUtils.doRequest2({
+			            url: '/Web/GetOrganizations',
+			            resFunction: (res) => {
+			                console.log("Organizations: ", res.data)
+			                let {
+			                    data,
+			                    count,
+			                    Message
+			                } = res.data
+			                if (count == 1) {
+			                    this.arrayHOrgName = []
+			                    this.arrayHOrgValue = []
+			                    Array.from(data).forEach(e => {
+			                        this.arrayHOrgName.push(e.Name)
+			                        this.arrayHOrgValue.push(e.ID)
+			                    })
+			                    resolve()
+			                } else {
+			                    uni.showToast({
+			                        icon: 'none',
+			                        title: Message
+			                    })
+			                    reject()
+			                }
+			
+			            }
+			        })
+			    })
+			},
+			getHSupList() {
+				CommonUtils.doRequest(
+					"/Gy_Customer/list", {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			getSupplier()
+			{
+				CommonUtils.doRequest(
+					"/WEBSController/GetSupplier_Json", {
+						HBarCode: uni.getStorageSync(''),
+						Organization: uni.getStorageSync('Organization')
+					},
+					(res) => {
+						let res1 = res.data
+						let {
+							data,
+							count
+						} = res1
+						if (count == 1) {
+							this.HSupNameList = data
+							for (var i = 0; i < data.length; i++) {
+								this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: data.Message,
+								icon: 'none'
+							})
+						}
+					}
+				)
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			//#region 璋冨叆璋冨嚭浠撳簱浠撲綅method
+			// 璋冨嚭浠撳簱淇敼
+			HSCWHNameChange(e) {
+			    for (var i = 0; i < this.HWHNameList.length; i++) {
+			        if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+			            this.hform.HSCWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+			            this.hform.HSCWHID = this.HWHNameList[i].HItemID
+			
+			            if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+			                this.HSCIsStockMgr = true
+			            } else {
+			                this.hform.HOutStockPlaceName = ''
+			                this.hform.HOutStockPlaceID = ''
+			                this.HSCIsStockMgr = false
+			            }
+			        }
+			    }
+			},
+			// 璋冨叆浠撳簱璧勬枡
+			getHWarehouseInList(Organizaiton) {
+			  Organizaiton = Organizaiton || uni.getStorageSync("Organization")
+			  CommonUtils.doRequest2({
+			    url: '/Gy_Warehouse/list',
+			    data: {
+			      sWhere: "",
+			      user: uni.getStorageSync('HUserName'),
+			      Organization: Organizaiton
+			    },
+			    resFunction: (res) => {
+			      console.log('璋冨叆浠撳簱 res: ', res.data.data);
+			      if (res.data.count == 1) {
+			        this.HWHInNameList = res.data.data
+			        this.arrayHWHInName = [] // 纭繚鏁扮粍鍒濆鍖�
+			        for (var i = 0; i < res.data.data.length; i++) {
+			          this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
+			        }
+			      } else {
+			        uni.showToast({
+			          title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+			          icon: 'none'
+			        })
+			      }
+			    }
+			  });
+			
+			  uni.request({
+			    url: this.serverUrl + '/Gy_StockPlace/list',
+			    data: {
+			      sWhere: "",
+			      user: uni.getStorageSync('HUserName'),
+			      Organization: Organizaiton
+			    },
+			    success: (res) => {
+			      if (res.data.count == 1) {
+			        this.HStockPlaceInNameList = res.data.data
+			        this.arrayHStockPlaceInName = [] // 纭繚鏁扮粍鍒濆鍖�
+			        for (var i = 0; i < res.data.data.length; i++) {
+			          this.arrayHStockPlaceInName[i] = res.data.data[i].浠撲綅鍚嶇О
+			        }
+			      } else {
+			        uni.showToast({
+			          title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+			          icon: 'none'
+			        })
+			      }
+			    },
+			    fail: (res) => {
+			      console.log(res);
+			      uni.showToast({
+			        title: '鎺ュ彛璇锋眰澶辫触',
+			        icon: 'none'
+			      })
+			    },
+			  });
+			},
+			//#endregion
+
+			//鍣ㄥ叿淇℃伅
+			DisBillEntryList() {
+				CommonUtils.doRequest(
+					"/MouldController/GetMouldBillEntryTmpList_Json", {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType
+					},
+					(res) => {
+						console.log('鍣ㄥ叿', res.data)
+						var data = res.data.data
+						this.HMouldList = data.HMouldList
+						if (data.count==0) {
+
+							this.hform.HMouldID_B = ''
+							this.hform.HMouldName_B = ''
+							
+						} else {
+
+							this.hform.HMouldID_B = data[0].HMouldID
+							this.hform.HMouldName_B = data[0].HMouldName
+							this.hform.HBarCode_B=data[0].HBarCode
+						}
+					},
+			
+				)
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url: '/pages/MJGL/mujulingliaochukudan/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			ifEdit(){
+				this.isEdit = true
+				this.hform.eventType = 'Modify'
+			},
+			//缂栬緫鍥炴樉
+			getEditData(linterid,HBillNo){				
+				//涓昏〃
+				var sWhere = " and hmainid='" + linterid + "'";
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage', 
+					data: { sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization'),
+						page:1,
+						size:100 },
+				    success: (res) => {
+				        console.log(1,res.data.data[0]);
+						if(res.data.code == 1){
+							var data = res.data.data[0]							
+							this.btnType=3
+							this.hform.HInterID= data.hmainid
+							this.hform.HBillNo= data.鍗曟嵁鍙�
+							// this.hform.HBarCode= data.鏉″舰鐮� 瑙嗗浘涓病鏈夎瀛楁
+							this.hform.HDeptID= data.HDeptID
+							this.hform.HDeptName= data.閮ㄩ棬
+							this.hform.HCollectUserName= data.鍙戞枡浜�
+							this.hform.HCollectUserID= data.hkeeperid
+							this.hform.HKeeperID= data.hkeeperid
+							this.hform.HSactterUserName= data.棰嗘枡浜�
+							this.hform.HSactterUserID= data.hsecmanagerid
+							this.hform.HSecManagerID=data.hsecmanagerid
+							this.hform.HMangerName= data.璐熻矗浜�
+							// this.hform.HRemark= data.琛ㄥご澶囨敞						
+							this.hform.HDate = data.鏃ユ湡.substr(0,10)
+							
+							this.hform.HWHID=data.HWHID,
+							this.hform.HWHName=data.浠撳簱,
+							this.hform.HStockPlaceID=data.HSPID,
+							this.hform.HStockPlaceName=data.浠撲綅,
+							
+										
+														
+							this.hform.HMouldID_B=data.hmaterid,
+							// this.hform.HMouldID_B=data.妯″叿浠g爜,
+							this.hform.HMouldName_B=data.妯″叿鍚嶇О,
+							// this.hform.HMouldModel=data.妯″叿瑙勬牸,
+							this.hform.HRedBlueFlag=data.绾㈣摑鍗曟爣璁�=='钃濆瓧'?false:true,
+							
+							
+							this.hform.HStockOrgID=data.HStockOrgID,
+							this.hform.HStockOrgName=data.搴撳瓨缁勭粐,
+							// this.hform.HICMOEntryID=data.HICMOEntryID,
+							// this.hform.HProcExchBillNo=data.HProcExchBillNo,
+							// this.hform.HProcExchInterID=data.HProcExchInterID,
+							// this.hform.HProcExchEntryID=data.HProcExchEntryID,
+							// this.hform.HOrgID=data.HOrgID,
+																				
+							this.hform.HMaker= data.鍒跺崟浜�
+							//this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
+							//this.hform.HUpDater= data.淇敼浜�
+							//this.hform.HUpDateDate= data.淇敼鏃ユ湡
+							// this.hform.HChecker= data.瀹℃牳浜�
+							// this.hform.HCheckDate= data.瀹℃牳鏃ユ湡							
+							// this.hform.HDeleteMan= data.浣滃簾浜�
+							// this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});				
+			},
+			submit() {
+				if(this.hform.HStockInOrgName==uni.getStorageSync("Organization"))
+				{
+					this.hform.HStockStyle='缁勭粐鍐呰皟鎷�'
+				}
+				else
+					this.hform.HStockStyle='璺ㄧ粍缁囪皟鎷�'
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HSactterUserName) {
+					this.hform.HSactterUserID = 0
+				}
+				else
+				{
+					this.HSecManagerID=this.hform.HSactterUserID
+				}
+				if (!this.hform.HCollectUserName) {
+					this.hform.HCollectUserID = 0
+				}
+				else
+				{
+					this.HKeeperID=this.hform.HCollectUserID 
+				}
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else {
+					if (this.hform.HMouldID_B == 0||this.hform.HMouldID_B ==null) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鍣ㄥ叿鏉$爜锛岃鍏堟壂鎻忓櫒鍏锋潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+			
+			
+						let sMainStr = JSON.stringify(this.hform);
+						console.log("涓昏〃锛�" + sMainStr)
+			
+						CommonUtils.doRequest(
+							'/MouldController/set_SaveMouldProdMoveBill_Json', {
+								oMain: sMainStr
+							},
+							(res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/caigouruku/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+									uni.showModal({
+										content: res.data.Message,
+										showCancel: false,
+										complete() {
+											uni.hideLoading()
+										}
+									})
+								}
+							},
+							null,
+							"POST"
+						)
+					}
+				}
+			},
+			onLoad(e) {
+				console.log(e, this.userInfo)
+				
+				if(e.linterid){
+					this.btnType = 3
+					this.linterid = e.linterid
+					this.HBillNo = e.HBillNo
+					this.getEditData(e.linterid, e.HBillNo)
+				}else{
+					this.getNewData()
+				}
+			
+				this.getHBaseList()
+				this.getHSupList()
+				this.getHEmpList()
+				this.getHDeptList()
+				this.getHWarehouseInList()
+				this.getOrganization()
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+    .form {
+        width: 668rpx;
+        margin: 20rpx auto;
+        padding-bottom: 240rpx;
+    }
+
+    .tab_area {
+        width: 100%;
+        height: 50rpx;
+    }
+
+    .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;
+
+        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;
+        }
+    }
+
+    .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;
+            flex-shrink: 0;
+
+            .uni-icons {
+                color: #fff !important;
+            }
+        }
+
+        .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;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
+
+        .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/MJGL/qijudiaobodan/table.vue b/pages/MJGL/qijudiaobodan/table.vue
new file mode 100644
index 0000000..f38a578
--- /dev/null
+++ b/pages/MJGL/qijudiaobodan/table.vue
@@ -0,0 +1,620 @@
+<template>
+	<view class="content">
+		<view class="form">
+			<!-- <view class="form-item">
+				<view class="title">鐘舵��:</view>
+				<view class="right">
+					<picker :range="arrayStatus" :value="hform.HStatus" @change="HStatusChange">
+						<input name="HStatus" disabled :value="hform.HStatus" placeholder="璇烽�夋嫨鐘舵��" />
+					</picker>
+				</view>
+			</view> -->
+			<view class="form-item">
+				<view class="title">寮�濮嬫椂闂�:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.HBeginDate" @change="HBeginDateChange">
+						<input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">缁撴潫鏃堕棿:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.HEndDate" @change="HEndDateChange">
+						<input name="HEndDate" disabled :value="hform.HEndDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			<view v-if="showmore">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="right">
+						<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+					</view>
+				</view>
+						
+			</view>
+			<view class="other">
+				<view v-if="!showmore" @tap="showmore = true">
+					灞曞紑鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+				</view>
+				<view v-if="showmore" @tap="showmore = false">
+					鎶樺彔鍏朵粬鏉′欢<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+				</view>
+			</view>
+
+			<view class="buttons">
+				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+				<button class="btn-b" size="mini" type="default" @tap="creat">鏂板</button>
+				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+			</view>
+		</view>
+
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+		<view class="list" v-for="(item,index) in showList" :key="index">
+		<!-- todo  HProcExchBillNo-->
+			<uni-card :title="item.HProcExchBillNo" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">		
+				<!-- #ifndef MP-WEIXIN-->
+				<view class="card-detail">
+					<view class="detail" v-if="item.閮ㄩ棬">
+						<text>閮ㄩ棬锛�</text>{{item.閮ㄩ棬}}
+					</view>
+					<view class="detail" v-if="item.璋冨嚭浠撳簱">
+						<text>璋冨嚭浠撳簱锛�</text>{{item.璋冨嚭浠撳簱}}
+					</view>
+					<view class="detail" v-if="item.璋冨嚭浠撲綅">
+						<text>璋冨嚭浠撲綅锛�</text>{{item.璋冨嚭浠撲綅}}
+					</view>
+					<view class="detail" v-if="item.璋冨叆浠撳簱">
+						<text>璋冨叆浠撳簱锛�</text>{{item.璋冨叆浠撳簱}}
+					</view>
+					<view class="detail" v-if="item.璋冨叆浠撲綅">
+						<text>璋冨叆浠撲綅锛�</text>{{item.璋冨叆浠撲綅}}
+					</view>
+					<view class="detail" v-if="item.妯″叿缂栫爜">
+						<text>妯″叿浠g爜锛�</text>{{item.妯″叿缂栫爜}}
+					</view>
+					<view class="detail" v-if="item.妯″叿鍚嶇О">
+						<text>妯″叿鍚嶇О锛�</text>{{item.妯″叿鍚嶇О}}
+					</view>
+					<view class="detail" v-if="item.妯″叿瑙勬牸">
+						<text>妯″叿瑙勬牸锛�</text>{{item.妯″叿瑙勬牸}}
+					</view>
+					
+					<view class="detail" v-if="item.棰嗘枡浜�">
+						<text>棰嗘枡浜猴細</text>{{item.棰嗘枡浜簘}
+					</view>
+					<view class="detail" v-if="item.鍙戞枡浜�">
+						<text>鍙戞枡浜猴細</text>{{item.鍙戞枡浜簘}
+					</view>
+					
+					<view class="detail" v-if="item['璋冨嚭缁勭粐']">
+						<text>璋冨嚭缁勭粐锛�</text>{{item['璋冨嚭缁勭粐']}}
+					</view>
+					<view class="detail" v-if="item['璋冨叆缁勭粐']">
+						<text>璋冨叆缁勭粐锛�</text>{{item['璋冨叆缁勭粐']}}
+					</view>
+					
+					
+				</view>
+				<view class="card-detail" v-if="showDetail == index">
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+						<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.淇敼浜�">
+						<text>淇敼浜猴細</text>{{item.淇敼浜簘}
+					</view>
+					<view class="detail" v-if="item.淇敼鏃ユ湡">
+						<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.瀹℃牳浜�">
+						<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+					</view>
+					<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+						<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.鍏抽棴浜�">
+						<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+					</view>
+					<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+						<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.澶囨敞">
+						<text>澶囨敞锛�</text>{{item.澶囨敞}}
+					</view>
+				</view>
+				<!-- #endif -->
+				
+				<!-- #ifdef MP-WEIXIN -->
+				<uni-card style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+					
+					<view class="card-detail">
+						<view class="detail" v-if="item['閮ㄩ棬']">
+							<text>閮ㄩ棬锛�</text>{{item['閮ㄩ棬']}}
+						</view>
+						<view class="detail" v-if="item['璋冨嚭浠撳簱']">
+							<text>璋冨嚭浠撳簱锛�</text>{{item['璋冨嚭浠撳簱']}}
+						</view>
+						<view class="detail" v-if="item['璋冨嚭浠撲綅']">
+							<text>璋冨嚭浠撲綅锛�</text>{{item['璋冨嚭浠撲綅']}}
+						</view>
+						<view class="detail" v-if="item['璋冨叆浠撳簱']">
+							<text>璋冨叆浠撳簱锛�</text>{{item['璋冨叆浠撳簱']}}
+						</view>
+						<view class="detail" v-if="item['璋冨叆浠撲綅']">
+							<text>璋冨叆浠撲綅锛�</text>{{item['璋冨叆浠撲綅']}}
+						</view>
+						<view class="detail" v-if="item['妯″叿缂栫爜']">
+							<text>妯″叿缂栫爜锛�</text>{{item['妯″叿缂栫爜']}}
+						</view>
+						<view class="detail" v-if="item['妯″叿鍚嶇О']">
+							<text>妯″叿鍚嶇О锛�</text>{{item['妯″叿鍚嶇О']}}
+						</view>
+						<view class="detail" v-if="item['妯″叿瑙勬牸']">
+							<text>妯″叿瑙勬牸锛�</text>{{item['妯″叿瑙勬牸']}}
+						</view>
+						
+						<view class="detail" v-if="item['棰嗘枡浜�']">
+							<text>棰嗘枡浜猴細</text>{{item['棰嗘枡浜�']}}
+						</view>
+						<view class="detail" v-if="item['鍙戞枡浜�']">
+							<text>鍙戞枡浜猴細</text>{{item['鍙戞枡浜�']}}
+						</view>
+						
+						
+						<view class="detail" v-if="item['璋冨嚭缁勭粐']">
+							<text>璋冨嚭缁勭粐锛�</text>{{item['璋冨嚭缁勭粐']}}
+						</view>
+						<view class="detail" v-if="item['璋冨叆缁勭粐']">
+							<text>璋冨叆缁勭粐锛�</text>{{item['璋冨叆缁勭粐']}}
+						</view>
+						
+					</view>
+					<view class="card-detail" v-if="showDetail == index">
+						<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['鍒跺崟鏃ユ湡'].substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item['淇敼浜�']">
+							<text>淇敼浜猴細</text>{{item['淇敼浜�']}}
+						</view>
+						<view class="detail" v-if="item['淇敼鏃ユ湡']">
+							<text>淇敼鏃ユ湡锛�</text>{{item['淇敼鏃ユ湡'].substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item['瀹℃牳浜�']">
+							<text>瀹℃牳浜猴細</text>{{item['瀹℃牳浜�']}}
+						</view>
+						<view class="detail" v-if="item['瀹℃牳鏃ユ湡']">
+							<text>瀹℃牳鏃ユ湡锛�</text>{{item['瀹℃牳鏃ユ湡'].substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item['鍏抽棴浜�']">
+							<text>鍏抽棴浜猴細</text>{{item['鍏抽棴浜�']}}
+						</view>
+						<view class="detail" v-if="item['鍏抽棴鏃ユ湡']">
+							<text>鍏抽棴鏃ユ湡锛�</text>{{item['鍏抽棴鏃ユ湡'].substr(0,10)}}
+						</view>
+						<view class="detail" v-if="item['澶囨敞']">
+							<text>澶囨敞锛�</text>{{item['澶囨敞']}}
+						</view>
+					</view>
+					<!-- #endif -->
+
+					<view class="more" v-if="showDetail == index && operations != index">
+						<view class="part" style="border-right: 1px solid #eee;">
+							<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+						</view>
+						<view class="part" @tap.stop="operations = operations==index?-1:index">
+							<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+								size="14"></uni-icons>鎿嶄綔
+						</view>
+					</view>
+					<view class="more" v-if="showDetail != index && operations != index">
+						<view class="part" style="border-right: 1px solid #eee;">
+							<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+						</view>
+						<view class="part" @tap.stop="operations = operations==index?-1:index">
+							<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+								size="14"></uni-icons>鎿嶄綔
+						</view>
+					</view>
+					
+					<view class="op" v-if="operations == index">						
+		<!-- 				<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+						<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+					</view>
+				</uni-card>
+		</view>
+
+		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				showmore: false,
+				arrayStatus: ['鍏ㄩ儴', '鏈鏍�', '宸插鏍�', '宸插叧闂�'],
+				hform: {
+					HStatus: '鍏ㄩ儴',
+					HBeginDate: '',
+					HEndDate: '',
+					HBillNo: '',
+					HProcExchBillNo: '',					
+				},
+				sWhere: '',
+				listData: [],
+				showList: [],
+				showDetail: -1,
+				operations: -1,
+
+				page: 1,
+			}
+		},
+		onLoad() {
+			this.getList()
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(() => {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		methods: {
+			getPage(page, list) {
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex, eindex)
+				return newList
+			},
+			getList() {
+				uni.showLoading({
+					title: '鍔犺浇涓�...'
+				})
+				if(this.sWhere=='')
+				this.sWhere='and 1=1'
+				uni.request({
+					url: this.serverUrl + '/Sc_MouldProdMoveBill/page',
+					data: {
+						sWhere: this.sWhere,
+						//sWhere: 'and 1=1',
+						user: uni.getStorageSync('HUserName'),
+						//Organization:uni.getStorageSync('Organization'),
+						page:1,
+						size:100
+					},
+					success: (res) => {
+						console.log(1, res.data);
+						//todo 姝ゅ鍙兘鏈夐棶棰橈紙res.data.code锛�
+						if (res.data.code == 1) {
+							this.listData = res.data.data
+							this.showList = this.getPage(this.page, this.listData)
+							setTimeout(() => {
+								uni.hideLoading()
+							}, 1000)
+						} else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.hideLoading()
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鐘舵��
+			HStatusChange(e) {
+				console.log(e.detail.value)
+				this.hform.HStatus = this.arrayStatus[e.detail.value]
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			HBeginDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HBeginDate = e.detail.value
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			HEndDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HEndDate = e.detail.value
+			},
+			//鎼滅储
+			search() {
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+
+				console.log(this.hform)
+
+				if (this.hform.HStatus) {
+					if (this.hform.HStatus == '鍏ㄩ儴') {
+						this.sWhere += "";
+					} else if (this.hform.HStatus == '鏈鏍�') {
+						this.sWhere += " and 瀹℃牳浜�=''";
+					} else if (this.hform.HStatus == '宸插鏍�') {
+						this.sWhere += " and 瀹℃牳浜�<>''";
+					} else if (this.hform.HStatus == '宸插叧闂�') {
+						this.sWhere += " and 鍏抽棴浜�<>''";
+					}
+				}
+				if (this.hform.BenginHCreateDate) {
+					this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+				}
+				if (this.hform.EndHCreateDate) {
+					this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+				}
+				if (this.hform.HBillNo) {
+					this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}				
+				
+				if (this.hform.HProcExchBillNo) {
+					this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
+				}
+
+				this.getList()
+			},
+			//鏂板
+			creat() {
+				uni.navigateTo({
+					url: '/pages/MJGL/qijudiaobodan/form'
+				})
+			},
+			//閲嶇疆
+			clear() {
+				this.listData = []
+				this.page = 1
+				this.showList = []
+
+				this.showmore = false
+				this.sWhere = ''
+				this.showDetail = -1,
+					this.operations = -1,
+					this.hform = {
+						HStatus: '鍏ㄩ儴',
+						HBeginDate: '',
+						HEndDate: '',
+						HBillNo: '',
+						HProcExchBillNo: '',						
+					}
+				this.getList()
+			},
+
+			//缂栬緫
+			edit(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: '/pages/MJGL/shangmudan/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+				})
+			},
+			//鍒犻櫎
+			del(item) {
+				console.log(item)
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');							
+							uni.request({
+								url: this.serverUrl +'/Sc_MouldProdMoveBill/DeltetMouldProdMoveBill',
+								data: {
+									//HInterID: item.hmainid + "_" + item.hsubid,
+									HInterID: item.hmainid ,
+									user: uni.getStorageSync('HUserName')
+								},
+								success: (res) => {
+									console.log(1, res);
+									if (res.data.count == 1) {
+										this.clear()
+									}
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.showToast({
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
+									})
+								},
+							});
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form {
+		width: 640rpx;
+		margin: 20rpx auto;
+	}
+
+	.other {
+		margin-top: 8rpx;
+		text-align: center;
+		font-size: 28rpx;
+		padding: 4rpx 18rpx;
+		color: #1890FF;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+
+		.title {
+			width: 180rpx;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+
+		.righton {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	.buttons {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #acacac;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #3a78ff;
+			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;
+			}
+		}
+
+		.op {
+			display: flex;
+			justify-content: space-around;
+			margin-top: 20rpx;
+
+			button {
+				padding: 0;
+				width: 150rpx;
+				font-size: 25rpx;
+			}
+
+			.op1 {
+				border: 1px solid #41a863;
+				color: #41a863;
+			}
+
+			.op2 {
+				border: 1px solid #d98d00;
+				color: #d98d00;
+			}
+
+			.op3 {
+				border: 1px solid #3a78ff;
+				color: #3a78ff;
+			}
+
+			.op4 {
+				border: 1px solid #da0000;
+				color: #da0000;
+			}
+
+			.op5 {
+				border: 1px solid #888;
+				color: #888;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/shangmudan/form.vue b/pages/MJGL/shangmudan/form.vue
index fc62d0e..3e7610c 100644
--- a/pages/MJGL/shangmudan/form.vue
+++ b/pages/MJGL/shangmudan/form.vue
@@ -2,11 +2,13 @@
 	<view>
 		<view class="form">
 			<view class="form-item">
-				<view class="title"><text>*</text>鏉″舰鐮�:</view>
-				<view class="right" style="width: 380rpx;">
-					<input v-model="hform.HBarCode" disabled placeholder="璇锋壂鎻忔潯鐮�" @blur="getHBarCodeData(hform.HBarCode)"/>
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)"/>
 				</view>
-				<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
+				<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>
diff --git a/pages/fenbushidiaochudan/form_out.vue b/pages/fenbushidiaochudan/form_out.vue
new file mode 100644
index 0000000..4fec4bc
--- /dev/null
+++ b/pages/fenbushidiaochudan/form_out.vue
@@ -0,0 +1,2582 @@
+<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.HSCWHName"
+                        @input="HSCWHNameChange" @confirm="HWHNameOutScan"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">璋冨嚭浠撲綅:</view>
+                <view class="right" v-show="HSCIsStockMgr">
+                    <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                        v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
+                        @confirm="HStockPlaceOutNameScan"></uni-combox>
+                </view>
+                <view class="righton" v-show="!HSCIsStockMgr">
+                    <input v-model="hform.HOutStockPlaceName" :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 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" @confirm="onHSourceBillNoConfirmHandler"
+                            name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+
+                    </view>
+                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+                    </view>
+
+                    <view class="righton" v-show="!showHSourceBillNo">
+                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                    </view>
+                </view>
+
+                <view class="form-item">
+                    <view class="title">鍗曟嵁瀛愮被鍨�:</view>
+                    <view class="right">
+                        <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>
+
+                <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" v-show="showHMainSourceBillType">
+						<uni-combox :candidates="HStockStyleArray" placeholder="璇烽�夋嫨" v-model="hform.HStockStyle"
+							@input="HStockStyleChange"></uni-combox>
+					</view>    -->
+                    <view class="righton">
+                        <input name="HStockStyle" disabled v-model="hform.HStockStyle" placeholder="璇烽�夋嫨璋冩嫧绫诲瀷" />
+                    </view>
+                </view>
+
+                <view class="form-item">
+                    <view class="title">鏃ユ湡:</view>
+                    <view class="right">
+                        <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 v-if="tabs == 1">
+                <view class="form-item">
+                    <view class="title">璋冨叆浠撳簱:</view>
+                    <view class="right">
+                        <uni-combox :candidates="arrayHWHInName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+                            @input="HWHInNameChange" @confirm="HWHNameInScan"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冨叆浠撲綅:</view>
+                    <view class="right" v-show="HIsStockMgr">
+                        <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                            v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
+                            @confirm="HStockPlaceNameInScan"></uni-combox>
+                    </view>
+                    <view class="righton" v-show="!HIsStockMgr">
+                        <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+                    </view>
+                </view>
+               <!-- <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="right">
+                        <uni-combox :candidates="arrayHCusName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HCusName"
+                            @input="HCusNameChange"></uni-combox>
+                    </view>
+                    <!-- <view class="righton" v-show="!showHSupName">
+                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+                    </view> -->
+                </view>
+                <!-- TODO: 璺ㄧ粍缁囪皟鐢ㄥ彲淇敼 閫変腑缁勭粐鍚庯紝浠撳簱浠撲綅涔熻鍙戠敓鍙樺寲 -->
+                <view class="form-item">
+                    <view class="title">璋冨嚭缁勭粐:</view>
+                    <view class="righton">
+                        <input name="HStockOutOrgName" disabled v-model="hform.HStockOutOrgName" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冨叆缁勭粐:</view>
+                    <view class="right" v-show="!HIsStockInner">
+                        <uni-combox :candidates="arrayHOrgName" placeholder="璇烽�夋嫨璋冨叆缁勭粐" v-model="hform.HStockInOrgName"
+                            @input="HStockInOrgNameChange"></uni-combox>
+                    </view>
+                    <view class="righton" v-show="HIsStockInner">
+                        <input name="HStockInOrgName" disabled v-model="hform.HStockInOrgName" />
+                    </view>
+                </view>
+            </view>
+
+            <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 == 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 class="form-item">
+                    <view class="title">璋冨嚭浠撳簱:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HSCWHName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冨嚭浠撲綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HSCSPName_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>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+<script>
+    import {
+        CommonUtils
+    } from '../../utils/common';
+    import getDateTime from '@/utils/getdateTime.js';
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import elemIterator from '../../utils/elemIterator';
+    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+    import {
+        getUserStockRelation
+    } from '../../utils/userRelationManager';
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    export default {
+        data() {
+            return {
+                pageTitleName: '鍒嗗竷寮忚皟鍑哄崟',
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                HModName: 'Kf_MoveStockStepOutBill_PDA.html',
+                ModRightName: 'CE_MoveStockStepOut',
+                OperationType: 1,
+                HInterID_Temp: '',
+
+                HSCIsStockMgr: false,
+                HIsStockMgr: false,
+                showHStockPlaceName: true,
+                showHMainSourceBillType: true,
+                showHSourceBillNo: true,
+                reHSourceBillNo: true,
+                showHSupName: true,
+                barCodeFocus: false,
+                HSourcebillNoFocus: false,
+                HSupName: '',
+
+                HStockStyleArray: ["缁勭粐鍐呰皟鎷�", "璺ㄧ粍缁囪皟鎷�"],
+
+                tabs: 0,
+                HMainSourceBillType: '鍙戣揣閫氱煡鍗�',
+                arrayHMainSourceBillType: ['鍙戣揣閫氱煡鍗�', '璋冩嫧鐢宠鍗�',
+                     '鎵嬪伐褰曞叆'
+                ],
+                arrayHMainSourceBillValue: [1402, 1243, 3720, 1604,
+                    1214, 3721, 1242, -1
+                ],
+
+                linterid: '',
+                HBillNo: '',
+                btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+                showmore: false,
+
+                arrayHWHName: [], //浠撳簱
+                HWHNameList: [],
+                arrayHStockPlaceName: [], //浠撲綅
+                HStockPlaceNameList: [],
+                arrayHSourceBillNo: [], //婧愬崟鍗曞彿
+                HSourceBillNoList: [],
+                arrayHTransferDirect: [], // 璋冩嫧鏂瑰悜
+                arrayHOrgName: [], // 缁勭粐
+                arrayHOrgValue: [], // 缁勭粐瀵瑰簲ID
+                arrayHWHInName: [], // 璋冨叆浠撳簱
+                HWHInNameList: [],
+                arrayHStockPlaceInName: [], //璋冨叆浠撲綅
+                HStockPlaceInNameList: [],
+
+                arrayHBillSubType: [],
+                arrayHBillSubTypeValue: [],
+                HBillSubType: '',
+
+                arrayHEmpName: [], //鎿嶄綔鍛�
+                HEmpNameList: [],
+                arrayHDeptName: [], //閮ㄩ棬
+                HDeptNameList: [],
+                arrayHSupName: [], //瀹㈡埛
+                HSupNameList: [],
+                arrayHSupName: [], //瀹㈡埛
+                HSupNameList: [],
+                arrayHCusName: [], //渚涘簲鍟�
+                HCusNameList: [],
+                
+                Materlist: [],
+                FIFOlist: [],
+                hform: {
+                    HBillType: 1250,
+                    HBillSubType: "",
+                    HBillerID: uni.getStorageSync('HBillerID'),
+                    HRedBlueFlag: false,
+
+                    HStockOutOrgName: uni.getStorageSync('Organization'),
+                    HStockInOrgName: uni.getStorageSync('Organization'),
+                    HStockInOrgID: uni.getStorageSync('OrganizationID'),
+                    HStockOutOrgID: uni.getStorageSync('OrganizationID'),
+
+                    HBarCode: '',
+                    HQty: '',
+                    HSCWHName: getUserInfo().HWHName,
+                    HSCWHID: getUserInfo().HWhID,
+                    HWHName: getUserInfo().HWHName,
+                    HWHID: getUserInfo().HWhID,
+
+                    HStockStyle: '',
+                    HOutStockPlaceName: getUserInfo().HSPName,
+                    HOutStockPlaceID: getUserInfo().HSPID,
+                    HStockPlaceName: getUserInfo().HSPName,
+                    HStockPlaceID: getUserInfo().HSPID,
+
+                    HMainSourceBillType: 1402,
+                    HSourceBillNo: '', //CGDD000200
+                    HFIFOWHName: '',
+                    HFIFOWHID: '',
+                    HDate: getDateTime.dateTimeStr('y-m-d'),
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HBillNo: '',
+                    HInterID: '',
+
+                    HKeeperName: getUserInfo().HKeeper,
+                    HKeeperID: getUserInfo().HKeeperID,
+                    HSecManagerName: getUserInfo().HSecManager,
+                    HSecManagerID: getUserInfo().HSecManagerID,
+                    HDeptName: getUserInfo().HDept,
+                    HDeptID: getUserInfo().HDeptID,
+                    // 瀹㈡埛
+                    HSupName: '',
+                    HSupID: '',
+                    // 渚涘簲鍟�
+                    HCusID: '',
+                    HCusName: '',
+                    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
+        },
+        
+        async onLoad(e) {
+            await this.getOrganization()
+            console.log(e, this.userInfo)
+            this.OperationType = e.OperationType
+            if (e.HInterID) {
+                this.HInterID_Temp = e.HInterID
+                // this.btnType = 1
+                this.barCodeFocus = true
+                this.RoadBillMain(e.HInterID)
+            } else {
+                this.HSourcebillNoFocus = true
+                this.getNewData()
+            }
+
+            this.getHWarehouseInList()
+            // this.getHBaseList()
+            this.getHSupList()
+            this.getHEmpList()
+            this.getHDeptList()
+            this.set_InitBillSubType()
+            this.InitTransferDirect()
+            //this.InitShipType()
+            
+            // this.getHSupList() // 鍒濆鍖� 瀹㈡埛
+            this.getHCusList() // 鍒濆鍖� 渚涘簲鍟�
+
+            this.getRelationStore()
+            this.GetSourceBillType()
+
+            uni.$on('BillSelectComplete', (e) => {
+                console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+                this.getHBarCodeData(e.HBillNo)
+                this.$refs.billList.exit()
+            })
+        },
+        onUnload() {
+            uni.$off('BillSelectComplete')
+        },
+        computed: {
+            HIsStockInner: {
+                get: function() {
+                    if (this.hform.HStockStyle == '缁勭粐鍐呰皟鎷�') {
+                        return true
+                    }
+                    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: {
+            //鑾峰彇渚涘簲鍟嗘暟鎹�
+            getHCusList() {
+                if (!this.hform.HStockOrgID) {
+                    var HOtherOrgID = 0;
+                } else {
+                    var HOtherOrgID = this.hform.HStockOrgID
+                }
+                uni.request({
+                    url: this.serverUrl + '/Web/GetSupplierList_Json',
+                    data: {
+                        Supplier: '',
+                        HOrgID: HOtherOrgID
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            console.log('Supplier: ',res.data);
+                            this.HCusNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHCusName[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'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨渚涘簲鍟�
+            HCusNameChange(e) {
+                console.log('e: ',e);
+                for (var i = 0; i < this.HCusNameList.length; i++) {
+                    if (this.HCusNameList[i].HName == e) {
+                        this.hform.HCusID = this.HCusNameList[i].HItemID
+                        this.hform.HCusName = this.HCusNameList[i].HName
+                    }
+                }
+            },
+            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
+                })
+            },
+            async HWHNameOutScan(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 HStockPlaceOutNameScan(e) {
+                // 鎵弿浠撲綅鐮�
+                console.log('浠撲綅鐮�: ', e);
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                console.log('index: ', index);
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HOutStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
+            async HWHNameInScan(e) {
+                // 鎵弿浠撳簱鐮�
+                console.log('浠撳簱鐮�: ', e);
+                let index = this.HWHInNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+                    })
+                } else {
+                    this.HWHInNameChange(this.HWHInNameList[index]['浠撳簱鍚嶇О'])
+                }
+            },
+            async HStockPlaceNameInScan(e) {
+                // 鎵弿浠撲綅鐮�
+                console.log('浠撲綅鐮�: ', e);
+                let index = this.HStockPlaceInNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                console.log('index: ', index);
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HStockPlaceNameChange(this.HStockPlaceInNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
+            async qrCodeDisplay() {
+                try {
+                    this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
+                    await this.$nextTick()
+                    this.$refs.barcodePopup.open()
+                } catch (err) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err
+                    })
+                }
+            },
+            async getRelationStore() {
+                let {
+                    data,
+                    count
+                } = await getUserStockRelation()
+                if (count == 1) {
+                    let WHIDList = []
+                    console.log('WHIDList: ', data);
+                    Array.from(data).forEach(elem => {
+                        WHIDList.push(elem.HItemID)
+                    })
+
+                    let sWhere = ` and HItemID in (${WHIDList.join(",")})`
+                    this.getHBaseList({
+                        sWhere: sWhere
+                    })
+
+                } else {
+                    this.getHBaseList()
+                }
+            },
+            // 璋冨叆浠撳簱淇敼
+            HStockPlaceInNameChange(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
+                    }
+                }
+            },
+            // 璋冨叆浠撲綅淇敼
+            HWHInNameChange(e) {
+                console.log('e: ', e);
+                for (var i = 0; i < this.HWHInNameList.length; i++) {
+                    if (this.HWHInNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HWHName = this.HWHInNameList[i].浠撳簱鍚嶇О
+                        this.hform.HWHID = this.HWHInNameList[i].HItemID
+
+                        if (this.HWHInNameList[i]['鍚敤浠撲綅'] == 'Y') {
+                            this.HIsStockMgr = true
+                        } else {
+                            // this.hform.HStockPlaceName = ''
+                            this.HIsStockMgr = false
+                        }
+                    }
+                }
+            },
+            getOrganization() {
+                return new Promise((resolve, reject) => {
+                    CommonUtils.doRequest2({
+                        url: '/Web/GetOrganizations',
+                        resFunction: (res) => {
+                            console.log("Organizations: ", res.data)
+                            let {
+                                data,
+                                count,
+                                Message
+                            } = res.data
+                            if (count == 1) {
+                                this.arrayHOrgName = []
+                                this.arrayHOrgValue = []
+                                Array.from(data).forEach(e => {
+                                    this.arrayHOrgName.push(e.Name)
+                                    this.arrayHOrgValue.push(e.ID)
+                                })
+                                resolve()
+                            } else {
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: Message
+                                })
+                                reject()
+                            }
+
+                        }
+                    })
+                })
+            },
+            HStockInOrgNameChange(e) {
+                let index = this.arrayHOrgName.findIndex(elem => elem == e)
+                if (index != -1) {
+                    this.hform.HStockInOrgID = this.arrayHOrgValue[index]
+                }
+                // 鏇存柊璋冨叆浠撳簱
+                this.getHWarehouseInList(e)
+                this.hform.HWHID = '',
+                    this.hform.HWHName = ''
+            },
+            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.HBillSubType = this.arrayHBillSubType[0]
+                            this.hform.HBillSubType = this.arrayHBillSubTypeValue[0]
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                )
+            },
+            onHSourceBillNoConfirmHandler() {
+                if (this.hform.HMainSourceBillType == -1) {
+                    // 鎵嬪伐褰曞叆涓嶈繘琛屾彁浜�
+                    this.playSound(1)
+                    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() {
+                uni.scanCode({
+                    onlyFromCamera: true,
+                    success: (res) => {
+                        console.log('鏉$爜鍐呭锛�' + res.result);
+                        if (this.hform.HBarCode == '*') {
+                            this.hform.HBarCode = this.hform.HBarCode + res.result
+                        } else {
+                            this.hform.HBarCode = res.result
+                        }
+
+                        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
+            },
+            HBillSubTypeChange(e) {
+                let index = e.detail.value
+                // console.log(e.detail.value)
+                this.HBillSubType = this.arrayHBillSubType[index]
+                this.hform.HBillSubType = this.arrayHBillSubTypeValue[index]
+            },
+            // 璋冩嫧鏂瑰悜淇敼
+            HStockStyleChange(e) {
+                this.hform.HStockStyle = e
+            },
+            // 璋冨叆浠撳簱璧勬枡
+            getHWarehouseInList(Organizaiton) {
+                Organizaiton = Organizaiton || uni.getStorageSync("Organization")
+                CommonUtils.doRequest2({
+                    url: '/Gy_Warehouse/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: Organizaiton
+                    },
+                    resFunction: (res) => {
+                        console.log('璋冨叆浠撳簱 res: ', res.data.data);
+                        if (res.data.count == 1) {
+                            this.HWHInNameList = []
+                            this.arrayHWHInName = []
+
+                            this.HWHInNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    }
+                });
+
+                uni.request({
+                    url: this.serverUrl + '/Gy_StockPlace/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: Organizaiton
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HStockPlaceInNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHStockPlaceInName[i] = res.data.data[i].浠撲綅鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //鍩虹浠撳簱璧勬枡
+            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
+                            this.HWHInNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+                                this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+
+                uni.request({
+                    url: this.serverUrl + '/Gy_StockPlace/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HStockPlaceNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+
+                // this.getHYDList()
+            },
+            // 璋冩嫧鏂瑰悜
+            InitTransferDirect() {
+                let HTransferDirect = '';
+
+                CommonUtils.doRequest(
+                    "/WEBSController/GetMoveDirect_Json", {},
+                    (res) => {
+                        console.log('transferDirectRes: ', res);
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.arrayHTransferDirect = Array.from(data).map(e => {
+
+                                return e.HName
+
+                            })
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                Message: Message
+                            })
+                        }
+                    },
+                    (err) => {
+                        console.log('err: ', err);
+                    }
+                )
+
+            },
+            // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
+            async GetSourceBillType() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetHSourceBillTypeByBillType',
+                    data: {
+                        HBillType: this.hform.HBillType,
+                        Num: 2
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            console.log('data: ', data);
+                            this.arrayHMainSourceBillType = []
+                            this.arrayHMainSourceBillValue = []
+                            Array.from(data).forEach(e => {
+                                this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+                                this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+                            })
+
+                            this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+                            this.arrayHMainSourceBillValue.push('-1')
+                            //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
+                            if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
+                                this.tabs = 1
+                            }
+
+                            this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+                            this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: 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.hform.HStockPlaceID = ''
+                            this.HIsStockMgr = false
+                        }
+                    }
+                }
+            },
+            // 璋冨嚭浠撳簱淇敼
+            HSCWHNameChange(e) {
+                // var name = e.split("(")
+                for (var i = 0; i < this.HWHNameList.length; i++) {
+                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HSCWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+                        this.hform.HSCWHID = this.HWHNameList[i].HItemID
+
+                        if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+                            this.HSCIsStockMgr = true
+                        } else {
+                            this.hform.HOutStockPlaceName = ''
+                            this.hform.HOutStockPlaceID = ''
+                            this.HSCIsStockMgr = 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) {
+                        console.log(this.HStockPlaceNameList[i]);
+                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                    }
+                }
+            },
+            HOutStockPlaceNameChange(e) {
+                for (var i = 0; i < this.HStockPlaceInNameList.length; i++) {
+                    if (this.HStockPlaceInNameList[i].浠撲綅鍚嶇О == e) {
+                        this.hform.HOutStockPlaceName = this.HStockPlaceInNameList[i].浠撲綅鍚嶇О
+                        this.hform.HOutStockPlaceID = this.HStockPlaceInNameList[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 + '/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'
+                        })
+                    },
+                });
+            },
+            // 璋冩嫧鏂瑰悜淇敼
+            HTransferDirectChange(e) {
+                this.hform.HTransferDirect = e
+            },
+            //淇濈
+            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_MoveStock_Json',
+                    data: {
+                        HInterID: this.hform.HInterID,
+                        HBillNo: this.hform.HBillNo,
+                        HBillType: this.hform.HBillType,
+                        HSourceBillNo: HBarCode,
+                        HSourceBillType: this.hform.HMainSourceBillType,
+                        HMaker: this.hform.HMaker,
+                        HOWNERID: this.hform.HStockOrgID,
+                        HFIFOWhID: this.hform.HFIFOWHID,
+                        // 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.barCodeFocus = true
+                            this.playSound(1)
+                            this.DisBillEntryList()
+                        } else {
+                            this.playSound(0)
+                            console.log('res: ', res);
+
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                            this.HSourcebillNoFocus = false
+                            this.$nextTick(() => {
+                                this.hform.HSourceBillNo = ""
+                                this.HSourcebillNoFocus = true
+                            })
+                        }
+                    },
+                    fail: (err) => {
+                        console.log('err: ', err);
+                        this.playSound(0)
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                        this.HSourcebillNoFocus = false
+                        this.$nextTick(() => {
+                            this.hform.HSourceBillNo = ""
+                            this.HSourcebillNoFocus = true
+                        })
+                    },
+                });
+            },
+            //鎵潯鐮佸鐞�
+            async getCode(HBarCode) {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HSCWHName) {
+                    this.hform.HSCWHID = 0
+                }
+                if (!this.hform.HOutStockPlaceName) {
+                    this.hform.HOutStockPlaceID = 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 sHSCWHID = this.hform.HSCWHID
+                var sHOUTSPID = this.hform.HOutStockPlaceID
+                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 {
+
+                        try {
+                            let res = await CommonUtils.doRequest2Sync({
+                                url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+                                data: {
+                                    HInterID: this.hform.HInterID,
+                                    HBillType: this.hform.HBillType,
+                                    HBarCode: sBarCode
+                                }
+                            })
+                            if (!res) {
+                                return
+                            }
+                            console.log('鍒犻櫎鏉$爜', res.data);
+                            this.hform.HBarCode = ''
+                            if (res.data.count == 1) {
+                                this.playSound(1)
+                                this.hform.HQty = ''
+                                this.DisBillEntryList()
+                            } else {
+                                this.playSound(0)
+                                this.refreshBarCodeState()
+                                uni.showToast({
+                                    title: res.data.Message,
+                                    icon: 'none'
+                                })
+                            }
+                        } catch (err) {
+                            this.refreshBarCodeState()
+                            this.playSound(0)
+                            uni.showToast({
+                                title: '鎺ュ彛璇锋眰澶辫触: ' + err,
+                                icon: 'none'
+                            })
+                        }
+                        // 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)
+                        // 
+                        //             uni.showToast({
+                        //                 title: res.data.Message,
+                        //                 icon: 'none'
+                        //             })
+                        //             this.barCodeFocus = false
+                        //             this.$nextTick(() => {
+                        //                 this.barCodeFocus = true
+                        //                 this.hform.HBarCode = ""
+                        //             })
+                        //         }
+                        //     },
+                        //     fail: (res) => {
+                        //         this.playSound(0)
+                        //         this.barCodeFocus = true
+                        //         console.log(res);
+                        //         uni.showToast({
+                        //             title: '鎺ュ彛璇锋眰澶辫触',
+                        //             icon: 'none'
+                        //         })
+                        //         this.barCodeFocus = false
+                        //         this.$nextTick(() => {
+                        //             this.barCodeFocus = true
+                        //             this.hform.HBarCode = ""
+                        //         })
+                        //     },
+                        // });
+                    }
+                } else {
+                    var sBarCode = this.hform.HBarCode
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+                    try {
+
+                        let res = await CommonUtils.doRequest2Sync({
+                            url: '/WEBSController/get_BarCode_MoveStock_New_Json',
+                            data: {
+                                sBarCode: sBarCode,
+                                HInterID: this.hform.HInterID,
+                                HBillType: this.hform.HBillType,
+                                HBillNo: this.hform.HBillNo,
+                                HMaker: this.hform.HMaker,
+                                HWhID: sHWHID,
+                                HSPID: sHSPID,
+                                HSCWHID: sHSCWHID,
+                                HSCSPID: sHOUTSPID,
+                                HQty: sHQty,
+                                // HRedBlueFlag: this.hform.HRedBlueFlag,
+                                SourceFlag: HSourceFlag,
+                                HSourceBillNo: sSourceBillNo,
+                                HSourceBillType: sSourceBillType,
+                                HStockInOrgID: this.hform.HStockOrgID,
+                                HStockOutOrgID: this.hform.HStockOutOrgID,
+                                HScanStyle: "",
+                                HCustom1: "",
+                                HCustom2: ""
+                            },
+                        })
+
+                        if (!res) {
+                            return
+                        }
+
+                        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 == "1402") {
+                                // 	this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+                                // 	this.hform.HMainSourceBillType = 1402
+                                // 	this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "1243") {
+                                // 	this.HMainSourceBillType = '璋冩嫧鐢宠鍗�'
+                                // 	this.hform.HMainSourceBillType = 1243
+                                // 	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 if (data.hSourceBillTypeField == "1604") {
+                                // 	this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
+                                // 	this.hform.HMainSourceBillType = 1604
+                                // 	this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "1214") {
+                                // 	this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+                                // 	this.hform.HMainSourceBillType = 1214
+                                // 	this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "3721") {
+                                // 	this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+                                // 	this.hform.HMainSourceBillType = 3721
+                                // 	this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "1242") {
+                                // 	this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
+                                // 	this.hform.HMainSourceBillType = 1242
+                                // 	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 || -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.barCodeFocus = false
+                            this.$nextTick(() => {
+                                this.barCodeFocus = true
+                                this.hform.HBarCode = ""
+                            })
+                        } else {
+                            this.playSound(0)
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                            this.barCodeFocus = false
+                            this.$nextTick(() => {
+                                this.barCodeFocus = true
+                                this.hform.HBarCode = ""
+                            })
+                        }
+
+                    } catch (err) {
+                        this.playSound(0)
+                        this.barCodeFocus = true
+                        console.log(err);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触:' + err,
+                            icon: 'none'
+                        })
+                        this.barCodeFocus = false
+                        this.$nextTick(() => {
+                            this.barCodeFocus = true
+                            this.hform.HBarCode = ""
+                        })
+
+                    }
+
+
+                    // uni.request({
+                    //     url: this.serverUrl + '/WEBSController/get_BarCode_MoveStock_New_Json',
+                    //     data: {
+                    //         sBarCode: sBarCode,
+                    //         HInterID: this.hform.HInterID,
+                    //         HBillType: this.hform.HBillType,
+                    //         HBillNo: this.hform.HBillNo,
+                    //         HMaker: this.hform.HMaker,
+                    //         HWhID: sHWHID,
+                    //         HSPID: sHSPID,
+                    //         HSCWHID: sHSCWHID,
+                    //         HSCSPID: sHOUTSPID,
+                    //         HQty: sHQty,
+                    //         // HRedBlueFlag: this.hform.HRedBlueFlag,
+                    //         SourceFlag: HSourceFlag,
+                    //         HSourceBillNo: sSourceBillNo,
+                    //         HSourceBillType: sSourceBillType,
+                    //         HStockInOrgID: this.hform.HStockOrgID,
+                    //         HStockOutOrgID: this.hform.HStockOutOrgID,
+                    //         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 == "1402") {
+                    //                 // 	this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+                    //                 // 	this.hform.HMainSourceBillType = 1402
+                    //                 // 	this.showHMainSourceBillType = false
+                    //                 // } else if (data.hSourceBillTypeField == "1243") {
+                    //                 // 	this.HMainSourceBillType = '璋冩嫧鐢宠鍗�'
+                    //                 // 	this.hform.HMainSourceBillType = 1243
+                    //                 // 	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 if (data.hSourceBillTypeField == "1604") {
+                    //                 // 	this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
+                    //                 // 	this.hform.HMainSourceBillType = 1604
+                    //                 // 	this.showHMainSourceBillType = false
+                    //                 // } else if (data.hSourceBillTypeField == "1214") {
+                    //                 // 	this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+                    //                 // 	this.hform.HMainSourceBillType = 1214
+                    //                 // 	this.showHMainSourceBillType = false
+                    //                 // } else if (data.hSourceBillTypeField == "3721") {
+                    //                 // 	this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+                    //                 // 	this.hform.HMainSourceBillType = 3721
+                    //                 // 	this.showHMainSourceBillType = false
+                    //                 // } else if (data.hSourceBillTypeField == "1242") {
+                    //                 // 	this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
+                    //                 // 	this.hform.HMainSourceBillType = 1242
+                    //                 // 	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 || -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.barCodeFocus = false
+                    //             this.$nextTick(() => {
+                    //                 this.barCodeFocus = true
+                    //                 this.hform.HBarCode = ""
+                    //             })
+                    //         } else {
+                    //             this.playSound(0)
+                    //             uni.showToast({
+                    //                 title: res.data.Message,
+                    //                 icon: 'none'
+                    //             })
+                    //             this.barCodeFocus = false
+                    //             this.$nextTick(() => {
+                    //                 this.barCodeFocus = true
+                    //                 this.hform.HBarCode = ""
+                    //             })
+                    //         }
+                    //     },
+                    //     fail: (res) => {
+                    //         this.playSound(0)
+                    //         this.barCodeFocus = true
+                    //         console.log(res);
+                    //         uni.showToast({
+                    //             title: '鎺ュ彛璇锋眰澶辫触',
+                    //             icon: 'none'
+                    //         })
+                    //         this.barCodeFocus = false
+                    //         this.$nextTick(() => {
+                    //             this.barCodeFocus = true
+                    //             this.hform.HBarCode = ""
+                    //         })
+                    //     },
+                    // });
+                }
+            },
+            //鐗╂枡淇℃伅
+            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 = ''
+                                this.hform.HSCWHName_B = ''
+                                this.hform.HSCSPName_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
+                                this.hform.HSCWHName_B = data.BarCodeDetailslist[0].HSCWHName
+                                this.hform.HSCSPName_B = data.BarCodeDetailslist[0].HSCSPName
+                            }
+                        } 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 == 1402) {
+                            // 	this.hform.HMainSourceBillType = 1402
+                            // 	this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 1243) {
+                            // 	this.hform.HMainSourceBillType = 1243
+                            // 	this.HMainSourceBillType = '璋冩嫧鐢宠鍗�'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 3720) {
+                            // 	this.hform.HMainSourceBillType = 3720
+                            // 	this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 1604) {
+                            // 	this.hform.HMainSourceBillType = 1604
+                            // 	this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 1214) {
+                            // 	this.hform.HMainSourceBillType = 1214
+                            // 	this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 3721) {
+                            // 	this.hform.HMainSourceBillType = 3721
+                            // 	this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 1242) {
+                            // 	this.hform.HMainSourceBillType = 1242
+                            // 	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.hform.HStockStyle = data.HStockStyle
+
+                            let HStockInOrgIndex = this.arrayHOrgValue.findIndex(e => e == data
+                                .HStockInOrgID)
+                            let HStockOutOrgIndex = this.arrayHOrgValue.findIndex(e => e == data
+                                .HStockOutOrgID)
+                            this.hform.HStockInOrgID = data.HStockInOrgID
+                            this.hform.HStockOutOrgID = data.HStockOutOrgID
+                            if (HStockInOrgIndex != -1) {
+                                this.hform.HStockInOrgName = this.arrayHOrgName[HStockInOrgIndex]
+                            }
+
+                            if (HStockOutOrgIndex != -1) {
+                                this.hform.HStockOutOrgName = this.arrayHOrgName[HStockOutOrgIndex]
+                            }
+                            this.tabs = 2
+                            this.DisBillEntryList()
+                        } else {
+                            uni.showToast({
+                                title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: '/pages/zhijiediaobo/form?OperationType=1'
+                })
+            },
+            async 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);
+
+                        try {
+                            let res = await CommonUtils.doRequest2Sync({
+                                url: '/WEBSController/set_SaveMoveStockBill_Json',
+                                method: 'POST',
+                                data: {
+                                    oMain: sMainStr
+                                },
+                            })
+                            if (!res) {
+                                return
+                            }
+                            console.log(1, res);
+                            uni.hideLoading()
+                            if (res.data.count == 1) {
+                                // let sMain = JSON.stringify(this.materMeta) + ';' + this.hform
+                                //     .HBillType + ';' + this.hform.HSourceBillNo
+                                // 涓烘潯鐮佽缃嚭搴撳崟鍙峰拰鍑哄簱娆℃暟
+                                // await this.Set_BarCodeBill(sMain)
+                                uni.showModal({
+                                    title: '鎻愮ず',
+                                    content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
+                                    success: (res) => {
+                                        if (res.confirm) {
+                                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                            uni.redirectTo({
+                                                url: '/pages/zhijiediaobo/form?OperationType=1'
+                                            })
+                                        } else if (res.cancel) {
+                                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                            // setTimeout(() => {
+                                            // 	uni.navigateBack();
+                                            // }, 50)
+                                        }
+                                    }
+                                });
+                            } else {
+                                uni.showToast({
+                                    title: res.data.Message,
+                                    icon: 'none'
+                                })
+                            }
+                        } catch (err) {
+                            console.warn(err);
+                            uni.showToast({
+                                title: '鎺ュ彛璇锋眰澶辫触:' + err,
+                                icon: 'none'
+                            })
+                        }
+
+                        // uni.request({
+                        //     url: this.serverUrl + '/WEBSController/set_SaveMoveStockBill_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/zhijiediaobo/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;
+    }
+
+    .tab_area {
+        width: 100%;
+        height: 50rpx;
+    }
+
+    .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;
+
+        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;
+        }
+    }
+
+    .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;
+            flex-shrink: 0;
+
+            .uni-icons {
+                color: #fff !important;
+            }
+        }
+
+        .icon-wrapper[disabled] {
+            background-color: rgba(228, 228, 228, 1);
+            pointer-events: none;
+            touch-action: none;
+        }
+    }
+
+    .bottom-btn {
+        box-sizing: border-box;
+        width: 100%;
+        // height: 120rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 30rpx 40rpx 40rpx 40rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
+
+        .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/fenbushidiaochudan/table_out.vue b/pages/fenbushidiaochudan/table_out.vue
new file mode 100644
index 0000000..5319e1a
--- /dev/null
+++ b/pages/fenbushidiaochudan/table_out.vue
@@ -0,0 +1,542 @@
+<template>
+    <view class="content">
+        <view class="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+        <view class="form" v-if="tabs == 0">
+            <view class="buttons" @tap="add">
+                <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+            </view>
+        </view>
+        <view class="form" v-if="tabs == 1">
+            <view class="form-item">
+                <view class="title">鍗曟嵁鍙�:</view>
+                <view class="right">
+                    <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">婧愬崟鍗曞彿:</view>
+                <view class="right">
+                    <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                </view>
+            </view>
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+            <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <view class="detail" v-if="item.鍒跺崟浜�">
+                        <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                    </view>
+                    <view class="detail" v-if="item.鍗曟嵁鍐呯爜">
+                        <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+                    </view>
+                    <view class="detail" v-if="item.鏁伴噺">
+                        <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+                    </view>
+                    <view class="detail" v-if="item.婧愬崟鍗曞彿">
+                        <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+                    </view>
+                    <view class="detail" v-if="item.缁勭粐">
+                        <text>缁勭粐锛�</text>{{item.缁勭粐}}
+                    </view>
+                </view>
+
+                <view class="more">
+                    <view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+                        <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+                    </view>
+                    <view class="part" style="color: #da0000;" @tap.stop="del(item)">
+                        <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+                    </view>
+                </view>
+            </uni-card>
+        </view>
+        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+            <uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+					<view class="detail" v-if="item.鐘舵��">
+						<text>鐘舵�侊細</text>{{item.鐘舵�亇}
+					</view>
+                    <view class="detail" v-if="item.鍒跺崟浜�">
+                        <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                    </view>
+                    <view class="detail" v-if="item.鏁伴噺">
+                        <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+                    </view>
+                    <view class="detail" v-if="item.婧愬崟鍗曞彿">
+                        <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+                    </view>
+                    <view class="detail" v-if="item.鐗╂枡浠g爜">
+                        <text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
+                    </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>
+
+                <view class="more">
+                    <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
+                        <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+                    </view>
+                    <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+                        <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+                    </view>
+                </view>
+            </uni-card>
+        </view>
+
+        <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
+        <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+        <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    export default {
+        data() {
+            return {
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                MvarReportTitle: '鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 1207,
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+
+                page: 1,
+            }
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        onReachBottom: function() {
+            this.page++
+            setTimeout(() => {
+                this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+            }, 100)
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        methods: {
+            async qrCodeDisplay(item) {
+              this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+              await this.$nextTick()
+              this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_MoveStock',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            getPage(page, list) {
+                let sindex = (parseInt(page) - 1) * 20
+                let eindex = parseInt(page) * 20
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json'
+                }
+                if (this.tabs == 1) {
+                    this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                }
+                this.getList()
+            },
+            getList() {
+                uni.showLoading({
+                    title: '鍔犺浇涓�...'
+                })
+                uni.request({
+                    url: this.serverUrl + this.urls,
+                    data: this.hform,
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            this.listData = res.data.data
+                            this.showList = this.getPage(this.page, this.listData)
+                            setTimeout(() => {
+                                uni.hideLoading()
+                            }, 1000)
+                        } else {
+                            uni.hideLoading()
+                            this.listData = []
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            search() {
+                this.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                // if (this.hform.HBillNo) {
+                //     this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                // }
+                // if (this.hform.HSourceBillNo) {
+                //     this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HSourceBillNo + "%'";
+                // }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 1207,
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                }
+                this.getList()
+            },
+            add() {
+                uni.navigateTo({
+                    url: './form?OperationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './form?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            del(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DelPonderationBillMain_Temp_New_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .form {
+        width: 640rpx;
+        margin: 20rpx auto;
+        margin-top: 90rpx;
+    }
+
+    .tabs {
+        width: 100%;
+        position: fixed;
+        left: 0;
+        z-index: 9;
+        display: flex;
+        background-color: #e5e5e5;
+
+        view {
+            width: 50%;
+            font-size: 30rpx;
+            color: #333;
+            text-align: center;
+            padding: 16rpx 0;
+        }
+
+        .on {
+            color: #3a78ff;
+            font-weight: bold;
+            border-bottom: 3px solid #3a78ff;
+        }
+    }
+
+    .buttons {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        margin-top: 20rpx;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #acacac;
+            color: #fff;
+        }
+
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #3a78ff;
+            color: #fff;
+        }
+    }
+
+    .form-item {
+        display: flex;
+        align-items: center;
+        font-size: 28rpx;
+        padding: 6rpx 0;
+
+        .title {
+            width: 180rpx;
+
+            text {
+                color: red;
+                font-weight: bold;
+            }
+        }
+
+        .right {
+            width: 450rpx;
+            border-radius: 22rpx;
+            border: 1px solid #acacac;
+        }
+
+        .righton {
+            width: 450rpx;
+            border-radius: 22rpx;
+            border: 1px solid #e4e4e4;
+            background-color: #e4e4e4;
+        }
+
+        input {
+            width: 100%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
+    }
+
+    .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: 26rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/fenbushidiaorudan/form.vue b/pages/fenbushidiaorudan/form.vue
new file mode 100644
index 0000000..5340676
--- /dev/null
+++ b/pages/fenbushidiaorudan/form.vue
@@ -0,0 +1,2453 @@
+<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.HSCWHName"
+                        @input="HSCWHNameChange" @confirm="HWHNameOutScan"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">璋冨嚭浠撲綅:</view>
+                <view class="right" v-show="HSCIsStockMgr">
+                    <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                        v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
+                        @confirm="HStockPlaceOutNameScan"></uni-combox>
+                </view>
+                <view class="righton" v-show="!HSCIsStockMgr">
+                    <input v-model="hform.HOutStockPlaceName" :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 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">
+                        <input :focus="HSourcebillNoFocus" type="text" @confirm="onHSourceBillNoConfirmHandler"
+                            name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+
+                    </view>
+                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+                    </view>
+
+                    <view class="righton" v-show="!showHSourceBillNo">
+                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                    </view>
+                </view>
+
+                <!-- <view class="form-item">
+                    <view class="title">鍗曟嵁瀛愮被鍨�:</view>
+                    <view class="right">
+                        <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> -->
+                <view class="form-item">
+                    <view class="title">璋冩嫧绫诲瀷:</view>
+                    <view class="righton">
+                        <input name="HStockStyle" disabled v-model="hform.HStockStyle" placeholder="璇烽�夋嫨璋冩嫧绫诲瀷" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冩嫧鏂瑰悜:</view>
+                    <view class="righton">
+                        <input name="HTransferDirect" disabled v-model="hform.HTransferDirect" placeholder="璇烽�夋嫨璋冩嫧鏂瑰悜" />
+                    </view>
+                </view>
+             
+
+                <view class="form-item">
+                    <view class="title">鏃ユ湡:</view>
+                    <view class="right">
+                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
+                            <input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+                            <view class="picker-overlay"></view>
+                        </picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒跺崟浜�:</view>
+                    <view class="righton">
+                        <input name="HMaker" disabled v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
+                    </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="scan" size="20" @click="qrCodeDisplay"></uni-icons>
+                    </view>
+                </view>
+                <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="arrayHWHInName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+                            @input="HWHInNameChange" @confirm="HWHNameInScan"></uni-combox>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冨叆浠撲綅:</view>
+                    <view class="right" v-show="HIsStockMgr">
+                        <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                            v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
+                            @confirm="HStockPlaceNameInScan"></uni-combox>
+                    </view>
+                    <view class="righton" v-show="!HIsStockMgr">
+                        <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+                    </view>
+                </view>
+                <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="right">
+                        <uni-combox :candidates="arrayHCusName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HCusName"
+                            @input="HCusNameChange"></uni-combox>
+                    </view>
+                    <!-- <view class="righton" v-show="!showHSupName">
+                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
+                    </view> -->
+                </view>
+                <!-- TODO: 璺ㄧ粍缁囪皟鐢ㄥ彲淇敼 閫変腑缁勭粐鍚庯紝浠撳簱浠撲綅涔熻鍙戠敓鍙樺寲 -->
+                <view class="form-item">
+                    <view class="title">璋冨嚭缁勭粐:</view>
+                    <view class="righton">
+                        <input name="HStockOutOrgName" disabled v-model="hform.HStockOutOrgName" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冨叆缁勭粐:</view>
+                    <view class="right" v-show="!HIsStockInner">
+                        <uni-combox :candidates="arrayHOrgName" placeholder="璇烽�夋嫨璋冨叆缁勭粐" v-model="hform.HStockInOrgName"
+                            @input="HStockInOrgNameChange"></uni-combox>
+                    </view>
+                    <view class="righton" v-show="HIsStockInner">
+                        <input name="HStockInOrgName" disabled v-model="hform.HStockInOrgName" />
+                    </view>
+                </view>
+            </view>
+
+            <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 == 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 class="form-item">
+                    <view class="title">璋冨嚭浠撳簱:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HSCWHName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冨嚭浠撲綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HSCSPName_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>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+<script>
+    import {
+        CommonUtils
+    } from '../../utils/common';
+    import getDateTime from '@/utils/getdateTime.js';
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import elemIterator from '../../utils/elemIterator';
+    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+    import {
+        getUserStockRelation
+    } from '../../utils/userRelationManager';
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    export default {
+        data() {
+            return {
+                pageTitleName: '鐩存帴璋冩嫧鍗�',
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                HModName: 'Kf_MoveStockBill_PDA',
+                ModRightName: 'CE_MoveStock',
+                OperationType: 1,
+                HInterID_Temp: '',
+
+                HSCIsStockMgr: false,
+                HIsStockMgr: false,
+                showHStockPlaceName: true,
+                showHMainSourceBillType: true,
+                showHSourceBillNo: true,
+                reHSourceBillNo: true,
+                showHSupName: true,
+                barCodeFocus: false,
+                HSourcebillNoFocus: false,
+                HSupName: '',
+
+                HStockStyleArray: ["缁勭粐鍐呰皟鎷�", "璺ㄧ粍缁囪皟鎷�"],
+
+                tabs: 0,
+                HMainSourceBillType: '鍒嗗竷寮忚皟鍏ュ崟',
+                arrayHMainSourceBillType: ['鍒嗗竷寮忚皟鍏ュ崟','鎵嬪伐褰曞叆'
+                ],
+                arrayHMainSourceBillValue: [1250, -1
+                ],
+
+                linterid: '',
+                HBillNo: '',
+                btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+                showmore: false,
+
+                arrayHWHName: [], //浠撳簱
+                HWHNameList: [],
+                arrayHStockPlaceName: [], //浠撲綅
+                HStockPlaceNameList: [],
+                arrayHSourceBillNo: [], //婧愬崟鍗曞彿
+                HSourceBillNoList: [],
+                arrayHTransferDirect: [], // 璋冩嫧鏂瑰悜
+                arrayHOrgName: [], // 缁勭粐
+                arrayHOrgValue: [], // 缁勭粐瀵瑰簲ID
+                arrayHWHInName: [], // 璋冨叆浠撳簱
+                HWHInNameList: [],
+                arrayHStockPlaceInName: [], //璋冨叆浠撲綅
+                HStockPlaceInNameList: [],
+
+                // arrayHBillSubType: [],
+                // arrayHBillSubTypeValue: [],
+                HBillSubType: '',
+
+                arrayHEmpName: [], //鎿嶄綔鍛�
+                HEmpNameList: [],
+                arrayHDeptName: [], //閮ㄩ棬
+                HDeptNameList: [],
+                arrayHSupName: [], //瀹㈡埛
+                HSupNameList: [],
+                arrayHSupName: [], //瀹㈡埛
+                HSupNameList: [],
+                arrayHCusName: [], //渚涘簲鍟�
+                HCusNameList: [],
+                
+                Materlist: [],
+                FIFOlist: [],
+                hform: {
+                    HBillType: 1251,
+                    HBillSubType: "",
+                    HBillerID: uni.getStorageSync('HBillerID'),
+                    HRedBlueFlag: false,
+
+                    HStockOutOrgName: uni.getStorageSync('Organization'),
+                    HStockInOrgName: uni.getStorageSync('Organization'),
+                    HStockInOrgID: uni.getStorageSync('OrganizationID'),
+                    HStockOutOrgID: uni.getStorageSync('OrganizationID'),
+
+                    HBarCode: '',
+                    HQty: '',
+                    HSCWHName: getUserInfo().HWHName,
+                    HSCWHID: getUserInfo().HWhID,
+                    HWHName: getUserInfo().HWHName,
+                    HWHID: getUserInfo().HWhID,
+
+                    HStockStyle: '',
+                    HOutStockPlaceName: getUserInfo().HSPName,
+                    HOutStockPlaceID: getUserInfo().HSPID,
+                    HStockPlaceName: getUserInfo().HSPName,
+                    HStockPlaceID: getUserInfo().HSPID,
+                    HTransferDirect: '', //璋冩嫧鏂瑰悜
+                    HShipType: '', // 鍑哄簱绫诲瀷	
+
+                    HMainSourceBillType: 1402,
+                    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: '',
+                    // 渚涘簲鍟�
+                    HCusID: '',
+                    HCusName: '',
+                    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
+        },
+        
+        async onLoad(e) {
+            await this.getOrganization()
+            console.log(e, this.userInfo)
+            this.OperationType = e.OperationType
+            if (e.HInterID) {
+                this.HInterID_Temp = e.HInterID
+                // this.btnType = 1
+                this.barCodeFocus = true
+                this.RoadBillMain(e.HInterID)
+            } else {
+                this.HSourcebillNoFocus = true
+                this.getNewData()
+            }
+
+            this.getHWarehouseInList()
+            // this.getHBaseList()
+            this.getHSupList()
+            this.getHEmpList()
+            this.getHDeptList()
+            this.set_InitBillSubType()
+            this.InitTransferDirect()
+            this.InitShipType()
+            
+            // this.getHSupList() // 鍒濆鍖� 瀹㈡埛
+            this.getHCusList() // 鍒濆鍖� 渚涘簲鍟�
+
+            this.getRelationStore()
+            this.GetSourceBillType()
+
+            uni.$on('BillSelectComplete', (e) => {
+                console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+                this.getHBarCodeData(e.HBillNo)
+                this.$refs.billList.exit()
+            })
+        },
+        onUnload() {
+            uni.$off('BillSelectComplete')
+        },
+        computed: {
+            HIsStockInner: {
+                get: function() {
+                    if (this.hform.HStockStyle == '缁勭粐鍐呰皟鎷�') {
+                        return true
+                    }
+                    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: {
+            //鑾峰彇渚涘簲鍟嗘暟鎹�
+            getHCusList() {
+                if (!this.hform.HStockOrgID) {
+                    var HOtherOrgID = 0;
+                } else {
+                    var HOtherOrgID = this.hform.HStockOrgID
+                }
+                uni.request({
+                    url: this.serverUrl + '/Web/GetSupplierList_Json',
+                    data: {
+                        Supplier: '',
+                        HOrgID: HOtherOrgID
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            console.log('Supplier: ',res.data);
+                            this.HCusNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHCusName[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'
+                        })
+                    },
+                });
+            },
+            //閫夋嫨渚涘簲鍟�
+            HCusNameChange(e) {
+                console.log('e: ',e);
+                for (var i = 0; i < this.HCusNameList.length; i++) {
+                    if (this.HCusNameList[i].HName == e) {
+                        this.hform.HCusID = this.HCusNameList[i].HItemID
+                        this.hform.HCusName = this.HCusNameList[i].HName
+                    }
+                }
+            },
+            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
+                })
+            },
+            async HWHNameOutScan(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 HStockPlaceOutNameScan(e) {
+                // 鎵弿浠撲綅鐮�
+                console.log('浠撲綅鐮�: ', e);
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                console.log('index: ', index);
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HOutStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
+            async HWHNameInScan(e) {
+                // 鎵弿浠撳簱鐮�
+                console.log('浠撳簱鐮�: ', e);
+                let index = this.HWHInNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+                    })
+                } else {
+                    this.HWHInNameChange(this.HWHInNameList[index]['浠撳簱鍚嶇О'])
+                }
+            },
+            async HStockPlaceNameInScan(e) {
+                // 鎵弿浠撲綅鐮�
+                console.log('浠撲綅鐮�: ', e);
+                let index = this.HStockPlaceInNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                console.log('index: ', index);
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HStockPlaceNameChange(this.HStockPlaceInNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
+            async qrCodeDisplay() {
+                try {
+                    this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
+                    await this.$nextTick()
+                    this.$refs.barcodePopup.open()
+                } catch (err) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err
+                    })
+                }
+            },
+            async getRelationStore() {
+                let {
+                    data,
+                    count
+                } = await getUserStockRelation()
+                if (count == 1) {
+                    let WHIDList = []
+                    console.log('WHIDList: ', data);
+                    Array.from(data).forEach(elem => {
+                        WHIDList.push(elem.HItemID)
+                    })
+
+                    let sWhere = ` and HItemID in (${WHIDList.join(",")})`
+                    this.getHBaseList({
+                        sWhere: sWhere
+                    })
+
+                } else {
+                    this.getHBaseList()
+                }
+            },
+            // 璋冨叆浠撳簱淇敼
+            HStockPlaceInNameChange(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
+                    }
+                }
+            },
+            // 璋冨叆浠撲綅淇敼
+            HWHInNameChange(e) {
+                console.log('e: ', e);
+                for (var i = 0; i < this.HWHInNameList.length; i++) {
+                    if (this.HWHInNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HWHName = this.HWHInNameList[i].浠撳簱鍚嶇О
+                        this.hform.HWHID = this.HWHInNameList[i].HItemID
+
+                        if (this.HWHInNameList[i]['鍚敤浠撲綅'] == 'Y') {
+                            this.HIsStockMgr = true
+                        } else {
+                            // this.hform.HStockPlaceName = ''
+                            this.HIsStockMgr = false
+                        }
+                    }
+                }
+            },
+            getOrganization() {
+                return new Promise((resolve, reject) => {
+                    CommonUtils.doRequest2({
+                        url: '/Web/GetOrganizations',
+                        resFunction: (res) => {
+                            console.log("Organizations: ", res.data)
+                            let {
+                                data,
+                                count,
+                                Message
+                            } = res.data
+                            if (count == 1) {
+                                this.arrayHOrgName = []
+                                this.arrayHOrgValue = []
+                                Array.from(data).forEach(e => {
+                                    this.arrayHOrgName.push(e.Name)
+                                    this.arrayHOrgValue.push(e.ID)
+                                })
+                                resolve()
+                            } else {
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: Message
+                                })
+                                reject()
+                            }
+
+                        }
+                    })
+                })
+            },
+            HStockInOrgNameChange(e) {
+                let index = this.arrayHOrgName.findIndex(elem => elem == e)
+                if (index != -1) {
+                    this.hform.HStockInOrgID = this.arrayHOrgValue[index]
+                }
+                // 鏇存柊璋冨叆浠撳簱
+                this.getHWarehouseInList(e)
+                this.hform.HWHID = '',
+                    this.hform.HWHName = ''
+            },
+            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.HBillSubType = this.arrayHBillSubType[0]
+                            this.hform.HBillSubType = this.arrayHBillSubTypeValue[0]
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                )
+            },
+            onHSourceBillNoConfirmHandler() {
+                if (this.hform.HMainSourceBillType == -1) {
+                    // 鎵嬪伐褰曞叆涓嶈繘琛屾彁浜�
+                    this.playSound(1)
+                    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() {
+                uni.scanCode({
+                    onlyFromCamera: true,
+                    success: (res) => {
+                        console.log('鏉$爜鍐呭锛�' + res.result);
+                        if (this.hform.HBarCode == '*') {
+                            this.hform.HBarCode = this.hform.HBarCode + res.result
+                        } else {
+                            this.hform.HBarCode = res.result
+                        }
+
+                        this.getCode(this.hform.HBarCode)
+                    }
+                });
+            },
+            showBillList() {
+                this.$refs.billList.showPopup()
+            },
+            //鏃ユ湡
+            HDateChange(e) {
+                console.log(e.detail.value)
+                this.hform.HDate = e.detail.value
+            },
+            HShipTypeChange(e) {
+                this.hform.HShipType = e
+            },
+            // HBillSubTypeChange(e) {
+            //     let index = e.detail.value
+            //     // console.log(e.detail.value)
+            //     this.HBillSubType = this.arrayHBillSubType[index]
+            //     this.hform.HBillSubType = this.arrayHBillSubTypeValue[index]
+            // },
+            // 璋冩嫧鏂瑰悜淇敼
+            HStockStyleChange(e) {
+                this.hform.HStockStyle = e
+            },
+            // 璋冨叆浠撳簱璧勬枡
+            getHWarehouseInList(Organizaiton) {
+                Organizaiton = Organizaiton || uni.getStorageSync("Organization")
+                CommonUtils.doRequest2({
+                    url: '/Gy_Warehouse/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: Organizaiton
+                    },
+                    resFunction: (res) => {
+                        console.log('璋冨叆浠撳簱 res: ', res.data.data);
+                        if (res.data.count == 1) {
+                            this.HWHInNameList = []
+                            this.arrayHWHInName = []
+
+                            this.HWHInNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    }
+                });
+
+                uni.request({
+                    url: this.serverUrl + '/Gy_StockPlace/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: Organizaiton
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HStockPlaceInNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHStockPlaceInName[i] = res.data.data[i].浠撲綅鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            //鍩虹浠撳簱璧勬枡
+            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
+                            this.HWHInNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+                                this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+
+                uni.request({
+                    url: this.serverUrl + '/Gy_StockPlace/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {
+                            this.HStockPlaceNameList = res.data.data
+                            for (var i = 0; i < res.data.data.length; i++) {
+                                this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+                            }
+                        } else {
+                            uni.showToast({
+                                title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+
+                // this.getHYDList()
+            },
+            // 璋冩嫧鏂瑰悜
+            InitTransferDirect() {
+                let HTransferDirect = '';
+
+                CommonUtils.doRequest(
+                    "/WEBSController/GetMoveDirect_Json", {},
+                    (res) => {
+                        console.log('transferDirectRes: ', res);
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.arrayHTransferDirect = Array.from(data).map(e => {
+
+                                return e.HName
+
+                            })
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                Message: Message
+                            })
+                        }
+                    },
+                    (err) => {
+                        console.log('err: ', err);
+                    }
+                )
+
+            },
+           
+            // 閫氳繃鍗曟嵁绫诲瀷鑾峰彇婧愬崟绫诲瀷
+            async GetSourceBillType() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetHSourceBillTypeByBillType',
+                    data: {
+                        HBillType: this.hform.HBillType,
+                        Num: 2
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            console.log('data: ', data);
+                            this.arrayHMainSourceBillType = []
+                            this.arrayHMainSourceBillValue = []
+                            Array.from(data).forEach(e => {
+                                this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
+                                this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
+                            })
+
+                            this.arrayHMainSourceBillType.push('鎵嬪伐褰曞叆')
+                            this.arrayHMainSourceBillValue.push('-1')
+                            //濡傛灉鎵嬪伐褰曞叆涓嶇敤閫夋嫨婧愬崟
+                            if (this.arrayHMainSourceBillType[0] == '鎵嬪伐褰曞叆') {
+                                this.tabs = 1
+                            }
+
+                            this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
+                            this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: 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.hform.HStockPlaceID = ''
+                            this.HIsStockMgr = false
+                        }
+                    }
+                }
+            },
+            // 璋冨嚭浠撳簱淇敼
+            HSCWHNameChange(e) {
+                // var name = e.split("(")
+                for (var i = 0; i < this.HWHNameList.length; i++) {
+                    if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+                        this.hform.HSCWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+                        this.hform.HSCWHID = this.HWHNameList[i].HItemID
+
+                        if (this.HWHNameList[i]['鍚敤浠撲綅'] == 'Y') {
+                            this.HSCIsStockMgr = true
+                        } else {
+                            this.hform.HOutStockPlaceName = ''
+                            this.hform.HOutStockPlaceID = ''
+                            this.HSCIsStockMgr = false
+                        }
+                    }
+                }
+            },
+            //閫夋嫨浠撲綅
+            HStockPlaceNameChange(e) {
+                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+                    if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+                        console.log(this.HStockPlaceNameList[i]);
+                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
+                    }
+                }
+            },
+            HOutStockPlaceNameChange(e) {
+                for (var i = 0; i < this.HStockPlaceInNameList.length; i++) {
+                    if (this.HStockPlaceInNameList[i].浠撲綅鍚嶇О == e) {
+                        this.hform.HOutStockPlaceName = this.HStockPlaceInNameList[i].浠撲綅鍚嶇О
+                        this.hform.HOutStockPlaceID = this.HStockPlaceInNameList[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 + '/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'
+                        })
+                    },
+                });
+            },
+            // 璋冩嫧鏂瑰悜淇敼
+            HTransferDirectChange(e) {
+                this.hform.HTransferDirect = e
+            },
+            //淇濈
+            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_MoveStock_Json',
+                    data: {
+                        HInterID: this.hform.HInterID,
+                        HBillNo: this.hform.HBillNo,
+                        HBillType: this.hform.HBillType,
+                        HSourceBillNo: HBarCode,
+                        HSourceBillType: this.hform.HMainSourceBillType,
+                        HMaker: this.hform.HMaker,
+                        HOWNERID: this.hform.HStockOrgID,
+                        HFIFOWhID: this.hform.HFIFOWHID,
+                        // 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.barCodeFocus = true
+                            this.playSound(1)
+                            this.DisBillEntryList()
+                        } else {
+                            this.playSound(0)
+                            console.log('res: ', res);
+
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                            this.HSourcebillNoFocus = false
+                            this.$nextTick(() => {
+                                this.hform.HSourceBillNo = ""
+                                this.HSourcebillNoFocus = true
+                            })
+                        }
+                    },
+                    fail: (err) => {
+                        console.log('err: ', err);
+                        this.playSound(0)
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                        this.HSourcebillNoFocus = false
+                        this.$nextTick(() => {
+                            this.hform.HSourceBillNo = ""
+                            this.HSourcebillNoFocus = true
+                        })
+                    },
+                });
+            },
+            //鎵潯鐮佸鐞�
+            async getCode(HBarCode) {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HSCWHName) {
+                    this.hform.HSCWHID = 0
+                }
+                if (!this.hform.HOutStockPlaceName) {
+                    this.hform.HOutStockPlaceID = 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 sHSCWHID = this.hform.HSCWHID
+                var sHOUTSPID = this.hform.HOutStockPlaceID
+                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 {
+
+                        try {
+                            let res = await CommonUtils.doRequest2Sync({
+                                url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+                                data: {
+                                    HInterID: this.hform.HInterID,
+                                    HBillType: this.hform.HBillType,
+                                    HBarCode: sBarCode
+                                }
+                            })
+                            if (!res) {
+                                return
+                            }
+                            console.log('鍒犻櫎鏉$爜', res.data);
+                            this.hform.HBarCode = ''
+                            if (res.data.count == 1) {
+                                this.playSound(1)
+                                this.hform.HQty = ''
+                                this.DisBillEntryList()
+                            } else {
+                                this.playSound(0)
+                                this.refreshBarCodeState()
+                                uni.showToast({
+                                    title: res.data.Message,
+                                    icon: 'none'
+                                })
+                            }
+                        } catch (err) {
+                            this.refreshBarCodeState()
+                            this.playSound(0)
+                            uni.showToast({
+                                title: '鎺ュ彛璇锋眰澶辫触: ' + err,
+                                icon: 'none'
+                            })
+                        }
+                        // 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)
+                        // 
+                        //             uni.showToast({
+                        //                 title: res.data.Message,
+                        //                 icon: 'none'
+                        //             })
+                        //             this.barCodeFocus = false
+                        //             this.$nextTick(() => {
+                        //                 this.barCodeFocus = true
+                        //                 this.hform.HBarCode = ""
+                        //             })
+                        //         }
+                        //     },
+                        //     fail: (res) => {
+                        //         this.playSound(0)
+                        //         this.barCodeFocus = true
+                        //         console.log(res);
+                        //         uni.showToast({
+                        //             title: '鎺ュ彛璇锋眰澶辫触',
+                        //             icon: 'none'
+                        //         })
+                        //         this.barCodeFocus = false
+                        //         this.$nextTick(() => {
+                        //             this.barCodeFocus = true
+                        //             this.hform.HBarCode = ""
+                        //         })
+                        //     },
+                        // });
+                    }
+                } else {
+                    var sBarCode = this.hform.HBarCode
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+                    try {
+
+                        let res = await CommonUtils.doRequest2Sync({
+                            url: '/WEBSController/get_BarCode_MoveStock_New_Json',
+                            data: {
+                                sBarCode: sBarCode,
+                                HInterID: this.hform.HInterID,
+                                HBillType: this.hform.HBillType,
+                                HBillNo: this.hform.HBillNo,
+                                HMaker: this.hform.HMaker,
+                                HWhID: sHWHID,
+                                HSPID: sHSPID,
+                                HSCWHID: sHSCWHID,
+                                HSCSPID: sHOUTSPID,
+                                HQty: sHQty,
+                                // HRedBlueFlag: this.hform.HRedBlueFlag,
+                                SourceFlag: HSourceFlag,
+                                HSourceBillNo: sSourceBillNo,
+                                HSourceBillType: sSourceBillType,
+                                HStockInOrgID: this.hform.HStockOrgID,
+                                HStockOutOrgID: this.hform.HStockOutOrgID,
+                                HScanStyle: "",
+                                HCustom1: "",
+                                HCustom2: ""
+                            },
+                        })
+
+                        if (!res) {
+                            return
+                        }
+
+                        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 == "1402") {
+                                // 	this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+                                // 	this.hform.HMainSourceBillType = 1402
+                                // 	this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "1243") {
+                                // 	this.HMainSourceBillType = '璋冩嫧鐢宠鍗�'
+                                // 	this.hform.HMainSourceBillType = 1243
+                                // 	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 if (data.hSourceBillTypeField == "1604") {
+                                // 	this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
+                                // 	this.hform.HMainSourceBillType = 1604
+                                // 	this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "1214") {
+                                // 	this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+                                // 	this.hform.HMainSourceBillType = 1214
+                                // 	this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "3721") {
+                                // 	this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+                                // 	this.hform.HMainSourceBillType = 3721
+                                // 	this.showHMainSourceBillType = false
+                                // } else if (data.hSourceBillTypeField == "1242") {
+                                // 	this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
+                                // 	this.hform.HMainSourceBillType = 1242
+                                // 	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 || -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.barCodeFocus = false
+                            this.$nextTick(() => {
+                                this.barCodeFocus = true
+                                this.hform.HBarCode = ""
+                            })
+                        } else {
+                            this.playSound(0)
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                            this.barCodeFocus = false
+                            this.$nextTick(() => {
+                                this.barCodeFocus = true
+                                this.hform.HBarCode = ""
+                            })
+                        }
+
+                    } catch (err) {
+                        this.playSound(0)
+                        this.barCodeFocus = true
+                        console.log(err);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触:' + err,
+                            icon: 'none'
+                        })
+                        this.barCodeFocus = false
+                        this.$nextTick(() => {
+                            this.barCodeFocus = true
+                            this.hform.HBarCode = ""
+                        })
+
+                    }
+
+
+                    // uni.request({
+                    //     url: this.serverUrl + '/WEBSController/get_BarCode_MoveStock_New_Json',
+                    //     data: {
+                    //         sBarCode: sBarCode,
+                    //         HInterID: this.hform.HInterID,
+                    //         HBillType: this.hform.HBillType,
+                    //         HBillNo: this.hform.HBillNo,
+                    //         HMaker: this.hform.HMaker,
+                    //         HWhID: sHWHID,
+                    //         HSPID: sHSPID,
+                    //         HSCWHID: sHSCWHID,
+                    //         HSCSPID: sHOUTSPID,
+                    //         HQty: sHQty,
+                    //         // HRedBlueFlag: this.hform.HRedBlueFlag,
+                    //         SourceFlag: HSourceFlag,
+                    //         HSourceBillNo: sSourceBillNo,
+                    //         HSourceBillType: sSourceBillType,
+                    //         HStockInOrgID: this.hform.HStockOrgID,
+                    //         HStockOutOrgID: this.hform.HStockOutOrgID,
+                    //         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 == "1402") {
+                    //                 // 	this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+                    //                 // 	this.hform.HMainSourceBillType = 1402
+                    //                 // 	this.showHMainSourceBillType = false
+                    //                 // } else if (data.hSourceBillTypeField == "1243") {
+                    //                 // 	this.HMainSourceBillType = '璋冩嫧鐢宠鍗�'
+                    //                 // 	this.hform.HMainSourceBillType = 1243
+                    //                 // 	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 if (data.hSourceBillTypeField == "1604") {
+                    //                 // 	this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
+                    //                 // 	this.hform.HMainSourceBillType = 1604
+                    //                 // 	this.showHMainSourceBillType = false
+                    //                 // } else if (data.hSourceBillTypeField == "1214") {
+                    //                 // 	this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+                    //                 // 	this.hform.HMainSourceBillType = 1214
+                    //                 // 	this.showHMainSourceBillType = false
+                    //                 // } else if (data.hSourceBillTypeField == "3721") {
+                    //                 // 	this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+                    //                 // 	this.hform.HMainSourceBillType = 3721
+                    //                 // 	this.showHMainSourceBillType = false
+                    //                 // } else if (data.hSourceBillTypeField == "1242") {
+                    //                 // 	this.HMainSourceBillType = '鍑哄簱鐢宠鍗�'
+                    //                 // 	this.hform.HMainSourceBillType = 1242
+                    //                 // 	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 || -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.barCodeFocus = false
+                    //             this.$nextTick(() => {
+                    //                 this.barCodeFocus = true
+                    //                 this.hform.HBarCode = ""
+                    //             })
+                    //         } else {
+                    //             this.playSound(0)
+                    //             uni.showToast({
+                    //                 title: res.data.Message,
+                    //                 icon: 'none'
+                    //             })
+                    //             this.barCodeFocus = false
+                    //             this.$nextTick(() => {
+                    //                 this.barCodeFocus = true
+                    //                 this.hform.HBarCode = ""
+                    //             })
+                    //         }
+                    //     },
+                    //     fail: (res) => {
+                    //         this.playSound(0)
+                    //         this.barCodeFocus = true
+                    //         console.log(res);
+                    //         uni.showToast({
+                    //             title: '鎺ュ彛璇锋眰澶辫触',
+                    //             icon: 'none'
+                    //         })
+                    //         this.barCodeFocus = false
+                    //         this.$nextTick(() => {
+                    //             this.barCodeFocus = true
+                    //             this.hform.HBarCode = ""
+                    //         })
+                    //     },
+                    // });
+                }
+            },
+            //鐗╂枡淇℃伅
+            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 = ''
+                                this.hform.HSCWHName_B = ''
+                                this.hform.HSCSPName_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
+                                this.hform.HSCWHName_B = data.BarCodeDetailslist[0].HSCWHName
+                                this.hform.HSCSPName_B = data.BarCodeDetailslist[0].HSCSPName
+                            }
+                        } 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 == 1402) {
+                            // 	this.hform.HMainSourceBillType = 1402
+                            // 	this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 1243) {
+                            // 	this.hform.HMainSourceBillType = 1243
+                            // 	this.HMainSourceBillType = '璋冩嫧鐢宠鍗�'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 3720) {
+                            // 	this.hform.HMainSourceBillType = 3720
+                            // 	this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 1604) {
+                            // 	this.hform.HMainSourceBillType = 1604
+                            // 	this.HMainSourceBillType = '濮斿鐢ㄦ枡娓呭崟'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 1214) {
+                            // 	this.hform.HMainSourceBillType = 1214
+                            // 	this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 3721) {
+                            // 	this.hform.HMainSourceBillType = 3721
+                            // 	this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+                            // 	this.showHSupName = false
+                            // } else if (data.HSourceBillType == 1242) {
+                            // 	this.hform.HMainSourceBillType = 1242
+                            // 	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.hform.HStockStyle = data.HStockStyle
+
+                            let HStockInOrgIndex = this.arrayHOrgValue.findIndex(e => e == data
+                                .HStockInOrgID)
+                            let HStockOutOrgIndex = this.arrayHOrgValue.findIndex(e => e == data
+                                .HStockOutOrgID)
+                            this.hform.HStockInOrgID = data.HStockInOrgID
+                            this.hform.HStockOutOrgID = data.HStockOutOrgID
+                            if (HStockInOrgIndex != -1) {
+                                this.hform.HStockInOrgName = this.arrayHOrgName[HStockInOrgIndex]
+                            }
+
+                            if (HStockOutOrgIndex != -1) {
+                                this.hform.HStockOutOrgName = this.arrayHOrgName[HStockOutOrgIndex]
+                            }
+                            this.tabs = 2
+                            this.DisBillEntryList()
+                        } else {
+                            uni.showToast({
+                                title: '鑾峰彇鏁版嵁鍥炲~澶辫触',
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            addNew() {
+                uni.redirectTo({
+                    url: '/pages/zhijiediaobo/form?OperationType=1'
+                })
+            },
+            async 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);
+
+                        try {
+                            let res = await CommonUtils.doRequest2Sync({
+                                url: '/WEBSController/set_SaveMoveStockBill_Json',
+                                method: 'POST',
+                                data: {
+                                    oMain: sMainStr
+                                },
+                            })
+                            if (!res) {
+                                return
+                            }
+                            console.log(1, res);
+                            uni.hideLoading()
+                            if (res.data.count == 1) {
+                                // let sMain = JSON.stringify(this.materMeta) + ';' + this.hform
+                                //     .HBillType + ';' + this.hform.HSourceBillNo
+                                // 涓烘潯鐮佽缃嚭搴撳崟鍙峰拰鍑哄簱娆℃暟
+                                // await this.Set_BarCodeBill(sMain)
+                                uni.showModal({
+                                    title: '鎻愮ず',
+                                    content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
+                                    success: (res) => {
+                                        if (res.confirm) {
+                                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                            uni.redirectTo({
+                                                url: '/pages/zhijiediaobo/form?OperationType=1'
+                                            })
+                                        } else if (res.cancel) {
+                                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                            // setTimeout(() => {
+                                            // 	uni.navigateBack();
+                                            // }, 50)
+                                        }
+                                    }
+                                });
+                            } else {
+                                uni.showToast({
+                                    title: res.data.Message,
+                                    icon: 'none'
+                                })
+                            }
+                        } catch (err) {
+                            console.warn(err);
+                            uni.showToast({
+                                title: '鎺ュ彛璇锋眰澶辫触:' + err,
+                                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;
+    }
+
+    .tab_area {
+        width: 100%;
+        height: 50rpx;
+    }
+
+    .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;
+
+        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;
+        }
+    }
+
+    .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;
+            flex-shrink: 0;
+
+            .uni-icons {
+                color: #fff !important;
+            }
+        }
+
+        .icon-wrapper[disabled] {
+            background-color: rgba(228, 228, 228, 1);
+            pointer-events: none;
+            touch-action: none;
+        }
+    }
+
+    .bottom-btn {
+        box-sizing: border-box;
+        width: 100%;
+        // height: 120rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 30rpx 40rpx 40rpx 40rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
+
+        .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/fenbushidiaorudan/form_test.vue b/pages/fenbushidiaorudan/form_test.vue
new file mode 100644
index 0000000..bb271ba
--- /dev/null
+++ b/pages/fenbushidiaorudan/form_test.vue
@@ -0,0 +1,1502 @@
+<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 type="number" 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.HSCWHName"
+                        @input="HSCWHNameChange" @confirm="HWHNameOutScan"></uni-combox>
+                </view>
+                <view class="icon-wrapper">
+                    <uni-icons type="more" size="20" @click="showWarehouseList('HSCWHID')"></uni-icons>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">璋冨嚭浠撲綅:</view>
+                <view class="right" v-show="HSCIsStockMgr">
+                    <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                        v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
+                        @confirm="HStockPlaceOutNameScan"></uni-combox>
+                </view>
+                <view class="righton" v-show="!HSCIsStockMgr">
+                    <input v-model="hform.HOutStockPlaceName" :disabled="!HSCIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+                </view>
+                <view class="icon-wrapper" v-show="HSCIsStockMgr">
+                    <uni-icons type="more" size="20" @click="showStockPlaceList('HOSpID')"></uni-icons>
+                </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="HMainSourceBillTypeIndex"
+                            @change="HMainSourceBillTypeChange">
+                            <input name="HMainSourceBillType" disabled :value="HMainSourceBillType" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+                            <view class="picker-overlay"></view>
+                        </picker>
+                    </view>
+                    <view class="righton" v-show="!showHMainSourceBillType">
+                        <input name="HMainSourceBillType" disabled :value="HMainSourceBillType" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">婧愬崟鍗曞彿:</view>
+                    <view class="right" v-show="showHSourceBillNo">
+                        <input :focus="HSourcebillNoFocus" type="text" @confirm="onHSourceBillNoConfirmHandler"
+                            name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                    </view>
+                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+                    </view>
+                    <view class="icon-wrapper" v-show="showHSourceBillNo">
+                        <uni-icons type="right" size="20" @click="onHSourceBillNoConfirmHandler"></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="righton">
+                        <input name="HStockStyle" disabled v-model="hform.HStockStyle" 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 :value="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>
+                <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="arrayHWHInName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+                            @input="HWHInNameChange" @confirm="HWHNameInScan"></uni-combox>
+                    </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="more" size="20" @click="showWarehouseList('HWHID')"></uni-icons>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冨叆浠撲綅:</view>
+                    <view class="right" v-show="HIsStockMgr">
+                        <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+                            v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
+                            @confirm="HStockPlaceNameInScan"></uni-combox>
+                    </view>
+                    <view class="righton" v-show="!HIsStockMgr">
+                        <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="涓嶅彲鎿嶄綔" />
+                    </view>
+                    <view class="icon-wrapper" v-show="HIsStockMgr">
+                        <uni-icons type="more" size="20" @click="showStockPlaceList('HSpID')"></uni-icons>
+                    </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 class="icon-wrapper">
+                        <uni-icons type="more" size="20" @click="showDepartmentList"></uni-icons>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冨嚭缁勭粐:</view>
+                    <view class="righton">
+                        <input name="HStockOutOrgName" disabled v-model="hform.HStockOutOrgName" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冨叆缁勭粐:</view>
+                    <view class="righton">
+                        <input name="HStockInOrgName" disabled v-model="hform.HStockInOrgName" />
+                    </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="showMaterialDetail(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="showSourceBarCodeDetail(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.HBarCode}}
+                            </view>
+                            <view class="detail">
+                                <text>鐗╂枡浠g爜锛�</text>{{item.HMaterNumber}}
+                            </view>
+							<view class="detail">
+							    <text>鐗╂枡鍚嶇О锛�</text>{{item.HMaterName}}
+							</view>
+                            <view class="detail">
+                                <text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
+                            </view>
+							<view class="detail">
+							    <text>HMaterID锛�</text>{{item.HMaterID}}
+							</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 class="detail" v-if="item.HSourceBillNo">
+							    <text>婧愬崟鍗曞彿锛�</text>{{item.HSourceBillNo}}
+							</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 class="form-item">
+                    <view class="title">璋冨嚭浠撳簱:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HSCWHName_B" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璋冨嚭浠撲綅:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HSCSPName_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 || 1250"
+            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+<!--        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue> -->
+        <!-- <MaterialEditPopup ref="materialEdit" :materialData="selectedMaterial" @on-save="onMaterialSave"></MaterialEditPopup> -->
+    </view>
+</template>
+
+<script>
+    import {
+        CommonUtils
+    } from '../../utils/common';
+    import getDateTime from '@/utils/getdateTime.js';
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+    
+
+    export default {
+        data() {
+            return {
+                pageTitleName: '鍒嗘寮忚皟鍏ュ崟',
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                HModName: 'Kf_MoveStockStepInBill_PDA',
+                ModRightName: 'CE_MoveStockStepIn',
+                OperationType: 1,
+                HInterID_Temp: '',
+
+                HSCIsStockMgr: false,
+                HIsStockMgr: false,
+                showHMainSourceBillType: true,
+                showHSourceBillNo: true,
+                barCodeFocus: false,
+                HSourcebillNoFocus: false,
+
+                tabs: 0,
+                HMainSourceBillTypeIndex: 0,
+                HMainSourceBillType: '鍒嗘寮忚皟鍑哄崟',
+                arrayHMainSourceBillType: ['鍒嗘寮忚皟鍑哄崟', '鎵嬪伐褰曞叆'],
+                arrayHMainSourceBillValue: [1250, -1],
+
+                btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+
+                arrayHWHName: [], //璋冨嚭浠撳簱
+                HWHNameList: [],
+                arrayHStockPlaceName: [], //璋冨嚭浠撲綅
+                HStockPlaceNameList: [],
+                arrayHWHInName: [], // 璋冨叆浠撳簱
+                HWHInNameList: [],
+                arrayHStockPlaceInName: [], //璋冨叆浠撲綅
+                HStockPlaceInNameList: [],
+                arrayHDeptName: [], //閮ㄩ棬
+                HDeptNameList: [],
+                arrayHOrgName: [], // 缁勭粐
+                arrayHOrgValue: [], // 缁勭粐瀵瑰簲ID
+
+                Materlist: [],
+                FIFOlist: [],
+                selectedMaterial: {},
+
+                hform: {
+                    HBillType: 1251,
+                    HBillerID: uni.getStorageSync('HBillerID'),
+                    HRedBlueFlag: false,
+
+                    HStockOutOrgName: uni.getStorageSync('Organization'),
+                    HStockInOrgName: uni.getStorageSync('Organization'),
+                    HStockInOrgID: uni.getStorageSync('OrganizationID'),
+                    HStockOutOrgID: uni.getStorageSync('OrganizationID'),
+
+                    HBarCode: '',
+                    HQty: '',
+                    HSCWHName: getUserInfo().HWHName,
+                    HSCWHID: getUserInfo().HWhID,
+                    HWHName: getUserInfo().HWHName,
+                    HWHID: getUserInfo().HWhID,
+
+                    HStockStyle: '缁勭粐鍐呰皟鎷�',
+                    HOutStockPlaceName: getUserInfo().HSPName,
+                    HOutStockPlaceID: getUserInfo().HSPID,
+                    HStockPlaceName: getUserInfo().HSPName,
+                    HStockPlaceID: getUserInfo().HSPID,
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    HMainSourceBillType: 1250,
+                    HSourceBillNo: '',
+
+                    HDate: getDateTime.dateTimeStr('y-m-d'),
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HBillNo: '',
+                    HInterID: '',
+
+                    HDeptName: getUserInfo().HDept,
+                    HDeptID: getUserInfo().HDeptID,
+
+                    // 鏉$爜淇℃伅
+                    HBarCode_B: '',
+                    HMaterName_B: '',
+                    HMaterModel_B: '',
+                    HBatchNo_B: '',
+                    HUnitName_B: '',
+                    HQty_B: '',
+                    HTMQty_B: '',
+                    HWHName_B: '',
+                    HSPName_B: '',
+                    HSCWHName_B: '',
+                    HSCSPName_B: '',
+                }
+            }
+        },
+        components: {
+            BillListPopupVue,
+        },
+        
+        async onLoad(e) {
+            console.log('椤甸潰鍙傛暟:', e);
+            await this.getOrganization()
+            this.OperationType = e.OperationType || 1;
+            
+            if (e.HInterID) {
+                this.HInterID_Temp = e.HInterID
+                this.RoadBillMain(e.HInterID)
+                this.barCodeFocus = true
+            } else {
+                this.HSourcebillNoFocus = true
+                this.getNewData()
+            }
+
+            this.getHBaseList()
+            this.getHDeptList()
+            this.checkModRight()
+            
+            uni.$on('BillSelectComplete', (e) => {
+                console.log("鎺ユ敹鍒扮殑婧愬崟: ", e.HBillNo)
+                this.getSourceBarCodeData(e.HBillNo)
+                this.$refs.billList.exit()
+            })
+
+            uni.$on('WarehouseSelectComplete', (data) => {
+                this.handleWarehouseSelect(data)
+            })
+
+            uni.$on('StockPlaceSelectComplete', (data) => {
+                this.handleStockPlaceSelect(data)
+            })
+
+            uni.$on('DepartmentSelectComplete', (data) => {
+                this.handleDepartmentSelect(data)
+            })
+        },
+        onUnload() {
+            uni.$off('BillSelectComplete')
+            uni.$off('WarehouseSelectComplete')
+            uni.$off('StockPlaceSelectComplete')
+            uni.$off('DepartmentSelectComplete')
+        },
+        computed: {
+            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: {
+            // 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            async checkModRight() {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: '/WEBSController/CheckModRight_Json',
+                        data: {
+                            "ModRightName": this.ModRightName,
+                            "HUserName": this.hform.HMaker
+                        }
+                    })
+                    if (res.data.count != 1) {
+                        uni.showModal({
+                            title: '娓╅Θ鎻愮ず',
+                            content: res.data.Message,
+                            showCancel: false,
+                            success: () => {
+                                uni.navigateBack()
+                            }
+                        })
+                    }
+                } catch (error) {
+                    console.error('鏉冮檺妫�鏌ュけ璐�:', error)
+                }
+            },
+
+            // 鑾峰彇缁勭粐鏁版嵁
+            async getOrganization() {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: '/Web/GetOrganizations'
+                    })
+                    if (res.data.count == 1) {
+                        this.arrayHOrgName = []
+                        this.arrayHOrgValue = []
+                        Array.from(res.data.data).forEach(e => {
+                            this.arrayHOrgName.push(e.Name)
+                            this.arrayHOrgValue.push(e.ID)
+                        })
+                    }
+                } catch (error) {
+                    console.error('鑾峰彇缁勭粐鏁版嵁澶辫触:', error)
+                }
+            },
+
+            // 鎵弿鏉$爜
+            toScanCode() {
+                uni.scanCode({
+                    onlyFromCamera: true,
+                    success: (res) => {
+                        console.log('鏉$爜鍐呭锛�' + res.result);
+                        this.hform.HBarCode = res.result
+                        this.getCode(this.hform.HBarCode)
+                    }
+                });
+            },
+
+            // 澶勭悊鏉$爜
+            async getCode(HBarCode) {
+                if (!HBarCode) {
+                    this.playSound(0)
+                    uni.showToast({
+                        title: '鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�',
+                        icon: 'none'
+                    })
+                    return
+                }
+
+                const HDeleteFlag = HBarCode.substring(0, 1);
+                const sBarCode = HBarCode.slice(1);
+
+                if (HDeleteFlag == "*") {
+                    // 鍒犻櫎鏉$爜
+                    await this.deleteBarCode(sBarCode)
+                } else {
+                    // 澶勭悊鏉$爜
+                    await this.processBarCode(HBarCode)
+                }
+            },
+
+            // 鍒犻櫎鏉$爜
+            async deleteBarCode(sBarCode) {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+                        data: {
+                            HInterID: this.hform.HInterID,
+                            HBillType: this.hform.HBillType,
+                            HBarCode: sBarCode
+                        }
+                    })
+                    
+                    if (res.data.count == 1) {
+                        this.playSound(1)
+                        this.hform.HQty = ''
+                        this.DisBillEntryList()
+                    } else {
+                        this.playSound(0)
+                        uni.showToast({
+                            title: res.data.Message,
+                            icon: 'none'
+                        })
+                    }
+                } catch (error) {
+                    this.playSound(0)
+                    uni.showToast({
+                        title: '鍒犻櫎鏉$爜澶辫触',
+                        icon: 'none'
+                    })
+                }
+                this.refreshBarCodeState()
+            },
+
+            // 澶勭悊鏉$爜
+            async processBarCode(sBarCode) {
+                // 浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if (!this.hform.HWHName) this.hform.HWHID = 0
+                if (!this.hform.HStockPlaceName) this.hform.HStockPlaceID = 0
+                if (!this.hform.HSCWHName) this.hform.HSCWHID = 0
+                if (!this.hform.HOutStockPlaceName) this.hform.HOutStockPlaceID = 0
+
+                const sHQty = this.hform.HQty || 0
+                const HSourceFlag = !!this.hform.HSourceBillNo
+
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: '/WEBSController/get_BarCode_MoveStock_New_Json',
+                        data: {
+                            sBarCode: sBarCode,
+                            HInterID: this.hform.HInterID,
+                            HBillType: this.hform.HBillType,
+                            HBillNo: this.hform.HBillNo,
+                            HMaker: this.hform.HMaker,
+                            HWhID: this.hform.HWHID,
+                            HSPID: this.hform.HStockPlaceID,
+                            HSCWHID: this.hform.HSCWHID,
+                            HSCSPID: this.hform.HOutStockPlaceID,
+                            HQty: sHQty,
+                            SourceFlag: HSourceFlag,
+                            HSourceBillNo: this.hform.HSourceBillNo,
+                            HSourceBillType: this.hform.HMainSourceBillType,
+                            HStockInOrgID: this.hform.HStockInOrgID,
+                            HStockOutOrgID: this.hform.HStockOutOrgID,
+                            HScanStyle: "",
+                            HCustom1: "",
+                            HCustom2: ""
+                        }
+                    })
+
+                    if (res.data.count == 1) {
+                        this.playSound(1)
+                        await this.handleBarCodeResult(res.data.data)
+                        this.DisBillEntryList()
+                        this.hform.HQty = ''
+                    } else {
+                        this.playSound(0)
+                        uni.showToast({
+                            title: res.data.Message,
+                            icon: 'none'
+                        })
+                    }
+                } catch (error) {
+                    this.playSound(0)
+                    uni.showToast({
+                        title: '澶勭悊鏉$爜澶辫触',
+                        icon: 'none'
+                    })
+                }
+                this.refreshBarCodeState()
+            },
+
+            // 澶勭悊鏉$爜鎵弿缁撴灉
+            async handleBarCodeResult(data) {
+                switch (data.hBarTypeField) {
+                    case '浠撳簱鏉$爜':
+                        this.handleWarehouseBarCode(data)
+                        break
+                    case '浠撲綅鏉$爜':
+                        this.handleStockPlaceBarCode(data)
+                        break
+                    case '閮ㄩ棬鏉$爜':
+                        this.handleDepartmentBarCode(data)
+                        break
+                    case '婧愬崟鏉$爜':
+                        await this.handleSourceBillBarCode(data)
+                        break
+                    default:
+                        await this.handleMaterialBarCode(data)
+                }
+            },
+
+            // 澶勭悊浠撳簱鏉$爜
+            handleWarehouseBarCode(data) {
+                this.hform.HSCWHName = data.hWhNameField
+                this.hform.HSCWHID = data.hWhIDField
+                this.hform.HOutStockPlaceName = data.hSPNameField
+                this.hform.HOutStockPlaceID = data.hSPIDField
+                this.HSCIsStockMgr = data.hSPFlagField != 0
+            },
+
+            // 澶勭悊浠撲綅鏉$爜
+            handleStockPlaceBarCode(data) {
+                this.hform.HOutStockPlaceName = data.hSPNameField
+                this.hform.HOutStockPlaceID = data.hSPIDField
+                this.hform.HSCWHName = data.hWhNameField
+                this.hform.HSCWHID = data.hWhIDField
+            },
+
+            // 澶勭悊閮ㄩ棬鏉$爜
+            handleDepartmentBarCode(data) {
+                this.hform.HDeptName = data.hDeptNameField
+                this.hform.HDeptID = data.hDeptIDField
+                this.tabs = 1
+            },
+
+            // 澶勭悊婧愬崟鏉$爜
+            async handleSourceBillBarCode(data) {
+                await this.setSourceBillInfo(data)
+                this.tabs = 3
+            },
+
+            // 澶勭悊鐗╂枡鏉$爜
+            async handleMaterialBarCode(data) {
+                if (!this.hform.HSourceBillNo) {
+                    await this.setSourceBillInfo(data)
+                }
+                this.tabs = 2
+            },
+
+            // 璁剧疆婧愬崟淇℃伅
+            async setSourceBillInfo(data) {
+                if (data.hDeptIDField != 0) {
+                    this.hform.HDeptID = data.hDeptIDField
+                    this.hform.HDeptName = data.hDeptNameField
+                }
+
+                this.hform.HSourceBillNo = data.hSourceBillNoField
+                this.hform.HMainSourceBillType = data.hSourceBillTypeField
+
+                // 鏇存柊婧愬崟绫诲瀷鏄剧ず
+                const index = this.arrayHMainSourceBillValue.findIndex(e => e == data.hSourceBillTypeField)
+                if (index !== -1) {
+                    this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                    this.HMainSourceBillTypeIndex = index
+                    this.showHMainSourceBillType = false
+                }
+
+                if (data.hMulSourceFlagField == 0) {
+                    this.showHSourceBillNo = false
+                }
+
+                this.hform.HStockStyle = data.hStockStyleField
+                this.hform.HStockInOrgID = data.hStockInOrgIDField
+                this.hform.HStockOutOrgID = data.hStockOutOrgIDField
+
+                // 鏇存柊缁勭粐鏄剧ず
+                const inOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.hStockInOrgIDField)
+                const outOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.hStockOutOrgIDField)
+                if (inOrgIndex !== -1) {
+                    this.hform.HStockInOrgName = this.arrayHOrgName[inOrgIndex]
+                }
+                if (outOrgIndex !== -1) {
+                    this.hform.HStockOutOrgName = this.arrayHOrgName[outOrgIndex]
+                }
+
+                // 濡傛灉缁勭粐鍙戠敓鍙樺寲锛屾竻绌轰粨搴撲粨浣�
+                if (this.hform.HStockInOrgID != uni.getStorageSync('OrganizationID')) {
+                    this.clearInWarehouseData()
+                }
+                if (this.hform.HStockOutOrgID != uni.getStorageSync('OrganizationID')) {
+                    this.clearOutWarehouseData()
+                }
+            },
+
+            // 娓呯┖璋冨叆浠撳簱鏁版嵁
+            clearInWarehouseData() {
+                this.hform.HWHID = 0
+                this.hform.HWHName = ''
+                this.hform.HStockPlaceID = 0
+                this.hform.HStockPlaceName = ''
+                this.HIsStockMgr = true
+            },
+
+            // 娓呯┖璋冨嚭浠撳簱鏁版嵁
+            clearOutWarehouseData() {
+                this.hform.HSCWHID = 0
+                this.hform.HSCWHName = ''
+                this.hform.HOutStockPlaceID = 0
+                this.hform.HOutStockPlaceName = ''
+                this.HSCIsStockMgr = true
+            },
+
+            // 鍒锋柊鏉$爜杈撳叆鐘舵��
+            async refreshBarCodeState() {
+                this.barCodeFocus = false
+                await this.$nextTick(() => {
+                    this.hform.HBarCode = ""
+                    this.barCodeFocus = true
+                })
+            },
+
+            // 鎾斁鎻愮ず闊�
+            playSound(type) {
+                const innerAudioContext = uni.createInnerAudioContext();
+                innerAudioContext.src = type == 1 ? '/static/success.wav' : '/static/jingbao.wav';
+                innerAudioContext.play();
+            },
+
+            // 鎵弿浠撳簱鐮�
+            async HWHNameOutScan(e) {
+                let index = this.HWHNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+                    })
+                } else {
+                    this.HSCWHNameChange(this.HWHNameList[index]['浠撳簱鍚嶇О'])
+                }
+            },
+
+            // 鎵弿浠撲綅鐮�
+            async HStockPlaceOutNameScan(e) {
+                let index = this.HStockPlaceNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HOutStockPlaceNameChange(this.HStockPlaceNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
+
+            // 鎵弿璋冨叆浠撳簱鐮�
+            async HWHNameInScan(e) {
+                let index = this.HWHInNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撳簱鏉$爜瀵瑰簲鐨勪粨搴撲笉瀛樺湪...'
+                    })
+                } else {
+                    this.HWHInNameChange(this.HWHInNameList[index]['浠撳簱鍚嶇О'])
+                }
+            },
+
+            // 鎵弿璋冨叆浠撲綅鐮�
+            async HStockPlaceNameInScan(e) {
+                let index = this.HStockPlaceInNameList.findIndex(elem => elem['鏉$爜缂栧彿'] == e)
+                if (index == -1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鎵弿浠撲綅鏉$爜瀵瑰簲鐨勪粨浣嶄笉瀛樺湪...'
+                    })
+                } else {
+                    this.HStockPlaceInNameChange(this.HStockPlaceInNameList[index]['浠撲綅鍚嶇О'])
+                }
+            },
+
+            // 婧愬崟绫诲瀷鍙樻洿
+            HMainSourceBillTypeChange(e) {
+                this.HMainSourceBillTypeIndex = e.detail.value
+                this.HMainSourceBillType = this.arrayHMainSourceBillType[this.HMainSourceBillTypeIndex]
+                this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[this.HMainSourceBillTypeIndex]
+            },
+
+            // 婧愬崟鍗曞彿纭
+            onHSourceBillNoConfirmHandler() {
+                if (this.hform.HMainSourceBillType == -1) {
+                    this.playSound(1)
+                    return
+                }
+                this.getSourceBarCodeData(this.hform.HSourceBillNo)
+            },
+
+            // 鑾峰彇婧愬崟鏁版嵁
+            async getSourceBarCodeData(HSourceBillNo) {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: '/WEBSController/get_SourceBarCode_MoveStockStepIn_Json',
+                        data: {
+                            HInterID: this.hform.HInterID,
+                            HBillNo: this.hform.HBillNo,
+                            HBillType: this.hform.HBillType,
+                            HSourceBillNo: HSourceBillNo,
+                            HSourceBillType: this.hform.HMainSourceBillType,
+                            HMaker: this.hform.HMaker,
+                            HStockInOrgID: this.hform.HStockInOrgID,
+                            HStockOutOrgID: this.hform.HStockOutOrgID
+                        }
+                    })
+
+                    if (res.data.count == 1) {
+                        this.playSound(1)
+                        await this.setSourceBillInfo(res.data.data)
+                        this.tabs = 2
+                        this.barCodeFocus = true
+                        this.DisBillEntryList()
+                    } else {
+                        this.playSound(0)
+                        uni.showToast({
+                            title: res.data.Message,
+                            icon: 'none'
+                        })
+                        this.refreshHSourceBillState()
+                    }
+                } catch (error) {
+                    this.playSound(0)
+                    uni.showToast({
+                        title: '鑾峰彇婧愬崟鏁版嵁澶辫触',
+                        icon: 'none'
+                    })
+                    this.refreshHSourceBillState()
+                }
+            },
+
+            // 鍒锋柊婧愬崟杈撳叆鐘舵��
+            async refreshHSourceBillState() {
+                this.HSourcebillNoFocus = false
+                await this.$nextTick(() => {
+                    this.hform.HSourceBillNo = ""
+                    this.HSourcebillNoFocus = true
+                })
+            },
+
+            // 鏄剧ず婧愬崟鍒楄〃
+            showBillList() {
+                this.$refs.billList.showPopup()
+            },
+
+            // 鏃ユ湡鍙樻洿
+            HDateChange(e) {
+                this.hform.HDate = e.detail.value
+            },
+
+            // 璋冨嚭浠撳簱鍙樻洿
+            HSCWHNameChange(e) {
+                const warehouse = this.HWHNameList.find(item => item.浠撳簱鍚嶇О == e)
+                if (warehouse) {
+                    this.hform.HSCWHName = warehouse.浠撳簱鍚嶇О
+                    this.hform.HSCWHID = warehouse.HItemID
+                    this.HSCIsStockMgr = warehouse['鍚敤浠撲綅'] == 'Y'
+                    if (!this.HSCIsStockMgr) {
+                        this.hform.HOutStockPlaceName = ''
+                        this.hform.HOutStockPlaceID = ''
+                    }
+                }
+            },
+
+            // 璋冨嚭浠撲綅鍙樻洿
+            HOutStockPlaceNameChange(e) {
+                const stockPlace = this.HStockPlaceNameList.find(item => item.浠撲綅鍚嶇О == e)
+                if (stockPlace) {
+                    this.hform.HOutStockPlaceName = stockPlace.浠撲綅鍚嶇О
+                    this.hform.HOutStockPlaceID = stockPlace.HMainID
+                }
+            },
+
+            // 璋冨叆浠撳簱鍙樻洿
+            HWHInNameChange(e) {
+                const warehouse = this.HWHInNameList.find(item => item.浠撳簱鍚嶇О == e)
+                if (warehouse) {
+                    this.hform.HWHName = warehouse.浠撳簱鍚嶇О
+                    this.hform.HWHID = warehouse.HItemID
+                    this.HIsStockMgr = warehouse['鍚敤浠撲綅'] == 'Y'
+                    if (!this.HIsStockMgr) {
+                        this.hform.HStockPlaceName = ''
+                        this.hform.HStockPlaceID = ''
+                    }
+                }
+            },
+
+            // 璋冨叆浠撲綅鍙樻洿
+            HStockPlaceInNameChange(e) {
+                const stockPlace = this.HStockPlaceInNameList.find(item => item.浠撲綅鍚嶇О == e)
+                if (stockPlace) {
+                    this.hform.HStockPlaceName = stockPlace.浠撲綅鍚嶇О
+                    this.hform.HStockPlaceID = stockPlace.HMainID
+                }
+            },
+
+            // 閮ㄩ棬鍙樻洿
+            HDeptNameChange(e) {
+                const dept = this.HDeptNameList.find(item => item.閮ㄩ棬鍚嶇О == e)
+                if (dept) {
+                    this.hform.HDeptName = dept.閮ㄩ棬鍚嶇О
+                    this.hform.HDeptID = dept.HItemID
+                }
+            },
+
+            // 鑾峰彇鍩虹鏁版嵁
+            getHBaseList() {
+                // 鑾峰彇浠撳簱鍒楄〃
+                CommonUtils.doRequest2({
+                    url: '/Gy_Warehouse/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    resFunction: (res) => {
+                        if (res.data.count == 1) {
+                            this.HWHNameList = res.data.data
+                            this.HWHInNameList = res.data.data
+                            this.arrayHWHName = res.data.data.map(item => item.浠撳簱鍚嶇О)
+                            this.arrayHWHInName = res.data.data.map(item => item.浠撳簱鍚嶇О)
+                        }
+                    }
+                })
+
+                // 鑾峰彇浠撲綅鍒楄〃
+                CommonUtils.doRequest2({
+                    url: '/Gy_StockPlace/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    resFunction: (res) => {
+                        if (res.data.count == 1) {
+                            this.HStockPlaceNameList = res.data.data
+                            this.HStockPlaceInNameList = res.data.data
+                            this.arrayHStockPlaceName = res.data.data.map(item => item.浠撲綅鍚嶇О)
+                            this.arrayHStockPlaceInName = res.data.data.map(item => item.浠撲綅鍚嶇О)
+                        }
+                    }
+                })
+            },
+
+            // 鑾峰彇閮ㄩ棬鍒楄〃
+            getHDeptList() {
+                CommonUtils.doRequest2({
+                    url: '/Gy_Department/list',
+                    data: {
+                        sWhere: "",
+                        user: uni.getStorageSync('HUserName'),
+                        Organization: uni.getStorageSync('Organization')
+                    },
+                    resFunction: (res) => {
+                        if (res.data.count == 1) {
+                            this.HDeptNameList = res.data.data
+                            this.arrayHDeptName = res.data.data.map(item => item.閮ㄩ棬鍚嶇О)
+                        }
+                    }
+                })
+            },
+
+            // 鏄剧ず浠撳簱鍒楄〃
+            showWarehouseList(type) {
+                const HOrgID = type === 'HSCWHID' ? this.hform.HStockOutOrgID : this.hform.HStockInOrgID
+                uni.navigateTo({
+                    url: `/pages/Baseset/WarehouseList?Type=${type}&HOrgID=${HOrgID}`
+                })
+            },
+
+            // 鏄剧ず浠撲綅鍒楄〃
+            showStockPlaceList(type) {
+                const HWhID = type === 'HOSpID' ? this.hform.HSCWHID : this.hform.HWHID
+                const HOrgID = type === 'HOSpID' ? this.hform.HStockOutOrgID : this.hform.HStockInOrgID
+                uni.navigateTo({
+                    url: `/pages/Baseset/StockPlaceList?HWhID=${HWhID}&Type=${type}&HOrgID=${HOrgID}`
+                })
+            },
+
+            // 鏄剧ず閮ㄩ棬鍒楄〃
+            showDepartmentList() {
+                uni.navigateTo({
+                    url: `/pages/Baseset/DepartmentList?HStockOrgID=${this.hform.HStockOrgID}&Type=HDept1`
+                })
+            },
+
+            // 澶勭悊浠撳簱閫夋嫨缁撴灉
+            handleWarehouseSelect(data) {
+                if (data.type === 'HSCWHID') {
+                    this.hform.HSCWHName = data.data[0].HName
+                    this.hform.HSCWHID = data.data[0].HItemID
+                    this.hform.HOutStockPlaceName = data.data[0].HSPName
+                    this.hform.HOutStockPlaceID = data.data[0].HSPID
+                    this.HSCIsStockMgr = data.data[0].HSPFlag != 0
+                } else if (data.type === 'HWHID') {
+                    this.hform.HWHName = data.data[0].HName
+                    this.hform.HWHID = data.data[0].HItemID
+                    this.hform.HStockPlaceName = data.data[0].HSPName
+                    this.hform.HStockPlaceID = data.data[0].HSPID
+                    this.HIsStockMgr = data.data[0].HSPFlag != 0
+                }
+            },
+
+            // 澶勭悊浠撲綅閫夋嫨缁撴灉
+            handleStockPlaceSelect(data) {
+                if (data.type === 'HOSpID') {
+                    this.hform.HOutStockPlaceName = data.data[0].HName
+                    this.hform.HOutStockPlaceID = data.data[0].HItemID
+                    this.hform.HSCWHName = data.data[0].HWhName
+                    this.hform.HSCWHID = data.data[0].HWHID
+                } else if (data.type === 'HSpID') {
+                    this.hform.HStockPlaceName = data.data[0].HName
+                    this.hform.HStockPlaceID = data.data[0].HItemID
+                    this.hform.HWHName = data.data[0].HWhName
+                    this.hform.HWHID = data.data[0].HWHID
+                }
+            },
+
+            // 澶勭悊閮ㄩ棬閫夋嫨缁撴灉
+            handleDepartmentSelect(data) {
+                this.hform.HDeptName = data.data[0].HName
+                this.hform.HDeptID = data.data[0].HItemID
+            },
+
+            // 鏄剧ず鐗╂枡鏄庣粏
+            showMaterialDetail(item) {
+                this.selectedMaterial = item
+                // this.$refs.materialEdit.show()
+            },
+
+            // 鏄剧ず婧愬崟鏉$爜鏄庣粏
+            showSourceBarCodeDetail(item) {
+                // 鍙互鍦ㄨ繖閲屽疄鐜版簮鍗曟潯鐮佹槑缁嗙殑鏄剧ず閫昏緫
+                console.log('婧愬崟鏉$爜鏄庣粏:', item)
+            },
+
+            // 鐗╂枡淇濆瓨鍥炶皟
+            onMaterialSave() {
+                this.DisBillEntryList()
+            },
+
+            // 鏄剧ず鐗╂枡娓呭崟
+            DisBillEntryList() {
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/GetBillEntryTmpList_Json',
+                    data: {
+                        HInterID: this.hform.HInterID,
+                        HBillNo: this.hform.HBillNo,
+                        HBillType: this.hform.HBillType,
+                        HStockOrgID: this.hform.HStockOutOrgID
+                    },
+                    resFunction: (res) => {
+                        if (res.data.count == 1) {
+                            const data = res.data.data
+                            this.Materlist = data.Materlist
+                            if (data.ICMOReportlist[0].HSourceInterID !=0 ) {
+                                this.FIFOlist = data.ICMOReportlist
+                            }
+
+                            // 鏇存柊鏉$爜淇℃伅
+                            if (data.BarCodeDetailslist && data.BarCodeDetailslist[0].HBarCode) {
+                                const barcode = data.BarCodeDetailslist[0]
+                                this.hform.HBarCode_B = barcode.HBarCode
+                                this.hform.HMaterName_B = barcode.HMaterName
+                                this.hform.HMaterModel_B = barcode.HMaterModel
+                                this.hform.HBatchNo_B = barcode.HBatchNo
+                                this.hform.HUnitName_B = barcode.HUnitName
+                                this.hform.HQty_B = barcode.HQty
+                                this.hform.HTMQty_B = barcode.HTMQty
+                                this.hform.HWHName_B = barcode.HWHName
+                                this.hform.HSPName_B = barcode.HSPName
+                                this.hform.HSCWHName_B = barcode.HSCWHName
+                                this.hform.HSCSPName_B = barcode.HSCSPName
+                            } else {
+                                this.clearBarcodeInfo()
+                            }
+                        } else {
+                            this.Materlist = []
+                            this.FIFOlist = []
+                            this.clearBarcodeInfo()
+                        }
+                    }
+                })
+            },
+
+            // 娓呯┖鏉$爜淇℃伅
+            clearBarcodeInfo() {
+                this.hform.HBarCode_B = ''
+                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 = ''
+                this.hform.HSCWHName_B = ''
+                this.hform.HSCSPName_B = ''
+            },
+
+            // 鑾峰彇鏂板崟鎹暟鎹�
+            getNewData() {
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/GetMaxBillNoAndID_Json',
+                    data: {
+                        HBillType: this.hform.HBillType
+                    },
+                    resFunction: (res) => {
+                        if (res.data.count == 1) {
+                            this.hform.HInterID = res.data.data[0].HInterID
+                            this.hform.HBillNo = res.data.data[0].HBillNo
+                        }
+                    }
+                })
+            },
+
+            // 鍔犺浇宸叉湁鍗曟嵁
+            RoadBillMain(HInterID) {
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/GetSourceBill_Temp_Json',
+                    data: {
+                        HInterID: HInterID,
+                        HBillType: this.hform.HBillType
+                    },
+                    resFunction: (res) => {
+                        if (res.data.count == 1) {
+                            const 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
+
+                            // 璁剧疆婧愬崟绫诲瀷
+                            const index = this.arrayHMainSourceBillValue.findIndex(e => e == data.HSourceBillType)
+                            if (index !== -1) {
+                                this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+                                this.HMainSourceBillTypeIndex = index
+                                this.showHMainSourceBillType = false
+                            }
+
+                            if (data.HMulSourceBill == 0) {
+                                this.showHSourceBillNo = false
+                            }
+
+                            if (data.HDeptID != 0) {
+                                this.hform.HDeptID = data.HDeptID
+                                this.hform.HDeptName = data.HDeptName
+                            }
+
+                            this.hform.HStockStyle = data.HStockStyle
+                            this.hform.HStockInOrgID = data.HStockInOrgID
+                            this.hform.HStockOutOrgID = data.HStockOutOrgID
+
+                            // 璁剧疆缁勭粐鏄剧ず
+                            const inOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.HStockInOrgID)
+                            const outOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.HStockOutOrgID)
+                            if (inOrgIndex !== -1) {
+                                this.hform.HStockInOrgName = this.arrayHOrgName[inOrgIndex]
+                            }
+                            if (outOrgIndex !== -1) {
+                                this.hform.HStockOutOrgName = this.arrayHOrgName[outOrgIndex]
+                            }
+
+                            this.tabs = 2
+                            this.DisBillEntryList()
+                        }
+                    }
+                })
+            },
+
+            // 鏂板鍗曟嵁
+            addNew() {
+                uni.redirectTo({
+                    url: '/pages/fenbushidiaoru/form?OperationType=1'
+                })
+            },
+
+            // 鎻愪氦鍗曟嵁
+            async submit() {
+                // 琛ㄥ崟楠岃瘉
+                if (!this.hform.HInterID) {
+                    uni.showToast({
+                        title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+                        icon: 'none'
+                    })
+                    return
+                }
+
+                if (!this.hform.HBillNo) {
+                    uni.showToast({
+                        title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+                        icon: 'none'
+                    })
+                    return
+                }
+
+                if (!this.Materlist || this.Materlist.length == 0) {
+                    uni.showToast({
+                        title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+                        icon: 'none'
+                    })
+                    return
+                }
+
+                const hasMaterial = this.Materlist.some(item => item.鏁伴噺 > 0)
+                if (!hasMaterial) {
+                    uni.showToast({
+                        title: '娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+                        icon: 'none'
+                    })
+                    return
+                }
+
+                // 娓呯┖绌哄�肩殑ID
+                if (!this.hform.HWHName) this.hform.HWHID = 0
+                if (!this.hform.HStockPlaceName) this.hform.HStockPlaceID = 0
+                if (!this.hform.HSCWHName) this.hform.HSCWHID = 0
+                if (!this.hform.HOutStockPlaceName) this.hform.HOutStockPlaceID = 0
+                if (!this.hform.HDeptName) this.hform.HDeptID = 0
+
+                try {
+                    const sMainStr = JSON.stringify(this.hform)
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: '/WEBSController/set_SaveMoveStockStepInBill_Json',
+                        method: 'POST',
+                        data: {
+                            oMain: sMainStr
+                        }
+                    })
+
+                    if (res.data.count == 1) {
+                        uni.showModal({
+                            title: '鎻愮ず',
+                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵',
+                            success: (res) => {
+                                if (res.confirm) {
+                                    this.addNew()
+                                } else {
+                                    if (this.OperationType == 2) {
+                                        uni.navigateBack()
+                                    } else {
+                                        uni.switchTab({
+                                            url: '/pages/index/index'
+                                        })
+                                    }
+                                }
+                            }
+                        })
+                    } else {
+                        uni.showToast({
+                            title: res.data.Message,
+                            icon: 'none'
+                        })
+                    }
+                } catch (error) {
+                    uni.showToast({
+                        title: '鎻愪氦澶辫触:' + error,
+                        icon: 'none'
+                    })
+                }
+            },
+
+            // 杩斿洖
+            goBack() {
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            if (this.OperationType == 2) {
+                                uni.navigateBack()
+                            } else {
+                                uni.switchTab({
+                                    url: '/pages/index/index'
+                                })
+                            }
+                        }
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .form {
+        width: 668rpx;
+        margin: 20rpx auto;
+        padding-bottom: 240rpx;
+    }
+
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
+
+        view {
+            width: 20%;
+            font-size: 26rpx;
+            color: #555;
+            text-align: center;
+            padding: 16rpx 0;
+        }
+
+        .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;
+
+        .title {
+            width: 208rpx;
+            flex-shrink: 0;
+        }
+
+        .right {
+            flex: 1;
+            border-radius: 22rpx;
+            border: 1px solid #acacac;
+            position: relative;
+            display: flex;
+        }
+
+        .righton {
+            flex: 1;
+            border-radius: 22rpx;
+            border: 1px solid #e4e4e4;
+            background-color: #e4e4e4;
+        }
+
+        input {
+            width: 100%;
+            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;
+            flex-shrink: 0;
+
+            .uni-icons {
+                color: #fff !important;
+            }
+        }
+
+        .icon-wrapper[disabled] {
+            background-color: rgba(228, 228, 228, 1);
+            pointer-events: none;
+            touch-action: none;
+        }
+    }
+
+    .bottom-btn {
+        box-sizing: border-box;
+        width: 100%;
+        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;
+        }
+
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+        }
+    }
+
+    .list {
+        width: 100%;
+
+        .card-detail {
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            line-height: 120%;
+
+            .detail {
+                font-size: 26rpx;
+                margin-bottom: 12rpx;
+                color: #555;
+                margin-right: 20rpx;
+
+                text {
+                    color: #999;
+                    font-size: 26rpx;
+                }
+            }
+        }
+    }
+
+    .over {
+        text-align: center;
+        color: #999;
+        padding: 40rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/fenbushidiaorudan/table.vue b/pages/fenbushidiaorudan/table.vue
new file mode 100644
index 0000000..068a7a8
--- /dev/null
+++ b/pages/fenbushidiaorudan/table.vue
@@ -0,0 +1,542 @@
+<template>
+    <view class="content">
+        <view class="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+        <view class="form" v-if="tabs == 0">
+            <view class="buttons" @tap="add">
+                <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+            </view>
+        </view>
+        <view class="form" v-if="tabs == 1">
+            <view class="form-item">
+                <view class="title">鍗曟嵁鍙�:</view>
+                <view class="right">
+                    <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">婧愬崟鍗曞彿:</view>
+                <view class="right">
+                    <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                </view>
+            </view>
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+            <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <view class="detail" v-if="item.鍒跺崟浜�">
+                        <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                    </view>
+                    <view class="detail" v-if="item.鍗曟嵁鍐呯爜">
+                        <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+                    </view>
+                    <view class="detail" v-if="item.鏁伴噺">
+                        <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+                    </view>
+                    <view class="detail" v-if="item.婧愬崟鍗曞彿">
+                        <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+                    </view>
+                    <view class="detail" v-if="item.缁勭粐">
+                        <text>缁勭粐锛�</text>{{item.缁勭粐}}
+                    </view>
+                </view>
+
+                <view class="more">
+                    <view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+                        <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+                    </view>
+                    <view class="part" style="color: #da0000;" @tap.stop="del(item)">
+                        <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+                    </view>
+                </view>
+            </uni-card>
+        </view>
+        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+            <uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+					<view class="detail" v-if="item.鐘舵��">
+						<text>鐘舵�侊細</text>{{item.鐘舵�亇}
+					</view>
+                    <view class="detail" v-if="item.鍒跺崟浜�">
+                        <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                    </view>
+                    <view class="detail" v-if="item.鏁伴噺">
+                        <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+                    </view>
+                    <view class="detail" v-if="item.婧愬崟鍗曞彿">
+                        <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+                    </view>
+                    <view class="detail" v-if="item.鐗╂枡浠g爜">
+                        <text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
+                    </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>
+
+                <view class="more">
+                    <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
+                        <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+                    </view>
+                    <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+                        <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+                    </view>
+                </view>
+            </uni-card>
+        </view>
+
+        <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
+        <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+        <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+    export default {
+        data() {
+            return {
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+                MvarReportTitle: '鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 1251,
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+
+                page: 1,
+            }
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        onReachBottom: function() {
+            this.page++
+            setTimeout(() => {
+                this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+            }, 100)
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        methods: {
+            async qrCodeDisplay(item) {
+              this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+              await this.$nextTick()
+              this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_MoveStock',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            getPage(page, list) {
+                let sindex = (parseInt(page) - 1) * 20
+                let eindex = parseInt(page) * 20
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json'
+                }
+                if (this.tabs == 1) {
+                    this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                }
+                this.getList()
+            },
+            getList() {
+                uni.showLoading({
+                    title: '鍔犺浇涓�...'
+                })
+                uni.request({
+                    url: this.serverUrl + this.urls,
+                    data: this.hform,
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            this.listData = res.data.data
+                            this.showList = this.getPage(this.page, this.listData)
+                            setTimeout(() => {
+                                uni.hideLoading()
+                            }, 1000)
+                        } else {
+                            uni.hideLoading()
+                            this.listData = []
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            search() {
+                this.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                // if (this.hform.HBillNo) {
+                //     this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                // }
+                // if (this.hform.HSourceBillNo) {
+                //     this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HSourceBillNo + "%'";
+                // }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 1251,
+                    HMaker: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                }
+                this.getList()
+            },
+            add() {
+                uni.navigateTo({
+                    url: './form_test?OperationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './form_test?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            del(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DelPonderationBillMain_Temp_New_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .form {
+        width: 640rpx;
+        margin: 20rpx auto;
+        margin-top: 90rpx;
+    }
+
+    .tabs {
+        width: 100%;
+        position: fixed;
+        left: 0;
+        z-index: 9;
+        display: flex;
+        background-color: #e5e5e5;
+
+        view {
+            width: 50%;
+            font-size: 30rpx;
+            color: #333;
+            text-align: center;
+            padding: 16rpx 0;
+        }
+
+        .on {
+            color: #3a78ff;
+            font-weight: bold;
+            border-bottom: 3px solid #3a78ff;
+        }
+    }
+
+    .buttons {
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        margin-top: 20rpx;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #acacac;
+            color: #fff;
+        }
+
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #3a78ff;
+            color: #fff;
+        }
+    }
+
+    .form-item {
+        display: flex;
+        align-items: center;
+        font-size: 28rpx;
+        padding: 6rpx 0;
+
+        .title {
+            width: 180rpx;
+
+            text {
+                color: red;
+                font-weight: bold;
+            }
+        }
+
+        .right {
+            width: 450rpx;
+            border-radius: 22rpx;
+            border: 1px solid #acacac;
+        }
+
+        .righton {
+            width: 450rpx;
+            border-radius: 22rpx;
+            border: 1px solid #e4e4e4;
+            background-color: #e4e4e4;
+        }
+
+        input {
+            width: 100%;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
+    }
+
+    .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: 26rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/index/_index.vue b/pages/index/_index.vue
index 3d4f26f..530edaf 100644
--- a/pages/index/_index.vue
+++ b/pages/index/_index.vue
@@ -125,6 +125,12 @@
 						text: '鏉$爜鎷嗙爜',
 						url: '/pages/tiaomachaima/tiaomachaima',
 						id: 20,
+					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鎵嬫満瀵垮懡',
+						url: '/pages/shoujishouming/plan',
+						id: 20,
 					}
 				]
 			}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index af57a66..3345b40 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -246,6 +246,27 @@
                         id: 26,
                         hidden: false,
                     },
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鍒嗗竷寮忚皟鍏ュ崟',
+						url: '/pages/fenbushidiaorudan/form_test',
+						id: 27,
+						hidden: false,
+					},
+                    {
+                    	img: '../../static/icon/icon16.png',
+                    	text: '鍒嗗竷寮忚皟鍏ュ崟缂撳瓨',
+                    	url: '/pages/fenbushidiaorudan/table',
+                    	id: 28,
+                    	hidden: false,
+                    },
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鍒嗗竷寮忚皟鍑哄崟',
+						url: '/pages/fenbushidiaochudan/form_out',
+						id: 29,
+						hidden: false,
+					},
 
 
                 ],
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 2e2bf94..a0ad400 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -85,8 +85,8 @@
                     "娓╁窞娴疯瘹鍏夊": 'http://122.228.39.234:7177/API/',
                     "瀹佹尝鎯犲悍宸ヤ笟": 'http://172.16.72.30:6699/API/',
                     "浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
-					"鑻忓窞鍗櫤绉戞妧-澶栫綉": 'http://221.224.60.42:8082/API_WW/',
-                    "鑻忓窞鍗櫤绉戞妧-鍐呯綉": 'http://172.16.20.233:8082/API_NW/',
+ 					//"llj": 'http://localhost:8082/LuBaoAPI/',
+					"鑻忓窞鍗櫤绉戞妧": 'http://221.224.60.42:8082/API_WW/',
 					"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
 					"闄堥晲鍝叉湰鍦版祴璇�": 'http://localhost:81/API/',
 					"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index 75ba524..847248e 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -127,6 +127,7 @@
 						url: '/pages/mujvzhuangtai/mujvzhuangtai',
 						id: 15,
 						hidden: true,
+					
 					}, {
 						img: '../../static/icon/icon10.png',
 						text: '鎴戠殑浠诲姟',
@@ -135,6 +136,14 @@
 						id: 16,
 						hidden: false,
 					}, 
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鍣ㄥ叿瀵垮懡',
+						url: '/pages/shoujishouming/table',
+						id: 17,
+						hidden: false,
+					},
+					
 				]
 				// itemData: [{
 				// 	//  img:'../../static/icon0.png',
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 97c169c..d66e360 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -36,9 +36,7 @@
 				menuListName: 'tab2',
 				canEdit: false,
 				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				itemData: [
-				// 閲囪喘鐩稿叧鏆傚瓨鍒楄〃
-				{
+				itemData: [{
 					img: '../../static/icon/icon17.png',
 					text: '閲囪喘鍏ュ簱鏆傚瓨鍒楄〃',
 					url: '/pages/caigouruku/table',
@@ -51,31 +49,39 @@
 					id: 2,
 					hidden: false,
 				}, {
+					id: 3,
+					hidden: false,
+},{
 					img: '../../static/icon/icon30.png',
 					text: '閲囪喘鍏ュ簱鏍¢獙鏆傚瓨鍒楄〃',
 					url: '/pages/caigourukujiaoyan/table',
-					id: 3,
+					id: 4,
 					hidden: false,
-				},
-				
-				// 閿�鍞浉鍏虫殏瀛樺垪琛�
+				}, 
 				{
+					img: '../../static/icon/icon18.png',
+					id: 5,
+					hidden: false,
+},{
 					img: '../../static/icon/icon18.png',
 					text: '閿�鍞嚭搴撴殏瀛樺垪琛�',
 					url: '/pages/xiaoshouchuku/table',
-					id: 4,
+					id: 6,
 					hidden: false,
 				}, {
+					id: 7,
+					hidden: false,
+},{
 					img: '../../static/icon/icon20.png',
 					text: '閿�鍞��璐ф殏瀛樺垪琛�',
 					url: '/pages/xiaoshoutuihuo/table',
-					id: 5,
+					id: 8,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon18.png',
 					text: '閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�',
 					url: '/pages/xiaoshouchukujiaoyan/table',
-					id: 6,
+					id: 9,
 					hidden: false,
 				},
 				
@@ -84,49 +90,53 @@
 					img: '../../static/icon/icon30.png',
 					text: '鐢熶骇棰嗘枡鏆傚瓨鍒楄〃',
 					url: '/pages/shengchanlingliaoshengdan/table',
-					id: 7,
+					id: 10,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon31.png',
 					text: '鐢熶骇琛ユ枡鏆傚瓨鍒楄〃',
 					url: '/pages/shengchanbuliao/table',
-					id: 8,
+					// url: '',
+					id: 11,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon17.png',
 					text: '鐢熶骇鍏ュ簱鏆傚瓨鍒楄〃',
 					url: '/pages/shengchanrukushengdan/table',
-					id: 9,
+					id: 12,
 					hidden: false,
 				}, {
+					id: 13,
+					hidden: false,
+				},{
 					img: '../../static/icon/icon8.png',
 					text: '鐢熶骇閫�鏂欏崟鏆傚瓨鍒楄〃',
 					url: `/pages/shengchantuiliao/table`,
-					id: 10,
+					id: 14,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon30.png',
 					text: '鐢熶骇棰嗘枡鏍¢獙鏆傚瓨鍒楄〃',
 					url: '/pages/shengchanlingliao/table',
-					id: 11,
+					id: 15,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon31.png',
 					text: '鐢熶骇琛ユ枡鏍¢獙鏆傚瓨鍒楄〃',
 					url: '/pages/shengchanbuliaojiaoyan/CacheList',
-					id: 12,
+					id: 16,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon17.png',
 					text: '鐢熶骇鍏ュ簱鏍¢獙鏆傚瓨鍒楄〃',
 					url: '/pages/shengchanruku/table',
-					id: 13,
+					id: 17,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon32.png',
 					text: '鐢熶骇璋冩嫧鏍¢獙鏆傚瓨鍒楄〃',
 					url: '/pages/shengchandiaobo/table',
-					id: 14,
+					id: 18,
 					hidden: false,
 				},
 				
@@ -135,19 +145,28 @@
 					img: '../../static/icon/icon30.png',
 					text: '濮斿棰嗘枡鏆傚瓨鍒楄〃',
 					url: '/pages/weiwailingliao/table',
-					id: 15,
+					id: 19,
 					hidden: false,
 				}, {
+					id: 20,
+					hidden: false, 
+				},{
 					img: '../../static/icon/icon20.png',
 					text: '濮斿鍏ュ簱鏆傚瓨鍒楄〃',
 					url: '/pages/weiwairuku/table',
-					id: 16,
+					id: 21,
 					hidden: false,
 				}, {
+					id: 22,
+					hidden: false,
+				},{
 					img: '../../static/icon/icon30.png',
 					text: '濮斿棰嗘枡鏍¢獙鏆傚瓨鍒楄〃',
 					url: '/pages/weiwailingliaojiaoyan/table',
-					id: 17,
+					id: 23,
+					hidden: false,
+					url: '/pages/xiaoshouchukujiaoyan/table',
+					id: 24,
 					hidden: false,
 				},
 				
@@ -156,19 +175,22 @@
 					img: '../../static/icon/icon17.png',
 					text: '鍏朵粬鍏ュ簱鏆傚瓨鍒楄〃',
 					url: '/pages/qitaruku_v2/table',
-					id: 18,
+					id: 25,
 					hidden: false,
 				}, {
+					id: 26,
+					hidden: false,
+				},{
 					img: '../../static/icon/icon18.png',
 					text: '鍏朵粬鍑哄簱鏆傚瓨鍒楄〃',
 					url: '/pages/qitachuku_v2/table',
-					id: 19,
+					id: 27,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon18.png',
 					text: '鍏朵粬鍑哄簱鏍¢獙鏆傚瓨鍒楄〃',
 					url: '/pages/qitachuku/qitachuku',
-					id: 20,
+					id: 28,
 					hidden: false,
 				},
 				
@@ -177,7 +199,7 @@
 					img: '../../static/icon/icon32.png',
 					text: '鐩存帴璋冩嫧鏆傚瓨鍒楄〃',
 					url: '/pages/zhijiediaobo/table',
-					id: 21,
+					id: 29,
 					hidden: false,
 				},
 				
@@ -186,7 +208,7 @@
 					img: '../../static/icon/icon8.png',
 					text: '缁勬墭鍗曟殏瀛樺垪琛�',
 					url: `/pages/zutuosaoma/table`,
-					id: 22,
+					id: 30,
 					hidden: false,
 				},
 					// 鏍囩鏉$爜鐩稿叧锛堥潪鏆傚瓨鍒楄〃锛�
@@ -194,19 +216,19 @@
 					img: '../../static/icon/icon21.png',
 					text: '鏍囩鎵撳嵃',
 					url: '/pages/labelPrinter/index',
-					id: 23,
+					id: 31,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon21.png',
 					text: '鏉$爜鎷嗙爜',
 					url: '/pages/tiaomachaima/tiaomachaima',
-					id: 24,
+					id: 32,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon21.png',
 					text: '鏉$爜鎷嗙爜2',
 					url: '/pages/tiaomachaima/tiaomachaima2',
-					id: 25,
+					id: 33,
 					hidden: false,
 				},
 				// 璁惧鐩稿叧锛堥潪鏆傚瓨鍒楄〃锛�
@@ -214,40 +236,41 @@
 					img: '../../static/icon/icon3.png',
 					text: '璁惧淇濆吇璁板綍鍗�',
 					url: '/pages/baoyangjilu/table',
-					id: 26,
+					id: 34,
 					hidden: false,
+                
 				}, {
 					img: '../../static/icon/icon5.png',
 					text: '璁惧鐐规璁板綍鍗�',
 					url: '',
-					id: 27,
+					id: 35,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon6.png',
 					text: '璁惧鏁呴殰鐧昏琛�',
 					url: '/pages/guzhangdengji/table',
-					id: 28,
+					id: 36,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon7.png',
 					text: '璁惧缁翠慨璁板綍鍗�',
 					url: '/pages/shebeiweixiu/table',
-					id: 29,
+					id: 37,
 					hidden: false,
-				},
+				}, 
 				
 				// 寮傚父鐩稿叧锛堥潪鏆傚瓨鍒楄〃锛�
 				{
 					img: '../../static/icon/icon15.png',
 					text: '寮傚父鍙嶉鍗�',
 					url: '/pages/yichang/table',
-					id: 30,
+					id: 38,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon16.png',
 					text: '寮傚父鍙嶉澶勭悊鍗�',
 					url: '/pages/yichang/list',
-					id: 31,
+					id: 39,
 					hidden: false,
 				},
 				// 搴撳瓨鏌ヨ锛堥潪鏆傚瓨鍒楄〃锛�
@@ -255,63 +278,68 @@
 					img: '../../static/icon/icon18.png',
 					text: 'ERP鍙婃椂搴撳瓨鏌ヨ',
 					url: '/pages/jishikucunchaxun/table',
-					id: 32,
+					id: 40,
 					hidden: false,
 				},
 				
 				// 鍙栨牱杩樻牱锛堥潪鏆傚瓨鍒楄〃锛�
 				{
+					hidden: false,
+				},{
 					img: '../../static/icon/icon8.png',
 					text: '鍙栨牱鍗�',
 					url: '/pages/quyangdan/table',
-					id: 33,
+					id: 41,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon8.png',
 					text: '杩樻牱鍗�',
 					url: '/pages/huanyangdan/table',
-					id: 34,
+					id: 42,
 					hidden: false,
 				},
 				{
 					img: '../../static/icon/icon13.png',
 					text: '涓婃ā鍗�',					
 					url: '/pages/MJGL/shangmudan/table',
-					id: 35,
+					id: 43,
 					hidden: false,
 				}, {
 					img: '../../static/icon/icon13.png',
 					text: '涓嬫ā鍗�',					
 					url: '/pages/MJGL/xiamodan/table',
-					id: 36,
+					id: 44,
 					hidden: false,
 				},
                 {
+				}, {
                 	img: '../../static/icon/icon13.png',
                 	text: '鍣ㄥ叿鏁呴殰鐧昏',
                 	url: '/pages/qijvguzhangdengji/table',
-                	id: 37,
+                	id: 45,
                 	hidden: false,
                 },
                 {
+				}, {
                 	img: '../../static/icon/icon13.png',
                 	text: '鍣ㄥ叿鏁呴殰鐧昏鍗�',
                 	url: '/pages/qijvguzhangdengji/form?operationType=1',
-                	id: 38,
+                	id: 46,
                 	hidden: false,
                 },
                 {
+				}, {
                 	img: '../../static/icon/icon13.png',
                 	text: '缁翠慨璁板綍',
                 	url: '/pages/weixiujilu/table',
-                	id: 39,
+                	id: 47,
                 	hidden: false,
                 },
                 {
                 	img: '../../static/icon/icon13.png',
                 	text: '缁翠慨璁板綍鍗�',
                 	url: '/pages/weixiujilu/form',
-                	id: 40,
+                	id: 48,
                 	hidden: false,
                 },
                 {
@@ -340,6 +368,24 @@
 					id: 44,
 					hidden: false,
 				}
+                    img: '../../static/icon/icon8.png',
+                    text: '妯″叿棰嗘枡鍑哄簱鍗�',
+                    url: `/pages/MJGL/mujulingliaochukudan/table`,
+                    id: 49,
+                    hidden: false,
+                },{
+                    img: '../../static/icon/icon8.png',
+                    text: '妯″叿棰嗘枡閫�搴撳崟',
+                    url: `/pages/MJGL/mujulingliaotuikudan/table`,
+                    id: 50,
+                    hidden: false,
+                },{
+                    img: '../../static/icon/icon8.png',
+                    text: '鍣ㄥ叿璋冩嫧鍗�',
+                    url: `/pages/MJGL/qijudiaobodan/table`,
+                    id: 51,
+                    hidden: false,
+                }
 				]
 			}
 		},
diff --git a/pages/shoujishouming/form.vue b/pages/shoujishouming/form.vue
new file mode 100644
index 0000000..3cebf53
--- /dev/null
+++ b/pages/shoujishouming/form.vue
@@ -0,0 +1,733 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜</view>
+				<view class="right" style="width: 350rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" @blur="getCode(hform.HBarCode)"/>
+				</view>
+				<uni-icons type="scan"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20" @click="toScanCode"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title">鍗曟嵁鍙�:</view>
+				<view class="righton">
+					<input name="HBillNo" disabled v-model="hform.HBillNo" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍗曟嵁鏃ユ湡:</view>
+				<view class="right">
+					<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+						<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+					</picker>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>璋冩暣浜�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHDisplayName" placeholder="璇烽�夋嫨璋冩暣浜�" v-model="hform.HDisplayName" @input="HDisplayNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>璋冩暣鍘熷洜:</view>
+				<view class="right">
+					<input v-model="hform.HReason" placeholder="璋冩暣鍘熷洜" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>浣跨敤閮ㄩ棬:</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"><text>*</text>鎿嶄綔鍛�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName" @input="HEmpNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>璐熻矗浜�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="hform.HMangerName" @input="HManagerNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍣ㄥ叿缂栫爜:</view>
+				<view class="righton">
+					<input name="HMaterCode" v-model="hform.HMaterCode" disabled placeholder="璇疯緭鍏ュ櫒鍏风紪鐮�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍣ㄥ叿鍚嶇О:</view>
+				<view class="righton">
+					<input name="HMaterName" v-model="hform.HMaterName" disabled placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍣ㄥ叿鍨嬪彿:</view>
+				<view class="righton">
+					<input name="HMaterSpec" v-model="hform.HMaterSpec" disabled placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">妯℃不鍏疯鏍�::</view>
+				<view class="righton">
+					<input name="HModel" v-model="hform.HModel" disabled placeholder="璇疯緭鍏ヨ鏍�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">璁捐瀵垮懡:</view>
+				<view class="right">
+					<textarea name="HDesignLife"  v-model="hform.HDesignLife" auto-height placeholder="璇疯緭鍏ヨ璁″鍛�"></textarea>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍓╀綑瀵垮懡:</view>
+				<view class="right">
+					<textarea name="HLeaveLife"  v-model="hform.HLeaveLife" auto-height placeholder="璇疯緭鍏ュ墿浣欏鍛�"></textarea>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鏂板墿浣欏鍛�:</view>
+				<view class="right">
+					<textarea name="HNewLeaveLife"  v-model="hform.HNewLeaveLife" auto-height placeholder="璇疯緭鍏ュ墿浣欏鍛�"></textarea>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">澶囨敞:</view>
+				<view class="right">
+					<textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
+				</view>
+			</view>
+			
+			<view class="tab_area"></view>
+			
+			<view v-if="showmore">				
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" disabled/>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟鏃ユ湡:</view>
+					<view class="righton">
+						<input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled/>
+						<input v-else v-model="hform.HMakeDate" disabled/>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" disabled/>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled/>
+						<input v-else v-model="hform.HUpDateDate" disabled/>
+					</view>
+				</view>
+				<!-- <view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" disabled/>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃ユ湡:</view>
+					<view class="righton">
+						<input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled/>
+						<input v-else v-model="hform.HCheckDate" disabled/>
+					</view>
+				</view> -->
+			
+			</view>
+			<view class="other">
+				<view v-if="!showmore" @tap="showmore = true">
+					灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+				</view>
+				<view v-if="showmore" @tap="showmore = false">
+					鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+				</view>
+			</view>
+				
+			<view class="tab_area"></view>
+				
+			<view class="bottom-btn">
+				<button v-if="btnType == 1 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<button v-if="btnType != 1 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button>
+				<button v-if="btnType != 1 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>					
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+			</view>
+		</view>
+		
+	</view>
+</template>
+<script>
+	import getDateTime from '@/utils/getdateTime.js';
+	import { getUserInfo } from "@/utils/auth.js";
+    export default {
+        data() {
+            return {
+				userInfo:getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl')||'http://localhost:8082/LuBaoAPI/',
+				linterid:'',
+				HBillNo:'',
+				btnType:1,//1鏂板锛�3淇敼
+				showmore: false,
+				
+				arrayHDeptName:[],//閮ㄩ棬
+				HDeptNameList:[],
+				arrayHEmpName:[],//鍙戠幇浜�/璐熻矗浜�
+				arrayHDisplayName:[],//璋冩暣浜�
+				HEmpNameList:[],
+				HSourceNameList:[],
+				
+				
+				isEdit: false,
+				hform:{
+					HInterID:'',
+					HBillNo:'',
+					HDate:getDateTime.dateTimeStr('y-m-d'),
+					HBarCode:'',
+					HEmpName:'',
+					HEmpID:'',
+					HMangerName:'',
+					HMangerID:'',
+					HDisplayName:'',
+					HDisplayID:'',
+					HSourceName:'',
+					HSourceID:'',
+
+					HOrgID:uni.getStorageSync('OrganizationID'),
+					
+					HMaker:uni.getStorageSync('HUserName'),
+					HMakeDate:getDateTime.dateTimeStr('y-m-d'),
+					HUpDater:'',
+					HUpDateDate:'',		
+					HChecker:'',
+					HCheckDate:'',
+					HCloseMan:'',
+					HCloseDate:'',		
+					HDeleteMan:'',
+					HDeleteDate:'',
+					
+					eventType:'Add',
+					
+					//new
+					HMaterID:'',
+					HMaterCode:'',
+					HMaterName:'',
+					HMaterSpec:'',
+					HDesignLife:'',
+					HLeaveLife:'',
+					HDeptID:'',
+					HDeptName:'',
+					HGroupID:'',
+					HNewLeaveLife:'',
+					
+					HInnerBillNo:''
+				}
+            }
+        },
+		onLoad(e) {
+			
+			this.hform.HMaker = uni.getStorageSync('HUserName')
+			console.log(e,this.userInfo)
+			if(e.linterid){
+				this.btnType = 3
+				this.linterid = e.linterid
+				this.HBillNo = e.HBillNo
+				this.getEditData(e.linterid, e.HBillNo)
+			}else{
+				this.getNewData()
+			}
+	
+			this.getHDeptList()
+			this.getHEmpList()
+		},
+        methods: {
+			//鎵爜
+			toScanCode(){		
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval':'10', //瓒呮椂鏃堕棿
+					'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				},(ret) => {
+					console.log(ret.resp_result)
+					this.hform.HBarCode = ret.resp_result
+					this.getHBarCodeData(ret.resp_result)
+				})
+			},
+			//鏃ユ湡
+			HDateChange(e){
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},	
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList(){
+				uni.request({
+				    url: this.serverUrl + '/PublicPageMethod/DeptList', 
+					data: { sWhere: "where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync('OrganizationID') + "" },
+				    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].HName
+							}
+							this.$forceUpdate();
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								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].HName == e){
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+					}
+				}
+			},
+			//鎿嶄綔鍛樸�佽礋璐d汉
+			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.arrayHDisplayName[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'
+						})
+					},
+				});
+			},
+			//閫夋嫨鎿嶄綔鍛�
+			HEmpNameChange(e){
+				for(var i=0;i<this.HEmpNameList.length;i++){
+					if(this.HEmpNameList[i].HName == e){
+						this.hform.HEmpID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨璐熻矗浜�
+			HManagerNameChange(e){
+				for(var i=0;i<this.HEmpNameList.length;i++){
+					if(this.HEmpNameList[i].HName == e){
+						this.hform.HMangerID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			HDisplayNameChange(e){
+				for(var i=0;i<this.HEmpNameList.length;i++){
+					if(this.HEmpNameList[i].HName == e){
+						this.hform.HDisplayID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			ifEdit(){
+				this.isEdit = true
+				this.hform.eventType = 'Modify'
+			},
+			//缂栬緫鍥炴樉
+			getEditData(linterid,HBillNo){				
+				//涓昏〃
+				console.log(linterid)
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldLifeChangeBill/Sc_GetMouldLifeChangeBillListCheckDetai', 
+					data: { HID: linterid },
+				    success: (res) => {
+				        console.log(1,res.data.data.h_v_Sc_MouldLifeChangeBillList_Edit[0]);
+						var data = res.data.data.h_v_Sc_MouldLifeChangeBillList_Edit[0];
+						console.log(1,data);
+						if(res.data.code == 1){				
+							this.btnType=3
+							this.hform.HInterID= data.hmainid
+							this.hform.HBillNo= data.鍗曟嵁鍙�
+							this.hform.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
+							this.hform.HReason= data.璋冩暣鍘熷洜
+							this.hform.HDeptID= data.HDeptID
+							this.hform.HDeptName= data.閮ㄩ棬
+							this.hform.HEmpID= data.HEmpID
+							this.hform.HEmpName= data.璋冩暣浜�
+							
+							this.hform.HDisplayName= data.璋冩暣浜�
+							this.hform.HMangerID= data.HMangerID
+							this.hform.HMangerName= data.璐熻矗浜�
+							this.hform.HRemark= data.澶囨敞						
+							this.hform.HDate = data.鏃ユ湡.substr(0,10)				
+													
+							this.hform.HMaterID=data.HMaterID,
+							this.hform.HMaterCode=data.妯″叿浠g爜,
+							this.hform.HMouldName=data.妯″叿,
+							this.hform.HMaterSpec=data.瑙勬牸鍨嬪彿
+							this.hform.HDesignLife=data.璁捐瀵垮懡
+							this.hform.HLeaveLife=data.鍘熷墿浣欏鍛�
+							
+							this.hform.HOrgID=data.HOrgID,
+																				
+							this.hform.HMaker= data.鍒跺崟浜�
+							this.hform.HMakeDate= data.鍒跺崟鏃ユ湡
+							this.hform.HUpDater= data.淇敼浜�
+							this.hform.HUpDateDate= data.淇敼鏃ユ湡
+							this.hform.HChecker= data.瀹℃牳浜�
+							this.hform.HCheckDate= data.瀹℃牳鏃ユ湡							
+							this.hform.HDeleteMan= data.浣滃簾浜�
+							this.hform.HDeleteDate= data.浣滃簾鏃ユ湡
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});				
+			},
+			//鏂板
+			getNewData(){
+				uni.request({
+				    url: this.serverUrl + '/Web/GetMAXNum', 
+					data: { HBillType: '3846' },
+				    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.btnType=1
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						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 sDisplayName = this.hform.HDisplayName
+				var sDisplayID = this.hform.HDisplayID
+				
+				//
+				var sOldBarCode = HBarCode; 
+				var HDeleteFlag = sOldBarCode.substring(0, 1); //鍙栨潯鐮佺涓�涓瓧绗�
+				var sBarCode = sOldBarCode.slice(1); //鑾峰彇绗竴涓瓧绗︿互澶栫殑鍏ㄩ儴瀛楃
+				var sSourceBillNo =""
+				var sSourceBillType ="-1" 
+				if (HDeleteFlag == '*') {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						});
+					} else {
+						uni.request({
+							url: this.serverUrl + '/MouldController/set_DelMouldStockBillMain_Temp_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.hform.HQty = ''
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}else
+				{
+					
+					var sBarCode = this.hform.HBarCode
+					var sWhere = " and 鏉$爜缂栧彿='" + sBarCode + "'";
+					uni.request({
+						url: this.serverUrl + '/Gy_Mould/list1',
+						data:{
+							sWhere:sWhere,
+							ModRightNameSelect:"Gy_MouldTypeList",
+							user: uni.getStorageSync('HUserName')
+						},
+						success:(res)=> {
+							console.log('妫�鏌ユ壂鐮佽繑鍥炵殑鏁版嵁', res.data);
+							this.hform.HBarCode=''
+							if(res.data.count==1){
+								this.tabs = 1
+								var LoadData = res.data.data;
+								this.hform.HMaterID=LoadData[0].hmainid
+								this.hform.HMaterCode=LoadData[0].鏉$爜缂栧彿
+								this.hform.HMaterName=LoadData[0].妯″叿鍚嶇О
+								this.hform.HMaterSpec=LoadData[0].妯″叿鍨嬪彿
+								this.hform.HModel=LoadData[0].褰撳墠妯″叿瑙勬牸
+								this.hform.HDesignLife=LoadData[0].鍒濆璁捐瀵垮懡
+								this.hform.HLeaveLife=LoadData[0].鍓╀綑瀵垮懡
+								this.hform.HDeptID=LoadData[0].HDeptID
+								this.hform.HDeptName=LoadData[0].浣跨敤閮ㄩ棬
+							}
+							else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					})
+				}
+			}, 
+            submit() {
+				var refSav = "";
+				// if (OperationType == 1) {
+				//     refSav = "Add";
+				// } else {
+				//     refSav = "Update";
+				// }
+    //         	if(!this.hform.HBarCode){
+    //         		uni.showToast({
+    //         			title:'璇锋壂鎻忔潯褰㈢爜',
+    //         			icon:'none'
+    //         		})}
+				  if(!this.hform.HDeptID){
+					uni.showToast({
+						title:'璇烽�夋嫨閮ㄩ棬',
+						icon:'none'
+					})
+				}else if(!this.hform.HEmpName){
+					uni.showToast({
+						title:'璋冩暣浜烘湭閫夋嫨',
+						icon:'none'
+					})
+            	}else if(!this.hform.HMangerID){
+					uni.showToast({
+						title:'璐熻矗浜烘湭閫夋嫨',
+						icon:'none'
+					})
+            	}
+				
+				else{
+            		uni.showLoading({
+            			title:'璇风◢鍊�'
+            		})
+					 var numData = [{ "HMaterID": this.hform.HMaterID, "HPropertyID": 0, "HSecUnitID": 0, "HSecUnitRate": 0, "HDeptID": this.hform.HDeptID, "HUnitID": 0, "HDesignLife": this.hform.HDesignLife, "HLeaveLife": this.hform.HLeaveLife, "HNewLeaveLife":this.hform.HNewLeaveLife }]
+					var sMainStr = JSON.stringify(this.hform);
+					var sSubStr = JSON.stringify(numData);
+					var sMainSub = sMainStr + ";" + sSubStr+";"+uni.getStorageSync('HUserName');
+            		console.log(sMainSub);
+            		uni.request({
+            		    url: this.serverUrl + '/Sc_MouldLifeChangeBill/SaveGetMouldLifeChangeBillList',
+            			method:'POST',
+            			dataType:"json",
+            			data:{ msg: sMainSub },
+            		    success: (res) => {
+            		        console.log(1,res);
+							uni.hideLoading()
+            				if(res.data.count == 1){
+								let pages = getCurrentPages();
+								let prePage = pages[pages.length - 2]; 
+								prePage.$vm.getList()
+								if(this.isEdit){
+									setTimeout(()=>{
+										uni.redirectTo({
+											url:'/pages/weiwaigxIn/form?linterid=' + this.linterid + '&HBillNo=' + this.linterid
+										})
+									},1000)
+								}else{
+									setTimeout(()=>{
+										uni.navigateBack()
+									},1000)
+								}
+            				}
+            				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()
+				        } else if (res.cancel) {
+				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+				        }
+				    }
+				});
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+	.form{
+		width: 668rpx;
+		margin: 20rpx auto;
+		padding-bottom: 240rpx;
+	}
+	.tab_area{
+		width: 100%;
+		height: 50rpx;
+	}
+	.other{
+		margin-top: 8rpx;
+		text-align: center;
+		font-size: 28rpx;
+		padding: 4rpx 18rpx;
+		color: #1890FF;
+	}
+    .form-item{
+		display: flex;
+		align-items: center;
+		font-size: 30rpx;
+		padding: 6rpx 0;
+		.title{
+			width: 208rpx;
+			text{
+				color: red;
+				font-weight: bold;
+			}
+		}
+		.right{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+		.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;
+		}
+
+	}
+	.bottom-btn{
+		width: 100%;
+		// height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+		padding: 30rpx 40rpx 40rpx 40rpx;
+		button{
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+		.btn-a{
+			background-color: #3A78FF;
+			color: #fff;
+		}
+		.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;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shoujishouming/table.vue b/pages/shoujishouming/table.vue
new file mode 100644
index 0000000..60318fa
--- /dev/null
+++ b/pages/shoujishouming/table.vue
@@ -0,0 +1,485 @@
+<template>
+	<view class="content">
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鍗曟嵁鍙�:</view>
+				<view class="right">
+					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍒跺崟浜�:</view>
+				<view class="right">
+					<input v-model="hform.HCreateBy" placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">寮�濮嬫椂闂�:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.BenginHCreateDate" @change="BenginHCreateDateChange">
+						<input name="BenginHCreateDate" disabled :value="hform.BenginHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">缁撴潫鏃堕棿:</view>
+				<view class="right">
+					<picker mode="date" :value="hform.EndHCreateDate" @change="EndHCreateDateChange">
+						<input name="EndHCreateDate" disabled :value="hform.EndHCreateDate" placeholder="璇烽�夋嫨" />
+					</picker>
+				</view>
+			</view>
+			
+			<view class="buttons">
+				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+				<button class="btn-b" size="mini" type="default" @tap="creat">鏂板</button>
+				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+			</view>
+		</view>
+		
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+		
+		<view class="list" v-for="(item,index) in showList" :key="index">
+			<uni-card :title="item.鍗曟嵁鍙�"  style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鍗曟嵁绫诲瀷">
+						<text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
+					</view>
+					<view class="detail" v-if="item.妯″叿">
+						<text>妯″叿锛�</text>{{item.妯″叿}}
+					</view>
+					<view class="detail" v-if="item.璋冩暣浜�">
+						<text>璋冩暣浜猴細</text>{{item.璋冩暣浜簘}
+					</view>
+					<view class="detail" v-if="item.璐熻矗浜�">
+						<text>璐熻矗浜猴細</text>{{item.璐熻矗浜簘}
+					</view>
+					<view class="detail" v-if="item.閮ㄩ棬">
+						<text>閮ㄩ棬锛�</text>{{item.閮ㄩ棬}}
+					</view>
+					<view class="detail" v-if="item.璋冩暣鍘熷洜">
+						<text>璋冩暣鍘熷洜锛�</text>{{item.璋冩暣鍘熷洜}}
+					</view>
+					<view class="detail" v-if="item.鍐呴儴鍗曟嵁鍙�">
+						<text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.鍐呴儴鍗曟嵁鍙穧}
+					</view>
+					<view class="detail" v-if="item.鍘熷墿浣欏鍛�">
+						<text>鍘熷墿浣欏鍛斤細</text>{{item.鍘熷墿浣欏鍛絵}
+					</view>
+					<view class="detail" v-if="item.鏂板墿浣欏鍛�">
+						<text>鏂板墿浣欏鍛斤細</text>{{item.鏂板墿浣欏鍛絵}
+					</view>
+					<view class="detail" v-if="item.寮�濮嬫棩鏈�">
+						<text>寮�濮嬫棩鏈燂細</text>{{item.寮�濮嬫棩鏈�.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.缁撴潫鏃ユ湡">
+						<text>缁撴潫鏃ユ湡锛�</text>{{item.缁撴潫鏃ユ湡.substr(0,10)}}
+					</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>
+				<view class="card-detail" v-if="showDetail == index">
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+						<text>鍒跺崟鏃ユ湡锛�</text>{{item.鍒跺崟鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.瀹℃牳浜�">
+						<text>瀹℃牳浜猴細</text>{{item.瀹℃牳浜簘}
+					</view>
+					<view class="detail" v-if="item.瀹℃牳鏃ユ湡">
+						<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.淇敼浜�">
+						<text>淇敼浜猴細</text>{{item.淇敼浜簘}
+					</view>
+					<view class="detail" v-if="item.淇敼鏃ユ湡">
+						<text>淇敼鏃ユ湡锛�</text>{{item.淇敼鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.鍏抽棴浜�">
+						<text>鍏抽棴浜猴細</text>{{item.鍏抽棴浜簘}
+					</view>
+					<view class="detail" v-if="item.鍏抽棴鏃ユ湡">
+						<text>鍏抽棴鏃ユ湡锛�</text>{{item.鍏抽棴鏃ユ湡.substr(0,10)}}
+					</view>
+					<view class="detail" v-if="item.浣滃簾浜�">
+						<text>浣滃簾浜猴細</text>{{item.浣滃簾浜簘}
+					</view>
+					<view class="detail" v-if="item.浣滃簾鏃ユ湡">
+						<text>浣滃簾鏃ユ湡锛�</text>{{item.浣滃簾鏃ユ湡.substr(0,10)}}
+					</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.hbilltype">
+						<text>hbilltype锛�</text>{{item.hbilltype}}
+					</view>
+					<view class="detail" v-if="item.鎽樿">
+						<text>鎽樿锛�</text>{{item.鎽樿}}
+					</view>
+				</view>
+				
+				<view class="more" v-if="showDetail == index && operations != index">
+					<view class="part" style="border-right: 1px solid #eee;">
+						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+					</view>
+					<view class="part" @tap.stop="operations = operations==index?-1:index">
+						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+					</view>
+				</view>
+				<view class="more" v-if="showDetail != index && operations != index">
+					<view class="part" style="border-right: 1px solid #eee;">
+						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+					</view>
+					<view class="part" @tap.stop="operations = operations==index?-1:index">
+						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+					</view>
+				</view>
+				
+				<view class="op" v-if="operations == index">
+<!-- 					<button class="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button> -->
+					<!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
+					<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
+					<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+					<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+				</view>
+			</uni-card>
+		</view>
+		
+		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+	</view>
+</template>
+
+<script>
+	import { getUserInfo } from "@/utils/auth.js";
+	export default {
+	    data() {
+	        return {
+				userInfo:getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl')||'http://localhost:8082/LuBaoAPI',
+				hform:{
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				operations:-1,
+				
+				page:1,
+				size:100
+	        }
+	    },
+		onLoad() {
+			this.getList()
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(()=>{
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+	    methods: {
+			getPage(page,list){
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex,eindex)
+				return newList
+			},
+			getList(){
+				console.log(this.sWhere)
+				uni.showLoading({
+					title:'鍔犺浇涓�...'
+				})
+				uni.request({
+				    url: this.serverUrl + '/Sc_MouldLifeChangeBill/page',
+					data:{ 
+						sWhere: this.sWhere,
+						user: uni.getStorageSync('HUserName'),
+						page:1,
+						size:100
+					},
+				    success: (res) => {
+				        console.log(1,res);
+						if(res.data.count >0){
+							this.listData = res.data.data
+							this.showList = this.getPage(this.page,this.listData)
+							setTimeout(()=>{
+							     uni.hideLoading()
+							}, 1000)
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.hideLoading()
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			BenginHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.BenginHCreateDate = e.detail.value
+			},
+			//閫夋嫨鍗曟嵁鏃ユ湡
+			EndHCreateDateChange(e){
+				console.log(e.detail.value)
+				this.hform.EndHCreateDate = e.detail.value
+			},
+			search(){
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				console.log(this.hform)
+				if (this.hform.HBillNo) {
+				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				}
+				if (this.hform.HCreateBy) {
+				    this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+				}
+				if (this.hform.BenginHCreateDate) {
+				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+				}
+				if (this.hform.EndHCreateDate) {
+				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.hform.EndHCreateDate + "'";
+				}
+				
+				this.getList()
+			},
+			creat(){
+				uni.navigateTo({
+					url:'/pages/shoujishouming/form'
+				})
+			},
+			clear(){
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				this.sWhere = ''
+				this.showDetail = -1,
+				this.operations = -1,
+				this.hform = {
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				}
+				this.getList()
+			},
+			toSon(item){
+				uni.navigateTo({
+					url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid 
+					+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О 
+					+ '&璁惧浠g爜=' + item.璁惧浠g爜,
+				})
+			},
+			
+			//缂栬緫
+			edit(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: '/pages/shoujishouming/form?linterid=' + item.hmainid + '&HBillNo=' + item.鍗曟嵁鍙�
+				})
+			},
+			//鍒犻櫎
+			del(item){
+				console.log(item)
+				uni.showModal({
+				    title: '鎻愮ず',
+				    content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+				    success: (res) => {
+				        if (res.confirm) {
+				            console.log('鐢ㄦ埛鐐瑰嚮纭畾',);
+							uni.request({
+							    url: this.serverUrl + '/Sc_MouldLifeChangeBill/DeltetMouldLifeChangeBill',
+								data:{ 
+									HInterID: item.hmainid,
+									user: uni.getStorageSync('HUserName')
+								},
+							    success: (res) => {
+							        console.log(1,res);
+									if(res.data.count == 1){
+										this.clear()
+									}
+									uni.showToast({
+										title:res.data.Message,
+										icon:'none'
+									})
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.showToast({
+										title:'鎺ュ彛璇锋眰澶辫触',
+										icon:'none'
+									})
+								},
+							});
+				        } else if (res.cancel) {
+				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+				        }
+				    }
+				});
+			},
+	    }
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form{
+		width: 640rpx;
+		margin: 20rpx auto;
+	}
+    .form-item{
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+		.title{
+			width: 180rpx;
+			text{
+				color: red;
+				font-weight: bold;
+			}
+		}
+		.right{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+		.righton{
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+		input{
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+	.buttons{
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+		button{
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+		.btn-a{
+			background-color: #acacac;
+			color: #fff;
+		}
+		.btn-b{
+			background-color: #41a863;
+			color: #fff;
+		}
+		.btn-c{
+			background-color: #3a78ff;
+			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;
+			}
+		}
+		.op{
+			display: flex;
+			justify-content: space-around;
+			margin-top: 20rpx;
+			button{
+				padding: 0;
+				width: 130rpx;
+				font-size: 25rpx;
+			}
+			.op1{
+				border: 1px solid #41a863;
+				color: #41a863;
+			}
+			.op2{
+				border: 1px solid #d98d00;
+				color: #d98d00;
+			}
+			.op3{
+				border: 1px solid #3a78ff;
+				color: #3a78ff;
+			}
+			.op4{
+				border: 1px solid #da0000;
+				color: #da0000;
+			}
+			.op5{
+				border: 1px solid #888;
+				color: #888;
+			}
+		}
+	}
+
+</style>

--
Gitblit v1.9.1