From d192710b103db633b04b7e2da4442cbf1fd25450 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期二, 22 七月 2025 13:46:45 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/qitarukujiaoyan/form.vue              |  956 +++++++
 pages.json                                  |  591 ++--
 pages/xiaoshouchukujiaoyan/table.vue        |    2 
 utils/common.js                             |   72 
 pages/caigourukujiaoyan/form.vue            |  954 +++++++
 pages/qitarukujiaoyan/table.vue             |  497 +++
 pages/qitachukujiaoyan/detail.vue           |   20 
 pages/xiaoshouchukujiaoyan/form.vue         |   43 
 pages/shengchanbuliaojiaoyan/CacheList.vue  |   10 
 pages/weiwailingliaojiaoyan/form.vue        |   43 
 pages/xiaoshouchuku/table.vue               |    2 
 pages/shengchanbuliaojiaoyan/form.vue       |   57 
 pages/caigourukujiaoyan/table.vue           |  521 ++++
 pages/weiwaibuliaojiaoyan/table.vue         |  521 ++++
 pages/weiwailingliaojiaoyan/table.vue       |    8 
 pages/shengchanlingliaoshengdan/table.vue   |  495 +++
 pages/qitachukujiaoyan/qitachukujiaoyan.vue |    2 
 pages/weiwaibuliaojiaoyan/form.vue          |  947 +++++++
 components/BillListPopup/BillListPopup.vue  |  233 +
 pages/index/index.vue                       |   24 
 pages/shengchanlingliaoshengdan/form.vue    | 1491 +++++++++++
 21 files changed, 7,128 insertions(+), 361 deletions(-)

