From 4c871e4c1afee9f9cb4a50378b074684de606e37 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 01 九月 2025 07:53:09 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages.json | 778 +++++++++++++++++++++++++++++++++++
pages/index/tab2.vue | 7
.hbuilderx/launch.json | 2
pages/tiaomachaima/tiaomachaima2.vue | 497 ++++++++++++++++++++++
4 files changed, 1,282 insertions(+), 2 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index d7abf73..4dd14cd 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -25,7 +25,7 @@
"localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
"openVueDevtools" : true,
"packageName" : "com.shebeiguanli.www",
- "playground" : "custom",
+ "playground" : "standard",
"type" : "uni-app:app-android"
}
]
diff --git a/pages.json b/pages.json
index 6815974..7b0ff69 100644
--- a/pages.json
+++ b/pages.json
@@ -2,7 +2,783 @@
"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" : "淇敼瀵嗙爜"
+ }
+ }
+ ],
+ "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"
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 5eb30ea..f7d578a 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -209,6 +209,13 @@
id: 28,
hidden: false,
},
+ {
+ img: '../../static/icon/icon21.png',
+ text: '鏉＄爜鎷嗙爜2',
+ url: '/pages/tiaomachaima/tiaomachaima2',
+ id: 29,
+ hidden: false,
+ },
// , {
// img: '../../static/icon/icon1.png',
// text: '璁惧妗ｆ鏌ヨ',
diff --git a/pages/tiaomachaima/tiaomachaima2.vue b/pages/tiaomachaima/tiaomachaima2.vue
new file mode 100644
index 0000000..92c2982
--- /dev/null
+++ b/pages/tiaomachaima/tiaomachaima2.vue
@@ -0,0 +1,497 @@
+<template>
+ <view class="container">
+ <view class="header">
+ <view class="item">
+ <view class="left">鏉＄爜缂栧彿锛�</view>
+ <view class="right">
+ <input name="HBarCode" v-model="barCodeInfoMeta.barCodeNo" placeholder="璇锋壂鎻忔潯鐮�"
+ @blur="searchbarCodeInfo" />
+ </view>
+ <view>
+ <uni-icons type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
+ size="20" @click="toScanCode"></uni-icons>
+ </view>
+ </view>
+ <view class="item">
+ <view class="left">鎷嗙爜鏁伴噺锛�</view>
+ <view class="right">
+ <input type="number" name="HSplitNum" v-model="barCodeInfoMeta.splitNum" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�" />
+ </view>
+ </view>
+ <view class="item">
+ <view class="left">鍒跺崟浜猴細</view>
+ <view class="right">
+ <input type="text" disabled name="HMaker" v-model="barCodeInfoMeta.billMaker"
+ placeholder="璇疯緭鍏ュ埗鍗曚汉" />
+ </view>
+ </view>
+ <view class="operation-zone">
+ <button class="btn-c" @click="searchbarCodeInfoMeta">鎷嗙爜</button>
+ <button type="default" :class="cantGenerate?'':'btn-c'" @click="SaveBarCodeCreate"
+ :disabled="cantGenerate">鐢熸垚</button>
+ <button type="default" :class="cantPrint?'':'btn-c'" @click="PrintHBarCode" :disabled="cantPrint" >鎵撳嵃</button>
+ </view>
+ </view>
+ <view class="divide"></view>
+ <view class="content">
+ <view class="barcode-detail" v-show="CommonUtils.isEmpty(Object.assign(barCodeInfo, {})) === false">
+ <view class="title">鏉＄爜淇℃伅</view>
+ <uni-card>
+ <view class="detail" style="display: none;">
+ <text>鏉＄爜ID锛�</text>{{barCodeInfo['HItemID'] || '0'}}
+ </view>
+ <view class="detail">
+ <text>鏉＄爜缂栧彿锛�</text>{{barCodeInfo['鏉＄爜缂栧彿'] || ''}}
+ </view>
+ <view class="detail">
+ <text>鏉＄爜鍘熸暟閲忥細</text>{{barCodeInfo['鏁伴噺'] || '0'}}
+ </view>
+ <view class="detail">
+ <text>鍓╀綑鏁伴噺锛�</text>{{barCodeInfo['鍓╀綑鏁伴噺'] || '0'}}
+ </view>
+ <view class="dWetail">
+ <text>鐗╂枡缂栫爜锛�</text>{{barCodeInfo['鐗╂枡浠ｇ爜'] || ''}}
+ </view>
+ <view class="detail">
+ <text>鐗╂枡鍚嶇О锛�</text>{{barCodeInfo['鐗╂枡鍚嶇О'] || ''}}
+ </view>
+ <view class="detail">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{barCodeInfo['瑙勬牸鍨嬪彿'] || ''}}
+ </view>
+ <view class="detail">
+ <text>璁￠噺鍗曚綅锛�</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
+ </view>
+ </uni-card>
+ </view>
+ <view class="divide"></view>
+ <view class="barcode-split" v-show="barCodeSplitInfo.length>0">
+ <view class="title">鏉＄爜鎷嗙爜</view>
+ <view class="barcode-split-list" v-for="(item,index) in barCodeSplitInfo" :key="index">
+ <uni-card @tap="ModityHQty(item)">
+ <view class="detail">
+ <text>鏉＄爜缂栧彿锛�</text>{{item['HBarCode'] || ''}}
+ </view>
+ <view class="detail split-num">
+ <text>鎷嗗垎鏁伴噺锛�</text>{{item['HSplitNum'] || '0'}}
+ </view>
+ <view class="detail">
+ <text>鐗╂枡浠ｇ爜锛�</text>{{item['HNumber'] || ''}}
+ </view>
+ <view class="detail">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item['HName'] || ''}}
+ </view>
+ <view class="detail">
+ <text>瑙勬牸鍨嬪彿锛�</text>{{item['HModel'] || ''}}
+ </view>
+ <view class="detail">
+ <text>璁￠噺鍗曚綅锛�</text>{{barCodeInfo['璁￠噺鍗曚綅'] || ''}}
+ </view>
+ </uni-card>
+ </view>
+ </view>
+ </view>
+ <view class="over" v-if="barCodeSplitInfo.length == 0">鏆傛棤鏁版嵁</view>
+ <view class="over" v-if="barCodeSplitInfo.length != 0">宸插埌搴�</view>
+ <view>
+ <!-- 杈撳叆妗嗙ず渚� -->
+ <uni-popup ref="inputDialog" type="dialog">
+ <uni-popup-dialog ref="inputClose" mode="input" title="璇疯緭鍏ユ媶鐮佹暟閲�" :value="dialogVal" placeholder="璇疯緭鍏ユ媶鐮佹暟閲�"
+ @confirm="dialogInputConfirm"></uni-popup-dialog>
+ </uni-popup>
+ </view>
+ <labelPrinterComponentVue ref="labelPrinter" :printInfo="printInfo" :printMode="'cpcl'">
+ </labelPrinterComponentVue>
+ </view>
+</template>
+
+<script>
+ import labelPrinterComponentVue from '../../components/labelPrinterComponent/labelPrinterComponent.vue';
+ import {
+ CBar,
+ CBox,
+ CForm,
+ CImage,
+ CLine,
+ CCodeRotation,
+ CCodeType,
+ CPage,
+ CText,
+ CFont,
+ CBold,
+ CRotation,
+ CInverse,
+ CMag,
+ CQRCode,
+ CCorrectLevel,
+ CSN,
+ CStatus,
+ CPCL,
+ } from "@psdk/cpcl";
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from "@/utils/common.js"
+ export default {
+ data() {
+ return {
+ CommonUtils,
+ userInfo: getUserInfo(),
+ serverUrl: 'http://192.168.2.227:8082/API',
+ barCodeInfoMeta: {
+ barCodeNo: "",
+ splitNum: "",
+ billMaker: getUserInfo().HEmpName,
+ billMakerID: getUserInfo().HEmpID
+ },
+ barCodeInfo: {
+
+ },
+ barCodeSplitInfo: [],
+ dialogVal: 0,
+ itemCache: {},
+ cantGenerate: true,
+ cantPrint:true,
+ printInfo: ""//鎵撳嵃
+ };
+ },
+ components: {
+ labelPrinterComponentVue
+ },
+ methods: {
+ doRequest(url, data, resFunction, errFunction, method) {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ })
+ uni.request({
+ method: method || "GET",
+ url: this.serverUrl + url,
+ data: data || "",
+ success: (res) => {
+ if (typeof resFunction === 'function') {
+ resFunction.call(this, res)
+ } else if (typeof errFunction === 'undefined') {
+ return
+ } else {
+ throw new TypeError("璁块棶鎴愬姛鍥炶皟鍑芥暟绫诲瀷寮傚父!")
+ }
+ },
+ fail: (err) => {
+ uni.showToast({
+ icon: "error",
+ title: "鎺ュ彛璁块棶寮傚父!",
+ duration: 2000
+ })
+ if (typeof errFunction === 'function') {
+ errFunction.call(this, err)
+ } else if (typeof errFunction === 'undefined') {
+ return
+ } else {
+ throw new TypeError("璁块棶澶辫触鍥炶皟鍑芥暟绫诲瀷寮傚父!")
+ }
+ }
+ })
+ uni.hideLoading()
+ },
+ //鎽勫儚澶磋皟鐢�
+ async searchbarCodeInfo() {
+ await this.$nextTick()
+ let urlEncode =
+ `/Gy_BarCodeBillList/page?sWhere= and 鏉＄爜缂栧彿=\'\'${this.barCodeInfoMeta.barCodeNo}\'\'&user=${this.userInfo.HEmpName}&page=1&size=1`
+ .toString()
+ if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) == true) {
+ return uni.showToast({
+ icon: "fail",
+ title: "鏉＄爜缂栧彿涓嶈兘涓虹┖!"
+ })
+ }
+ this.doRequest(
+ urlEncode,
+ null,
+ function(res) {
+ console.log(res)
+ let res1 = res.data
+ let {data,count} = res1
+ if (count > 0) {
+ this.barCodeInfo = data[0]
+ this.barCodeSplitInfo= []
+ }
+ },
+ function(err) {
+ console.err(err)
+ }
+ )
+ },
+ //鎷嗙爜鎸夐挳璋冪敤
+ async searchbarCodeInfoMeta() {
+ this.cantGenerate = true
+ this.cantPrint=true
+ if (CommonUtils.isEmpty(this.barCodeInfoMeta.barCodeNo) === true) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鏉＄爜缂栧彿涓嶅緱涓虹┖!'
+ });
+ }
+ if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
+ });
+ }
+ if (CommonUtils.isEmpty(this.barCodeInfoMeta.splitNum, true) === true) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鎷嗗垎鏁伴噺涓嶅緱涓虹┖!'
+ });
+ }
+ if (parseFloat(this.barCodeInfoMeta.splitNum) > parseFloat(this.barCodeInfo['鏁伴噺'])) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉＄爜鍘熸暟閲�!'
+ });
+ }
+ this.doRequest(
+ "/Sc_BarCode/SplitBarCode_Sub", {
+ HBarCodeNo: this.barCodeInfoMeta.barCodeNo
+ },
+ function(res) {
+ console.log(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]));
+ barCodeItem1.HSplitNum = this.barCodeInfoMeta.splitNum;
+ barCodeItem1.HBarCode = res.data.data.NextBarCode;
+ this.barCodeSplitInfo.push(barCodeItem1);
+
+ //鏇存柊鍘熷厛鏉＄爜鏁伴噺
+ this.barCodeInfo['鍓╀綑鏁伴噺'] = this.barCodeInfo['鏁伴噺'] - this.barCodeInfoMeta.splitNum;
+
+ this.cantGenerate = false;
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: '娌℃湁鎵惧埌瀵瑰簲鐨勫崟鎹�'
+ });
+ }
+ },
+ function(err) {
+ console.error(err)
+ }
+ )
+ },
+ //淇濆瓨鏂规硶
+ SaveBarCodeCreate() {
+ // 鏍￠獙鎷嗙爜鏁伴噺
+ let sum = this.barCodeSplitInfo.reduce((acc, obj) => {
+ return acc + obj["HSplitNum"]
+ }, 0)
+
+ if (sum > this.barCodeInfo["HQty"]) {
+ return uni.showToast({
+ icon: 'none',
+ title: '鎷嗙爜鏁伴噺鍜屼笉寰楀ぇ浜庢潯鐮佹暟閲�'
+ });
+ }
+ let msg =
+ `${this.barCodeInfoMeta["barCodeNo"]};${this.barCodeInfoMeta["splitNum"]};${JSON.stringify(this.barCodeSplitInfo)};${this.userInfo["HEmpName"]}`
+ this.doRequest(
+ "/Sc_BarCode/SplitBarCode_Save", {
+ msg: msg
+ },
+ function(res) {
+ if (res.data.code == 1) {
+ this.cantGenerate = true
+ this.cantPrint=false
+ uni.showToast({
+ title: '鐢熸垚鎴愬姛!'
+ });
+ }else{
+ this.cantGenerate = false
+ uni.showToast({
+ title: res.data.Message
+ });
+ }
+
+ },
+ function(err) {
+ console.err(err)
+ },
+ "POST"
+ )
+
+ },
+ //鎵撳嵃鎸夐挳
+ async PrintHBarCode() {
+ if (this.$printer.isConnected() === false) {
+ this.$refs.labelPrinter.openPopup()
+ }
+ else
+ {
+ let HBarCodeNoStr =`${this.barCodeSplitInfo[0]['HBarCode']}`
+ this.printInfo = `! 0 200 200 400 1
+ PAGE-WIDTH 608
+ SETQRVER 3
+ B QR 475 15 Q 0 U 3
+ LA,${HBarCodeNoStr}
+ ENDQR
+ T 24 0 0 30 渚涘簲鍟�: ${this.lailiaoInfo.HSupName}
+ T 55 0 0 55 (Supplier)
+ T 24 0 0 75 渚涘簲鍟嗘枡鍙�: ${this.lailiaoInfo.HMaterNumber}
+ T 55 0 0 100 (Supplier Sku No.)
+ T 24 0 0 120 鐗╂枡鍚嶇О: ${this.lailiaoInfo.HMaterName}
+ T 55 0 0 145 (Material Code)
+ T 24 0 0 165 娆惧彿: ${this.lailiaoInfo.HCoilNO}
+ T 55 0 0 190 (Style No.)
+ T 24 0 300 165 瀹㈡埛缂栧彿: ${this.lailiaoInfo.HFactory}
+ T 55 0 300 190 (Consumer No.)
+ T 24 0 0 210 鍒嗙粍: ${this.lailiaoInfo.HFurnaceNO || ''}
+ T 55 0 0 235 (Group)
+ T 24 0 300 210 瑙勬牸: ${this.lailiaoInfo.HMaterModel}
+ T 55 0 300 235 (SKU NO.)
+ T 24 0 0 255 鏁伴噺: ${ parseFloat(this.lailiaoInfo.HQty || 0).toFixed(0) } ${pcsInfo}
+ T 55 0 0 280 (Quantity)
+ T 24 0 300 255 鏃ユ湡: ${this.lailiaoInfo.HDate || ''}
+ T 55 0 300 280 (Date)
+ T 24 0 0 300 妫�楠屽憳:
+ T 55 0 0 325 (QC)
+ T 24 0 300 300 閲囪喘鍗曞彿: ${this.lailiaoInfo.HBillNo || ''}
+ T 55 0 300 325 (Purchase Order No.)
+ T 24 0 0 345 妫�楠岀粨鏋�:
+ T 55 0 0 370 (Inspection status)
+ BOX 240 345 260 365 4
+ T 24 0 270 345 鍚堟牸
+ T 55 0 250 370 (Pass)
+ BOX 340 345 360 365 4
+ T 24 0 370 345 涓嶅悎鏍�
+ T 55 0 370 370 (Fail)
+ BOX 460 345 480 365 4
+ T 24 0 490 345 鐗归噰
+ T 55 0 440 370 (Spec. accepted)
+ FORM
+ PRINT`
+ await this.$nextTick(() => {
+ this.$refs.labelPrinter.execPrint()
+ })
+ }
+ },
+ toScanCode() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval':'10', //瓒呮椂鏃堕棿
+ 'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ },(ret) => {
+ console.log(ret.resp_result)
+ if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
+ console.log('鏉＄爜鍐呭锛�' + ret.resp_result);
+ this.barCodeInfoMeta.barCodeNo = ret.resp_result
+
+ this.searchbarCodeInfo()
+ }
+ })
+ }
+ },
+ onLoad() {
+ }
+ }
+</script>
+
+<style lang="scss">
+ * {
+ box-sizing: border-box;
+ }
+
+ input {
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ line-height: 30rpx;
+ }
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .uni-card {
+ margin: 0 !important;
+ }
+
+ .container {
+ .header {
+ padding: 20rpx 10rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 20rpx;
+
+ .item {
+ display: flex;
+ flex-direction: row;
+ padding: 0 10rpx;
+ gap: 20rpx;
+ font-size: 30rpx;
+ // height: 1.5rem;
+ // justify-content: center;
+ align-items: center;
+
+ .left {
+ text-align: right;
+ width: 5rem;
+ }
+
+ .right {
+ flex: 1;
+ height: 100%;
+ padding: 6rpx 0;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+
+ >input {
+ height: auto;
+ }
+ }
+ }
+
+ .operation-zone {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-evenly;
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+ }
+
+ .divide {
+ width: 100%;
+ height: 16rpx;
+ background-color: #e5e5e5;
+ }
+
+ .content {
+ flex: 1;
+
+ .barcode-detail,
+ .barcode-split {
+ padding: 30rpx;
+ display: flex;
+ flex-direction: column;
+ gap: 30rpx;
+ }
+ }
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.1