From e5594beb8a153268db8b9bb695297612913efd2b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 16 七月 2025 16:54:00 +0800
Subject: [PATCH] 其他出库校验模组 完成 添加 生产补料校验模组

---
 pages/qitarukujiaoyan/form.vue                       |   22 
 pages.json                                           |  100 +
 pages/xiaoshouchukujiaoyan/table.vue                 |   22 
 .hbuilderx/launch.json                               |   40 
 utils/common.js                                      |    1 
 pages/caigourukujiaoyan/form.vue                     |   22 
 pages/qitarukujiaoyan/table.vue                      |   22 
 pages/qitachukujiaoyan/detail.vue                    |  947 +++++++++++++++++
 pages/xiaoshouchukujiaoyan/form.vue                  |   22 
 pages/shengchanbuliaojiaoyan/CacheList.vue           |  498 +++++++++
 pages/weiwailingliaojiaoyan/form.vue                 |   22 
 pages/labelPrinter/index.vue                         |   10 
 pages/shengchanbuliaojiaoyan/form.vue                |  939 +++++++++++++++++
 pages/caigourukujiaoyan/table.vue                    |   22 
 pages/weiwaibuliaojiaoyan/table.vue                  |   22 
 pages/weiwailingliaojiaoyan/table.vue                |   19 
 pages/qitachukujiaoyan/qitachukujiaoyan.vue          |  498 +++++++++
 pages/weiwaibuliaojiaoyan/form.vue                   |   22 
 components/blueToothConnector/blueToothConnector.vue |    8 
 pages/index/index.vue                                |   12 
 20 files changed, 3,242 insertions(+), 28 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 582561b..b4d909b 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -1,16 +1,28 @@
-{ // launch.json 閰嶇疆浜嗗惎鍔ㄨ皟璇曟椂鐩稿叧璁剧疆锛宑onfigurations涓嬭妭鐐瑰悕绉板彲涓� app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype椤瑰彲閰嶇疆鍊间负local鎴杛emote, local浠ｈ〃鍓嶇杩炴湰鍦颁簯鍑芥暟锛宺emote浠ｈ〃鍓嶇杩炰簯绔簯鍑芥暟
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 閰嶇疆浜嗗惎鍔ㄨ皟璇曟椂鐩稿叧璁剧疆锛宑onfigurations涓嬭妭鐐瑰悕绉板彲涓� app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype椤瑰彲閰嶇疆鍊间负local鎴杛emote, local浠ｈ〃鍓嶇杩炴湰鍦颁簯鍑芥暟锛宺emote浠ｈ〃鍓嶇杩炰簯绔簯鍑芥暟
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "openVueDevtools" : true,
+            "type" : "uni-app:h5"
+        },
+        {
+            "openVueDevtools" : true,
+            "type" : "uni-app:app-ios"
+        },
+        {
+            "openVueDevtools" : true,
+            "type" : "uni-app:app-android"
+        }
     ]
 }
diff --git a/components/blueToothConnector/blueToothConnector.vue b/components/blueToothConnector/blueToothConnector.vue
index 7805270..d642203 100644
--- a/components/blueToothConnector/blueToothConnector.vue
+++ b/components/blueToothConnector/blueToothConnector.vue
@@ -96,12 +96,8 @@
 					},
 					fail: async (e) => {
 						console.error(e)
-						switch (e.code) {
-							case "10009":
-								this.showToast("姝よ澶囦笉鏀寔璁惧鎼滅储鍔熻兘!");
-								break;
-							default:
-								console.error(e);
+						if(e.errCode == 10009) {
+							this.showToast('姝よ澶囦笉鏀寔璁惧鎼滅储鍔熻兘!');
 						}
 					}
 				})
