From 5e234e7e92f694cb40ad395f10544e5e2faa3318 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 06 八月 2025 15:10:17 +0800
Subject: [PATCH] 委外工序接收单 添加工序/部门选择框 流转卡添加搜索按钮

---
 pages/index/tab1.vue                               |  621 +++++----
 components/ProcExchListPopup/ProcExchListPopup.vue |  234 +++
 pages/weiwaigxOut/form.vue                         | 2420 +++++++++++++++++++-----------------
 manifest.json                                      |  202 +-
 pages/index/tab2.vue                               |  452 ++++--
 pages/index/index.vue                              |   12 
 pages/weiwaigxOut/table.vue                        |    2 
 7 files changed, 2,216 insertions(+), 1,727 deletions(-)

diff --git a/components/ProcExchListPopup/ProcExchListPopup.vue b/components/ProcExchListPopup/ProcExchListPopup.vue
new file mode 100644
index 0000000..af96dd7
--- /dev/null
+++ b/components/ProcExchListPopup/ProcExchListPopup.vue
@@ -0,0 +1,234 @@
+<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="HBillNo" /></view>
+				</view>
+				<view class="search-condition">
+					<view class="title"><text>鐗╂枡缂栫爜: </text></view>
+					<view class="right"><input type="text" v-model="HNumber" /></view>
+				</view>
+				<view class="search-condition">
+					<view class="title"><text>鐗╂枡鍚嶇О: </text></view>
+					<view class="right"><input type="text" v-model="HName" /></view>
+				</view>
+				<view class="search-condition">
+					<view class="title"><text>鐢熶骇璁㈠崟: </text></view>
+					<view class="right"><input type="text" v-model="HICMOBillNo" /></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 id="#BillListPanel" scroll-y="true" style="height: 45vh;">
+					<view class="options-wrapper" v-show="HBillList.length != 0">
+						<uni-card v-for="(bill, index) in HBillList[curPage-1]" :key="index" :title="bill['鐗╂枡鍚嶇О']"
+							:extra="`鏁伴噺: ${bill['鏁伴噺']}`" @tap="clickCard(bill['HSourceInterID'], bill['鍗曟嵁鍙�'])">
+							<view class="item">
+								<view class="left">鍗曟嵁鍙�: </view>
+								<view class="right">{{bill['鍗曟嵁鍙�']}}</view>
+							</view>
+							<view class="item">
+								<view class="left">鐗╂枡浠g爜: </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>
+					<view class="over" v-show="HBillList.length == 0">鏆傛棤鏁版嵁</view>
+				</scroll-view>
+				<uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size"
+					:total="length"></uni-pagination>
+			</view>
+
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import {
+		CommonUtils
+	} from '../../utils/common';
+	export default {
+		name: "ProcExchListPopup",
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				size: 20,
+				curPage: 1,
+				length: 0,
+				page: 0,
+				HBillNo: '',
+				HName: '',
+				HNumber: '',
+				HICMOBillNo: '',
+				HBillList: [],
+				panelHeight: 0,
+			};
+		},
+		props: {
+			
+		},
+		model: {
+			prop: "HSourceBill",
+			event: 'change'
+		},
+		methods: {
+			popupChangeHandler(e) {
+				if (e.show === true) {
+					this.getBillList()
+				} else {
+					// 娓呯悊璧勬簮
+					this.size = 20
+					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/GetMES_ProcessExchangeBillList_PDA_QiaoYi_Json", {
+						HBillNo: this.HBillNo || '',
+						HNumber: this.HNumber || '',
+						HName: this.HName || '',
+						HICMOBillNo: this.HICMOBillNo || "",
+						user: this.userInfo['Czymc']
+					},
+					(res) => {
+						let {
+							data,
+							count,
+							Message
+						} = res.data
+						if (count == 1) {
+							console.log(data)
+							this.length = Array.from(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',
+								title: 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;
+				height: auto;
+
+				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(1, 1fr);
+			gap: 20rpx;
+
+			>view {
+				margin: 0 !important;
+				box-sizing: border-box;
+
+			}
+
+			.item {
+				.left {
+					display: inline-block;
+					width: 6rem;
+				}
+
+				.right {
+					display: inline-block;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ffceb25..43ffad6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,33 +1,33 @@
 {
-    "name": "鏅轰簯LMES",
-    "appid": "__UNI__B002F49",
-    "description": "",
-    "versionName": "1.0.40",
-    "versionCode": 140,
-    "transformPx": false,
+    "name" : "鏅轰簯LMES",
+    "appid" : "__UNI__B002F49",
+    "description" : "",
+    "versionName" : "1.0.41",
+    "versionCode" : 141,
+    "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
-    "app-plus": {
-        "usingComponents": true,
-        "nvueStyleCompiler": "uni-app",
-        "compilerVersion": 3,
-        "splashscreen": {
-            "alwaysShowBeforeRender": true,
-            "waiting": true,
-            "autoclose": true,
-            "delay": 0
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
         },
         /* 妯″潡閰嶇疆 */
-        "modules": {
-            "Barcode": {},
-            "Camera": {},
-            "Contacts": {},
-            "Bluetooth": {}
+        "modules" : {
+            "Barcode" : {},
+            "Camera" : {},
+            "Contacts" : {},
+            "Bluetooth" : {}
         },
         /* 搴旂敤鍙戝竷淇℃伅 */
-        "distribute": {
+        "distribute" : {
             /* android鎵撳寘閰嶇疆 */
-            "android": {
-                "permissions": [
+            "android" : {
+                "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
@@ -46,80 +46,80 @@
                     "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
-                "minSdkVersion": 23
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "minSdkVersion" : 23
             },
             /* ios鎵撳寘閰嶇疆 */
-            "ios": {
-                "dSYMs": false
+            "ios" : {
+                "dSYMs" : false
             },
             /* SDK閰嶇疆 */
-            "sdkConfigs": {
-                "ad": {}
+            "sdkConfigs" : {
+                "ad" : {}
             },
-            "icons": {
-                "android": {
-                    "hdpi": "unpackage/res/icons/72x72.png",
-                    "xhdpi": "unpackage/res/icons/96x96.png",
-                    "xxhdpi": "unpackage/res/icons/144x144.png",
-                    "xxxhdpi": "unpackage/res/icons/192x192.png"
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
-                "ios": {
-                    "appstore": "unpackage/res/icons/1024x1024.png",
-                    "ipad": {
-                        "app": "unpackage/res/icons/76x76.png",
-                        "app@2x": "unpackage/res/icons/152x152.png",
-                        "notification": "unpackage/res/icons/20x20.png",
-                        "notification@2x": "unpackage/res/icons/40x40.png",
-                        "proapp@2x": "unpackage/res/icons/167x167.png",
-                        "settings": "unpackage/res/icons/29x29.png",
-                        "settings@2x": "unpackage/res/icons/58x58.png",
-                        "spotlight": "unpackage/res/icons/40x40.png",
-                        "spotlight@2x": "unpackage/res/icons/80x80.png"
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
-                    "iphone": {
-                        "app@2x": "unpackage/res/icons/120x120.png",
-                        "app@3x": "unpackage/res/icons/180x180.png",
-                        "notification@2x": "unpackage/res/icons/40x40.png",
-                        "notification@3x": "unpackage/res/icons/60x60.png",
-                        "settings@2x": "unpackage/res/icons/58x58.png",
-                        "settings@3x": "unpackage/res/icons/87x87.png",
-                        "spotlight@2x": "unpackage/res/icons/80x80.png",
-                        "spotlight@3x": "unpackage/res/icons/120x120.png"
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             }
         },
-        "nativePlugins": {
-            "Mpaas-Scan": {
-                "AppId": "ALIPUB2087527291109",
-                "License": "uqSDoPf8ArVz0mKgs62fihEiELxaNc/fCwZU2eRwDvfdN3uhWCRRtXgszPkWmqjSUPYSFgOdMh0dv4UkQe0twC8fZt8+71FB3K6A83NaLtwi5gu+hVJ8MZnOTUe/ipmCCVmRGapmwfKfyHbV2oSAOLbq4/fgBszewOVtdjx7ogzyIltcCHOESsdejnFxmg/7+HuX5/0qmLxGIUUwGhwQazot0bQeGBP8sJ4ONZLd7n4WQFe8bQCrRcB3CPAFClwA/VldpIjOwrTYTd0LHyrhPJN5xHdpeoKmGIyJYsoxm94DDUFZyGHB+Qs+3euCJHOlCqpa7/A+ciAdUSeKHa0tkw==",
-                "WorkspaceId": "default",
-                "__plugin_info__": {
-                    "name": "鏀粯瀹濆師鐢熸壂鐮佹彃浠�",
-                    "description": "鏀粯瀹濆師鐢熸壂鐮佺粍浠讹紝鍖呬綋绉粎0.7MB锛�15鍒嗛挓鍗冲彲瀹屾垚鎺ュ叆銆傚悓鏃讹紝mPaaS鎻愪緵銆屾壂鐮佸垎鏋愩�嶅ぇ鐩�",
-                    "platforms": "Android,iOS",
-                    "url": "https://ext.dcloud.net.cn/plugin?id=2636",
-                    "android_package_name": "com.shebeiguanli.www",
-                    "ios_bundle_id": "",
-                    "isCloud": true,
-                    "bought": 1,
-                    "pid": "2636",
-                    "parameters": {
-                        "AppId": {
-                            "des": "Android骞冲彴鐨凙ppId锛岃濉啓Android鐨刢onfig鏂囦欢涓殑appId瀵瑰簲鐨勫��",
-                            "key": "mobilegw.appid",
-                            "value": ""
+        "nativePlugins" : {
+            "Mpaas-Scan" : {
+                "AppId" : "ALIPUB2087527291109",
+                "License" : "uqSDoPf8ArVz0mKgs62fihEiELxaNc/fCwZU2eRwDvfdN3uhWCRRtXgszPkWmqjSUPYSFgOdMh0dv4UkQe0twC8fZt8+71FB3K6A83NaLtwi5gu+hVJ8MZnOTUe/ipmCCVmRGapmwfKfyHbV2oSAOLbq4/fgBszewOVtdjx7ogzyIltcCHOESsdejnFxmg/7+HuX5/0qmLxGIUUwGhwQazot0bQeGBP8sJ4ONZLd7n4WQFe8bQCrRcB3CPAFClwA/VldpIjOwrTYTd0LHyrhPJN5xHdpeoKmGIyJYsoxm94DDUFZyGHB+Qs+3euCJHOlCqpa7/A+ciAdUSeKHa0tkw==",
+                "WorkspaceId" : "default",
+                "__plugin_info__" : {
+                    "name" : "鏀粯瀹濆師鐢熸壂鐮佹彃浠�",
+                    "description" : "鏀粯瀹濆師鐢熸壂鐮佺粍浠讹紝鍖呬綋绉粎0.7MB锛�15鍒嗛挓鍗冲彲瀹屾垚鎺ュ叆銆傚悓鏃讹紝mPaaS鎻愪緵銆屾壂鐮佸垎鏋愩�嶅ぇ鐩�",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=2636",
+                    "android_package_name" : "com.shebeiguanli.www",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "2636",
+                    "parameters" : {
+                        "AppId" : {
+                            "des" : "Android骞冲彴鐨凙ppId锛岃濉啓Android鐨刢onfig鏂囦欢涓殑appId瀵瑰簲鐨勫��",
+                            "key" : "mobilegw.appid",
+                            "value" : ""
                         },
-                        "License": {
-                            "des": "Android骞冲彴鐨凩icense,锛岃濉啓Android鐨刢onfig鏂囦欢涓殑mpaasConfigLicense瀵瑰簲鐨勫��",
-                            "key": "mpaasConfigLicense",
-                            "value": ""
+                        "License" : {
+                            "des" : "Android骞冲彴鐨凩icense,锛岃濉啓Android鐨刢onfig鏂囦欢涓殑mpaasConfigLicense瀵瑰簲鐨勫��",
+                            "key" : "mpaasConfigLicense",
+                            "value" : ""
                         },
-                        "WorkspaceId": {
-                            "des": "Android骞冲彴鐨刉orkspaceId锛岃濉啓Android鐨刢onfig鏂囦欢涓殑workspaceId瀵瑰簲鐨勫��",
-                            "key": "workspaceId",
-                            "value": ""
+                        "WorkspaceId" : {
+                            "des" : "Android骞冲彴鐨刉orkspaceId锛岃濉啓Android鐨刢onfig鏂囦欢涓殑workspaceId瀵瑰簲鐨勫��",
+                            "key" : "workspaceId",
+                            "value" : ""
                         }
                     }
                 }
@@ -127,29 +127,29 @@
         }
     },
     /* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
-    "quickapp": {},
+    "quickapp" : {},
     /* 灏忕▼搴忕壒鏈夌浉鍏� */
-    "mp-weixin": {
-        "appid": "",
-        "setting": {
-            "urlCheck": false
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
         },
-        "usingComponents": true
+        "usingComponents" : true
     },
-    "mp-alipay": {
-        "usingComponents": true
+    "mp-alipay" : {
+        "usingComponents" : true
     },
-    "mp-baidu": {
-        "usingComponents": true
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "mp-toutiao": {
-        "usingComponents": true
+    "mp-toutiao" : {
+        "usingComponents" : true
     },
-    "uniStatistics": {
-        "enable": false
+    "uniStatistics" : {
+        "enable" : false
     },
-    "vueVersion": "2",
-    "orientation": [
+    "vueVersion" : "2",
+    "orientation" : [
         //绔栧睆姝f柟鍚�
         "portrait-primary",
         //绔栧睆鍙嶆柟鍚�
@@ -161,4 +161,4 @@
         //鑷劧鏂瑰悜
         "default"
     ]
-}
\ No newline at end of file
+}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1653898..8a607ac 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -405,15 +405,17 @@
 					this.itemData = itemCache
 				}
 			},
-			async switchHidden(index) {
+			switchHidden(index) {
 				console.log(this.itemData[index].hidden)
 				this.itemData[index].hidden = !this.itemData[index].hidden
-				await this.$nextTick(() => {
-					uni.setStorageSync("HIndexItemData", this.itemData)
-				})
 			},
 			switchIconsModeHandler() {
 				this.canEdit = !this.canEdit
+				if(this.canEdit == false) {
+					this.$nextTick(() => {
+						uni.setStorageSync("HIndexItemData", this.itemData)
+					})
+				}
 				this.$forceUpdate()
 			},
 			toUrl(item) {
@@ -446,7 +448,7 @@
 
 	.switch-button {
 		position: absolute;
-		right: 0;
+		right: 10rpx;
 		bottom: 0;
 	}
 
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index 3d9975c..7ec20ca 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -1,293 +1,364 @@
 <template>
-    <view class="content">
-        <view class="mains">
-            <view class="box" v-for="(item,index) in itemData" :key="index" @tap="toUrl(item)">
-                <image :src="item.img" mode=""></image>
-                <view class="texts">
-                    <view class="font1">{{item.text}}</view>
-                    <!-- <view class="font2">{{item.tip}}</view> -->
-                </view>
-                <!-- <uni-icons type="forward" color="#888" style="position: absolute;right: 70rpx;" size="18"></uni-icons> -->
-            </view>
-        </view>
-    </view>
+	<view class="content">
+		<view class="header">
+			<view class="switch-button">
+				<uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
+			</view>
+		</view>
+		<view class="mains">
+			<view v-if="!canEdit" :hidden="item.hidden" class="box" v-for="(item,index) in itemData" :key="index"
+				@tap="toUrl(item)">
+				<image :src="item.img" mode=""></image>
+				<view class="texts">
+					{{item.text}}
+				</view>
+			</view>
+			<view :enable-hidden="item.hidden" v-if="canEdit" class="box edit" v-for="(item,index) in itemData"
+				:key="index" @tap="switchHidden(index)">
+				<uni-icons class="edit-mark" color="red" type="closeempty"></uni-icons>
+				<image :src="item.img" mode=""></image>
+				<view class="texts">
+					{{item.text}}
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-    export default {
-        data() {
-            return {
-                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-                itemData: [{
-                        img: '../../static/icon/icon9.png',
-                        text: '宸ュ簭杩涚珯鎺ユ敹鍗曟柊澧�',
-                        tip: '绔嬪嵆鏂板',
-                        url: '/pages/gongxuIn/form',
-                        id: 1,
-                    }, {
-                        img: '../../static/icon/icon9.png',
-                        text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
-                        tip: '鏌ョ湅鍒楄〃',
-                        url: '/pages/gongxuIn/table',
-                        id: 2,
-                    }, {
-                        img: '../../static/icon/icon10.png',
-                        text: '宸ュ簭鍑虹珯姹囨姤鍗曟柊澧�',
-                        tip: '绔嬪嵆鏂板',
-                        url: '/pages/gongxuOut/form',
-                        id: 3,
-                    }, {
-                        img: '../../static/icon/icon10.png',
-                        text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
-                        tip: '鏌ョ湅鍒楄〃',
-                        url: '/pages/gongxuOut/table',
-                        id: 4,
-                    }, {
-                        img: '../../static/icon/icon11.png',
-                        text: '宸ュ簭濮斿鍙戝嚭鍗曟柊澧�',
-                        tip: '绔嬪嵆鏂板',
-                        url: '/pages/weiwaigxIn/form',
-                        id: 5,
-                    }, {
-                        img: '../../static/icon/icon11.png',
-                        text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
-                        tip: '鏌ョ湅鍒楄〃',
-                        url: '/pages/weiwaigxIn/table',
-                        id: 6,
-                    }, {
-                        img: '../../static/icon/icon12.png',
-                        text: '宸ュ簭濮斿鎺ユ敹鍗曟柊澧�',
-                        tip: '绔嬪嵆鏂板',
-                        url: '/pages/weiwaigxOut/form',
-                        id: 7,
-                    }, {
-                        img: '../../static/icon/icon12.png',
-                        text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
-                        tip: '鏌ョ湅鍒楄〃',
-                        url: '/pages/weiwaigxOut/table',
-                        id: 8,
-                    }
-                    // , {
-                    // 	img: '../../static/icon/icon1.png',
-                    // 	text: '璁惧妗f鏌ヨ',
-                    // 	tip: '鏌ョ湅璇︽儏',
-                    // 	url: '/pages/shebeidangan/table',
-                    // 	id: 9,
-                    // }, {
-                    // 	img: '../../static/icon/icon8.png',
-                    // 	text: '璁惧灞ュ巻鏌ヨ',
-                    // 	tip: '鏌ョ湅璇︽儏',
-                    // 	url: '/pages/shebeilvli/table',
-                    // 	id: 10,
-                    // }, {
-                    // 	img: '../../static/icon/icon14.png',
-                    // 	text: '鎴戠殑鎶ュ伐骞冲彴',
-                    // 	tip: '鐐瑰嚮杩涘叆',
-                    // 	url: '/pages/baogong/table',
-                    // 	id: 11,
-                    // }, {
-                    // 	img: '../../static/icon/icon13.png',
-                    // 	text: '涓婃ā鍗�',
-                    // 	tip: '鏌ョ湅璇︽儏',
-                    // 	url: '/pages/MJGL/shangmudan/table',
-                    // 	id: 12,
-                    // }, {
-                    // 	img: '../../static/icon/icon13.png',
-                    // 	text: '涓嬫ā鍗�',
-                    // 	tip: '鏌ョ湅璇︽儏',
-                    // 	url: '',
-                    // 	id: 13,
-                    // }, {
-                    // 	img: '../../static/icon/icon32.png',
-                    // 	text: '璁惧杩愯鐘舵��',
-                    // 	tip: '鏌ョ湅璇︽儏',
-                    // 	url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
-                    // 	id: 14,
-                    // }, {
-                    // 	img: '../../static/icon/icon6.png',
-                    // 	text: '妯″叿鐘舵�佸垎鏋�',
-                    // 	tip: '鏌ョ湅璇︽儏',
-                    // 	url: '/pages/mujvzhuangtai/mujvzhuangtai',
-                    // 	id: 15,
-                    // },
-                ]
-                // itemData: [{
-                // 	//  img:'../../static/icon0.png',
-                // 	//  text:'鎶ヨ〃涓績',
-                // 	//  url:'/pages/shebeilvli/table',
-                // 	//  id:0
-                // 	// },{
-                // 	img: '../../static/icon/icon_a1.png',
-                // 	text: '璁惧妗f',
-                // 	url: '/pages/shebeidangan/table',
-                // 	id: 1
-                // }, {
-                // 	img: '../../static/icon/icon_a2.png',
-                // 	text: '璁惧淇濆吇璁″垝鍗�',
-                // 	url: '/pages/baoyangjihua/table',
-                // 	id: 2
-                // }, {
-                // 	img: '../../static/icon/icon_a3.png',
-                // 	text: '璁惧淇濆吇璁板綍鍗�',
-                // 	url: '/pages/baoyangjilu/table',
-                // 	id: 3
-                // 	// },{
-                // 	//  img:'../../static/icon/icon_a4.png',
-                // 	//  text:'璁惧鐐规璁″垝鍗�',
-                // 	//  url:'',
-                // 	//  id:4
-                // 	// },{
-                // 	//  img:'../../static/icon/icon_a5.png',
-                // 	//  text:'璁惧鐐规璁板綍鍗�',
-                // 	//  url:'',
-                // 	//  id:5,
-                // }, {
-                // 	img: '../../static/icon/icon_a6.png',
-                // 	text: '璁惧鏁呴殰鐧昏琛�',
-                // 	url: '/pages/guzhangdengji/table',
-                // 	id: 6
-                // }, {
-                // 	img: '../../static/icon/icon_a7.png',
-                // 	text: '璁惧缁翠慨璁板綍鍗�',
-                // 	url: '/pages/shebeiweixiu/table',
-                // 	id: 7,
-                // }, {
-                // 	img: '../../static/icon/icon_a8.png',
-                // 	text: '璁惧灞ュ巻',
-                // 	url: '/pages/shebeilvli/table',
-                // 	id: 8,
-                // }, {
-                // 	img: '../../static/icon/icon_a9.png',
-                // 	text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
-                // 	url: '/pages/gongxuIn/table',
-                // 	id: 9,
-                // }, {
-                // 	img: '../../static/icon/icon_a10.png',
-                // 	text: '宸ュ簭鍑虹珯姹囨姤鍗�',
-                // 	url: '/pages/gongxuOut/table',
-                // 	id: 10,
-                // }, {
-                // 	img: '../../static/icon/icon_a11.png',
-                // 	text: '宸ュ簭濮斿鍙戝嚭鍗�',
-                // 	url: '/pages/weiwaigxIn/table',
-                // 	id: 11,
-                // }, {
-                // 	img: '../../static/icon/icon_a12.png',
-                // 	text: '宸ュ簭濮斿鎺ユ敹鍗�',
-                // 	url: '/pages/weiwaigxOut/table',
-                // 	id: 12,
-                // // }, {
-                // // 	img: '../../static/icon/icon_a13.png',
-                // // 	text: '璁惧绠$悊',
-                // // 	url: '',
-                // // 	id: 13,
-                // }, {
-                // 	img: '../../static/icon/icon_a14.png',
-                // 	text: '鎶ュ伐骞冲彴',
-                // 	url: '/pages/baogong/table',
-                // 	id: 14,
-                // }, {
-                // 	img: '../../static/icon/icon_a15.png',
-                // 	text: '寮傚父鍙嶉鍗�',
-                // 	url: '/pages/yichang/table',
-                // 	id: 15,
-                // }, {
-                // 	img: '../../static/icon/icon_a16.png',
-                // 	text: '寮傚父鍙嶉澶勭悊鍗�',
-                // 	url: '/pages/yichang/list',
-                // 	id: 16,
-                // }]
-            }
-        },
-        onLoad() {
-
-        },
-        methods: {
-            toUrl(item) {
-                if (item.url) {
-                    uni.navigateTo({
-                        url: item.url
-                    })
-                } else {
-                    uni.showToast({
-                        title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
-                        icon: 'none'
-                    })
-                }
-            }
-        }
-    }
+	export default {
+		data() {
+			return {
+				canEdit: false,
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				itemData: [{
+						img: '../../static/icon/icon9.png',
+						text: '宸ュ簭杩涚珯鎺ユ敹鍗曟柊澧�',
+						tip: '绔嬪嵆鏂板',
+						url: '/pages/gongxuIn/form',
+						id: 1,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon9.png',
+						text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
+						tip: '鏌ョ湅鍒楄〃',
+						url: '/pages/gongxuIn/table',
+						id: 2,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon10.png',
+						text: '宸ュ簭鍑虹珯姹囨姤鍗曟柊澧�',
+						tip: '绔嬪嵆鏂板',
+						url: '/pages/gongxuOut/form',
+						id: 3,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon10.png',
+						text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
+						tip: '鏌ョ湅鍒楄〃',
+						url: '/pages/gongxuOut/table',
+						id: 4,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon11.png',
+						text: '宸ュ簭濮斿鍙戝嚭鍗曟柊澧�',
+						tip: '绔嬪嵆鏂板',
+						url: '/pages/weiwaigxIn/form',
+						id: 5,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon11.png',
+						text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
+						tip: '鏌ョ湅鍒楄〃',
+						url: '/pages/weiwaigxIn/table',
+						id: 6,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon12.png',
+						text: '宸ュ簭濮斿鎺ユ敹鍗曟柊澧�',
+						tip: '绔嬪嵆鏂板',
+						url: '/pages/weiwaigxOut/form',
+						id: 7,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon12.png',
+						text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
+						tip: '鏌ョ湅鍒楄〃',
+						url: '/pages/weiwaigxOut/table',
+						id: 8,
+						hidden: false,
+					}
+					// , {
+					// 	img: '../../static/icon/icon1.png',
+					// 	text: '璁惧妗f鏌ヨ',
+					// 	tip: '鏌ョ湅璇︽儏',
+					// 	url: '/pages/shebeidangan/table',
+					// 	id: 9,
+					// }, {
+					// 	img: '../../static/icon/icon8.png',
+					// 	text: '璁惧灞ュ巻鏌ヨ',
+					// 	tip: '鏌ョ湅璇︽儏',
+					// 	url: '/pages/shebeilvli/table',
+					// 	id: 10,
+					// }, {
+					// 	img: '../../static/icon/icon14.png',
+					// 	text: '鎴戠殑鎶ュ伐骞冲彴',
+					// 	tip: '鐐瑰嚮杩涘叆',
+					// 	url: '/pages/baogong/table',
+					// 	id: 11,
+					// }, {
+					// 	img: '../../static/icon/icon13.png',
+					// 	text: '涓婃ā鍗�',
+					// 	tip: '鏌ョ湅璇︽儏',
+					// 	url: '/pages/MJGL/shangmudan/table',
+					// 	id: 12,
+					// }, {
+					// 	img: '../../static/icon/icon13.png',
+					// 	text: '涓嬫ā鍗�',
+					// 	tip: '鏌ョ湅璇︽儏',
+					// 	url: '',
+					// 	id: 13,
+					// }, {
+					// 	img: '../../static/icon/icon32.png',
+					// 	text: '璁惧杩愯鐘舵��',
+					// 	tip: '鏌ョ湅璇︽儏',
+					// 	url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
+					// 	id: 14,
+					// }, {
+					// 	img: '../../static/icon/icon6.png',
+					// 	text: '妯″叿鐘舵�佸垎鏋�',
+					// 	tip: '鏌ョ湅璇︽儏',
+					// 	url: '/pages/mujvzhuangtai/mujvzhuangtai',
+					// 	id: 15,
+					// },
+				]
+				// itemData: [{
+				// 	//  img:'../../static/icon0.png',
+				// 	//  text:'鎶ヨ〃涓績',
+				// 	//  url:'/pages/shebeilvli/table',
+				// 	//  id:0
+				// 	// },{
+				// 	img: '../../static/icon/icon_a1.png',
+				// 	text: '璁惧妗f',
+				// 	url: '/pages/shebeidangan/table',
+				// 	id: 1
+				// }, {
+				// 	img: '../../static/icon/icon_a2.png',
+				// 	text: '璁惧淇濆吇璁″垝鍗�',
+				// 	url: '/pages/baoyangjihua/table',
+				// 	id: 2
+				// }, {
+				// 	img: '../../static/icon/icon_a3.png',
+				// 	text: '璁惧淇濆吇璁板綍鍗�',
+				// 	url: '/pages/baoyangjilu/table',
+				// 	id: 3
+				// 	// },{
+				// 	//  img:'../../static/icon/icon_a4.png',
+				// 	//  text:'璁惧鐐规璁″垝鍗�',
+				// 	//  url:'',
+				// 	//  id:4
+				// 	// },{
+				// 	//  img:'../../static/icon/icon_a5.png',
+				// 	//  text:'璁惧鐐规璁板綍鍗�',
+				// 	//  url:'',
+				// 	//  id:5,
+				// }, {
+				// 	img: '../../static/icon/icon_a6.png',
+				// 	text: '璁惧鏁呴殰鐧昏琛�',
+				// 	url: '/pages/guzhangdengji/table',
+				// 	id: 6
+				// }, {
+				// 	img: '../../static/icon/icon_a7.png',
+				// 	text: '璁惧缁翠慨璁板綍鍗�',
+				// 	url: '/pages/shebeiweixiu/table',
+				// 	id: 7,
+				// }, {
+				// 	img: '../../static/icon/icon_a8.png',
+				// 	text: '璁惧灞ュ巻',
+				// 	url: '/pages/shebeilvli/table',
+				// 	id: 8,
+				// }, {
+				// 	img: '../../static/icon/icon_a9.png',
+				// 	text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
+				// 	url: '/pages/gongxuIn/table',
+				// 	id: 9,
+				// }, {
+				// 	img: '../../static/icon/icon_a10.png',
+				// 	text: '宸ュ簭鍑虹珯姹囨姤鍗�',
+				// 	url: '/pages/gongxuOut/table',
+				// 	id: 10,
+				// }, {
+				// 	img: '../../static/icon/icon_a11.png',
+				// 	text: '宸ュ簭濮斿鍙戝嚭鍗�',
+				// 	url: '/pages/weiwaigxIn/table',
+				// 	id: 11,
+				// }, {
+				// 	img: '../../static/icon/icon_a12.png',
+				// 	text: '宸ュ簭濮斿鎺ユ敹鍗�',
+				// 	url: '/pages/weiwaigxOut/table',
+				// 	id: 12,
+				// // }, {
+				// // 	img: '../../static/icon/icon_a13.png',
+				// // 	text: '璁惧绠$悊',
+				// // 	url: '',
+				// // 	id: 13,
+				// }, {
+				// 	img: '../../static/icon/icon_a14.png',
+				// 	text: '鎶ュ伐骞冲彴',
+				// 	url: '/pages/baogong/table',
+				// 	id: 14,
+				// }, {
+				// 	img: '../../static/icon/icon_a15.png',
+				// 	text: '寮傚父鍙嶉鍗�',
+				// 	url: '/pages/yichang/table',
+				// 	id: 15,
+				// }, {
+				// 	img: '../../static/icon/icon_a16.png',
+				// 	text: '寮傚父鍙嶉澶勭悊鍗�',
+				// 	url: '/pages/yichang/list',
+				// 	id: 16,
+				// }]
+			}
+		},
+		onLoad() {
+			this.getHiddenItem()
+		},
+		methods: {
+			getHiddenItem() {
+				let itemCache = uni.getStorageSync('HTab1ItemData') || ''
+				console.log('itemCache: ', itemCache);
+				if (itemCache !== '') {
+					this.itemData = itemCache
+				}
+			},
+			switchHidden(index) {
+				console.log(this.itemData[index].hidden)
+				this.itemData[index].hidden = !this.itemData[index].hidden
+			},
+			switchIconsModeHandler() {
+				this.canEdit = !this.canEdit
+				if (this.canEdit == false) {
+					this.$nextTick(() => {
+						uni.setStorageSync("HTab1ItemData", this.itemData)
+					})
+				}
+				this.$forceUpdate()
+			},
+			toUrl(item) {
+				if (item.url) {
+					uni.navigateTo({
+						url: item.url
+					})
+				} else {
+					uni.showToast({
+						title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
+						icon: 'none'
+					})
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    page {
-        width: 100vw;
-        min-height: 100vh;
-        background-color: #fff;
-    }
+	.header {
+		width: 100%;
+		height: 2em;
+		position: relative;
 
-    .mains {
-        width: 720rpx;
-        margin: 0 auto;
-        display: flex;
-        flex-wrap: wrap;
-        padding-bottom: 80rpx;
+		.switch-button {
+			position: absolute;
+			right: 10rpx;
+			bottom: 0;
+		}
+	}
 
-        .box {
-            width: 25%;
-            margin-top: 2.5vh;
-            text-align: center;
+	page {
+		width: 100vw;
+		min-height: 100vh;
+		background-color: #fff;
+	}
 
-            image {
-                width: 18vw;
-                height: 18vw;
-            }
+	.mains {
+		width: 720rpx;
+		margin: 0 auto;
+		display: flex;
+		flex-wrap: wrap;
+		padding-bottom: 80rpx;
 
-            .texts {
-                width: 120rpx;
-                margin: 0 auto;
-                font-size: 29rpx;
-                font-weight: normal;
-                color: #333333;
-                margin-top: .2vh;
-            }
-        }
-    }
+		.box {
+			width: 25%;
+			margin-top: 2.5vh;
+			text-align: center;
 
-    // .mains {
-    // 	width: 720rpx;
-    // 	margin: 0 auto;
-    // 	padding-bottom: 120rpx;
+			image {
+				width: 18vw;
+				height: 18vw;
+			}
 
-    // 	.box {
-    // 		width: 680rpx;
-    // 		margin: 0 auto;
-    // 		margin-top: 20rpx;
-    // 		display: flex;
-    // 		align-items: center;
-    // 		background-color: #fff;
-    // 		border-radius: 20rpx;
-    // 		box-shadow: 2upx 2upx 20upx 0 #ddd;
+			.texts {
+				width: 120rpx;
+				margin: 0 auto;
+				font-size: 29rpx;
+				font-weight: normal;
+				color: #333333;
+				margin-top: .2vh;
+			}
+		}
 
-    // 		image {
-    // 			width: 78rpx;
-    // 			height: 78rpx;
-    // 			padding: 10rpx;
-    // 			margin: 14rpx 30rpx;
-    // 		}
+		.edit {
+			position: relative;
+		}
 
-    // 		.texts {
-    // 			font-size: 30rpx;
-    // 			font-weight: normal;
-    // 			color: #333333;
+		.edit-mark {
+			position: absolute;
+			top: 0;
+			right: 0;
+		}
 
-    // 			.font1 {}
+		view[enable-hidden] {
+			opacity: .4 !important;
+		}
 
-    // 			.font2 {
-    // 				font-size: 25rpx;
-    // 				color: #999;
-    // 			}
-    // 		}
-    // 	}
-    // }
+		view[hidden] {
+			display: none;
+		}
+	}
+
+	// .mains {
+	// 	width: 720rpx;
+	// 	margin: 0 auto;
+	// 	padding-bottom: 120rpx;
+
+	// 	.box {
+	// 		width: 680rpx;
+	// 		margin: 0 auto;
+	// 		margin-top: 20rpx;
+	// 		display: flex;
+	// 		align-items: center;
+	// 		background-color: #fff;
+	// 		border-radius: 20rpx;
+	// 		box-shadow: 2upx 2upx 20upx 0 #ddd;
+
+	// 		image {
+	// 			width: 78rpx;
+	// 			height: 78rpx;
+	// 			padding: 10rpx;
+	// 			margin: 14rpx 30rpx;
+	// 		}
+
+	// 		.texts {
+	// 			font-size: 30rpx;
+	// 			font-weight: normal;
+	// 			color: #333333;
+
+	// 			.font1 {}
+
+	// 			.font2 {
+	// 				font-size: 25rpx;
+	// 				color: #999;
+	// 			}
+	// 		}
+	// 	}
+	// }
 </style>
\ No newline at end of file
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index ae14c60..f4f8f34 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -1,12 +1,25 @@
 <template>
 	<view class="content">
+		<view class="header">
+			<view class="switch-button">
+				<uni-icons type="loop" @click="switchIconsModeHandler"></uni-icons>
+			</view>
+		</view>
 		<view class="mains">
-			<view class="box" v-for="(item,index) in itemData" :key="index" @tap="toUrl(item)">
+			<view v-if="!canEdit" :hidden="item.hidden" class="box" v-for="(item,index) in itemData" :key="index"
+				@tap="toUrl(item)">
 				<image :src="item.img" mode=""></image>
 				<view class="texts">
 					{{item.text}}
 				</view>
-				<!-- <uni-icons type="forward" color="#888" style="position: absolute;right: 40rpx;" size="18"></uni-icons> -->
+			</view>
+			<view :enable-hidden="item.hidden" v-if="canEdit" class="box edit" v-for="(item,index) in itemData"
+				:key="index" @tap="switchHidden(index)">
+				<uni-icons class="edit-mark" color="red" type="closeempty"></uni-icons>
+				<image :src="item.img" mode=""></image>
+				<view class="texts">
+					{{item.text}}
+				</view>
 			</view>
 		</view>
 	</view>
@@ -14,208 +27,267 @@
 
 <script>
 	export default {
-	    data() {
-	        return {
-				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-				itemData:[{
-						img:'../../static/icon/icon17.png',
-						text:'閲囪喘鍏ュ簱鏆傚瓨鍒楄〃',
-						url:'/pages/caigouruku/table',
-						id:1
-					},{
-						img:'../../static/icon/icon18.png',
-						text:'閲囪喘閫�鏂欐殏瀛樺垪琛�',
-						url:'/pages/caigoutuiliao/table',
-						id:2,
-					},{
-						img:'../../static/icon/icon17.png',
-						text:'鍏朵粬鍏ュ簱鏆傚瓨鍒楄〃',
-						url:'/pages/qitaruku_v2/table',
-						id:3,
-					},{
-						img:'../../static/icon/icon18.png',
-						text:'鍏朵粬鍑哄簱鏆傚瓨鍒楄〃',
-						url:'/pages/qitachuku_v2/table',
-						id:4,
-					},{
-						img:'../../static/icon/icon32.png',
-						text:'鐩存帴璋冩嫧鏆傚瓨鍒楄〃',
-						url:'/pages/zhijiediaobo/table',
-						id:5,
-					},{
-						img:'../../static/icon/icon30.png',
-						text:'鐢熶骇棰嗘枡鏆傚瓨鍒楄〃',
-						url:'/pages/shengchanlingliaoshengdan/table',
-						id:6,
-					},{
-						img:'../../static/icon/icon31.png',
-						text:'鐢熶骇琛ユ枡鏆傚瓨鍒楄〃',
-						url: '/pages/shengchanbuliao/table' ,
-						// url: '',
-						id:7,
-					},{
-						img:'../../static/icon/icon17.png',
-						text:'鐢熶骇鍏ュ簱鏆傚瓨鍒楄〃',
-						url:'/pages/shengchanrukushengdan/table',
-						// url:'',
-						id:8,
-					},{
-						img:'../../static/icon/icon30.png',
-						text:'濮斿棰嗘枡鏆傚瓨鍒楄〃',
-						// url:'',
-						url:'/pages/weiwailingliao/table',
-						id:9,
-					},{
-						img:'../../static/icon/icon18.png',
-						text:'閿�鍞嚭搴撴殏瀛樺垪琛�',
-						url:'/pages/xiaoshouchuku/table',
-						id:10,
-					},{
-						img:'../../static/icon/icon20.png',
-						text:'閿�鍞��璐ф殏瀛樺垪琛�',
-						url:'/pages/xiaoshoutuihuo/table',
-						id:11
-					},{
-						img:'../../static/icon/icon30.png',
-						text:'鐢熶骇棰嗘枡鏍¢獙鏆傚瓨鍒楄〃',
-						url:'/pages/shengchanlingliao/table',
-						id:12,
-					},{
-						img:'../../static/icon/icon31.png',
-						text:'鐢熶骇琛ユ枡鏍¢獙鏆傚瓨鍒楄〃',
-						url:'/pages/shengchanbuliaojiaoyan/CacheList',
-						id:13,
-					},{
-						img:'../../static/icon/icon32.png',
-						text:'鐢熶骇璋冩嫧鏍¢獙鏆傚瓨鍒楄〃',
-						url:'/pages/shengchandiaobo/table',
-						id:14,
-					},{
-						img:'../../static/icon/icon18.png',
-						text:'鍏朵粬鍑哄簱鏍¢獙鏆傚瓨鍒楄〃',
-						url:'/pages/qitachuku/qitachuku',
-						id:15,
-					},{
-						img:'../../static/icon/icon17.png',
-						text:'鐢熶骇鍏ュ簱鏍¢獙鏆傚瓨鍒楄〃',
-						url:'/pages/shengchanruku/table',
-						id:16,
-					},{
-						img:'../../static/icon/icon18.png',
-						text:'閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�',
-						url:'/pages/xiaoshouchukujiaoyan/table',
-						id:17,
-					},{
-						img:'../../static/icon/icon30.png',
-						text:'濮斿棰嗘枡鏍¢獙鏆傚瓨鍒楄〃',
-						url:'/pages/weiwailingliaojiaoyan/table',
-						id:18,
-					},{
-						img:'../../static/icon/icon3.png',
-						text:'璁惧淇濆吇璁板綍鍗�',
-						url:'/pages/baoyangjilu/table',
-						id:19,
-					},{
-						img:'../../static/icon/icon5.png',
-						text:'璁惧鐐规璁板綍鍗�',
-						url:'',
-						id:20,
-					},{
-						img:'../../static/icon/icon6.png',
-						text:'璁惧鏁呴殰鐧昏琛�',
-						url:'/pages/guzhangdengji/table',
-						id:21,
-					},{
-						img:'../../static/icon/icon7.png',
-						text:'璁惧缁翠慨璁板綍鍗�',
-						url:'/pages/shebeiweixiu/table',
-						id:22,
-					},{
-						img:'../../static/icon/icon15.png',
-						text:'寮傚父鍙嶉鍗�',
-						url:'/pages/yichang/table',
-						id:23,
-					},{
-						img:'../../static/icon/icon16.png',
-						text:'寮傚父鍙嶉澶勭悊鍗�',
-						url:'/pages/yichang/list',
-						id:24,
-					},{
-						img:'../../static/icon/icon21.png',
-						text:'鏍囩鎵撳嵃',
-						url:'/pages/labelPrinter/index',
-						id:25,
-					},{
-						img:'../../static/icon/icon21.png',
-						text:'鏉$爜鎷嗙爜',
-						url:'/pages/tiaomachaima/tiaomachaima',
-						id:26,
-					}]
-	        }
-	    },
-		onLoad() {
-		
+		data() {
+			return {
+				canEdit: false,
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				itemData: [{
+					img: '../../static/icon/icon17.png',
+					text: '閲囪喘鍏ュ簱鏆傚瓨鍒楄〃',
+					url: '/pages/caigouruku/table',
+					id: 1,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon18.png',
+					text: '閲囪喘閫�鏂欐殏瀛樺垪琛�',
+					url: '/pages/caigoutuiliao/table',
+					id: 2,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon17.png',
+					text: '鍏朵粬鍏ュ簱鏆傚瓨鍒楄〃',
+					url: '/pages/qitaruku_v2/table',
+					id: 3,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon18.png',
+					text: '鍏朵粬鍑哄簱鏆傚瓨鍒楄〃',
+					url: '/pages/qitachuku_v2/table',
+					id: 4,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon32.png',
+					text: '鐩存帴璋冩嫧鏆傚瓨鍒楄〃',
+					url: '/pages/zhijiediaobo/table',
+					id: 5,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon30.png',
+					text: '鐢熶骇棰嗘枡鏆傚瓨鍒楄〃',
+					url: '/pages/shengchanlingliaoshengdan/table',
+					id: 6,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon31.png',
+					text: '鐢熶骇琛ユ枡鏆傚瓨鍒楄〃',
+					url: '/pages/shengchanbuliao/table',
+					// url: '',
+					id: 7,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon17.png',
+					text: '鐢熶骇鍏ュ簱鏆傚瓨鍒楄〃',
+					url: '/pages/shengchanrukushengdan/table',
+					// url:'',
+					id: 8,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon30.png',
+					text: '濮斿棰嗘枡鏆傚瓨鍒楄〃',
+					// url:'',
+					url: '/pages/weiwailingliao/table',
+					id: 9,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon18.png',
+					text: '閿�鍞嚭搴撴殏瀛樺垪琛�',
+					url: '/pages/xiaoshouchuku/table',
+					id: 10,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon20.png',
+					text: '閿�鍞��璐ф殏瀛樺垪琛�',
+					url: '/pages/xiaoshoutuihuo/table',
+					id: 11,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon30.png',
+					text: '鐢熶骇棰嗘枡鏍¢獙鏆傚瓨鍒楄〃',
+					url: '/pages/shengchanlingliao/table',
+					id: 12,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon31.png',
+					text: '鐢熶骇琛ユ枡鏍¢獙鏆傚瓨鍒楄〃',
+					url: '/pages/shengchanbuliaojiaoyan/CacheList',
+					id: 13,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon32.png',
+					text: '鐢熶骇璋冩嫧鏍¢獙鏆傚瓨鍒楄〃',
+					url: '/pages/shengchandiaobo/table',
+					id: 14,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon18.png',
+					text: '鍏朵粬鍑哄簱鏍¢獙鏆傚瓨鍒楄〃',
+					url: '/pages/qitachuku/qitachuku',
+					id: 15,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon17.png',
+					text: '鐢熶骇鍏ュ簱鏍¢獙鏆傚瓨鍒楄〃',
+					url: '/pages/shengchanruku/table',
+					id: 16,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon18.png',
+					text: '閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�',
+					url: '/pages/xiaoshouchukujiaoyan/table',
+					id: 17,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon30.png',
+					text: '濮斿棰嗘枡鏍¢獙鏆傚瓨鍒楄〃',
+					url: '/pages/weiwailingliaojiaoyan/table',
+					id: 18,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon3.png',
+					text: '璁惧淇濆吇璁板綍鍗�',
+					url: '/pages/baoyangjilu/table',
+					id: 19,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon5.png',
+					text: '璁惧鐐规璁板綍鍗�',
+					url: '',
+					id: 20,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon6.png',
+					text: '璁惧鏁呴殰鐧昏琛�',
+					url: '/pages/guzhangdengji/table',
+					id: 21,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon7.png',
+					text: '璁惧缁翠慨璁板綍鍗�',
+					url: '/pages/shebeiweixiu/table',
+					id: 22,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon15.png',
+					text: '寮傚父鍙嶉鍗�',
+					url: '/pages/yichang/table',
+					id: 23,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon16.png',
+					text: '寮傚父鍙嶉澶勭悊鍗�',
+					url: '/pages/yichang/list',
+					id: 24,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon21.png',
+					text: '鏍囩鎵撳嵃',
+					url: '/pages/labelPrinter/index',
+					id: 25,
+					hidden: false,
+				}, {
+					img: '../../static/icon/icon21.png',
+					text: '鏉$爜鎷嗙爜',
+					url: '/pages/tiaomachaima/tiaomachaima',
+					id: 26,
+					hidden: false,
+				}]
+			}
 		},
-	    methods: {
-			toUrl(item){
-				if(item.url){
-					uni.navigateTo({
-						url:item.url
+		onLoad() {
+			this.getHiddenItem()
+		},
+		methods: {
+			getHiddenItem() {
+				let itemCache = uni.getStorageSync('HTab2ItemData') || ''
+				console.log('itemCache: ', itemCache);
+				if (itemCache !== '') {
+					this.itemData = itemCache
+				}
+			},
+			switchHidden(index) {
+				this.itemData[index].hidden = !this.itemData[index].hidden
+			},
+			switchIconsModeHandler() {
+				this.canEdit = !this.canEdit
+				if (this.canEdit == false) {
+					this.$nextTick(() => {
+						uni.setStorageSync("HTab2ItemData", this.itemData)
 					})
-				}else{
+				}
+				this.$forceUpdate()
+			},
+			toUrl(item) {
+				if (item.url) {
+					uni.navigateTo({
+						url: item.url
+					})
+				} else {
 					uni.showToast({
-						title:'鍔熻兘寮�鍙戜腑銆傘�傘��',
-						icon:'none'
+						title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
+						icon: 'none'
 					})
 				}
 			}
-	    }
+		}
 	}
 </script>
 
 <style lang="scss" scoped>
-// .mains{
-// 	width: 720rpx;
-// 	margin: 0 auto;
-// 	display: flex;
-// 	flex-wrap: wrap;
-// 	margin-top: 10rpx;
-// 	padding-bottom: 80rpx;
-// 	.box{
-// 		width: 100%;
-// 		margin: 26rpx 26rpx 0 26rpx;
-// 		padding: 0 0 16rpx 10rpx;
-// 		display: flex;
-// 		align-items: center;
-// 		border-bottom: 1px solid #f0f0f0;
-// 		image{
-// 			width: 52rpx;
-// 			height: 52rpx;
-// 		}
-// 		.texts{
-// 			font-size: 30rpx;
-// 			color: #333333;
-// 			margin-left: 30rpx;
-// 		}
-// 	}
-// }
+	// .mains{
+	// 	width: 720rpx;
+	// 	margin: 0 auto;
+	// 	display: flex;
+	// 	flex-wrap: wrap;
+	// 	margin-top: 10rpx;
+	// 	padding-bottom: 80rpx;
+	// 	.box{
+	// 		width: 100%;
+	// 		margin: 26rpx 26rpx 0 26rpx;
+	// 		padding: 0 0 16rpx 10rpx;
+	// 		display: flex;
+	// 		align-items: center;
+	// 		border-bottom: 1px solid #f0f0f0;
+	// 		image{
+	// 			width: 52rpx;
+	// 			height: 52rpx;
+	// 		}
+	// 		.texts{
+	// 			font-size: 30rpx;
+	// 			color: #333333;
+	// 			margin-left: 30rpx;
+	// 		}
+	// 	}
+	// }
+
+	.header {
+		width: 100%;
+		height: 2em;
+		position: relative;
+
+		.switch-button {
+			position: absolute;
+			right: 10rpx;
+			bottom: 0;
+		}
+	}
+
 	.mains {
 		width: 720rpx;
 		margin: 0 auto;
 		display: flex;
 		flex-wrap: wrap;
 		padding-bottom: 80rpx;
-	
+
 		.box {
 			width: 25%;
 			margin-top: 2.5vh;
 			text-align: center;
-	
+
 			image {
 				width: 18vw;
 				height: 18vw;
 			}
-	
+
 			.texts {
 				width: 120rpx;
 				margin: 0 auto;
@@ -225,5 +297,23 @@
 				margin-top: .2vh;
 			}
 		}
+
+		.edit {
+			position: relative;
+		}
+
+		.edit-mark {
+			position: absolute;
+			top: 0;
+			right: 0;
+		}
+
+		view[enable-hidden] {
+			opacity: .4 !important;
+		}
+
+		view[hidden] {
+			display: none;
+		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/weiwaigxOut/form.vue b/pages/weiwaigxOut/form.vue
index 7b68843..bc13113 100644
--- a/pages/weiwaigxOut/form.vue
+++ b/pages/weiwaigxOut/form.vue
@@ -1,159 +1,176 @@
 <template>
-    <view>
-        <view class="form">
-            <view class="form-item">
-                <view class="title"><text>*</text>鏉″舰鐮�:</view>
-                <view class="right" style="width: 380rpx;">
-                    <input name="HBarCode" v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�" @confirm="toInCode(e)" />
-                </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"><text>*</text>娴佹按鍙�:</view>
-                <view class="right" style="width: 380rpx;">
-                    <input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�"
-                        @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
-                </view>
-                <uni-icons type="scan"
-                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
-                    size="20" @click="toScanProcNo"></uni-icons>
-            </view>
-            <view class="form-item">
-                <view class="title">鏈姤宸ユ暟閲�:</view>
-                <view class="righton">
-                    <input disabled v-model="hform.HNotReportQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">鍚堟牸鏁伴噺:</view>
-                <view class="right">
-                    <input v-model="hform.HQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">涓嶈壇鏁伴噺:</view>
-                <view class="right">
-                    <input v-model="hform.HPieceQty" placeholder="璇疯緭鍏ヤ笉鑹暟閲�" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">鎶ュ簾鏁伴噺:</view>
-                <view class="right">
-                    <input v-model="hform.HWasterQty" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title"><text>*</text>渚涘簲鍟�:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName"
-                        @input="HSupNameChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
-                        @input="HEmpNameChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">閫佽揣鍗曞彿:</view>
-                <view class="right">
-                    <input v-model="hform.HInnerBillNo" placeholder="璇疯緭鍏ラ�佽揣鍗曞彿" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">濮斿宸ュ崟鍙�:</view>
-                <view class="right">
-                    <input v-model="hform.HWWWorkOrderBillNo" placeholder="璇疯緭鍏ュ澶栧伐鍗曞彿" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title"><text>*</text>鐢熶骇鐝粍:</view>
-                <view class="right">
-                    <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍" v-model="hform.HGroupName"
-                        @input="HGroupNameChange"></uni-combox>
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">澶囨敞:</view>
-                <view class="right">
-                    <textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
-                </view>
-            </view>
-            <view class="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>
+		<view class="form">
+			<view class="form-item">
+				<view class="title"><text>*</text>鏉″舰鐮�:</view>
+				<view class="right" style="width: 380rpx;">
+					<input name="HBarCode" v-model="hform.HBarCode" placeholder="璇锋壂鎻忔潯鐮�" @confirm="toInCode(e)" />
+				</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"><text>*</text>娴佹按鍙�:</view>
+				<view class="right" style="width: 380rpx;">
+					<input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�"
+						@confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
+				</view>
+				<uni-icons type="scan"
+					style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+					size="20" @click="toScanProcNo"></uni-icons>
+			</view>
+			<view class="form-item">
+				<view class="title">鏈姤宸ユ暟閲�:</view>
+				<view class="righton">
+					<input disabled v-model="hform.HNotReportQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鍚堟牸鏁伴噺:</view>
+				<view class="right">
+					<input v-model="hform.HQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">涓嶈壇鏁伴噺:</view>
+				<view class="right">
+					<input v-model="hform.HPieceQty" placeholder="璇疯緭鍏ヤ笉鑹暟閲�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鎶ュ簾鏁伴噺:</view>
+				<view class="right">
+					<input v-model="hform.HWasterQty" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>渚涘簲鍟�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" v-model="hform.HSupName"
+						@input="HSupNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>鎿嶄綔鍛�:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
+						@input="HEmpNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">宸ュ簭:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨宸ュ簭" v-model="hform.HProcName"
+						@input="HProcNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">閮ㄩ棬:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHDept" placeholder="璇烽�夋嫨閮ㄩ棬" v-model="hform.HDept"
+						@input="HHDeptChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">閫佽揣鍗曞彿:</view>
+				<view class="right">
+					<input v-model="hform.HInnerBillNo" placeholder="璇疯緭鍏ラ�佽揣鍗曞彿" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">濮斿宸ュ崟鍙�:</view>
+				<view class="right">
+					<input v-model="hform.HWWWorkOrderBillNo" placeholder="璇疯緭鍏ュ澶栧伐鍗曞彿" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title"><text>*</text>鐢熶骇鐝粍:</view>
+				<view class="right">
+					<uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍" v-model="hform.HGroupName"
+						@input="HGroupNameChange"></uni-combox>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">澶囨敞:</view>
+				<view class="right">
+					<textarea name="HRemark" v-model="hform.HRemark" auto-height placeholder="璇疯緭鍏ュ娉�"></textarea>
+				</view>
+			</view>
+			<view class="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="tab_area"></view>
+			<view class="tab_area"></view>
 
-            <view class="form-item">
-                <view class="title">鍗曟嵁鍙�:</view>
-                <view class="righton">
-                    <input name="HBillNo" disabled v-model="hform.HBillNo" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">鐢熶骇璁㈠崟:</view>
-                <view class="righton">
-                    <input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">娴佽浆鍗�:</view>
-                <view class="righton">
-                    <input disabled v-model="hform.HProcExchBillNo" />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">鐗╂枡浠g爜:</view>
-                <view class="righton">
-                    <input disabled v-model="hform.HMaterNumber" />
-                    <!-- <uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨浜у搧浠g爜" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox> -->
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">鐗╂枡鍚嶇О:</view>
-                <view class="righton">
-                    <input v-model="hform.HMaterName" disabled />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">瑙勬牸鍨嬪彿:</view>
-                <view class="righton">
-                    <input v-model="hform.HMaterModel" disabled />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">璁¢噺鍗曚綅:</view>
-                <view class="righton">
-                    <input v-model="hform.鍗曚綅" disabled />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">宸ュ簭:</view>
-                <!-- 				<view class="right">
+			<view class="form-item">
+				<view class="title">鍗曟嵁鍙�:</view>
+				<view class="righton">
+					<input name="HBillNo" disabled v-model="hform.HBillNo" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鐢熶骇璁㈠崟:</view>
+				<view class="righton">
+					<input name="HICMOBillNo" disabled v-model="hform.HICMOBillNo" />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">娴佽浆鍗�:</view>
+				<view class="righton">
+					<input disabled v-model="hform.HProcExchBillNo" />
+				</view>
+				<view class="icon-wrapper" :disabled="hform.HMainSourceBillType === -1">
+					<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鐗╂枡浠g爜:</view>
+				<view class="righton">
+					<input disabled v-model="hform.HMaterNumber" />
+					<!-- <uni-combox :candidates="arrayHMaterNumber" placeholder="璇烽�夋嫨浜у搧浠g爜" v-model="hform.HMaterNumber" @input="HMaterNumberChange"></uni-combox> -->
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鐗╂枡鍚嶇О:</view>
+				<view class="righton">
+					<input v-model="hform.HMaterName" disabled />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">瑙勬牸鍨嬪彿:</view>
+				<view class="righton">
+					<input v-model="hform.HMaterModel" disabled />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">璁¢噺鍗曚綅:</view>
+				<view class="righton">
+					<input v-model="hform.鍗曚綅" disabled />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">宸ュ簭:</view>
+				<!-- 				<view class="right">
 					<uni-combox :candidates="arrayHProcName" placeholder="璇烽�夋嫨褰撳墠宸ュ簭" v-model="hform.HProcName" @input="HProcNameChange"></uni-combox>
 				</view> -->
-                <view class="righton">
-                    <input v-model="hform.HProcName" disabled />
-                </view>
-            </view>
-            <view class="form-item">
-                <view class="title">鐢熶骇缁勭粐:</view>
-                <view class="righton">
-                    <input v-model="hform.HPRDOrg" disabled />
-                </view>
-            </view>
+				<view class="righton">
+					<input v-model="hform.HProcName" disabled />
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">鐢熶骇缁勭粐:</view>
+				<view class="righton">
+					<input v-model="hform.HPRDOrg" disabled />
+				</view>
+			</view>
 
-            <!-- 			<view class="form-item">
+			<!-- 			<view class="form-item">
 				<view class="title">璁㈠崟鏁伴噺:</view>
 				<view class="right">
 					<input name="HICMOQty" v-model="hform.HICMOQty" placeholder="璇疯緭鍏ヨ鍗曟暟閲�" />
@@ -212,7 +229,7 @@
 				</view>
 			</view> -->
 
-            <!-- 			<view class="form-item">
+			<!-- 			<view class="form-item">
 				<view class="title">鎿嶄綔鍛�:</view>
 				<view class="right">
 					<input v-model="hform.HEmp" placeholder="璇疯緭鍏ユ搷浣滃憳" />
@@ -237,64 +254,64 @@
 				</view>
 			</view> -->
 
-            <!-- <view class="tab_area"></view> -->
+			<!-- <view class="tab_area"></view> -->
 
-            <!-- 			<view class="form-item">
+			<!-- 			<view class="form-item">
 				<view class="title">閫夋嫨鏂囦欢:</view>
 				<view class="right">
 					1111
 				</view>
 			</view> -->
 
-            <view class="tab_area"></view>
+			<view class="tab_area"></view>
 
-            <view v-if="showmore">
-                <view class="form-item">
-                    <view class="title">璁㈠崟璺熻釜鍙�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HOrderProcNO" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒跺崟浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HMaker" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">鍒跺崟鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
-                        <input v-else v-model="hform.HMakeDate" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HUpDater" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">淇敼鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
-                        <input v-else v-model="hform.HUpDateDate" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HChecker" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">瀹℃牳鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
-                        <input v-else v-model="hform.HCheckDate" disabled />
-                    </view>
-                </view>
-                <!-- 				<view class="form-item">
+			<view v-if="showmore">
+				<view class="form-item">
+					<view class="title">璁㈠崟璺熻釜鍙�:</view>
+					<view class="righton">
+						<input v-model="hform.HOrderProcNO" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HMaker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">鍒跺崟鏃ユ湡:</view>
+					<view class="righton">
+						<input v-if="hform.HMakeDate" v-model="hform.HMakeDate.substr(0,10)" disabled />
+						<input v-else v-model="hform.HMakeDate" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HUpDater" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">淇敼鏃ユ湡:</view>
+					<view class="righton">
+						<input v-if="hform.HUpDateDate" v-model="hform.HUpDateDate.substr(0,10)" disabled />
+						<input v-else v-model="hform.HUpDateDate" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HChecker" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">瀹℃牳鏃ユ湡:</view>
+					<view class="righton">
+						<input v-if="hform.HCheckDate" v-model="hform.HCheckDate.substr(0,10)" disabled />
+						<input v-else v-model="hform.HCheckDate" disabled />
+					</view>
+				</view>
+				<!-- 				<view class="form-item">
 					<view class="title">鍏抽棴浜�:</view>
 					<view class="righton">
 						<input v-model="hform.HCloseMan" disabled/>
@@ -307,1003 +324,1078 @@
 						<input v-else v-model="hform.HCloseDate" disabled/>
 					</view>
 				</view> -->
-                <view class="form-item">
-                    <view class="title">浣滃簾浜�:</view>
-                    <view class="righton">
-                        <input v-model="hform.HDeleteMan" disabled />
-                    </view>
-                </view>
-                <view class="form-item">
-                    <view class="title">浣滃簾鏃ユ湡:</view>
-                    <view class="righton">
-                        <input v-if="hform.HDeleteDate" v-model="hform.HDeleteDate.substr(0,10)" disabled />
-                        <input v-else v-model="hform.HDeleteDate" disabled />
-                    </view>
-                </view>
-            </view>
+				<view class="form-item">
+					<view class="title">浣滃簾浜�:</view>
+					<view class="righton">
+						<input v-model="hform.HDeleteMan" disabled />
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="title">浣滃簾鏃ユ湡:</view>
+					<view class="righton">
+						<input v-if="hform.HDeleteDate" v-model="hform.HDeleteDate.substr(0,10)" disabled />
+						<input v-else v-model="hform.HDeleteDate" disabled />
+					</view>
+				</view>
+			</view>
 
-            <view class="other">
-                <view v-if="!showmore" @tap="showmore = true">
-                    灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
-                </view>
-                <view v-if="showmore" @tap="showmore = false">
-                    鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
-                </view>
-            </view>
+			<view class="other">
+				<view v-if="!showmore" @tap="showmore = true">
+					灞曞紑鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="bottom"></uni-icons>
+				</view>
+				<view v-if="showmore" @tap="showmore = false">
+					鎶樺彔鍏朵粬淇℃伅<uni-icons color="#1890FF" style="margin-left: 8rpx;" type="top"></uni-icons>
+				</view>
+			</view>
 
-            <view class="bottom-btn">
-                <button v-if="btnType == 0 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-                <button v-if="btnType != 0 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button>
-                <button v-if="btnType != 0 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
-                <button v-if="btnType != 0 && btnType == 2" class="btn-b" style="margin-left: 20rpx;" size="mini"
-                    @tap="check">瀹℃牳</button>
-                <button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
-                    @tap="abandonCheck">鍙嶅鏍�</button>
-                <view style="flex: 1;"></view>
-                <button class="btn-b" size="mini" @tap="addNew">鏂板</button>
-                <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
-            </view>
-        </view>
-    </view>
+			<view class="bottom-btn">
+				<button v-if="btnType == 0 && !isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<button v-if="btnType != 0 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">淇敼</button>
+				<button v-if="btnType != 0 && isEdit" class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+				<button v-if="btnType != 0 && btnType == 2" class="btn-b" style="margin-left: 20rpx;" size="mini"
+					@tap="check">瀹℃牳</button>
+				<button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
+					@tap="abandonCheck">鍙嶅鏍�</button>
+				<view style="flex: 1;"></view>
+				<button class="btn-b" size="mini" @tap="addNew">鏂板</button>
+				<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+			</view>
+		</view>
+		<ProcExchListPopupVue ref="billList"></ProcExchListPopupVue>
+	</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',
-                linterid: '',
-                HBillNo: '',
-                btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
-                showmore: false,
+	import getDateTime from '@/utils/getdateTime.js';
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import ProcExchListPopupVue from '../../components/ProcExchListPopup/ProcExchListPopup.vue';
+import { CommonUtils } from '../../utils/common';
+	export default {
+		components: {
+			ProcExchListPopupVue
+		},
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				linterid: '',
+				HBillNo: '',
+				btnType: 0, //0鏂板锛�1淇敼锛�2瀹℃牳锛�3鍙嶅鏍�
+				showmore: false,
 
-                arrayHMaterNumber: [], //浜у搧
-                HMaterNumberList: [],
-                arrayHProcName: [], //宸ュ簭
-                HProcNameList: [],
-                arrayHSupName: [], //渚涘簲鍟�
-                HSupNameList: [],
-                arrayHEmpName: [], //鎿嶄綔鍛�
-                HEmpNameList: [],
-                arrayHGroupName: [], //鐝粍
-                HGroupNameList: [],
+				arrayHMaterNumber: [], //浜у搧
+				HMaterNumberList: [],
+				arrayHProcName: [], //宸ュ簭
+				HProcNameList: [],
+				arrayHSupName: [], //渚涘簲鍟�
+				HSupNameList: [],
+				arrayHEmpName: [], //鎿嶄綔鍛�
+				HEmpNameList: [],
+				arrayHGroupName: [], //鐝粍
+				HGroupNameList: [],
+				arrayHDept: [], // 閮ㄩ棬
+				HDeptList: [],
 
-                isEdit: false,
-                hform: {
-                    HInterID: '',
-                    HBillNo: '',
-                    HBarCode: '',
-                    HNotReportQty: 0,
-                    HQty: 0,
-                    HPieceQty: 0,
-                    HWasterQty: 0,
-                    HEmpName: '',
-                    HEmpID: 0,
-                    HInnerBillNo: '',
-                    HWWWorkOrderBillNo: '',
-                    HRemark: '',
-                    HDate: getDateTime.dateTimeStr('y-m-d'),
+				isEdit: false,
+				hform: {
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
 
-                    HICMOBillNo: '',
-                    HProcExchBillNo: '',
-                    HMaterNumber: '',
-                    HMaterName: '',
-                    HMaterID: 0,
-                    HMaterModel: '',
-                    HSupName: '',
-                    HSupID: 0,
-                    鍗曚綅: '',
-                    HProcName: '',
-                    HProcID: 0,
-                    HPRDOrg: '',
-                    HOrderProcNO: '',
+					HInterID: '',
+					HBillNo: '',
+					HBarCode: '',
+					HNotReportQty: 0,
+					HQty: 0,
+					HPieceQty: 0,
+					HWasterQty: 0,
+					HEmpName: '',
+					HEmpID: 0,
+					HInnerBillNo: '',
+					HWWWorkOrderBillNo: '',
+					HRemark: '',
+					HDate: getDateTime.dateTimeStr('y-m-d'),
 
-                    // HPRDOrg:'',
-                    // HICMOBillNo:'',
-                    // HICMOInterID:'',
-                    // HICMOQty:'',
-                    // HOrderProcNO:'',
-                    // HMaterNumber:'',
-                    // HMaterName:'',
-                    // HMaterID:'',
-                    // HMaterModel:'',
-                    // HProcExchBillNo:'',
-                    // HProcExchHinteID:'',
-                    // HProcName:'',
-                    // HProcID:'',
-                    // HPlanQty:'',
-                    // HProcNo:'',
-                    // HSupName:'',
-                    // HSupID:'',
-                    // HTaxRate:'',
-                    // HPrice:'',
-                    // HMoney:'',
-                    // HStationInTime:'',
-                    // HStationOutTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
-                    // HEmp:'',
-                    // HEmpID:'',
-                    // HSource:'',
-                    // HSourceID:'',		
-                    HGroupName: '',
-                    HGroupID: 0,
-                    // HDept:'',
-                    // HDeptID:'',		
+					HICMOBillNo: '',
+					HProcExchBillNo: '',
+					HMaterNumber: '',
+					HMaterName: '',
+					HMaterID: 0,
+					HMaterModel: '',
+					HSupName: '',
+					HSupID: 0,
+					鍗曚綅: '',
+					HProcName: '',
+					HProcID: 0,
+					HPRDOrg: '',
+					HOrderProcNO: '',
 
-                    HMaker: '',
-                    HMakeDate: '',
-                    HUpDater: '',
-                    HUpDateDate: '',
-                    HChecker: '',
-                    HCheckDate: '',
-                    // HCloseMan:'',
-                    // HCloseDate:'',		
-                    HDeleteMan: '',
-                    HDeleteDate: '',
+					// HPRDOrg:'',
+					// HICMOBillNo:'',
+					// HICMOInterID:'',
+					// HICMOQty:'',
+					// HOrderProcNO:'',
+					// HMaterNumber:'',
+					// HMaterName:'',
+					// HMaterID:'',
+					// HMaterModel:'',
+					// HProcExchBillNo:'',
+					// HProcExchHinteID:'',
+					// HProcName:'',
+					// HProcID:'',
+					// HPlanQty:'',
+					// HProcNo:'',
+					// HSupName:'',
+					// HSupID:'',
+					// HTaxRate:'',
+					// HPrice:'',
+					// HMoney:'',
+					// HStationInTime:'',
+					// HStationOutTime:getDateTime.dateTimeStr('y-m-d h:i:s'),
+					// HEmp:'',
+					// HEmpID:'',
+					// HSource:'',
+					// HSourceID:'',		
+					HGroupName: '',
+					HGroupID: 0,
+					HDept: '',
+					HDeptID: '',
 
-                    eventType: 'Add',
-                }
-            }
-        },
-        onLoad(e) {
-            // this.getEditData('710','WXGD000000000274')
-            // console.log(e,this.userInfo)
-            // this.hform.HEmpID = this.userInfo.Czybm
-            // this.hform.HEmp = uni.getStorageSync('HUserName')
-            this.hform.HMaker = uni.getStorageSync('HUserName')
-            if (e.linterid) {
-                this.btnType = 1
-                this.linterid = e.linterid
-                this.HBillNo = e.HBillNo
-                this.getEditData(e.linterid, e.HBillNo)
-            } else {
-                this.getNewData()
-            }
-            this.getHGroupList()
-            this.getHMaterList()
-            this.getHProcList()
-            this.getHSupList()
-            this.getHEmpList()
+					HMaker: '',
+					HMakeDate: '',
+					HUpDater: '',
+					HUpDateDate: '',
+					HChecker: '',
+					HCheckDate: '',
+					// HCloseMan:'',
+					// HCloseDate:'',		
+					HDeleteMan: '',
+					HDeleteDate: '',
 
-            this.getDefValByUser()
-        },
-        methods: {
-            //閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
-            getDefValByUser() {
-                uni.request({
-                    url: this.serverUrl + '/Cj_StationInBill/GetDefValByUser',
-                    type: "GET",
-                    async: false,
-                    data: {
-                        "Czybm": this.userInfo.Czybm,
-                        "Czymc": this.userInfo.Czymc
-                    },
-                    success: (res) => {
-                        console.log(res.data)
-                        if (res.data.count == 1) {
-                            var data = res.data.data[0]
-                            this.hform.HGroupID = data.HGroupID
-                            this.hform.HGroupName = data.鐢熶骇鐝粍鍚嶇О
-                            this.hform.HEmpID = data.HEmpID
-                            this.hform.HEmpName = data.鎿嶄綔鍛樺悕绉�
-                            this.hform.HEmpNumber = data.鎿嶄綔鍛樹唬鐮�
-                            this.hform.HSourceID = data.HSourceID
-                            this.hform.HSourceName = data.鐢熶骇璧勬簮鍚嶇О
-                            this.hform.HCenterID = data.HWorkCenterID
-                            this.hform.HCenterName = data.宸ヤ綔涓績鍚嶇О
-                            this.hform.HEmpName_second = data.鎿嶄綔鍛樺悕绉�
-                        } else {
-                            uni.showToast({
-                                title: '鑾峰彇鐢熶骇鐝粍淇℃伅澶辫触',
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鑾峰彇鐢熶骇鐝粍淇℃伅澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //鎵爜
-            toScanCode() {
-                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-                mpaasScanModule.mpaasScan({
-                    'hideAlbum': true,
-                    'timeoutInterval': '10', //瓒呮椂鏃堕棿
-                    'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-                }, (ret) => {
-                    console.log(ret.resp_result)
-                    var str = ret.resp_result
-                    if (str.includes('@')) {
-                        const parts = str.split('@');
-                        this.hform.HBarCode = parts[0]
-                        this.hform.HProcNo = parts[1]
-                        this.getHBarCodeData(parts[0], 1)
-                        // this.getHProcNoData(parts[0],parts[1])
-                    } else {
-                        this.hform.HBarCode = ret.resp_result
-                        this.getHBarCodeData(ret.resp_result)
-                    }
-                })
-            },
-            toInCode(e) {
-                var str = this.hform.HBarCode
-                if (str.includes('@')) {
-                    const parts = str.split('@');
-                    this.hform.HBarCode = parts[0]
-                    this.hform.HProcNo = parts[1]
-                    this.getHBarCodeData(parts[0], 1)
-                    // this.getHProcNoData(parts[0],parts[1])
-                } else {
-                    this.getHBarCodeData(this.hform.HBarCode)
-                }
-            },
-            //鎵祦姘村彿
-            toScanProcNo() {
-                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
-                mpaasScanModule.mpaasScan({
-                    'hideAlbum': true,
-                    'timeoutInterval': '10', //瓒呮椂鏃堕棿
-                    'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-                }, (ret) => {
-                    console.log(ret.resp_result)
-                    this.hform.HProcNo = ret.resp_result
-                    this.getHProcNoData(this.hform.HBarCode, ret.resp_result)
-                })
-            },
-            //鏃ユ湡
-            HDateChange(e) {
-                console.log(e.detail.value)
-                this.hform.HDate = e.detail.value
-            },
+					eventType: 'Add',
+				}
+			}
+		},
+		onLoad(e) {
+			// this.getEditData('710','WXGD000000000274')
+			// console.log(e,this.userInfo)
+			// this.hform.HEmpID = this.userInfo.Czybm
+			// this.hform.HEmp = uni.getStorageSync('HUserName')
+			this.hform.HMaker = uni.getStorageSync('HUserName')
+			if (e.linterid) {
+				this.btnType = 1
+				this.linterid = e.linterid
+				this.HBillNo = e.HBillNo
+				this.getEditData(e.linterid, e.HBillNo)
+			} else {
+				this.getNewData()
+			}
+			this.getHGroupList()
+			this.getHMaterList()
+			this.getHProcList()
+			this.getHSupList()
+			this.getHEmpList()
+			this.getHProcList()
+			this.getHDeptList()
 
-            //鑾峰彇浜у搧鏁版嵁
-            getHMaterList() {
-                var Value = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync('OrganizationID')
-                uni.request({
-                    url: this.serverUrl + '/Web/GetMaterialList_Json',
-                    data: {
-                        sWhere: Value
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            this.HMaterNumberList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHMaterNumber[i] = res.data.data[i].HNumber
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //閫夋嫨浜у搧鏁版嵁
-            HMaterNumberChange(e) {
-                for (var i = 0; i < this.HMaterNumberList.length; i++) {
-                    if (this.HMaterNumberList[i].HNumber == e) {
-                        this.hform.HMaterName = this.HMaterNumberList[i].HName
-                        this.hform.HMaterID = this.HMaterNumberList[i].HItemID
-                    }
-                }
-            },
-            //宸ュ簭
-            getHProcList() {
-                uni.request({
-                    url: this.serverUrl + '/Web/GetProcList_Json',
-                    data: {
-                        sWhere: ''
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            this.HProcNameList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHProcName[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'
-                        })
-                    },
-                });
-            },
-            //閫夋嫨宸ュ簭
-            HProcNameChange(e) {
-                for (var i = 0; i < this.HProcNameList.length; i++) {
-                    if (this.HProcNameList[i].宸ュ簭 == e) {
-                        this.hform.HProcID = this.HProcNameList[i].HItemID
-                    }
-                }
-            },
-            //鑾峰彇渚涘簲鍟嗘暟鎹�
-            getHSupList() {
-                if (!uni.getStorageSync('OrganizationID')) {
-                    var HOtherOrgID = 0;
-                } else {
-                    var HOtherOrgID = uni.getStorageSync('OrganizationID')
-                }
-                uni.request({
-                    url: this.serverUrl + '/Web/GetSupplierList_Json',
-                    data: {
-                        Supplier: '',
-                        HOrgID: HOtherOrgID
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            this.HSupNameList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHSupName[i] = res.data.data[i].HName
-                            }
-                            this.$forceUpdate();
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //閫夋嫨渚涘簲鍟�
-            HSupNameChange(e) {
-                for (var i = 0; i < this.HSupNameList.length; i++) {
-                    if (this.HSupNameList[i].HName == e) {
-                        this.hform.HSupID = this.HSupNameList[i].HItemID
-                    }
-                }
-            },
-            //鎿嶄綔鍛�
-            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: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
+			this.getDefValByUser()
 
-            },
-            //閫夋嫨鎺ユ敹浜�
-            HEmpNameChange(e) {
-                for (var i = 0; i < this.HEmpNameList.length; i++) {
-                    if (this.HEmpNameList[i].HName == e) {
-                        this.hform.HEmpID = this.HEmpNameList[i].HItemID
-                        this.hform.HQCCheckID = this.HEmpNameList[i].HItemID
-                    }
-                }
-            },
-            //鐢熶骇鐝粍
-            getHGroupList() {
-                uni.request({
-                    url: this.serverUrl + '/Web/GetProductionTeamList_Json',
-                    data: {
-                        sWhere: "and HUSEORGID = " + uni.getStorageSync('OrganizationID') + ""
-                    },
-                    success: (res) => {
-                        if (res.data.count == 1) {
-                            this.HGroupNameList = res.data.data
-                            for (var i = 0; i < res.data.data.length; i++) {
-                                this.arrayHGroupName[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'
-                        })
-                    },
-                });
-            },
-            //閫夋嫨鐢熶骇鐝粍
-            HGroupNameChange(e) {
-                for (var i = 0; i < this.HGroupNameList.length; i++) {
-                    if (this.HGroupNameList[i].鐝粍 == e) {
-                        this.hform.HGroupName = this.HGroupNameList[i].鐝粍
-                        this.hform.HGroupID = this.HGroupNameList[i].HItemID
-                    }
-                }
-            },
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑娑堟伅: ", e.HBillNo)
+				this.getHBarCodeData(e.HBillNo)
+				this.$refs.billList.exit()
+			})
+		},
+		methods: {
+			//閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+			getDefValByUser() {
+				uni.request({
+					url: this.serverUrl + '/Cj_StationInBill/GetDefValByUser',
+					type: "GET",
+					async: false,
+					data: {
+						"Czybm": this.userInfo.Czybm,
+						"Czymc": this.userInfo.Czymc
+					},
+					success: (res) => {
+						console.log(res.data)
+						if (res.data.count == 1) {
+							var data = res.data.data[0]
+							this.hform.HGroupID = data.HGroupID
+							this.hform.HGroupName = data.鐢熶骇鐝粍鍚嶇О
+							this.hform.HEmpID = data.HEmpID
+							this.hform.HEmpName = data.鎿嶄綔鍛樺悕绉�
+							this.hform.HEmpNumber = data.鎿嶄綔鍛樹唬鐮�
+							this.hform.HSourceID = data.HSourceID
+							this.hform.HSourceName = data.鐢熶骇璧勬簮鍚嶇О
+							this.hform.HCenterID = data.HWorkCenterID
+							this.hform.HCenterName = data.宸ヤ綔涓績鍚嶇О
+							this.hform.HEmpName_second = data.鎿嶄綔鍛樺悕绉�
+						} else {
+							uni.showToast({
+								title: '鑾峰彇鐢熶骇鐝粍淇℃伅澶辫触',
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鑾峰彇鐢熶骇鐝粍淇℃伅澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鎵爜
+			toScanCode() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					var str = ret.resp_result
+					if (str.includes('@')) {
+						const parts = str.split('@');
+						this.hform.HBarCode = parts[0]
+						this.hform.HProcNo = parts[1]
+						this.getHBarCodeData(parts[0], 1)
+						// this.getHProcNoData(parts[0],parts[1])
+					} else {
+						this.hform.HBarCode = ret.resp_result
+						this.getHBarCodeData(ret.resp_result)
+					}
+				})
+			},
+			toInCode(e) {
+				var str = this.hform.HBarCode
+				if (str.includes('@')) {
+					const parts = str.split('@');
+					this.hform.HBarCode = parts[0]
+					this.hform.HProcNo = parts[1]
+					this.getHBarCodeData(parts[0], 1)
+					// this.getHProcNoData(parts[0],parts[1])
+				} else {
+					this.getHBarCodeData(this.hform.HBarCode)
+				}
+			},
+			//鎵祦姘村彿
+			toScanProcNo() {
+				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+				mpaasScanModule.mpaasScan({
+					'hideAlbum': true,
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
+					console.log(ret.resp_result)
+					this.hform.HProcNo = ret.resp_result
+					this.getHProcNoData(this.hform.HBarCode, ret.resp_result)
+				})
+			},
+			//鏃ユ湡
+			HDateChange(e) {
+				console.log(e.detail.value)
+				this.hform.HDate = e.detail.value
+			},
 
-            //缂栬緫
-            ifEdit() {
-                //鏄惁缂栬緫
-                uni.request({
-                    url: this.serverUrl + '/Cj_StationEntrustOutBill/set_ShowBillJudge',
-                    data: {
-                        HBillNo: this.HBillNo,
-                        CurUserName: uni.getStorageSync('HUserName'),
-                        HInterID: this.linterid,
-                    },
-                    success: (res) => {
-                        console.log(res)
-                        if (res.data.count == 1) {
-                            this.isEdit = true
-                            this.hform.eventType = 'Modify'
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            getEditData(linterid, HBillNo) {
-                //涓昏〃
-                uni.request({
-                    url: this.serverUrl + '/Cj_StationEntrustOutBill/GetStationEntrustOutBill',
-                    data: {
-                        HInterID: linterid
-                    },
-                    success: (res) => {
-                        console.log(1, res.data.data[0]);
-                        if (res.data.code == 1) {
-                            var data = res.data.data[0]
-                            this.getHBarCodeData(data.HBarCode)
-                            this.getHProcNoData(data.HBarCode, data.HProcNo)
+			//鑾峰彇浜у搧鏁版嵁
+			getHMaterList() {
+				var Value = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + uni.getStorageSync('OrganizationID')
+				uni.request({
+					url: this.serverUrl + '/Web/GetMaterialList_Json',
+					data: {
+						sWhere: Value
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HMaterNumberList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHMaterNumber[i] = res.data.data[i].HNumber
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨浜у搧鏁版嵁
+			HMaterNumberChange(e) {
+				for (var i = 0; i < this.HMaterNumberList.length; i++) {
+					if (this.HMaterNumberList[i].HNumber == e) {
+						this.hform.HMaterName = this.HMaterNumberList[i].HName
+						this.hform.HMaterID = this.HMaterNumberList[i].HItemID
+					}
+				}
+			},
+			//宸ュ簭
+			getHProcList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetProcList_Json',
+					data: {
+						sWhere: ''
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HProcNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHProcName[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'
+						})
+					},
+				});
+			},
+			//閫夋嫨宸ュ簭
+			HProcNameChange(e) {
+				for (var i = 0; i < this.HProcNameList.length; i++) {
+					if (this.HProcNameList[i].宸ュ簭 == e) {
+						this.hform.HProcID = this.HProcNameList[i].HItemID
+					}
+				}
+			},
+			getHDeptList() { // 鑾峰緱閮ㄩ棬
+				CommonUtils.doRequest(
+				"/Gy_Department/list",
+				{
+					sWhere: ` and HUSEORGID=${uni.getStorageSync('OrganizationID')}`,
+					user: this.userInfo['Czymc'],
+					Organization: uni.getStorageSync('Organization')
+				},
+				(res) => {
+					let {data, count, Message} = res.data
+					console.log('data: ',data);
+					if(count == 1) {
+						this.HDeptList = data
+						this.arrayHDept = Array.from(data).map(e => e['閮ㄩ棬鍚嶇О'])
+					}else {
+						uni.showToast({
+							icon: 'none',
+							Message: Message
+						})
+					}
+				}
+				)
+			},
+			HHDeptChange(e) {
+				for (var i = 0; i < this.HDeptList.length; i++) {
+					if (this.HDeptList[i]['閮ㄩ棬鍚嶇О']== e) {
+						this.hform.HDeptID = this.HDeptList[i].HItemID
+					}
+				}
+			},
+			//鑾峰彇渚涘簲鍟嗘暟鎹�
+			getHSupList() {
+				if (!uni.getStorageSync('OrganizationID')) {
+					var HOtherOrgID = 0;
+				} else {
+					var HOtherOrgID = uni.getStorageSync('OrganizationID')
+				}
+				uni.request({
+					url: this.serverUrl + '/Web/GetSupplierList_Json',
+					data: {
+						Supplier: '',
+						HOrgID: HOtherOrgID
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HSupNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHSupName[i] = res.data.data[i].HName
+							}
+							this.$forceUpdate();
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//閫夋嫨渚涘簲鍟�
+			HSupNameChange(e) {
+				for (var i = 0; i < this.HSupNameList.length; i++) {
+					if (this.HSupNameList[i].HName == e) {
+						this.hform.HSupID = this.HSupNameList[i].HItemID
+					}
+				}
+			},
+			//鎿嶄綔鍛�
+			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: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
 
-                            this.hform.HInterID = data.HInterID
-                            this.hform.HBillNo = data.HBillNo
-                            this.hform.HBarCode = data.HBarCode
-                            this.hform.HProcNo = data.HProcNo
-                            // this.hform.HQty= data.HQty,
-                            this.hform.HNotReportQty = data.HNotReportQty
-                            this.hform.HPieceQty = data.HPieceQty
-                            this.hform.HWasterQty = data.HWasterQty
-                            this.hform.HSupName = data.HSupName
-                            this.hform.HSupID = data.HSupID
-                            this.hform.HEmpID = data.HEmpID
-                            this.hform.HEmpName = data.HEmpName
-                            this.hform.HInnerBillNo = data.HInnerBillNo
-                            this.hform.HWWWorkOrderBillNo = data.HWWWorkOrderBillNo
-                            this.hform.HRemark = data.HRemark
-                            this.hform.HDate = data.HDate.substr(0, 10)
+			},
+			//閫夋嫨鎺ユ敹浜�
+			HEmpNameChange(e) {
+				for (var i = 0; i < this.HEmpNameList.length; i++) {
+					if (this.HEmpNameList[i].HName == e) {
+						this.hform.HEmpID = this.HEmpNameList[i].HItemID
+						this.hform.HQCCheckID = this.HEmpNameList[i].HItemID
+					}
+				}
+			},
+			//鐢熶骇鐝粍
+			getHGroupList() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetProductionTeamList_Json',
+					data: {
+						sWhere: "and HUSEORGID = " + uni.getStorageSync('OrganizationID') + ""
+					},
+					success: (res) => {
+						if (res.data.count == 1) {
+							this.HGroupNameList = res.data.data
+							for (var i = 0; i < res.data.data.length; i++) {
+								this.arrayHGroupName[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'
+						})
+					},
+				});
+			},
+			//閫夋嫨鐢熶骇鐝粍
+			HGroupNameChange(e) {
+				for (var i = 0; i < this.HGroupNameList.length; i++) {
+					if (this.HGroupNameList[i].鐝粍 == e) {
+						this.hform.HGroupName = this.HGroupNameList[i].鐝粍
+						this.hform.HGroupID = this.HGroupNameList[i].HItemID
+					}
+				}
+			},
 
-                            // this.hform.HSupID= data.HSupID,
-                            // this.hform.HSupName= data.HSupName,
-                            // this.hform.HMaterNumber= data.HMaterNumber,
-                            // this.hform.HMaterName= data.HMaterName,
-                            // this.hform.HMaterID= data.HMaterID,
-                            // this.hform.HPrice= data.HPrice,
-                            // this.hform.HMoney= data.HMoney,
-                            // this.hform.HBadPNL= data.HBadPNL,
-                            // this.hform.HSourceID= data.HSourceID,
-                            // this.hform.HSourceName= data.HSourceName
-                            if (data.鏄惁瀹℃牳 == "true") {
-                                this.btnType = 3
-                            } else {
-                                this.btnType = 2
-                            }
+			//缂栬緫
+			ifEdit() {
+				//鏄惁缂栬緫
+				uni.request({
+					url: this.serverUrl + '/Cj_StationEntrustOutBill/set_ShowBillJudge',
+					data: {
+						HBillNo: this.HBillNo,
+						CurUserName: uni.getStorageSync('HUserName'),
+						HInterID: this.linterid,
+					},
+					success: (res) => {
+						console.log(res)
+						if (res.data.count == 1) {
+							this.isEdit = true
+							this.hform.eventType = 'Modify'
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getEditData(linterid, HBillNo) {
+				//涓昏〃
+				uni.request({
+					url: this.serverUrl + '/Cj_StationEntrustOutBill/GetStationEntrustOutBill',
+					data: {
+						HInterID: linterid
+					},
+					success: (res) => {
+						console.log(1, res.data.data[0]);
+						if (res.data.code == 1) {
+							var data = res.data.data[0]
+							this.getHBarCodeData(data.HBarCode)
+							this.getHProcNoData(data.HBarCode, data.HProcNo)
 
-                            this.hform.HMaker = data.HMaker
-                            this.hform.HMakeDate = data.HMakeDate
-                            this.hform.HUpDater = data.HUpDater
-                            this.hform.HUpDateDate = data.HUpDateDate
-                            this.hform.HChecker = data.HChecker
-                            this.hform.HCheckDate = data.HCheckDate
-                            // this.hform.HCloseMan= data.HCloseMan
-                            // this.hform.HCloseDate= data.HCloseDate
-                            this.hform.HDeleteMan = data.HDeleteMan
-                            this.hform.HDeleteDate = data.HDeleteDate
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            getHBarCodeData(HBarCode, e) {
-                uni.request({
-                    url: this.serverUrl + '/Cj_StationEntrustInBill/txtHBarCode_KeyDown',
-                    data: {
-                        HBarCode: HBarCode
-                    },
-                    success: (res) => {
-                        console.log(2, res.data);
-                        if (res.data.code == 1) {
-                            var data = res.data.data[0]
-                            this.hform.HICMOBillNo = data.浠诲姟鍗曞彿
-                            this.hform.HICMOInterID = data.hicmointerid
-                            this.hform.HMaterID = data.HMaterID
-                            this.hform.HMaterName = data.浜у搧
-                            this.hform.HMaterNumber = data.浜у搧浠g爜
-                            this.hform.HMaterModel = data.瑙勬牸鍨嬪彿
-                            this.hform.鍗曚綅 = data.鍗曚綅
-                            // this.HQty= 0,
-                            // this.hform.HPieceQty= data.鐢熶骇鏁伴噺
-                            this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
-                            this.hform.HPlanQty = data.鐢熶骇鏁伴噺
-                            this.hform.lngBillSubKey = data.hsubid
-                            this.hform.lngBillKey = data.hmainid
-                            this.hform.HProcExchBillNo = data.鍗曟嵁鍙�
-                            this.hform.HICMOQty = data.浠诲姟鍗曟暟閲�
-                            this.hform.HOrderProcNO = data.璁㈠崟璺熻釜鍙�
-                            this.hform.HStationInTime = getDateTime.dateTimeStr('y-m-d h:i:s')
-                            // this.hform.HMoney= 0
-                            // this.hform.HSupID= data.HSupID
-                            // this.hform.HSupName= data.渚涘簲鍟�
-                            // this.hform.HSourceID= data.HSourceID
-                            // this.hform.HSource= data.鐢熶骇璧勬簮
-                            // this.hform.HGroupID= data.HGroupID
-                            // this.hform.HGroupName= data.鐝粍
-                            this.hform.HDeptID = this.userInfo.HDeptID
-                            this.hform.HDept = this.userInfo.HDept
-                            this.hform.HProcExchHinteID = data.hmainid
-                            this.hform.HPRDOrg = data.缁勭粐鍚嶇О
-                            this.hform.HPRDOrgID = data.HPRDORGID
-                            if (e) {
-                                this.getHProcNoData(this.hform.HBarCode, this.hform.HProcNo)
-                            }
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            getHProcNoData(HBarCode, HProcNo) {
-                uni.request({
-                    url: this.serverUrl + '/Cj_StationEntrustInBill/txtHProcNo_KeyDown',
-                    data: {
-                        sBillNo: HBarCode,
-                        sProcNo: HProcNo
-                    },
-                    success: (res) => {
-                        console.log(3, res);
-                        if (res.data.code == 1) {
-                            var data = res.data.data[0]
-                            this.hform.lngBillSubKey = data.hsubid
-                            this.hform.HProcName = data.宸ュ簭
-                            this.hform.HProcID = data.HProcID
-                            this.hform.HCenterName = data.宸ヤ綔涓績
-                            this.hform.HCenterID = data.HCenterID
-                            this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
-                            if (!this.hform.HSupName) {
-                                this.hform.HSupName = data.渚涘簲鍟�
-                                this.hform.HSupID = data.HSupID
-                            }
-                        } else {
-                            uni.showToast({
-                                title: res.data.Message,
-                                icon: 'none'
-                            })
-                        }
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //鏂板
-            getNewData() {
-                uni.request({
-                    url: this.serverUrl + '/Web/GetMAXNum',
-                    data: {
-                        HBillType: '3793'
-                    },
-                    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'
-                        })
-                    },
-                });
-            },
-            addNew() {
-                uni.redirectTo({
-                    url: '/pages/weiwaigxOut/form?OperationType=1'
-                })
-            },
-            submit() {
-                if (!this.hform.HBarCode) {
-                    uni.showToast({
-                        title: '璇锋壂鎻忚澶囨潯褰㈢爜',
-                        icon: 'none'
-                    })
-                } else if (!this.hform.HProcNo) {
-                    uni.showToast({
-                        title: '璇疯緭鍏�/鎵弿娴佹按鍙�',
-                        icon: 'none'
-                    })
-                } else if (!this.hform.HSupName) {
-                    uni.showToast({
-                        title: '璇烽�夋嫨渚涘簲鍟�',
-                        icon: 'none'
-                    })
-                } else if (!this.hform.HEmpName) {
-                    uni.showToast({
-                        title: '璇烽�夋嫨鎿嶄綔鍛�',
-                        icon: 'none'
-                    })
-                } else {
-                    uni.showLoading({
-                        title: '璇风◢鍊�'
-                    })
-                    var sMainStr = JSON.stringify(this.hform);
-                    var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName');
-                    console.log(sMainSub);
-                    uni.request({
-                        url: this.serverUrl + '/Cj_StationEntrustOutBill/AddBill',
-                        method: 'POST',
-                        dataType: "json",
-                        data: {
-                            oMain: sMainSub
-                        },
-                        success: (res) => {
-                            console.log(1, res);
-                            uni.hideLoading()
-                            if (res.data.count == 1) {
-                                // let pages = getCurrentPages(); 
-                                // let prePage = pages[pages.length - 2]; 
-                                // prePage.$vm.getList()
-                                if (this.isEdit) {
-                                    setTimeout(() => {
-                                        uni.redirectTo({
-                                            url: '/pages/weiwaigxOut/form?linterid=' + this
-                                                .linterid + '&HBillNo=' + this.linterid
-                                        })
-                                    }, 1000)
-                                } else {
-                                    uni.showModal({
-                                        title: '鎻愮ず',
-                                        content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
-                                        success: (res) => {
-                                            if (res.confirm) {
-                                                console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                                                uni.redirectTo({
-                                                    url: '/pages/weiwaigxOut/form?OperationType=1'
-                                                })
-                                            } else if (res.cancel) {
-                                                console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                                                setTimeout(() => {
-                                                    uni.navigateBack();
-                                                }, 50)
-                                            }
-                                        }
-                                    });
-                                }
-                            } else {
-                                uni.showToast({
-                                    title: res.data.Message,
-                                    icon: 'none'
-                                })
-                            }
-                        },
-                        fail: (res) => {
-                            console.log(res);
-                            uni.showToast({
-                                title: '鎺ュ彛璇锋眰澶辫触',
-                                icon: 'none'
-                            })
-                        },
-                    });
-                }
-            },
-            //瀹℃牳
-            check() {
-                uni.request({
-                    url: this.serverUrl + '/Cj_StationEntrustOutBill/set_CheckBill',
-                    method: 'GET',
-                    dataType: "json",
-                    data: {
-                        CurUserName: uni.getStorageSync('HUserName'),
-                        HInterID: this.linterid,
-                    },
-                    success: (res) => {
-                        console.log(1, res);
-                        uni.hideLoading()
-                        if (res.data.count == 1) {
-                            this.btnType = 3
-                            let pages = getCurrentPages();
-                            let prePage = pages[pages.length - 2];
-                            prePage.$vm.getList()
-                            uni.showModal({
-                                title: '鎿嶄綔鎴愬姛',
-                                content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜鍙嶅鏍革紝鈥樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
-                                confirmText: '鏄�',
-                                cancelText: '鍚�',
-                                success: (res) => {
-                                    if (res.confirm) {
-                                        console.log('鐢ㄦ埛鐐瑰嚮鏄�');
-                                        this.btnType = 3
-                                    } else if (res.cancel) {
-                                        console.log('鐢ㄦ埛鐐瑰嚮鍚�');
-                                        uni.navigateBack()
-                                    }
-                                }
-                            });
-                        }
-                        uni.showToast({
-                            title: res.data.Message,
-                            icon: 'none'
-                        })
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            //鍙嶅鏍�
-            abandonCheck() {
-                uni.request({
-                    url: this.serverUrl + '/Cj_StationEntrustOutBill/set_AbandonCheck',
-                    method: 'GET',
-                    dataType: "json",
-                    data: {
-                        CurUserName: uni.getStorageSync('HUserName'),
-                        HInterID: this.linterid,
-                    },
-                    success: (res) => {
-                        console.log(1, res);
-                        uni.hideLoading()
-                        if (res.data.count == 1) {
-                            let pages = getCurrentPages();
-                            let prePage = pages[pages.length - 2];
-                            prePage.$vm.getList()
-                            this.btnType = 2
-                            uni.showModal({
-                                title: '鎿嶄綔鎴愬姛',
-                                content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜瀹℃牳锛屸�樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
-                                confirmText: '鏄�',
-                                cancelText: '鍚�',
-                                success: (res) => {
-                                    if (res.confirm) {
-                                        console.log('鐢ㄦ埛鐐瑰嚮鏄�');
-                                        this.btnType = 2
-                                    } else if (res.cancel) {
-                                        console.log('鐢ㄦ埛鐐瑰嚮鍚�');
-                                        uni.navigateBack()
-                                    }
-                                }
-                            });
-                        }
-                        uni.showToast({
-                            title: res.data.Message,
-                            icon: 'none'
-                        })
-                    },
-                    fail: (res) => {
-                        console.log(res);
-                        uni.showToast({
-                            title: '鎺ュ彛璇锋眰澶辫触',
-                            icon: 'none'
-                        })
-                    },
-                });
-            },
-            goBack() {
-                uni.showModal({
-                    title: '鎻愮ず',
-                    content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
-                    success: (res) => {
-                        if (res.confirm) {
-                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
-                            uni.navigateBack()
-                        } else if (res.cancel) {
-                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-                        }
-                    }
-                });
-            }
-        }
-    }
+							this.hform.HInterID = data.HInterID
+							this.hform.HBillNo = data.HBillNo
+							this.hform.HBarCode = data.HBarCode
+							this.hform.HProcNo = data.HProcNo
+							// this.hform.HQty= data.HQty,
+							this.hform.HNotReportQty = data.HNotReportQty
+							this.hform.HPieceQty = data.HPieceQty
+							this.hform.HWasterQty = data.HWasterQty
+							this.hform.HSupName = data.HSupName
+							this.hform.HSupID = data.HSupID
+							this.hform.HEmpID = data.HEmpID
+							this.hform.HEmpName = data.HEmpName
+							this.hform.HInnerBillNo = data.HInnerBillNo
+							this.hform.HWWWorkOrderBillNo = data.HWWWorkOrderBillNo
+							this.hform.HRemark = data.HRemark
+							this.hform.HDate = data.HDate.substr(0, 10)
+
+							// this.hform.HSupID= data.HSupID,
+							// this.hform.HSupName= data.HSupName,
+							// this.hform.HMaterNumber= data.HMaterNumber,
+							// this.hform.HMaterName= data.HMaterName,
+							// this.hform.HMaterID= data.HMaterID,
+							// this.hform.HPrice= data.HPrice,
+							// this.hform.HMoney= data.HMoney,
+							// this.hform.HBadPNL= data.HBadPNL,
+							// this.hform.HSourceID= data.HSourceID,
+							// this.hform.HSourceName= data.HSourceName
+							if (data.鏄惁瀹℃牳 == "true") {
+								this.btnType = 3
+							} else {
+								this.btnType = 2
+							}
+
+							this.hform.HMaker = data.HMaker
+							this.hform.HMakeDate = data.HMakeDate
+							this.hform.HUpDater = data.HUpDater
+							this.hform.HUpDateDate = data.HUpDateDate
+							this.hform.HChecker = data.HChecker
+							this.hform.HCheckDate = data.HCheckDate
+							// this.hform.HCloseMan= data.HCloseMan
+							// this.hform.HCloseDate= data.HCloseDate
+							this.hform.HDeleteMan = data.HDeleteMan
+							this.hform.HDeleteDate = data.HDeleteDate
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getHBarCodeData(HBarCode, e) {
+				uni.request({
+					url: this.serverUrl + '/Cj_StationEntrustInBill/txtHBarCode_KeyDown',
+					data: {
+						HBarCode: HBarCode
+					},
+					success: (res) => {
+						console.log(2, res.data);
+						if (res.data.code == 1) {
+							var data = res.data.data[0]
+							this.hform.HICMOBillNo = data.浠诲姟鍗曞彿
+							this.hform.HICMOInterID = data.hicmointerid
+							this.hform.HMaterID = data.HMaterID
+							this.hform.HMaterName = data.浜у搧
+							this.hform.HMaterNumber = data.浜у搧浠g爜
+							this.hform.HMaterModel = data.瑙勬牸鍨嬪彿
+							this.hform.鍗曚綅 = data.鍗曚綅
+							// this.HQty= 0,
+							// this.hform.HPieceQty= data.鐢熶骇鏁伴噺
+							this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
+							this.hform.HPlanQty = data.鐢熶骇鏁伴噺
+							this.hform.lngBillSubKey = data.hsubid
+							this.hform.lngBillKey = data.hmainid
+							this.hform.HProcExchBillNo = data.鍗曟嵁鍙�
+							this.hform.HICMOQty = data.浠诲姟鍗曟暟閲�
+							this.hform.HOrderProcNO = data.璁㈠崟璺熻釜鍙�
+							this.hform.HStationInTime = getDateTime.dateTimeStr('y-m-d h:i:s')
+							// this.hform.HProcName = data['宸ュ簭']
+							// this.hform.HProcID = data['HProcID']
+							// this.hform.HMoney= 0
+							// this.hform.HSupID= data.HSupID
+							// this.hform.HSupName= data.渚涘簲鍟�
+							// this.hform.HSourceID= data.HSourceID
+							// this.hform.HSource= data.鐢熶骇璧勬簮
+							// this.hform.HGroupID= data.HGroupID
+							// this.hform.HGroupName= data.鐝粍
+							// this.hform.HDeptID = this.userInfo.HDeptID
+							// this.hform.HDept = this.userInfo.HDept
+							this.hform.HProcExchHinteID = data.hmainid
+							this.hform.HPRDOrg = data.缁勭粐鍚嶇О
+							this.hform.HPRDOrgID = data.HPRDORGID
+							
+							if (e) {
+								this.getHProcNoData(this.hform.HBarCode, this.hform.HProcNo)
+							}
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getHProcNoData(HBarCode, HProcNo) {
+				uni.request({
+					url: this.serverUrl + '/Cj_StationEntrustInBill/txtHProcNo_KeyDown',
+					data: {
+						sBillNo: HBarCode,
+						sProcNo: HProcNo
+					},
+					success: (res) => {
+						console.log(3, res);
+						if (res.data.code == 1) {
+							var data = res.data.data[0]
+							this.hform.lngBillSubKey = data.hsubid
+							this.hform.HProcName = data.宸ュ簭
+							this.hform.HProcID = data.HProcID
+							this.hform.HCenterName = data.宸ヤ綔涓績
+							this.hform.HCenterID = data.HCenterID
+							this.hform.HNotReportQty = data['鏈姤宸ユ暟閲�']
+							if (!this.hform.HSupName) {
+								this.hform.HSupName = data.渚涘簲鍟�
+								this.hform.HSupID = data.HSupID
+							}
+						} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鏂板
+			getNewData() {
+				uni.request({
+					url: this.serverUrl + '/Web/GetMAXNum',
+					data: {
+						HBillType: '3793'
+					},
+					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'
+						})
+					},
+				});
+			},
+			addNew() {
+				uni.redirectTo({
+					url: '/pages/weiwaigxOut/form?OperationType=1'
+				})
+			},
+			submit() {
+				if (!this.hform.HBarCode) {
+					uni.showToast({
+						title: '璇锋壂鎻忚澶囨潯褰㈢爜',
+						icon: 'none'
+					})
+				} else if (!this.hform.HProcNo) {
+					uni.showToast({
+						title: '璇疯緭鍏�/鎵弿娴佹按鍙�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HSupName) {
+					uni.showToast({
+						title: '璇烽�夋嫨渚涘簲鍟�',
+						icon: 'none'
+					})
+				} else if (!this.hform.HEmpName) {
+					uni.showToast({
+						title: '璇烽�夋嫨鎿嶄綔鍛�',
+						icon: 'none'
+					})
+				} else {
+					uni.showLoading({
+						title: '璇风◢鍊�'
+					})
+					var sMainStr = JSON.stringify(this.hform);
+					var sMainSub = sMainStr + ";" + uni.getStorageSync('HUserName');
+					console.log(sMainSub);
+					uni.request({
+						url: this.serverUrl + '/Cj_StationEntrustOutBill/AddBill',
+						method: 'POST',
+						dataType: "json",
+						data: {
+							oMain: sMainSub
+						},
+						success: (res) => {
+							console.log(1, res);
+							uni.hideLoading()
+							if (res.data.count == 1) {
+								// let pages = getCurrentPages(); 
+								// let prePage = pages[pages.length - 2]; 
+								// prePage.$vm.getList()
+								if (this.isEdit) {
+									setTimeout(() => {
+										uni.redirectTo({
+											url: '/pages/weiwaigxOut/form?linterid=' + this
+												.linterid + '&HBillNo=' + this.linterid
+										})
+									}, 1000)
+								} else {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+										success: (res) => {
+											if (res.confirm) {
+												console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url: '/pages/weiwaigxOut/form?OperationType=1'
+												})
+											} else if (res.cancel) {
+												console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(() => {
+													uni.navigateBack();
+												}, 50)
+											}
+										}
+									});
+								}
+							} else {
+								uni.showToast({
+									title: res.data.Message,
+									icon: 'none'
+								})
+							}
+						},
+						fail: (res) => {
+							console.log(res);
+							uni.showToast({
+								title: '鎺ュ彛璇锋眰澶辫触',
+								icon: 'none'
+							})
+						},
+					});
+				}
+			},
+			//瀹℃牳
+			check() {
+				uni.request({
+					url: this.serverUrl + '/Cj_StationEntrustOutBill/set_CheckBill',
+					method: 'GET',
+					dataType: "json",
+					data: {
+						CurUserName: uni.getStorageSync('HUserName'),
+						HInterID: this.linterid,
+					},
+					success: (res) => {
+						console.log(1, res);
+						uni.hideLoading()
+						if (res.data.count == 1) {
+							this.btnType = 3
+							let pages = getCurrentPages();
+							let prePage = pages[pages.length - 2];
+							prePage.$vm.getList()
+							uni.showModal({
+								title: '鎿嶄綔鎴愬姛',
+								content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜鍙嶅鏍革紝鈥樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
+								confirmText: '鏄�',
+								cancelText: '鍚�',
+								success: (res) => {
+									if (res.confirm) {
+										console.log('鐢ㄦ埛鐐瑰嚮鏄�');
+										this.btnType = 3
+									} else if (res.cancel) {
+										console.log('鐢ㄦ埛鐐瑰嚮鍚�');
+										uni.navigateBack()
+									}
+								}
+							});
+						}
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			//鍙嶅鏍�
+			abandonCheck() {
+				uni.request({
+					url: this.serverUrl + '/Cj_StationEntrustOutBill/set_AbandonCheck',
+					method: 'GET',
+					dataType: "json",
+					data: {
+						CurUserName: uni.getStorageSync('HUserName'),
+						HInterID: this.linterid,
+					},
+					success: (res) => {
+						console.log(1, res);
+						uni.hideLoading()
+						if (res.data.count == 1) {
+							let pages = getCurrentPages();
+							let prePage = pages[pages.length - 2];
+							prePage.$vm.getList()
+							this.btnType = 2
+							uni.showModal({
+								title: '鎿嶄綔鎴愬姛',
+								content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜瀹℃牳锛屸�樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
+								confirmText: '鏄�',
+								cancelText: '鍚�',
+								success: (res) => {
+									if (res.confirm) {
+										console.log('鐢ㄦ埛鐐瑰嚮鏄�');
+										this.btnType = 2
+									} else if (res.cancel) {
+										console.log('鐢ㄦ埛鐐瑰嚮鍚�');
+										uni.navigateBack()
+									}
+								}
+							});
+						}
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+			goBack() {
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕侀��鍑哄綋鍓嶉〉闈㈠悧锛�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.navigateBack()
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    .form {
-        width: 668rpx;
-        margin: 20rpx auto;
-        padding-bottom: 240rpx;
-    }
+	.form {
+		width: 668rpx;
+		margin: 20rpx auto;
+		padding-bottom: 240rpx;
+	}
 
-    .tab_area {
-        width: 100%;
-        height: 50rpx;
-    }
+	.tab_area {
+		width: 100%;
+		height: 50rpx;
+	}
 
-    .other {
-        margin-top: 8rpx;
-        text-align: center;
-        font-size: 28rpx;
-        padding: 4rpx 18rpx;
-        color: #1890FF;
-    }
+	.other {
+		margin-top: 8rpx;
+		text-align: center;
+		font-size: 28rpx;
+		padding: 4rpx 18rpx;
+		color: #1890FF;
+	}
 
-    .form-item {
-        display: flex;
-        align-items: center;
-        font-size: 30rpx;
-        padding: 6rpx 0;
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 30rpx;
+		padding: 6rpx 0;
+		gap: 10rpx;
 
-        .title {
-            width: 208rpx;
+		.title {
+			width: 188rpx;
 
-            text {
-                color: red;
-                font-weight: bold;
-            }
-        }
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
 
-        .right {
-            width: 450rpx;
-            border-radius: 22rpx;
-            border: 1px solid #acacac;
-        }
+		.right {
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
 
-        .righton {
-            width: 450rpx;
-            border-radius: 22rpx;
-            border: 1px solid #e4e4e4;
-            background-color: #e4e4e4;
-        }
+		.righton {
+			flex: 1;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
 
-        input {
-            width: 100%;
-            padding: 8rpx 20rpx;
-            font-size: 30rpx;
-        }
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
 
-        textarea {
-            width: 98%;
-            padding: 8rpx 20rpx;
-            font-size: 30rpx;
-        }
+		textarea {
+			width: 98%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
 
-    }
+		.icon-wrapper {
+			background-color: #3A78FF;
+			width: 52rpx;
+			height: 52rpx;
+			border-radius: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
 
-    .bottom-btn {
-        width: 100%;
-        box-sizing: border-box;
-        // height: 120rpx;
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        background-color: #fff;
-        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
-        padding: 30rpx 40rpx 40rpx 40rpx;
-        display: flex;
-        flex-direction: row;
-        gap: 10rpx;
+			.uni-icons {
+				color: #fff !important;
+			}
+		}
 
-        button {
-            border-radius: 50rpx;
-            width: 180rpx;
-            height: 66rpx;
-            line-height: 66rpx;
-            font-size: 28rpx;
-        }
+		.icon-wrapper[disabled] {
+			background-color: rgba(228, 228, 228, 1);
+			pointer-events: none;
+			touch-action: none;
+		}
 
-        .btn-a {
-            background-color: #3A78FF;
-            color: #fff;
-        }
+	}
 
-        .btn-b {
-            background-color: #41a863;
-            color: #fff;
-            // margin-left: 30rpx;
-        }
+	.bottom-btn {
+		width: 100%;
+		box-sizing: border-box;
+		// height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+		padding: 30rpx 40rpx 40rpx 40rpx;
+		display: flex;
+		flex-direction: row;
+		gap: 10rpx;
 
-        .btn-c {
-            background-color: #acacac;
-            color: #fff;
-            // position: absolute;
-            // right: 120rpx;
-        }
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
 
-        .btn-d {
-            background-color: #ff8901;
-            color: #fff;
-            // margin-left: 30rpx;
-        }
-    }
+		.btn-a {
+			background-color: #3A78FF;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+			// margin-left: 30rpx;
+		}
+
+		.btn-c {
+			background-color: #acacac;
+			color: #fff;
+			// position: absolute;
+			// right: 120rpx;
+		}
+
+		.btn-d {
+			background-color: #ff8901;
+			color: #fff;
+			// margin-left: 30rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/weiwaigxOut/table.vue b/pages/weiwaigxOut/table.vue
index b3a7d25..b0840ec 100644
--- a/pages/weiwaigxOut/table.vue
+++ b/pages/weiwaigxOut/table.vue
@@ -276,7 +276,7 @@
 				return newList
 			},
 			getList(){
-				this.sWhere += ` and 鍒跺崟浜� like N'%${this.userInfo.Czymc}'`
+				// this.sWhere += ` and 鍒跺崟浜� like N'%${this.userInfo.Czymc}'`
 				// console.log(this.sWhere)
 				uni.showLoading({
 					title:'鍔犺浇涓�...'

--
Gitblit v1.9.1