From fcd0d5e8655aba83519be297e408cdd07fb133ca Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 08 九月 2025 11:38:11 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/quyangdan/table.vue | 283 ++++++++
components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue | 1
pages.json | 1596 +++++++++++++++++++++++------------------------
package.json | 1
pages/tiaomachaima/tiaomachaima2.vue | 66 -
5 files changed, 1,068 insertions(+), 879 deletions(-)
diff --git a/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue b/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue
index 330fa92..5ea3dbe 100644
--- a/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue
+++ b/components/PushSeOutStockBillPopup/PushSeOutStockBillPopup.vue
@@ -76,7 +76,6 @@
<uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="curPage" :pageSize="size"
:total="length"></uni-pagination>
</view>
-
</uni-popup>
</view>
</template>
diff --git a/package.json b/package.json
index 0a5f075..4c2978e 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
"@psdk/device-ble-uniapp": "^0.6.1",
"@psdk/esc": "^0.6.1",
"@psdk/tspl": "^0.6.1",
+ "dayjs": "^1.11.18",
"echarts": "^5.6.0",
"i": "^0.3.7",
"npm": "^9.5.1",
diff --git a/pages.json b/pages.json
index d2dd977..30fa352 100644
--- a/pages.json
+++ b/pages.json
@@ -2,824 +2,780 @@
"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": "璁惧妗ｆ"
- }
- },
- {
- "path": "pages/shebeidangan/table",
- "style": {
- "navigationBarTitleText": "璁惧妗ｆ",
- "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": "鏉＄爜妗ｆ"
- }
- },
- {
- "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/jishikucunchaxun/table",
- "style": {
- "navigationBarTitleText": "ERP鍙婃椂搴撳瓨鏌ヨ"
- // "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/weiwairuku/table",
- "style": {
- "navigationBarTitleText": "濮斿鍏ュ簱"
- }
- },
- {
- "path": "pages/weiwairuku/form",
- "style": {
- "navigationBarTitleText": "濮斿鍏ュ簱鍗�"
- }
- },
- {
- "path": "pages/tiaomaguanli/table",
- "style": {
- "navigationBarTitleText": "鏉＄爜绠＄悊"
- }
- },
- {
- "path": "pages/tiaomaguanli/table_son",
- "style": {
- "navigationBarTitleText": "鏉＄爜鐢熸垚"
- }
- },
- {
- "path" : "pages/huanyangdan/table",
- "style" :
- {
- "navigationBarTitleText" : "杩樻牱鍗曠淮鎶�"
- }
- },
- {
- "path" : "pages/huanyangdan/form",
- "style" :
- {
- "navigationBarTitleText" : "杩樻牱鍗�"
- }
- },
- {
- "path" : "pages/quyangdan/table",
- "style" :
- {
- "navigationBarTitleText" : "鍙栨牱鍗曠淮鎶�"
- }
- },
- {
- "path" : "pages/quyangdan/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": {}
+ "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": "璁惧妗ｆ"
+ }
+ },
+ {
+ "path": "pages/shebeidangan/table",
+ "style": {
+ "navigationBarTitleText": "璁惧妗ｆ",
+ "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": "鏉＄爜妗ｆ"
+ }
+ },
+ {
+ "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": {}
}
\ No newline at end of file
diff --git a/pages/quyangdan/table.vue b/pages/quyangdan/table.vue
index c8e5017..4e658c7 100644
--- a/pages/quyangdan/table.vue
+++ b/pages/quyangdan/table.vue
@@ -1,21 +1,135 @@
<template>
<view>
- <view class="page-header"></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-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">
+
+ <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
</scroll-view>
<!-- 鍒嗛〉鍣� -->
- <view class="page-footer"></view>
+ <view class="page-footer">
+ <uni-pagination id="#pagination" title="鏍囬鏂囧瓧" v-model="pageMeta.curPage" :pageSize="pageMeta.size"
+ :total="pageMeta.total"></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 {
+ // 鍒嗛〉鎺у埗
+ 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: [],
+ }
+ },
+ computed: {
+ dateSwhere: {
+ 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;
+ }
}
}
},
@@ -26,11 +140,172 @@
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);
+ },
+ onResetClickHandler() {
+
+ },
+ get_DisplayPage(sWhere) {
+ CommonUtils.doRequest2({
+ url: '/QC_TakeSampleCheckBill/getQC_TakeSampleCheckBillListPage',
+ data: {
+ "sWhere": sWhere,
+ "user": getUserInfo()["Czymc"],
+ "page": 1,
+ "size": 50
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ console.log('res.data: ', res.data);
+ this.listData = data;
+ this.pageMeta.total = count
+ }
+ })
}
- }
+ },
}
</script>
-<style>
+<style lang="scss">
+ .page-header {
+ display: flex;
+ box-sizing: border-box;
+ padding: 20rpx;
+ flex-direction: column;
+ gap: 10rpx;
+ font-size: 32rpx;
+ .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;
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ .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/tiaomachaima/tiaomachaima2.vue b/pages/tiaomachaima/tiaomachaima2.vue
index 52c9299..8c401ad 100644
--- a/pages/tiaomachaima/tiaomachaima2.vue
+++ b/pages/tiaomachaima/tiaomachaima2.vue
@@ -140,8 +140,7 @@
return {
CommonUtils,
userInfo: getUserInfo(),
- serverUrl: 'http://192.168.2.227:8082/API',
- // serverUrl: 'http://47.96.97.237/API/',
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
barCodeInfoMeta: {
barCodeNo: "",
splitNum: "",
@@ -263,13 +262,12 @@
title: '鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉＄爜鍘熸暟閲�!'
});
}
-
- uni.request({
- url: this.serverUrl + '/Sc_BarCode/SplitBarCode_Sub',
- data: {
+ this.doRequest(
+ "/Sc_BarCode/SplitBarCode_Sub",
+ {
HBarCodeNo: this.barCodeInfoMeta.barCodeNo,
},
- success: (res) => {
+ (res) => {
this.barCodeSplitInfo = []
if (res.data.count > 0) {
@@ -281,13 +279,14 @@
}
//鎷嗗垎鏉＄爜锛氭暟閲忎负 splitNum
- // let barCodeItem1 = JSON.parse(JSON.stringify(res.data.data.SubBarCodes[0]));
+ let barCodeItem1 = JSON.parse(JSON.stringify(res.data.data.SubBarCodes[0]));
let HSplitNum = this.barCodeInfoMeta.splitNum;
- let HBarCode = res.data.data.NextBarCode;
- console.log('HBarCode: ',HBarCode);
this.barCodeSplitInfo.push({
HSplitNum: this.barCodeInfoMeta.splitNum,
- HBarCode: res.data.data.NextBarCode
+ HBarCode: res.data.data.NextBarCode,
+ HNumber: barCodeItem1.HNumber,
+ HName: barCodeItem1.HName,
+ HModel: barCodeItem1.HModel
});
//鏇存柊鍘熷厛鏉＄爜鏁伴噺
@@ -301,51 +300,10 @@
});
}
},
- fail: (err) => {
+ (err) => {
console.error(err)
}
- })
-
- // this.doRequest(
- // "/Sc_BarCode/SplitBarCode_Sub",
- // {
- // HBarCodeNo: this.barCodeInfoMeta.barCodeNo,
- // },
- // (res) => {
- // this.barCodeSplitInfo = []
- // if (res.data.count > 0) {
-
- // if (res.data.data.length < 1) {
- // return uni.showToast({
- // icon: 'none',
- // title: Message
- // });
- // }
-
- // //鎷嗗垎鏉＄爜锛氭暟閲忎负 splitNum
- // let barCodeItem1 = JSON.parse(JSON.stringify(res.data.data.SubBarCodes[0]));
- // HSplitNum = this.barCodeInfoMeta.splitNum;
- // HBarCode = res.data.NextBarCode;
- // this.barCodeSplitInfo.push({
- // HSplitNum: this.barCodeInfoMeta.splitNum,
- // HBarCode: res.data.NextBarCode
- // });
-
- // //鏇存柊鍘熷厛鏉＄爜鏁伴噺
- // this.barCodeInfo['鍓╀綑鏁伴噺'] = this.barCodeInfo['鏁伴噺'] - this.barCodeInfoMeta.splitNum;
-
- // this.cantGenerate = false;
- // } else {
- // uni.showToast({
- // icon: 'none',
- // title: '娌℃湁鎵惧埌瀵瑰簲鐨勫崟鎹�'
- // });
- // }
- // },
- // (err) => {
- // console.error(err)
- // }
- // )
+ )
},
//淇濆瓨鏂规硶
SaveBarCodeCreate() {
--
Gitblit v1.9.1