From 8e5ede49987bcfa4e56e98641fb11070210f4f35 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 11 三月 2026 17:50:49 +0800
Subject: [PATCH] 进销存升级app 1.底部操作栏图标修改 2.首页生产报工调准没反应修改
---
src/pages/index.vue | 24 +++++++++++++++++++++++-
src/static/images/tabbar/myBlue.png | 0
/dev/null | 0
src/pages.json | 14 +++++++-------
src/static/images/tabbar/new.png | 0
src/static/images/tabbar/newBlue.png | 0
src/pages/productionManagement/productionReport/index.vue | 11 +++++++++++
src/static/images/tabbar/home.png | 0
src/static/images/tabbar/homeBlue.png | 0
src/static/images/tabbar/workBlue.png | 0
src/static/images/tabbar/my.png | 0
11 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index 8d715d0..044361a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1197,25 +1197,25 @@
{
"pagePath": "pages/index",
"iconPath": "static/images/tabbar/home.png",
- "selectedIconPath": "static/images/tabbar/home_.png",
+ "selectedIconPath": "static/images/tabbar/homeBlue.png",
"text": "棣栭〉"
},
{
"pagePath": "pages/works",
- "iconPath": "static/images/tabbar/home.png",
- "selectedIconPath": "static/images/tabbar/home_.png",
+ "iconPath": "static/images/tabbar/work.png",
+ "selectedIconPath": "static/images/tabbar/workBlue.png",
"text": "宸ヤ綔鍙�"
},
{
"pagePath": "pages/message",
- "iconPath": "static/images/tabbar/work.png",
- "selectedIconPath": "static/images/tabbar/work_.png",
+ "iconPath": "static/images/tabbar/new.png",
+ "selectedIconPath": "static/images/tabbar/newBlue.png",
"text": "娑堟伅"
},
{
"pagePath": "pages/mine",
- "iconPath": "static/images/tabbar/mine.png",
- "selectedIconPath": "static/images/tabbar/mine_.png",
+ "iconPath": "static/images/tabbar/my.png",
+ "selectedIconPath": "static/images/tabbar/myBlue.png",
"text": "鎴戠殑"
}
]
diff --git a/src/pages/index.vue b/src/pages/index.vue
index bc5e836..3c122d7 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -213,7 +213,7 @@
label: "鐢熶骇鎶ュ伐",
icon: "/static/images/icon/shengchanbaogong@2x.png",
bgColor: "linear-gradient(135deg,#3b82f6,#2563eb)",
- route: "/pages/productionManagement/productionReport/index",
+ action: "scan",
},
{
label: "璁惧宸℃",
@@ -250,6 +250,28 @@
}
function handleQuickTool(item) {
+ if (item?.action === "scan") {
+ // 鐢熶骇鎶ュ伐 - 璋冪敤鎵爜
+ uni.scanCode({
+ success: (res) => {
+ console.log("鎵爜缁撴灉:", res);
+ // 瑙ｆ瀽鎵爜缁撴灉骞惰烦杞埌鐢熶骇鎶ュ伐椤甸潰
+ try {
+ const scanResult = JSON.parse(res.result);
+ uni.navigateTo({
+ url: `/pages/productionManagement/productionReport/index?orderRow=${encodeURIComponent(JSON.stringify(scanResult))}`
+ });
+ } catch (e) {
+ console.error("鎵爜缁撴灉瑙ｆ瀽澶辫触:", e);
+ uni.showToast({ title: "鏃犳晥鐨勪簩缁寸爜", icon: "none" });
+ }
+ },
+ fail: (err) => {
+ console.error("鎵爜澶辫触:", err);
+ }
+ });
+ return;
+ }
if (!item?.route) return;
uni.navigateTo({ url: item.route });
}
diff --git a/src/pages/productionManagement/productionReport/index.vue b/src/pages/productionManagement/productionReport/index.vue
index 16412c1..dcd0fd7 100644
--- a/src/pages/productionManagement/productionReport/index.vue
+++ b/src/pages/productionManagement/productionReport/index.vue
@@ -182,6 +182,17 @@
// 椤甸潰鍔犺浇鏃跺垵濮嬪寲鏁版嵁
onLoad(options => {
console.log(options, "options");
+ // 濡傛灉娌℃湁 orderRow 鍙傛暟锛岃鏄庢槸浠庨椤电洿鎺ヨ烦杞紝闇�瑕佺敤鎴锋墜鍔ㄩ�夋嫨璁㈠崟
+ if (!options.orderRow) {
+ console.log("浠庨椤佃烦杞紝鏃犺鍗曟暟鎹�");
+ getInfo().then(res => {
+ // 榛樿浣跨敤褰撳墠鐧诲綍鐢ㄦ埛
+ form.value.userId = res.user.userId;
+ form.value.userName = res.user.userName;
+ form.value.schedulingUserId = res.user.userId;
+ });
+ return;
+ }
try {
const orderRow = JSON.parse(options.orderRow);
console.log("鏋勯�犵殑orderRow:", orderRow);
diff --git a/src/static/images/tabbar/home.png b/src/static/images/tabbar/home.png
index 50acdfd..b051264 100644
--- a/src/static/images/tabbar/home.png
+++ b/src/static/images/tabbar/home.png
Binary files differ
diff --git a/src/static/images/tabbar/homeBlue.png b/src/static/images/tabbar/homeBlue.png
new file mode 100644
index 0000000..5e93119
--- /dev/null
+++ b/src/static/images/tabbar/homeBlue.png
Binary files differ
diff --git a/src/static/images/tabbar/home_.png b/src/static/images/tabbar/home_.png
deleted file mode 100644
index a408f71..0000000
--- a/src/static/images/tabbar/home_.png
+++ /dev/null
Binary files differ
diff --git a/src/static/images/tabbar/mine.png b/src/static/images/tabbar/mine.png
deleted file mode 100644
index f13fe44..0000000
--- a/src/static/images/tabbar/mine.png
+++ /dev/null
Binary files differ
diff --git a/src/static/images/tabbar/mine_.png b/src/static/images/tabbar/mine_.png
deleted file mode 100644
index 8a0a742..0000000
--- a/src/static/images/tabbar/mine_.png
+++ /dev/null
Binary files differ
diff --git a/src/static/images/tabbar/my.png b/src/static/images/tabbar/my.png
new file mode 100644
index 0000000..f1d0053
--- /dev/null
+++ b/src/static/images/tabbar/my.png
Binary files differ
diff --git a/src/static/images/tabbar/myBlue.png b/src/static/images/tabbar/myBlue.png
new file mode 100644
index 0000000..3cd72fe
--- /dev/null
+++ b/src/static/images/tabbar/myBlue.png
Binary files differ
diff --git a/src/static/images/tabbar/new.png b/src/static/images/tabbar/new.png
new file mode 100644
index 0000000..0e9d139
--- /dev/null
+++ b/src/static/images/tabbar/new.png
Binary files differ
diff --git a/src/static/images/tabbar/newBlue.png b/src/static/images/tabbar/newBlue.png
new file mode 100644
index 0000000..25b1e44
--- /dev/null
+++ b/src/static/images/tabbar/newBlue.png
Binary files differ
diff --git a/src/static/images/tabbar/workBlue.png b/src/static/images/tabbar/workBlue.png
new file mode 100644
index 0000000..77d7a29
--- /dev/null
+++ b/src/static/images/tabbar/workBlue.png
Binary files differ
diff --git a/src/static/images/tabbar/work_.png b/src/static/images/tabbar/work_.png
deleted file mode 100644
index 80b979c..0000000
--- a/src/static/images/tabbar/work_.png
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3