From 5a25b5074d9803a83ff8049daa6d3c3c6ebdf099 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期二, 15 七月 2025 15:25:46 +0800
Subject: [PATCH] 1

---
 pages/shengchanruku/table.vue       |  495 +++++
 static/icon/icon30.png              |    0 
 pages.json                          |   42 
 static/icon/icon32.png              |    0 
 pages/shengchandiaobo/table.vue     |  495 +++++
 static/icon/icon_a30.png            |    0 
 README.md                           |    9 
 pages/shengchanlingliao/form.vue    |  898 +++++++++
 pages/shengchanruku/form.vue        | 1309 ++++++++++++++
 static/images/newVer.png            |    0 
 static/icon/icon31.png              |    0 
 static/icon/icon_a32.png            |    0 
 static/icon/icon_a31.png            |    0 
 pages/shengchandiaobo/form.vue      | 1309 ++++++++++++++
 pages/shouliaotongzhi/table_son.vue |  389 ++-
 pages/shengchanlingliao/table.vue   |  497 +++++
 pages/index/index.vue               |   15 
 17 files changed, 5,268 insertions(+), 190 deletions(-)

diff --git a/README.md b/README.md
index 563d394..fc97442 100644
--- a/README.md
+++ b/README.md
@@ -22,13 +22,4 @@
 娣诲姞鍔熻兘妯″潡锛氳嚜鍔ㄦ洿鏂帮紝鎵撳嵃鏉$爜
 娴嬭瘯鏁版嵁锛氭敹鏂欓�氱煡鍗�(CGSL000145)
 
-###git閰嶇疆(鎴戣嚜宸辩殑)
-[user]
-	name = qq_41295110
-	email = qq_41295110@noreply.gitcode.com
-  signingkey = admin
-[credential]
-    helper = store
-[credential "https://gitcode.com"]
-	provider = generic
 	
