From ec00255aab24865cd785e181704e502354b9c8f6 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 13 三月 2026 13:52:49 +0800
Subject: [PATCH] Merge branch 'dev_KT' of http://114.132.189.42:9002/r/product-inventory-APP-before into dev_KT
---
src/pages/index.vue | 173 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 86 insertions(+), 87 deletions(-)
diff --git a/src/pages/index.vue b/src/pages/index.vue
index a9bf210..127bcba 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -309,6 +309,10 @@
icon: "/static/images/icon/caigoutaizhang@2x.png",
label: "浜哄憳钖祫",
},
+ {
+ icon: "/static/images/icon/caigoutaizhang@2x.png",
+ label: "鍚堝悓绠＄悊",
+ },
]);
const safetyItems = reactive([
{
@@ -323,10 +327,10 @@
icon: "/static/images/icon/caigoutaizhang@2x.png",
label: "鍗遍櫓浣滀笟瀹℃壒",
},
- {
- icon: "/static/images/icon/guzhangfenxi@2x.png",
- label: "闅愭偅鎺掓煡涓婃姤",
- },
+ // {
+ // icon: "/static/images/icon/guzhangfenxi@2x.png",
+ // label: "闅愭偅鎺掓煡涓婃姤",
+ // },
{
icon: "/static/images/icon/guzhangfenxi@2x.png",
label: "鍗遍櫓鐗╂枡绠℃帶",
@@ -335,14 +339,14 @@
icon: "/static/images/icon/guzhangfenxi@2x.png",
label: "搴旀�ラ妗堟煡闃�",
},
- {
- icon: "/static/images/icon/guzhangfenxi@2x.png",
- label: "浜嬫晠涓婃姤璁板綍",
- },
- {
- icon: "/static/images/icon/guzhangfenxi@2x.png",
- label: "瀹夊叏鍩硅鑰冩牳",
- },
+ // {
+ // icon: "/static/images/icon/guzhangfenxi@2x.png",
+ // label: "浜嬫晠涓婃姤璁板綍",
+ // },
+ // {
+ // icon: "/static/images/icon/guzhangfenxi@2x.png",
+ // label: "瀹夊叏鍩硅鑰冩牳",
+ // },
]);
// 鍗忓悓鍔炲叕鍔熻兘鏁版嵁
const collaborationItems = reactive([
@@ -350,10 +354,10 @@
icon: "/static/images/icon/baoxiaoguanli.png",
label: "鍗忓悓瀹℃壒",
},
- {
- icon: "/static/images/icon/huiyiliebiao@2x.png",
- label: "浼氳绠＄悊",
- },
+ // {
+ // icon: "/static/images/icon/huiyiliebiao@2x.png",
+ // label: "浼氳绠＄悊",
+ // },
{
icon: "/static/images/icon/tongzhigonggao@2x.png",
label: "閫氱煡鍏憡",
@@ -362,18 +366,18 @@
icon: "/static/images/icon/zhishiku@2x.png",
label: "鐭ヨ瘑搴�",
},
- {
- icon: "/static/images/icon/yongyinguanli@2x.png",
- label: "鐢ㄥ嵃绠＄悊",
- },
+ // {
+ // icon: "/static/images/icon/yongyinguanli@2x.png",
+ // label: "鐢ㄥ嵃绠＄悊",
+ // },
{
icon: "/static/images/icon/guizhangzhidu@2x.png",
label: "瑙勭珷鍒跺害",
},
- {
- icon: "/static/images/icon/kehubaifang@2x.png",
- label: "瀹㈡埛鎷滆",
- },
+ // {
+ // icon: "/static/images/icon/kehubaifang@2x.png",
+ // label: "瀹㈡埛鎷滆",
+ // },
]);
// 鐢熶骇绠℃帶鍔熻兘鏁版嵁
@@ -393,10 +397,14 @@
// label: "宸ュ簭鎺掍骇",
// bgColor: "#E91E63",
// },
+ // {
+ // icon: "/static/images/icon/shengchanbaogong@2x.png",
+ // label: "鐢熶骇鎶ュ伐",
+ // bgColor: "#673AB7",
+ // },
{
- icon: "/static/images/icon/shengchanbaogong@2x.png",
+ icon: "/static/images/icon/caigoutaizhang@2x.png",
label: "鐢熶骇鎶ュ伐",
- bgColor: "#673AB7",
},
// {
// icon: "/static/images/icon/shengchanhesuan@2x.png",
@@ -425,8 +433,12 @@
},
{
icon: "/static/images/icon/xunjianshangchuan@2x.png",
- label: "宸℃涓婁紶",
+ label: "宸℃绠＄悊",
},
+ {
+ icon: "/static/images/icon/xunjianshangchuan@2x.png",
+ label: "宸℃浠诲姟绠＄悊",
+ }
]);
// 澶勭悊甯哥敤鍔熻兘鐐瑰嚮
@@ -613,8 +625,13 @@
url: "/pages/productionManagement/processScheduling/index",
});
break;
+ // case "鐢熶骇鎶ュ伐":
+ // getcode();
+ // break;
case "鐢熶骇鎶ュ伐":
- getcode();
+ uni.navigateTo({
+ url: "/pages/productionManagement/workOrder/index",
+ });
break;
case "鐢熶骇鏍哥畻":
uni.navigateTo({
@@ -641,9 +658,14 @@
url: "/pages/equipmentManagement/upkeep/index",
});
break;
- case "宸℃涓婁紶":
+ case "宸℃绠＄悊":
uni.navigateTo({
url: "/pages/inspectionUpload/index",
+ });
+ break;
+ case "宸℃浠诲姟绠＄悊":
+ uni.navigateTo({
+ url: "/pages/inspectionManagement/index",
});
break;
case "鍒嗘瀽杩芥函":
@@ -714,6 +736,11 @@
case "浜哄憳钖祫":
uni.navigateTo({
url: "/pages/humanResources/monthlyStatistics/index",
+ });
+ break;
+ case "鍚堝悓绠＄悊":
+ uni.navigateTo({
+ url: "/pages/humanResources/contractManagement/index",
});
break;
default:
@@ -818,8 +845,6 @@
return;
}
}
-
- console.log(orderRow, "orderRow======@@@@@@@@");
// 鎵爜鎴愬姛鍚庤烦杞埌鐢熶骇鎶ュ伐椤甸潰锛屽苟浼犻�抩rderRow鍙傛暟
uni.navigateTo({
url: `/pages/productionManagement/productionReport/index?orderRow=${orderRow}`,
@@ -904,26 +929,6 @@
};
collectMenuTitles(routers);
- console.log("鍏佽鐨勮彍鍗曟爣棰�:", Array.from(allowedMenuTitles));
- console.log(
- "杩囨护鍓� - 钀ラ攢绠＄悊:",
- marketingItems.length,
- "閲囪喘绠＄悊:",
- purchaseItems.length,
- "鍗忓悓鍔炲叕:",
- collaborationItems.length
- );
- console.log(
- "杩囨护鍓� - 瀹夊叏鐢熶骇:",
- safetyItems.length,
- "浜哄姏璧勬簮:",
- humanResourcesItems.length,
- "鐢熶骇绠℃帶:",
- productionItems.length,
- "璁惧绠＄悊:",
- equipmentItems.length
- );
-
// 杩囨护钀ラ攢绠＄悊鑿滃崟
const originalMarketing = [
{ icon: "/static/images/icon/xiaoshoutaizhang@2x.png", label: "閿�鍞彴璐�" },
@@ -1003,6 +1008,7 @@
const originalHumanResources = [
{ icon: "/static/images/icon/caigoutaizhang@2x.png", label: "鎵撳崱绛惧埌" },
{ icon: "/static/images/icon/caigoutaizhang@2x.png", label: "浜哄憳钖祫" },
+ { icon: "/static/images/icon/caigoutaizhang@2x.png", label: "鍚堝悓绠＄悊" },
];
const filteredHumanResources = originalHumanResources.filter(item => {
return allowedMenuTitles.has(item.label);
@@ -1015,10 +1021,14 @@
// 杩囨护鐢熶骇绠℃帶鑿滃崟
const originalProduction = [
+ // {
+ // icon: "/static/images/icon/shengchanbaogong@2x.png",
+ // label: "鐢熶骇鎶ュ伐",
+ // bgColor: "#673AB7",
+ // },
{
- icon: "/static/images/icon/shengchanbaogong@2x.png",
+ icon: "/static/images/icon/caigoutaizhang@2x.png",
label: "鐢熶骇鎶ュ伐",
- bgColor: "#673AB7",
},
];
const filteredProduction = originalProduction.filter(item => {
@@ -1031,35 +1041,19 @@
{ icon: "/static/images/icon/shbeibaoxiu@2x.png", label: "杩愯绠＄悊" },
{ icon: "/static/images/icon/shbeibaoxiu@2x.png", label: "璁惧鎶ヤ慨" },
{ icon: "/static/images/icon/shbeibaoyang@2x.png", label: "璁惧淇濆吇" },
- { icon: "/static/images/icon/xunjianshangchuan@2x.png", label: "宸℃涓婁紶" },
+ { icon: "/static/images/icon/xunjianshangchuan@2x.png", label: "宸℃绠＄悊" },
+ { icon: "/static/images/icon/xunjianshangchuan@2x.png", label: "宸℃浠诲姟绠＄悊" },
];
const filteredEquipment = originalEquipment.filter(item => {
return allowedMenuTitles.has(item.label);
});
+ if (filteredEquipment.some(i => i.label === "宸℃绠＄悊")) {
+ const task = originalEquipment.find(i => i.label === "宸℃浠诲姟绠＄悊");
+ if (task && !filteredEquipment.some(i => i.label === "宸℃浠诲姟绠＄悊")) {
+ filteredEquipment.push(task);
+ }
+ }
equipmentItems.splice(0, equipmentItems.length, ...filteredEquipment);
-
- console.log(
- "杩囨护鍚� - 钀ラ攢绠＄悊:",
- marketingItems.length,
- "閲囪喘绠＄悊:",
- purchaseItems.length,
- "鍗忓悓鍔炲叕:",
- collaborationItems.length
- );
- console.log(
- "杩囨护鍚� - 瀹夊叏鐢熶骇:",
- safetyItems.length,
- "浜哄姏璧勬簮:",
- humanResourcesItems.length,
- "鐢熶骇绠℃帶:",
- productionItems.length,
- "璁惧绠＄悊:",
- equipmentItems.length
- );
- console.log(
- "鐢熶骇绠℃帶鑿滃崟椤�:",
- productionItems.map(item => item.label)
- );
};
// 妫�鏌ユā鍧楁槸鍚︽湁鑿滃崟椤归渶瑕佹樉绀�
@@ -1094,7 +1088,7 @@
.content {
background: #f6f7fb;
min-height: 100vh;
- padding: 12px;
+ // padding: 12px;
/* 涓烘墍鏈夎澶囪缃熀纭�padding-top锛堝寘鍚畨鍏ㄥ尯锛� */
padding-top: calc(env(safe-area-inset-top) + 30px);
position: relative;
@@ -1168,6 +1162,7 @@
}
.hero-section {
+ margin: 0 12px;
margin-bottom: 12px;
animation: fadeInUp 0.6s ease-out 0.1s both;
}
@@ -1220,7 +1215,9 @@
.hero-content {
position: relative;
z-index: 1;
+
padding: 14px 14px 18px 14px;
+ margin: 0 12px;
height: 100%;
}
.hero-wave {
@@ -1396,7 +1393,7 @@
.common-module {
margin-bottom: 12px;
background: linear-gradient(135deg, #ffffff 0%, #f9fbff 100%);
- border-radius: 14px;
+ // border-radius: 14px;
padding: 12px;
box-shadow: 0 8px 22px rgba(17, 24, 39, 0.06);
border: none;
@@ -1674,8 +1671,9 @@
.common-module {
margin-bottom: 12px;
background: #ffffff;
- border-radius: 16px;
- padding: 12px;
+ // border-radius: 16px;
+ // padding: 0px;
+ padding: 12px 0;
box-shadow: 0 10px 28px rgba(15, 23, 42, 0.06);
border: 1px solid rgba(148, 163, 184, 0.18);
position: relative;
@@ -1724,7 +1722,8 @@
}
.module-header {
- margin-bottom: 10px;
+ margin-bottom: 18px;
+ padding-left: 18px;
display: flex;
align-items: center;
justify-content: space-between;
@@ -1749,8 +1748,8 @@
}
.icon-container {
- width: 52px;
- height: 52px;
+ width: 48px;
+ height: 48px;
border-radius: 14px;
display: flex;
align-items: center;
@@ -1797,9 +1796,9 @@
}
.item-label {
- font-size: 12px;
+ font-size: 22rpx;
margin-top: 4px;
- margin-bottom: 6px;
+ margin-bottom: 20px;
}
.grid-text {
font-size: 0.875rem;
@@ -1813,4 +1812,4 @@
box-shadow: 0 0.375rem 1.25rem rgba(0, 0, 0, 0.4);
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3