diff --git a/pages.json b/pages.json
index 85305f2..89b5c7b 100644
--- a/pages.json
+++ b/pages.json
@@ -530,6 +530,106 @@
 					{
 						"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" : "閿�鍞嚭搴撴牎楠�"
+					}
+				},
+				{
+					"path" : "pages/xiaoshouchukujiaoyan/form",
+					"style" : 
+					{
+						"navigationBarTitleText" : "閿�鍞嚭搴撳崟鏍￠獙"
+					}
+				},
+				{
+					"path" : "pages/weiwailingliaojiaoyan/table",
+					"style" : 
+					{
+						"navigationBarTitleText" : "濮斿棰嗘枡鏍￠獙"
+					}
+				},
+				{
+					"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" : "濮斿琛ユ枡鍗曟牎楠�"
+					}
 				}
 	],
 	"tabBar": {
diff --git a/pages/caigourukujiaoyan/form.vue b/pages/caigourukujiaoyan/form.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/caigourukujiaoyan/form.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/caigourukujiaoyan/table.vue b/pages/caigourukujiaoyan/table.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/caigourukujiaoyan/table.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d26af04..85bf1eb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -197,6 +197,18 @@
 						url: '/pages/caigoudingdan/caigoudingdan',
 						id: 30,
 					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鍏朵粬鍑哄簱鏍￠獙',
+						url: '/pages/qitachukujiaoyan/qitachukujiaoyan',
+						id: 31,
+					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鐢熶骇琛ユ枡鏍￠獙',
+						url: '/pages/shengchanbuliaojiaoyan/CacheList',
+						id: 31,
+					},
 				]
 			}
 		},
diff --git a/pages/labelPrinter/index.vue b/pages/labelPrinter/index.vue
index ad0a6af..5c05d5f 100644
--- a/pages/labelPrinter/index.vue
+++ b/pages/labelPrinter/index.vue
@@ -89,6 +89,7 @@
 	import {
 		EImage
 	} from "@psdk/esc";