\ No newline at end of file
diff --git a/pages.json b/pages.json
index d042fc4..2166b6f 100644
--- a/pages.json
+++ b/pages.json
@@ -330,6 +330,48 @@
 			}
 		},
 		{
+			"path": "pages/shengchanlingliao/table",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇棰嗘枡鏍¢獙鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanlingliao/form",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shengchanruku/table",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱鏍¢獙鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanruku/form",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/shengchandiaobo/table",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇璋冩嫧鏍¢獙鍒楄〃",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchandiaobo/form",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
 					"path": "pages/labelPrinter/index",
 					"style": {
 						"navigationBarTitleText": "鏍囩鎵撳嵃"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e48560c..4ef178c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -127,6 +127,21 @@
 						text: '鏀舵枡閫氱煡鍗�',
 						url: '/pages/shouliaotongzhi/table',
 						id: 21,
+					},{
+						img: '../../static/icon/icon30.png',
+						text: '鐢熶骇棰嗘枡鏍¢獙',
+						url: '/pages/shengchanlingliao/table',
+						id: 30,
+					},{
+						img: '../../static/icon/icon31.png',
+						text: '鐢熶骇鍏ュ簱鏍¢獙',
+						url: '/pages/shengchanruku/table',
+						id: 31,
+					},{
+						img: '../../static/icon/icon32.png',
+						text: '鐢熶骇璋冩嫧鏍¢獙',
+						url: '/pages/shengchandiaobo/table',
+						id: 32,
 					},
 					{
 						img: '../../static/icon/icon16.png',
diff --git a/pages/shengchandiaobo/form.vue b/pages/shengchandiaobo/form.vue
new file mode 100644
index 0000000..32f4181
--- /dev/null
+++ b/pages/shengchandiaobo/form.vue
@@ -0,0 +1,1309 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜:</view>
+				<view class="right" style="width: 380rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)"/>
+				</view>
+				<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title">鏁伴噺:</view>
+				<view class="right">
+					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�"/>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撳簱:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName" @input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName" placeholder="涓嶅彲鎿嶄綔"/></view>
+			</view>
+			
+			<view 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="璇烽�夋嫨婧愬崟绫诲瀷" />
+						</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>
+					</view>
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ュ師鍗曞崟鍙�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍏堣繘鍏堝嚭浠�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName" @input="HFIFOWHNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</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="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" v-show="!showHSupName">
+						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁勭粐:</view>
+					<view class="righton">
+						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+					</view>
+				</view>
+			</view>
+			
+			<view v-if="tabs == 2">
+				<view class="list" v-for="(item,index) in Materlist" :key="index">
+					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
+						<view class="card-detail">
+							<view class="detail">
+								<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+							</view>
+							<view class="detail">
+								<text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
+							</view>
+							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+							</view>
+							<view class="detail" v-if="item.杈呭姪灞炴��">
+								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
+			
+			<view v-if="tabs == 4">
+				<view class="list" v-for="(item,index) in FIFOlist" :key="index">
+					<uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;" @tap="delMater(item)">
+						<view class="card-detail">
+							<view class="detail">
+								<text>鏁伴噺锛�</text>{{item.HQty}}
+							</view>
+							<view class="detail">
+								<text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
+							</view>
+							<view class="detail">
+								<text>浠撳簱锛�</text>{{item.HWhName}}
+							</view>
+							<view class="detail">
+								<text>浠撲綅锛�</text>{{item.HSPName}}
+							</view>
+							<view class="detail">
+								<text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
+							</view>
+							<view class="detail" v-if="item.HBatchNo">
+								<text>鎵瑰彿锛�</text>{{item.HBatchNo}}
+							</view>
+							<view class="detail" v-if="item.HAuxPropName">
+								<text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
+			
+			<view v-if="tabs == 3">
+				<view class="form-item">
+					<view class="title">鏉$爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐗╂枡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMaterName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瑙勬牸:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMaterModel_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎵规:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBatchNo_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曚綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HUnitName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏁伴噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HQty_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹归噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HTMQty_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浠撳簱:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HWHName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浠撲綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HSPName_B" />
+					</view>
+				</view>
+			</view>
+
+			<view 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";
+    export default {
+        data() {
+            return {
+				userInfo:getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+				HModName:'Kf_SellOutBill_PDA',
+				ModRightName:'CE_SellOut',
+				OperationType: 1,
+				HInterID_Temp:'',
+				
+				showHStockPlaceName:true,
+				showHMainSourceBillType:true,
+				showHSourceBillNo:true,
+				reHSourceBillNo:true,
+				showHSupName:true,
+				
+				tabs:0,
+				HMainSourceBillType:'鍙戣揣閫氱煡鍗�',
+				arrayHMainSourceBillType:['鍙戣揣閫氱煡鍗�','閿�鍞鍗�','鎵嬪伐褰曞叆'],
+				
+				linterid:'',
+				HBillNo:'',
+				btnType:0,//0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+				showmore: false,
+				
+				arrayHWHName:[],//浠撳簱
+				HWHNameList:[],
+				arrayHStockPlaceName:[],//浠撲綅
+				HStockPlaceNameList:[],
+				arrayHSourceBillNo:[],//鍘熷崟鍗曞彿
+				HSourceBillNoList:[],
+				
+				arrayHEmpName:[],//鎿嶄綔鍛�
+				HEmpNameList:[],
+				arrayHDeptName:[],//閮ㄩ棬
+				HDeptNameList:[],
+				arrayHSupName:[],//瀹㈡埛
+				HSupNameList:[],
+				
+				Materlist:[],
+				FIFOlist:[],
+				hform:{
+					HBillType:1205,
+					HBillerID:uni.getStorageSync('HBillerID'),
+					HRedBlueFlag:false,
+					
+					HBarCode:'',
+					HQty:'',
+					HWHName:getUserInfo().HWHName,
+					HWHID:getUserInfo().HWhID,
+					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:'',
+					HStockOrgName:uni.getStorageSync('Organization'),
+					HStockOrgID:uni.getStorageSync('OrganizationID'),
+
+					HBarCode_B:'',
+					HMaterName_B:'',
+					HMaterModel_B:'',
+					HBatchNo_B:'',
+					HUnitName_B:'',
+					HQty_B:'',
+					HTMQty_B:'',
+					HWHName_B:'',
+					HSPName_B:'',
+				}
+            }
+        },
+		onLoad(e) {
+			console.log(e,this.userInfo)
+			this.OperationType = e.OperationType
+			if(e.HInterID){
+				this.HInterID_Temp = e.HInterID
+				// this.btnType = 1
+				this.RoadBillMain(e.HInterID)
+			}else{
+				this.getNewData()
+			}
+			this.getHBaseList()
+			this.getHSupList()
+			this.getHEmpList()
+			this.getHDeptList()
+		},
+        methods: {
+			//鎵爜
+			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)
+				    }
+				});
+			},
+			//鎵叾浠�(浠撳簱锛屼粨浣�)
+			// toScanData(e){
+			// 	uni.scanCode({
+			// 	    onlyFromCamera: true,
+			// 	    success: (res) => {
+			// 	        console.log('鏉$爜鍐呭锛�' + res.result);
+			// 			var code = res.result
+			// 			if(e == 1){
+			// 				uni.request({
+			// 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
+			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
+			// 					success: (res) => {
+			// 						this.hform.HStockPlaceID = 0
+			// 						this.hform.HStockPlaceName = ''
+			// 						this.showHStockPlaceName = true
+			// 						if(res.data.count == 1){
+			// 							var data = res.data.data[0]
+			// 							this.hform.HWHID = data.HItemID
+			// 							this.hform.HWHName = data.HName
+			// 							if (data.HSPFlag == 0) {
+			// 							    this.showHStockPlaceName = false
+			// 							}
+			// 						}else{
+			// 							this.hform.HWHID = 0
+			// 							this.hform.HWHName = ''
+			// 							uni.showToast({
+			// 								title:res.data.Message,
+			// 								icon:'none'
+			// 							})
+			// 						}
+			// 					},
+			// 					fail: (res) => {
+			// 						console.log(res);
+			// 						uni.showToast({
+			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+			// 							icon:'none'
+			// 						})
+			// 					},
+			// 				});
+			// 			}else if(e == 2){
+			// 				uni.request({
+			// 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
+			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
+			// 					success: (res) => {
+			// 						if(res.data.count == 1){
+			// 							var data = res.data.data[0]
+			// 							this.hform.HWHID = data.HWHID
+			// 							this.hform.HWHName = data.HWhName
+			// 							this.hform.HStockPlaceID = data.HItemID
+			// 							this.hform.HStockPlaceName = data.HName
+			// 						}else{
+			// 							this.hform.HWHID = 0
+			// 							this.hform.HWHName = ''
+			// 							this.hform.HStockPlaceID = 0
+			// 							this.hform.HStockPlaceName = ''
+			// 							uni.showToast({
+			// 								title:res.data.Message,
+			// 								icon:'none'
+			// 							})
+			// 						}
+			// 					},
+			// 					fail: (res) => {
+			// 						console.log(res);
+			// 						uni.showToast({
+			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+			// 							icon:'none'
+			// 						})
+			// 					},
+			// 				});
+			// 			}
+			// 	    }
+			// 	});
+			// },
+			//鏃ユ湡
+			HDateChange(e){
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			//鍩虹浠撳簱璧勬枡
+			getHBaseList(){
+				uni.request({
+					url: this.serverUrl + '/Gy_Warehouse/list', 
+					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
+					success: (res) => {
+						if(res.data.count == 1){
+							this.HWHNameList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+							}
+						}else{
+							uni.showToast({
+								title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+				
+				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()
+			},
+			//婧愬崟璧勬枡
+			getHYDList(){
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetSourceBillList_Json', 
+					data: {HBillType:this.hform.HBillType,HSourceBillType:this.hform.HMainSourceBillType,HStockOrgID:this.hform.HStockOrgID,HSourceBillNo:"",HMater:"",HCustom:""},
+					success: (res) => {
+						if(res.data.count == 1){
+							this.HSourceBillNoList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
+							}
+							this.reHSourceBillNo = false
+							this.$nextTick(()=>{
+								this.reHSourceBillNo = true
+							})
+						}else{
+							uni.showToast({
+								title:'婧愬崟鏁版嵁璇锋眰澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨浠撳簱
+			HWHNameChange(e){
+				// var name = e.split("(")
+				for(var i=0;i<this.HWHNameList.length;i++){
+					if(this.HWHNameList[i].浠撳簱鍚嶇О == e){
+						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+					}
+				}
+			},
+			HFIFOWHNameChange(e){
+				for(var i=0;i<this.HWHNameList.length;i++){
+					if(this.HWHNameList[i].浠撳簱鍚嶇О == e){
+						this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+						this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨浠撲綅
+			HStockPlaceNameChange(e){
+				for(var i=0;i<this.HStockPlaceNameList.length;i++){
+					if(this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e){
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨婧愬崟
+			HSourceBillNoChange(e){
+				this.hform.HSourceBillNo = e						
+				this.getHBarCodeData(e)
+				// for(var i=0;i<this.HSourceBillNoList.length;i++){
+				// 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
+				// 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
+				// 	}
+				// }
+			},
+			//閫夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e){
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+				if(this.HMainSourceBillType == '鍙戣揣閫氱煡鍗�'){
+					this.hform.HMainSourceBillType = 1402
+					this.getHYDList()
+				}else if(this.HMainSourceBillType == '閿�鍞鍗�'){
+					this.hform.HMainSourceBillType = 1401
+					this.getHYDList()
+				}else{
+					this.hform.HMainSourceBillType = -1
+					this.getHYDList()
+				}
+			},
+			
+			//鑾峰彇瀹㈡埛鏁版嵁
+			getHSupList(){
+				uni.request({
+				    url: this.serverUrl + '/Gy_Customer/list', 
+					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
+				    success: (res) => {
+						if(res.data.count == 1){
+							this.HSupNameList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHSupName[i] = res.data.data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'瀹㈡埛鏁版嵁璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨瀹㈡埛
+			HSupNameChange(e){
+				for(var i=0;i<this.HSupNameList.length;i++){
+					if(this.HSupNameList[i].瀹㈡埛鍚嶇О == e){
+						this.hform.HSupID = this.HSupNameList[i].HItemID
+						this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+					}
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList(){
+				uni.request({
+				    url: this.serverUrl + '/Gy_Department/list', 
+					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
+				    success: (res) => {
+						if(res.data.count == 1){
+							this.HDeptNameList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						}else{
+							uni.showToast({
+								title:'閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e){
+				for(var i=0;i<this.HDeptNameList.length;i++){
+					if(this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e){
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			//鎿嶄綔鍛�
+			getHEmpList(){
+				uni.request({
+					url: this.serverUrl + '/Web/GetEmployeeList_Json', 
+					data: { Employee: '',HGroupID:0 },
+					success: (res) => {
+						if(res.data.count == 1){
+							this.HEmpNameList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						}else{
+							uni.showToast({
+								title:'浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//淇濈
+			HKeeperNameChange(e){
+				for(var i=0;i<this.HEmpNameList.length;i++){
+					if(this.HEmpNameList[i].HName == e){
+						console.log(this.HEmpNameList[i])
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+						this.hform.HKeeperName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			//楠屾敹
+			HSecManagerNameChange(e){
+				for(var i=0;i<this.HEmpNameList.length;i++){
+					if(this.HEmpNameList[i].HName == e){
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+						this.hform.HSecManagerName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			//閫変腑婧愬崟
+			getHBarCodeData(HBarCode){
+				if(!this.hform.HFIFOWHName){
+					this.hform.HFIFOWHID = 0
+				}
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/get_SourceBarCode_SellOut_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, },
+				    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.DisBillEntryList()
+						}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 sOldBarCode = HBarCode
+				var HDeleteFlag = sOldBarCode.substring(0, 1);
+				var sBarCode = sOldBarCode.slice(1);
+
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sHQty = this.hform.HQty
+				var sSourceBillNo = this.hform.HSourceBillNo
+				var sSourceBillType = this.hform.HMainSourceBillType
+				var HSourceFlag = this.hform.HSourceBillNo==''?false:true
+				console.log(this.hform.HSourceBillNo,HSourceFlag)
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        uni.showToast({
+                        	title:'璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+							icon:'none'
+                        })
+                    }else{
+						uni.request({
+						    url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json', 
+							data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HBarCode: sBarCode },
+						    success: (res) => {
+						        console.log('鍒犻櫎鏉$爜',res.data);
+								this.hform.HBarCode = ''
+								if(res.data.count == 1){
+									this.hform.HQty = ''
+									this.DisBillEntryList()
+								}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
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+					uni.request({
+					    url: this.serverUrl + '/WEBSController/Get_BarCode_Json', 
+						data: { sBarCode: sBarCode, HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HBillNo: this.hform.HBillNo, HMaker: this.hform.HMaker, HWhID: sHWHID, HSPID: sHSPID, HQty: sHQty, HRedBlueFlag: this.hform.HRedBlueFlag, SourceFlag: HSourceFlag, HSourceBillNo: sSourceBillNo, HSourceBillType: sSourceBillType, HStockOrgID: this.hform.HStockOrgID, HScanStyle: "", HCustom1: "", HCustom2: "" },
+					    success: (res) => {
+					        console.log('鎵爜杩斿洖',res.data);
+							this.hform.HBarCode = ''
+							if(res.data.count == 1){
+								var data = res.data.data
+								if (data.hBarTypeField == '浠撳簱鏉$爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = ''
+									this.hform.HStockPlaceID = 0
+								    if (data.hSPFlagField == 0) {
+										this.showHStockPlaceName = false
+								    }else {
+										this.showHStockPlaceName = true
+								    }
+								}else if (data.hBarTypeField == '浠撲綅鏉$爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = data.hSPNameField
+									this.hform.HStockPlaceID = data.hSPIDField
+								}else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
+									this.hform.HDeptName = data.hDeptNameField
+									this.hform.HDeptID = data.hDeptIDField
+								    this.tabs = 1
+								}else if (data.hBarTypeField == '婧愬崟鏉$爜') {
+								    this.hform.HSupName = data.hSupNameField
+									this.hform.HSupID = data.hSupIDField
+								    if (data.hDeptIDField != 0) {
+										this.hform.HDeptID = data.hDeptIDField
+										this.hform.HDeptName = data.hDeptNameField
+								    }
+									this.hform.HSourceBillNo = data.hSourceBillNoField
+								    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+									this.hform.HMainSourceBillType = data.hSourceBillTypeField
+								    if (data.hSourceBillTypeField == "1402") {
+										this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+										this.hform.HMainSourceBillType = 1402
+										this.showHMainSourceBillType = false
+								    }else if (data.hSourceBillTypeField == "1401") {
+										this.HMainSourceBillType = '閿�鍞鍗�'
+										this.hform.HMainSourceBillType = 1401
+										this.showHMainSourceBillType = false
+								    }else {
+								        this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+								        this.showHMainSourceBillType = false
+								    }
+								    if (data.hMulSourceFlagField == 0) {
+										this.showHSourceBillNo = false
+								    }
+								    //瀹㈡埛涓嶅彲缂栬緫
+									this.showHSupName = false
+									this.tabs = 2
+								}else {//鐗╂枡鏉$爜
+									this.tabs = 2
+									if(!this.hform.HSourceBillNo){
+										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+										this.showHMainSourceBillType = false
+										this.showHSourceBillNo = false
+									}
+								}
+								//鏄剧ず琛ㄤ綋鏄庣粏
+								this.DisBillEntryList()
+								//娓呯┖鏁伴噺
+								this.hform.HQty = ''
+							}else{
+								uni.showToast({
+									title:res.data.Message,
+									icon:'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title:'鎺ュ彛璇锋眰澶辫触',
+								icon:'none'
+							})
+						},
+					});
+                }				
+			},
+			//鐗╂枡淇℃伅
+			DisBillEntryList(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json', 
+					data: { HInterID: this.hform.HInterID, HBillNo: this.hform.HBillNo, HBillType: this.hform.HBillType, HStockOrgID: this.hform.HStockOrgID },
+				    success: (res) => {
+						console.log('鐗╂枡',res.data)
+						if(res.data.count == 1){
+							var data = res.data.data
+							this.Materlist = data.Materlist
+							if (data.FIFOlist.length != 0) {
+							    if (data.FIFOlist[0].HMaterID != 0) {
+							       this.FIFOlist = data.FIFOlist
+							    }
+							}
+							if(!data.BarCodeDetailslist[0].HBarCode){
+								this.hform.HMaterName_B = ''
+								this.hform.HMaterModel_B = ''
+								this.hform.HBatchNo_B = ''
+								this.hform.HUnitName_B = ''
+								this.hform.HQty_B = ''
+								this.hform.HTMQty_B = ''
+								this.hform.HWHName_B = ''
+								this.hform.HSPName_B = ''
+							}else{
+								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+							}
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//鍒犻櫎鐗╂枡鐮�
+			delMater(item){
+				uni.showModal({
+				    title: '鎻愮ず',
+				    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+				    success: (res) => {
+				        if (res.confirm) {
+				            uni.request({
+				                url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json', 
+				            	data: { HInterID: this.hform.HInterID, HMaterID: item.HMaterID, HAuxPropID: item.HAuxPropID, HMTONo: item.HMTONo, HSourceInterID: item.HSourceInterID, HSourceEntryID: item.HSourceEntryID, HBillType: this.hform.HBillType },
+				                success: (res) => {
+				            		if(res.data.count == 1){
+				            			this.DisBillEntryList()
+				            		}else{
+				            			uni.showToast({
+				            				title:res.data.Message,
+				            				icon:'none'
+				            			})
+				            		}
+				            	},
+				            	fail: (res) => {
+				            		console.log(res);
+				            		uni.showToast({
+				            			title:'鎺ュ彛璇锋眰澶辫触',
+				            			icon:'none'
+				            		})
+				            	},
+				            });
+				        }
+				    }
+				});
+			},
+			//鏂板
+			getNewData(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json', 
+					data: { HBillType: this.hform.HBillType },
+				    success: (res) => {
+						// console.log(res.data)
+						if(res.data.count == 1){
+							this.hform.HInterID = res.data.data[0].HInterID
+							this.hform.HBillNo = res.data.data[0].HBillNo
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//淇敼鍥炲~鏁版嵁
+			RoadBillMain(HInterID){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json', 
+					data: {HInterID: HInterID,HBillType:this.hform.HBillType},
+				    success: (res) => {
+				        console.log(33,res.data.data[0]);
+						if(res.data.count == 1){
+							var data = res.data.data[0]
+							this.hform.HInterID = data.HInterID
+							this.hform.HBillNo = data.HBillNo
+							this.hform.HMainSourceBillType = data.HSourceBillType
+							this.hform.HSourceBillNo = data.HSourceBillNo
+							if(data.HSourceBillType == 1402){
+								this.hform.HMainSourceBillType = 1402
+								this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+								this.showHSupName = false
+							}else if(data.HSourceBillType == 1401){
+								this.hform.HMainSourceBillType = 1401
+								this.HMainSourceBillType = '閿�鍞鍗�'
+								this.showHSupName = false
+							}else{
+								this.hform.HMainSourceBillType = -1
+								this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+							}
+							this.showHMainSourceBillType = false
+							
+							//闈炲婧愬崟妯″紡
+							if (data.HMulSourceBill == 0) {
+								this.showHSourceBillNo = false
+							}
+							this.hform.HDeptID = data.HDeptID
+							this.hform.HDeptName = data.HDeptName
+							this.hform.HSupID = data.HCusID
+							this.hform.HSupName = data.HCusName
+							this.DisBillEntryList()
+							this.tabs = 2
+						}else{
+							uni.showToast({
+								title:'鑾峰彇鏁版嵁鍥炲~澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+            submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if(!this.hform.HWHName){
+					this.hform.HWHID = 0
+				}
+				if(!this.hform.HStockPlaceName){
+					this.hform.HStockPlaceID = 0
+				}
+				if(!this.hform.HKeeperName){
+					this.hform.HKeeperID = 0
+				}
+				if(!this.hform.HSecManagerName){
+					this.hform.HSecManagerID = 0
+				}
+				if(!this.hform.HDeptName){
+					this.hform.HDeptID = 0
+				}
+				if(!this.hform.HSupName){
+					this.hform.HSupID = 0
+				}
+            	if(this.hform.HInterID == 0 ||!this.hform.HInterID){
+            		uni.showToast({
+            			title:'鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+            			icon:'none'
+            		})
+				}else if(!this.hform.HBillNo){
+					uni.showToast({
+						title:'鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon:'none'
+					})
+				}else if(!this.Materlist || this.Materlist.length == 0){
+					uni.showToast({
+						title:'娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+						icon:'none'
+					})
+				}else{
+					var s = 0;
+					for (var i = 0; i < this.Materlist.length; i++) {
+					    if (this.Materlist[i].鏁伴噺 >0) {
+					        s = 1;
+					    }
+					}
+					if (s == 0) {
+						uni.showToast({
+							title:'娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon:'none'
+						})
+					}else{
+						uni.showLoading({
+							title:'璇风◢鍊�'
+						})
+						var sMainStr = JSON.stringify(this.hform);
+						uni.request({
+						    url: this.serverUrl + '/WEBSController/set_SaveSellOutBill_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/xiaoshouchuku/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.redirectTo({
+								url:'/pages/xiaoshouchuku/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;
+		.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;
+		}
+	}
+	.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/shengchandiaobo/table.vue b/pages/shengchandiaobo/table.vue
new file mode 100644
index 0000000..16320a5
--- /dev/null
+++ b/pages/shengchandiaobo/table.vue
@@ -0,0 +1,495 @@
+<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.鐗╂枡浠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: #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>
+	</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',
+				tabs:0,
+				urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+				MvarReportTitle:'閿�鍞嚭搴撳崟缂撳瓨鍒楄〃',
+				hform:{
+					HBillNo:'',
+					HSourceBillNo:'',
+					HBillType: 1205,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				
+				page:1,
+	        }
+	    },
+		onLoad() {
+			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			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: {
+			CheckModRight(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data:{ 
+						ModRightName: 'CE_SellOut',
+						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: 1205,
+					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>
diff --git a/pages/shengchanlingliao/form.vue b/pages/shengchanlingliao/form.vue
new file mode 100644
index 0000000..38cd96b
--- /dev/null
+++ b/pages/shengchanlingliao/form.vue
@@ -0,0 +1,898 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜:</view>
+				<view class="right" style="width: 380rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)"/>
+				</view>
+				<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title">鏁伴噺:</view>
+				<view class="right">
+					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�"/>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撳簱:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName" @input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName" placeholder="涓嶅彲鎿嶄綔"/></view>
+			</view>
+			
+			<view class="tabs">
+				<!-- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view> -->
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
+				<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉$爜淇℃伅</view>
+			</view>
+			
+			<view v-if="tabs == 1">
+				<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 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="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+					</view>
+				</view>
+			</view>
+			<view v-if="tabs == 2">
+				<view class="list" v-for="(item,index) in Materlist" :key="index">
+					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
+						<view class="card-detail">
+							<view class="detail">
+								<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+							</view>
+							<view class="detail">
+								<text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
+							</view>
+							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+							</view>
+							<view class="detail" v-if="item.杈呭姪灞炴��">
+								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
+			
+			<view v-if="tabs == 3">
+				<view class="form-item">
+					<view class="title">鏉$爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐗╂枡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMaterName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瑙勬牸:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMaterModel_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎵规:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBatchNo_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曚綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HUnitName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏁伴噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HQty_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹归噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HTMQty_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浠撳簱:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HWHName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浠撲綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HSPName_B" />
+					</view>
+				</view>
+			</view>
+
+			<view class="bottom-btn">
+				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<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://47.96.97.237/API',
+				HModName:'Kf_MateOutBill_Check_PDA',
+				ModRightName:'CE_MateOutCheck',
+				OperationType: 1,
+				HInterID_Temp:'',
+				
+				showHStockPlaceName:true,
+				tabs:1,
+				linterid:'',
+				HBillNo:'',
+				
+				arrayHWHName:[],//浠撳簱
+				HWHNameList:[],
+				arrayHStockPlaceName:[],//浠撲綅
+				HStockPlaceNameList:[],
+				
+				Materlist:[],
+				hform:{
+					HBillType:1204,
+					HBillerID:uni.getStorageSync('HBillerID'),
+					HRedBlueFlag:false,
+					
+					HBarCode:'',
+					HQty:'',
+					HWHName:getUserInfo().HWHName,
+					HWHID:getUserInfo().HWhID,
+					HStockPlaceName:getUserInfo().HSPName,
+					HStockPlaceID:getUserInfo().HSPID,
+					
+					HBillNo:'',
+					HInterID:'',
+					HMaker:uni.getStorageSync('HUserName'),
+					HStockOrgName:uni.getStorageSync('Organization'),
+					HStockOrgID:uni.getStorageSync('OrganizationID'),
+					HSourceBarCodeCtl:"N", //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+
+					HBarCode_B:'',
+					HMaterName_B:'',
+					HMaterModel_B:'',
+					HBatchNo_B:'',
+					HUnitName_B:'',
+					HQty_B:'',
+					HTMQty_B:'',
+					HWHName_B:'',
+					HSPName_B:'',
+				}
+            }
+        },
+		onLoad(e) {
+			console.log(e,this.userInfo)
+			this.OperationType = e.OperationType
+			if(e.HInterID){
+				this.HInterID_Temp = e.HInterID
+				this.hform.HBillNo = e.HBillNo
+				this.GetMeesageByBillNo()
+			}else{
+				// this.getNewData()
+			}
+			this.getHBaseList()
+		},
+        methods: {
+			//鎵爜
+			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)
+				    }
+				});
+			},
+			//鎵弿鍗曟嵁鍙锋潯鐮�
+			GetMeesageByBillNo(){
+				uni.request({
+					url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json', 
+					data: {HBillNo:this.hform.HBillNo,HBillType:this.hform.HBillType,HMaker:this.hform.HMaker,HStockOrgID:uni.getStorageSync('Organization')},
+					success: (res) => {
+						if(res.data.count == 1){
+							var data = res.data.data
+							console.log(data)
+							$('#HInterID').val(result.data.hInterIDField)
+							$('#HBillNo').val(result.data.hBillNoField)
+							$("#HBillNo").attr("disabled", "disabled");
+							$('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+							$('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+							HInterID = $('#HInterID').val()
+							//鏉$爜鏍稿鏍囪
+							if (result.data.hSourceBarCodeFlagField) {
+							    $("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
+							    form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+							        "HBarflag": result.data
+							    });
+							    HSourceBarCodeCtl = "Y"
+							}
+							element.tabChange('tab-Kf_MateOutBill_Check_PDA', '2');
+							$("#HBarCode").select();
+							$("#HBarCode").focus();
+							//鏄剧ず琛ㄤ綋鏄庣粏
+							DisBillEntryList();
+							
+							//宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁
+							if (result.data.hBackField == '2') {
+							    playSound();
+							    layer.confirm(result.data.hRemarkField, {
+							        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
+							        btn2: function () {
+							        }//鍏抽棴
+							    }
+							    , function () {
+							        $.ajax({
+							            type: "GET",
+							            url: GetWEBURL() + "/WEBSController/get_ClearBarCode_BillCheck_Json",
+							            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+							            data: { "HInterID": HInterID, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+							            success: function (result) {
+							                if (result.count == 1) {
+							                    var data = result.data[0];
+							                    $('#HInterID').val(data.HInterID)
+							                    $('#HBillNo').val(data.HBillNo)
+							                    HInterID = $('#HInterID').val()
+							                    layer.closeAll();
+							                    //鏄剧ず琛ㄤ綋鏄庣粏
+							                    DisBillEntryList();
+							                }
+							                else {
+							                    playSound();
+							                    layer.msg(result.Message, {
+							                        icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+							                    }, function () {
+							                        element.tabChange('tab-Kf_MateOutBill_Check_PDA', '1');
+							                        $("#HBillNo").select();
+							                        $("#HBillNo").focus();
+							                    });
+							                }
+							            },
+							            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+							            error: function (err) {
+							                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+							            }
+							        });
+							    });//娓呯┖
+							}
+							
+							this.DisBillEntryList()
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+							this.hform.HBillNo = ''
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//鍩虹浠撳簱璧勬枡
+			getHBaseList(){
+				uni.request({
+					url: this.serverUrl + '/Gy_Warehouse/list', 
+					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
+					success: (res) => {
+						if(res.data.count == 1){
+							this.HWHNameList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+							}
+						}else{
+							uni.showToast({
+								title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+				
+				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'
+						})
+					},
+				});
+			},
+			//閫夋嫨浠撳簱
+			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
+					}
+				}
+			},
+			//閫夋嫨浠撲綅
+			HStockPlaceNameChange(e){
+				for(var i=0;i<this.HStockPlaceNameList.length;i++){
+					if(this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e){
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+					}
+				}
+			},
+			//鎵潯鐮佸鐞�
+			getCode(HBarCode){
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sOldBarCode = HBarCode
+				var HDeleteFlag = sOldBarCode.substring(0, 1);
+				var sBarCode = sOldBarCode.slice(1);
+
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sHQty = this.hform.HQty
+				var sSourceBillNo = this.hform.HSourceBillNo
+				var sSourceBillType = this.hform.HMainSourceBillType
+				var HSourceFlag = this.hform.HSourceBillNo==''?false:true
+				console.log(this.hform.HSourceBillNo,HSourceFlag)
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        uni.showToast({
+                        	title:'璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon:'none'
+                        })
+                    }else{
+						uni.request({
+						    url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json', 
+							data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HBarCode: sBarCode },
+						    success: (res) => {
+						        console.log('鍒犻櫎鏉$爜',res.data);
+								this.hform.HBarCode = ''
+								if(res.data.count == 1){
+									this.hform.HQty = ''
+									this.DisBillEntryList()
+								}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
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+					uni.request({
+					    url: this.serverUrl + '/WEBSController/Get_BarCode_Json', 
+						data: { sBarCode: sBarCode, HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HBillNo: this.hform.HBillNo, HMaker: this.hform.HMaker, HWhID: sHWHID, HSPID: sHSPID, HQty: sHQty, HRedBlueFlag: this.hform.HRedBlueFlag, SourceFlag: HSourceFlag, HSourceBillNo: sSourceBillNo, HSourceBillType: sSourceBillType, HStockOrgID: this.hform.HStockOrgID, HScanStyle: "", HCustom1: "", HCustom2: "" },
+					    success: (res) => {
+					        console.log('鎵爜杩斿洖',res.data);
+							this.hform.HBarCode = ''
+							if(res.data.count == 1){
+								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
+								    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+								    if (data.hSourceBillTypeField == "1103") {
+										this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+										this.hform.HMainSourceBillType = 1103
+										this.showHMainSourceBillType = false
+								    }else if (data.hSourceBillTypeField == "1102") {
+										this.HMainSourceBillType = '閲囪喘璁㈠崟'
+										this.hform.HMainSourceBillType = 1102
+										this.showHMainSourceBillType = false
+								    }else {
+								        this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+								        this.showHMainSourceBillType = false
+								    }
+								    if (data.hMulSourceFlagField == 0) {
+										this.showHSourceBillNo = false
+								    }
+								    //渚涘簲鍟嗕笉鍙紪杈�
+									this.showHSupName = false
+									this.tabs = 2
+								}else {//鐗╂枡鏉$爜
+									this.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
+										if (data.hSourceBillTypeField == "1103") {
+											this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+											this.hform.HMainSourceBillType = 1103
+											this.showHMainSourceBillType = false
+										}else if (data.hSourceBillTypeField == "1102") {
+											this.HMainSourceBillType = '閲囪喘璁㈠崟'
+											this.hform.HMainSourceBillType = 1102
+											this.showHMainSourceBillType = false
+										}else {
+										    this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+											this.hform.HMainSourceBillType = -1
+										    this.showHMainSourceBillType = false
+										}
+										if (data.hMulSourceFlagField == 0) {
+											this.showHSourceBillNo = false
+										}
+										//渚涘簲鍟嗕笉鍙紪杈�
+										this.showHSupName = false
+									}
+								}
+								//鏄剧ず琛ㄤ綋鏄庣粏
+								this.DisBillEntryList()
+								//娓呯┖鏁伴噺
+								this.hform.HQty = ''
+							}else{
+								uni.showToast({
+									title:res.data.Message,
+									icon:'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title:'鎺ュ彛璇锋眰澶辫触',
+								icon:'none'
+							})
+						},
+					});
+                }				
+			},
+			//鐗╂枡淇℃伅
+			DisBillEntryList(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json', 
+					data: { HInterID: this.hform.HInterID, HBillNo: this.hform.HBillNo, HBillType: this.hform.HBillType, HStockOrgID: this.hform.HStockOrgID },
+				    success: (res) => {
+						console.log('鐗╂枡',res.data)
+						if(res.data.count == 1){
+							var data = res.data.data
+							this.Materlist = data.Materlist
+							if(!data.BarCodeDetailslist[0].HBarCode){
+								this.hform.HMaterName_B = ''
+								this.hform.HMaterModel_B = ''
+								this.hform.HBatchNo_B = ''
+								this.hform.HUnitName_B = ''
+								this.hform.HQty_B = ''
+								this.hform.HTMQty_B = ''
+								this.hform.HWHName_B = ''
+								this.hform.HSPName_B = ''
+							}else{
+								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+							}
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//鍒犻櫎鐗╂枡鐮�
+			delMater(item){
+				uni.showModal({
+				    title: '鎻愮ず',
+				    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+				    success: (res) => {
+				        if (res.confirm) {
+				            uni.request({
+				                url: this.serverUrl + '/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json', 
+				            	data: { HInterID: this.hform.HInterID, 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'
+				            		})
+				            	},
+				            });
+				        }
+				    }
+				});
+			},
+            submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佷緵搴斿晢鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+				if(!this.hform.HWHName){
+					this.hform.HWHID = 0
+				}
+				if(!this.hform.HStockPlaceName){
+					this.hform.HStockPlaceID = 0
+				}
+				if(!this.hform.HKeeperName){
+					this.hform.HKeeperID = 0
+				}
+				if(!this.hform.HSecManagerName){
+					this.hform.HSecManagerID = 0
+				}
+				if(!this.hform.HDeptName){
+					this.hform.HDeptID = 0
+				}
+				if(!this.hform.HSupName){
+					this.hform.HSupID = 0
+				}
+            	if(this.hform.HInterID == 0 ||!this.hform.HInterID){
+            		uni.showToast({
+            			title:'鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+            			icon:'none'
+            		})
+				}else if(!this.hform.HBillNo){
+					uni.showToast({
+						title:'鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon:'none'
+					})
+				}else if(!this.Materlist || this.Materlist.length == 0){
+					uni.showToast({
+						title:'娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+						icon:'none'
+					})
+				}else{
+					var s = 0;
+					for (var i = 0; i < this.Materlist.length; i++) {
+					    if (this.Materlist[i].鏁伴噺 >0) {
+					        s = 1;
+					    }
+					}
+					if (s == 0) {
+						uni.showToast({
+							title:'娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon:'none'
+						})
+					}else{
+						uni.showLoading({
+							title:'璇风◢鍊�'
+						})
+						var sMainStr = JSON.stringify(this.hform);
+						uni.request({
+						    url: this.serverUrl + '/WEBSController/set_SaveMateOutBill_BillCheck_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/shengchanlingliao/form?OperationType=1'
+												})
+									        } else if (res.cancel) {
+									            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(()=>{
+													uni.navigateBack();
+												},50)
+									        }
+									    }
+									});
+								}else{
+									uni.showToast({
+										title:res.data.Message,
+										icon:'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title:'鎺ュ彛璇锋眰澶辫触',
+									icon:'none'
+								})
+							},
+						});
+					}
+            	}
+            },
+
+            goBack(){
+				uni.showModal({
+				    title: '鎻愮ず',
+				    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+				    success: (res) => {
+				        if (res.confirm) {
+				            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.redirectTo({
+								url:'/pages/caigouruku/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;
+		.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;
+		}
+	}
+	.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/shengchanlingliao/table.vue b/pages/shengchanlingliao/table.vue
new file mode 100644
index 0000000..3174473
--- /dev/null
+++ b/pages/shengchanlingliao/table.vue
@@ -0,0 +1,497 @@
+<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.鐗╂枡浠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: #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>
+	</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',
+				tabs:0,
+				urls:'/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
+				MvarReportTitle:'鐢熶骇棰嗘枡鍗曟牎楠岀紦瀛樺垪琛�',
+				hform:{
+					HBillNo:'',
+					HSourceBillNo:'',
+					HBillType: 1204,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				
+				page:1,
+	        }
+	    },
+		onLoad() {
+			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			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: {
+			CheckModRight(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data:{ 
+						ModRightName: 'CE_MateOutCheck',
+						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_BillCheck_Json'
+				}
+				if(this.tabs == 1){
+					this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_BillCheck_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: 1204,
+					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 + '&HBillNo=' + item.HBillNo
+							})
+						}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/DeleteTempBillList_BillCheck_Json',
+								data:{ 
+									HInterID: item.HInterID,
+									HBillNo: item.鍗曟嵁鍙�,
+									HBillType: this.hform.HBillType,
+									HMaker: uni.getStorageSync('HUserName'),
+									HStockOrgID:this.hform.HStockOrgID,
+									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_BillCheck_Json',
+								data:{ 
+									HInterID: item.HInterID,
+									HBillNo: item.鍗曟嵁鍙�,
+									HBillType: this.hform.HBillType,
+									HMaker: uni.getStorageSync('HUserName'),
+									HStockOrgID:this.hform.HStockOrgID,
+									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>
diff --git a/pages/shengchanruku/form.vue b/pages/shengchanruku/form.vue
new file mode 100644
index 0000000..32f4181
--- /dev/null
+++ b/pages/shengchanruku/form.vue
@@ -0,0 +1,1309 @@
+<template>
+	<view>
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉$爜:</view>
+				<view class="right" style="width: 380rpx;">
+					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)"/>
+				</view>
+				<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title">鏁伴噺:</view>
+				<view class="right">
+					<input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�"/>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撳簱:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName" @input="HWHNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浠撲綅:</view>
+				<view class="right" v-show="showHStockPlaceName">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName" placeholder="涓嶅彲鎿嶄綔"/></view>
+			</view>
+			
+			<view 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="璇烽�夋嫨婧愬崟绫诲瀷" />
+						</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>
+					</view>
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ュ師鍗曞崟鍙�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍏堣繘鍏堝嚭浠�:</view>
+					<view class="right">
+						<uni-combox :candidates="arrayHWHName" placeholder="璇烽�夋嫨" v-model="hform.HFIFOWHName" @input="HFIFOWHNameChange"></uni-combox>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏃ユ湡:</view>
+					<view class="right">
+						<picker mode="date" v-model="hform.HDate" @change="HDateChange">
+							<input disabled v-model="hform.HDate" placeholder="璇烽�夋嫨鏃ユ湡" />
+						</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="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" v-show="!showHSupName">
+						<input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨瀹㈡埛" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">缁勭粐:</view>
+					<view class="righton">
+						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
+					</view>
+				</view>
+			</view>
+			
+			<view v-if="tabs == 2">
+				<view class="list" v-for="(item,index) in Materlist" :key="index">
+					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="item.鐗╂枡浠g爜" style="margin: 10px;" @tap="delMater(item)">
+						<view class="card-detail">
+							<view class="detail">
+								<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+							</view>
+							<view class="detail">
+								<text>婧愬崟鏁伴噺锛�</text>{{item.婧愬崟鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+							</view>
+							<view class="detail">
+								<text>鏉$爜涓暟锛�</text>{{item.鏉$爜涓暟}}
+							</view>
+							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+							</view>
+							<view class="detail" v-if="item.杈呭姪灞炴��">
+								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
+			
+			<view v-if="tabs == 4">
+				<view class="list" v-for="(item,index) in FIFOlist" :key="index">
+					<uni-card :title="item.HMaterName" :extra="item.HMaterNumber" style="margin: 10px;" @tap="delMater(item)">
+						<view class="card-detail">
+							<view class="detail">
+								<text>鏁伴噺锛�</text>{{item.HQty}}
+							</view>
+							<view class="detail">
+								<text>涓嬫灦鏁伴噺锛�</text>{{item.HQtyMust}}
+							</view>
+							<view class="detail">
+								<text>浠撳簱锛�</text>{{item.HWhName}}
+							</view>
+							<view class="detail">
+								<text>浠撲綅锛�</text>{{item.HSPName}}
+							</view>
+							<view class="detail">
+								<text>瑙勬牸鍨嬪彿锛�</text>{{item.HMaterModel}}
+							</view>
+							<view class="detail" v-if="item.HBatchNo">
+								<text>鎵瑰彿锛�</text>{{item.HBatchNo}}
+							</view>
+							<view class="detail" v-if="item.HAuxPropName">
+								<text>杈呭姪灞炴�э細</text>{{item.HAuxPropName}}
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<view class="over" v-if="FIFOlist.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
+			
+			<view v-if="tabs == 3">
+				<view class="form-item">
+					<view class="title">鏉$爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐗╂枡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMaterName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瑙勬牸:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMaterModel_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎵规:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBatchNo_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曚綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HUnitName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏁伴噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HQty_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹归噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HTMQty_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浠撳簱:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HWHName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浠撲綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HSPName_B" />
+					</view>
+				</view>
+			</view>
+
+			<view 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";
+    export default {
+        data() {
+            return {
+				userInfo:getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+				HModName:'Kf_SellOutBill_PDA',
+				ModRightName:'CE_SellOut',
+				OperationType: 1,
+				HInterID_Temp:'',
+				
+				showHStockPlaceName:true,
+				showHMainSourceBillType:true,
+				showHSourceBillNo:true,
+				reHSourceBillNo:true,
+				showHSupName:true,
+				
+				tabs:0,
+				HMainSourceBillType:'鍙戣揣閫氱煡鍗�',
+				arrayHMainSourceBillType:['鍙戣揣閫氱煡鍗�','閿�鍞鍗�','鎵嬪伐褰曞叆'],
+				
+				linterid:'',
+				HBillNo:'',
+				btnType:0,//0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+				showmore: false,
+				
+				arrayHWHName:[],//浠撳簱
+				HWHNameList:[],
+				arrayHStockPlaceName:[],//浠撲綅
+				HStockPlaceNameList:[],
+				arrayHSourceBillNo:[],//鍘熷崟鍗曞彿
+				HSourceBillNoList:[],
+				
+				arrayHEmpName:[],//鎿嶄綔鍛�
+				HEmpNameList:[],
+				arrayHDeptName:[],//閮ㄩ棬
+				HDeptNameList:[],
+				arrayHSupName:[],//瀹㈡埛
+				HSupNameList:[],
+				
+				Materlist:[],
+				FIFOlist:[],
+				hform:{
+					HBillType:1205,
+					HBillerID:uni.getStorageSync('HBillerID'),
+					HRedBlueFlag:false,
+					
+					HBarCode:'',
+					HQty:'',
+					HWHName:getUserInfo().HWHName,
+					HWHID:getUserInfo().HWhID,
+					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:'',
+					HStockOrgName:uni.getStorageSync('Organization'),
+					HStockOrgID:uni.getStorageSync('OrganizationID'),
+
+					HBarCode_B:'',
+					HMaterName_B:'',
+					HMaterModel_B:'',
+					HBatchNo_B:'',
+					HUnitName_B:'',
+					HQty_B:'',
+					HTMQty_B:'',
+					HWHName_B:'',
+					HSPName_B:'',
+				}
+            }
+        },
+		onLoad(e) {
+			console.log(e,this.userInfo)
+			this.OperationType = e.OperationType
+			if(e.HInterID){
+				this.HInterID_Temp = e.HInterID
+				// this.btnType = 1
+				this.RoadBillMain(e.HInterID)
+			}else{
+				this.getNewData()
+			}
+			this.getHBaseList()
+			this.getHSupList()
+			this.getHEmpList()
+			this.getHDeptList()
+		},
+        methods: {
+			//鎵爜
+			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)
+				    }
+				});
+			},
+			//鎵叾浠�(浠撳簱锛屼粨浣�)
+			// toScanData(e){
+			// 	uni.scanCode({
+			// 	    onlyFromCamera: true,
+			// 	    success: (res) => {
+			// 	        console.log('鏉$爜鍐呭锛�' + res.result);
+			// 			var code = res.result
+			// 			if(e == 1){
+			// 				uni.request({
+			// 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
+			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
+			// 					success: (res) => {
+			// 						this.hform.HStockPlaceID = 0
+			// 						this.hform.HStockPlaceName = ''
+			// 						this.showHStockPlaceName = true
+			// 						if(res.data.count == 1){
+			// 							var data = res.data.data[0]
+			// 							this.hform.HWHID = data.HItemID
+			// 							this.hform.HWHName = data.HName
+			// 							if (data.HSPFlag == 0) {
+			// 							    this.showHStockPlaceName = false
+			// 							}
+			// 						}else{
+			// 							this.hform.HWHID = 0
+			// 							this.hform.HWHName = ''
+			// 							uni.showToast({
+			// 								title:res.data.Message,
+			// 								icon:'none'
+			// 							})
+			// 						}
+			// 					},
+			// 					fail: (res) => {
+			// 						console.log(res);
+			// 						uni.showToast({
+			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+			// 							icon:'none'
+			// 						})
+			// 					},
+			// 				});
+			// 			}else if(e == 2){
+			// 				uni.request({
+			// 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
+			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
+			// 					success: (res) => {
+			// 						if(res.data.count == 1){
+			// 							var data = res.data.data[0]
+			// 							this.hform.HWHID = data.HWHID
+			// 							this.hform.HWHName = data.HWhName
+			// 							this.hform.HStockPlaceID = data.HItemID
+			// 							this.hform.HStockPlaceName = data.HName
+			// 						}else{
+			// 							this.hform.HWHID = 0
+			// 							this.hform.HWHName = ''
+			// 							this.hform.HStockPlaceID = 0
+			// 							this.hform.HStockPlaceName = ''
+			// 							uni.showToast({
+			// 								title:res.data.Message,
+			// 								icon:'none'
+			// 							})
+			// 						}
+			// 					},
+			// 					fail: (res) => {
+			// 						console.log(res);
+			// 						uni.showToast({
+			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+			// 							icon:'none'
+			// 						})
+			// 					},
+			// 				});
+			// 			}
+			// 	    }
+			// 	});
+			// },
+			//鏃ユ湡
+			HDateChange(e){
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			//鍩虹浠撳簱璧勬枡
+			getHBaseList(){
+				uni.request({
+					url: this.serverUrl + '/Gy_Warehouse/list', 
+					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
+					success: (res) => {
+						if(res.data.count == 1){
+							this.HWHNameList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+							}
+						}else{
+							uni.showToast({
+								title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+				
+				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()
+			},
+			//婧愬崟璧勬枡
+			getHYDList(){
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetSourceBillList_Json', 
+					data: {HBillType:this.hform.HBillType,HSourceBillType:this.hform.HMainSourceBillType,HStockOrgID:this.hform.HStockOrgID,HSourceBillNo:"",HMater:"",HCustom:""},
+					success: (res) => {
+						if(res.data.count == 1){
+							this.HSourceBillNoList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHSourceBillNo[i] = res.data.data[i].鍗曟嵁鍙�
+							}
+							this.reHSourceBillNo = false
+							this.$nextTick(()=>{
+								this.reHSourceBillNo = true
+							})
+						}else{
+							uni.showToast({
+								title:'婧愬崟鏁版嵁璇锋眰澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨浠撳簱
+			HWHNameChange(e){
+				// var name = e.split("(")
+				for(var i=0;i<this.HWHNameList.length;i++){
+					if(this.HWHNameList[i].浠撳簱鍚嶇О == e){
+						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+					}
+				}
+			},
+			HFIFOWHNameChange(e){
+				for(var i=0;i<this.HWHNameList.length;i++){
+					if(this.HWHNameList[i].浠撳簱鍚嶇О == e){
+						this.hform.HFIFOWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+						this.hform.HFIFOWHID = this.HWHNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨浠撲綅
+			HStockPlaceNameChange(e){
+				for(var i=0;i<this.HStockPlaceNameList.length;i++){
+					if(this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e){
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨婧愬崟
+			HSourceBillNoChange(e){
+				this.hform.HSourceBillNo = e						
+				this.getHBarCodeData(e)
+				// for(var i=0;i<this.HSourceBillNoList.length;i++){
+				// 	if(this.HSourceBillNoList[i].鍗曟嵁鍙� == e){
+				// 		this.hform.HSourceBillNo = this.HSourceBillNoList[i].鍗曟嵁鍙�
+				// 	}
+				// }
+			},
+			//閫夋嫨婧愬崟绫诲瀷
+			HMainSourceBillTypeChange(e){
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
+				if(this.HMainSourceBillType == '鍙戣揣閫氱煡鍗�'){
+					this.hform.HMainSourceBillType = 1402
+					this.getHYDList()
+				}else if(this.HMainSourceBillType == '閿�鍞鍗�'){
+					this.hform.HMainSourceBillType = 1401
+					this.getHYDList()
+				}else{
+					this.hform.HMainSourceBillType = -1
+					this.getHYDList()
+				}
+			},
+			
+			//鑾峰彇瀹㈡埛鏁版嵁
+			getHSupList(){
+				uni.request({
+				    url: this.serverUrl + '/Gy_Customer/list', 
+					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
+				    success: (res) => {
+						if(res.data.count == 1){
+							this.HSupNameList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHSupName[i] = res.data.data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'瀹㈡埛鏁版嵁璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨瀹㈡埛
+			HSupNameChange(e){
+				for(var i=0;i<this.HSupNameList.length;i++){
+					if(this.HSupNameList[i].瀹㈡埛鍚嶇О == e){
+						this.hform.HSupID = this.HSupNameList[i].HItemID
+						this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+					}
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList(){
+				uni.request({
+				    url: this.serverUrl + '/Gy_Department/list', 
+					data: {sWhere:"",user:uni.getStorageSync('HUserName'),Organization:uni.getStorageSync('Organization')},
+				    success: (res) => {
+						if(res.data.count == 1){
+							this.HDeptNameList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						}else{
+							uni.showToast({
+								title:'閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e){
+				for(var i=0;i<this.HDeptNameList.length;i++){
+					if(this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e){
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			//鎿嶄綔鍛�
+			getHEmpList(){
+				uni.request({
+					url: this.serverUrl + '/Web/GetEmployeeList_Json', 
+					data: { Employee: '',HGroupID:0 },
+					success: (res) => {
+						if(res.data.count == 1){
+							this.HEmpNameList = res.data.data
+							for(var i=0;i<res.data.data.length;i++){
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						}else{
+							uni.showToast({
+								title:'浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//淇濈
+			HKeeperNameChange(e){
+				for(var i=0;i<this.HEmpNameList.length;i++){
+					if(this.HEmpNameList[i].HName == e){
+						console.log(this.HEmpNameList[i])
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+						this.hform.HKeeperName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			//楠屾敹
+			HSecManagerNameChange(e){
+				for(var i=0;i<this.HEmpNameList.length;i++){
+					if(this.HEmpNameList[i].HName == e){
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+						this.hform.HSecManagerName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			//閫変腑婧愬崟
+			getHBarCodeData(HBarCode){
+				if(!this.hform.HFIFOWHName){
+					this.hform.HFIFOWHID = 0
+				}
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/get_SourceBarCode_SellOut_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, },
+				    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.DisBillEntryList()
+						}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 sOldBarCode = HBarCode
+				var HDeleteFlag = sOldBarCode.substring(0, 1);
+				var sBarCode = sOldBarCode.slice(1);
+
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sHQty = this.hform.HQty
+				var sSourceBillNo = this.hform.HSourceBillNo
+				var sSourceBillType = this.hform.HMainSourceBillType
+				var HSourceFlag = this.hform.HSourceBillNo==''?false:true
+				console.log(this.hform.HSourceBillNo,HSourceFlag)
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        uni.showToast({
+                        	title:'璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+							icon:'none'
+                        })
+                    }else{
+						uni.request({
+						    url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json', 
+							data: { HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HBarCode: sBarCode },
+						    success: (res) => {
+						        console.log('鍒犻櫎鏉$爜',res.data);
+								this.hform.HBarCode = ''
+								if(res.data.count == 1){
+									this.hform.HQty = ''
+									this.DisBillEntryList()
+								}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
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+					uni.request({
+					    url: this.serverUrl + '/WEBSController/Get_BarCode_Json', 
+						data: { sBarCode: sBarCode, HInterID: this.hform.HInterID, HBillType: this.hform.HBillType, HBillNo: this.hform.HBillNo, HMaker: this.hform.HMaker, HWhID: sHWHID, HSPID: sHSPID, HQty: sHQty, HRedBlueFlag: this.hform.HRedBlueFlag, SourceFlag: HSourceFlag, HSourceBillNo: sSourceBillNo, HSourceBillType: sSourceBillType, HStockOrgID: this.hform.HStockOrgID, HScanStyle: "", HCustom1: "", HCustom2: "" },
+					    success: (res) => {
+					        console.log('鎵爜杩斿洖',res.data);
+							this.hform.HBarCode = ''
+							if(res.data.count == 1){
+								var data = res.data.data
+								if (data.hBarTypeField == '浠撳簱鏉$爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = ''
+									this.hform.HStockPlaceID = 0
+								    if (data.hSPFlagField == 0) {
+										this.showHStockPlaceName = false
+								    }else {
+										this.showHStockPlaceName = true
+								    }
+								}else if (data.hBarTypeField == '浠撲綅鏉$爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = data.hSPNameField
+									this.hform.HStockPlaceID = data.hSPIDField
+								}else if (data.hBarTypeField == '閮ㄩ棬鏉$爜') {
+									this.hform.HDeptName = data.hDeptNameField
+									this.hform.HDeptID = data.hDeptIDField
+								    this.tabs = 1
+								}else if (data.hBarTypeField == '婧愬崟鏉$爜') {
+								    this.hform.HSupName = data.hSupNameField
+									this.hform.HSupID = data.hSupIDField
+								    if (data.hDeptIDField != 0) {
+										this.hform.HDeptID = data.hDeptIDField
+										this.hform.HDeptName = data.hDeptNameField
+								    }
+									this.hform.HSourceBillNo = data.hSourceBillNoField
+								    //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+									this.hform.HMainSourceBillType = data.hSourceBillTypeField
+								    if (data.hSourceBillTypeField == "1402") {
+										this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+										this.hform.HMainSourceBillType = 1402
+										this.showHMainSourceBillType = false
+								    }else if (data.hSourceBillTypeField == "1401") {
+										this.HMainSourceBillType = '閿�鍞鍗�'
+										this.hform.HMainSourceBillType = 1401
+										this.showHMainSourceBillType = false
+								    }else {
+								        this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+								        this.showHMainSourceBillType = false
+								    }
+								    if (data.hMulSourceFlagField == 0) {
+										this.showHSourceBillNo = false
+								    }
+								    //瀹㈡埛涓嶅彲缂栬緫
+									this.showHSupName = false
+									this.tabs = 2
+								}else {//鐗╂枡鏉$爜
+									this.tabs = 2
+									if(!this.hform.HSourceBillNo){
+										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+										this.showHMainSourceBillType = false
+										this.showHSourceBillNo = false
+									}
+								}
+								//鏄剧ず琛ㄤ綋鏄庣粏
+								this.DisBillEntryList()
+								//娓呯┖鏁伴噺
+								this.hform.HQty = ''
+							}else{
+								uni.showToast({
+									title:res.data.Message,
+									icon:'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title:'鎺ュ彛璇锋眰澶辫触',
+								icon:'none'
+							})
+						},
+					});
+                }				
+			},
+			//鐗╂枡淇℃伅
+			DisBillEntryList(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json', 
+					data: { HInterID: this.hform.HInterID, HBillNo: this.hform.HBillNo, HBillType: this.hform.HBillType, HStockOrgID: this.hform.HStockOrgID },
+				    success: (res) => {
+						console.log('鐗╂枡',res.data)
+						if(res.data.count == 1){
+							var data = res.data.data
+							this.Materlist = data.Materlist
+							if (data.FIFOlist.length != 0) {
+							    if (data.FIFOlist[0].HMaterID != 0) {
+							       this.FIFOlist = data.FIFOlist
+							    }
+							}
+							if(!data.BarCodeDetailslist[0].HBarCode){
+								this.hform.HMaterName_B = ''
+								this.hform.HMaterModel_B = ''
+								this.hform.HBatchNo_B = ''
+								this.hform.HUnitName_B = ''
+								this.hform.HQty_B = ''
+								this.hform.HTMQty_B = ''
+								this.hform.HWHName_B = ''
+								this.hform.HSPName_B = ''
+							}else{
+								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+							}
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//鍒犻櫎鐗╂枡鐮�
+			delMater(item){
+				uni.showModal({
+				    title: '鎻愮ず',
+				    content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+				    success: (res) => {
+				        if (res.confirm) {
+				            uni.request({
+				                url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json', 
+				            	data: { HInterID: this.hform.HInterID, HMaterID: item.HMaterID, HAuxPropID: item.HAuxPropID, HMTONo: item.HMTONo, HSourceInterID: item.HSourceInterID, HSourceEntryID: item.HSourceEntryID, HBillType: this.hform.HBillType },
+				                success: (res) => {
+				            		if(res.data.count == 1){
+				            			this.DisBillEntryList()
+				            		}else{
+				            			uni.showToast({
+				            				title:res.data.Message,
+				            				icon:'none'
+				            			})
+				            		}
+				            	},
+				            	fail: (res) => {
+				            		console.log(res);
+				            		uni.showToast({
+				            			title:'鎺ュ彛璇锋眰澶辫触',
+				            			icon:'none'
+				            		})
+				            	},
+				            });
+				        }
+				    }
+				});
+			},
+			//鏂板
+			getNewData(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/GetMaxBillNoAndID_Json', 
+					data: { HBillType: this.hform.HBillType },
+				    success: (res) => {
+						// console.log(res.data)
+						if(res.data.count == 1){
+							this.hform.HInterID = res.data.data[0].HInterID
+							this.hform.HBillNo = res.data.data[0].HBillNo
+						}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			//淇敼鍥炲~鏁版嵁
+			RoadBillMain(HInterID){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json', 
+					data: {HInterID: HInterID,HBillType:this.hform.HBillType},
+				    success: (res) => {
+				        console.log(33,res.data.data[0]);
+						if(res.data.count == 1){
+							var data = res.data.data[0]
+							this.hform.HInterID = data.HInterID
+							this.hform.HBillNo = data.HBillNo
+							this.hform.HMainSourceBillType = data.HSourceBillType
+							this.hform.HSourceBillNo = data.HSourceBillNo
+							if(data.HSourceBillType == 1402){
+								this.hform.HMainSourceBillType = 1402
+								this.HMainSourceBillType = '鍙戣揣閫氱煡鍗�'
+								this.showHSupName = false
+							}else if(data.HSourceBillType == 1401){
+								this.hform.HMainSourceBillType = 1401
+								this.HMainSourceBillType = '閿�鍞鍗�'
+								this.showHSupName = false
+							}else{
+								this.hform.HMainSourceBillType = -1
+								this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+							}
+							this.showHMainSourceBillType = false
+							
+							//闈炲婧愬崟妯″紡
+							if (data.HMulSourceBill == 0) {
+								this.showHSourceBillNo = false
+							}
+							this.hform.HDeptID = data.HDeptID
+							this.hform.HDeptName = data.HDeptName
+							this.hform.HSupID = data.HCusID
+							this.hform.HSupName = data.HCusName
+							this.DisBillEntryList()
+							this.tabs = 2
+						}else{
+							uni.showToast({
+								title:'鑾峰彇鏁版嵁鍥炲~澶辫触',
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+            submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if(!this.hform.HWHName){
+					this.hform.HWHID = 0
+				}
+				if(!this.hform.HStockPlaceName){
+					this.hform.HStockPlaceID = 0
+				}
+				if(!this.hform.HKeeperName){
+					this.hform.HKeeperID = 0
+				}
+				if(!this.hform.HSecManagerName){
+					this.hform.HSecManagerID = 0
+				}
+				if(!this.hform.HDeptName){
+					this.hform.HDeptID = 0
+				}
+				if(!this.hform.HSupName){
+					this.hform.HSupID = 0
+				}
+            	if(this.hform.HInterID == 0 ||!this.hform.HInterID){
+            		uni.showToast({
+            			title:'鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+            			icon:'none'
+            		})
+				}else if(!this.hform.HBillNo){
+					uni.showToast({
+						title:'鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon:'none'
+					})
+				}else if(!this.Materlist || this.Materlist.length == 0){
+					uni.showToast({
+						title:'娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+						icon:'none'
+					})
+				}else{
+					var s = 0;
+					for (var i = 0; i < this.Materlist.length; i++) {
+					    if (this.Materlist[i].鏁伴噺 >0) {
+					        s = 1;
+					    }
+					}
+					if (s == 0) {
+						uni.showToast({
+							title:'娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon:'none'
+						})
+					}else{
+						uni.showLoading({
+							title:'璇风◢鍊�'
+						})
+						var sMainStr = JSON.stringify(this.hform);
+						uni.request({
+						    url: this.serverUrl + '/WEBSController/set_SaveSellOutBill_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/xiaoshouchuku/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.redirectTo({
+								url:'/pages/xiaoshouchuku/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;
+		.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;
+		}
+	}
+	.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/shengchanruku/table.vue b/pages/shengchanruku/table.vue
new file mode 100644
index 0000000..16320a5
--- /dev/null
+++ b/pages/shengchanruku/table.vue
@@ -0,0 +1,495 @@
+<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.鐗╂枡浠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: #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>
+	</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',
+				tabs:0,
+				urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+				MvarReportTitle:'閿�鍞嚭搴撳崟缂撳瓨鍒楄〃',
+				hform:{
+					HBillNo:'',
+					HSourceBillNo:'',
+					HBillType: 1205,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				
+				page:1,
+	        }
+	    },
+		onLoad() {
+			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			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: {
+			CheckModRight(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data:{ 
+						ModRightName: 'CE_SellOut',
+						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: 1205,
+					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>
diff --git a/pages/shouliaotongzhi/table_son.vue b/pages/shouliaotongzhi/table_son.vue
index d7d493c..6a51955 100644
--- a/pages/shouliaotongzhi/table_son.vue
+++ b/pages/shouliaotongzhi/table_son.vue
@@ -51,7 +51,7 @@
 			</view>
 			<view class="buttons">
 				<button class="btn-b" size="mini" type="default" @tap="getList()">鏉$爜鐢熸垚</button>
-				<button class="btn-c" size="mini" type="default" @tap="searchLabelPrinter()">鎼滅储鎵撳嵃鏈�</button>
+				<!-- <button class="btn-c" size="mini" type="default" @tap="searchLabelPrinter()">鎼滅储鎵撳嵃鏈�</button> -->
 			</view>
 		</view>
 		
@@ -80,6 +80,8 @@
 		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
 		<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
 		
+		<labelPrinterComponentVue ref="labelPrinter" :printInfo="printInfo" :printMode="'cpcl'"></labelPrinterComponentVue>
+		
 		<!-- 鎵撳嵃鏈洪�夋嫨鍒楄〃 -->
 		<view v-if="maskShow" class="uni-mask" @tap="maskShow = false">
 			<scroll-view class="uni-scroll_box" scroll-y>
@@ -94,42 +96,44 @@
 
 <script>
 	import { getUserInfo } from "@/utils/auth.js";
-	import bluetoothTool from '@/plugins/BluetoothTool.js'
-	import permission from '@/plugins/permission.js'
-	import {
-		InputImage
-	} from '@psdk/frame-imageb';
-	import {
-		ConnectedDevice,
-		Lifecycle,
-		Raw,
-		FakeConnectedDevice,
-		WriteOptions,
-	} from '@psdk/frame-father';
-	import {
-		CBar,
-		CBox,
-		CForm,
-		CImage,
-		CLine,
-		CCodeRotation,
-		CCodeType,
-		CPage,
-		CText,
-		CFont,
-		CBold,
-		CRotation,
-		CInverse,
-		CMag,
-		CQRCode,
-		CCorrectLevel,
-		CSN,
-		CStatus,
-	} from "@psdk/cpcl";
-	import {
-		EImage
-	} from "@psdk/esc";
+	import labelPrinterComponentVue from "@/components/labelPrinterComponent/labelPrinterComponent.vue"
+	// import bluetoothTool from '@/plugins/BluetoothTool.js'
+	// import permission from '@/plugins/permission.js'
+	// import {
+	// 	InputImage
+	// } from '@psdk/frame-imageb';
+	// import {
+	// 	ConnectedDevice,
+	// 	Lifecycle,
+	// 	Raw,
+	// 	FakeConnectedDevice,
+	// 	WriteOptions,
+	// } from '@psdk/frame-father';
+	// import {
+	// 	CBar,
+	// 	CBox,
+	// 	CForm,
+	// 	CImage,
+	// 	CLine,
+	// 	CCodeRotation,
+	// 	CCodeType,
+	// 	CPage,
+	// 	CText,
+	// 	CFont,
+	// 	CBold,
+	// 	CRotation,
+	// 	CInverse,
+	// 	CMag,
+	// 	CQRCode,
+	// 	CCorrectLevel,
+	// 	CSN,
+	// 	CStatus,
+	// } from "@psdk/cpcl";
+	// import {
+	// 	EImage
+	// } from "@psdk/esc";
 	export default {
+		components: {labelPrinterComponentVue},
 	    data() {
 	        return {
 				userInfo:getUserInfo(),
@@ -154,6 +158,7 @@
 				listData:[],
 				printItem:'',
 				
+				printInfo:"",
 				maskShow:false,
 				discoveredDevices: [], // 鏌ヨ鍒扮殑璁惧
 				connectedDeviceId: ""
@@ -165,30 +170,30 @@
 			this.HEntryID = e.hsubid
 			this.getData()
 			
-			//#ifdef APP-PLUS
-			// 钃濈墮
-			bluetoothTool.init({
-				listenBTStatusCallback: (state) => {
-					if (state == 'STATE_ON') {
-						console.log(state);
-					}
-				},
-				discoveryDeviceCallback: this.onDevice,
-				discoveryFinishedCallback: function() {
-					console.log("鎼滅储瀹屾垚");
-				},
-				readDataCallback: function(dataByteArr) {
-					/* if(that.receiveDataArr.length >= 200) {
-						that.receiveDataArr = [];
-					}
-					that.receiveDataArr.push.apply(that.receiveDataArr, dataByteArr); */
-					console.log("璇诲彇瀹屾垚" + dataByteArr);
-				},
-				connExceptionCallback: function(e) {
-					console.log(e);
-				}
-			});
-			//#endif
+			// //#ifdef APP-PLUS
+			// // 钃濈墮
+			// bluetoothTool.init({
+			// 	listenBTStatusCallback: (state) => {
+			// 		if (state == 'STATE_ON') {
+			// 			console.log(state);
+			// 		}
+			// 	},
+			// 	discoveryDeviceCallback: this.onDevice,
+			// 	discoveryFinishedCallback: function() {
+			// 		console.log("鎼滅储瀹屾垚");
+			// 	},
+			// 	readDataCallback: function(dataByteArr) {
+			// 		/* if(that.receiveDataArr.length >= 200) {
+			// 			that.receiveDataArr = [];
+			// 		}
+			// 		that.receiveDataArr.push.apply(that.receiveDataArr, dataByteArr); */
+			// 		console.log("璇诲彇瀹屾垚" + dataByteArr);
+			// 	},
+			// 	connExceptionCallback: function(e) {
+			// 		console.log(e);
+			// 	}
+			// });
+			// //#endif
 		},
 	    methods: {
 			getData(){
@@ -378,134 +383,156 @@
 					vm.connectedDeviceId = "";
 				}
 			},
-			labelPrint(item) {
+			async labelPrint(item) {
 				// 鎵撳嵃
 				this.printItem = item
-				// 妫�鏌ヨ摑鐗欒繛鎺�
-				let btStatus = bluetoothTool.getBluetoothStatus()
-				if(btStatus != true) {
-					this.showToast("钃濈墮杩炴帴寮傚父!")
-					return
+				if (this.$printer.isConnected() === false) {
+					this.$refs.labelPrinter.openPopup()
+				} else {
+					this.printInfo = `! 0 200 200 300 1
+										PAGE-WIDTH 608
+										SETQRVER 3
+										B QR 450 30 M 2 U 5
+										LA,`+ this.printItem.鏉$爜缂栧彿 + `
+										ENDQR
+										T 24 0 24 40 瀹℃牳鏃ユ湡:`+ this.baseInfo.SHdate +`
+										T 24 0 24 80 鐗╂枡缂栫爜:`+ this.printItem.鐗╂枡浠g爜 +`
+										T 24 0 24 120 鐗╂枡鍚嶇О:`+ this.printItem.鐗╂枡鍚嶇О +`
+										T 24 0 24 160 瑙勬牸鍨嬪彿:`+ this.printItem.瑙勬牸鍨嬪彿 +`
+										T 24 0 24 200 鐗╂枡鏁伴噺:`+ this.baseInfo.HQty +`
+										T 24 0 24 240 鏉$爜鏁伴噺:`+ this.printItem.鏁伴噺 +`
+										FORM
+										PRINT`
+					await this.$nextTick(() => {
+						this.$refs.labelPrinter.execPrint()
+					})
 				}
 				
-				// 妫�鏌ユ槸鍚﹁繛鎺ヨ澶�
-				let pairedDevices = bluetoothTool.getPairedDevices()
-				if(pairedDevices.length < 1) {
-					this.showToast("鏃犺澶囪繛鎺�!")
-					return
-				}
+				// // 妫�鏌ヨ摑鐗欒繛鎺�
+				// let btStatus = bluetoothTool.getBluetoothStatus()
+				// if(btStatus != true) {
+				// 	this.showToast("钃濈墮杩炴帴寮傚父!")
+				// 	return
+				// }
 				
-				// 妫�鏌ヨ〃鍗曢」鏄惁鏈夌┖鍊�
-				for (var key in this.hform) {
-					if (this.hform[key] == "") {
-						// todo 鎻愮ず琛ㄥ崟椤逛笉鑳戒负绌�
-						this.showToast("琛ㄥ崟涓嶈兘鏈夌┖鍊�!")
-						return
-					}
-				}
-				this.printWrite()
+				// // 妫�鏌ユ槸鍚﹁繛鎺ヨ澶�
+				// let pairedDevices = bluetoothTool.getPairedDevices()
+				// if(pairedDevices.length < 1) {
+				// 	this.showToast("鏃犺澶囪繛鎺�!")
+				// 	return
+				// }
+				
+				// // 妫�鏌ヨ〃鍗曢」鏄惁鏈夌┖鍊�
+				// for (var key in this.hform) {
+				// 	if (this.hform[key] == "") {
+				// 		// todo 鎻愮ず琛ㄥ崟椤逛笉鑳戒负绌�
+				// 		this.showToast("琛ㄥ崟涓嶈兘鏈夌┖鍊�!")
+				// 		return
+				// 	}
+				// }
+				// this.printWrite()
 			},
-			showToast(msg, status = "none") {
-				uni.showToast({
-					title: msg,
-					icon: status,
-					duration: 2000
-				});
-			},
-			///杞垚瀹夊崜鏈夌鍙风殑
-			uint8ArrayToSignedArray(uint8Array) {
-				let signedArray = new Array(uint8Array.length);
-				for (let i = 0; i < uint8Array.length; i++) {
-					if (uint8Array[i] >= 128) {
-						signedArray[i] = uint8Array[i] - 256;
-					} else {
-						signedArray[i] = uint8Array[i];
-					}
-				}
-				return signedArray;
-			},
-			async printWrite(type = "cpcl") {
-				const vm = this;
-				console.log("寮�濮嬫墦鍗�------------------")
-				switch (type) {
-					case "cpcl":
-						await vm.writeCpclModel();
-						break;
-				}
-			},
-			async writeCpclModel() {
-				const vm = this;
-				try {
-					const cpcl = await vm.$printer.cpcl().clear()
-						.page(new CPage({
-							width: 608,
-							height: 300
-						}))
-						.qrcode(new CQRCode({
-							x: 450,
-							y: 30,
-							width: 5,
-							content: vm.printItem.鏉$爜缂栧彿,
-							codeRotation: CCodeRotation.ROTATION_0,
-							level: CCorrectLevel.L
-						}))
-						.text(new CText({
-							x: 24,
-							y: 40,
-							content: vm.baseInfo.SHdate?"瀹℃牳鏃ユ湡: " + vm.baseInfo.SHdate : "瀹℃牳鏃ユ湡: ",
-							font: CFont.TSS24
-						}))
-						.text(new CText({
-							x: 24,
-							y: 80,
-							content: "鐗╂枡缂栫爜: " + vm.printItem.鐗╂枡浠g爜,
-							font: CFont.TSS24
-						}))
-						.text(new CText({
-							x: 24,
-							y: 120,
-							content: "鐗╂枡鍚嶇О: " + vm.printItem.鐗╂枡鍚嶇О,
-							font: CFont.TSS24
-						}))
-						.text(new CText({
-							x: 24,
-							y: 160,
-							content: "瑙勬牸鍨嬪彿: " + vm.printItem.瑙勬牸鍨嬪彿,
-							font: CFont.TSS24
-						}))
-						.text(new CText({
-							x: 24,
-							y: 200,
-							content: "鐗╂枡鏁伴噺: " + vm.baseInfo.HQty,
-							font: CFont.TSS24
-						}))
-						.text(new CText({
-							x: 24,
-							y: 240,
-							content: "鏉$爜鏁伴噺: " + vm.printItem.鏁伴噺,
-							font: CFont.TSS24
-						}))
+			// showToast(msg, status = "none") {
+			// 	uni.showToast({
+			// 		title: msg,
+			// 		icon: status,
+			// 		duration: 2000
+			// 	});
+			// },
+			// ///杞垚瀹夊崜鏈夌鍙风殑
+			// uint8ArrayToSignedArray(uint8Array) {
+			// 	let signedArray = new Array(uint8Array.length);
+			// 	for (let i = 0; i < uint8Array.length; i++) {
+			// 		if (uint8Array[i] >= 128) {
+			// 			signedArray[i] = uint8Array[i] - 256;
+			// 		} else {
+			// 			signedArray[i] = uint8Array[i];
+			// 		}
+			// 	}
+			// 	return signedArray;
+			// },
+			// async printWrite(type = "cpcl") {
+			// 	const vm = this;
+			// 	console.log("寮�濮嬫墦鍗�------------------")
+			// 	switch (type) {
+			// 		case "cpcl":
+			// 			await vm.writeCpclModel();
+			// 			break;
+			// 	}
+			// },
+			// async writeCpclModel() {
+			// 	const vm = this;
+			// 	try {
+			// 		const cpcl = await vm.$printer.cpcl().clear()
+			// 			.page(new CPage({
+			// 				width: 608,
+			// 				height: 300
+			// 			}))
+			// 			.qrcode(new CQRCode({
+			// 				x: 450,
+			// 				y: 30,
+			// 				width: 5,
+			// 				content: vm.printItem.鏉$爜缂栧彿,
+			// 				codeRotation: CCodeRotation.ROTATION_0,
+			// 				level: CCorrectLevel.L
+			// 			}))
+			// 			.text(new CText({
+			// 				x: 24,
+			// 				y: 40,
+			// 				content: vm.baseInfo.SHdate?"瀹℃牳鏃ユ湡: " + vm.baseInfo.SHdate : "瀹℃牳鏃ユ湡: ",
+			// 				font: CFont.TSS24
+			// 			}))
+			// 			.text(new CText({
+			// 				x: 24,
+			// 				y: 80,
+			// 				content: "鐗╂枡缂栫爜: " + vm.printItem.鐗╂枡浠g爜,
+			// 				font: CFont.TSS24
+			// 			}))
+			// 			.text(new CText({
+			// 				x: 24,
+			// 				y: 120,
+			// 				content: "鐗╂枡鍚嶇О: " + vm.printItem.鐗╂枡鍚嶇О,
+			// 				font: CFont.TSS24
+			// 			}))
+			// 			.text(new CText({
+			// 				x: 24,
+			// 				y: 160,
+			// 				content: "瑙勬牸鍨嬪彿: " + vm.printItem.瑙勬牸鍨嬪彿,
+			// 				font: CFont.TSS24
+			// 			}))
+			// 			.text(new CText({
+			// 				x: 24,
+			// 				y: 200,
+			// 				content: "鐗╂枡鏁伴噺: " + vm.baseInfo.HQty,
+			// 				font: CFont.TSS24
+			// 			}))
+			// 			.text(new CText({
+			// 				x: 24,
+			// 				y: 240,
+			// 				content: "鏉$爜鏁伴噺: " + vm.printItem.鏁伴噺,
+			// 				font: CFont.TSS24
+			// 			}))
 
-						.form(new CForm()) //鏍囩绾搁渶瑕佸姞瀹氫綅鎸囦护
-						.print();
-					console.log(cpcl.command().string());
-					var binary = cpcl.command().binary();
-					await this.sendMessage(Array.from(this.uint8ArrayToSignedArray(binary)));
-				} catch (e) {
-					console.error(e);
-					uni.showToast({
-						title: '澶辫触',
-					});
-				}
-			},
-			async sendMessage(cmd) {
-				console.log(cmd);
-				const result = bluetoothTool.sendByteData(cmd);
-				uni.showToast({
-					icon: 'none',
-					title: result ? '鍙戦�佹垚鍔燂紒' : '鍙戦�佸け璐�...'
-				})
-			},
+			// 			.form(new CForm()) //鏍囩绾搁渶瑕佸姞瀹氫綅鎸囦护
+			// 			.print();
+			// 		console.log(cpcl.command().string());
+			// 		var binary = cpcl.command().binary();
+			// 		await this.sendMessage(Array.from(this.uint8ArrayToSignedArray(binary)));
+			// 	} catch (e) {
+			// 		console.error(e);
+			// 		uni.showToast({
+			// 			title: '澶辫触',
+			// 		});
+			// 	}
+			// },
+			// async sendMessage(cmd) {
+			// 	console.log(cmd);
+			// 	const result = bluetoothTool.sendByteData(cmd);
+			// 	uni.showToast({
+			// 		icon: 'none',
+			// 		title: result ? '鍙戦�佹垚鍔燂紒' : '鍙戦�佸け璐�...'
+			// 	})
+			// },
 	    }
 	}
 </script>
diff --git a/static/icon/icon30.png b/static/icon/icon30.png
new file mode 100644
index 0000000..a48cca0
--- /dev/null
+++ b/static/icon/icon30.png
Binary files differ
diff --git a/static/icon/icon31.png b/static/icon/icon31.png
new file mode 100644
index 0000000..0f11083
--- /dev/null
+++ b/static/icon/icon31.png
Binary files differ
diff --git a/static/icon/icon32.png b/static/icon/icon32.png
new file mode 100644
index 0000000..322a51d
--- /dev/null
+++ b/static/icon/icon32.png
Binary files differ
diff --git a/static/icon/icon_a30.png b/static/icon/icon_a30.png
new file mode 100644
index 0000000..bd5da7c
--- /dev/null
+++ b/static/icon/icon_a30.png
Binary files differ
diff --git a/static/icon/icon_a31.png b/static/icon/icon_a31.png
new file mode 100644
index 0000000..f85d413
--- /dev/null
+++ b/static/icon/icon_a31.png
Binary files differ
diff --git a/static/icon/icon_a32.png b/static/icon/icon_a32.png
new file mode 100644
index 0000000..e4a2b5d
--- /dev/null
+++ b/static/icon/icon_a32.png
Binary files differ
diff --git a/static/images/newVer.png b/static/images/newVer.png
new file mode 100644
index 0000000..88d5f1c
--- /dev/null
+++ b/static/images/newVer.png
Binary files differ

--
Gitblit v1.9.1