From 87668fec3d068f91aedc0585f7ba98eadffbc142 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 09 九月 2025 10:08:37 +0800
Subject: [PATCH] 完成采样单 还样单编写页面UI 和 接口 修改 收料通知单 打印模板

---
 pages/quyangdan/table.vue           |  367 ++++
 pages/saomachuku/table.vue          |    2 
 pages/huanyangdan/table.vue         |  574 ++++++++
 pages.json                          | 1563 +++++++++++-----------
 pages/quyangdan/form.vue            |  817 +++++++++++
 pages/huanyangdan/form.vue          |  786 +++++++++++
 pages/shouliaotongzhi/table_son.vue |    4 
 7 files changed, 3,277 insertions(+), 836 deletions(-)

diff --git a/pages.json b/pages.json
index 30fa352..6b8b6ae 100644
--- a/pages.json
+++ b/pages.json
@@ -2,780 +2,791 @@
     "pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
         {
             "path": "pages/index/login",
-			"style": {
-				"navigationBarTitleText": "鐧诲綍",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "棣栭〉",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/index/tab1",
-			"style": {
-				"navigationBarTitleText": "杞﹂棿宸ュ簭"
-			}
-		},
-		{
-			"path": "pages/index/tab2",
-			"style": {
-				"navigationBarTitleText": "鍗曟嵁鍒楄〃"
-			}
-		},
-		{
-			"path": "pages/index/mine",
-			"style": {
-				"navigationBarTitleText": "涓汉涓績",
-				// "navigationStyle": "custom"
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#65a2fb"
-			}
-		},
-		{
-			"path": "pages/shebeilvli/form",
-			"style": {
-				"navigationBarTitleText": "璁惧鐘舵�佸垎鏋�"
-			}
-		},
-		{
-			"path": "pages/shebeilvli/table",
-			"style": {
-				"navigationBarTitleText": "璁惧灞ュ巻",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeilvli/table_son",
-			"style": {
-				"navigationBarTitleText": "璁惧灞ュ巻瀛愯〃"
-			}
-		},
-		{
-			"path": "pages/baoyangjihua/form",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�"
-			}
-		},
-		{
-			"path": "pages/baoyangjihua/table",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baoyangjihua/table_son",
-			"style": {
-				"navigationBarTitleText": "淇濆吇璁″垝瀛愯〃"
-			}
-		},
-		{
-			"path": "pages/baoyangjilu/form",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/baoyangjilu/table",
-			"style": {
-				"navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baoyangjilu/table_son",
-			"style": {
-				"navigationBarTitleText": "淇濆吇璁板綍瀛愯〃"
-			}
-		},
-		{
-			"path": "pages/guzhangdengji/form",
-			"style": {
-				"navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�"
-			}
-		},
-		{
-			"path": "pages/guzhangdengji/table",
-			"style": {
-				"navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeidangan/form",
-			"style": {
-				"navigationBarTitleText": "璁惧妗f"
-			}
-		},
-		{
-			"path": "pages/shebeidangan/table",
-			"style": {
-				"navigationBarTitleText": "璁惧妗f",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiweixiu/form",
-			"style": {
-				"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�"
-			}
-		},
-		{
-			"path": "pages/shebeiweixiu/table",
-			"style": {
-				"navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaigxIn/form",
-			"style": {
-				"navigationBarTitleText": "濮斿宸ュ簭鍙戝嚭鍗�"
-			}
-		},
-		{
-			"path": "pages/weiwaigxIn/table",
-			"style": {
-				"navigationBarTitleText": "濮斿宸ュ簭鍙戝嚭鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaigxOut/form",
-			"style": {
-				"navigationBarTitleText": "濮斿宸ュ簭鎺ユ敹鍗�"
-			}
-		},
-		{
-			"path": "pages/weiwaigxOut/table",
-			"style": {
-				"navigationBarTitleText": "濮斿宸ュ簭鎺ユ敹鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaigxOut/firstCheck",
-			"style": {
-				"navigationBarTitleText": "棣栦欢妫�楠屽崟",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/gongxuIn/form",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
-			}
-		},
-		{
-			"path": "pages/gongxuIn/table",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/gongxuOut/form",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
-			}
-		},
-		{
-			"path": "pages/gongxuOut/table",
-			"style": {
-				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiguanli/form",
-			"style": {
-				"navigationBarTitleText": "璁惧绠$悊",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiguanli/table",
-			"style": {
-				"navigationBarTitleText": "璁惧绠$悊",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiguanli/list",
-			"style": {
-				"navigationBarTitleText": "宸ュ崟鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baogong/form",
-			"style": {
-				"navigationBarTitleText": "浜ч噺姹囨姤鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/baogong/table",
-			"style": {
-				"navigationBarTitleText": "鎶ュ伐骞冲彴",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baogong/list",
-			"style": {
-				"navigationBarTitleText": "宸ュ崟鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/baogong/abnormal",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/yichang/table",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉鍗曞垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/yichang/form",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉鍗�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/yichang/list",
-			"style": {
-				"navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigouruku/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigouruku/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂欏崟",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/table",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/table",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐у垪琛�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐у崟",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shouliaotongzhi/table",
-			"style": {
-				"navigationBarTitleText": "鏀舵枡閫氱煡鍗�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shouliaotongzhi/table_son",
-			"style": {
-				"navigationBarTitleText": "鏉$爜鐢熸垚",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shengchanlingliao/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡鏍¢獙鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanlingliao/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shengchanruku/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鏍¢獙鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanruku/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/shengchandiaobo/table",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇璋冩嫧鏍¢獙鍒楄〃",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchandiaobo/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/labelPrinter/index",
-			"style": {
-				"navigationBarTitleText": "鏍囩鎵撳嵃"
-			}
-		},
-		{
-			"path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
-			"style": {
-				"navigationBarTitleText": "璁惧杩愯鐘舵��",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiyunxingzhuangtai/detail",
-			"style": {
-				"navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
-			}
-		},
-		{
-			"path": "pages/mujvzhuangtai/mujvzhuangtai",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/mujvzhuangtai/detail",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
-			}
-		},
-		{
-			"path": "pages/tiaomachaima/tiaomachaima",
-			"style": {
-				"navigationBarTitleText": "鏉$爜鎷嗙爜"
-			}
-		},
-		{
-			"path": "pages/tiaomachaima/tiaomachaima2",
-			"style": {
-				"navigationBarTitleText": "鏉$爜鎷嗙爜2"
-			}
-		},
-		{
-			"path": "pages/wuliaosaoma/wuliaosaoma",
-			"style": {
-				"navigationBarTitleText": "鐗╂枡娓呭崟"
-			}
-		},
-		{
-			"path": "pages/wuliaosaoma/detail",
-			"style": {
-				"navigationBarTitleText": "鏉$爜妗f"
-			}
-		},
-		{
-			"path": "pages/caigouruku/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigouruku/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigoutuiliao/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/table",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshouchuku/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟"
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/table",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshoutuihuo/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞��璐у崟"
-			}
-		},
-		{
-			"path": "pages/qitachuku/qitachuku",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachuku/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
-			}
-		},
-		{
-			"path": "pages/qitaruku/qitaruku",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitaruku/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path": "pages/tiaomadaying/tiaomadaying",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鏉$爜鎵撳嵃"
-			}
-		},
-		{
-			"path": "pages/caigoudingdan/generate",
-			"style": {
-				"navigationBarTitleText": "鏉$爜鐢熸垚"
-			}
-		},
-		{
-			"path": "pages/caigoudingdan/caigoudingdan",
-			"style": {
-				"navigationBarTitleText": "閲囪喘璁㈠崟"
-			}
-		},
-		{
-			"path": "pages/MJGL/shangmudan/table",
-			"style": {
-				"navigationBarTitleText": "涓婃ā鍗�"
-			}
-		},
-		{
-			"path": "pages/MJGL/shangmudan/form",
-			"style": {
-				"navigationBarTitleText": "涓婃ā鍗�"
-			}
-		},
-		{
-			"path": "pages/qitachukujiaoyan/qitachukujiaoyan",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitachukujiaoyan/detail",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/shengchanbuliaojiaoyan/CacheList",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shengchanbuliaojiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/xiaoshouchukujiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/xiaoshouchukujiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
-			}
-		},
-		{
-			"path": "pages/weiwailingliaojiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwailingliaojiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/caigourukujiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/caigourukujiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitarukujiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitarukujiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
-			}
-		},
-		{
-			"path": "pages/weiwaibuliaojiaoyan/table",
-			"style": {
-				"navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/weiwaibuliaojiaoyan/form",
-			"style": {
-				"navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
-			}
-		},
-		{
-			"path" : "pages/shengchanlingliaoshengdan/table",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐢熶骇棰嗘枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path" : "pages/shengchanlingliaoshengdan/form",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐢熶骇棰嗘枡鍗�"
-			}
-		},
-		{
-			"path" : "pages/weiwailingliao/table",
-			"style" : 
-			{
-				"navigationBarTitleText" : "濮斿棰嗘枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path" : "pages/weiwailingliao/form",
-			"style" : 
-			{
-				"navigationBarTitleText" : "濮斿棰嗘枡鍗�"
-			}
-		},
-		{
-			"path" : "pages/shengchanrukushengdan/table",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐢熶骇鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path" : "pages/shengchanrukushengdan/form",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐢熶骇鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path" : "pages/shengchanbuliao/table",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐢熶骇琛ユ枡",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path" : "pages/shengchanbuliao/form",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐢熶骇琛ユ枡鍗�"
-			}
-		},
-		{
-			"path" : "pages/qitaruku_v2/table",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍏朵粬鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path" : "pages/qitaruku_v2/form",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍏朵粬鍏ュ簱鍗�"
-			}
-		},
-		{
-			"path" : "pages/qitachuku_v2/table",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍏朵粬鍑哄簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path" : "pages/qitachuku_v2/form",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍏朵粬鍑哄簱鍗�"
-			}
-		},
-		{
-			"path" : "pages/zhijiediaobo/table",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐩存帴璋冩嫧",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path" : "pages/zhijiediaobo/form",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐩存帴璋冩嫧鍗�"
-			}
-		},
-		{
-			"path" : "pages/xiugaimima/index",
-			"style" : 
-			{
-				"navigationBarTitleText" : "淇敼瀵嗙爜"
-			}
-		}
-	],
-	"tabBar": {
-		"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
-		"backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/home.png",
-				"selectedIconPath": "static/tabBar/home-default.png",
-				"text": "浠撳偍绠$悊"
-			},
-			{
-				"pagePath": "pages/index/tab1",
-				"iconPath": "static/tabBar/icon1.png",
-				"selectedIconPath": "static/tabBar/icon1-default.png",
-				"text": "杞﹂棿宸ュ簭"
-			},
-			{
-				"pagePath": "pages/index/tab2",
-				"iconPath": "static/tabBar/icon2.png",
-				"selectedIconPath": "static/tabBar/icon2-default.png",
-				"text": "鍗曟嵁鍒楄〃"
-			},
-			{
-				"pagePath": "pages/index/mine",
-				"iconPath": "static/tabBar/user.png",
-				"selectedIconPath": "static/tabBar/user-default.png",
-				"text": "鎴戠殑"
-			}
-		]
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "璁惧绠$悊",
-		"navigationBarBackgroundColor": "#3A78FF",
-		"backgroundColor": "#F8F8F8",
-		"pageOrientation": "default"
-	},
-	"uniIdRouter": {}
+            "style": {
+                "navigationBarTitleText": "鐧诲綍",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/index/index",
+            "style": {
+                "navigationBarTitleText": "棣栭〉",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/index/tab1",
+            "style": {
+                "navigationBarTitleText": "杞﹂棿宸ュ簭"
+            }
+        },
+        {
+            "path": "pages/index/tab2",
+            "style": {
+                "navigationBarTitleText": "鍗曟嵁鍒楄〃"
+            }
+        },
+        {
+            "path": "pages/index/mine",
+            "style": {
+                "navigationBarTitleText": "涓汉涓績",
+                // "navigationStyle": "custom"
+                "navigationBarTextStyle": "white",
+                "navigationBarBackgroundColor": "#65a2fb"
+            }
+        },
+        {
+            "path": "pages/shebeilvli/form",
+            "style": {
+                "navigationBarTitleText": "璁惧鐘舵�佸垎鏋�"
+            }
+        },
+        {
+            "path": "pages/shebeilvli/table",
+            "style": {
+                "navigationBarTitleText": "璁惧灞ュ巻",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeilvli/table_son",
+            "style": {
+                "navigationBarTitleText": "璁惧灞ュ巻瀛愯〃"
+            }
+        },
+        {
+            "path": "pages/baoyangjihua/form",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�"
+            }
+        },
+        {
+            "path": "pages/baoyangjihua/table",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁″垝鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baoyangjihua/table_son",
+            "style": {
+                "navigationBarTitleText": "淇濆吇璁″垝瀛愯〃"
+            }
+        },
+        {
+            "path": "pages/baoyangjilu/form",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/baoyangjilu/table",
+            "style": {
+                "navigationBarTitleText": "璁惧淇濆吇璁板綍鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baoyangjilu/table_son",
+            "style": {
+                "navigationBarTitleText": "淇濆吇璁板綍瀛愯〃"
+            }
+        },
+        {
+            "path": "pages/guzhangdengji/form",
+            "style": {
+                "navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�"
+            }
+        },
+        {
+            "path": "pages/guzhangdengji/table",
+            "style": {
+                "navigationBarTitleText": "璁惧鏁呴殰鐧昏琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeidangan/form",
+            "style": {
+                "navigationBarTitleText": "璁惧妗f"
+            }
+        },
+        {
+            "path": "pages/shebeidangan/table",
+            "style": {
+                "navigationBarTitleText": "璁惧妗f",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiweixiu/form",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�"
+            }
+        },
+        {
+            "path": "pages/shebeiweixiu/table",
+            "style": {
+                "navigationBarTitleText": "璁惧缁翠慨璁板綍鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaigxIn/form",
+            "style": {
+                "navigationBarTitleText": "濮斿宸ュ簭鍙戝嚭鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwaigxIn/table",
+            "style": {
+                "navigationBarTitleText": "濮斿宸ュ簭鍙戝嚭鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaigxOut/form",
+            "style": {
+                "navigationBarTitleText": "濮斿宸ュ簭鎺ユ敹鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwaigxOut/table",
+            "style": {
+                "navigationBarTitleText": "濮斿宸ュ簭鎺ユ敹鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaigxOut/firstCheck",
+            "style": {
+                "navigationBarTitleText": "棣栦欢妫�楠屽崟",
+                "enablePullDownRefresh": true
+            }
+        }, {
+            "path": "pages/gongxuIn/form",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
+            }
+        },
+        {
+            "path": "pages/gongxuIn/table",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
+                "enablePullDownRefresh": true
+            }
+        }, {
+            "path": "pages/gongxuOut/form",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
+            }
+        },
+        {
+            "path": "pages/gongxuOut/table",
+            "style": {
+                "navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiguanli/form",
+            "style": {
+                "navigationBarTitleText": "璁惧绠$悊",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiguanli/table",
+            "style": {
+                "navigationBarTitleText": "璁惧绠$悊",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiguanli/list",
+            "style": {
+                "navigationBarTitleText": "宸ュ崟鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baogong/form",
+            "style": {
+                "navigationBarTitleText": "浜ч噺姹囨姤鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/baogong/table",
+            "style": {
+                "navigationBarTitleText": "鎶ュ伐骞冲彴",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baogong/list",
+            "style": {
+                "navigationBarTitleText": "宸ュ崟鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/baogong/abnormal",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/yichang/table",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉鍗曞垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/yichang/form",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/yichang/list",
+            "style": {
+                "navigationBarTitleText": "寮傚父鍙嶉澶勭悊鍗曞垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigouruku/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigouruku/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂欏崟",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/table",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/table",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐у垪琛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐у崟",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shouliaotongzhi/table",
+            "style": {
+                "navigationBarTitleText": "鏀舵枡閫氱煡鍗�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shouliaotongzhi/table_son",
+            "style": {
+                "navigationBarTitleText": "鏉$爜鐢熸垚",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shengchanlingliao/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鏍¢獙鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanlingliao/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shengchanruku/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鏍¢獙鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanruku/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/shengchandiaobo/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇璋冩嫧鏍¢獙鍒楄〃",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchandiaobo/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇璋冩嫧鍗曟牎楠�",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/labelPrinter/index",
+            "style": {
+                "navigationBarTitleText": "鏍囩鎵撳嵃"
+            }
+        },
+        {
+            "path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
+            "style": {
+                "navigationBarTitleText": "璁惧杩愯鐘舵��",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shebeiyunxingzhuangtai/detail",
+            "style": {
+                "navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
+            }
+        },
+        {
+            "path": "pages/mujvzhuangtai/mujvzhuangtai",
+            "style": {
+                "navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/mujvzhuangtai/detail",
+            "style": {
+                "navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
+            }
+        },
+        {
+            "path": "pages/tiaomachaima/tiaomachaima",
+            "style": {
+                "navigationBarTitleText": "鏉$爜鎷嗙爜"
+            }
+        },
+        {
+            "path": "pages/tiaomachaima/tiaomachaima2",
+            "style": {
+                "navigationBarTitleText": "鏉$爜鎷嗙爜2"
+            }
+        },
+        {
+            "path": "pages/wuliaosaoma/wuliaosaoma",
+            "style": {
+                "navigationBarTitleText": "鐗╂枡娓呭崟"
+            }
+        },
+        {
+            "path": "pages/wuliaosaoma/detail",
+            "style": {
+                "navigationBarTitleText": "鏉$爜妗f"
+            }
+        },
+        {
+            "path": "pages/caigouruku/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigouruku/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigoutuiliao/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘閫�鏂欏崟"
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/table",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshouchuku/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟"
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/table",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshoutuihuo/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞��璐у崟"
+            }
+        },
+        {
+            "path": "pages/qitachuku/qitachuku",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachuku/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+            }
+        },
+        {
+            "path": "pages/qitaruku/qitaruku",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitaruku/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/tiaomadaying/tiaomadaying",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鏉$爜鎵撳嵃"
+            }
+        },
+        {
+            "path": "pages/caigoudingdan/generate",
+            "style": {
+                "navigationBarTitleText": "鏉$爜鐢熸垚"
+            }
+        },
+        {
+            "path": "pages/caigoudingdan/caigoudingdan",
+            "style": {
+                "navigationBarTitleText": "閲囪喘璁㈠崟"
+            }
+        },
+        {
+            "path": "pages/MJGL/shangmudan/table",
+            "style": {
+                "navigationBarTitleText": "涓婃ā鍗�"
+            }
+        },
+        {
+            "path": "pages/MJGL/shangmudan/form",
+            "style": {
+                "navigationBarTitleText": "涓婃ā鍗�"
+            }
+        },
+        {
+            "path": "pages/qitachukujiaoyan/qitachukujiaoyan",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachukujiaoyan/detail",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/shengchanbuliaojiaoyan/CacheList",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanbuliaojiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/xiaoshouchukujiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撴牎楠�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/xiaoshouchukujiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "閿�鍞嚭搴撳崟鏍¢獙"
+            }
+        },
+        {
+            "path": "pages/weiwailingliaojiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwailingliaojiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/caigourukujiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/caigourukujiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "閲囪喘鍏ュ簱鍗曟牎楠�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitarukujiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitarukujiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/weiwaibuliaojiaoyan/table",
+            "style": {
+                "navigationBarTitleText": "濮斿琛ユ枡鏍¢獙",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwaibuliaojiaoyan/form",
+            "style": {
+                "navigationBarTitleText": "濮斿琛ユ枡鍗曟牎楠�"
+            }
+        },
+        {
+            "path": "pages/shengchanlingliaoshengdan/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanlingliaoshengdan/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇棰嗘枡鍗�"
+            }
+        },
+        {
+            "path": "pages/weiwailingliao/table",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/weiwailingliao/form",
+            "style": {
+                "navigationBarTitleText": "濮斿棰嗘枡鍗�"
+            }
+        },
+        {
+            "path": "pages/shengchanrukushengdan/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanrukushengdan/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/shengchanbuliao/table",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/shengchanbuliao/form",
+            "style": {
+                "navigationBarTitleText": "鐢熶骇琛ユ枡鍗�"
+            }
+        },
+        {
+            "path": "pages/qitaruku_v2/table",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitaruku_v2/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+            }
+        },
+        {
+            "path": "pages/qitachuku_v2/table",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/qitachuku_v2/form",
+            "style": {
+                "navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+            }
+        },
+        {
+            "path": "pages/zhijiediaobo/table",
+            "style": {
+                "navigationBarTitleText": "鐩存帴璋冩嫧",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/zhijiediaobo/form",
+            "style": {
+                "navigationBarTitleText": "鐩存帴璋冩嫧鍗�"
+            }
+        },
+        {
+            "path": "pages/xiugaimima/index",
+            "style": {
+                "navigationBarTitleText": "淇敼瀵嗙爜"
+            }
+        },
+        {
+            "path": "pages/quyangdan/table",
+            "style": {
+                "navigationBarTitleText": "鍙栨牱鍗�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path": "pages/quyangdan/form",
+            "style": {
+                "navigationBarTitleText": "鍙栨牱鍗�"
+            }
+        }, 
+        {
+            "path": "pages/huanyangdan/table",
+            "style": {
+                "navigationBarTitleText": "杩樻牱鍗�",
+                "enablePullDownRefresh": true
+            }
+        }, 
+        {
+            "path": "pages/huanyangdan/form",
+            "style": {
+                "navigationBarTitleText": "杩樻牱鍗�"
+            }
+        }
+    ],
+    "tabBar": {
+        "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+        "selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+        "borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
+        "backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+        "list": [{
+                "pagePath": "pages/index/index",
+                "iconPath": "static/tabBar/home.png",
+                "selectedIconPath": "static/tabBar/home-default.png",
+                "text": "浠撳偍绠$悊"
+            },
+            {
+                "pagePath": "pages/index/tab1",
+                "iconPath": "static/tabBar/icon1.png",
+                "selectedIconPath": "static/tabBar/icon1-default.png",
+                "text": "杞﹂棿宸ュ簭"
+            },
+            {
+                "pagePath": "pages/index/tab2",
+                "iconPath": "static/tabBar/icon2.png",
+                "selectedIconPath": "static/tabBar/icon2-default.png",
+                "text": "鍗曟嵁鍒楄〃"
+            },
+            {
+                "pagePath": "pages/index/mine",
+                "iconPath": "static/tabBar/user.png",
+                "selectedIconPath": "static/tabBar/user-default.png",
+                "text": "鎴戠殑"
+            }
+        ]
+    },
+    "globalStyle": {
+        "navigationBarTextStyle": "white",
+        "navigationBarTitleText": "璁惧绠$悊",
+        "navigationBarBackgroundColor": "#3A78FF",
+        "backgroundColor": "#F8F8F8",
+        "pageOrientation": "default"
+    },
+    "uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/pages/huanyangdan/form.vue b/pages/huanyangdan/form.vue
index 492629a..f95fd20 100644
--- a/pages/huanyangdan/form.vue
+++ b/pages/huanyangdan/form.vue
@@ -1,19 +1,797 @@
 <template>
     <view>
-        
+        <scroll-view scroll-y id="scroll-content" class="scroll-content" :style="{height: scrollContentHeight + 'px'}">
+            <view class="form-item">
+                <view class="title">鏉″舰鐮�:</view>
+                <view class="right">
+                    <input type="text" name="HBarCode" id="HBarCode" v-model="HBarCode"
+                        @confirm="getCode(HBarCode)" />
+                </view>
+                <view class="right-icon" @click="toScanCode">
+                    <uni-icons color="#fff" type="scan" size="24"></uni-icons>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">杩樻牱鏁伴噺:</view>
+                <view class="right">
+                    <input type="number" name="HQty" id="HQty" v-model="hform.HQty" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">杩樻牱鍐呭:</view>
+                <view class="right">
+                    <input type="text" name="HRemark" id="HRemark" v-model="hform.HRemark" />
+                </view>
+            </view>
+
+            
+            <view class="form-item">
+                <view class="title">杩樻牱鍛�:</view>
+                <view class="right">
+                    <uni-combox :candidates="HCheckEmpNameArray" name="HCheckEmpName" id="HCheckEmpName"
+                        placeholder="璇烽�夋嫨杩樻牱鍛�" v-model="hform.HCheckEmpName"
+                        @input="HCheckEmpNameChangeHandler"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">閮ㄩ棬:</view>
+                <view class="right">
+                    <uni-combox :candidates="HDeptNameArray" name="HDeptName" id="HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬"
+                        v-model="hform.HDeptName" @input="HDeptNameChangeHandler"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐢熶骇鐝:</view>
+                <view class="right">
+                    <uni-combox :candidates="HShiftsNameArray" name="HShiftsName" id="HShiftsName" placeholder="璇烽�夋嫨鐢熶骇鐝"
+                        v-model="hform.HShiftsName" @input="HShiftsNameChangeHandler"></uni-combox>
+                </view>
+            </view>
+            
+            <view class="form-item">
+                <view class="title">鍗曟嵁鏃ユ湡:</view>
+                <view class="right disabled">
+                    <input disabled type="text" name="HDate" id="HDate" v-model="hform.HDate" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鍗曟嵁鍙�:</view>
+                <view class="right disabled">
+                    <input disabled type="text" name="HBillNo" id="HBillNo" v-model="hform.HBillNo" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐢熶骇璁㈠崟:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">娴佽浆鍗�:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HProcExchBillNo" name="HProcExchBillNo"
+                        id="HProcExchBillNo" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐗╂枡浠g爜:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HMaterCode" name="HMaterCode" id="HMaterCode" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐗╂枡鍚嶇О:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HMaterName" name="HMaterName" id="HMaterName" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">瑙勬牸鍨嬪彿:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HMaterSpec" name="HMaterSpec" id="HMaterSpec" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">璁¢噺鍗曚綅:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HUnitName" name="HUnitName" id="HUnitName" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">宸ュ簭:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HProcName" name="HProcName" id="HProcName" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">娴佽浆鍗℃壒鍙�:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HBatchNo" name="HBatchNo" id="HBatchNo" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">娴佽浆鍗℃暟閲�:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HProcExchQty" name="HProcExchQty" id="HProcExchQty" />
+                </view>
+            </view>
+        </scroll-view>
+        <view class="bottom-btn" id="bottom-btn">
+            <view><button class="btn-a" size="mini" @tap="submit">鎻愪氦</button></view>
+            <view><button class="btn-b" size="mini" @tap="onAddNewHandler">鏂板</button></view>
+            <view class="placeholder__view"></view>
+            <view><button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button></view>
+        </view>
     </view>
 </template>
 
 <script>
+    import dayjs from 'dayjs'
+    import {
+        getUserInfo
+    } from '../../utils/auth'
+    import {
+        CommonUtils
+    } from '../../utils/common'
+
     export default {
         data() {
             return {
+                pageMeta: {
+                    scrollContentTop: 0,
+                    bottomBtnTop: 0,
+                },
+                refSav: 'Add',
+                showMask: true,
+                TestTypeArray: ["棣栨", "宸℃", "鏈", "瀹為獙"],
+
+                HBillType: '7521',
+                HProcNameArray: [],
+                HProcNameArraySource: [],
+
+                HDeptNameArray: [],
+                HDeptNameArraySource: [],
+
+                HShiftsNameArray: [],
+                HShiftsNameArraySource: [],
+
+                HGroupNameArray: [],
+                HGroupNameArraySource: [],
+
+                HCheckEmpNameArray: [],
+                HCheckEmpNameSource: [],
+
+                HSourceNameArray: [],
+                HSourceNameSource: [],
+
+                HBarCode: '',
+                hform: {
+                    HBarCode: '',
+                    HQty: '',
+                    HRemark: '',
+                    HEmpName: getUserInfo()['HEmpName'],
+                    HEmp: getUserInfo()['HEmpID'],
+                    HDeptName: '',
+                    HDeptID: 0,
+                    HWorkShiftName: '',
+                    HWorkShiftID: 0,
+                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HBillNo: '',
+                    HInterID: '',
+                    HICMOBillNo: '',
+                    HICMOInterID: '',
+                    HICMOEntryID: '',
+                    HProcExchBillNo: '',
+                    HProcExchInterID: '',
+                    HProcExchEntryID: '',
+                    HMaterNumber: '',
+                    HMaterID: 0,
+                    HMaterName: '',
+                    HModel: '',
+                    HUnitName: '',
+                    HUnitID: '',
+                    HProcName: '',
+                    HProcID: '',
+                    HBatchNo: '',
+                    HProcExchQty: '',
+                    HICMOQty: '',
+                    HMaker: getUserInfo()['Czymc'],
+                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+                    HUpDater: '',
+                    HUpDateDate: '',
+                    HChecker: '',
+                    HCheckDate: '',
+                    HDeleteMan: '',
+                    HDeleteDate: '',
+                }
+            }
+        },
+        computed: {
+            scrollContentHeight: {
+                get() {
+                    return this.pageMeta.bottomBtnTop - this.pageMeta.scrollContentTop
+                }
+            }
+        },
+        onReady() {
+            // #ifndef MP-WEIXIN
+            let query = uni.createSelectorQuery().in(this)
+            query.select("#scroll-content").boundingClientRect((data) => {
+                this.pageMeta.scrollContentTop = data.top
+            }).exec()
+            query.select("#bottom-btn").boundingClientRect((data) => {
+                this.pageMeta.bottomBtnTop = data.top
+            }).exec()
+            // #endif
+            // #ifdef MP-WEIXIN
+            // 寰俊涓嶆敮鎸� uni.createSelectorQuery().in(this)
+            // #endif
+
+        },
+        async onLoad(e) {
+            let {
+                operationType
+            } = e
+            if (operationType == 0) {
+                this.getMaxNum()
+                this.refSav = 'Add'
+            } else {
+                this.refSav = 'Update'
+            }
+
+            this.getProcessList()
+            this.get_Gy_WorkShiftList()
+            this.GetGroupList()
+            this.GetEmployeeList()
+            this.getSourceList()
+            this.GetDepartmentList()
+        },
+        methods: {
+            HDeptNameChangeHandler(){
+                let index = this.HDeptNameArray.findIndex(item => item == e)
                 
-            };
+                if (index != -1) {
+                    this.hform.HDeptID = this.HDeptNameArraySource[index]["HItemID"]
+                    this.hform.HDeptName = this.HDeptNameArraySource[index]["HName"]
+                }
+            },
+            GetDepartmentList() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetDepartmentList_Json',
+                    data: {
+                        Department: '',
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message,
+                            code
+                        } = res.data
+                        if (count == 1) {
+                            this.HDeptNameArray = Array.from(data).map(item => item['HName'])
+                            this.HDeptNameArraySource = data
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            HSourceNameChangeHandler(e) {
+                let index = this.HSourceNameArray.findIndex(item => item == e)
+
+                if (index != -1) {
+                    this.hform.HSourceID = this.HSourceNameArraySource[index]["HItemID"]
+                    this.hform.HSourceName = this.HSourceNameArraySource[index]["鐢熶骇璧勬簮"]
+                }
+                
+                console.log('this.hform: ',this.hform);
+            },
+            // 鑾峰彇鐢熶骇璧勬簮
+            getSourceList() {
+                CommonUtils.doRequest2({
+                    url: '/api/newBill/getSourceList',
+                    data: {
+                        sWhere: '',
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            msg,
+                            code
+                        } = res.data
+                        if (code == 1) {
+                            let data1 = data.Gy_Source
+                            this.HSourceNameArray = Array.from(data1).map(item => item['鐢熶骇璧勬簮'])
+                            this.HSourceNameArraySource = data1
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            HCheckEmpNameChangeHandler(e) {
+                let index = this.HCheckEmpNameArray.findIndex(item => item == e)
+
+                if (index != -1) {
+                    this.hform.HCheckEmp = this.HCheckEmpNameArraySource[index]["HItemID"]
+                    this.hform.HCheckEmpName = this.HCheckEmpNameArraySource[index]["HName"]
+                }
+            },
+            // 鑾峰彇鑱屽憳淇℃伅
+            GetEmployeeList() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetEmployeeList_Json',
+                    data: {
+                        Employee: '',
+                        HGroupID: 0
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.HCheckEmpNameArray = Array.from(data).map(item => item['HName'])
+                            this.HCheckEmpNameArraySource = data
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            HGroupNameChangeHandler(e) {
+                let index = this.HGroupNameArray.findIndex(item => item == e)
+
+                if (index != -1) {
+                    this.hform.HGroupID = this.HGroupNameArraySource[index]["HItemID"]
+                    this.hform.HGroupName = this.HGroupNameArraySource[index]["HName"]
+                }
+            },
+            // 鑾峰彇鐢熶骇鐝粍
+            GetGroupList() {
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/GetGroupList_Json',
+                    data: {
+                        Group: '',
+                        HStockOrgID: uni.getStorageSync('OrganizationID')
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.HGroupNameArray = Array.from(data).map(item => item['HName'])
+                            this.HGroupNameArraySource = data
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+
+            // 鑾峰彇鏈�鏂板崟鎹彿鍜孒InterID
+            getMaxNum() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetMAXNum',
+                    data: {
+                        HBillType: this.HBillType
+                    },
+                    resFunction: (res) => {
+                        let {
+                            count,
+                            data,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.hform.HBillNo = data[0].HBillNo
+                            this.hform.HInterID = data[0].HInterID
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            HShiftsNameChangeHandler(e) {
+                let index = this.HShiftsNameArray.findIndex(item => item == e)
+                if (index != -1) {
+                    this.hform.HShiftsID = this.HShiftsNameArraySource[index]['HInterID']
+                    this.hform.HShiftsName = this.HShiftsNameArraySource[index]['鐝鍚嶇О']
+                }
+            },
+            // 鍒濆鍖栫彮娆′俊鎭�
+            get_Gy_WorkShiftList() {
+                CommonUtils.doRequest2({
+                    url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
+                    data: {
+                        sWhere: ` and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync('Organization')}' and 绂佺敤鏍囪='' and ISNULL(瀹℃牳浜� ,'') !=''`,
+                        HMaker: getUserInfo()['Czymc']
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.HShiftsNameArray = Array.from(data).map(item => item['鐝鍚嶇О'])
+                            this.HShiftsNameArraySource = data
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            // 鑾峰彇鐝
+            get_HWorkShift() {
+                CommonUtils.doRequest2({
+                    url: '/Gy_ShiftsController/Get_HWorkShift',
+                    data: {
+                        "HDeptID": this.hform.HDeptID,
+                        "HCenterID": this.hform.HCenterID
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            Message,
+                            count
+                        } = res.data
+
+                        this.hform.HShiftsID = data[0]['HInterID']
+                        this.hform.HShiftsName = data[0]['鐝']
+                    }
+                })
+            },
+            ProcessExchangeBillQuerySub() {
+                let HProcID = this.hform.HProcID
+                let HBarCode = this.hform.HProcExchInterID
+                let sWhere = ` ${HBarCode} and HProcID = ${HProcID} `
+                CommonUtils.doRequest2({
+                    url: '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
+                    data: {
+                        sWhere: sWhere
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            Message,
+                            count
+                        } = res.data
+                        if (count == 1 && data.length > 0) {
+                            this.hform = Object.assign(this.hform, {
+                                HProcID: data[0]['HProcID'],
+                                HProcName: data[0]['宸ュ簭鍚嶇О'],
+                                HSourceID: data[0]['HSourceID'] || 0,
+                                HSourceName: data[0]['鐢熶骇璧勬簮'] || '',
+                                HMainSourceEntryID: data[0]['hsubid'],
+                                HProcExchEntryID: data[0]['hsubid'],
+                                HProcExchQty: data[0]['娴佽浆鍗℃暟閲�'],
+                                HCenterID: data[0]['HCenterID'] || getUserInfo()['HWorkCenterID'],
+                            })
+                            
+                        }
+                    }
+                })
+            },
+            onHProcNameChangeHandler(e) {
+                let index = this.HProcNameArray.findIndex(item => item == e)
+                if (index != -1) {
+                    this.hform.HProcName = this.HProcNameArraySource[index]['HName']
+                    this.hform.HProcID = this.HProcNameArraySource[index]['HItemID']
+                    this.ProcessExchangeBillQuerySub()
+                }
+            },
+            getProcessList() {
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/GetProcessList_Json',
+                    data: {
+                        Process: '',
+                        HStockOrgID: uni.getStorageSync("OrganizationID")
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.HProcNameArray = Array.from(data).map(item => item.HName)
+                            this.HProcNameArraySource = data
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            TestTypeChange(e) {
+                console.log('e: ', e);
+            },
+            toScanCode() {
+                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+                mpaasScanModule.mpaasScan({
+                    'hideAlbum': true,
+                    'timeoutInterval': '10', //瓒呮椂鏃堕棿
+                    'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+                }, (ret) => {
+                    console.log(ret.resp_result)
+                    if (this.hform.HBarCode == '*') {
+                        this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+                    } else {
+                        this.HBarCode = ret.resp_result
+                        this.hform.HBarCode = ret.resp_result
+                    }
+
+                    this.getCode(this.hform.HBarCode)
+                })
+            },
+            getCode(HBarCode) {
+                console.log('HBarCode: ', HBarCode);
+                if (!HBarCode) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鏉″舰鐮佷笉鑳戒负绌�'
+                    })
+                }
+                CommonUtils.doRequest2({
+                    url: '/api/newBill/getHbarCodeDetail',
+                    data: {
+                        "sBillBarCode": HBarCode
+                    },
+                    resFunction: (res) => {
+                        let {
+                            code,
+                            msg,
+                            count,
+                            data
+                        } = res.data
+                        if (code == 1) {
+                            this.HBarCode = ''
+                            let data1 = data.h_v_Sc_ProcessExchangeBillList
+                            this.hform = Object.assign(this.hform, {
+                                "HMaterID": data1[0].HMaterID, //浜у搧ID
+                                "HMaterCode": data1[0].浜у搧浠g爜, //浜у搧浠g爜
+                                "HMaterName": data1[0].浜у搧, //浜у搧鍚嶇О
+                                "HMaterSpec": data1[0].瑙勬牸鍨嬪彿, //浜у搧瑙勬牸
+                                "HUnitID": data1[0].HUnitID, //璁¢噺鍗曚綅id
+                                "HUnitName": data1[0].鍗曚綅, //璁¢噺鍗曚綅
+                                "HMainSourceBillNo": data1[0].鍗曟嵁鍙�, //婧愬崟鍗曞彿
+                                "HMainSourceInterID": data1[0].hmainid, //婧愬崟涓诲唴鐮�
+                                "HMainSourceBillType": 3772, //婧愬崟绫诲瀷
+                                "HProcExchBillNo": data1[0].鍗曟嵁鍙�, //娴佽浆鍗″彿
+                                "HProcExchInterID": data1[0].hmainid, //娴佽浆鍗′富鍐呯爜(鍙栧�糎InterID)
+                                "HBatchNo": data1[0].鎵瑰彿, //娴佽浆鍗℃壒娆�
+                                "HICMOInterID": data1[0].hicmointerid, //鐢熶骇璁㈠崟ID
+                                "HICMOEntryID": data1[0].HICMOEntryID, //鐢熶骇璁㈠崟瀛怚D
+                                "HICMOBillNo": data1[0].浠诲姟鍗曞彿, //鐢熶骇璁㈠崟
+                                "HDeptID": data1[0].HWorkShopID, //杞﹂棿ID
+                                "HDeptName": data1[0].鐢熶骇杞﹂棿, //杞﹂棿
+                            })
+                            
+                            uni.showToast({
+                                icon: 'none',
+                                title: msg
+                            })
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: msg
+                            })
+                        }
+                    }
+                })
+            },
+            submit() {
+                if (this.hform.HProcID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '宸ュ簭娌℃湁閫夋嫨'
+                    })
+                }
+                if (this.hform.HQty == '') {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鍙栨牱鏁伴噺涓虹┖'
+                    })
+                }
+                if (this.hform.HProcID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '宸ュ簭娌℃湁閫夋嫨'
+                    })
+                }
+                if (this.hform.HDeptID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '閮ㄩ棬娌℃湁閫夋嫨'
+                    })
+                }
+                if (this.hform.HShiftsID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鐝鏈�夋嫨'
+                    })
+                }
+                if (this.hform.HGroupID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鐢熶骇鐝粍鏈�夋嫨'
+                    })
+                }
+                if (this.hform.HCheckEmp == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鍙栨牱鍛樻湭閫夋嫨'
+                    })
+                }
+                if (this.hform.HSourceID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鐢熶骇璧勬簮鏈�夋嫨'
+                    })
+                }
+                
+                console.log('this.hform: ',this.hform);
+                let sMainStr = JSON.stringify(this.hform)
+                console.log('sMainStr: ',sMainStr);
+                let sMainSub = sMainStr + ';' + this.refSav + ';' + getUserInfo()['Czymc'];
+                CommonUtils.doRequest2({
+                    method: 'POST',
+                    url: '/QC_TakeSampleCheckBill/SaveQC_TakeSampleCheckBillMain',
+                    data: {
+                        msg: sMainSub
+                    },
+                    resFunction: (res) => {
+                        let {
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            return uni.showToast({
+                                icon: 'none',
+                                title: "鎻愪氦鎴愬姛!"
+                            })
+                        } else {
+                            return uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            onAddNewHandler() {
+                uni.redirectTo({
+                    url: "/pages/quyangdan/form?operationType=0"
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
         }
     }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+ 
+    .scroll-content {
+        box-sizing: border-box;
+        padding: 20rpx;
 
-</style>
+        ::v-deep .uni-scroll-view-content {
+            box-sizing: border-box;
+            padding: 0 40rpx;
+            display: flex;
+            flex-direction: column;
+            gap: 20rpx;
+        }
+
+        .form-item {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            gap: 20rpx;
+
+            input {
+                width: inherit;
+                padding: 8rpx 20rpx;
+                font-size: 30rpx;
+            }
+
+            .title {
+                width: 5em;
+                font-size: 30rpx;
+                flex-shrink: 0;
+                text-align: right;
+            }
+
+            .right {
+                flex: 1;
+                border-radius: 22rpx;
+                border: 1px solid #acacac;
+            }
+
+            .right-icon {
+                width: 54rpx;
+                height: 54rpx;
+                border-radius: 50%;
+                background-color: #3A78FF;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                flex-shrink: 0;
+
+            }
+
+            .disabled {
+                border: 1px solid #e4e4e4;
+                background-color: #e4e4e4;
+            }
+        }
+    }
+
+    .bottom-btn {
+        position: fixed;
+        bottom: 0;
+        box-sizing: border-box;
+        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: 20rpx;
+        justify-content: space-between;
+        width: 100%;
+
+        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;
+        }
+    }
+
+    .placeholder__view {
+        flex: 1;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/huanyangdan/table.vue b/pages/huanyangdan/table.vue
index c060bd6..767e1d4 100644
--- a/pages/huanyangdan/table.vue
+++ b/pages/huanyangdan/table.vue
@@ -1,22 +1,584 @@
 <template>
     <view>
-        
+        <view class="page-header">
+            <view class="search-item">
+                <view class="left">鏃ユ湡闂撮殧</view>
+                <view class="right">
+                    <picker mode="selector" :value="curDateGap" :range="dateRangePicker"
+                        @change="onDateRangePickerChangeHandler">
+                        <input disabled v-model="curDateGap" placeholder="璇烽�夋嫨鏃ユ湡闂撮殧" />
+                        <view class="picker-overlay"></view>
+                    </picker>
+
+                </view>
+            </view>
+            <view class="search-item">
+                <view class="left">寮�濮嬫棩鏈�</view>
+                <view class="right">
+                    <uni-datetime-picker :clear-icon="false" type="date" v-model="startDate"
+                        :disabled="!enableCustomDateRange">
+                        <view class="datetime-picker-inner"
+                            :class="enableCustomDateRange?'font__enable':'font__disable'">
+                            <text>{{ startDate }}</text>
+                        </view>
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view class="search-item">
+                <view class="left">缁撴潫鏃ユ湡</view>
+                <view class="right">
+                    <uni-datetime-picker :clear-icon="false" type="date" v-model="endDate"
+                        :disabled="!enableCustomDateRange">
+                        <view class="datetime-picker-inner"
+                            :class="enableCustomDateRange?'font__enable':'font__disable'">{{ endDate }}</view>
+                    </uni-datetime-picker>
+                </view>
+            </view>
+            <view class="search-item">
+                <view class="left">鍗曟嵁鍙�</view>
+                <view class="right">
+                    <input type="text" auto-focus v-model="HBillNo" />
+                </view>
+            </view>
+
+            <view class="button-groups">
+                <button type="default" size="mini" class="btn-b" @tap.stop="onAddClickHandler">鏂板</button>
+                <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
+                <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
+            </view>
+        </view>
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+        <scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+            <view v-for="(item,index) in listData" :key="index">
+                <uni-card :title="item['鍗曟嵁鍙�']" :extra="'No.'+item['sorderid']"
+                    @tap="showDetail = showDetail==index?-1:index">
+                    <view class="card-detail">
+                        <view class="detail" v-if="item['鍗曟嵁鍙�']">
+                            <text>鍗曟嵁鍙凤細</text>{{item['鍗曟嵁鍙�']}}
+                        </view>
+                        <view class="detail" v-if="item['鍗曟嵁鐘舵��']">
+                            <text>鍗曟嵁鐘舵�侊細</text>{{item['鍗曟嵁鐘舵��']}}
+                        </view>
+                        <view class="detail" v-if="item['鏃ユ湡']">
+                            <text>鏃ユ湡锛�</text>{{item['鏃ユ湡']}}
+                        </view>
+                        <view class="detail" v-if="item['閮ㄩ棬']">
+                            <text>閮ㄩ棬锛�</text>{{item['閮ㄩ棬']}}
+                        </view>
+                        <view class="detail" v-if="item['宸ュ簭']">
+                            <text>宸ュ簭锛�</text>{{item['宸ュ簭']}}
+                        </view>
+                        <view class="detail" v-if="item['浜у搧缂栫爜']">
+                            <text>浜у搧缂栫爜锛�</text>{{item['浜у搧缂栫爜']}}
+                        </view>
+                        <view class="detail" v-if="item['浜у搧鍚嶇О']">
+                            <text>浜у搧鍚嶇О锛�</text>{{item['浜у搧鍚嶇О']}}
+                        </view>
+                        <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
+                            <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+                        </view>
+                        <view class="detail" v-if="item['璁¢噺鍗曚綅']">
+                            <text>璁¢噺鍗曚綅锛�</text>{{item['璁¢噺鍗曚綅']}}
+                        </view>
+                        <view class="detail" v-if="item['鐢熶骇璁㈠崟']">
+                            <text>鐢熶骇璁㈠崟锛�</text>{{item['鐢熶骇璁㈠崟']}}
+                        </view>
+                        <view class="detail" v-if="item['娴佽浆鍗�']">
+                            <text>娴佽浆鍗★細</text>{{item['娴佽浆鍗�']}}
+                        </view>
+                        <view class="detail" v-if="item['鍒跺崟浜�']">
+                            <text>鍒跺崟浜猴細</text>{{item['鍒跺崟浜�']}}
+                        </view>
+                        <view class="detail" v-if="item['瀹℃牳浜�']">
+                            <text>瀹℃牳浜猴細</text>{{item['瀹℃牳浜�']}}
+                        </view>
+                    </view>
+                    <view class="card-detail" v-if="showDetail == index">
+                        <view class="detail" v-if="item['杩樻牱鍛�']">
+                            <text>杩樻牱鍛橈細</text>{{item['杩樻牱鍛�']}}
+                        </view>
+                        <view class="detail" v-if="item['杩樻牱鏁伴噺']">
+                            <text>杩樻牱鏁伴噺锛�</text>{{item['杩樻牱鏁伴噺']}}
+                        </view>
+                        <view class="detail" v-if="item['鏉ユ簮缁勭粐']">
+                            <text>鏉ユ簮缁勭粐锛�</text>{{item['鏉ユ簮缁勭粐']}}
+                        </view>
+                        <view class="detail" v-if="item['璐ㄦ缁勭粐']">
+                            <text>璐ㄦ缁勭粐锛�</text>{{item['璐ㄦ缁勭粐']}}
+                        </view>
+                        <view class="detail" v-if="item['宸ュ簭娴佽浆鍗″彿']">
+                            <text>宸ュ簭娴佽浆鍗″彿锛�</text>{{item['宸ュ簭娴佽浆鍗″彿']}}
+                        </view>
+                        <view class="detail" v-if="item['宸ュ簭娴佽浆鍗″瓙鍐呯爜']">
+                            <text>宸ュ簭娴佽浆鍗″瓙鍐呯爜锛�</text>{{item['宸ュ簭娴佽浆鍗″瓙鍐呯爜']}}
+                        </view>
+                        <view class="detail" v-if="item['宸ュ簭娴佽浆鍗℃暟閲�']">
+                            <text>宸ュ簭娴佽浆鍗℃暟閲忥細</text>{{item['宸ュ簭娴佽浆鍗℃暟閲�']}}
+                        </view>
+                        <view class="detail" v-if="item['宸ュ簭娴佽浆鍗℃壒娆″彿']">
+                            <text>宸ュ簭娴佽浆鍗℃壒娆″彿锛�</text>{{item['宸ュ簭娴佽浆鍗℃壒娆″彿']}}
+                        </view>
+                        <view class="detail" v-if="item['浠诲姟鍗曞彿']">
+                            <text>浠诲姟鍗曞彿锛�</text>{{item['浠诲姟鍗曞彿']}}
+                        </view>
+                        <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
+                            <text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡']}}
+                        </view>
+                        <view class="detail" v-if="item['瀹℃牳鏃ユ湡']">
+                            <text>瀹℃牳鏃ユ湡锛�</text>{{item['瀹℃牳鏃ユ湡']}}
+                        </view>
+                        <view class="detail" v-if="item['淇敼浜�']">
+                            <text>淇敼浜猴細</text>{{item['淇敼浜�']}}
+                        </view>
+                        <view class="detail" v-if="item['淇敼鏃ユ湡']">
+                            <text>淇敼鏃ユ湡锛�</text>{{item['淇敼鏃ユ湡']}}
+                        </view>
+                        <view class="detail" v-if="item['鍏抽棴浜�']">
+                            <text>鍏抽棴浜猴細</text>{{item['鍏抽棴浜�']}}
+                        </view>
+                        <view 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" v-if="showDetail == index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="more" v-if="showDetail != index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+
+                    <view class="op" v-if="operations == index">
+                        <!-- <button class="op1" size="mini" plain @tap.stop="">瀛愯〃淇℃伅</button> -->
+                        <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
+                        <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                        <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+                        <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                    </view>
+                </uni-card>
+            </view>
+            <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
+        </scroll-view>
+        <!-- 鍒嗛〉鍣� -->
+        <view class="page-footer">
+            <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="pageMeta.curPage" :pageSize="pageMeta.size"
+                :total="pageMeta.total" @change="onPageChangeHandler"></uni-pagination>
+        </view>
     </view>
 </template>
 
 <script>
+    import dayjs from 'dayjs'
+    import {
+        CommonUtils
+    } from '@/utils/common.js'
+    import {
+        getUserInfo
+    } from '../../utils/auth'
     export default {
         data() {
             return {
-                
+                // 璁$畻鍗$墖鍒楄〃楂樺害
+                pagination_top: 0,
+                pageContent_top: 0,
+                // 鍒嗛〉鎺у埗
+                pageMeta: {
+                    curPage: 1,
+                    size: 50,
+                    total: 0,
+                },
+                // 婊氬姩鎺у埗
+                scrollTop: 0,
+                old: {
+                    scrollTop: 0
+                },
+
+                dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�",
+                    "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"
+                ],
+                curDateGap: "杩戜竷澶�",
+                enableCustomDateRange: false,
+                startDate: dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD'),
+                endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+                HBillNo: '',
+
+                listData: [],
+                showDetail: -1,
+                operations: -1,
             }
         },
+        computed: {
+            pageContentHeight: {
+                get() {
+                    return (this.pagination_top - this.pageContent_top)
+                }
+            },
+        },
+        onLoad() {
+            this.onSearchClickHandler()
+        },
+        onPullDownRefresh() {
+            this.onSearchClickHandler()
+        },
+        async onReady() {
+            // #ifndef MP-WEIXIN
+            let query = uni.createSelectorQuery().in(this)
+            query.select("#pagination")
+                .boundingClientRect((data) => {
+                    if (data) {
+                        this.pagination_top = data.top
+                    } else {
+                        console.log("鏈壘鍒�#pagination鑺傜偣");
+                    }
+                })
+                .exec();
+            query.select("#pageContent")
+                .boundingClientRect((data) => {
+                    if (data) {
+                        this.pageContent_top = data.top
+                    } else {
+                        console.log("鏈壘鍒�#pageContent鑺傜偣");
+                    }
+                })
+                .exec();
+            // #endif
+
+        },
         methods: {
-            
-        }
+            // 鏂板杩樻牱鍗�
+            onAddClickHandler() {
+                uni.navigateTo({
+                    url: "/pages/huanyangdan/form?operationType=0"
+                })
+            },
+            del(item) {
+                uni.showModal({
+                    title: '鍒犻櫎纭',
+                    content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            CommonUtils.doRequest2({
+                                url: '/QC_TakeSampleCheckBill/DeleteQC_BackSampleCheckBillMain',
+                                data: {
+                                    HInterID: item['hmainid'],
+                                    user: getUserInfo()['Czymc']
+                                },
+                                resFunction: (res) => {
+                                    let {
+                                        data,
+                                        count,
+                                        Message
+                                    } = res.data
+                                    if (count == 1) {
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: '鍒犻櫎鎴愬姛!'
+                                        })
+                                        this.onSearchClickHandler()
+                                    } else {
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: Message
+                                        })
+                                    }
+                                }
+                            })
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            goTop: function(e) {
+                // 瑙e喅view灞備笉鍚屾鐨勯棶棰�
+                this.scrollTop = this.old.scrollTop
+                this.$nextTick(function() {
+                    this.scrollTop = 0
+                });
+            },
+            onDateRangePickerChangeHandler({
+                detail
+            }) {
+                this.enableCustomDateRange = false
+                this.curDateGap = this.dateRangePicker[detail.value]
+                let date = new Date()
+                switch (this.curDateGap) {
+                    case "浠婂ぉ":
+                        this.startDate = dayjs(date).format("YYYY-MM-DD")
+                        break;
+                    case "杩戜竴澶�":
+                        this.startDate = dayjs(date).subtract(1, 'day').format("YYYY-MM-DD")
+                        break;
+                    case "杩戜袱澶�":
+                        this.startDate = dayjs(date).subtract(2, 'day').format("YYYY-MM-DD")
+                        break;
+                    case "杩戜笁澶�":
+                        this.startDate = dayjs(date).subtract(3, 'day').format("YYYY-MM-DD")
+                        break;
+                    case "杩戝洓澶�":
+                        this.startDate = dayjs(date).subtract(4, 'day').format("YYYY-MM-DD")
+                        break;
+                    case "杩戜簲澶�":
+                        this.startDate = dayjs(date).subtract(5, 'day').format("YYYY-MM-DD")
+                        break;
+                    case "杩戝叚澶�":
+                        this.startDate = dayjs(date).subtract(6, 'day').format("YYYY-MM-DD")
+                        break;
+                    case "杩戜竷澶�":
+                        this.startDate = dayjs(date).subtract(7, 'day').format("YYYY-MM-DD")
+                        break;
+                    case "杩�30澶�":
+                        this.startDate = dayjs(date).subtract(30, 'day').format("YYYY-MM-DD")
+                        break;
+                }
+                if (this.curDateGap == '浠绘剰闂撮殧') {
+                    this.enableCustomDateRange = true
+                }
+            },
+            onSearchClickHandler() {
+                let sWhere = ""
+                if (this.startDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.startDate + "'";
+                }
+                if (this.endDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.endDate + "'";
+                }
+                if (this.HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + this.HBillNo + "%'";
+                }
+                this.get_DisplayPage(sWhere);
+            },
+            clear() {
+                this.curDateGap = "杩戜竷澶�"
+                this.enableCustomDateRange = false
+                this.startDate = dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD')
+                this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+                this.HBillNo = ''
+            },
+            async onResetClickHandler() {
+                this.clear()
+                await this.$nextTick()
+                this.onSearchClickHandler()
+            },
+            get_DisplayPage(sWhere) {
+                CommonUtils.doRequest2({
+                    url: '/QC_TakeSampleCheckBill/get_QC_BackSampleCheckBillListPage',
+                    data: {
+                        "sWhere": sWhere,
+                        "user": getUserInfo()["Czymc"],
+                        "page": this.pageMeta.curPage,
+                        "size": this.pageMeta.size
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            Message,
+                            count
+                        } = res.data
+                        console.log('res.data: ', res.data);
+                        this.listData = data;
+                        this.pageMeta.total = count
+                        uni.stopPullDownRefresh()
+                    }
+                })
+            },
+            onPageChangeHandler() {
+                this.onSearchClickHandler()
+                this.goTop()
+            }
+        },
     }
 </script>
 
-<style>
+<style lang="scss">
+    .page-header {
+        display: flex;
+        box-sizing: border-box;
+        padding: 20rpx;
+        flex-direction: column;
+        gap: 10rpx;
+        font-size: 32rpx;
 
-</style>
+        .search-item {
+            display: flex;
+            flex-direction: row;
+            gap: 10rpx;
+            justify-content: center;
+            align-items: center;
+
+            .left {
+                width: 4em;
+            }
+
+            .right {
+                flex: 1;
+                position: relative;
+                border-radius: 22rpx;
+                border: 1px solid #acacac;
+                display: flex;
+                padding: 4rpx 10rpx;
+
+                picker {
+                    width: 100%;
+                }
+            }
+        }
+
+        input {
+            width: inherit;
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+        }
+
+        .datetime-picker-inner {
+            padding: 8rpx 20rpx;
+            font-size: 30rpx;
+            display: flex;
+            align-items: center;
+        }
+
+        .font__enable {
+            color: #000;
+        }
+
+        .font__disable {
+            color: #cccccc;
+        }
+    }
+
+    .button-groups {
+        box-sizing: border-box;
+        padding: 10rpx 0 0 0;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
+        justify-content: space-between;
+
+        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;
+        }
+    }
+
+    .page-content {
+        // height: 40vh;
+        box-sizing: border-box;
+        padding: 10rpx 0;
+
+        .card-detail {
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            line-height: 120%;
+
+            .detail {
+                // width: 50%;
+                font-size: 26rpx;
+                margin-bottom: 12rpx;
+                color: #555;
+                margin-right: 20rpx;
+
+                text {
+                    color: #999;
+                    font-size: 26rpx;
+                }
+            }
+        }
+
+        .more {
+            color: #888;
+            font-size: 24rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                text-align: center;
+            }
+        }
+
+        .op {
+            display: flex;
+            justify-content: space-around;
+            margin-top: 20rpx;
+
+            button {
+                padding: 0;
+                width: 150rpx;
+                font-size: 25rpx;
+            }
+
+            .op1 {
+                border: 1px solid #41a863;
+                color: #41a863;
+            }
+
+            .op2 {
+                border: 1px solid #d98d00;
+                color: #d98d00;
+            }
+
+            .op3 {
+                border: 1px solid #3a78ff;
+                color: #3a78ff;
+            }
+
+            .op4 {
+                border: 1px solid #da0000;
+                color: #da0000;
+            }
+
+            .op5 {
+                border: 1px solid #888;
+                color: #888;
+            }
+        }
+    }
+
+    .page-footer {
+        position: fixed;
+        bottom: 0;
+        width: 100%;
+        box-sizing: border-box;
+        padding: 32rpx 40rpx;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/quyangdan/form.vue b/pages/quyangdan/form.vue
index 65057e7..cf30df0 100644
--- a/pages/quyangdan/form.vue
+++ b/pages/quyangdan/form.vue
@@ -1,22 +1,833 @@
 <template>
     <view>
-      
+        <scroll-view scroll-y id="scroll-content" class="scroll-content" :style="{height: scrollContentHeight + 'px'}">
+            <view class="form-item">
+                <view class="title">鏉″舰鐮�:</view>
+                <view class="right">
+                    <input type="text" name="HBarCode" id="HBarCode" v-model="HBarCode"
+                        @confirm="getCode(HBarCode)" />
+                </view>
+                <view class="right-icon" @click="toScanCode">
+                    <uni-icons color="#fff" type="scan" size="24"></uni-icons>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">宸ュ簭:</view>
+                <view class="right">
+                    <uni-combox :candidates="HProcNameArray" name="HProcName" id="HProcName" placeholder="璇烽�夋嫨宸ュ簭鍙�"
+                        v-model="hform.HProcName" @input="onHProcNameChangeHandler"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鍙栨牱鏁伴噺:</view>
+                <view class="right">
+                    <input type="number" name="HQty" id="HQty" v-model="hform.HQty" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐮村潖鎬у疄楠屾暟閲�:</view>
+                <view class="right">
+                    <input type="number" name="HSampleDamageQty" id="HSampleDamageQty"
+                        v-model="hform.HSampleDamageQty" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">閫佹祴绫诲瀷:</view>
+                <view class="right">
+                    <uni-combox :candidates="TestTypeArray" v-model="hform.TestType"
+                        @input="TestTypeChange"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">閫佹祴鍐呭:</view>
+                <view class="right">
+                    <input type="text" name="HBadNote" id="HBadNote" v-model="hform.HBadNote" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">閮ㄩ棬:</view>
+                <view class="right">
+                    <uni-combox :candidates="HDeptNameArray" name="HDeptName" id="HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬"
+                        v-model="hform.HDeptName" @input="HDeptNameChangeHandler"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐢熶骇鐝:</view>
+                <view class="right">
+                    <uni-combox :candidates="HShiftsNameArray" name="HShiftsName" id="HShiftsName" placeholder="璇烽�夋嫨鐢熶骇鐝"
+                        v-model="hform.HShiftsName" @input="HShiftsNameChangeHandler"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐢熶骇鐝粍:</view>
+                <view class="right">
+                    <uni-combox :candidates="HGroupNameArray" name="HShiftsName" id="HShiftsName" placeholder="璇烽�夋嫨鐢熶骇鐝粍"
+                        v-model="hform.HGroupName" @input="HGroupNameChangeHandler"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鍙栨牱鍛�:</view>
+                <view class="right">
+                    <uni-combox :candidates="HCheckEmpNameArray" name="HCheckEmpName" id="HCheckEmpName"
+                        placeholder="璇烽�夋嫨鍙栨牱鍛�" v-model="hform.HCheckEmpName"
+                        @input="HCheckEmpNameChangeHandler"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐢熶骇璧勬簮:</view>
+                <view class="right">
+                    <uni-combox :candidates="HSourceNameArray" name="HSourceName" id="HSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬枡"
+                        v-model="hform.HSourceName" @input="HSourceNameChangeHandler"></uni-combox>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鍗曟嵁鏃ユ湡:</view>
+                <view class="right disabled">
+                    <input disabled type="text" name="HDate" id="HDate" v-model="hform.HDate" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鍗曟嵁鍙�:</view>
+                <view class="right disabled">
+                    <input disabled type="text" name="HBillNo" id="HBillNo" v-model="hform.HBillNo" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐢熶骇璁㈠崟:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">娴佽浆鍗�:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HProcExchBillNo" name="HProcExchBillNo"
+                        id="HProcExchBillNo" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐗╂枡浠g爜:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HMaterCode" name="HMaterCode" id="HMaterCode" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鐗╂枡鍚嶇О:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HMaterName" name="HMaterName" id="HMaterName" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">瑙勬牸鍨嬪彿:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HMaterSpec" name="HMaterSpec" id="HMaterSpec" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">璁¢噺鍗曚綅:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HUnitName" name="HUnitName" id="HUnitName" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">娴佽浆鍗℃壒鍙�:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HBatchNo" name="HBatchNo" id="HBatchNo" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">娴佽浆鍗℃暟閲�:</view>
+                <view class="right disabled">
+                    <input disabled type="text" v-model="hform.HProcExchQty" name="HProcExchQty" id="HProcExchQty" />
+                </view>
+            </view>
+        </scroll-view>
+        <view class="bottom-btn" id="bottom-btn">
+            <view><button class="btn-a" size="mini" @tap="submit">鎻愪氦</button></view>
+            <view><button class="btn-b" size="mini" @tap="onAddNewHandler">鏂板</button></view>
+            <view class="placeholder__view"></view>
+            <view><button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button></view>
+        </view>
     </view>
 </template>
 
 <script>
+    import dayjs from 'dayjs'
+    import {
+        getUserInfo
+    } from '../../utils/auth'
+    import {
+        CommonUtils
+    } from '../../utils/common'
+
     export default {
         data() {
             return {
+                pageMeta: {
+                    scrollContentTop: 0,
+                    bottomBtnTop: 0,
+                },
+                refSav: 'Add',
+                showMask: true,
+                TestTypeArray: ["棣栨", "宸℃", "鏈", "瀹為獙"],
 
+                HBillType: '7521',
+                HProcNameArray: [],
+                HProcNameArraySource: [],
+
+                HDeptNameArray: [],
+                HDeptNameArraySource: [],
+
+                HShiftsNameArray: [],
+                HShiftsNameArraySource: [],
+
+                HGroupNameArray: [],
+                HGroupNameArraySource: [],
+
+                HCheckEmpNameArray: [],
+                HCheckEmpNameSource: [],
+
+                HSourceNameArray: [],
+                HSourceNameSource: [],
+
+                HBarCode: '',
+                hform: {
+                    HBarCode: '',
+                    HProcName: '',
+                    HProcID: 0,
+                    HQty: '',
+                    HSampleDamageQty: 0,
+                    TestType: '棣栨',
+                    HBadNote: '',
+                    HDeptName: '',
+                    HDeptID: 0,
+                    HCenterID: 0,
+                    HShiftsName: '',
+                    HShiftsID: 0,
+                    HGroupName: '',
+                    HGroupID: 0,
+                    HCheckEmpName: '',
+                    HCheckEmp: '',
+                    HSourceName: '',
+                    HSourceID: 0,
+                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HBillNo: '',
+                    HInterID: 0,
+                    HICMOBillNo: '',
+                    HICMOInterID: 0,
+                    HICMOEntryID: 0,
+                    HProcExchBillNo: '',
+                    HProcExchInterID: 0,
+                    HProcExchEntryID: 0,
+                    HMainSourceBillNo: '',
+                    HMainSourceInterID: 0,
+                    HMainSourceBillType: '',
+                    HMainSourceEntryID: 0,
+                    HMaterCode: '',
+                    HMaterID: 0,
+                    HMaterName: '',
+                    HMaterSpec: '',
+                    HUnitName: '',
+                    HUnitID: 0,
+                    HBatchNo: '',
+                    HProcExchQty: '',
+                    HMaker: getUserInfo()['Czymc'],
+                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
+                    HUpDater: '',
+                    HUpDateDate: '',
+                    HChecker: '',
+                    HCheckDate: '',
+                    HDeleteMan: '',
+                    HDeleteDate: '',
+                }
             }
         },
-        methods: {
+        computed: {
+            scrollContentHeight: {
+                get() {
+                    return this.pageMeta.bottomBtnTop - this.pageMeta.scrollContentTop
+                }
+            }
+        },
+        onReady() {
+            // #ifndef MP-WEIXIN
+            let query = uni.createSelectorQuery().in(this)
+            query.select("#scroll-content").boundingClientRect((data) => {
+                this.pageMeta.scrollContentTop = data.top
+            }).exec()
+            query.select("#bottom-btn").boundingClientRect((data) => {
+                this.pageMeta.bottomBtnTop = data.top
+            }).exec()
+            // #endif
+            // #ifdef MP-WEIXIN
+            // 寰俊涓嶆敮鎸� uni.createSelectorQuery().in(this)
+            // #endif
 
+        },
+        async onLoad(e) {
+            let {
+                operationType
+            } = e
+            if (operationType == 0) {
+                this.getMaxNum()
+                this.refSav = 'Add'
+            } else {
+                this.refSav = 'Update'
+            }
+
+            this.getProcessList()
+            this.get_Gy_WorkShiftList()
+            this.GetGroupList()
+            this.GetEmployeeList()
+            this.getSourceList()
+            this.GetDepartmentList()
+        },
+        methods: {
+            HDeptNameChangeHandler(){
+                let index = this.HDeptNameArray.findIndex(item => item == e)
+                
+                if (index != -1) {
+                    this.hform.HDeptID = this.HDeptNameArraySource[index]["HItemID"]
+                    this.hform.HDeptName = this.HDeptNameArraySource[index]["HName"]
+                }
+            },
+            GetDepartmentList() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetDepartmentList_Json',
+                    data: {
+                        Department: '',
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message,
+                            code
+                        } = res.data
+                        if (count == 1) {
+                            this.HDeptNameArray = Array.from(data).map(item => item['HName'])
+                            this.HDeptNameArraySource = data
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            HSourceNameChangeHandler(e) {
+                let index = this.HSourceNameArray.findIndex(item => item == e)
+
+                if (index != -1) {
+                    this.hform.HSourceID = this.HSourceNameArraySource[index]["HItemID"]
+                    this.hform.HSourceName = this.HSourceNameArraySource[index]["鐢熶骇璧勬簮"]
+                }
+                
+                console.log('this.hform: ',this.hform);
+            },
+            // 鑾峰彇鐢熶骇璧勬簮
+            getSourceList() {
+                CommonUtils.doRequest2({
+                    url: '/api/newBill/getSourceList',
+                    data: {
+                        sWhere: '',
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            msg,
+                            code
+                        } = res.data
+                        if (code == 1) {
+                            let data1 = data.Gy_Source
+                            this.HSourceNameArray = Array.from(data1).map(item => item['鐢熶骇璧勬簮'])
+                            this.HSourceNameArraySource = data1
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            HCheckEmpNameChangeHandler(e) {
+                let index = this.HCheckEmpNameArray.findIndex(item => item == e)
+
+                if (index != -1) {
+                    this.hform.HCheckEmp = this.HCheckEmpNameArraySource[index]["HItemID"]
+                    this.hform.HCheckEmpName = this.HCheckEmpNameArraySource[index]["HName"]
+                }
+            },
+            // 鑾峰彇鑱屽憳淇℃伅
+            GetEmployeeList() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetEmployeeList_Json',
+                    data: {
+                        Employee: '',
+                        HGroupID: this.hform.HGroupID
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.HCheckEmpNameArray = Array.from(data).map(item => item['HName'])
+                            this.HCheckEmpNameArraySource = data
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            HGroupNameChangeHandler(e) {
+                let index = this.HGroupNameArray.findIndex(item => item == e)
+
+                if (index != -1) {
+                    this.hform.HGroupID = this.HGroupNameArraySource[index]["HItemID"]
+                    this.hform.HGroupName = this.HGroupNameArraySource[index]["HName"]
+                }
+            },
+            // 鑾峰彇鐢熶骇鐝粍
+            GetGroupList() {
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/GetGroupList_Json',
+                    data: {
+                        Group: '',
+                        HStockOrgID: uni.getStorageSync('OrganizationID')
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.HGroupNameArray = Array.from(data).map(item => item['HName'])
+                            this.HGroupNameArraySource = data
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+
+            // 鑾峰彇鏈�鏂板崟鎹彿鍜孒InterID
+            getMaxNum() {
+                CommonUtils.doRequest2({
+                    url: '/Web/GetMAXNum',
+                    data: {
+                        HBillType: this.HBillType
+                    },
+                    resFunction: (res) => {
+                        let {
+                            count,
+                            data,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.hform.HBillNo = data[0].HBillNo
+                            this.hform.HInterID = data[0].HInterID
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            HShiftsNameChangeHandler(e) {
+                let index = this.HShiftsNameArray.findIndex(item => item == e)
+                if (index != -1) {
+                    this.hform.HShiftsID = this.HShiftsNameArraySource[index]['HInterID']
+                    this.hform.HShiftsName = this.HShiftsNameArraySource[index]['鐝鍚嶇О']
+                }
+            },
+            // 鍒濆鍖栫彮娆′俊鎭�
+            get_Gy_WorkShiftList() {
+                CommonUtils.doRequest2({
+                    url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
+                    data: {
+                        sWhere: ` and 浣跨敤缁勭粐鍚嶇О = '${uni.getStorageSync('Organization')}' and 绂佺敤鏍囪='' and ISNULL(瀹℃牳浜� ,'') !=''`,
+                        HMaker: getUserInfo()['Czymc']
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.HShiftsNameArray = Array.from(data).map(item => item['鐝鍚嶇О'])
+                            this.HShiftsNameArraySource = data
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            // 鑾峰彇鐝
+            get_HWorkShift() {
+                CommonUtils.doRequest2({
+                    url: '/Gy_ShiftsController/Get_HWorkShift',
+                    data: {
+                        "HDeptID": this.hform.HDeptID,
+                        "HCenterID": this.hform.HCenterID
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            Message,
+                            count
+                        } = res.data
+
+                        this.hform.HShiftsID = data[0]['HInterID']
+                        this.hform.HShiftsName = data[0]['鐝']
+                    }
+                })
+            },
+            ProcessExchangeBillQuerySub() {
+                let HProcID = this.hform.HProcID
+                let HBarCode = this.hform.HProcExchInterID
+                let sWhere = ` ${HBarCode} and HProcID = ${HProcID} `
+                CommonUtils.doRequest2({
+                    url: '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
+                    data: {
+                        sWhere: sWhere
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            Message,
+                            count
+                        } = res.data
+                        if (count == 1 && data.length > 0) {
+                            this.hform = Object.assign(this.hform, {
+                                HProcID: data[0]['HProcID'],
+                                HProcName: data[0]['宸ュ簭鍚嶇О'],
+                                HSourceID: data[0]['HSourceID'] || 0,
+                                HSourceName: data[0]['鐢熶骇璧勬簮'] || '',
+                                HMainSourceEntryID: data[0]['hsubid'],
+                                HProcExchEntryID: data[0]['hsubid'],
+                                HProcExchQty: data[0]['娴佽浆鍗℃暟閲�'],
+                                HCenterID: data[0]['HCenterID'] || getUserInfo()['HWorkCenterID'],
+                            })
+                            
+                        }
+                    }
+                })
+            },
+            onHProcNameChangeHandler(e) {
+                let index = this.HProcNameArray.findIndex(item => item == e)
+                if (index != -1) {
+                    this.hform.HProcName = this.HProcNameArraySource[index]['HName']
+                    this.hform.HProcID = this.HProcNameArraySource[index]['HItemID']
+                    this.ProcessExchangeBillQuerySub()
+                }
+            },
+            getProcessList() {
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/GetProcessList_Json',
+                    data: {
+                        Process: '',
+                        HStockOrgID: uni.getStorageSync("OrganizationID")
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.HProcNameArray = Array.from(data).map(item => item.HName)
+                            this.HProcNameArraySource = data
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            TestTypeChange(e) {
+                console.log('e: ', e);
+            },
+            toScanCode() {
+                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+                mpaasScanModule.mpaasScan({
+                    'hideAlbum': true,
+                    'timeoutInterval': '10', //瓒呮椂鏃堕棿
+                    'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+                }, (ret) => {
+                    console.log(ret.resp_result)
+                    if (this.hform.HBarCode == '*') {
+                        this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+                    } else {
+                        this.HBarCode = ret.resp_result
+                        this.hform.HBarCode = ret.resp_result
+                    }
+
+                    this.getCode(this.hform.HBarCode)
+                })
+            },
+            getCode(HBarCode) {
+                if (!HBarCode) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鏉″舰鐮佷笉鑳戒负绌�'
+                    })
+                }
+                let sWhere = " and 鍗曟嵁鍙�='" + HBarCode + "'";
+                CommonUtils.doRequest2({
+                    url: '/QC_TakeSampleCheckBill/Get_BackSampleList',
+                    data: {
+                        "sWhere": sWhere
+                    },
+                    resFunction: (res) => {
+                        let {
+                            code,
+                            msg,
+                            count,
+                            data
+                        } = res.data
+                        if (code == 1) {
+                            this.HBarCode = ''
+                            let data1 = data.h_v_Sc_ProcessExchangeBillList
+                            this.hform = Object.assign(this.hform, {
+                                "HMaterID": data1[0].HMaterID, //浜у搧ID
+                                "HMaterCode": data1[0].浜у搧浠g爜, //浜у搧浠g爜
+                                "HMaterName": data1[0].浜у搧, //浜у搧鍚嶇О
+                                "HMaterSpec": data1[0].瑙勬牸鍨嬪彿, //浜у搧瑙勬牸
+                                "HUnitID": data1[0].HUnitID, //璁¢噺鍗曚綅id
+                                "HUnitName": data1[0].鍗曚綅, //璁¢噺鍗曚綅
+                                "HMainSourceBillNo": data1[0].鍗曟嵁鍙�, //婧愬崟鍗曞彿
+                                "HMainSourceInterID": data1[0].hmainid, //婧愬崟涓诲唴鐮�
+                                "HMainSourceBillType": 3772, //婧愬崟绫诲瀷
+                                "HProcExchBillNo": data1[0].鍗曟嵁鍙�, //娴佽浆鍗″彿
+                                "HProcExchInterID": data1[0].hmainid, //娴佽浆鍗′富鍐呯爜(鍙栧�糎InterID)
+                                "HBatchNo": data1[0].鎵瑰彿, //娴佽浆鍗℃壒娆�
+                                "HICMOInterID": data1[0].hicmointerid, //鐢熶骇璁㈠崟ID
+                                "HICMOEntryID": data1[0].HICMOEntryID, //鐢熶骇璁㈠崟瀛怚D
+                                "HICMOBillNo": data1[0].浠诲姟鍗曞彿, //鐢熶骇璁㈠崟
+                                "HDeptID": data1[0].HWorkShopID, //杞﹂棿ID
+                                "HDeptName": data1[0].鐢熶骇杞﹂棿, //杞﹂棿
+                            })
+                            
+                            uni.showToast({
+                                icon: 'none',
+                                title: msg
+                            })
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: msg
+                            })
+                        }
+                    }
+                })
+            },
+            submit() {
+                if (this.hform.HProcID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '宸ュ簭娌℃湁閫夋嫨'
+                    })
+                }
+                if (this.hform.HQty == '') {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鍙栨牱鏁伴噺涓虹┖'
+                    })
+                }
+                if (this.hform.HProcID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '宸ュ簭娌℃湁閫夋嫨'
+                    })
+                }
+                if (this.hform.HDeptID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '閮ㄩ棬娌℃湁閫夋嫨'
+                    })
+                }
+                if (this.hform.HShiftsID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鐝鏈�夋嫨'
+                    })
+                }
+                if (this.hform.HGroupID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鐢熶骇鐝粍鏈�夋嫨'
+                    })
+                }
+                if (this.hform.HCheckEmp == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鍙栨牱鍛樻湭閫夋嫨'
+                    })
+                }
+                if (this.hform.HSourceID == 0) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鐢熶骇璧勬簮鏈�夋嫨'
+                    })
+                }
+                
+                console.log('this.hform: ',this.hform);
+                let sMainStr = JSON.stringify(this.hform)
+                console.log('sMainStr: ',sMainStr);
+                let sMainSub = sMainStr + ';' + this.refSav + ';' + getUserInfo()['Czymc'];
+                CommonUtils.doRequest2({
+                    method: 'POST',
+                    url: '/QC_TakeSampleCheckBill/SaveQC_TakeSampleCheckBillMain',
+                    data: {
+                        msg: sMainSub
+                    },
+                    resFunction: (res) => {
+                        let {
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            return uni.showToast({
+                                icon: 'none',
+                                title: "鎻愪氦鎴愬姛!"
+                            })
+                        } else {
+                            return uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            onAddNewHandler() {
+                uni.redirectTo({
+                    url: "/pages/quyangdan/form?operationType=0"
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
         }
     }
 </script>
 
-<style>
+<style lang="scss" scoped>
+ 
+    .scroll-content {
+        box-sizing: border-box;
+        padding: 20rpx;
 
+        ::v-deep .uni-scroll-view-content {
+            box-sizing: border-box;
+            padding: 0 40rpx;
+            display: flex;
+            flex-direction: column;
+            gap: 20rpx;
+        }
+
+        .form-item {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            gap: 20rpx;
+
+            input {
+                width: inherit;
+                padding: 8rpx 20rpx;
+                font-size: 30rpx;
+            }
+
+            .title {
+                width: 5em;
+                font-size: 30rpx;
+                flex-shrink: 0;
+                text-align: right;
+            }
+
+            .right {
+                flex: 1;
+                border-radius: 22rpx;
+                border: 1px solid #acacac;
+            }
+
+            .right-icon {
+                width: 54rpx;
+                height: 54rpx;
+                border-radius: 50%;
+                background-color: #3A78FF;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                flex-shrink: 0;
+
+            }
+
+            .disabled {
+                border: 1px solid #e4e4e4;
+                background-color: #e4e4e4;
+            }
+        }
+    }
+
+    .bottom-btn {
+        position: fixed;
+        bottom: 0;
+        box-sizing: border-box;
+        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: 20rpx;
+        justify-content: space-between;
+        width: 100%;
+
+        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;
+        }
+    }
+
+    .placeholder__view {
+        flex: 1;
+    }
 </style>
\ No newline at end of file
diff --git a/pages/quyangdan/table.vue b/pages/quyangdan/table.vue
index 4e658c7..ed0a009 100644
--- a/pages/quyangdan/table.vue
+++ b/pages/quyangdan/table.vue
@@ -42,19 +42,151 @@
             </view>
 
             <view class="button-groups">
+                <button type="default" size="mini" class="btn-b" @tap.stop="onAddClickHandler">鏂板</button>
                 <button type="default" size="mini" class="btn-c" @tap.stop="onSearchClickHandler">鏌ヨ</button>
                 <button type="default" size="mini" class="btn-a" @tap.stop="onResetClickHandler">閲嶇疆</button>
             </view>
         </view>
         <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-        <scroll-view class="page-content">
+        <scroll-view id="pageContent" scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
+            <view v-for="(item,index) in listData" :key="index">
+                <uni-card :title="item['鍗曟嵁鍙�']" :extra="'No.'+item['sorderid']"
+                    @tap="showDetail = showDetail==index?-1:index">
+                    <view class="card-detail">
+                        <view class="detail" v-if="item['鍗曟嵁鍙�']">
+                            <text>鍗曟嵁鍙凤細</text>{{item['鍗曟嵁鍙�']}}
+                        </view>
+                        <view class="detail" v-if="item['鍗曟嵁鐘舵��']">
+                            <text>鍗曟嵁鐘舵�侊細</text>{{item['鍗曟嵁鐘舵��']}}
+                        </view>
+                        <view class="detail" v-if="item['閮ㄩ棬']">
+                            <text>閮ㄩ棬锛�</text>{{item['閮ㄩ棬']}}
+                        </view>
+                        <view class="detail" v-if="item['鐢熶骇璧勬簮']">
+                            <text>鐢熶骇璧勬簮锛�</text>{{item['鐢熶骇璧勬簮']}}
+                        </view>
+                        <view class="detail" v-if="item['宸ュ簭']">
+                            <text>宸ュ簭锛�</text>{{item['宸ュ簭']}}
+                        </view>
+                        <view class="detail" v-if="item['鐢熶骇璁㈠崟']">
+                            <text>鐢熶骇璁㈠崟锛�</text>{{item['鐢熶骇璁㈠崟']}}
+                        </view>
+                        <view class="detail" v-if="item['娴佽浆鍗�']">
+                            <text>娴佽浆鍗★細</text>{{item['娴佽浆鍗�']}}
+                        </view>
+                        <view class="detail" v-if="item['鍒跺崟浜�']">
+                            <text>鍒跺崟浜猴細</text>{{item['鍒跺崟浜�']}}
+                        </view>
+                        <view class="detail" v-if="item['瀹℃牳浜�']">
+                            <text>瀹℃牳浜猴細</text>{{item['瀹℃牳浜�']}}
+                        </view>
+                        <view class="detail" v-if="item['浜у搧缂栫爜']">
+                            <text>浜у搧缂栫爜锛�</text>{{item['浜у搧缂栫爜']}}
+                        </view>
+                        <view class="detail" v-if="item['浜у搧鍚嶇О']">
+                            <text>浜у搧鍚嶇О锛�</text>{{item['浜у搧鍚嶇О']}}
+                        </view>
+                        <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
+                            <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+                        </view>
+                        <view class="detail" v-if="item['璁¢噺鍗曚綅']">
+                            <text>璁¢噺鍗曚綅锛�</text>{{item['璁¢噺鍗曚綅']}}
+                        </view>
+                    </view>
+                    <view class="card-detail" v-if="showDetail == index">
+                        <view class="detail" v-if="item['鍙栨牱鍛�']">
+                            <text>鍙栨牱鍛橈細</text>{{item['鍙栨牱鍛�']}}
+                        </view>
+                        <view class="detail" v-if="item['鐢熶骇鐝粍']">
+                            <text>鐢熶骇鐝粍锛�</text>{{item['鐢熶骇鐝粍']}}
+                        </view>
+                        <view class="detail" v-if="item['鐢熶骇鐝']">
+                            <text>鐢熶骇鐝锛�</text>{{item['鐢熶骇鐝']}}
+                        </view>
+                        <view class="detail" v-if="item['鍙栨牱鏁伴噺']">
+                            <text>鍙栨牱鏁伴噺锛�</text>{{item['鍙栨牱鏁伴噺']}}
+                        </view>
+                        <view class="detail" v-if="item['閫佹祴鍐呭']">
+                            <text>閫佹祴鍐呭锛�</text>{{item['閫佹祴鍐呭']}}
+                        </view>
+                        <view class="detail" v-if="item['閫佹祴绫诲瀷']">
+                            <text>閫佹祴绫诲瀷锛�</text>{{item['閫佹祴绫诲瀷']}}
+                        </view>
+                        <view class="detail" v-if="item['鏉ユ簮缁勭粐']">
+                            <text>鏉ユ簮缁勭粐锛�</text>{{item['鏉ユ簮缁勭粐']}}
+                        </view>
+                        <view class="detail" v-if="item['鐮村潖鎬у疄楠屾暟閲�']">
+                            <text>鐮村潖鎬у疄楠屾暟閲忥細</text>{{item['鐮村潖鎬у疄楠屾暟閲�']}}
+                        </view>
+                        <view class="detail" v-if="item['浜у搧鍗曢噸1']">
+                            <text>浜у搧鍗曢噸1锛�</text>{{item['浜у搧鍗曢噸1']}}
+                        </view>
+                        <view class="detail" v-if="item['浜у搧鍗曢噸2']">
+                            <text>浜у搧鍗曢噸2锛�</text>{{item['浜у搧鍗曢噸2']}}
+                        </view>
+                        <view class="detail" v-if="item['浜у搧鍗曢噸3']">
+                            <text>浜у搧鍗曢噸3锛�</text>{{item['浜у搧鍗曢噸3']}}
+                        </view>
+                        <view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
+                            <text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡']}}
+                        </view>
+                        <view class="detail" v-if="item['瀹℃牳鏃ユ湡']">
+                            <text>瀹℃牳鏃ユ湡锛�</text>{{item['瀹℃牳鏃ユ湡']}}
+                        </view>
+                        <view class="detail" v-if="item['淇敼浜�']">
+                            <text>淇敼浜猴細</text>{{item['淇敼浜�']}}
+                        </view>
+                        <view class="detail" v-if="item['淇敼鏃ユ湡']">
+                            <text>淇敼鏃ユ湡锛�</text>{{item['淇敼鏃ユ湡']}}
+                        </view>
+                        <view class="detail" v-if="item['鍏抽棴浜�']">
+                            <text>鍏抽棴浜猴細</text>{{item['鍏抽棴浜�']}}
+                        </view>
+                        <view class="detail" v-if="item['鍏抽棴鏃ユ湡']">
+                            <text>鍏抽棴鏃ユ湡锛�</text>{{item['鍏抽棴鏃ユ湡']}}
+                        </view>
+                        <view class="detail" v-if="item['浣滃簾浜�']">
+                            <text>浣滃簾浜猴細</text>{{item['浣滃簾浜�']}}
+                        </view>
+                        <view class="detail" v-if="item['浣滃簾鏃ユ湡']">
+                            <text>浣滃簾鏃ユ湡锛�</text>{{item['浣滃簾鏃ユ湡']}}
+                        </view>
+                    </view>
 
+                    <view class="more" v-if="showDetail == index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+                    <view class="more" v-if="showDetail != index && operations != index">
+                        <view class="part" style="border-right: 1px solid #eee;">
+                            <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+                        </view>
+                        <view class="part" @tap.stop="operations = operations==index?-1:index">
+                            <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;"
+                                size="14"></uni-icons>鎿嶄綔
+                        </view>
+                    </view>
+
+                    <view class="op" v-if="operations == index">
+                        <!-- <button class="op1" size="mini" plain @tap.stop="">瀛愯〃淇℃伅</button> -->
+                        <!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
+                        <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+                        <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+                        <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
+                    </view>
+                </uni-card>
+            </view>
             <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
         </scroll-view>
         <!-- 鍒嗛〉鍣� -->
         <view class="page-footer">
-            <uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="pageMeta.curPage" :pageSize="pageMeta.size"
-                :total="pageMeta.total"></uni-pagination>
+            <uni-pagination id="pagination" title="鏍囬鏂囧瓧" v-model="pageMeta.curPage" :pageSize="pageMeta.size"
+                :total="pageMeta.total" @change="onPageChangeHandler"></uni-pagination>
         </view>
     </view>
 </template>
@@ -70,6 +202,9 @@
     export default {
         data() {
             return {
+                // 璁$畻鍗$墖鍒楄〃楂樺害
+                pagination_top: 0,
+                pageContent_top: 0,
                 // 鍒嗛〉鎺у埗
                 pageMeta: {
                     curPage: 1,
@@ -92,48 +227,93 @@
                 HBillNo: '',
 
                 listData: [],
+                showDetail: -1,
+                operations: -1,
             }
         },
         computed: {
-            dateSwhere: {
+            pageContentHeight: {
                 get() {
-                    let date = new Date()
-                    switch (this.curDateGap) {
-                        case "浠婂ぉ":
-                            return ` and 鏃ユ湡 between convert(date, ${date.toLocaleDateString()}, 110) and convert(date, ${date.toLocaleDateString()}, 110)`;
-                            break;
-                        case "杩戜竴澶�":
-                            return ` and 鏃ユ湡 between convert(date, ${date.setDate(date.getDate() - 1).toLocaleDateString()}, 110) and convert(date, ${date.toLocaleDateString()}, 110)`;
-                            break;
-                        case "杩戜袱澶�":
-                            return ` and 鏃ユ湡 between convert(date, ${date.setDate(date.getDate() - 2).toLocaleDateString()}, 110) and convert(date, ${date.toLocaleDateString()}, 110)`;
-                            break;
-                        case "杩戜笁澶�":
-                            return ` and 鏃ユ湡 between convert(date, ${date.setDate(date.getDate() - 3).toLocaleDateString()}, 110) and convert(date, ${date.toLocaleDateString()}, 110)`;
-                            break;
-                        case "杩戝洓澶�":
-                            return ` and 鏃ユ湡 between convert(date, ${date.setDate(date.getDate() - 4).toLocaleDateString()}, 110) and convert(date, ${date.toLocaleDateString()}, 110)`;
-                            break;
-                        case "杩戜簲澶�":
-                            return ` and 鏃ユ湡 between convert(date, ${date.setDate(date.getDate() - 5).toLocaleDateString()}, 110) and convert(date, ${date.toLocaleDateString()}, 110)`;
-                            break;
-                        case "杩戝叚澶�":
-                            return ` and 鏃ユ湡 between convert(date, ${date.setDate(date.getDate() - 6).toLocaleDateString()}, 110) and convert(date, ${date.toLocaleDateString()}, 110)`;
-                            break;
-                        case "杩戜竷澶�":
-                            return ` and 鏃ユ湡 between convert(date, ${date.setDate(date.getDate() - 7).toLocaleDateString()}, 110) and convert(date, ${date.toLocaleDateString()}, 110)`;
-                            break;
-                        case "杩�30澶�":
-                            return ` and 鏃ユ湡 between convert(date, ${date.setDate(date.getDate() - 30).toLocaleDateString()}, 110) and convert(date, ${date.toLocaleDateString()}, 110)`;
-                            break;
-                        case "浠绘剰闂撮殧":
-                            return ` and 鏃ユ湡 between convert(date, ${date.setDate(this.startDate).toLocaleDateString()}, 110) and convert(date, ${date.setDate(this.startDate).toLocaleDateString()}, 110)`;
-                            break;
-                    }
+                    return (this.pagination_top - this.pageContent_top)
                 }
-            }
+            },
+        },
+        onLoad() {
+            this.onSearchClickHandler()
+        },
+        onPullDownRefresh() {
+          this.onSearchClickHandler()  
+        },
+        async onReady() {
+            // #ifndef MP-WEIXIN
+            let query = uni.createSelectorQuery().in(this)
+            query.select("#pagination")
+                .boundingClientRect((data) => {
+                    if (data) {
+                        this.pagination_top = data.top
+                    } else {
+                        console.log("鏈壘鍒�#pagination鑺傜偣");
+                    }
+                })
+                .exec();
+            query.select("#pageContent")
+                .boundingClientRect((data) => {
+                    if (data) {
+                        this.pageContent_top = data.top
+                    } else {
+                        console.log("鏈壘鍒�#pageContent鑺傜偣");
+                    }
+                })
+                .exec();
+            // #endif
+
         },
         methods: {
+            // 鏂板鍙栨牱鍗�
+            onAddClickHandler() {
+                uni.navigateTo({
+                    url: "/pages/quyangdan/form?operationType=0"
+                })
+            },
+            del(item) {
+                uni.showModal({
+                    title: '鍒犻櫎纭',
+                    content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            CommonUtils.doRequest2({
+                                url: '/QC_TakeSampleCheckBill/DeleteQC_TakeSampleCheckBillMain',
+                                data: {
+                                    HInterID: item['hmainid'],
+                                    user: getUserInfo()['Czymc']
+                                },
+                                resFunction: (res) => {
+                                    let {
+                                        data,
+                                        count,
+                                        Message
+                                    } = res.data
+                                    if (count == 1) {
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: '鍒犻櫎鎴愬姛!'
+                                        })
+                                        this.onSearchClickHandler()
+                                    } else {
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: Message
+                                        })
+                                    }
+                                }
+                            })
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
             goTop: function(e) {
                 // 瑙e喅view灞備笉鍚屾鐨勯棶棰�
                 this.scrollTop = this.old.scrollTop
@@ -181,7 +361,7 @@
                 }
             },
             onSearchClickHandler() {
-                let sWhere = ''
+                let sWhere = ""
                 if (this.startDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.startDate + "'";
                 }
@@ -193,8 +373,17 @@
                 }
                 this.get_DisplayPage(sWhere);
             },
-            onResetClickHandler() {
-
+            clear() {
+                this.curDateGap = "杩戜竷澶�"
+                this.enableCustomDateRange = false
+                this.startDate = dayjs(new Date()).subtract(7, 'day').format('YYYY-MM-DD')
+                this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
+                this.HBillNo = ''
+            },
+            async onResetClickHandler() {
+                this.clear()
+                await this.$nextTick()
+                this.onSearchClickHandler()
             },
             get_DisplayPage(sWhere) {
                 CommonUtils.doRequest2({
@@ -202,8 +391,8 @@
                     data: {
                         "sWhere": sWhere,
                         "user": getUserInfo()["Czymc"],
-                        "page": 1,
-                        "size": 50
+                        "page": this.pageMeta.curPage,
+                        "size": this.pageMeta.size
                     },
                     resFunction: (res) => {
                         let {
@@ -214,8 +403,13 @@
                         console.log('res.data: ', res.data);
                         this.listData = data;
                         this.pageMeta.total = count
+                        uni.stopPullDownRefresh() 
                     }
                 })
+            },
+            onPageChangeHandler() {
+                this.onSearchClickHandler()
+                this.goTop()
             }
         },
     }
@@ -285,6 +479,14 @@
         gap: 10rpx;
         justify-content: space-between;
 
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
         .btn-a {
             background-color: #acacac;
             color: #fff;
@@ -301,11 +503,90 @@
         }
     }
 
+    .page-content {
+        // height: 40vh;
+        box-sizing: border-box;
+        padding: 10rpx 0;
+
+        .card-detail {
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            line-height: 120%;
+
+            .detail {
+                // width: 50%;
+                font-size: 26rpx;
+                margin-bottom: 12rpx;
+                color: #555;
+                margin-right: 20rpx;
+
+                text {
+                    color: #999;
+                    font-size: 26rpx;
+                }
+            }
+        }
+
+        .more {
+            color: #888;
+            font-size: 24rpx;
+            display: flex;
+            border-top: 1px solid #eee;
+            padding-top: 20rpx;
+
+            .part {
+                width: 50%;
+                text-align: center;
+            }
+        }
+
+        .op {
+            display: flex;
+            justify-content: space-around;
+            margin-top: 20rpx;
+
+            button {
+                padding: 0;
+                width: 150rpx;
+                font-size: 25rpx;
+            }
+
+            .op1 {
+                border: 1px solid #41a863;
+                color: #41a863;
+            }
+
+            .op2 {
+                border: 1px solid #d98d00;
+                color: #d98d00;
+            }
+
+            .op3 {
+                border: 1px solid #3a78ff;
+                color: #3a78ff;
+            }
+
+            .op4 {
+                border: 1px solid #da0000;
+                color: #da0000;
+            }
+
+            .op5 {
+                border: 1px solid #888;
+                color: #888;
+            }
+        }
+    }
+
     .page-footer {
         position: fixed;
         bottom: 0;
         width: 100%;
         box-sizing: border-box;
         padding: 32rpx 10rpx;
+
+
     }
 </style>
\ No newline at end of file
diff --git a/pages/saomachuku/table.vue b/pages/saomachuku/table.vue
index 79c297d..01d5b6b 100644
--- a/pages/saomachuku/table.vue
+++ b/pages/saomachuku/table.vue
@@ -451,8 +451,6 @@
                     }
                     await this.$nextTick()
 
-
-
                     let sMainStr = JSON.stringify(this.hform)
                     let sSubStr = JSON.stringify(this.subform)
                     let sMainSub = sMainStr + ';' + sSubStr + ';' + getUserInfo()["Czymc"] + ';' + 1; 
diff --git a/pages/shouliaotongzhi/table_son.vue b/pages/shouliaotongzhi/table_son.vue
index 0d136ff..3fd6f93 100644
--- a/pages/shouliaotongzhi/table_son.vue
+++ b/pages/shouliaotongzhi/table_son.vue
@@ -421,9 +421,9 @@
 T 24 0 300 255 鏃ユ湡: ${this.baseInfo.HDate || ''}
 T 55 0 300 280 (Date) 
 T 24 0 0 300 妫�楠屽憳: 
-L 80 325 250 325 3
+L 80 325 230 325 3
 T 55 0 0 325 (QC)  
-T 24 0 300 300 閲囪喘鍗曞彿: ${this.baseInfo.HInnerBillNo || ''}
+T 24 0 240 300 閲囪喘鍗曞彿: ${this.baseInfo.HInnerBillNo || ''}
 T 55 0 300 325 (Purchase Order No.)  
 T 24 0 0 345 妫�楠岀粨鏋�: 
 T 55 0 0 370 (Inspection status) 

--
Gitblit v1.9.1