+import { string } from 'i/lib/util';
 	export default {
 		data() {
 			return {
@@ -163,13 +164,8 @@
 						bluetoothTool.discoveryNewDevice();
 					},
 					fail: async (e) => {
-						console.error(e)
-						switch (e.code) {
-							case "10009":
-								this.showToast("姝よ澶囦笉鏀寔璁惧鎼滅储鍔熻兘!");
-								break;
-							default:
-								console.error(e);
+						if(e.errCode == 10009) {
+							this.showToast('姝よ澶囦笉鏀寔璁惧鎼滅储鍔熻兘!');
 						}
 					}
 				})
diff --git a/pages/qitachukujiaoyan/detail.vue b/pages/qitachukujiaoyan/detail.vue
new file mode 100644
index 0000000..2c3f0ad
--- /dev/null
+++ b/pages/qitachukujiaoyan/detail.vue
@@ -0,0 +1,947 @@
+<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>
+			</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>
+					</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_OtherOutBill_CheckList_PDA',
+				ModRightName: 'CE_OtherOutCheck',
+				OperationType: 1,
+				
+				showHBillNo: true,
+				tabs: 1,
+				linterid: '',
+				HBillNo: '',
+
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+
+				Materlist: [],
+				hform: {
+					HBillType: 1206,
+					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: 1,
+					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) {
+							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 {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+							this.hform.HBillNo = ''
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鍩虹浠撳簱璧勬枡
+			getHBaseList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Warehouse/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HWHNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+							}
+						} else {
+							uni.showToast({
+								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+
+				uni.request({
+					url: this.serverUrl + '/Gy_StockPlace/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HStockPlaceNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+							}
+						} else {
+							uni.showToast({
+								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨浠撳簱
+			HWHNameChange(e) {
+				// var name = e.split("(")
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨浠撲綅
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+					}
+				}
+			},
+			getCode(HBarCode) {
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sOldBarCode = HBarCode
+				var HDeleteFlag = sOldBarCode.substring(0, 1);
+				var sBarCode = sOldBarCode.slice(1);
+
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sHQty = this.hform.HQty
+				var sSourceBillNo = this.hform.HSourceBillNo
+				var sSourceBillType = this.hform.HMainSourceBillType
+				var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
+				console.log(this.hform.HSourceBillNo, HSourceFlag)
+				if (HDeleteFlag == "*") {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						})
+					} else {
+						uni.request({
+							url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+							data: {
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBarCode: sBarCode
+							},
+							success: (res) => {
+								console.log('鍒犻櫎鏉＄爜', res.data);
+								this.hform.HBarCode = ''
+								if (res.data.count == 1) {
+									this.hform.HQty = ''
+									this.DisBillEntryList()
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				} else {
+					var sBarCode = this.hform.HBarCode
+					if (sHQty == "") {
+						sHQty = 0;
+					}
+					uni.request({
+						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+						data: {
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HQty: sHQty,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							SourceFlag: HSourceFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HScanStyle: "",
+							HCustom1: "",
+							HCustom2: ""
+						},
+						success: (res) => {
+							console.log('鎵爜杩斿洖', res.data);
+							this.hform.HBarCode = ''
+							if (res.data.count == 1) {
+								var data = res.data.data
+								if (data.hBarTypeField == '浠撳簱鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = ''
+									this.hform.HStockPlaceID = 0
+									// if (data.hSPFlagField == 0) {
+									// 	this.showHStockPlaceName = false
+									// } else {
+									// 	this.showHStockPlaceName = true
+									// }
+								} else if (data.hBarTypeField == '浠撲綅鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = data.hSPNameField
+									this.hform.HStockPlaceID = data.hSPIDField
+								} else if (data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+									this.hform.HDeptName = data.hDeptNameField
+									this.hform.HDeptID = data.hDeptIDField
+									this.tabs = 1
+								} else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
+									this.hform.HSupName = data.hSupNameField
+									this.hform.HSupID = data.hSupIDField
+									if (data.hDeptIDField != 0) {
+										this.hform.HDeptID = data.hDeptIDField
+										this.hform.HDeptName = data.hDeptNameField
+									}
+									this.hform.HSourceBillNo = data.hSourceBillNoField
+									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+									if (data.hSourceBillTypeField == "1103") {
+										this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+										this.hform.HMainSourceBillType = 1103
+										this.showHMainSourceBillType = false
+									} else if (data.hSourceBillTypeField == "1102") {
+										this.HMainSourceBillType = '閲囪喘璁㈠崟'
+										this.hform.HMainSourceBillType = 1102
+										this.showHMainSourceBillType = false
+									} else {
+										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+										this.showHMainSourceBillType = false
+									}
+									if (data.hMulSourceFlagField == 0) {
+										this.showHSourceBillNo = false
+									}
+									//渚涘簲鍟嗕笉鍙紪杈�
+									this.showHSupName = false
+									this.tabs = 2
+								} else { //鐗╂枡鏉＄爜
+									this.tabs = 2
+									if (!this.hform.HSourceBillNo) {
+										this.hform.HSupName = data.hSupNameField
+										this.hform.HSupID = data.hSupIDField
+										this.hform.HSourceBillNo = data.hSourceBillNoField
+										if (data.hDeptIDField != 0) {
+											this.hform.HDeptID = data.hDeptIDField
+											this.hform.HDeptName = data.hDeptNameField
+										}
+										console.log(data)
+										//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+										this.hform.HMainSourceBillType = data.hSourceBillTypeField
+										if (data.hSourceBillTypeField == "1103") {
+											this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+											this.hform.HMainSourceBillType = 1103
+											this.showHMainSourceBillType = false
+										} else if (data.hSourceBillTypeField == "1102") {
+											this.HMainSourceBillType = '閲囪喘璁㈠崟'
+											this.hform.HMainSourceBillType = 1102
+											this.showHMainSourceBillType = false
+										} else {
+											this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+											this.hform.HMainSourceBillType = -1
+											this.showHMainSourceBillType = false
+										}
+										if (data.hMulSourceFlagField == 0) {
+											this.showHSourceBillNo = false
+										}
+										//渚涘簲鍟嗕笉鍙紪杈�
+										this.showHSupName = false
+									}
+								}
+								//鏄剧ず琛ㄤ綋鏄庣粏
+								this.DisBillEntryList()
+								//娓呯┖鏁伴噺
+								this.hform.HQty = ''
+							} else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+			//鐗╂枡淇℃伅
+			DisBillEntryList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/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_SaveOtherOutBill_BillCheck_Json',
+							method: 'POST',
+							dataType: "json",
+							data: {
+								oMain: sMainStr
+							},
+							success: (res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/shengchanlingliao/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+
+									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.redirectTo({
+								url: '/pages/qitachukujiaoyan/qitachukujiaoyan'
+							})
+						} 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;
+			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;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/qitachukujiaoyan/qitachukujiaoyan.vue b/pages/qitachukujiaoyan/qitachukujiaoyan.vue
new file mode 100644
index 0000000..c2b45e6
--- /dev/null
+++ b/pages/qitachukujiaoyan/qitachukujiaoyan.vue
@@ -0,0 +1,498 @@
+<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_BillCheck_Json',
+				MvarReportTitle:'鍏朵粬鍑哄簱鍗曟牎楠岀紦瀛樺垪琛�',
+				hform:{
+					HBillNo:'',
+					HSourceBillNo:'',
+					HBillType: 1206,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				
+				page:1,
+	        }
+	    },
+		onLoad() {
+			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			this.CheckModRight()
+			this.changeTab(0)
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(()=>{
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+	    methods: {
+			CheckModRight(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data:{ 
+						ModRightName: 'CE_MateOutCheck',
+						HUserName: uni.getStorageSync('HUserName')
+					},
+				    success: (res) => {
+						if(res.data.count == 1){}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			getPage(page,list){
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex,eindex)
+				return newList
+			},
+			changeTab(e){
+				this.tabs = e
+				this.page = 1
+				this.showList = []
+				
+				if(this.tabs == 0){
+					this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json'
+				}
+				if(this.tabs == 1){
+					this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_BillCheck_Json'
+				}
+				this.getList()
+			},
+			getList(){
+				uni.showLoading({
+					title:'鍔犺浇涓�...'
+				})
+				uni.request({
+				    url: this.serverUrl + this.urls,
+					data:this.hform,
+				    success: (res) => {
+				        console.log(1,res);
+						if(res.data.count == 1){
+							this.listData = res.data.data
+							this.showList = this.getPage(this.page,this.listData)
+							setTimeout(()=>{
+							     uni.hideLoading()
+							}, 1000)
+						}else{
+							uni.hideLoading()
+							this.listData = []
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.hideLoading()
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			search(){
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				console.log(this.hform)
+				// if (this.hform.HBillNo) {
+				//     this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				// }
+				// if (this.hform.HSourceBillNo) {
+				//     this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HSourceBillNo + "%'";
+				// }
+				this.getList()
+			},
+			clear(){
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				this.sWhere = ''
+				this.hform = {
+					HBillNo:'',
+					HSourceBillNo:'',
+					HBillType: 1206,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				}
+				this.getList()
+			},
+			add(){
+				uni.navigateTo({
+					url:'./detail?OperationType=1'
+				})
+			},
+			//缂栬緫
+			edit(item){
+				console.log(item)
+				uni.navigateTo({
+					url:'./detail?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 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/qitarukujiaoyan/form.vue b/pages/qitarukujiaoyan/form.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/qitarukujiaoyan/form.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/qitarukujiaoyan/table.vue b/pages/qitarukujiaoyan/table.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/qitarukujiaoyan/table.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/shengchanbuliaojiaoyan/CacheList.vue b/pages/shengchanbuliaojiaoyan/CacheList.vue
new file mode 100644
index 0000000..63fbb73
--- /dev/null
+++ b/pages/shengchanbuliaojiaoyan/CacheList.vue
@@ -0,0 +1,498 @@
+<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_BillCheck_Json',
+				MvarReportTitle:'鐢熶骇琛ユ枡鍗曟牎楠岀紦瀛樺垪琛�',
+				hform:{
+					HBillNo:'',
+					HSourceBillNo:'',
+					HBillType: 1254,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				
+				page:1,
+	        }
+	    },
+		onLoad() {
+			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			this.CheckModRight()
+			this.changeTab(0)
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(()=>{
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+	    methods: {
+			CheckModRight(){
+				uni.request({
+				    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data:{ 
+						ModRightName: 'CE_MateOutCheck',
+						HUserName: uni.getStorageSync('HUserName')
+					},
+				    success: (res) => {
+						if(res.data.count == 1){}else{
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			getPage(page,list){
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex,eindex)
+				return newList
+			},
+			changeTab(e){
+				this.tabs = e
+				this.page = 1
+				this.showList = []
+				
+				if(this.tabs == 0){
+					this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json'
+				}
+				if(this.tabs == 1){
+					this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_BillCheck_Json'
+				}
+				this.getList()
+			},
+			getList(){
+				uni.showLoading({
+					title:'鍔犺浇涓�...'
+				})
+				uni.request({
+				    url: this.serverUrl + this.urls,
+					data:this.hform,
+				    success: (res) => {
+				        console.log(1,res);
+						if(res.data.count == 1){
+							this.listData = res.data.data
+							this.showList = this.getPage(this.page,this.listData)
+							setTimeout(()=>{
+							     uni.hideLoading()
+							}, 1000)
+						}else{
+							uni.hideLoading()
+							this.listData = []
+							uni.showToast({
+								title:res.data.Message,
+								icon:'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.hideLoading()
+						uni.showToast({
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
+						})
+					},
+				});
+			},
+			search(){
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				console.log(this.hform)
+				// if (this.hform.HBillNo) {
+				//     this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				// }
+				// if (this.hform.HSourceBillNo) {
+				//     this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HSourceBillNo + "%'";
+				// }
+				this.getList()
+			},
+			clear(){
+				this.listData = []
+				this.page = 1
+				this.showList = []
+				
+				this.sWhere = ''
+				this.hform = {
+					HBillNo:'',
+					HSourceBillNo:'',
+					HBillType: 1254,
+					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 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/form.vue b/pages/shengchanbuliaojiaoyan/form.vue
new file mode 100644
index 0000000..3d633ea
--- /dev/null
+++ b/pages/shengchanbuliaojiaoyan/form.vue
@@ -0,0 +1,939 @@
+<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" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName" placeholder="涓嶅彲鎿嶄綔"/></view> -->
+			</view>
+
+			<view class="tabs">
+				<!-- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view> -->
+				<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">琛ㄥご淇℃伅</view>
+				<view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鐗╂枡淇℃伅</view>
+				<view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">鏉＄爜淇℃伅</view>
+			</view>
+
+			<view v-if="tabs == 1">
+				<view class="form-item" v-show="showHBillNo">
+					<view class="title">鍗曟嵁鍙�:</view>
+					<view class="right" style="width: 380rpx;">
+						<input name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鍗曟嵁鍙�"
+							@confirm="GetMeesageByBillNo(hform.HBillNo)" />
+					</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>
+			</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>
+					</uni-card>
+				</view>
+				<view class="over" v-if="Materlist.length == 0">鏆傛棤鏁版嵁</view>
+			</view>
+
+			<view v-if="tabs == 3">
+				<view class="form-item">
+					<view class="title">鏉＄爜:</view>
+					<view class="righton">
+						<input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鐗╂枡:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMaterName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瑙勬牸:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HMaterModel_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鎵规:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HBatchNo_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍗曚綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HUnitName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鏁伴噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HQty_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹归噺:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HTMQty_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浠撳簱:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HWHName_B" />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浠撲綅:</view>
+					<view class="righton">
+						<input disabled v-model="hform.HSPName_B" />
+					</view>
+				</view>
+			</view>
+
+			<view class="bottom-btn">
+				<button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				HModName: 'Kf_MateReplenishOutBill_Check_PDA',
+				ModRightName: 'CE_MateReplenishOutCheck',
+				OperationType: 1,
+
+				showHBillNo: true,
+				tabs: 1,
+				linterid: '',
+				HBillNo: '',
+
+				arrayHWHName: [], //浠撳簱
+				HWHNameList: [],
+				arrayHStockPlaceName: [], //浠撲綅
+				HStockPlaceNameList: [],
+
+				Materlist: [],
+				hform: {
+					HBillType: 1254,
+					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: 1,
+					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.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) {
+							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 {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+							this.hform.HBillNo = ''
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鍩虹浠撳簱璧勬枡
+			getHBaseList() {
+				uni.request({
+					url: this.serverUrl + '/Gy_Warehouse/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HWHNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
+							}
+						} else {
+							uni.showToast({
+								title: '浠撳簱鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+
+				uni.request({
+					url: this.serverUrl + '/Gy_StockPlace/list',
+					data: {
+						sWhere: "",
+						user: uni.getStorageSync('HUserName'),
+						Organization: uni.getStorageSync('Organization')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HStockPlaceNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHStockPlaceName[i] = res.data.data[i].浠撲綅鍚嶇О
+							}
+						} else {
+							uni.showToast({
+								title: '浠撲綅鏁版嵁璇锋眰澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨浠撳簱
+			HWHNameChange(e) {
+				// var name = e.split("(")
+				for (var i = 0; i < this.HWHNameList.length; i++) {
+					if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
+						this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
+						this.hform.HWHID = this.HWHNameList[i].HItemID
+					}
+				}
+			},
+			//閫夋嫨浠撲綅
+			HStockPlaceNameChange(e) {
+				for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
+					if (this.HStockPlaceNameList[i].浠撲綅鍚嶇О == e) {
+						this.hform.HStockPlaceName = this.HStockPlaceNameList[i].浠撲綅鍚嶇О
+						this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
+					}
+				}
+			},
+			//鎵潯鐮佸鐞�
+			getCode(HBarCode) {
+				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+				if (!this.hform.HWHName) {
+					this.hform.HWHID = 0
+				}
+				if (!this.hform.HStockPlaceName) {
+					this.hform.HStockPlaceID = 0
+				}
+				var sOldBarCode = HBarCode
+				var HDeleteFlag = sOldBarCode.substring(0, 1);
+				var sBarCode = sOldBarCode.slice(1);
+
+				var sHWHID = this.hform.HWHID
+				var sHSPID = this.hform.HStockPlaceID
+				var sHQty = this.hform.HQty
+				var sSourceBillNo = this.hform.HSourceBillNo
+				var sSourceBillType = this.hform.HMainSourceBillType
+				var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
+				console.log(this.hform.HSourceBillNo, HSourceFlag)
+				if (HDeleteFlag == "*") {
+					if (sBarCode == "") {
+						uni.showToast({
+							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
+							icon: 'none'
+						})
+					} else {
+						uni.request({
+							url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
+							data: {
+								HInterID: this.hform.HInterID,
+								HBillType: this.hform.HBillType,
+								HBarCode: sBarCode
+							},
+							success: (res) => {
+								console.log('鍒犻櫎鏉＄爜', res.data);
+								this.hform.HBarCode = ''
+								if (res.data.count == 1) {
+									this.hform.HQty = ''
+									this.DisBillEntryList()
+								} else {
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								}
+							},
+							fail: (res) => {
+								console.log(res);
+								uni.showToast({
+									title: '鎺ュ彛璇锋眰澶辫触',
+									icon: 'none'
+								})
+							},
+						});
+					}
+				} else {
+					var sBarCode = this.hform.HBarCode
+					if (sHQty == "") {
+						sHQty = 0;
+					}
+					uni.request({
+						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+						data: {
+							sBarCode: sBarCode,
+							HInterID: this.hform.HInterID,
+							HBillType: this.hform.HBillType,
+							HBillNo: this.hform.HBillNo,
+							HMaker: this.hform.HMaker,
+							HWhID: sHWHID,
+							HSPID: sHSPID,
+							HQty: sHQty,
+							HRedBlueFlag: this.hform.HRedBlueFlag,
+							SourceFlag: HSourceFlag,
+							HSourceBillNo: sSourceBillNo,
+							HSourceBillType: sSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HScanStyle: "",
+							HCustom1: "",
+							HCustom2: ""
+						},
+						success: (res) => {
+							console.log('鎵爜杩斿洖', res.data);
+							this.hform.HBarCode = ''
+							if (res.data.count == 1) {
+								var data = res.data.data
+								if (data.hBarTypeField == '浠撳簱鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = ''
+									this.hform.HStockPlaceID = 0
+									if (data.hSPFlagField == 0) {
+										this.showHStockPlaceName = false
+									} else {
+										this.showHStockPlaceName = true
+									}
+								} else if (data.hBarTypeField == '浠撲綅鏉＄爜') {
+									this.hform.HWHName = data.hWhNameField
+									this.hform.HWHID = data.hWhIDField
+									this.hform.HStockPlaceName = data.hSPNameField
+									this.hform.HStockPlaceID = data.hSPIDField
+								} else if (data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+									this.hform.HDeptName = data.hDeptNameField
+									this.hform.HDeptID = data.hDeptIDField
+									this.tabs = 1
+								} else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
+									this.hform.HSupName = data.hSupNameField
+									this.hform.HSupID = data.hSupIDField
+									if (data.hDeptIDField != 0) {
+										this.hform.HDeptID = data.hDeptIDField
+										this.hform.HDeptName = data.hDeptNameField
+									}
+									this.hform.HSourceBillNo = data.hSourceBillNoField
+									//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+									if (data.hSourceBillTypeField == "1103") {
+										this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+										this.hform.HMainSourceBillType = 1103
+										this.showHMainSourceBillType = false
+									} else if (data.hSourceBillTypeField == "1102") {
+										this.HMainSourceBillType = '閲囪喘璁㈠崟'
+										this.hform.HMainSourceBillType = 1102
+										this.showHMainSourceBillType = false
+									} else {
+										this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+										this.hform.HMainSourceBillType = -1
+										this.showHMainSourceBillType = false
+									}
+									if (data.hMulSourceFlagField == 0) {
+										this.showHSourceBillNo = false
+									}
+									//渚涘簲鍟嗕笉鍙紪杈�
+									this.showHSupName = false
+									this.tabs = 2
+								} else { //鐗╂枡鏉＄爜
+									this.tabs = 2
+									if (!this.hform.HSourceBillNo) {
+										this.hform.HSupName = data.hSupNameField
+										this.hform.HSupID = data.hSupIDField
+										this.hform.HSourceBillNo = data.hSourceBillNoField
+										if (data.hDeptIDField != 0) {
+											this.hform.HDeptID = data.hDeptIDField
+											this.hform.HDeptName = data.hDeptNameField
+										}
+										console.log(data)
+										//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+										this.hform.HMainSourceBillType = data.hSourceBillTypeField
+										if (data.hSourceBillTypeField == "1103") {
+											this.HMainSourceBillType = '鏀舵枡閫氱煡鍗�'
+											this.hform.HMainSourceBillType = 1103
+											this.showHMainSourceBillType = false
+										} else if (data.hSourceBillTypeField == "1102") {
+											this.HMainSourceBillType = '閲囪喘璁㈠崟'
+											this.hform.HMainSourceBillType = 1102
+											this.showHMainSourceBillType = false
+										} else {
+											this.HMainSourceBillType = '鎵嬪伐褰曞叆'
+											this.hform.HMainSourceBillType = -1
+											this.showHMainSourceBillType = false
+										}
+										if (data.hMulSourceFlagField == 0) {
+											this.showHSourceBillNo = false
+										}
+										//渚涘簲鍟嗕笉鍙紪杈�
+										this.showHSupName = false
+									}
+								}
+								//鏄剧ず琛ㄤ綋鏄庣粏
+								this.DisBillEntryList()
+								//娓呯┖鏁伴噺
+								this.hform.HQty = ''
+							} else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+			//鐗╂枡淇℃伅
+			DisBillEntryList() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/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_SaveMateReplenishOutBill_BillCheck_Json',
+							method: 'POST',
+							dataType: "json",
+							data: {
+								oMain: sMainStr
+							},
+							success: (res) => {
+								console.log(1, res);
+								uni.hideLoading()
+								if (res.data.count == 1) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/shengchanlingliao/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								} else {
+									// uni.showToast({
+									// 	title: res.data.Message,
+									// 	icon: 'none'
+									// })
+									
+									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/shengchanbuliaojiaoyan/CacheList'
+							})
+						} 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;
+			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;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/weiwaibuliaojiaoyan/form.vue b/pages/weiwaibuliaojiaoyan/form.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/weiwaibuliaojiaoyan/form.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/weiwaibuliaojiaoyan/table.vue b/pages/weiwaibuliaojiaoyan/table.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/weiwaibuliaojiaoyan/table.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/weiwailingliaojiaoyan/form.vue b/pages/weiwailingliaojiaoyan/form.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/weiwailingliaojiaoyan/form.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/weiwailingliaojiaoyan/table.vue b/pages/weiwailingliaojiaoyan/table.vue
new file mode 100644
index 0000000..8c3b35f
--- /dev/null
+++ b/pages/weiwailingliaojiaoyan/table.vue
@@ -0,0 +1,19 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/xiaoshouchukujiaoyan/form.vue b/pages/xiaoshouchukujiaoyan/form.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/xiaoshouchukujiaoyan/form.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/xiaoshouchukujiaoyan/table.vue b/pages/xiaoshouchukujiaoyan/table.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/xiaoshouchukujiaoyan/table.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/utils/common.js b/utils/common.js
index 8846e12..15096fd 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -172,7 +172,6 @@
 				}, 1000)
 			}
 		})
-		
 	}
 }
 

--
Gitblit v1.9.1