From 935719eaa1aa27a8f74e7805f099f3655a5d2d87 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 05 十一月 2025 14:23:37 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/MJGL/mujudianjianjiludan/form.vue |   26 
 pages.json                              |   13 
 pages/index/tab2.vue                    |    7 
 pages/index/login.vue                   |    2 
 pages/zhuangxiangdan/table.vue          |  487 ++++++++++
 pages/index/index.vue                   | 1178 ++++++++++++------------
 pages/zhuangxiangdan/form.vue           | 1059 ++++++++++++++++++++++
 7 files changed, 2,173 insertions(+), 599 deletions(-)

diff --git a/pages.json b/pages.json
index 0922c92..26926da 100644
--- a/pages.json
+++ b/pages.json
@@ -1221,6 +1221,19 @@
 			"style": {
 				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
 			}
+		},
+		{
+			"path": "pages/zhuangxiangdan/form",
+			"style": {
+				"navigationBarTitleText": "瑁呯鍗�"
+
+			}
+		},
+		{
+			"path": "pages/zhuangxiangdan/table",
+			"style": {
+				"navigationBarTitleText": "瑁呯鍗曠紦瀛�"
+			}
 		}
 	],
 	"tabBar": {
diff --git a/pages/MJGL/mujudianjianjiludan/form.vue b/pages/MJGL/mujudianjianjiludan/form.vue
index 1bb3243..075017e 100644
--- a/pages/MJGL/mujudianjianjiludan/form.vue
+++ b/pages/MJGL/mujudianjianjiludan/form.vue
@@ -97,7 +97,7 @@
 			
 			<view class="form-item" style="align-items: flex-start;">
 				<view class="title">寮傚父鎯呭喌璁板綍:</view>
-				<view class="right" style="min-height: 150rpx;">
+				<view class="right" style="min-height: 100rpx;">
 					<textarea name="HErrNote" v-model="hform.HErrNote" auto-height maxlength="-1"
 						placeholder="璇疯緭鍏ュ紓甯告儏鍐佃褰�"></textarea>
 				</view>
@@ -107,19 +107,9 @@
 			
 			<view class="form-item" style="align-items: flex-start;">
 				<view class="title">閲嶅ぇ瀹夊叏闅愭偅璁板綍:</view>
-				<view class="right" style="min-height: 150rpx;">
+				<view class="right" style="min-height: 100rpx;">
 					<textarea name="HBigSafeNote" v-model="hform.HBigSafeNote" auto-height maxlength="-1"
 						placeholder="璇疯緭鍏ラ噸澶у畨鍏ㄩ殣鎮h褰�"></textarea>
-				</view>
-			</view>
-
-			<view class="tab_area"></view>
-
-			<view class="form-item" style="align-items: flex-start;">
-				<view class="title">澶囨敞:</view>
-				<view class="right" style="min-height: 150rpx;">
-					<textarea name="HRemark" v-model="hform.HRemark" auto-height maxlength="-1"
-						placeholder="璇疯緭鍏ュ娉�"></textarea>
 				</view>
 			</view>
 			
@@ -127,11 +117,21 @@
 			
 			<view class="form-item" style="align-items: flex-start;">
 				<view class="title">鎽樿:</view>
-				<view class="right" style="min-height: 150rpx;">
+				<view class="right" style="min-height: 100rpx;">
 					<textarea name="HExplanation" v-model="hform.HExplanation" auto-height maxlength="-1"
 						placeholder="璇疯緭鍏ユ憳瑕�"></textarea>
 				</view>
 			</view>
+			
+			<view class="tab_area"></view>
+			
+			<view class="form-item" style="align-items: flex-start;">
+				<view class="title">澶囨敞:</view>
+				<view class="right" style="min-height: 100rpx;">
+					<textarea name="HRemark" v-model="hform.HRemark" auto-height maxlength="-1"
+						placeholder="璇疯緭鍏ュ娉�"></textarea>
+				</view>
+			</view>
 
 			<view class="tab_area"></view>
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3345b40..b40559e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,251 +1,251 @@
 <template>
-    <view class="content">
-        <view class="header">鏅轰簯L-MES鍒堕�犳墽琛岀郴缁�
-            <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 class="content">
+		<view class="header">鏅轰簯L-MES鍒堕�犳墽琛岀郴缁�
+			<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>
 
-        <vers></vers>
-    </view>
+		<vers></vers>
+	</view>
 </template>
 
 <script>
-    import vers from './vers.vue';
-    import {
-        setMenuList,
-        getMenuList
-    } from '../../utils/menuListApp';
-    import {
-        CommonUtils
-    } from '../../utils/common';
-    import {
-        getUserInfo
-    } from '../../utils/auth';
-    export default {
-        components: {
-            vers,
-        },
-        data() {
-            return {
-                updateCount: 0,
-                menuListName: 'index',
-                canEdit: false,
-                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-                itemData: [{
-                        img: '../../static/icon/icon8.png',
-                        text: '鏀舵枡閫氱煡鍗曟潯鐮佹墦鍗�',
-                        url: '/pages/tiaomaguanli/table?HBillType=1103',
-                        id: 1,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon8.png',
-                        text: '閲囪喘璁㈠崟鏉$爜鎵撳嵃',
-                        url: '/pages/tiaomaguanli/table?HBillType=1102',
-                        id: 2,
-                        hidden: false,
-                    },
+	import vers from './vers.vue';
+	import {
+		setMenuList,
+		getMenuList
+	} from '../../utils/menuListApp';
+	import {
+		CommonUtils
+	} from '../../utils/common';
+	import {
+		getUserInfo
+	} from '../../utils/auth';
+	export default {
+		components: {
+			vers,
+		},
+		data() {
+			return {
+				updateCount: 0,
+				menuListName: 'index',
+				canEdit: false,
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				itemData: [{
+						img: '../../static/icon/icon8.png',
+						text: '鏀舵枡閫氱煡鍗曟潯鐮佹墦鍗�',
+						url: '/pages/tiaomaguanli/table?HBillType=1103',
+						id: 1,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon8.png',
+						text: '閲囪喘璁㈠崟鏉$爜鎵撳嵃',
+						url: '/pages/tiaomaguanli/table?HBillType=1102',
+						id: 2,
+						hidden: false,
+					},
 
-                    // {
-                    //     img: '../../static/icon/icon8.png',
-                    //     text: '鎵爜鍑哄簱',
-                    //     url: '/pages/saomachuku/table',
-                    //     id: 1,
-                    //     hidden: false,
-                    // }, 
-                    // {
-                    //     img: '../../static/icon/icon8.png',
-                    //     text: '閲囪喘璁㈠崟鏍囩',
-                    //     url: '/pages/caigoudingdan/caigoudingdan',
-                    //     id: 1,
-                    //     hidden: true,
-                    // },
-                    // {
-                    //     img: '../../static/icon/icon4.png',
-                    //     text: '閲囪喘璁㈠崟瀛愭爣绛�',
-                    //     url: '/pages/tiaomadaying/tiaomadaying',
-                    //     id: 2,
-                    //     hidden: true,
-                    // },
-                    {
-                        img: '../../static/icon/icon11.png',
-                        text: '鏀舵枡閫氱煡鍗曟爣绛�',
-                        url: '/pages/shouliaotongzhi/table',
-                        id: 3,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon17.png',
-                        text: '閲囪喘鍏ュ簱鏂板',
-                        url: '/pages/caigouruku/form?OperationType=1',
-                        id: 4,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon20.png',
-                        text: '閲囪喘閫�鏂欐柊澧�',
-                        url: '/pages/caigoutuiliao/form?OperationType=1',
-                        id: 5,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon32.png',
-                        text: '鐩存帴璋冩嫧鏂板',
-                        url: '/pages/zhijiediaobo/form?OperationType=1',
-                        id: 6,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon30.png',
-                        text: '鐢熶骇棰嗘枡鏂板',
-                        url: '/pages/shengchanlingliaoshengdan/form?OperationType=1',
-                        id: 7,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon31.png',
-                        text: '鐢熶骇琛ユ枡鏂板',
-                        url: '/pages/shengchanbuliao/form?OperationType=1',
-                        id: 8,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon8.png',
-                        text: '鐢熶骇閫�鏂欐柊澧�',
-                        url: `/pages/shengchantuiliao/form`,
-                        id: 27,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon17.png',
-                        text: '鐢熶骇鍏ュ簱鏂板',
-                        url: '/pages/shengchanrukushengdan/form?OperationType=1',
-                        id: 9,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon30.png',
-                        text: '濮斿棰嗘枡鏂板',
-                        url: '/pages/weiwailingliao/form?OperationType=1',
-                        id: 10,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon17.png',
-                        text: '鍏朵粬鍏ュ簱鏂板',
-                        url: '/pages/qitaruku_v2/form?OperationType=1',
-                        id: 11,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon18.png',
-                        text: '鍏朵粬鍑哄簱鏂板',
-                        url: '/pages/qitachuku_v2/form?OperationType=1',
-                        id: 12,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon18.png',
-                        text: '閿�鍞嚭搴撴柊澧�',
-                        url: '/pages/xiaoshouchuku/form?OperationType=1',
-                        id: 13,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon19.png',
-                        text: '閿�鍞��璐ф柊澧�',
-                        url: '/pages/xiaoshoutuihuo/form?OperationType=1',
-                        id: 14,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon19.png',
-                        text: '濮斿鍏ュ簱鏂板',
-                        url: '/pages/weiwairuku/form?OperationType=1',
-                        id: 15,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon30.png',
-                        text: '鐢熶骇棰嗘枡妫�楠�',
-                        url: '/pages/shengchanlingliao/form?OperationType=1',
-                        id: 16,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon31.png',
-                        text: '鐢熶骇琛ユ枡鏍¢獙',
-                        url: '/pages/shengchanbuliaojiaoyan/form?OperationType=1',
-                        id: 17,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon32.png',
-                        text: '鐢熶骇璋冩嫧鏍¢獙',
-                        url: '/pages/shengchandiaobo/form?OperationType=1',
-                        id: 18,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon18.png',
-                        text: '鍏朵粬鍑哄簱鏍¢獙',
-                        url: '/pages/qitachukujiaoyan/detail?OperationType=1',
-                        id: 19,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon17.png',
-                        text: '鐢熶骇鍏ュ簱鏍¢獙',
-                        url: '/pages/shengchanruku/form?OperationType=1',
-                        id: 20,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon18.png',
-                        text: '閿�鍞嚭搴撴牎楠�',
-                        url: '/pages/xiaoshouchukujiaoyan/form?OperationType=1',
-                        id: 21,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon30.png',
-                        text: '濮斿棰嗘枡鏍¢獙',
-                        url: '/pages/weiwailingliaojiaoyan/form?OperationType=1',
-                        id: 22,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon16.png',
-                        text: '閲囪喘鍏ュ簱鏍¢獙',
-                        url: '/pages/caigourukujiaoyan/form?OperationType=1',
-                        id: 23,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon16.png',
-                        text: '鍏朵粬鍏ュ簱鏍¢獙',
-                        url: '/pages/qitarukujiaoyan/table',
-                        id: 27,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon8.png',
-                        text: '妫�楠屾姤鍛�',
-                        url: `/pages/InnerHtmlPage/index?src=http://172.16.72.15:8999/index.aspx?name=${getUserInfo()['HICNumber']}&pageTitle=妫�楠屾姤鍛�&pageMode=horizontal`,
-                        id: 24,
-                        hidden: false,
-                    }, {
-                        img: '../../static/icon/icon8.png',
-                        text: '缁勬墭鎵爜',
-                        url: `/pages/zutuosaoma/form`,
-                        id: 25,
-                        hidden: false,
-                    },
-                    {
-                        img: '../../static/icon/icon8.png',
-                        text: '鎷嗘墭鎵爜',
-                        url: `/pages/chaituosaoma/form`,
-                        id: 26,
-                        hidden: false,
-                    },
+					// {
+					//     img: '../../static/icon/icon8.png',
+					//     text: '鎵爜鍑哄簱',
+					//     url: '/pages/saomachuku/table',
+					//     id: 1,
+					//     hidden: false,
+					// }, 
+					// {
+					//     img: '../../static/icon/icon8.png',
+					//     text: '閲囪喘璁㈠崟鏍囩',
+					//     url: '/pages/caigoudingdan/caigoudingdan',
+					//     id: 1,
+					//     hidden: true,
+					// },
+					// {
+					//     img: '../../static/icon/icon4.png',
+					//     text: '閲囪喘璁㈠崟瀛愭爣绛�',
+					//     url: '/pages/tiaomadaying/tiaomadaying',
+					//     id: 2,
+					//     hidden: true,
+					// },
+					{
+						img: '../../static/icon/icon11.png',
+						text: '鏀舵枡閫氱煡鍗曟爣绛�',
+						url: '/pages/shouliaotongzhi/table',
+						id: 3,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon17.png',
+						text: '閲囪喘鍏ュ簱鏂板',
+						url: '/pages/caigouruku/form?OperationType=1',
+						id: 4,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon20.png',
+						text: '閲囪喘閫�鏂欐柊澧�',
+						url: '/pages/caigoutuiliao/form?OperationType=1',
+						id: 5,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon32.png',
+						text: '鐩存帴璋冩嫧鏂板',
+						url: '/pages/zhijiediaobo/form?OperationType=1',
+						id: 6,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon30.png',
+						text: '鐢熶骇棰嗘枡鏂板',
+						url: '/pages/shengchanlingliaoshengdan/form?OperationType=1',
+						id: 7,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon31.png',
+						text: '鐢熶骇琛ユ枡鏂板',
+						url: '/pages/shengchanbuliao/form?OperationType=1',
+						id: 8,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon8.png',
+						text: '鐢熶骇閫�鏂欐柊澧�',
+						url: `/pages/shengchantuiliao/form`,
+						id: 27,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon17.png',
+						text: '鐢熶骇鍏ュ簱鏂板',
+						url: '/pages/shengchanrukushengdan/form?OperationType=1',
+						id: 9,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon30.png',
+						text: '濮斿棰嗘枡鏂板',
+						url: '/pages/weiwailingliao/form?OperationType=1',
+						id: 10,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon17.png',
+						text: '鍏朵粬鍏ュ簱鏂板',
+						url: '/pages/qitaruku_v2/form?OperationType=1',
+						id: 11,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon18.png',
+						text: '鍏朵粬鍑哄簱鏂板',
+						url: '/pages/qitachuku_v2/form?OperationType=1',
+						id: 12,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon18.png',
+						text: '閿�鍞嚭搴撴柊澧�',
+						url: '/pages/xiaoshouchuku/form?OperationType=1',
+						id: 13,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon19.png',
+						text: '閿�鍞��璐ф柊澧�',
+						url: '/pages/xiaoshoutuihuo/form?OperationType=1',
+						id: 14,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon19.png',
+						text: '濮斿鍏ュ簱鏂板',
+						url: '/pages/weiwairuku/form?OperationType=1',
+						id: 15,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon30.png',
+						text: '鐢熶骇棰嗘枡妫�楠�',
+						url: '/pages/shengchanlingliao/form?OperationType=1',
+						id: 16,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon31.png',
+						text: '鐢熶骇琛ユ枡鏍¢獙',
+						url: '/pages/shengchanbuliaojiaoyan/form?OperationType=1',
+						id: 17,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon32.png',
+						text: '鐢熶骇璋冩嫧鏍¢獙',
+						url: '/pages/shengchandiaobo/form?OperationType=1',
+						id: 18,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon18.png',
+						text: '鍏朵粬鍑哄簱鏍¢獙',
+						url: '/pages/qitachukujiaoyan/detail?OperationType=1',
+						id: 19,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon17.png',
+						text: '鐢熶骇鍏ュ簱鏍¢獙',
+						url: '/pages/shengchanruku/form?OperationType=1',
+						id: 20,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon18.png',
+						text: '閿�鍞嚭搴撴牎楠�',
+						url: '/pages/xiaoshouchukujiaoyan/form?OperationType=1',
+						id: 21,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon30.png',
+						text: '濮斿棰嗘枡鏍¢獙',
+						url: '/pages/weiwailingliaojiaoyan/form?OperationType=1',
+						id: 22,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '閲囪喘鍏ュ簱鏍¢獙',
+						url: '/pages/caigourukujiaoyan/form?OperationType=1',
+						id: 23,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鍏朵粬鍏ュ簱鏍¢獙',
+						url: '/pages/qitarukujiaoyan/table',
+						id: 27,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon8.png',
+						text: '妫�楠屾姤鍛�',
+						url: `/pages/InnerHtmlPage/index?src=http://172.16.72.15:8999/index.aspx?name=${getUserInfo()['HICNumber']}&pageTitle=妫�楠屾姤鍛�&pageMode=horizontal`,
+						id: 24,
+						hidden: false,
+					}, {
+						img: '../../static/icon/icon8.png',
+						text: '缁勬墭鎵爜',
+						url: `/pages/zutuosaoma/form`,
+						id: 25,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon8.png',
+						text: '鎷嗘墭鎵爜',
+						url: `/pages/chaituosaoma/form`,
+						id: 26,
+						hidden: false,
+					},
 					{
 						img: '../../static/icon/icon16.png',
 						text: '鍒嗗竷寮忚皟鍏ュ崟',
@@ -253,13 +253,13 @@
 						id: 27,
 						hidden: false,
 					},
-                    {
-                    	img: '../../static/icon/icon16.png',
-                    	text: '鍒嗗竷寮忚皟鍏ュ崟缂撳瓨',
-                    	url: '/pages/fenbushidiaorudan/table',
-                    	id: 28,
-                    	hidden: false,
-                    },
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鍒嗗竷寮忚皟鍏ュ崟缂撳瓨',
+						url: '/pages/fenbushidiaorudan/table',
+						id: 28,
+						hidden: false,
+					},
 					{
 						img: '../../static/icon/icon16.png',
 						text: '鍒嗗竷寮忚皟鍑哄崟',
@@ -267,357 +267,363 @@
 						id: 29,
 						hidden: false,
 					},
+					{
+						img: '../../static/icon/icon8.png',
+						text: '瑁呯鍗�',
+						url: '/pages/zhuangxiangdan/form',
+						id: 30,
+						hidden: false,
+					},
 
+				],
+				// itemData: [{
+				// 		img: '../../static/icon/icon1.png',
+				// 		text: '璁惧妗f',
+				// 		url: '/pages/shebeidangan/table',
+				// 		id: 1
+				// 	}, {
+				// 		img: '../../static/icon/icon8.png',
+				// 		text: '璁惧灞ュ巻',
+				// 		url: '/pages/shebeilvli/table',
+				// 		id: 0,
+				// 	}, {
+				// 		img: '../../static/icon/icon2.png',
+				// 		text: '璁惧淇濆吇璁″垝鍗�',
+				// 		url: '/pages/baoyangjihua/table',
+				// 		id: 2
+				// 	}, {
+				// 		img: '../../static/icon/icon3.png',
+				// 		text: '璁惧淇濆吇璁板綍鍗�',
+				// 		url: '/pages/baoyangjilu/table',
+				// 		id: 3
+				// 	}, {
+				// 		img: '../../static/icon/icon4.png',
+				// 		text: '璁惧鐐规璁″垝鍗�',
+				// 		url: '',
+				// 		id: 4
+				// 	}, {
+				// 		img: '../../static/icon/icon5.png',
+				// 		text: '璁惧鐐规璁板綍鍗�',
+				// 		url: '',
+				// 		id: 5,
+				// 	}, {
+				// 		img: '../../static/icon/icon6.png',
+				// 		text: '璁惧鏁呴殰鐧昏琛�',
+				// 		url: '/pages/guzhangdengji/table',
+				// 		id: 6
+				// 	}, {
+				// 		img: '../../static/icon/icon7.png',
+				// 		text: '璁惧缁翠慨璁板綍鍗�',
+				// 		url: '/pages/shebeiweixiu/table',
+				// 		id: 7,
+				// 		// },{
+				// 		//  img:'../../static/icon/icon8.png',
+				// 		//  text:'璁惧灞ュ巻',
+				// 		//  url:'/pages/shebeilvli/table',
+				// 		//  id:8,
+				// 	}, {
+				// 		img: '../../static/icon/icon9.png',
+				// 		text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
+				// 		url: '/pages/gongxuIn/table',
+				// 		id: 9,
+				// 	}, {
+				// 		img: '../../static/icon/icon10.png',
+				// 		text: '宸ュ簭鍑虹珯姹囨姤鍗�',
+				// 		url: '/pages/gongxuOut/table',
+				// 		id: 10,
+				// 	}, {
+				// 		img: '../../static/icon/icon11.png',
+				// 		text: '宸ュ簭濮斿鍙戝嚭鍗�',
+				// 		url: '/pages/weiwaigxIn/table',
+				// 		id: 11,
+				// 	}, {
+				// 		img: '../../static/icon/icon12.png',
+				// 		text: '宸ュ簭濮斿鎺ユ敹鍗�',
+				// 		url: '/pages/weiwaigxOut/table',
+				// 		id: 12,
+				// 		// }, {
+				// 		// 	img: '../../static/icon/icon13.png',
+				// 		// 	text: '璁惧绠$悊',
+				// 		// 	url: '/pages/shebeiguanli/table',
+				// 		// 	id: 13,
+				// 	}, {
+				// 		img: '../../static/icon/icon14.png',
+				// 		text: '鎶ュ伐骞冲彴',
+				// 		url: '/pages/baogong/table',
+				// 		id: 14,
+				// 	}, {
+				// 		img: '../../static/icon/icon15.png',
+				// 		text: '寮傚父鍙嶉鍗�',
+				// 		url: '/pages/yichang/table',
+				// 		id: 15,
+				// 	}, {
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '寮傚父鍙嶉澶勭悊鍗�',
+				// 		url: '/pages/yichang/list',
+				// 		id: 16,
+				// 	}, {
+				// 		img: '../../static/icon/icon17.png',
+				// 		text: '閲囪喘鍏ュ簱',
+				// 		url: '/pages/caigouruku/table',
+				// 		id: 17,
+				// 	}, {
+				// 		img: '../../static/icon/icon18.png',
+				// 		text: '閲囪喘閫�鏂�',
+				// 		url: '/pages/caigoutuiliao/table',
+				// 		id: 18,
+				// 	}, {
+				// 		img: '../../static/icon/icon19.png',
+				// 		text: '閿�鍞嚭搴�',
+				// 		url: '/pages/xiaoshouchuku/table',
+				// 		id: 19,
+				// 	}, {
+				// 		img: '../../static/icon/icon20.png',
+				// 		text: '閿�鍞��璐�',
+				// 		url: '/pages/xiaoshoutuihuo/table',
+				// 		id: 20,
+				// 	}, {
+				// 		img: '../../static/icon/icon21.png',
+				// 		text: '鏀舵枡閫氱煡鍗�',
+				// 		url: '/pages/shouliaotongzhi/table',
+				// 		id: 21,
+				// 	},{
+				// 		img: '../../static/icon/icon30.png',
+				// 		text: '鐢熶骇棰嗘枡鏍¢獙',
+				// 		url: '/pages/shengchanlingliao/table',
+				// 		id: 30,
+				// 	},{
+				// 		img: '../../static/icon/icon31.png',
+				// 		text: '鐢熶骇鍏ュ簱鏍¢獙',
+				// 		url: '/pages/shengchanruku/table',
+				// 		id: 31,
+				// 	},{
+				// 		img: '../../static/icon/icon32.png',
+				// 		text: '鐢熶骇璋冩嫧鏍¢獙',
+				// 		url: '/pages/shengchandiaobo/table',
+				// 		id: 32,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鏍囩鎵撳嵃',
+				// 		url: '/pages/labelPrinter/index',
+				// 		id: 22,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '璁惧杩愯鐘舵��',
+				// 		url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
+				// 		id: 23,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '妯″叿杩愯鐘舵��',
+				// 		url: '/pages/mujvzhuangtai/mujvzhuangtai',
+				// 		id: 24,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鏉$爜鎷嗙爜',
+				// 		url: '/pages/tiaomachaima/tiaomachaima',
+				// 		id: 25,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鍏朵粬鍏ュ簱',
+				// 		url: '/pages/qitaruku/qitaruku',
+				// 		id: 26,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鍏朵粬鍑哄簱',
+				// 		url: '/pages/qitachuku/qitachuku',
+				// 		id: 27,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鏉ユ枡鏉$爜鎵撳嵃',
+				// 		url: '/pages/tiaomadaying/tiaomadaying',
+				// 		id: 28,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '涓婃ā鍗�',
+				// 		url: '/pages/MJGL/shangmudan/table',
+				// 		id: 29,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '閲囪喘璁㈠崟',
+				// 		url: '/pages/caigoudingdan/caigoudingdan',
+				// 		id: 30,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鍏朵粬鍑哄簱鏍¢獙',
+				// 		url: '/pages/qitachukujiaoyan/qitachukujiaoyan',
+				// 		id: 31,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鐢熶骇琛ユ枡鏍¢獙',
+				// 		url: '/pages/shengchanbuliaojiaoyan/CacheList',
+				// 		id: 32,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '閿�鍞嚭搴撴牎楠�',
+				// 		url: '/pages/xiaoshouchukujiaoyan/table',
+				// 		id: 33,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '濮斿棰嗘枡鏍¢獙',
+				// 		url: '/pages/weiwailingliaojiaoyan/table',
+				// 		id: 34,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '閲囪喘鍏ュ簱鏍¢獙',
+				// 		url: '/pages/caigourukujiaoyan/table',
+				// 		id: 35,
+				// 	},
 
-                ],
-                // itemData: [{
-                // 		img: '../../static/icon/icon1.png',
-                // 		text: '璁惧妗f',
-                // 		url: '/pages/shebeidangan/table',
-                // 		id: 1
-                // 	}, {
-                // 		img: '../../static/icon/icon8.png',
-                // 		text: '璁惧灞ュ巻',
-                // 		url: '/pages/shebeilvli/table',
-                // 		id: 0,
-                // 	}, {
-                // 		img: '../../static/icon/icon2.png',
-                // 		text: '璁惧淇濆吇璁″垝鍗�',
-                // 		url: '/pages/baoyangjihua/table',
-                // 		id: 2
-                // 	}, {
-                // 		img: '../../static/icon/icon3.png',
-                // 		text: '璁惧淇濆吇璁板綍鍗�',
-                // 		url: '/pages/baoyangjilu/table',
-                // 		id: 3
-                // 	}, {
-                // 		img: '../../static/icon/icon4.png',
-                // 		text: '璁惧鐐规璁″垝鍗�',
-                // 		url: '',
-                // 		id: 4
-                // 	}, {
-                // 		img: '../../static/icon/icon5.png',
-                // 		text: '璁惧鐐规璁板綍鍗�',
-                // 		url: '',
-                // 		id: 5,
-                // 	}, {
-                // 		img: '../../static/icon/icon6.png',
-                // 		text: '璁惧鏁呴殰鐧昏琛�',
-                // 		url: '/pages/guzhangdengji/table',
-                // 		id: 6
-                // 	}, {
-                // 		img: '../../static/icon/icon7.png',
-                // 		text: '璁惧缁翠慨璁板綍鍗�',
-                // 		url: '/pages/shebeiweixiu/table',
-                // 		id: 7,
-                // 		// },{
-                // 		//  img:'../../static/icon/icon8.png',
-                // 		//  text:'璁惧灞ュ巻',
-                // 		//  url:'/pages/shebeilvli/table',
-                // 		//  id:8,
-                // 	}, {
-                // 		img: '../../static/icon/icon9.png',
-                // 		text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
-                // 		url: '/pages/gongxuIn/table',
-                // 		id: 9,
-                // 	}, {
-                // 		img: '../../static/icon/icon10.png',
-                // 		text: '宸ュ簭鍑虹珯姹囨姤鍗�',
-                // 		url: '/pages/gongxuOut/table',
-                // 		id: 10,
-                // 	}, {
-                // 		img: '../../static/icon/icon11.png',
-                // 		text: '宸ュ簭濮斿鍙戝嚭鍗�',
-                // 		url: '/pages/weiwaigxIn/table',
-                // 		id: 11,
-                // 	}, {
-                // 		img: '../../static/icon/icon12.png',
-                // 		text: '宸ュ簭濮斿鎺ユ敹鍗�',
-                // 		url: '/pages/weiwaigxOut/table',
-                // 		id: 12,
-                // 		// }, {
-                // 		// 	img: '../../static/icon/icon13.png',
-                // 		// 	text: '璁惧绠$悊',
-                // 		// 	url: '/pages/shebeiguanli/table',
-                // 		// 	id: 13,
-                // 	}, {
-                // 		img: '../../static/icon/icon14.png',
-                // 		text: '鎶ュ伐骞冲彴',
-                // 		url: '/pages/baogong/table',
-                // 		id: 14,
-                // 	}, {
-                // 		img: '../../static/icon/icon15.png',
-                // 		text: '寮傚父鍙嶉鍗�',
-                // 		url: '/pages/yichang/table',
-                // 		id: 15,
-                // 	}, {
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '寮傚父鍙嶉澶勭悊鍗�',
-                // 		url: '/pages/yichang/list',
-                // 		id: 16,
-                // 	}, {
-                // 		img: '../../static/icon/icon17.png',
-                // 		text: '閲囪喘鍏ュ簱',
-                // 		url: '/pages/caigouruku/table',
-                // 		id: 17,
-                // 	}, {
-                // 		img: '../../static/icon/icon18.png',
-                // 		text: '閲囪喘閫�鏂�',
-                // 		url: '/pages/caigoutuiliao/table',
-                // 		id: 18,
-                // 	}, {
-                // 		img: '../../static/icon/icon19.png',
-                // 		text: '閿�鍞嚭搴�',
-                // 		url: '/pages/xiaoshouchuku/table',
-                // 		id: 19,
-                // 	}, {
-                // 		img: '../../static/icon/icon20.png',
-                // 		text: '閿�鍞��璐�',
-                // 		url: '/pages/xiaoshoutuihuo/table',
-                // 		id: 20,
-                // 	}, {
-                // 		img: '../../static/icon/icon21.png',
-                // 		text: '鏀舵枡閫氱煡鍗�',
-                // 		url: '/pages/shouliaotongzhi/table',
-                // 		id: 21,
-                // 	},{
-                // 		img: '../../static/icon/icon30.png',
-                // 		text: '鐢熶骇棰嗘枡鏍¢獙',
-                // 		url: '/pages/shengchanlingliao/table',
-                // 		id: 30,
-                // 	},{
-                // 		img: '../../static/icon/icon31.png',
-                // 		text: '鐢熶骇鍏ュ簱鏍¢獙',
-                // 		url: '/pages/shengchanruku/table',
-                // 		id: 31,
-                // 	},{
-                // 		img: '../../static/icon/icon32.png',
-                // 		text: '鐢熶骇璋冩嫧鏍¢獙',
-                // 		url: '/pages/shengchandiaobo/table',
-                // 		id: 32,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鏍囩鎵撳嵃',
-                // 		url: '/pages/labelPrinter/index',
-                // 		id: 22,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '璁惧杩愯鐘舵��',
-                // 		url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
-                // 		id: 23,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '妯″叿杩愯鐘舵��',
-                // 		url: '/pages/mujvzhuangtai/mujvzhuangtai',
-                // 		id: 24,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鏉$爜鎷嗙爜',
-                // 		url: '/pages/tiaomachaima/tiaomachaima',
-                // 		id: 25,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鍏朵粬鍏ュ簱',
-                // 		url: '/pages/qitaruku/qitaruku',
-                // 		id: 26,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鍏朵粬鍑哄簱',
-                // 		url: '/pages/qitachuku/qitachuku',
-                // 		id: 27,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鏉ユ枡鏉$爜鎵撳嵃',
-                // 		url: '/pages/tiaomadaying/tiaomadaying',
-                // 		id: 28,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '涓婃ā鍗�',
-                // 		url: '/pages/MJGL/shangmudan/table',
-                // 		id: 29,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '閲囪喘璁㈠崟',
-                // 		url: '/pages/caigoudingdan/caigoudingdan',
-                // 		id: 30,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鍏朵粬鍑哄簱鏍¢獙',
-                // 		url: '/pages/qitachukujiaoyan/qitachukujiaoyan',
-                // 		id: 31,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '鐢熶骇琛ユ枡鏍¢獙',
-                // 		url: '/pages/shengchanbuliaojiaoyan/CacheList',
-                // 		id: 32,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '閿�鍞嚭搴撴牎楠�',
-                // 		url: '/pages/xiaoshouchukujiaoyan/table',
-                // 		id: 33,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '濮斿棰嗘枡鏍¢獙',
-                // 		url: '/pages/weiwailingliaojiaoyan/table',
-                // 		id: 34,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '閲囪喘鍏ュ簱鏍¢獙',
-                // 		url: '/pages/caigourukujiaoyan/table',
-                // 		id: 35,
-                // 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '濮斿琛ユ枡鏍¢獙',
+				// 		url: '/pages/weiwaibuliaojiaoyan/table',
+				// 		id: 37,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon17.png',
+				// 		text: '鐢熶骇棰嗘枡',
+				// 		url: '/pages/shengchanlingliaoshengdan/table',
+				// 		id: 38,
+				// 	}, 
+				// ]
+			}
+		},
+		onLoad() {
+			this.getHiddenItem()
+		},
+		methods: {
+			checkCardShow(item) {
+				if (item.HMaker && item.HMaker != getUserInfo()['Czymc'] && item.hidden == true) {
+					return false
+				}
+				return true
+			},
+			async getHiddenItem() {
+				// let itemCache = uni.getStorageSync('HIndexItemData') || ''
+				// console.log('itemCache: ',itemCache);
+				// if(itemCache !== '') {
+				// 	this.itemData = itemCache
+				// }
 
-                // 	{
-                // 		img: '../../static/icon/icon16.png',
-                // 		text: '濮斿琛ユ枡鏍¢獙',
-                // 		url: '/pages/weiwaibuliaojiaoyan/table',
-                // 		id: 37,
-                // 	},
-                // 	{
-                // 		img: '../../static/icon/icon17.png',
-                // 		text: '鐢熶骇棰嗘枡',
-                // 		url: '/pages/shengchanlingliaoshengdan/table',
-                // 		id: 38,
-                // 	}, 
-                // ]
-            }
-        },
-        onLoad() {
-            this.getHiddenItem()
-        },
-        methods: {
-            checkCardShow(item) {
-                if (item.HMaker && item.HMaker != getUserInfo()['Czymc'] && item.hidden == true) {
-                    return false
-                }
-                return true
-            },
-            async getHiddenItem() {
-                // let itemCache = uni.getStorageSync('HIndexItemData') || ''
-                // console.log('itemCache: ',itemCache);
-                // if(itemCache !== '') {
-                // 	this.itemData = itemCache
-                // }
+				let data = await getMenuList({
+					menuName: this.menuListName
+				})
+				Array.from(data).forEach(e => {
+					this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
+					this.itemData[e["HIndex"]].HMaker = e["HMaker"]
+				})
+			},
+			switchHidden(index) {
+				this.updateCount++;
+				this.itemData[index].hidden = !this.itemData[index].hidden
+			},
+			switchIconsModeHandler() {
+				this.canEdit = !this.canEdit
+				if (this.canEdit == false && this.updateCount > 0) {
+					this.$nextTick(() => {
+						// uni.setStorageSync("HIndexItemData", this.itemData)
+						setMenuList({
+							menuName: this.menuListName,
+							payload: this.itemData
+						})
 
-                let data = await getMenuList({
-                    menuName: this.menuListName
-                })
-                Array.from(data).forEach(e => {
-                    this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
-                    this.itemData[e["HIndex"]].HMaker = e["HMaker"]
-                })
-            },
-            switchHidden(index) {
-                this.updateCount++;
-                this.itemData[index].hidden = !this.itemData[index].hidden
-            },
-            switchIconsModeHandler() {
-                this.canEdit = !this.canEdit
-                if (this.canEdit == false && this.updateCount > 0) {
-                    this.$nextTick(() => {
-                        // uni.setStorageSync("HIndexItemData", this.itemData)
-                        setMenuList({
-                            menuName: this.menuListName,
-                            payload: this.itemData
-                        })
-
-                        this.updateCount = 0
-                    })
-                }
-                this.$forceUpdate()
-            },
-            toUrl(item) {
-                if (item.url) {
-                    uni.navigateTo({
-                        url: item.url
-                    })
-                } else {
-                    uni.showToast({
-                        title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
-                        icon: 'none'
-                    })
-                }
-            }
-        }
-    }
+						this.updateCount = 0
+					})
+				}
+				this.$forceUpdate()
+			},
+			toUrl(item) {
+				if (item.url) {
+					uni.navigateTo({
+						url: item.url
+					})
+				} else {
+					uni.showToast({
+						title: '鍔熻兘寮�鍙戜腑銆傘�傘��',
+						icon: 'none'
+					})
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    .header {
-        width: 750rpx;
-        background: linear-gradient(0deg, #71AFFC 0%, #3A78FF 100%);
-        font-size: 47rpx;
-        font-weight: bold;
-        color: #FFFFFF;
-        text-align: center;
-        padding: 9vh 0 6vh 0;
-        position: relative;
-    }
+	.header {
+		width: 750rpx;
+		background: linear-gradient(0deg, #71AFFC 0%, #3A78FF 100%);
+		font-size: 47rpx;
+		font-weight: bold;
+		color: #FFFFFF;
+		text-align: center;
+		padding: 9vh 0 6vh 0;
+		position: relative;
+	}
 
-    .switch-button {
-        position: absolute;
-        right: 10rpx;
-        bottom: 0;
-    }
+	.switch-button {
+		position: absolute;
+		right: 10rpx;
+		bottom: 0;
+	}
 
-    .mains {
-        width: 720rpx;
-        margin: 0 auto;
-        display: flex;
-        flex-wrap: wrap;
-        margin-top: 3vh;
-        padding-bottom: 5vh;
+	.mains {
+		width: 720rpx;
+		margin: 0 auto;
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 3vh;
+		padding-bottom: 5vh;
 
-        .box {
-            width: 25%;
-            margin-top: 2.5vh;
-            text-align: center;
+		.box {
+			width: 25%;
+			margin-top: 2.5vh;
+			text-align: center;
 
-            image {
-                width: 18vw;
-                height: 18vw;
-            }
+			image {
+				width: 18vw;
+				height: 18vw;
+			}
 
-            .texts {
-                width: 120rpx;
-                margin: 0 auto;
-                font-size: 29rpx;
-                font-weight: normal;
-                color: #333333;
-                margin-top: .2vh;
-            }
-        }
+			.texts {
+				width: 120rpx;
+				margin: 0 auto;
+				font-size: 29rpx;
+				font-weight: normal;
+				color: #333333;
+				margin-top: .2vh;
+			}
+		}
 
-        .edit {
-            position: relative;
-        }
+		.edit {
+			position: relative;
+		}
 
-        .edit-mark {
-            position: absolute;
-            top: 0;
-            right: 0;
-        }
+		.edit-mark {
+			position: absolute;
+			top: 0;
+			right: 0;
+		}
 
-        view[enable-hidden] {
-            opacity: .4 !important;
-        }
+		view[enable-hidden] {
+			opacity: .4 !important;
+		}
 
-        view[hidden] {
-            display: none;
-        }
-    }
+		view[hidden] {
+			display: none;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/login.vue b/pages/index/login.vue
index a0ad400..7c6519a 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -87,6 +87,8 @@
                     "浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
  					//"llj": 'http://localhost:8082/LuBaoAPI/',
 					"鑻忓窞鍗櫤绉戞妧": 'http://221.224.60.42:8082/API_WW/',
+					"鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
+					"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
 					"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
 					"闄堥晲鍝叉湰鍦版祴璇�": 'http://localhost:81/API/',
 					"寮犵憺骞挎湰鍦版祴璇�": 'http://localhost:8082/API/',
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 56196ef..b17beb1 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -395,6 +395,13 @@
 						"url": "/pages/MJGL/qijudiaobodan/table",
 						"id": 47,
 						"hidden": false
+					},
+					{
+						"img": "../../static/icon/icon8.png",
+						"text": "瑁呯鍗曟殏瀛樺垪琛�",
+						"url": "/pages/zhuangxiangdan/table",
+						"id": 48,
+						"hidden": false
 					}
 				]
 			}
diff --git a/pages/zhuangxiangdan/form.vue b/pages/zhuangxiangdan/form.vue
new file mode 100644
index 0000000..7513d27
--- /dev/null
+++ b/pages/zhuangxiangdan/form.vue
@@ -0,0 +1,1059 @@
+<template>
+	<view class="form">
+		<view class="form-base-info">
+			<view class="form-item">
+				<view class="title">绠辨潯鐮�</view>
+				<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+				<view class="right" :class="disableBarCodePack ? 'disabled' : ''">
+					<input type="text" :focus="HBarCodePackFocus" v-model="HBarCode_Pack"
+						@confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" :disabled="disableBarCodePack" />
+				</view>
+				<view class="right-icon">
+					<uni-icons class="right-icon" :class="disableBarCodePack ? 'disabled':''" type="scan"
+						style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+						@click="toScanCode" :disabled="disableBarCodePack"></uni-icons>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">浜у搧鐮�</view>
+				<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
+				<view class="right" :class="disableBarCode ? 'disabled' : ''">
+					<input type="text" :focus="HBarCodeFocus" v-model="HBarCode"
+						@confirm="GetMeesageByBarCode(HBarCode)" :disabled="disableBarCode" />
+				</view>
+				<view class="right-icon">
+					<uni-icons class="right-icon" :class="[disableBarCode ? 'disabled':'']" type="scan"
+						style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+						@click="toScanCode" :disabled="disableBarCode"></uni-icons>
+				</view>
+			</view>
+			<view class="form-item">
+				<view class="title">宸叉壂鏁伴噺</view>
+				<view class="right disabled">
+					<input type="text" disabled :value="hform.HQtySum" />
+				</view>
+
+			</view>
+		</view>
+		<view class="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍗曟嵁淇℃伅</view>
+			<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">瑁呯淇℃伅</view>
+		</view>
+
+		<!-- 鍗曟嵁淇℃伅 -->
+		<view v-if="tabs == 0">
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">婧愬崟绫诲瀷:</view>
+					<view class="right" v-show="showHMainSourceBillType">
+						<picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillTypeIndex"
+							@change="HMainSourceBillTypeChange">
+							<input name="HMainSourceBillType" disabled :value="HMainSourceBillType"
+								placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+							<view class="picker-overlay"></view>
+						</picker>
+					</view>
+					<view class="righton" v-show="!showHMainSourceBillType">
+						<input name="HMainSourceBillType" disabled :value="HMainSourceBillType" placeholder="璇烽�夋嫨婧愬崟绫诲瀷" />
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">婧愬崟鍗曞彿:</view>
+					<view class="right" v-show="showHSourceBillNo">
+						<input :focus="HSourcebillNoFocus" type="text" @confirm="onHSourceBillNoConfirmHandler"
+							name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view>
+					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
+						<uni-icons type="search" size="20" @click="showBillList"></uni-icons>
+					</view>
+					<view class="icon-wrapper" v-show="showHSourceBillNo">
+						<uni-icons type="right" size="20" @click="onHSourceBillNoConfirmHandler"></uni-icons>
+					</view>
+					<view class="righton" v-show="!showHSourceBillNo">
+						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">婧愬崟鐗╂枡</view>
+					<view class="right disabled">
+						<input type="text" disabled :value="hform.HMaterName" />
+					</view>
+
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鏃ユ湡</view>
+					<view class="right">
+						<uni-datetime-picker type="date" v-model="hform.HDate">
+							<input type="text" v-model="hform.HDate" />
+						</uni-datetime-picker>
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">鍒跺崟浜�</view>
+					<view class="right disabled">
+						<input type="text" disabled :value="hform.HMaker" />
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">鍗曟嵁鍙�</view>
+					<view class="right disabled">
+						<input type="text" disabled :value="hform.HBillNo" />
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">鍗曟嵁ID</view>
+					<view class="right disabled">
+						<input type="text" disabled :value="hform.HInterID" />
+					</view>
+				</view>
+			</view>
+			<view class="bill-info">
+				<view class="form-item">
+					<view class="title">缁勭粐</view>
+					<view class="right disabled">
+						<input type="text" disabled :value="hform.HStockOrgName" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 瑁呯淇℃伅 -->
+		<view v-if="tabs == 1">
+			<zb-table id="list-table" :checked-highlight="true" :fit="true" :style="{height: `${listTableHeight}px`}"
+				:columns="columns" :data="listData" :show-header="true" :border="true" :row-key="row => row.index"
+				@toggleRowSelection="handleSelect" @toggleAllSelection="handleSelectAll"
+				@rowClick="onTableRowClickHandler" />
+		</view>
+		<view class="bottom-btn" id="bottom-btn">
+			<button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini"
+				@tap="cmdSubmit">鎻愪氦</button>
+			<view style="flex: 1;"></view>
+			<button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button>
+			<button class="btn-c" size="mini" @tap="cmdExit">閫�鍑�</button>
+		</view>
+		<!-- 寮圭獥缁勪欢 -->
+		<BillListPopupVue ref="billList" :HBillType="HBillType" :HSourceBillType="hform.HMainSourceBillType || 3710"
+			:HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
+	</view>
+</template>
+<script>
+	import dayjs from 'dayjs'
+	import {
+		getUserInfo
+	} from "../../utils/auth";
+	import {
+		CommonUtils
+	} from "@/utils/common.js"
+	import {
+		MpaasScan
+	} from "@/utils/mpaasScan.js"
+	import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
+
+	export default {
+		data() {
+			return {
+				// ==================== 甯冨眬璁$畻鐩稿叧 ====================
+				// 璁$畻鍒楄〃楂樺害
+				bottomBtnTop: 0,
+				listTableTop: 0,
+
+				// ==================== 鐣岄潰鐘舵�佹帶鍒� ====================
+				EnableSubmit: true, // 鏄惁鍏佽鎻愪氦
+				disableBarCodePack: true, // 绠辨潯鐮佺鐢ㄧ姸鎬�
+				disableBarCode: true, // 浜у搧鐮佺鐢ㄧ姸鎬�
+				HBarCodePackFocus: false, // 绠辨潯鐮佽緭鍏ユ鑱氱劍鐘舵��
+				HBarCodeFocus: false, // 浜у搧鐮佽緭鍏ユ鑱氱劍鐘舵��
+				tabs: 0, // 褰撳墠閫夐」鍗�(0:鍗曟嵁淇℃伅,1:瑁呯淇℃伅)
+
+
+				// ==================== 涓氬姟鏁版嵁 ====================
+				HBarCode_Pack: '', // 绠辨潯鐮�
+				HBarCode: '', // 浜у搧鐮�
+				HBillType: '3783', // 鍗曟嵁绫诲瀷
+				HBillSubType: '1', // 瀛愮被鍨嬶紙1瑁呯銆�2缁勬墭锛�
+				OperationType: 1, // 鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+				HMaterNumber_Pack: "", // 鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
+				HBarCode_Pack_Temp: "", // 浠庣紦瀛樺垪琛ㄤ腑杩斿洖绠辨潯鐮�
+				BarCodeType: 1, // 鏉$爜绫诲瀷(1:瑁呯,2:缁勬墭)
+
+				HSourcebillNoFocus: false, // 婧愬崟鍗曞彿杈撳叆妗嗚仛鐒︾姸鎬� - 鏂板杩欎釜灞炴��
+				showHMainSourceBillType: true,
+				showHSourceBillNo: true,
+				HMainSourceBillTypeIndex: 0,
+				HMainSourceBillType: '鐢熶骇璁㈠崟',
+				arrayHMainSourceBillType: ['鐢熶骇璁㈠崟', '鎵嬪伐褰曞叆'],
+				arrayHMainSourceBillValue: [3710, -1],
+
+				// ==================== 鍒楄〃鏁版嵁 ====================
+				listOption: [], // 鍒楄〃閫夐」
+				listData: [], // 琛ㄦ牸鏁版嵁
+				selectedRows: [], // 琛ㄦ牸閫変腑鐨勬暟鎹�
+				columns: [ // 琛ㄦ牸鍒楅厤缃�
+					{
+						type: 'selection',
+						fixed: true,
+						width: 50
+					},
+					{
+						name: 'index',
+						label: '搴忓彿',
+						width: 60,
+						hidden: true
+					},
+					{
+						name: '鏉$爜缂栧彿',
+						label: '鏉$爜缂栧彿',
+						width: 100
+					},
+					{
+						name: '鏁伴噺',
+						label: '鏁伴噺',
+						width: 100
+					},
+					{
+						name: '鐗╂枡浠g爜',
+						label: '鐗╂枡浠g爜',
+						width: 100
+					},
+					{
+						name: '鐗╂枡鍚嶇О',
+						label: '鐗╂枡鍚嶇О',
+						width: 100
+					},
+					{
+						name: '鏉$爜涓暟',
+						label: '鏉$爜涓暟',
+						width: 100
+					}
+				],
+
+				// ==================== 涓昏〃鍗曟暟鎹� ====================
+				hform: {
+					HDate: dayjs(new Date()).format('YYYY-MM-DD'), // 鍗曟嵁鏃ユ湡
+					HMaker: getUserInfo()['Czymc'], // 鍒跺崟浜�
+					HBillNo: '', // 鍗曟嵁鍙�
+					HInterID: '', // 鍗曟嵁ID
+					HStockOrgName: uni.getStorageSync("Organization"), // 缁勭粐鍚嶇О
+					HStockOrgID: uni.getStorageSync("OrganizationID"), // 缁勭粐ID
+					HMainSourceBillType: 3710, //婧愬崟绫诲瀷
+					HMaterName: '', //婧愬崟鐗╂枡
+					HMaterID: '', //婧愬崟鐗╂枡id
+					HQtySum: '', //澶栫鐮佹暟閲�
+					totalQty: 0, // 鎬绘暟
+				},
+
+				// ==================== 绯荤粺閰嶇疆 ====================
+				HModName: "Sc_PackUnionBill_Packing_PDA", // 妯″潡鍚嶇О
+				ModRightName: "CE_PackUnionBill_Packing", // 妯″潡鏉冮檺鍙傛暟
+				titleData: [] // 涓嶉渶瑕佹樉绀虹殑瀛楁
+			}
+		},
+		components: {
+			BillListPopupVue,
+		},
+		// ==================== 璁$畻灞炴�� ====================
+		computed: {
+			// 璁$畻琛ㄦ牸楂樺害
+			listTableHeight: {
+				get() {
+					return this.bottomBtnTop - this.listTableTop - 10
+				}
+			}
+		},
+
+		// ==================== 鏂规硶 ====================
+		methods: {
+			// 澶嶉�夋鍙樺寲澶勭悊
+			checkboxGroupChangeHandler(e) {
+				let checkBoxValues = Array.from(e.detail.value)
+				this.hform.HQualityApproval = checkBoxValues.includes('qualityApproval')
+			},
+
+			// 琛ㄦ牸琛岀偣鍑诲鐞�
+			onTableRowClickHandler(row, index) {
+				if (!this.listData[index].checked) {
+					this.$set(this.listData[index], 'checked', true)
+				} else {
+					this.listData[index].checked = !this.listData[index].checked
+				}
+			},
+
+			// 鍒锋柊浜у搧鐮佽緭鍏ユ鐒︾偣
+			async HBarCodeFocusRefresh() {
+				this.HBarCode = ''
+				this.HBarCodeFocus = false
+				await this.$nextTick()
+				this.HBarCodeFocus = true
+			},
+
+			// 鍒锋柊绠辨潯鐮佽緭鍏ユ鐒︾偣
+			async HBarCodePackFocusRefresh() {
+				this.HBarCode_Pack = ''
+				this.HBarCodePackFocus = false
+				await this.$nextTick()
+				this.HBarCodePackFocus = true
+			},
+
+			// 鎵弿绠辨潯鐮�
+			toScanCode() {
+				MpaasScan.scanCode((scanCode) => {
+					this.HBarCode_Pack = scanCode
+					this.GetMeesageByBarCode_Pack(this.HBarCode_Pack)
+				})
+			},
+
+			// 鏍规嵁绠辨潯鐮佽幏鍙栦俊鎭�
+			GetMeesageByBarCode_Pack(HBarCode_Pack) {
+				CommonUtils.doRequest2({
+					url: '/WEBSController/Get_PackBarCode_PackUnionBill_New_Json_Cus',
+					data: {
+						HInterID: this.hform.HInterID || 0,
+						HBillNo: this.hform.HBillNo,
+						HBillType: this.HBillType,
+						HBillSubType: this.HBillSubType,
+						HBarCode_Pack: HBarCode_Pack,
+						HSourceBillNo: this.hform.HSourceBillNo,
+					},
+					resFunction: (res) => {
+						let {
+							data,
+							count,
+							Message,
+							list
+						} = res.data
+						if (count == 1) {
+							CommonUtils.playSound(1)
+							this.hform.HBillNo = data[0].HBillNo
+							this.hform.HInterID = data[0].HInterID
+							this.HMaterNumber_Pack = data[0].HMaterNumber
+							this.hform.HMaterName = data[0].HMaterName
+							// 璁剧疆鎬绘暟锛屽綋鍓嶆壂鎻忔暟閲忛�氳繃DisBillEntryList鏇存柊
+							const totalQty = data[0].HBarcodeQtys || 0
+							this.hform.HQtySum = `0/${totalQty}`
+							//澶勭悊鎴愬姛鍚庤仛鐒﹀埌浜у搧鐮佽緭鍏ユ
+							this.HBarCodeFocusRefresh()
+							this.DisBillEntryList();
+							uni.showToast({
+								icon: 'none',
+								title: Message
+							})
+						} else {
+							CommonUtils.playSound(0)
+							this.HBarCodePackFocusRefresh()
+							uni.showToast({
+								icon: 'none',
+								title: Message
+							})
+						}
+					}
+				})
+			},
+
+			// 鎵弿浜у搧鐮�
+			toScanCode2() {
+				MpaasScan.scanCode((scanCode) => {
+					this.HBarCode = scanCode
+					this.GetMeesageByBarCode(scanCode)
+				})
+			},
+
+			// 鏍规嵁浜у搧鐮佽幏鍙栦俊鎭�
+			GetMeesageByBarCode(HBarCode) {
+				let HBarCode_Pack = this.HBarCode_Pack
+				let sOldBarCode = this.HBarCode
+				let HDeleteFlag = sOldBarCode.substring(0, 1)
+				let sBarCode = sOldBarCode.slice(1)
+
+				if (!HBarCode_Pack) {
+					return uni.showToast({
+						icon: 'none',
+						title: '绠辨潯鐮佷笉鑳戒负绌猴紝璇峰厛鎵弿鎵樻潯鐮侊紒'
+					})
+				}
+				if (HDeleteFlag == '*') {
+					// 鍒犻櫎鏉$爜閫昏緫
+					if (!sBarCode) {
+						return uni.showToast({
+							icon: 'none',
+							title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�'
+						})
+					} else {
+						this.HBarCodeFocusRefresh()
+					}
+					CommonUtils.doRequest2({
+						url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+						data: {
+							"HInterID": this.hform.HInterID,
+							"HBarCode": sBarCode,
+							"HBillType": this.HBillType
+						},
+						resFunction: (res) => {
+							let {
+								data,
+								count,
+								Message
+							} = res.data
+							if (count == 1) {
+								CommonUtils.playSound(1)
+								this.tabs = 1
+								this.DisBillEntryList()
+							} else {
+								CommonUtils.playSound(0)
+								uni.showToast({
+									icon: 'none',
+									title: Message
+								})
+							}
+						}
+					})
+				} else {
+					// 鏂板鏉$爜閫昏緫
+					let sBarCode = this.HBarCode
+					if (!sBarCode) {
+						return uni.showToast({
+							icon: 'none',
+							title: '鏉$爜涓嶈兘涓虹┖锛岃鎵弿鏉$爜锛�'
+						})
+					}
+					CommonUtils.doRequest2({
+						url: '/WEBSController/Get_BarCode_PackUnionBill_New_Json_Cus',
+						data: {
+							"HBarCode": sBarCode,
+							"HInterID": this.hform.HInterID,
+							"HBillNo": this.hform.HBillNo,
+							"HBillType": this.HBillType,
+							"HBillSubType": this.HBillSubType,
+							"HBarCode_Pack": this.HBarCode_Pack,
+							"HMaterNumber_Pack": this.HMaterNumber_Pack,
+							"HMaker": this.hform.HMaker,
+							"HStockOrgID": this.hform.HStockOrgID
+						},
+						resFunction: (res) => {
+							let {
+								data,
+								count,
+								Message
+							} = res.data
+							if (count == 1) {
+								CommonUtils.playSound(1)
+								this.tabs = 1
+								this.HBarCodeFocusRefresh()
+								this.DisBillEntryList()
+							} else {
+								CommonUtils.playSound(0)
+								this.HBarCodeFocusRefresh()
+								uni.showToast({
+									icon: 'none',
+									title: Message
+								})
+							}
+						}
+					})
+				}
+			},
+			// 鏄剧ず鍗曟嵁鏄庣粏鍒楄〃
+			DisBillEntryList() {
+				CommonUtils.doRequest2({
+					url: '/WEBSController/GetBillEntry_Tmp_Pack_Json',
+					data: {
+						"HInterID": this.hform.HInterID,
+						"HBillNo": this.hform.HBillNo,
+						"HBillType": this.HBillType
+					},
+					resFunction: (res) => {
+						let {
+							count,
+							data,
+							Message
+						} = res.data
+						this.listData = []
+						if (count == 1) {
+							for (let i = 0; i < data.length; i++) {
+								this.listData.push(Object.assign(data[i], {
+									index: i
+								}))
+							}
+
+							// 鏂板锛氭牴鎹繑鍥炵殑鏉$爜鍒楄〃鏁伴噺鏇存柊宸叉壂鏁伴噺
+							if (this.hform.HQtySum && this.hform.HQtySum.includes('/')) {
+								const total = this.hform.HQtySum.split('/')[1] // 鑾峰彇鎬绘暟
+								const currentScanned = data.length // 褰撳墠宸叉壂鎻忔暟閲�
+								this.hform.HQtySum = `${currentScanned}/${total}`
+								// 鏂板锛氭鏌ユ槸鍚﹁揪鍒版�绘暟锛屽鏋滄槸鍒欐彁绀轰繚瀛�
+								if (currentScanned >= total) {
+									uni.showModal({
+										title: '鎻愮ず',
+										content: '宸叉壂鏁伴噺宸茶揪鍒颁笂闄愶紝鏄惁绔嬪嵆淇濆瓨锛�',
+										confirmText: '淇濆瓨',
+										cancelText: '鍙栨秷',
+										success: ({
+											confirm
+										}) => {
+											if (confirm) {
+												// 鐢ㄦ埛鐐瑰嚮淇濆瓨锛岃皟鐢ㄤ繚瀛樻柟娉�
+												this.cmdSubmit()
+											} else {
+												// 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屼笉鍋氫换浣曟搷浣�
+												uni.showToast({
+													icon: 'none',
+													title: '鎮ㄥ彲浠ラ�夋嫨鎵嬪姩淇濆瓨'
+												})
+											}
+										}
+									})
+								}
+							} else {
+								// 濡傛灉娌℃湁鏁版嵁锛岄噸缃凡鎵暟閲�
+								if (this.hform.HQtySum && this.hform.HQtySum.includes('/')) {
+									const total = this.hform.HQtySum.split('/')[1] // 鑾峰彇鎬绘暟
+									this.hform.HQtySum = `0/${total}`
+								}
+							}
+						} else {
+							// 濡傛灉娌℃湁鏁版嵁锛岄噸缃凡鎵暟閲�
+							if (this.hform.HQtySum && this.hform.HQtySum.includes('/')) {
+								const total = this.hform.HQtySum.split('/')[1] // 鑾峰彇鎬绘暟
+								this.hform.HQtySum = `0/${total}`
+							}
+						}
+					}
+				})
+			},
+
+			// 琛ㄦ牸閫夋嫨澶勭悊
+			handleSelect(selected, array) {
+				this.selectedRows = array
+			},
+
+			// 琛ㄦ牸鍏ㄩ�夊鐞�
+			handleSelectAll(selected, array) {
+				this.selectedRows = array
+			},
+			// 鎾斁鎻愮ず闊�
+			playSound(type) {
+				const innerAudioContext = uni.createInnerAudioContext();
+				innerAudioContext.src = type == 1 ? '/static/success.wav' : '/static/jingbao.wav';
+				innerAudioContext.play();
+			},
+
+			// -----------------璁剧疆婧愬崟淇℃伅----------------------------------------------------
+			async setSourceBillInfo(data) {
+				this.hform.HMaterName = data[0].鐗╂枡鍚嶇О
+				this.hform.HMaterID = data[0].HMaterID
+				this.hform.HSourceBillNo = data[0].鍗曟嵁鍙�
+				this.hform.HMainSourceBillType = data[0].HSourceBillType
+
+				// 鏇存柊婧愬崟绫诲瀷鏄剧ず
+				const index = this.arrayHMainSourceBillValue.findIndex(e => e == data[0].HSourceBillType)
+				if (index !== -1) {
+					this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
+					this.HMainSourceBillTypeIndex = index
+					this.showHMainSourceBillType = false
+				}
+
+				if (data.hMulSourceFlagField == 0) {
+					this.showHSourceBillNo = false
+				}
+			},
+			// 婧愬崟绫诲瀷鍙樻洿
+			HMainSourceBillTypeChange(e) {
+				this.HMainSourceBillTypeIndex = e.detail.value
+				this.HMainSourceBillType = this.arrayHMainSourceBillType[this.HMainSourceBillTypeIndex]
+				this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[this.HMainSourceBillTypeIndex]
+			},
+
+			// 婧愬崟鍗曞彿纭
+			async onHSourceBillNoConfirmHandler() {
+				if (this.hform.HMainSourceBillType == -1) {
+					this.playSound(1)
+					return
+				}
+				// 鑾峰彇婧愬崟鐘舵��
+				await this.getSourceBarCodeControl(this.hform.HSourceBillNo)
+			},
+			// 鑾峰彇婧愬崟鐘舵��
+			async getSourceBarCodeControl(HSourceBillNo) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: '/WEBSController/GetSourceBillList_Control',
+						data: {
+							HBillType: this.HBillType,
+							HSourceBillType: this.hform.HMainSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HSourceBillNo: HSourceBillNo,
+							HMater: '',
+							HCustom: ''
+						}
+					})
+
+					if (res.data.count == 1) {
+						// 鑾峰彇婧愬崟鏁版嵁
+						await this.getSourceBarCodeData(this.hform.HSourceBillNo)
+					} else {
+						this.playSound(0)
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+						this.refreshHSourceBillState()
+					}
+				} catch (error) {
+					this.playSound(0)
+					uni.showToast({
+						title: '鑾峰彇婧愬崟鏁版嵁澶辫触',
+						icon: 'none'
+					})
+					this.refreshHSourceBillState()
+				}
+			},
+			// 鑾峰彇婧愬崟鏁版嵁
+			async getSourceBarCodeData(HSourceBillNo) {
+				try {
+					let res = await CommonUtils.doRequest2Sync({
+						url: '/WEBSController/GetSourceBillList_Json',
+						data: {
+							HBillType: this.HBillType,
+							HSourceBillType: this.hform.HMainSourceBillType,
+							HStockOrgID: this.hform.HStockOrgID,
+							HSourceBillNo: HSourceBillNo,
+							HMater: '',
+							HCustom: ''
+						}
+					})
+
+					if (res.data.count == 1) {
+						this.playSound(1)
+						await this.setSourceBillInfo(res.data.data)
+						// 婧愬崟鏁版嵁杩斿洖鎴愬姛鍚庯紝瑙i櫎绂佺敤骞惰仛鐒﹀埌绠辨潯鐮�
+						this.disableBarCodePack = false
+						this.disableBarCode = false
+						this.HBarCodePackFocusRefresh()
+					} else {
+						this.playSound(0)
+						uni.showToast({
+							title: res.data.Message,
+							icon: 'none'
+						})
+						this.refreshHSourceBillState()
+					}
+				} catch (error) {
+					this.playSound(0)
+					uni.showToast({
+						title: '鑾峰彇婧愬崟鏁版嵁澶辫触',
+						icon: 'none'
+					})
+					this.refreshHSourceBillState()
+				}
+			},
+
+			// 鍒锋柊婧愬崟杈撳叆鐘舵��
+			async refreshHSourceBillState() {
+				this.HSourcebillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HSourceBillNo = ""
+					this.HSourcebillNoFocus = true
+				})
+			},
+
+			// 鏄剧ず婧愬崟鍒楄〃
+			showBillList() {
+				this.$refs.billList.showPopup()
+			},
+			//--------------------------------------------------------------------------------------
+
+			// 鑾峰彇鏈�澶у崟鎹彿
+			getMaxNo() {
+				CommonUtils.doRequest2({
+					url: "/WEBSController/GetMaxBillNoAndID_Json",
+					data: {
+						"HBillType": this.HBillType
+					},
+					resFunction: (d) => {
+						let {
+							count,
+							data,
+							Message
+						} = d.data
+						if (count == 1) {
+							this.hform.HInterID = data[0].HInterID;
+							this.hform.HBillNo = data[0].HBillNo
+						} else {
+							uni.showModal({
+								title: "娓╅Θ鎻愮ず",
+								showCancel: false,
+								content: Message
+							})
+						}
+					}
+				})
+			},
+
+			// 鎻愪氦鍓嶆鏌�
+			submitPreCheck() {
+				if (CommonUtils.isEmpty(this.hform.HInterID)) {
+					uni.showToast({
+						icon: 'none',
+						title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�'
+					})
+					return false
+				}
+				if (CommonUtils.isEmpty(this.hform.HBillNo)) {
+					uni.showToast({
+						icon: 'none',
+						title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�'
+					})
+					return false
+				}
+				if (this.listData.length < 1) {
+					uni.showToast({
+						icon: 'none',
+						title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�'
+					})
+					return false
+				}
+				return true
+			},
+
+			// 鍒犻櫎閫変腑琛�
+			cmdDelete() {
+				if (this.selectedRows.length != 1) {
+					return uni.showToast({
+						icon: 'none',
+						title: '璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�'
+					})
+				}
+				uni.showModal({
+					title: '鍒犻櫎纭',
+					content: '纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!',
+					success: ({
+						confirm
+					}) => {
+						if (confirm) {
+							CommonUtils.doRequest2({
+								url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+								data: {
+									HInterID: this.hform.HInterID,
+									HBillType: this.HBillType,
+									HBarCode: this.selectedRows[0].HBarCode
+								},
+								resFunction: (res) => {
+									let {
+										data,
+										count,
+										Message
+									} = res.data
+									if (count == 1) {
+										CommonUtils.playSound(1)
+										uni.showToast({
+											icon: 'none',
+											title: Message
+										})
+										this.DisBillEntryList()
+									} else {
+										CommonUtils.playSound(0)
+										uni.showToast({
+											icon: 'none',
+											title: Message
+										})
+									}
+								}
+							})
+						}
+					}
+				})
+			},
+
+			// 鎻愪氦鍗曟嵁
+			cmdSubmit() {
+				let checkRes = this.submitPreCheck()
+				if (!checkRes) return
+
+				this.EnableSubmit = false
+				CommonUtils.doRequest2({
+					url: '/WEBSController/set_SavePackUnionBill_Json',
+					data: {
+						"HInterID": this.hform.HInterID,
+						"HBillType": this.HBillType,
+						"HBillNo": this.hform.HBillNo,
+						"HBarCode_Pack": this.HBarCode_Pack,
+						"HMaker": this.hform.HMaker,
+						"HStockOrgID": this.hform.HStockOrgID
+					},
+					resFunction: (res) => {
+						let {
+							data,
+							count,
+							Message
+						} = res.data
+						if (count == 1) {
+							this.Sc_ICMOBillWorkQtyStatus_Save()
+							uni.showModal({
+								title: '娓╅Θ鎻愮ず',
+								content: Message,
+								confirmText: "鏂板",
+								cancelText: '鍏抽棴',
+								success: ({
+									confirm,
+									cancel
+								}) => {
+									if (confirm) {
+										uni.redirectTo({
+											url: "/pages/zhuangxiangdan/form"
+										})
+									}
+									if (cancel) {
+										uni.navigateBack()
+									}
+								}
+							})
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: Message
+							})
+						}
+					}
+				})
+			},
+			//鑷姩鐢熶骇浜ч噺姹囨姤鍗�
+			Sc_ICMOBillWorkQtyStatus_Save() {
+				CommonUtils.doRequest2({
+					url: "/WEBSController/Sc_ICMOBillWorkQtyStatus_Tmp_Save",
+					data: {
+						"HInterID": this.hform.HInterID
+					},
+					resFunction: (d) => {
+						let {
+							count,
+							data,
+							Message
+						} = d.data
+						if (count == 1) {
+
+						} else {
+							uni.showModal({
+								title: "娓╅Θ鎻愮ず",
+								showCancel: false,
+								content: Message
+							})
+						}
+					}
+				})
+			},
+
+			// 閫�鍑洪〉闈�
+			cmdExit() {
+				uni.navigateBack()
+			}
+		},
+
+		// ==================== 鐢熷懡鍛ㄦ湡 ====================
+		async onReady() {
+			// 璁$畻琛ㄦ牸楂樺害
+			// #ifndef MP-WEIXIN
+			let query = uni.createSelectorQuery().in(this)
+			query.select("#bottom-btn").boundingClientRect((data) => {
+				if (data) this.bottomBtnTop = data.top
+			}).exec();
+			query.select("#list-table").boundingClientRect((data) => {
+				if (data) this.listTableTop = data.top
+			}).exec();
+			// #endif
+		},
+
+		onLoad(e) {
+			// 鍒濆鍖栧弬鏁�
+			this.BarCodeType = e.BarCodeType || 1
+			this.OperationType = e.OperationType || 1
+			this.HBarCode_Pack = e.HBarCode_Pack_Temp || ""
+			this.hform.HSourceBillNo = e.HSourceBillNo || ""
+
+			// 鏍规嵁鎿嶄綔绫诲瀷鍒濆鍖栨暟鎹�
+			if (this.OperationType == 1) {
+				this.getMaxNo() // 鏂板妯″紡锛氳幏鍙栨柊鍗曟嵁鍙�
+				// 鍒濆鍖栨椂鑱氱劍鍒版簮鍗曞崟鍙�
+				this.HSourcebillNoFocus = true
+			} else if (this.OperationType == 2) {
+				this.disableBarCodePack = false
+				this.disableBarCode = false
+				this.GetMeesageByBarCode_Pack(this.HBarCode_Pack) // 缂撳瓨妯″紡锛氬姞杞藉凡鏈夋暟鎹�
+				this.DisBillEntryList()
+				this.tabs = 0
+			}
+
+			// 榛樿鑱氱劍鍒扮鏉$爜杈撳叆妗�
+			//this.HBarCodePackFocusRefresh()
+			uni.$on('BillSelectComplete', (e) => {
+				console.log("鎺ユ敹鍒扮殑婧愬崟: ", e.HBillNo)
+				this.getSourceBarCodeData(e.HBillNo)
+				this.$refs.billList.exit()
+			})
+		},
+		onUnload() {
+			uni.$off('BillSelectComplete')
+		}
+	}
+</script>
+
+<style lang="scss">
+	input {
+		width: inherit;
+		padding: 8rpx 20rpx;
+		font-size: 30rpx;
+	}
+
+	.form {
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+
+		.form-base-info {
+			display: flex;
+			flex-direction: column;
+			gap: 10rpx;
+			box-sizing: border-box;
+			padding: 30rpx;
+		}
+
+		.bill-info {
+			display: flex;
+			flex-direction: column;
+			gap: 10rpx;
+			box-sizing: border-box;
+			padding: 16rpx 30rpx;
+		}
+
+		.form-item {
+			display: flex;
+			flex-direction: row;
+			gap: 10rpx;
+
+			.title {
+				width: 5rem;
+				flex-shrink: 0;
+			}
+
+			.right {
+				flex: 1;
+				border-radius: 22rpx;
+				border: 1px solid #acacac;
+			}
+
+			.disabled {
+				border: 1px solid #e4e4e4;
+				background-color: #e4e4e4;
+			}
+
+			.right-icon {
+				flex-shrink: 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.icon-wrapper {
+				background-color: #3A78FF;
+				border-radius: 100%;
+				width: 52rpx;
+				height: 52rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-shrink: 0;
+
+				.uni-icons {
+					color: #fff !important;
+				}
+			}
+
+			.icon-wrapper[disabled] {
+				background-color: rgba(228, 228, 228, 1);
+				pointer-events: none;
+				touch-action: none;
+			}
+		}
+	}
+
+	.tabs {
+		width: 100%;
+		display: flex;
+		border-bottom: 1px solid #ddd;
+		margin: 20rpx 0;
+
+		view {
+			width: 25%;
+			font-size: 30rpx;
+			color: #555;
+			text-align: center;
+			padding: 16rpx 0;
+		}
+
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
+
+	.bottom-btn {
+		width: 100%;
+		box-sizing: border-box;
+		// height: 120rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+		padding: 30rpx 40rpx 40rpx 40rpx;
+		display: flex;
+		flex-direction: row;
+		gap: 10rpx;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #3A78FF;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #acacac;
+			color: #fff;
+			// position: absolute;
+			// right: 120rpx;
+		}
+
+		.btn-d {
+			background-color: #ff8901;
+			color: #fff;
+		}
+	}
+
+	.right-icon.disabled {
+		background-color: #ccc !important;
+		color: #666 !important;
+		cursor: not-allowed;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/zhuangxiangdan/table.vue b/pages/zhuangxiangdan/table.vue
new file mode 100644
index 0000000..b08c7ea
--- /dev/null
+++ b/pages/zhuangxiangdan/table.vue
@@ -0,0 +1,487 @@
+<template>
+	<view class="content">
+		<view class="tabs">
+			<view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+		</view>
+
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+		<view class="form" v-if="tabs == 0">
+			<view class="buttons" @tap="add">
+				<uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+			</view>
+		</view>
+
+		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+			<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鎵樻潯鐮�">
+						<text>鎵樻潯鐮侊細</text>{{item.鎵樻潯鐮亇}
+					</view>
+					<view class="detail" v-if="item.HSourceBillNo">
+						<text>婧愬崟鍙凤細</text>{{item.HSourceBillNo}}
+					</view>
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鍒跺崟鏃ユ湡">
+						<text>鍒跺崟鏃ユ湡锛�</text>{{ item.鍒跺崟鏃ユ湡.split('T')[0] }}
+					</view>
+					<view class="detail" v-if="item.缁勭粐">
+						<text>缁勭粐锛�</text>{{item.缁勭粐}}
+					</view>
+				</view>
+
+				<view class="more">
+					<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+						<uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+					</view>
+					<view class="part" style="color: #da0000;" @tap.stop="del(item)">
+						<uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+					</view>
+				</view>
+			</uni-card>
+		</view>
+		<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+			<uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+				@tap="showDetail = showDetail==index?-1:index">
+				<view class="card-detail">
+					<view class="detail" v-if="item.鐘舵��">
+						<text>鐘舵�侊細</text>{{item.鐘舵�亇}
+					</view>
+					<view class="detail" v-if="item.鍒跺崟浜�">
+						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+					</view>
+					<view class="detail" v-if="item.鏁伴噺">
+						<text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+					</view>
+					<view class="detail" v-if="item.婧愬崟鍗曞彿">
+						<text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+					</view>
+					<view class="detail" v-if="item.鐗╂枡浠g爜">
+						<text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
+					</view>
+					<view class="detail" v-if="item.鐗╂枡鍚嶇О">
+						<text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+					</view>
+					<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+						<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+					</view>
+					<view class="detail" v-if="item.缁勭粐">
+						<text>缁勭粐锛�</text>{{item.缁勭粐}}
+					</view>
+				</view>
+
+				<view class="more">
+					<view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
+						<uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+					</view>
+					<view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+						<uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+					</view>
+				</view>
+			</uni-card>
+		</view>
+
+		<view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
+		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+		<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+	</view>
+</template>
+
+<script>
+	import dayjs from "dayjs";
+	import {
+		getUserInfo
+	} from "@/utils/auth.js";
+	import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+	export default {
+		data() {
+			return {
+				userInfo: getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				tabs: 0,
+				urls: '/WEBSController/GetSc_PackUnionBill_TempList_Json',
+				MvarReportTitle: '瑁呯鍗曠紦瀛樺垪琛�',
+				hform: {
+					// HBillNo: '',
+					// HSourceBillNo: '',
+					HBillType: 3783,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				},
+				sWhere: '',
+				listData: [],
+				showList: [],
+				showDetail: -1,
+
+				page: 1,
+			}
+		},
+		components: {
+			BarCodePopupVue
+		},
+		onShow() {
+			//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+			this.CheckModRight()
+			this.changeTab(0)
+			console.log(this.userInfo, uni.getStorageSync('HUserName'))
+		},
+		onReachBottom: function() {
+			this.page++
+			setTimeout(() => {
+				this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+			}, 100)
+		},
+		onPullDownRefresh: function() {
+			this.clear()
+			setTimeout(() => {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		methods: {
+			async qrCodeDisplay(item) {
+				this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+				await this.$nextTick()
+				this.$refs.barcodePopup.open()
+			},
+			CheckModRight() {
+				uni.request({
+					url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+					data: {
+						ModRightName: 'CE_PackUnion',
+						HUserName: uni.getStorageSync('HUserName')
+					},
+					success: (res) => {
+						if (res.data.count == 1) {} else {
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			getPage(page, list) {
+				let sindex = (parseInt(page) - 1) * 20
+				let eindex = parseInt(page) * 20
+				let newList = list.slice(sindex, eindex)
+				return newList
+			},
+			changeTab(e) {
+				this.tabs = e
+				this.page = 1
+				this.showList = []
+
+				if (this.tabs == 0) {
+					this.urls = '/WEBSController/GetSc_PackUnionBill_TempList_Json'
+				}
+				// if(this.tabs == 1){
+				// 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+				// }
+				this.getList()
+			},
+			getList() {
+				uni.showLoading({
+					title: '鍔犺浇涓�...'
+				})
+				uni.request({
+					url: this.serverUrl + this.urls,
+					data: this.hform,
+					success: (res) => {
+						console.log(1, res);
+						if (res.data.count == 1) {
+							this.listData = res.data.data
+							this.showList = this.getPage(this.page, this.listData)
+							setTimeout(() => {
+								uni.hideLoading()
+							}, 1000)
+						} else {
+							uni.hideLoading()
+							this.listData = []
+							uni.showToast({
+								title: res.data.Message,
+								icon: 'none'
+							})
+						}
+					},
+					fail: (res) => {
+						console.log(res);
+						uni.hideLoading()
+						uni.showToast({
+							title: '鎺ュ彛璇锋眰澶辫触',
+							icon: 'none'
+						})
+					},
+				});
+			},
+			search() {
+				this.sWhere = ''
+				this.listData = []
+				this.page = 1
+				this.showList = []
+
+				console.log(this.hform)
+				this.getList()
+			},
+			clear() {
+				this.listData = []
+				this.page = 1
+				this.showList = []
+
+				this.sWhere = ''
+				this.hform = {
+					HBillNo: '',
+					HSourceBillNo: '',
+					HBillType: 3783,
+					HMaker: uni.getStorageSync('HUserName'),
+					HStockOrgID: uni.getStorageSync('OrganizationID'),
+				}
+				this.getList()
+			},
+			add() {
+				uni.navigateTo({
+					url: './form?OperationType=1'
+				})
+			},
+			//缂栬緫
+			edit(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: './form?OperationType=2&HBarCode_Pack_Temp=' + item["HBarCode_Pack"] + '&HSourceBillNo=' +item["HSourceBillNo"],
+				})
+			},
+			//鍒犻櫎
+			del(item) {
+				// console.log(item.hmainid,uni.getStorageSync('HUserName'))
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.request({
+								url: this.serverUrl +
+									'/WEBSController/DeleteTemp_PackUnionBill_Json',
+								data: {
+									HInterID: item.HInterID,
+								},
+								success: (res) => {
+									console.log(1, res);
+									if (res.data.count == 1) {
+										this.clear()
+									}
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.hideLoading()
+									uni.showToast({
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
+									})
+								},
+							});
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+			//鎾ら攢
+			revoke(item) {
+				// console.log(item.hmainid,uni.getStorageSync('HUserName'))
+				uni.showModal({
+					title: '鎻愮ず',
+					content: '鏄惁纭鎾ら攢',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+							uni.request({
+								url: this.serverUrl +
+									'/WEBSController/set_DeleteICStockBillAndWMS_Json',
+								data: {
+									HInterID: item.HInterID,
+									HBillNo: item.鍗曟嵁鍙�,
+									HBillType: this.hform.HBillType,
+									HMaker: uni.getStorageSync('HUserName'),
+									MvarReportTitle: this.MvarReportTitle,
+								},
+								success: (res) => {
+									console.log(1, res);
+									if (res.data.count == 1) {
+										this.clear()
+									}
+									uni.showToast({
+										title: res.data.Message,
+										icon: 'none'
+									})
+								},
+								fail: (res) => {
+									console.log(res);
+									uni.hideLoading()
+									uni.showToast({
+										title: '鎺ュ彛璇锋眰澶辫触',
+										icon: 'none'
+									})
+								},
+							});
+						} else if (res.cancel) {
+							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.form {
+		width: 640rpx;
+		margin: 20rpx auto;
+		margin-top: 90rpx;
+	}
+
+	.tabs {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		z-index: 9;
+		display: flex;
+		background-color: #e5e5e5;
+
+		view {
+			width: 50%;
+			font-size: 30rpx;
+			color: #333;
+			text-align: center;
+			padding: 16rpx 0;
+		}
+
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
+
+	.buttons {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #acacac;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+
+		.title {
+			width: 180rpx;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+
+		.righton {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	.list {
+		width: 100%;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+
+			.detail {
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.more {
+			color: #888;
+			font-size: 26rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file

--
Gitblit v1.9.1