diff --git a/components/BillListPopup/BillListPopup.vue b/components/BillListPopup/BillListPopup.vue
new file mode 100644
index 0000000..d8d9433
--- /dev/null
+++ b/components/BillListPopup/BillListPopup.vue
@@ -0,0 +1,233 @@
+<template>
+	<view>
+		<uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+			<view class="content">
+				<view class="search-condition">
+					<view class="title"><text>婧愬崟鍗曞彿: </text></view>
+					<view class="right"><input type="text" v-model="HSourceBillNo" /></view>
+				</view>
+				<view class="search-condition">
+					<view class="title"><text>鐗╂枡: </text></view>
+					<view class="right"><input type="text" v-model="HMater" /></view>
+				</view>
+				<view class="search-condition">
+					<view class="title"><text>鍏宠仈椤�: </text></view>
+					<view class="right"><input type="text" v-model="HCustom" /></view>
+				</view>
+				<view class="buttons">
+					<view style="flex: 1;"></view>
+					<button size="mini" type="primary" @click="search">鎼滅储</button>
+					<button size="mini" type="primary" @click="exit">閫�鍑�</button>
+				</view>
+				<scroll-view scroll-y="true" style="height: 40vh;">
+					<view class="options-wrapper">
+						<uni-card v-for="bill in HBillList[curPage-1]" :key="bill.HSourceEntryID"
+							@tap="clickCard(bill['HSourceInterID'], bill['鍗曟嵁鍙�'])">
+							<view class="item">
+								<view class="left">鍗曟嵁鍙�: </view>
+								<view class="right">{{bill['鍗曟嵁鍙�']}}</view>
+							</view>
+							<view class="item">
+								<view class="left">鐗╂枡浠ｇ爜: </view>
+								<view class="right">{{bill['鐗╂枡浠ｇ爜']}}</view>
+							</view>
+							<view class="item">
+								<view class="left">鐗╂枡鍚嶇О: </view>
+								<view class="right">{{bill['鐗╂枡鍚嶇О']}}</view>
+							</view>
+							<view class="item">
+								<view class="left">瑙勬牸鍨嬪彿: </view>
+								<view class="right">{{bill['瑙勬牸鍨嬪彿']}}</view>
+							</view>
+							<view class="item">
+								<view class="left">鏁伴噺: </view>
+								<view class="right">{{bill['鏁伴噺']}}</view>
+							</view>
+						</uni-card>
+					</view>
+				</scroll-view>
+				<uni-pagination title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size" :total="length"></uni-pagination>
+			</view>
+
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		CommonUtils
+	} from '../../utils/common';
+	export default {
+		name: "BillListPopup",
+		data() {
+			return {
+				size: 20,
+				curPage: 1,
+				length: 0,
+				page: 0,
+				HSourceBillNo: '',
+				HMater: '',
+				HCustom: '',
+				HBillList: [],
+			};
+		},
+		props: {
+			HBillType: {
+				type: [String, Number],
+				required: true
+			},
+			HSourceBillType: {
+				type: [String, Number],
+				required: true
+			},
+			HStockOrgID: {
+				type: [String, Number],
+				required: true
+			},
+		},
+		model: {
+			prop: "HSourceBill",
+			event: 'change'
+		},
+		methods: {
+			popupChangeHandler(e) {
+				if (e.show === true) {
+					this.getBillList()
+				} else {
+					// 娓呯悊璧勬簮
+					this.size = 50
+					this.curPage = 1
+					this.length = 0
+					this.page = 0
+					this.HSourceBillNo = ''
+					this.HMater = ''
+					this.HCustom = ''
+					this.HBillList = []
+				}
+			},
+			exit() {
+				this.$refs.popup.close();
+			},
+			search() {
+				this.getBillList()
+			},
+			showPopup() {
+				this.$refs.popup.open();
+			},
+			clickCard(interid, billno) {
+				uni.$emit('BillSelectComplete', {
+					HInterID: interid,
+					HBillNo: billno
+				})
+				// this.exit()
+			},
+			getBillList() {
+				CommonUtils.doRequest(
+					"/WEBSController/GetSourceBillList_Json", {
+						HBilltype: this.HBillType,
+						HSourceBillType: this.HSourceBillType,
+						HStockOrgID: this.HStockOrgID,
+						HSourceBillNo: this.HSourceBillNo || "",
+						HMater: this.HMater || "",
+						HCustom: this.HCustom || ""
+					},
+					(res) => {
+						let {
+							data,
+							count,
+							Message
+						} = res.data
+						if (count == 1) {
+							console.log(data)
+							this.length = data.length
+
+							const result = [];
+							for (let i = 0; i < data.length; i += this.size) {
+								result.push(data.slice(i, i + this.size));
+							}
+							this.HBillList = result
+							this.page = result.length
+							console.log(this.page)
+						} else {
+							uni.showToast({
+								icon: 'none',
+								Message: Message
+							})
+						}
+					}
+				)
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		box-sizing: border-box;
+		border-radius: 15rpx 15rpx 0 0;
+		padding: 20rpx 20rpx 40rpx 20rpx;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		gap: 10rpx;
+
+		.search-condition {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			gap: 20rpx;
+
+			.title {
+				width: 5rem;
+				text-align: right;
+			}
+
+			.right {
+				flex: 1;
+				border-radius: 22rpx;
+				border: 1px solid #acacac;
+
+				input {
+					width: 100%;
+					padding: 8rpx 20rpx;
+					font-size: 24rpx;
+				}
+			}
+		}
+
+		.buttons {
+			display: flex;
+			flex-direction: row;
+			gap: 20rpx;
+			justify-content: flex-end;
+
+			>button {
+				display: inline-flex;
+				width: 4rem;
+			}
+		}
+
+		.options-wrapper {
+			padding: 20rpx;
+			display: grid;
+			grid-template-columns: repeat(2, 1fr);
+			gap: 20rpx;
+
+			>view {
+				margin: 0 !important;
+				box-sizing: border-box;
+				
+			}
+			
+			.item {
+				.left {
+					display: inline-block;
+				}
+				
+				.right {
+					display: inline-block;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b686e40..b1f8253 100644
--- a/pages.json
+++ b/pages.json
@@ -2,7 +2,7 @@
 	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/login",
-			
+
 			"style": {
 				"navigationBarTitleText": "鐧诲綍",
 				"navigationStyle": "custom"
@@ -164,7 +164,7 @@
 				"navigationBarTitleText": "棣栦欢妫�楠屽崟",
 				"enablePullDownRefresh": true
 			}
-		},{
+		}, {
 			"path": "pages/gongxuIn/form",
 			"style": {
 				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
@@ -176,7 +176,7 @@
 				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
 				"enablePullDownRefresh": true
 			}
-		},{
+		}, {
 			"path": "pages/gongxuOut/form",
 			"style": {
 				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
@@ -372,298 +372,301 @@
 			}
 		},
 		{
-					"path": "pages/labelPrinter/index",
-					"style": {
-						"navigationBarTitleText": "鏍囩鎵撳嵃"
-					}
-				},
-				{
-					"path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
-					"style": {
-						"navigationBarTitleText": "璁惧杩愯鐘舵��",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/shebeiyunxingzhuangtai/detail",
-					"style": {
-						"navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
-					}
-				},
-				{
-					"path": "pages/mujvzhuangtai/mujvzhuangtai",
-					"style": {
-						"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/mujvzhuangtai/detail",
-					"style": {
-						"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
-					}
-				},
-				{
-					"path": "pages/tiaomachaima/tiaomachaima",
-					"style": {
-						"navigationBarTitleText": "鏉＄爜鎷嗙爜"
-					}
-				},
-				{
-					"path": "pages/wuliaosaoma/wuliaosaoma",
-					"style": {
-						"navigationBarTitleText": "鐗╂枡娓呭崟"
-					}
-				},
-				{
-					"path": "pages/wuliaosaoma/detail",
-					"style": {
-						"navigationBarTitleText": "鏉＄爜妗ｆ"
-					}
-				},
-				{
-					"path": "pages/caigouruku/table",
-					"style": {
-						"navigationBarTitleText": "閲囪喘鍏ュ簱",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/caigouruku/form",
-					"style": {
-						"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
-					}
-				},
-				{
-					"path": "pages/caigoutuiliao/table",
-					"style": {
-						"navigationBarTitleText": "閲囪喘閫�鏂�",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/caigoutuiliao/form",
-					"style": {
-						"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
-					}
-				},
-				{
-					"path": "pages/xiaoshouchuku/table",
-					"style": {
-						"navigationBarTitleText": "閿�鍞嚭搴�",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/xiaoshouchuku/form",
-					"style": {
-						"navigationBarTitleText": "閿�鍞嚭搴撳崟"
-					}
-				},
-				{
-					"path": "pages/xiaoshoutuihuo/table",
-					"style": {
-						"navigationBarTitleText": "閿�鍞��璐�",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/xiaoshoutuihuo/form",
-					"style": {
-						"navigationBarTitleText": "閿�鍞��璐у崟"
-					}
-				},
-				{
-					"path": "pages/qitachuku/qitachuku",
-					"style": {
-						"navigationBarTitleText": "鍏朵粬鍑哄簱",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/qitachuku/form",
-					"style": {
-						"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
-					}
-				},
-				{
-					"path": "pages/qitaruku/qitaruku",
-					"style": {
-						"navigationBarTitleText": "鍏朵粬鍏ュ簱",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "pages/qitaruku/form",
-					"style": {
-						"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-					}
-				}, 
-				{
-					"path": "pages/tiaomadaying/tiaomadaying",
-					"style": {
-						"navigationBarTitleText": "鏉ユ枡鏉＄爜鎵撳嵃"
-					}
-				},
-				{
-					"path": "pages/caigoudingdan/generate",
-					"style": {
-						"navigationBarTitleText": "鏉＄爜鐢熸垚"
-					}
-				},
-				{
-					"path": "pages/caigoudingdan/caigoudingdan",
-					"style": {
-						"navigationBarTitleText": "閲囪喘璁㈠崟"
-					}
-				},
-				{
-					"path" : "pages/MJGL/shangmudan/table",
-					"style" : 
-					{
-						"navigationBarTitleText" : "涓婃ā鍗�"
-					}
-				},
-				{
-					"path" : "pages/MJGL/shangmudan/form",
-					"style" : 
-					{
-						"navigationBarTitleText" : "涓婃ā鍗�"
-					}
-				},
-				{
-					"path" : "pages/qitachukujiaoyan/qitachukujiaoyan",
-					"style" : 
-					{
-						"navigationBarTitleText" : "鍏朵粬鍑哄簱鏍￠獙",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path" : "pages/qitachukujiaoyan/detail",
-					"style" : 
-					{
-						"navigationBarTitleText" : "鍏朵粬鍑哄簱鍗曟牎楠�"
-					}
-				},
-				{
-					"path" : "pages/shengchanbuliaojiaoyan/CacheList",
-					"style" : 
-					{
-						"navigationBarTitleText" : "鐢熶骇琛ユ枡鏍￠獙",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path" : "pages/shengchanbuliaojiaoyan/form",
-					"style" : 
-					{
-						"navigationBarTitleText" : "鐢熶骇琛ユ枡鍗曟牎楠�"
-					}
-				},
-				{
-					"path" : "pages/xiaoshouchukujiaoyan/table",
-					"style" : 
-					{
-						"navigationBarTitleText" : "閿�鍞嚭搴撴牎楠�",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path" : "pages/xiaoshouchukujiaoyan/form",
-					"style" : 
-					{
-						"navigationBarTitleText" : "閿�鍞嚭搴撳崟鏍￠獙"
-					}
-				},
-				{
-					"path" : "pages/weiwailingliaojiaoyan/table",
-					"style" : 
-					{
-						"navigationBarTitleText" : "濮斿棰嗘枡鏍￠獙",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path" : "pages/weiwailingliaojiaoyan/form",
-					"style" : 
-					{
-						"navigationBarTitleText" : "濮斿棰嗘枡鍗曟牎楠�"
-					}
-				},
-				{
-					"path" : "pages/caigourukujiaoyan/table",
-					"style" : 
-					{
-						"navigationBarTitleText" : "閲囪喘鍏ュ簱鏍￠獙"
-					}
-				},
-				{
-					"path" : "pages/caigourukujiaoyan/form",
-					"style" : 
-					{
-						"navigationBarTitleText" : "閲囪喘鍏ュ簱鍗曟牎楠�"
-					}
-				},
-				{
-					"path" : "pages/qitarukujiaoyan/table",
-					"style" : 
-					{
-						"navigationBarTitleText" : "鍏朵粬鍏ュ簱鏍￠獙"
-					}
-				},
-				{
-					"path" : "pages/qitarukujiaoyan/form",
-					"style" : 
-					{
-						"navigationBarTitleText" : "鍏朵粬鍏ュ簱鍗曟牎楠�"
-					}
-				},
-				{
-					"path" : "pages/weiwaibuliaojiaoyan/table",
-					"style" : 
-					{
-						"navigationBarTitleText" : "濮斿琛ユ枡鏍￠獙"
-					}
-				},
-				{
-					"path" : "pages/weiwaibuliaojiaoyan/form",
-					"style" : 
-					{
-						"navigationBarTitleText" : "濮斿琛ユ枡鍗曟牎楠�"
-					}
-				}
+			"path": "pages/labelPrinter/index",
+			"style": {
+				"navigationBarTitleText": "鏍囩鎵撳嵃"
+			}
+		},
+		{
+			"path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
+			"style": {
+				"navigationBarTitleText": "璁惧杩愯鐘舵��",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shebeiyunxingzhuangtai/detail",
+			"style": {
+				"navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
+			}
+		},
+		{
+			"path": "pages/mujvzhuangtai/mujvzhuangtai",
+			"style": {
+				"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/mujvzhuangtai/detail",
+			"style": {
+				"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
+			}
+		},
+		{
+			"path": "pages/tiaomachaima/tiaomachaima",
+			"style": {
+				"navigationBarTitleText": "鏉＄爜鎷嗙爜"
+			}
+		},
+		{
+			"path": "pages/wuliaosaoma/wuliaosaoma",
+			"style": {
+				"navigationBarTitleText": "鐗╂枡娓呭崟"
+			}
+		},
+		{
+			"path": "pages/wuliaosaoma/detail",
+			"style": {
+				"navigationBarTitleText": "鏉＄爜妗ｆ"
+			}
+		},
+		{
+			"path": "pages/caigouruku/table",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/caigouruku/form",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/caigoutuiliao/table",
+			"style": {
+				"navigationBarTitleText": "閲囪喘閫�鏂�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/caigoutuiliao/form",
+			"style": {
+				"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
+			}
+		},
+		{
+			"path": "pages/xiaoshouchuku/table",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshouchuku/form",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撳崟"
+			}
+		},
+		{
+			"path": "pages/xiaoshoutuihuo/table",
+			"style": {
+				"navigationBarTitleText": "閿�鍞��璐�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshoutuihuo/form",
+			"style": {
+				"navigationBarTitleText": "閿�鍞��璐у崟"
+			}
+		},
+		{
+			"path": "pages/qitachuku/qitachuku",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitachuku/form",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+			}
+		},
+		{
+			"path": "pages/qitaruku/qitaruku",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitaruku/form",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+			}
+		},
+		{
+			"path": "pages/tiaomadaying/tiaomadaying",
+			"style": {
+				"navigationBarTitleText": "鏉ユ枡鏉＄爜鎵撳嵃"
+			}
+		},
+		{
+			"path": "pages/caigoudingdan/generate",
+			"style": {
+				"navigationBarTitleText": "鏉＄爜鐢熸垚"
+			}
+		},
+		{
+			"path": "pages/caigoudingdan/caigoudingdan",
+			"style": {
+				"navigationBarTitleText": "閲囪喘璁㈠崟"
+			}
+		},
+		{
+			"path": "pages/MJGL/shangmudan/table",
+			"style": {
+				"navigationBarTitleText": "涓婃ā鍗�"
+			}
+		},
+		{
+			"path": "pages/MJGL/shangmudan/form",
+			"style": {
+				"navigationBarTitleText": "涓婃ā鍗�"
+			}
+		},
+		{
+			"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鏍￠獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitachukujiaoyan/detail",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/shengchanbuliaojiaoyan/CacheList",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡鏍￠獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shengchanbuliaojiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/xiaoshouchukujiaoyan/table",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/xiaoshouchukujiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍￠獙"
+			}
+		},
+		{
+			"path": "pages/weiwailingliaojiaoyan/table",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡鏍￠獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwailingliaojiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/caigourukujiaoyan/table",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鏍￠獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/caigourukujiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitarukujiaoyan/table",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鏍￠獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/qitarukujiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
+			}
+		},
+		{
+			"path": "pages/weiwaibuliaojiaoyan/table",
+			"style": {
+				"navigationBarTitleText": "濮斿琛ユ枡鏍￠獙",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/weiwaibuliaojiaoyan/form",
+			"style": {
+				"navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
+			}
+		},
+		{
+			"path" : "pages/shengchanlingliaoshengdan/table",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�"
+			}
+		},
+		{
+			"path" : "pages/shengchanlingliaoshengdan/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐢熶骇棰嗘枡鍗�"
+			}
+		}
 	],
 	"tabBar": {
-		 "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		 "selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		 "borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
-		 "backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		 "list": [{
-			 "pagePath": "pages/index/index",
-			 "iconPath":"static/tabBar/home.png",
-			 "selectedIconPath":"static/tabBar/home-default.png",
-			 "text": "棣栭〉"
-		 },
-		 {
-			 "pagePath": "pages/index/tab1",
-			 "iconPath":"static/tabBar/icon1.png",
-			 "selectedIconPath":"static/tabBar/icon1-default.png",
-			 "text": "妯″潡鍔熻兘"
-		 },
-		 {
-			 "pagePath": "pages/index/tab2",
-			 "iconPath":"static/tabBar/icon2.png",
-			 "selectedIconPath":"static/tabBar/icon2-default.png",
-			 "text": "鎶ヨ〃涓績"
-		 },
-		 {
-			"pagePath": "pages/index/mine",
-			"iconPath":"static/tabBar/user.png",
-			"selectedIconPath":"static/tabBar/user-default.png",
-			"text": "鎴戠殑"
-		 }]
-	 },
+		"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		"selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		"borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
+		"backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "static/tabBar/home-default.png",
+				"text": "棣栭〉"
+			},
+			{
+				"pagePath": "pages/index/tab1",
+				"iconPath": "static/tabBar/icon1.png",
+				"selectedIconPath": "static/tabBar/icon1-default.png",
+				"text": "妯″潡鍔熻兘"
+			},
+			{
+				"pagePath": "pages/index/tab2",
+				"iconPath": "static/tabBar/icon2.png",
+				"selectedIconPath": "static/tabBar/icon2-default.png",
+				"text": "鎶ヨ〃涓績"
+			},
+			{
+				"pagePath": "pages/index/mine",
+				"iconPath": "static/tabBar/user.png",
+				"selectedIconPath": "static/tabBar/user-default.png",
+				"text": "鎴戠殑"
+			}
+		]
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "璁惧绠＄悊",
@@ -672,4 +675,4 @@
 		"pageOrientation": "default"
 	},
 	"uniIdRouter": {}
-}
+}
\ No newline at end of file
diff --git a/pages/caigourukujiaoyan/form.vue b/pages/caigourukujiaoyan/form.vue
index 8183fd0..7d03330 100644
--- a/pages/caigourukujiaoyan/form.vue
+++ b/pages/caigourukujiaoyan/form.vue
@@ -1,22 +1,966 @@
 <template>
 	<view>
-		
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉＄爜:</view>
+				<view class="right">
+					<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" >
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<!-- <view class="righton"><input v-model="hform.HStockPlaceName"
+					  disabled 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" v-show="showHBillNo">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="right" style="width: 380rpx;">
+						<input name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+							@confirm="GetMeesageByBillNo(hform.HBarCode)" />
+					</view>
+					<uni-icons type="scan"
+						style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+						size="20" @click="toScanBillCode"></uni-icons>
+				</view>
+				<view class="form-item" v-show="!showHBillNo">
+					<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>
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉＄爜鏍稿
+				</label>
+			</view>
+			<view v-if="tabs == 2">
+				<view class="list" v-for="(item,index) in Materlist" :key="index">
+					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" 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" v-if="item.瑙勬牸鍨嬪彿">
+								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+							</view>
+							<view class="detail">
+								<text>鎵规锛�</text>{{item.鎵规}}
+							</view>
+							<view class="detail" v-if="item.杈呭姪灞炴��">
+								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+							</view>
+							<view class="detail" v-if="item.浠撳簱">
+								<text>浠撳簱锛�</text>{{item.浠撳簱}}
+							</view>
+							<view class="detail" v-if="item.浠撲綅">
+								<text>浠撲綅锛�</text>{{item.浠撲綅}}
+							</view>
+							<view class="detail" >
+								<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";
+	import {
+		CommonUtils
+	} from "@/utils/common.js"
 	export default {
 		data() {
 			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				HModName: 'Kf_POStockInBill_CheckList_PDA',
+				ModRightName: 'CE_POStockInCheck',
+				OperationType: 1,
 				
+				showHBillNo: true,
+				tabs: 1,
+				linterid: '',
+				HBillNo: '',
+
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+
+				Materlist: [],
+				hform: {
+					HBillType: 1201,
+					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'涓烘牳瀵癸級
+					chkHBarflag: false,
+					HBarflag: '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.HBillNo) {
+				this.hform.HBillNo = e.HBillNo
+				this.GetMeesageByBillNo(e.HBillNo)
+			} 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.hform.HBarCode = res.result
+						// this.GetMeesageByBillNo(this.hform.HBarCode)
+						this.getCode(this.hform.HBarCode)
+					}
+				});
+			},
+			toScanBillCode() {
+				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.hform.HBillNo = res.result
+						this.GetMeesageByBillNo(this.hform.HBillNo)
+					}
+				});
+			},
+			//鎵弿鍗曟嵁鍙锋潯鐮�
+			GetMeesageByBillNo(e) {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
+					data: {
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType,
+						HMaker: this.hform.HMaker,
+						HStockOrgID: this.hform.HStockOrgID
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							CommonUtils.playSound(1);
+							var data = res.data.data
+							console.log('鍗曟嵁淇℃伅: ', data)
+							this.hform.HInterID = data.hInterIDField
+							this.hform.HBillNo = data.hBillNoField
+							this.showHBillNo = false
+							//鏉＄爜鏍稿鏍囪
+							if (data.hSourceBarCodeFlagField) {
+								this.hform.HSourceBarCodeCtl = "Y"
+								this.hform.chkHBarflag = true
+								this.hform.HBarflag = data
+							}
+							this.tabs = 2
+							this.DisBillEntryList();
+						} else {
+							CommonUtils.playSound(0);
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+							this.hform.HBillNo = ''
+						}
+					},
+					fail: (res) => {
+						CommonUtils.playSound(0);
+						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;
+					}
+					console.log("鍗曟嵁淇℃伅: ", this.hform)
+					uni.request({
+						url: this.serverUrl + '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
+						data: {
+							sBarCode: sBarCode,
+							HBillID: this.hform.HInterID || 0,
+							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) {
+								CommonUtils.playSound(1);
+								var data = res.data.data
+								if (data.hBarTypeField == '浠撳簱鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = ''
+									this.hform.HStockPlaceID = 0
+									// if (data.hSPFlagField == 0) {
+									// 	this.showHStockPlaceName = false
+									// } else {
+									// 	this.showHStockPlaceName = true
+									// }
+								} else if (data.hBarTypeField == '浠撲綅鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = data.hSPNameField
+									this.hform.HStockPlaceID = data.hSPIDField
+								} else if (data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+									this.hform.HDeptName = data.hDeptNameField
+									this.hform.HDeptID = data.hDeptIDField
+									this.tabs = 1
+								} else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
+									this.hform.HSupName = data.hSupNameField
+									this.hform.HSupID = data.hSupIDField
+									if (data.hDeptIDField != 0) {
+										this.hform.HDeptID = data.hDeptIDField
+										this.hform.HDeptName = data.hDeptNameField
+									}
+									this.hform.HSourceBillNo = data.hSourceBillNoField
+									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+									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 {
+								CommonUtils.playSound(0);
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							CommonUtils.playSound(0);
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+			//鐗╂枡淇℃伅
+			DisBillEntryList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_New_Json',
+					data: {
+						HInterID: this.hform.HInterID,
+						HBillType: this.hform.HBillType,
+						HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl,
+						sWhere: ''
+					},
+					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.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
+								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+							}
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鍒犻櫎鐗╂枡鐮�
+			delMater(item) {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							uni.request({
+								url: this.serverUrl +
+									'/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBillType: this.hform.HBillType,
+									HSourceInterID: item.HSourceInterID,
+									HSourceEntryID: item.HSourceEntryID,
+									HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl
+								},
+								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() {
+				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_SavePOStockInBill_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/caigourukujiaoyan/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+
+									uni.showModal({
+										title: '娓╅Θ鎻愮ず',
+										content: res.data.Message,
+										showCancel: false
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}
+			},
+
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.navigateBack({
+								url: '/pages/caigourukujiaoyan/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.form {
+		width: 668rpx;
+		margin: 20rpx auto;
+		padding-bottom: 240rpx;
+	}
 
-</style>
+	.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;
+			flex: 1;
+		}
+
+		.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 {
+			flex: 1;
+			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;
+			}
+		}
+	}
+	.checkbox{
+		color: #888;
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		float: right;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/caigourukujiaoyan/table.vue b/pages/caigourukujiaoyan/table.vue
index 8183fd0..ce6fb16 100644
--- a/pages/caigourukujiaoyan/table.vue
+++ b/pages/caigourukujiaoyan/table.vue
@@ -1,22 +1,531 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<view class="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+			<view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
+		</view>
+
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+		<view class="form" v-if="tabs == 0">
+			<view class="buttons" @tap="add">
+				<uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+			</view>
+		</view>
+		<view class="form" v-if="tabs == 1">
+			<view class="form-item">
+				<view class="title">鍗曟嵁鍙�:</view>
+				<view class="right">
+					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">婧愬崟鍗曞彿:</view>
+				<view class="right">
+					<input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+				</view>
+			</view>
+			<view class="buttons">
+				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+			</view>
+		</view>
+
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+			<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
+						<text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+					</view>
+					<view class="detail" v-if="item.鏁伴噺">
+						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟鍗曞彿">
+						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+					</view>
+					<view class="detail" v-if="item.缁勭粐">
+						<text>缁勭粐锛�</text>{{item.缁勭粐}}
+					</view>
+				</view>
+
+				<view class="more">
+					<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+						<uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+					</view>
+					<view class="part" style="color: #da0000;" @tap.stop="del(item)">
+						<uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+					</view>
+				</view>
+			</uni-card>
+		</view>
+		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+			<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鏁伴噺">
+						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟鍗曞彿">
+						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+					</view>
+					<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
+						<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+					</view>
+					<view class="detail" v-if="item.鐗╂枡鍚嶇О">
+						<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: 1201,
+					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'))
+		},
+		onShow() {
+			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			this.CheckModRight()
+			this.changeTab(0)
+			console.log(this.userInfo, uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(() => {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		methods: {
-			
+			CheckModRight() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data: {
+						ModRightName: 'CE_POStockInCheck',
+						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: 1201,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				}
+				this.getList()
+			},
+			add() {
+				uni.navigateTo({
+					url: './form?OperationType=1'
+				})
+			},
+			//缂栬緫
+			edit(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: './form?OperationType=2&HBillNo=' + item.HBillNo
+				})
+				// 			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){
+
+				// 					}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>
+<style lang="scss" scoped>
+	.form {
+		width: 640rpx;
+		margin: 20rpx auto;
+		margin-top: 90rpx;
+	}
 
-</style>
+	.tabs {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		z-index: 9;
+		display: flex;
+		background-color: #e5e5e5;
+
+		view {
+			width: 50%;
+			font-size: 30rpx;
+			color: #333;
+			text-align: center;
+			padding: 16rpx 0;
+		}
+
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
+
+	.buttons {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #acacac;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+
+		.title {
+			width: 180rpx;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+
+		.righton {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	.list {
+		width: 100%;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+
+			.detail {
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.more {
+			color: #888;
+			font-size: 26rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9c9ea09..cc6ec2e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -227,6 +227,30 @@
 						url: '/pages/weiwailingliaojiaoyan/table',
 						id: 34,
 					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '閲囪喘鍏ュ簱鏍￠獙',
+						url: '/pages/caigourukujiaoyan/table',
+						id: 35,
+					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鍏朵粬鍏ュ簱鏍￠獙',
+						url: '/pages/qitarukujiaoyan/table',
+						id: 36,
+					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '濮斿琛ユ枡鏍￠獙',
+						url: '/pages/weiwaibuliaojiaoyan/table',
+						id: 37,
+					},
+					{
+						img: '../../static/icon/icon17.png',
+						text: '鐢熶骇棰嗘枡',
+						url: '/pages/shengchanlingliaoshengdan/table',
+						id: 38,
+					}, 
 				]
 			}
 		},
diff --git a/pages/qitachukujiaoyan/detail.vue b/pages/qitachukujiaoyan/detail.vue
index dd953a7..fb3a5c3 100644
--- a/pages/qitachukujiaoyan/detail.vue
+++ b/pages/qitachukujiaoyan/detail.vue
@@ -75,6 +75,9 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc" />鏉＄爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -217,7 +220,7 @@
 					HStockOrgName: uni.getStorageSync('Organization'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag: 1,
+					chkHBarflag: false,
 					HBarflag: 'Y',
 
 					HBarCode_B: '',
@@ -289,6 +292,7 @@
 					},
 					success: (res) => {
 						if (res.data.count == 1) {
+							CommonUtils.playSound(1);
 							var data = res.data.data
 							console.log('鍗曟嵁淇℃伅: ', data)
 							this.hform.HInterID = data.hInterIDField
@@ -303,6 +307,7 @@
 							this.tabs = 2
 							this.DisBillEntryList();
 						} else {
+							CommonUtils.playSound(0);
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -311,6 +316,7 @@
 						}
 					},
 					fail: (res) => {
+						CommonUtils.playSound(0);
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -432,6 +438,7 @@
 								HBarCode: sBarCode
 							},
 							success: (res) => {
+								CommonUtils.playSound(1);
 								console.log('鍒犻櫎鏉＄爜', res.data);
 								this.hform.HBarCode = ''
 								if (res.data.count == 1) {
@@ -445,6 +452,7 @@
 								}
 							},
 							fail: (res) => {
+								CommonUtils.playSound(0);
 								console.log(res);
 								uni.showToast({
 									title: '鎺ュ彛璇锋眰澶辫触',
@@ -479,9 +487,11 @@
 							// HCustom2: ""
 						},
 						success: (res) => {
+
 							console.log('鎵爜杩斿洖', res.data);
 							this.hform.HBarCode = ''
 							if (res.data.count == 1) {
+								CommonUtils.playSound(1);
 								var data = res.data.data
 								if (data.hBarTypeField == '浠撳簱鏉＄爜') {
 									this.hform.HWHName = data.hWhNameField
@@ -575,6 +585,7 @@
 							}
 						},
 						fail: (res) => {
+							CommonUtils.playSound(0);
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
@@ -944,4 +955,11 @@
 			}
 		}
 	}
+
+	.checkbox {
+		color: #888;
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		float: right;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/qitachukujiaoyan/qitachukujiaoyan.vue b/pages/qitachukujiaoyan/qitachukujiaoyan.vue
index c2b45e6..e393b5b 100644
--- a/pages/qitachukujiaoyan/qitachukujiaoyan.vue
+++ b/pages/qitachukujiaoyan/qitachukujiaoyan.vue
@@ -2,7 +2,7 @@
 	<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 :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
 		</view>
 		
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
diff --git a/pages/qitarukujiaoyan/form.vue b/pages/qitarukujiaoyan/form.vue
index 8183fd0..b5f2ba5 100644
--- a/pages/qitarukujiaoyan/form.vue
+++ b/pages/qitarukujiaoyan/form.vue
@@ -1,22 +1,966 @@
 <template>
 	<view>
-		
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉＄爜:</view>
+				<view class="right">
+					<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">
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<!-- <view class="righton"><input v-model="hform.HStockPlaceName"
+					  disabled 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" v-show="showHBillNo">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="right" style="width: 380rpx;">
+						<input name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+							@confirm="GetMeesageByBillNo(hform.HBarCode)" />
+					</view>
+					<uni-icons type="scan"
+						style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+						size="20" @click="toScanBillCode"></uni-icons>
+				</view>
+				<view class="form-item" v-show="!showHBillNo">
+					<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>
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc" />鏉＄爜鏍稿
+				</label>
+			</view>
+			<view v-if="tabs == 2">
+				<view class="list" v-for="(item,index) in Materlist" :key="index">
+					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" 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" v-if="item.瑙勬牸鍨嬪彿">
+								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+							</view>
+							<view class="detail">
+								<text>鎵规锛�</text>{{item.鎵规}}
+							</view>
+							<view class="detail" v-if="item.杈呭姪灞炴��">
+								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+							</view>
+							<view class="detail" v-if="item.浠撳簱">
+								<text>浠撳簱锛�</text>{{item.浠撳簱}}
+							</view>
+							<view class="detail" v-if="item.浠撲綅">
+								<text>浠撲綅锛�</text>{{item.浠撲綅}}
+							</view>
+							<view class="detail">
+								<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";
+	import {
+		CommonUtils
+	} from "@/utils/common.js"
 	export default {
 		data() {
 			return {
-				
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				HModName: 'Kf_OtherInBill_CheckList_PDA',
+				ModRightName: 'CE_OtherInCheck',
+				OperationType: 1,
+
+				showHBillNo: true,
+				tabs: 1,
+				linterid: '',
+				HBillNo: '',
+
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+
+				Materlist: [],
+				hform: {
+					HBillType: 1203,
+					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'涓烘牳瀵癸級
+					chkHBarflag: false,
+					HBarflag: '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.HBillNo) {
+				this.hform.HBillNo = e.HBillNo
+				this.GetMeesageByBillNo(e.HBillNo)
+			} 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.hform.HBarCode = res.result
+						// this.GetMeesageByBillNo(this.hform.HBarCode)
+						this.getCode(this.hform.HBarCode)
+					}
+				});
+			},
+			toScanBillCode() {
+				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.hform.HBillNo = res.result
+						this.GetMeesageByBillNo(this.hform.HBillNo)
+					}
+				});
+			},
+			//鎵弿鍗曟嵁鍙锋潯鐮�
+			GetMeesageByBillNo(e) {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
+					data: {
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType,
+						HMaker: this.hform.HMaker,
+						HStockOrgID: this.hform.HStockOrgID
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							CommonUtils.playSound(1);
+							var data = res.data.data
+							console.log('鍗曟嵁淇℃伅: ', data)
+							this.hform.HInterID = data.hInterIDField
+							this.hform.HBillNo = data.hBillNoField
+							this.showHBillNo = false
+							//鏉＄爜鏍稿鏍囪
+							if (data.hSourceBarCodeFlagField) {
+								this.hform.HSourceBarCodeCtl = "Y"
+								this.hform.chkHBarflag = true
+								this.hform.HBarflag = data
+							}
+							this.tabs = 2
+							this.DisBillEntryList();
+						} else {
+							CommonUtils.playSound(0);
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+							this.hform.HBillNo = ''
+						}
+					},
+					fail: (res) => {
+						CommonUtils.playSound(0);
+						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_CheckTypeByBarCode_BillCheck_Json',
+						data: {
+							sBarCode: sBarCode,
+							HBillID: this.hform.HInterID || 0,
+							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) {
+								CommonUtils.playSound(1);
+								var data = res.data.data
+								if (data.hBarTypeField == '浠撳簱鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = ''
+									this.hform.HStockPlaceID = 0
+									// if (data.hSPFlagField == 0) {
+									// 	this.showHStockPlaceName = false
+									// } else {
+									// 	this.showHStockPlaceName = true
+									// }
+								} else if (data.hBarTypeField == '浠撲綅鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = data.hSPNameField
+									this.hform.HStockPlaceID = data.hSPIDField
+								} else if (data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+									this.hform.HDeptName = data.hDeptNameField
+									this.hform.HDeptID = data.hDeptIDField
+									this.tabs = 1
+								} else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
+									this.hform.HSupName = data.hSupNameField
+									this.hform.HSupID = data.hSupIDField
+									if (data.hDeptIDField != 0) {
+										this.hform.HDeptID = data.hDeptIDField
+										this.hform.HDeptName = data.hDeptNameField
+									}
+									this.hform.HSourceBillNo = data.hSourceBillNoField
+									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+									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 {
+								CommonUtils.playSound(0);
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							CommonUtils.playSound(0);
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+			//鐗╂枡淇℃伅
+			DisBillEntryList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_New_Json',
+					data: {
+						HInterID: this.hform.HInterID,
+						HBillType: this.hform.HBillType,
+						HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl,
+						sWhere: ''
+					},
+					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.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
+								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+							}
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鍒犻櫎鐗╂枡鐮�
+			delMater(item) {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							uni.request({
+								url: this.serverUrl +
+									'/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBillType: this.hform.HBillType,
+									HSourceInterID: item.HSourceInterID,
+									HSourceEntryID: item.HSourceEntryID,
+									HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl
+								},
+								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() {
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忓崟鎹潯鐮侊紒',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else if (!this.Materlist || this.Materlist.length == 0) {
+					uni.showToast({
+						title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+						icon: 'none'
+					})
+				} else {
+					var s = 0;
+					for (var i = 0; i < this.Materlist.length; i++) {
+						if (this.Materlist[i].鏁伴噺 > 0) {
+							s = 1;
+						}
+					}
+					if (s == 0) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+						var sMainStr = JSON.stringify(this.hform);
+						uni.request({
+							url: this.serverUrl + '/WEBSController/set_SaveOtherInBill_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/qitaruku/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+
+									uni.showModal({
+										title: '娓╅Θ鎻愮ず',
+										content: res.data.Message,
+										showCancel: false
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}
+			},
+
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.navigateBack({
+								url: '/pages/qitaruku/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.form {
+		width: 668rpx;
+		margin: 20rpx auto;
+		padding-bottom: 240rpx;
+	}
 
-</style>
+	.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;
+			flex: 1;
+		}
+
+		.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 {
+			flex: 1;
+			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;
+			}
+		}
+	}
+
+	.checkbox {
+		color: #888;
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		float: right;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/qitarukujiaoyan/table.vue b/pages/qitarukujiaoyan/table.vue
index 8183fd0..d58c304 100644
--- a/pages/qitarukujiaoyan/table.vue
+++ b/pages/qitarukujiaoyan/table.vue
@@ -1,22 +1,503 @@
 <template>
-	<view>
+	<view class="content">
+		<view class="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+			<view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
+		</view>
 		
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+		
+		<view class="form" v-if="tabs == 0">
+			<view class="buttons" @tap="add">
+				<uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+			</view>
+		</view>
+		<view class="form" v-if="tabs == 1">
+			<view class="form-item">
+				<view class="title">鍗曟嵁鍙�:</view>
+				<view class="right">
+					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">婧愬崟鍗曞彿:</view>
+				<view class="right">
+					<input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+				</view>
+			</view>
+			<view class="buttons">
+				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+			</view>
+		</view>
+		
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+		
+		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+			<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
+						<text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+					</view>
+					<view class="detail" v-if="item.鏁伴噺">
+						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟鍗曞彿">
+						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+					</view>
+					<view class="detail" v-if="item.缁勭粐">
+						<text>缁勭粐锛�</text>{{item.缁勭粐}}
+					</view>
+				</view>
+
+				<view class="more">
+					<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+						<uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+					</view>
+					<view class="part" style="color: #da0000;" @tap.stop="del(item)">
+						<uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+					</view>
+				</view>
+			</uni-card>
+		</view>
+		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+			<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鏁伴噺">
+						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟鍗曞彿">
+						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+					</view>
+					<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
+						<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+					</view>
+					<view class="detail" v-if="item.鐗╂枡鍚嶇О">
+						<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 {
+	    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: 1203,
+					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'))
+		// },
+		onShow() {
+			this.CheckModRight()
+			this.changeTab(0)
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
 		},
-		methods: {
-			
-		}
+		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_OtherInCheck',
+						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: 1203,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				}
+				this.getList()
+			},
+			add(){
+				uni.navigateTo({
+					url:'./form?OperationType=1'
+				})
+			},
+			//缂栬緫
+			edit(item){
+				console.log(item)
+				uni.navigateTo({
+					url:'./form?OperationType=2&HBillNo=' + item.HBillNo
+				})
+	// 			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){
+							
+	// 					}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>
+<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/shengchanbuliaojiaoyan/CacheList.vue b/pages/shengchanbuliaojiaoyan/CacheList.vue
index 63fbb73..8044263 100644
--- a/pages/shengchanbuliaojiaoyan/CacheList.vue
+++ b/pages/shengchanbuliaojiaoyan/CacheList.vue
@@ -2,7 +2,7 @@
 	<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 :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
 		</view>
 		
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
@@ -128,7 +128,13 @@
 				page:1,
 	        }
 	    },
-		onLoad() {
+		// onLoad() {
+		// 	//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+		// 	this.CheckModRight()
+		// 	this.changeTab(0)
+		// 	console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		// },
+		onShow() {
 			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
 			this.CheckModRight()
 			this.changeTab(0)
diff --git a/pages/shengchanbuliaojiaoyan/form.vue b/pages/shengchanbuliaojiaoyan/form.vue
index 4acdf5a..c0a11f6 100644
--- a/pages/shengchanbuliaojiaoyan/form.vue
+++ b/pages/shengchanbuliaojiaoyan/form.vue
@@ -4,26 +4,30 @@
 			<view class="form-item">
 				<view class="title">鏉＄爜:</view>
 				<view class="right">
-					<input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="getCode(hform.HBarCode)"/>
+					<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>
+				<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="璇疯緭鍏ユ暟閲�"/>
+					<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>
+					<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" >
-					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				<view class="right">
+					<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>
@@ -70,6 +74,9 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc" />鏉＄爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -171,6 +178,9 @@
 	import {
 		getUserInfo
 	} from "@/utils/auth.js";
+	import {
+		CommonUtils
+	} from "@/utils/common.js"
 	export default {
 		data() {
 			return {
@@ -209,7 +219,7 @@
 					HStockOrgName: uni.getStorageSync('Organization'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag: 1,
+					chkHBarflag: false,
 					HBarflag: 'Y',
 
 					HBarCode_B: '',
@@ -233,8 +243,21 @@
 			} else {
 				// this.getNewData()
 			}
-			
-			
+
+
+			this.getHBaseList()
+		},
+		onLoad(e) {
+			console.log(e, this.userInfo)
+			this.OperationType = e.OperationType
+			if (e.HBillNo) {
+				this.hform.HBillNo = e.HBillNo
+				this.GetMeesageByBillNo(e.HBillNo)
+			} else {
+				// this.getNewData()
+			}
+
+
 			this.getHBaseList()
 		},
 		methods: {
@@ -282,6 +305,7 @@
 					},
 					success: (res) => {
 						if (res.data.count == 1) {
+							CommonUtils.playSound(1)
 							var data = res.data.data
 							console.log('鍗曟嵁淇℃伅: ', data)
 							this.hform.HInterID = data.hInterIDField
@@ -296,6 +320,7 @@
 							this.tabs = 2
 							this.DisBillEntryList();
 						} else {
+							CommonUtils.playSound(0)
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -304,6 +329,7 @@
 						}
 					},
 					fail: (res) => {
+						CommonUtils.playSound(0)
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -476,6 +502,7 @@
 							console.log('鎵爜杩斿洖', res.data);
 							this.hform.HBarCode = ''
 							if (res.data.count == 1) {
+								CommonUtils.playSound(1)
 								var data = res.data.data
 								if (data.hBarTypeField == '浠撳簱鏉＄爜') {
 									this.hform.HWHName = data.hWhNameField
@@ -562,6 +589,7 @@
 								//娓呯┖鏁伴噺
 								this.hform.HQty = ''
 							} else {
+								CommonUtils.playSound(0)
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -569,6 +597,7 @@
 							}
 						},
 						fail: (res) => {
+							CommonUtils.playSound(0)
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
@@ -734,7 +763,7 @@
 									// 	title: res.data.Message,
 									// 	icon: 'none'
 									// })
-									
+
 									uni.showModal({
 										title: '娓╅Θ鎻愮ず',
 										content: res.data.Message,
@@ -935,5 +964,13 @@
 				text-align: center;
 			}
 		}
+
+	}
+
+	.checkbox {
+		color: #888;
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		float: right;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/shengchanlingliaoshengdan/form.vue b/pages/shengchanlingliaoshengdan/form.vue
new file mode 100644
index 0000000..ca5bc87
--- /dev/null
+++ b/pages/shengchanlingliaoshengdan/form.vue
@@ -0,0 +1,1491 @@
+<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> -->
+						<input type="text" name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ュ師鍗曞崟鍙�" />
+						
+					</view>
+					<uni-icons type="search"  v-show="showHSourceBillNo"
+						style="margin-left: 10rpx;background-color:  #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+						size="20" @click="showBillList"></uni-icons>
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ュ師鍗曞崟鍙�" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍏堣繘鍏堝嚭浠�:</view>
+					<view class="right">
+						<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.鐗╂枡浠ｇ爜" 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>
+		<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+	</view>
+</template>
+<script>
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				HModName: 'Kf_MateOutBill_PDA',
+				ModRightName: 'CE_MateOut',
+				OperationType: 1,
+				HInterID_Temp: '',
+
+				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: 1204,
+					HBillerID: uni.getStorageSync('HBillerID'),
+					HRedBlueFlag: false,
+
+					HBarCode: '',
+					HQty: '',
+					HWHName: getUserInfo().HWHName,
+					HWHID: getUserInfo().HWhID,
+					HStockPlaceName: getUserInfo().HSPName,
+					HStockPlaceID: getUserInfo().HSPID,
+
+					HMainSourceBillType: 3720,
+					HSourceBillNo: '', //CGDD000200
+					HFIFOWHName: '',
+					HFIFOWHID: '',
+					HDate: getDateTime.dateTimeStr('y-m-d'),
+					HMaker: uni.getStorageSync('HUserName'),
+					HBillNo: '',
+					HInterID: '',
+
+					HKeeperName: getUserInfo().HKeeper,
+					HKeeperID: getUserInfo().HKeeperID,
+					HSecManagerName: getUserInfo().HSecManager,
+					HSecManagerID: getUserInfo().HSecManagerID,
+					HDeptName: getUserInfo().HDept,
+					HDeptID: getUserInfo().HDeptID,
+					HSupName: '',
+					HSupID: '',
+					HStockOrgName: uni.getStorageSync('Organization'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+
+					HBarCode_B: '',
+					HMaterName_B: '',
+					HMaterModel_B: '',
+					HBatchNo_B: '',
+					HUnitName_B: '',
+					HQty_B: '',
+					HTMQty_B: '',
+					HWHName_B: '',
+					HSPName_B: '',
+				}
+			}
+		},
+		components: {BillListPopupVue},
+		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()
+			
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+				this.getHBarCodeData(e.HBillNo)
+				this.$refs.billList.exit()
+			})
+		},
+		beforeDestroy() {
+			uni.$off('BillSelectComplete')
+		},
+		methods: {
+			playSound(e) {
+				const innerAudioContext = uni.createInnerAudioContext();
+				if (e == 1) {
+					innerAudioContext.src = '/static/success.wav';
+				} else {
+					innerAudioContext.src = '/static/jingbao.wav';
+				}
+				innerAudioContext.play(); // 鎾斁闊抽
+			},
+			//鎵爜
+			toScanCode() {
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: (res) => {
+						console.log('鏉＄爜鍐呭锛�' + res.result);
+						if (this.hform.HBarCode == '*') {
+							this.hform.HBarCode = this.hform.HBarCode + res.result
+						} else {
+							this.hform.HBarCode = res.result
+						}
+
+						this.getCode(this.hform.HBarCode)
+					}
+				});
+			},
+			showBillList(){
+				this.$refs.billList.showPopup()
+			},
+			//鎵叾浠�(浠撳簱锛屼粨浣�)
+			// toScanData(e){
+			// 	uni.scanCode({
+			// 	    onlyFromCamera: true,
+			// 	    success: (res) => {
+			// 	        console.log('鏉＄爜鍐呭锛�' + res.result);
+			// 			var code = res.result
+			// 			if(e == 1){
+			// 				uni.request({
+			// 					url: this.serverUrl + '/WEBSController/GetWarehouse_Json', 
+			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID')},
+			// 					success: (res) => {
+			// 						this.hform.HStockPlaceID = 0
+			// 						this.hform.HStockPlaceName = ''
+			// 						this.showHStockPlaceName = true
+			// 						if(res.data.count == 1){
+			// 							var data = res.data.data[0]
+			// 							this.hform.HWHID = data.HItemID
+			// 							this.hform.HWHName = data.HName
+			// 							if (data.HSPFlag == 0) {
+			// 							    this.showHStockPlaceName = false
+			// 							}
+			// 						}else{
+			// 							this.hform.HWHID = 0
+			// 							this.hform.HWHName = ''
+			// 							uni.showToast({
+			// 								title:res.data.Message,
+			// 								icon:'none'
+			// 							})
+			// 						}
+			// 					},
+			// 					fail: (res) => {
+			// 						console.log(res);
+			// 						uni.showToast({
+			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+			// 							icon:'none'
+			// 						})
+			// 					},
+			// 				});
+			// 			}else if(e == 2){
+			// 				uni.request({
+			// 					url: this.serverUrl + '/WEBSController/GetStockPlace_Json', 
+			// 					data: {HBarCode:code,HStockOrgID:uni.getStorageSync('OrganizationID'),HWhID: this.hform.HWHID},
+			// 					success: (res) => {
+			// 						if(res.data.count == 1){
+			// 							var data = res.data.data[0]
+			// 							this.hform.HWHID = data.HWHID
+			// 							this.hform.HWHName = data.HWhName
+			// 							this.hform.HStockPlaceID = data.HItemID
+			// 							this.hform.HStockPlaceName = data.HName
+			// 						}else{
+			// 							this.hform.HWHID = 0
+			// 							this.hform.HWHName = ''
+			// 							this.hform.HStockPlaceID = 0
+			// 							this.hform.HStockPlaceName = ''
+			// 							uni.showToast({
+			// 								title:res.data.Message,
+			// 								icon:'none'
+			// 							})
+			// 						}
+			// 					},
+			// 					fail: (res) => {
+			// 						console.log(res);
+			// 						uni.showToast({
+			// 							title:'浠撳簱鏁版嵁璇锋眰澶辫触',
+			// 							icon:'none'
+			// 						})
+			// 					},
+			// 				});
+			// 			}
+			// 	    }
+			// 	});
+			// },
+			//鏃ユ湡
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
+			//鍩虹浠撳簱璧勬枡
+			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 = 3720
+					this.getHYDList()
+				} else if (this.HMainSourceBillType == '鐢熶骇澶囨枡鍗�') {
+					this.hform.HMainSourceBillType = 3721
+					this.getHYDList()
+				}else if (this.HMainSourceBillType == '鐢熶骇鍙戞枡閫氱煡鍗�') {
+					this.hform.HMainSourceBillType = 1214
+					this.getHYDList()
+				}else if (this.HMainSourceBillType == '鐢熶骇璁㈠崟') {
+					this.hform.HMainSourceBillType = 3710
+					this.getHYDList()
+				} else {
+					this.hform.HMainSourceBillType = -1
+					this.getHYDList()
+				}
+			},
+
+			//鑾峰彇瀹㈡埛鏁版嵁
+			getHSupList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Customer/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HSupNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHSupName[i] = res.data.data[i].瀹㈡埛鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '瀹㈡埛鏁版嵁璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨瀹㈡埛
+			HSupNameChange(e) {
+				for (var i = 0; i < this.HSupNameList.length; i++) {
+					if (this.HSupNameList[i].瀹㈡埛鍚嶇О == e) {
+						this.hform.HSupID = this.HSupNameList[i].HItemID
+						this.hform.HSupName = this.HSupNameList[i].瀹㈡埛鍚嶇О
+					}
+				}
+			},
+			//鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+			getHDeptList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Department/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HDeptNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHDeptName[i] = res.data.data[i].閮ㄩ棬鍚嶇О
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '閮ㄩ棬鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨浣跨敤閮ㄩ棬
+			HDeptNameChange(e) {
+				for (var i = 0; i < this.HDeptNameList.length; i++) {
+					if (this.HDeptNameList[i].閮ㄩ棬鍚嶇О == e) {
+						this.hform.HDeptID = this.HDeptNameList[i].HItemID
+						this.hform.HDeptName = this.HDeptNameList[i].閮ㄩ棬鍚嶇О
+					}
+				}
+			},
+			//鎿嶄綔鍛�
+			getHEmpList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetEmployeeList_Json',
+					data: {
+						Employee: '',
+						HGroupID: 0
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HEmpNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHEmpName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: '浜哄憳鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//淇濈
+			HKeeperNameChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						console.log(this.HEmpNameList[i])
+						this.hform.HKeeperID = this.HEmpNameList[i].HItemID
+						this.hform.HKeeperName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			//楠屾敹
+			HSecManagerNameChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HSecManagerID = this.HEmpNameList[i].HItemID
+						this.hform.HSecManagerName = this.HEmpNameList[i].HName
+					}
+				}
+			},
+			//閫変腑婧愬崟
+			getHBarCodeData(HBarCode) {
+				if (!this.hform.HFIFOWHName) {
+					this.hform.HFIFOWHID = 0
+				}
+				uni.request({
+					url: this.serverUrl + '/WEBSController/get_SourceBarCode_MateOut_Json',
+					data: {
+						HInterID: this.hform.HInterID,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType,
+						HSourceBillNo: HBarCode,
+						HSourceBillType: this.hform.HMainSourceBillType,
+						HMaker: this.hform.HMaker,
+						HStockOrgID: this.hform.HStockOrgID,
+						HFIFOWHID: this.hform.HFIFOWHID,
+						HPTQty: this.hform.HPTQty || 0,
+						HPlanMode: this.hform.HPlanMode || 0
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							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 == "") {
+						this.playSound(0)
+						uni.showToast({
+							title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						})
+					} else {
+						uni.request({
+							url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+							data: {
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBarCode: sBarCode
+							},
+							success: (res) => {
+								console.log('鍒犻櫎鏉＄爜', res.data);
+								this.hform.HBarCode = ''
+								if (res.data.count == 1) {
+									this.playSound(1)
+									this.hform.HQty = ''
+									this.DisBillEntryList()
+								} else {
+									this.playSound(0)
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								this.playSound(0)
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				} else {
+					var sBarCode = this.hform.HBarCode
+					if (sHQty == "") {
+						sHQty = 0;
+					}
+					uni.request({
+						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+						data: {
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HQty: sHQty,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							SourceFlag: HSourceFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HScanStyle: "",
+							HCustom1: "",
+							HCustom2: ""
+						},
+						success: (res) => {
+							console.log('鎵爜杩斿洖', res.data);
+							this.hform.HBarCode = ''
+							if (res.data.count == 1) {
+								this.playSound(1)
+								var data = res.data.data
+								if (data.hBarTypeField == '浠撳簱鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = ''
+									this.hform.HStockPlaceID = 0
+									if (data.hSPFlagField == 0) {
+										this.showHStockPlaceName = false
+									} else {
+										this.showHStockPlaceName = true
+									}
+								} else if (data.hBarTypeField == '浠撲綅鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = data.hSPNameField
+									this.hform.HStockPlaceID = data.hSPIDField
+								} else if (data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+									this.hform.HDeptName = data.hDeptNameField
+									this.hform.HDeptID = data.hDeptIDField
+									this.tabs = 1
+								} else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
+									this.hform.HSupName = data.hSupNameField
+									this.hform.HSupID = data.hSupIDField
+									if (data.hDeptIDField != 0) {
+										this.hform.HDeptID = data.hDeptIDField
+										this.hform.HDeptName = data.hDeptNameField
+									}
+									this.hform.HSourceBillNo = data.hSourceBillNoField
+									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+									this.hform.HMainSourceBillType = data.hSourceBillTypeField
+									if (data.hSourceBillTypeField == "3720") {
+										this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
+										this.hform.HMainSourceBillType = 3720
+										this.showHMainSourceBillType = false
+									} else if (data.hSourceBillTypeField == "3721") {
+										this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+										this.hform.HMainSourceBillType = 3721
+										this.showHMainSourceBillType = false
+									}  else if (data.hSourceBillTypeField == "1214") {
+										this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+										this.hform.HMainSourceBillType = 1214
+										this.showHMainSourceBillType = false
+									}  else if (data.hSourceBillTypeField == "3720") {
+										this.HMainSourceBillType = '鐢熶骇璁㈠崟'
+										this.hform.HMainSourceBillType = 3720
+										this.showHMainSourceBillType = false
+									} else {
+										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+										this.showHMainSourceBillType = false
+									}
+									if (data.hMulSourceFlagField == 0) {
+										this.showHSourceBillNo = false
+									}
+									//瀹㈡埛涓嶅彲缂栬緫
+									this.showHSupName = false
+									this.tabs = 2
+								} else { //鐗╂枡鏉＄爜
+									this.tabs = 2
+									if (!this.hform.HSourceBillNo) {
+										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+										this.showHMainSourceBillType = false
+										this.showHSourceBillNo = false
+									}
+								}
+								//鏄剧ず琛ㄤ綋鏄庣粏
+								this.DisBillEntryList()
+								//娓呯┖鏁伴噺
+								this.hform.HQty = ''
+							} else {
+								this.playSound(0)
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							this.playSound(0)
+							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 == 3720) {
+								this.hform.HMainSourceBillType = 3720
+								this.HMainSourceBillType = '鐢熶骇鐢ㄦ枡娓呭崟'
+								this.showHSupName = false
+							} else if (data.HSourceBillType == 3721) {
+								this.hform.HMainSourceBillType = 3721
+								this.HMainSourceBillType = '鐢熶骇澶囨枡鍗�'
+								this.showHSupName = false
+							}  else if (data.HSourceBillType == 1214) {
+								this.hform.HMainSourceBillType = 1214
+								this.HMainSourceBillType = '鐢熶骇鍙戞枡閫氱煡鍗�'
+								this.showHSupName = false
+							}  else if (data.HSourceBillType == 3710) {
+								this.hform.HMainSourceBillType = 3710
+								this.HMainSourceBillType = '鐢熶骇璁㈠崟'
+								this.showHSupName = false
+							} else {
+								this.hform.HMainSourceBillType = -1
+								this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+							}
+							this.showHMainSourceBillType = false
+
+							//闈炲婧愬崟妯″紡
+							if (data.HMulSourceBill == 0) {
+								this.showHSourceBillNo = false
+							}
+							this.hform.HDeptID = data.HDeptID
+							this.hform.HDeptName = data.HDeptName
+							this.hform.HSupID = data.HCusID
+							this.hform.HSupName = data.HCusName
+							this.DisBillEntryList()
+							this.tabs = 2
+						} else {
+							uni.showToast({
+								title: '鑾峰彇鏁版嵁鍥炲～澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			submit() {
+				//浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				if (!this.hform.HKeeperName) {
+					this.hform.HKeeperID = 0
+				}
+				if (!this.hform.HSecManagerName) {
+					this.hform.HSecManagerID = 0
+				}
+				if (!this.hform.HDeptName) {
+					this.hform.HDeptID = 0
+				}
+				if (!this.hform.HSupName) {
+					this.hform.HSupID = 0
+				}
+				if (this.hform.HInterID == 0 || !this.hform.HInterID) {
+					uni.showToast({
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HBillNo) {
+					uni.showToast({
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
+						icon: 'none'
+					})
+				} else if (!this.Materlist || this.Materlist.length == 0) {
+					uni.showToast({
+						title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+						icon: 'none'
+					})
+				} else {
+					var s = 0;
+					for (var i = 0; i < this.Materlist.length; i++) {
+						if (this.Materlist[i].鏁伴噺 > 0) {
+							s = 1;
+						}
+					}
+					if (s == 0) {
+						uni.showToast({
+							title: '娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
+							icon: 'none'
+						})
+					} else {
+						uni.showLoading({
+							title: '璇风◢鍊�'
+						})
+						var sMainStr = JSON.stringify(this.hform);
+						uni.request({
+							url: this.serverUrl + '/WEBSController/set_SaveMateOutBill_Json',
+							method: 'POST',
+							dataType: "json",
+							data: {
+								oMain: sMainStr
+							},
+							success: (res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/shengchanlingliaoshengdan/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 500)
+											}
+										}
+									});
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}
+			},
+
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.navigateBack({
+								url: '/pages/shengchanlingliaoshengdan/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			}
+		}
+	}
+</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;
+			flex: 1;
+			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/shengchanlingliaoshengdan/table.vue b/pages/shengchanlingliaoshengdan/table.vue
new file mode 100644
index 0000000..0d15c4d
--- /dev/null
+++ b/pages/shengchanlingliaoshengdan/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.鐗╂枡浠ｇ爜">
+						<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="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: 1204,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				
+				page:1,
+	        }
+	    },
+		onShow() {
+			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			this.CheckModRight()
+			this.changeTab(0)
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(()=>{
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+	    methods: {
+			CheckModRight(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data:{ 
+						ModRightName: 'CE_MateOut',
+						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: 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
+							})
+						}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/weiwaibuliaojiaoyan/form.vue b/pages/weiwaibuliaojiaoyan/form.vue
index 8183fd0..97a9ff8 100644
--- a/pages/weiwaibuliaojiaoyan/form.vue
+++ b/pages/weiwaibuliaojiaoyan/form.vue
@@ -1,22 +1,959 @@
 <template>
 	<view>
-		
+		<view class="form">
+			<view class="form-item">
+				<view class="title">鏉＄爜:</view>
+				<view class="right">
+					<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" >
+					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+				</view>
+				<!-- <view class="righton"><input v-model="hform.HStockPlaceName"
+					  disabled 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" v-show="showHBillNo">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="right" style="width: 380rpx;">
+						<input name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜"
+							@confirm="GetMeesageByBillNo(hform.HBarCode)" />
+					</view>
+					<uni-icons type="scan"
+						style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+						size="20" @click="toScanBillCode"></uni-icons>
+				</view>
+				<view class="form-item" v-show="!showHBillNo">
+					<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>
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉＄爜鏍稿
+				</label>
+			</view>
+			<view v-if="tabs == 2">
+				<view class="list" v-for="(item,index) in Materlist" :key="index">
+					<uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" 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" v-if="item.瑙勬牸鍨嬪彿">
+								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+							</view>
+							<view class="detail">
+								<text>鎵规锛�</text>{{item.鎵规}}
+							</view>
+							<view class="detail" v-if="item.杈呭姪灞炴��">
+								<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+							</view>
+							<view class="detail">
+								<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";
+	import {
+		CommonUtils
+	} from "@/utils/common.js"
 	export default {
 		data() {
 			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				HModName: 'Kf_EntrustReplenishOutBill_Check_PDA',
+				ModRightName: 'CE_EntrustReplenishOutCheck',
+				OperationType: 1,
 				
+				showHBillNo: true,
+				tabs: 1,
+				linterid: '',
+				HBillNo: '',
+
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+
+				Materlist: [],
+				hform: {
+					HBillType: 1255,
+					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'涓烘牳瀵癸級
+					chkHBarflag: false,
+					HBarflag: '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.HBillNo) {
+				this.hform.HBillNo = e.HBillNo
+				this.GetMeesageByBillNo(e.HBillNo)
+			} 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.hform.HBarCode = res.result
+						// this.GetMeesageByBillNo(this.hform.HBarCode)
+						this.getCode(this.hform.HBarCode)
+					}
+				});
+			},
+			toScanBillCode() {
+				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.hform.HBillNo = res.result
+						this.GetMeesageByBillNo(this.hform.HBillNo)
+					}
+				});
+			},
+			//鎵弿鍗曟嵁鍙锋潯鐮�
+			GetMeesageByBillNo(e) {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
+					data: {
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.hform.HBillType,
+						HMaker: this.hform.HMaker,
+						HStockOrgID: this.hform.HStockOrgID
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							CommonUtils.playSound(1);
+							var data = res.data.data
+							console.log('鍗曟嵁淇℃伅: ', data)
+							this.hform.HInterID = data.hInterIDField
+							this.hform.HBillNo = data.hBillNoField
+							this.showHBillNo = false
+							//鏉＄爜鏍稿鏍囪
+							if (data.hSourceBarCodeFlagField) {
+								this.hform.HSourceBarCodeCtl = "Y"
+								this.hform.chkHBarflag = true
+								this.hform.HBarflag = data
+							}
+							this.tabs = 2
+							this.DisBillEntryList();
+						} else {
+							CommonUtils.playSound(0);
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+							this.hform.HBillNo = ''
+						}
+					},
+					fail: (res) => {
+						CommonUtils.playSound(0);
+						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_CheckTypeByBarCode_BillCheck_Json',
+						data: {
+							sBarCode: sBarCode,
+							HBillID: this.hform.HInterID || 0,
+							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) {
+								CommonUtils.playSound(1);
+								var data = res.data.data
+								if (data.hBarTypeField == '浠撳簱鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = ''
+									this.hform.HStockPlaceID = 0
+									// if (data.hSPFlagField == 0) {
+									// 	this.showHStockPlaceName = false
+									// } else {
+									// 	this.showHStockPlaceName = true
+									// }
+								} else if (data.hBarTypeField == '浠撲綅鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = data.hSPNameField
+									this.hform.HStockPlaceID = data.hSPIDField
+								} else if (data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+									this.hform.HDeptName = data.hDeptNameField
+									this.hform.HDeptID = data.hDeptIDField
+									this.tabs = 1
+								} else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
+									this.hform.HSupName = data.hSupNameField
+									this.hform.HSupID = data.hSupIDField
+									if (data.hDeptIDField != 0) {
+										this.hform.HDeptID = data.hDeptIDField
+										this.hform.HDeptName = data.hDeptNameField
+									}
+									this.hform.HSourceBillNo = data.hSourceBillNoField
+									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+									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 {
+								CommonUtils.playSound(0);
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							CommonUtils.playSound(0);
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+			//鐗╂枡淇℃伅
+			DisBillEntryList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_New_Json',
+					data: {
+						HInterID: this.hform.HInterID,
+						HBillType: this.hform.HBillType,
+						HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl,
+						sWhere: ''
+					},
+					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.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
+								this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
+								this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
+								this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
+								this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
+								this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
+								this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
+								this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
+								this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
+							}
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鍒犻櫎鐗╂枡鐮�
+			delMater(item) {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+					success: (res) => {
+						if (res.confirm) {
+							uni.request({
+								url: this.serverUrl +
+									'/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBillType: this.hform.HBillType,
+									HSourceInterID: item.HSourceInterID,
+									HSourceEntryID: item.HSourceEntryID,
+									HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl
+								},
+								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() {
+				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_SaveEntrustReplenishOutBill_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/weiwaibuliaojiaoyan/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+
+									uni.showModal({
+										title: '娓╅Θ鎻愮ず',
+										content: res.data.Message,
+										showCancel: false
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				}
+			},
+
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.navigateBack({
+								url: '/pages/weiwaibuliaojiaoyan/table'
+							})
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.form {
+		width: 668rpx;
+		margin: 20rpx auto;
+		padding-bottom: 240rpx;
+	}
 
-</style>
+	.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;
+			flex: 1;
+		}
+
+		.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 {
+			flex: 1;
+			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;
+			}
+		}
+	}
+	.checkbox{
+		color: #888;
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		float: right;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/weiwaibuliaojiaoyan/table.vue b/pages/weiwaibuliaojiaoyan/table.vue
index 8183fd0..291da47 100644
--- a/pages/weiwaibuliaojiaoyan/table.vue
+++ b/pages/weiwaibuliaojiaoyan/table.vue
@@ -1,22 +1,531 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<view class="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+			<view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
+		</view>
+
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+		<view class="form" v-if="tabs == 0">
+			<view class="buttons" @tap="add">
+				<uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+			</view>
+		</view>
+		<view class="form" v-if="tabs == 1">
+			<view class="form-item">
+				<view class="title">鍗曟嵁鍙�:</view>
+				<view class="right">
+					<input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">婧愬崟鍗曞彿:</view>
+				<view class="right">
+					<input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+				</view>
+			</view>
+			<view class="buttons">
+				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+			</view>
+		</view>
+
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+			<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
+						<text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+					</view>
+					<view class="detail" v-if="item.鏁伴噺">
+						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟鍗曞彿">
+						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+					</view>
+					<view class="detail" v-if="item.缁勭粐">
+						<text>缁勭粐锛�</text>{{item.缁勭粐}}
+					</view>
+				</view>
+
+				<view class="more">
+					<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+						<uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+					</view>
+					<view class="part" style="color: #da0000;" @tap.stop="del(item)">
+						<uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+					</view>
+				</view>
+			</uni-card>
+		</view>
+		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+			<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鏁伴噺">
+						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟鍗曞彿">
+						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+					</view>
+					<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
+						<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+					</view>
+					<view class="detail" v-if="item.鐗╂枡鍚嶇О">
+						<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: 1255,
+					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'))
+		},
+		onShow() {
+			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			this.CheckModRight()
+			this.changeTab(0)
+			console.log(this.userInfo, uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(() => {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		methods: {
-			
+			CheckModRight() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data: {
+						ModRightName: 'CE_EntrustReplenishOutCheck',
+						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: 1255,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				}
+				this.getList()
+			},
+			add() {
+				uni.navigateTo({
+					url: './form?OperationType=1'
+				})
+			},
+			//缂栬緫
+			edit(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: './form?OperationType=2&HBillNo=' + item.HBillNo
+				})
+				// 			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){
+
+				// 					}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>
+<style lang="scss" scoped>
+	.form {
+		width: 640rpx;
+		margin: 20rpx auto;
+		margin-top: 90rpx;
+	}
 
-</style>
+	.tabs {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		z-index: 9;
+		display: flex;
+		background-color: #e5e5e5;
+
+		view {
+			width: 50%;
+			font-size: 30rpx;
+			color: #333;
+			text-align: center;
+			padding: 16rpx 0;
+		}
+
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
+
+	.buttons {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #acacac;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+
+		.title {
+			width: 180rpx;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+
+		.righton {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	.list {
+		width: 100%;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+
+			.detail {
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.more {
+			color: #888;
+			font-size: 26rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/weiwailingliaojiaoyan/form.vue b/pages/weiwailingliaojiaoyan/form.vue
index 0b2371c..75e7a23 100644
--- a/pages/weiwailingliaojiaoyan/form.vue
+++ b/pages/weiwailingliaojiaoyan/form.vue
@@ -25,7 +25,7 @@
 			</view>
 			<view class="form-item">
 				<view class="title">浠撲綅:</view>
-				<view class="right" >
+				<view class="right">
 					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
 						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
 				</view>
@@ -75,6 +75,10 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+
+				<label class="checkbox" style="float: right;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc" />鏉＄爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -82,6 +86,9 @@
 						<view class="card-detail">
 							<view class="detail">
 								<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+							</view>
+							<view class="detail">
+								<text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
 							</view>
 							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
 								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
@@ -91,6 +98,15 @@
 							</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">
+								<text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
 							</view>
 						</view>
 					</uni-card>
@@ -178,7 +194,7 @@
 				HModName: 'Kf_EntrustOutBill_CheckList_PDA',
 				ModRightName: 'CE_EntrustOutCheck',
 				OperationType: 1,
-				
+
 				showHBillNo: true,
 				tabs: 1,
 				linterid: '',
@@ -208,7 +224,7 @@
 					HStockOrgName: uni.getStorageSync('Organization'),
 					HStockOrgID: uni.getStorageSync('OrganizationID'),
 					HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
-					chkHBarflag: 1,
+					chkHBarflag: false,
 					HBarflag: 'Y',
 
 					HBarCode_B: '',
@@ -262,7 +278,7 @@
 						// }else{
 						// 	this.hform.HBarCode = res.result
 						// }
-						
+
 						this.hform.HBillNo = res.result
 						this.GetMeesageByBillNo(this.hform.HBillNo)
 					}
@@ -280,6 +296,7 @@
 					},
 					success: (res) => {
 						if (res.data.count == 1) {
+							CommonUtils.playSound(1);
 							var data = res.data.data
 							console.log('鍗曟嵁淇℃伅: ', data)
 							this.hform.HInterID = data.hInterIDField
@@ -294,6 +311,7 @@
 							this.tabs = 2
 							this.DisBillEntryList();
 						} else {
+							CommonUtils.playSound(0);
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -302,6 +320,7 @@
 						}
 					},
 					fail: (res) => {
+						CommonUtils.playSound(0);
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -449,7 +468,7 @@
 					if (sHQty == "") {
 						sHQty = 0;
 					}
-					
+
 					uni.request({
 						url: this.serverUrl + '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
 						data: {
@@ -474,6 +493,7 @@
 							console.log('鎵爜杩斿洖', res.data);
 							this.hform.HBarCode = ''
 							if (res.data.count == 1) {
+								CommonUtils.playSound(1);
 								var data = res.data.data
 								if (data.hBarTypeField == '浠撳簱鏉＄爜') {
 									this.hform.HWHName = data.hWhNameField
@@ -560,6 +580,7 @@
 								//娓呯┖鏁伴噺
 								this.hform.HQty = ''
 							} else {
+								CommonUtils.playSound(0);
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -567,6 +588,7 @@
 							}
 						},
 						fail: (res) => {
+							CommonUtils.playSound(0);
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
@@ -847,8 +869,8 @@
 			padding: 8rpx 20rpx;
 			font-size: 30rpx;
 		}
-		
-		
+
+
 
 		textarea {
 			width: 98%;
@@ -936,4 +958,11 @@
 			}
 		}
 	}
+
+	.checkbox {
+		color: #888;
+		font-size: 28rpx;
+		margin-top: 30rpx;
+		float: right;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/weiwailingliaojiaoyan/table.vue b/pages/weiwailingliaojiaoyan/table.vue
index 7218354..3210ee0 100644
--- a/pages/weiwailingliaojiaoyan/table.vue
+++ b/pages/weiwailingliaojiaoyan/table.vue
@@ -2,7 +2,7 @@
 	<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 :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
 		</view>
 
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
@@ -133,6 +133,12 @@
 			}
 		},
 		onLoad() {
+			// //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			// this.CheckModRight()
+			// this.changeTab(0)
+			// console.log(this.userInfo, uni.getStorageSync('HUserName'))
+		},
+		onShow() {
 			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
 			this.CheckModRight()
 			this.changeTab(0)
diff --git a/pages/xiaoshouchuku/table.vue b/pages/xiaoshouchuku/table.vue
index 16320a5..dc4bcfc 100644
--- a/pages/xiaoshouchuku/table.vue
+++ b/pages/xiaoshouchuku/table.vue
@@ -2,7 +2,7 @@
 	<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 :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
 		</view>
 		
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
diff --git a/pages/xiaoshouchukujiaoyan/form.vue b/pages/xiaoshouchukujiaoyan/form.vue
index 7c757f7..46e9b74 100644
--- a/pages/xiaoshouchukujiaoyan/form.vue
+++ b/pages/xiaoshouchukujiaoyan/form.vue
@@ -25,7 +25,7 @@
 			</view>
 			<view class="form-item">
 				<view class="title">浠撲綅:</view>
-				<view class="right" >
+				<view class="right">
 					<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
 						v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
 				</view>
@@ -75,6 +75,9 @@
 						<input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
 					</view>
 				</view>
+				<label class="checkbox" style="float: right !important;">
+					<checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc" />鏉＄爜鏍稿
+				</label>
 			</view>
 			<view v-if="tabs == 2">
 				<view class="list" v-for="(item,index) in Materlist" :key="index">
@@ -82,6 +85,9 @@
 						<view class="card-detail">
 							<view class="detail">
 								<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+							</view>
+							<view class="detail">
+								<text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
 							</view>
 							<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
 								<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
@@ -91,6 +97,15 @@
 							</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">
+								<text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
 							</view>
 						</view>
 					</uni-card>
@@ -178,7 +193,7 @@
 				HModName: 'Kf_SellOutBill_CheckList_PDA',
 				ModRightName: 'CE_SellOutCheck',
 				OperationType: 1,
-				
+
 				showHBillNo: true,
 				tabs: 1,
 				linterid: '',
@@ -194,6 +209,7 @@
 					HBillType: 1205,
 					HBillerID: uni.getStorageSync('HBillerID'),
 					HRedBlueFlag: false,
+					chkHBarflag: false,
 
 					HBarCode: '',
 					HQty: '',
@@ -262,7 +278,7 @@
 						// }else{
 						// 	this.hform.HBarCode = res.result
 						// }
-						
+
 						this.hform.HBillNo = res.result
 						this.GetMeesageByBillNo(this.hform.HBillNo)
 					}
@@ -280,6 +296,7 @@
 					},
 					success: (res) => {
 						if (res.data.count == 1) {
+							CommonUtils.playSound(1);
 							var data = res.data.data
 							console.log('鍗曟嵁淇℃伅: ', data)
 							this.hform.HInterID = data.hInterIDField
@@ -294,6 +311,7 @@
 							this.tabs = 2
 							this.DisBillEntryList();
 						} else {
+							CommonUtils.playSound(0);
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -302,6 +320,7 @@
 						}
 					},
 					fail: (res) => {
+						CommonUtils.playSound(0);
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -473,6 +492,7 @@
 							console.log('鎵爜杩斿洖', res.data);
 							this.hform.HBarCode = ''
 							if (res.data.count == 1) {
+								CommonUtils.playSound(1);
 								var data = res.data.data
 								if (data.hBarTypeField == '浠撳簱鏉＄爜') {
 									this.hform.HWHName = data.hWhNameField
@@ -559,6 +579,7 @@
 								//娓呯┖鏁伴噺
 								this.hform.HQty = ''
 							} else {
+								CommonUtils.playSound(0);
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -566,6 +587,7 @@
 							}
 						},
 						fail: (res) => {
+							CommonUtils.playSound(0);
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
@@ -758,8 +780,8 @@
 					success: (res) => {
 						if (res.confirm) {
 							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-							uni.redirectTo({
-								url: '/pages/qitachukujiaoyan/qitachukujiaoyan'
+							uni.navigateBack({
+								url: '/pages/xiaoshouchukujiaoyan/table'
 							})
 						} else if (res.cancel) {
 							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -846,8 +868,8 @@
 			padding: 8rpx 20rpx;
 			font-size: 30rpx;
 		}
-		
-		
+
+
 
 		textarea {
 			width: 98%;
@@ -934,5 +956,12 @@
 				text-align: center;
 			}
 		}
+
+	}
+
+	.checkbox {
+		color: #888;
+		font-size: 28rpx;
+		margin-top: 30rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/xiaoshouchukujiaoyan/table.vue b/pages/xiaoshouchukujiaoyan/table.vue
index b58047e..48b8206 100644
--- a/pages/xiaoshouchukujiaoyan/table.vue
+++ b/pages/xiaoshouchukujiaoyan/table.vue
@@ -2,7 +2,7 @@
 	<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 :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸叉牎楠屽垪琛�</view>
 		</view>
 
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
diff --git a/utils/common.js b/utils/common.js
index bd5b25c..d3dd163 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -126,6 +126,67 @@
 			}
 		};
 	}
+
+	deepClone(target, map = new WeakMap()) {
+		// 澶勭悊鍘熷鍊煎拰鍑芥暟(typeof 鏁扮粍浼氳繑鍥瀘bject)
+		if (typeof target !== 'object' || target === null) {
+			return target;
+		}
+
+		// 澶勭悊寰幆寮曠敤
+		if (map.has(target)) {
+			return map.get(target);
+		}
+
+		let clone;
+
+		// 澶勭悊鏁扮粍
+		if (Array.isArray(target)) {
+			clone = [];
+			map.set(target, clone);
+			target.forEach((item, index) => {
+				clone[index] = deepClone(item, map);
+			});
+			return clone;
+		}
+
+		// 澶勭悊鏃ユ湡瀵硅薄
+		if (target instanceof Date) {
+			clone = new Date(target.getTime());
+			map.set(target, clone);
+			return clone;
+		}
+
+		// 澶勭悊姝ｅ垯琛ㄨ揪寮�
+		if (target instanceof RegExp) {
+			clone = new RegExp(target);
+			map.set(target, clone);
+			return clone;
+		}
+
+		// 澶勭悊鍑芥暟 (鐩存帴浣跨敤鍑芥暟鐨勫紩鐢�)
+		if (typeof target === 'function') {
+			return target;
+		}
+
+		// 澶勭悊鍏朵粬瀵硅薄锛堟櫘閫氬璞°�佺被瀹炰緥绛夛級
+		clone = Object.create(Object.getPrototypeOf(target));
+		map.set(target, clone);
+
+		// 鑾峰彇鎵�鏈夊睘鎬э紙鍖呮嫭 Symbol 绫诲瀷锛�
+		const allKeys = [...Object.getOwnPropertyNames(target), ...Object.getOwnPropertySymbols(target)];
+
+		allKeys.forEach(key => {
+			const descriptor = Object.getOwnPropertyDescriptor(target, key);
+			if (descriptor && descriptor.enumerable) {
+				// 閫掑綊澶嶅埗灞炴�у��
+				clone[key] = deepClone(target[key], map);
+			}
+		});
+
+		return clone;
+	}
+
 	// uni-app 浣跨敤 灏佽璇锋眰鍑芥暟 浣跨敤浼犵粺鍑芥暟褰撲綔鍥炶皟闇�瑕佷紶that锛岀澶村嚱鏁颁笉闇�瑕�
 	doRequest(url, data, resFunction, errFunction, method, that) {
 		that = that || this;
@@ -174,6 +235,17 @@
 			}
 		})
 	}
+
+	// uni-app 鎾斁闊抽灏佽
+	playSound(e) {
+		const innerAudioContext = uni.createInnerAudioContext();
+		if (e == 1) {
+			innerAudioContext.src = '/static/success.wav';
+		} else {
+			innerAudioContext.src = '/static/jingbao.wav';
+		}
+		innerAudioContext.play(); // 鎾斁闊抽
+	}
 }
 
 export const CommonUtils = Object.freeze(new commonUtils());
\ No newline at end of file

--
Gitblit v1.9.1