From e7e65571bd75e7f8aa20ee2e151e77af824fabc0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 01 九月 2025 09:52:56 +0800
Subject: [PATCH] 添加 条码已存在时 计算 条码数量和每箱数量
---
pages.json | 807 ++-------------------------------------------------------
pages/tiaomaguanli/table_son.vue | 17 +
.hbuilderx/launch.json | 2
pages/xiaoshouchuku/form.vue | 3
components/blueToothConnector/blueToothConnector.vue | 4
5 files changed, 49 insertions(+), 784 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 4dd14cd..d7abf73 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" : "standard",
+ "playground" : "custom",
"type" : "uni-app:app-android"
}
]
diff --git a/components/blueToothConnector/blueToothConnector.vue b/components/blueToothConnector/blueToothConnector.vue
index d642203..ce6052b 100644
--- a/components/blueToothConnector/blueToothConnector.vue
+++ b/components/blueToothConnector/blueToothConnector.vue
@@ -202,14 +202,12 @@
})
// console.log("msg: " + cmd);
let toast = (msg) => {
+ uni.hideLoading()
uni.showToast({
icon: 'none',
title: msg,
duration: 2000
})
- setTimeout(() => {
- uni.hideLoading()
- }, 3000)
}
let that = this
return new Promise((resolve, reject) => {
diff --git a/pages.json b/pages.json
index 7b0ff69..6b49cf5 100644
--- a/pages.json
+++ b/pages.json
@@ -737,7 +737,37 @@
{
"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": "鏉＄爜鐢熸垚"
+ }
+ }
],
"tabBar": {
"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
@@ -778,779 +808,4 @@
"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/form",
- "style": {
- "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
- "enablePullDownRefresh": false
- }
- },
- {
- "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/wuliaosaoma/wuliaosaoma",
- "style": {
- "navigationBarTitleText": "鐗╂枡娓呭崟"
- }
- },
- {
- "path": "pages/wuliaosaoma/detail",
- "style": {
- "navigationBarTitleText": "鏉＄爜妗ｆ"
- }
- },
- {
- "path": "pages/caigouruku/table",
- "style": {
- "navigationBarTitleText": "閲囪喘鍏ュ簱",
- "enablePullDownRefresh": true
- }
- },
- {
- "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/saomachuku/table",
- "style" :
- {
- "navigationBarTitleText" : "鎵爜鍑哄簱",
- "enablePullDownRefresh": true
- }
- }
- ],
- "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/tiaomaguanli/table_son.vue b/pages/tiaomaguanli/table_son.vue
index 27cd4c7..0ec9bf2 100644
--- a/pages/tiaomaguanli/table_son.vue
+++ b/pages/tiaomaguanli/table_son.vue
@@ -55,7 +55,7 @@
<!-- <button class="btn-c" size="mini" type="default" @tap="searchLabelPrinter()">鎼滅储鎵撳嵃鏈�</button> -->
<!-- :disabled="codeGenComplete == false" -->
<button :class="codeGenComplete == false? 'btn-a': 'btn-c'" size="mini" type="default"
- @tap="search">鎵撳嵃</button>
+ :disabled="codeGenComplete == false" @tap="search">鎵撳嵃</button>
</view>
</view>
@@ -329,6 +329,10 @@
var HSourceBillType = "鏀舵枡閫氱煡鍗�";
//鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
var HSelectBarCodeType = "鍞竴鏉＄爜";
+
+ if(uni.getStorageSync('Organization').includes('娴疯瘹')){
+ HSelectBarCodeType = "鍝佺鏉＄爜";
+ }
//鑾峰彇褰撳墠鐧诲綍浜哄憳
var UserName = uni.getStorageSync('HUserName');
let listDataTemp = []
@@ -401,7 +405,14 @@
HBarCodeNo: item['HBarCode'],
HInterID: item['HInterID']
})
-
+ })
+
+ this.baseInfo.HBQty = res.data.data.length
+ this.baseInfo.HMinQty = Math.ceil(this.baseInfo.HQty / res.data.data.length)
+ this.codeGenComplete = true
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
})
}else {
this.codeGenComplete = true
@@ -565,7 +576,7 @@
HBillInterID: this.linterid,
HBillEntryID: this.HEntryID,
HViewName: 'h_v_IF_POInStockBillList',
- HBillSubType: '1203',
+ HBillSubType: '1103',
HInterID: HInterID
},
resFunction: (res) => {
diff --git a/pages/xiaoshouchuku/form.vue b/pages/xiaoshouchuku/form.vue
index f960aa4..8ef2c9e 100644
--- a/pages/xiaoshouchuku/form.vue
+++ b/pages/xiaoshouchuku/form.vue
@@ -401,7 +401,8 @@
computed: {
enableModule: {
get() {
- if (this.hform.HMainSourceBillType == 1402) {
+ console.log('typeof(Organization): ',typeof(uni.getStorageSync('Organization')));
+ if (this.hform.HMainSourceBillType == 1402 && uni.getStorageSync('Organization').includes('鍏磋揪')) {
return 1
} else {
return 2
--
Gitblit v1.9.1