From 0c357e90050d9d461c6ab0d85e1b9c2bac2f6f55 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 19 一月 2026 17:50:36 +0800
Subject: [PATCH] Merge branch 'dev_new' of http://114.132.189.42:9002/r/product-inventory-APP-before into dev_new
---
src/pages/index.vue | 138 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 129 insertions(+), 9 deletions(-)
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 2a3ef52..edfb7b1 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -279,6 +279,58 @@
// 鍗忓悓鍔炲叕鍔熻兘鏁版嵁
const collaborationItems = reactive([
{
+ icon: "/static/images/icon/gongchuguanli@2x.png",
+ label: "鍏嚭绠＄悊",
+ },
+ {
+ icon: "/static/images/icon/qingjiaguanli@2x.png",
+ label: "璇峰亣绠＄悊",
+ },
+ {
+ icon: "/static/images/icon/chuchaiguanli@2x.png",
+ label: "鍑哄樊绠＄悊",
+ },
+ {
+ icon: "/static/images/icon/chuchaiguanli@2x.png",
+ label: "鎶ラ攢绠＄悊",
+ },
+ {
+ icon: "/static/images/icon/chuchaiguanli@2x.png",
+ label: "閲囪喘绠＄悊",
+ },
+ {
+ icon: "/static/images/icon/chuchaiguanli@2x.png",
+ label: "鎶ヤ环绠＄悊",
+ },
+ {
+ icon: "/static/images/icon/chuchaiguanli@2x.png",
+ label: "鍑哄簱绠＄悊",
+ },
+ {
+ icon: "/static/images/icon/qingjiaguanli@2x.png",
+ label: "浼氳璁剧疆",
+ },
+ {
+ icon: "/static/images/icon/qingjiaguanli@2x.png",
+ label: "浼氳鍒楄〃",
+ },
+ {
+ icon: "/static/images/icon/qingjiaguanli@2x.png",
+ label: "浼氳鐢宠",
+ },
+ {
+ icon: "/static/images/icon/qingjiaguanli@2x.png",
+ label: "浼氳瀹℃壒",
+ },
+ {
+ icon: "/static/images/icon/qingjiaguanli@2x.png",
+ label: "浼氳鍙戝竷",
+ },
+ {
+ icon: "/static/images/icon/qingjiaguanli@2x.png",
+ label: "浼氳鎬荤粨",
+ },
+ {
icon: "/static/images/icon/xietongshenpi@2x.png",
label: "鍗忓悓瀹℃壒",
},
@@ -421,6 +473,71 @@
url: "/pages/procurementManagement/paymentLedger/index",
});
break;
+ case "鍏嚭绠＄悊":
+ uni.navigateTo({
+ url: "/pages/cooperativeOffice/collaborativeApproval/index1",
+ });
+ break;
+ case "璇峰亣绠＄悊":
+ uni.navigateTo({
+ url: "/pages/cooperativeOffice/collaborativeApproval/index2",
+ });
+ break;
+ case "鍑哄樊绠＄悊":
+ uni.navigateTo({
+ url: "/pages/cooperativeOffice/collaborativeApproval/index3",
+ });
+ break;
+ case "鎶ラ攢绠＄悊":
+ uni.navigateTo({
+ url: "/pages/cooperativeOffice/collaborativeApproval/index4",
+ });
+ break;
+ case "閲囪喘绠＄悊":
+ uni.navigateTo({
+ url: "/pages/cooperativeOffice/collaborativeApproval/index5",
+ });
+ break;
+ case "鎶ヤ环绠＄悊":
+ uni.navigateTo({
+ url: "/pages/cooperativeOffice/collaborativeApproval/index6",
+ });
+ break;
+ case "鍑哄簱绠＄悊":
+ uni.navigateTo({
+ url: "/pages/cooperativeOffice/collaborativeApproval/index7",
+ });
+ break;
+ case "浼氳璁剧疆":
+ uni.navigateTo({
+ url: "/pages/managementMeetings/meetingSettings/index",
+ });
+ break;
+ case "浼氳鍒楄〃":
+ uni.navigateTo({
+ url: "/pages/managementMeetings/meetingList/index",
+ });
+ break;
+ case "浼氳鐢宠":
+ uni.navigateTo({
+ url: "/pages/managementMeetings/meetApplication/index",
+ });
+ break;
+ case "浼氳瀹℃壒":
+ uni.navigateTo({
+ url: "/pages/managementMeetings/meetExamine/index",
+ });
+ break;
+ case "浼氳鍙戝竷":
+ uni.navigateTo({
+ url: "/pages/managementMeetings/meetPublish/index",
+ });
+ break;
+ case "浼氳鎬荤粨":
+ uni.navigateTo({
+ url: "/pages/managementMeetings/meetSummary/index",
+ });
+ break;
case "鍗忓悓瀹℃壒":
uni.navigateTo({
url: "/pages/cooperativeOffice/collaborativeApproval/index",
@@ -535,7 +652,7 @@
// 鍒ゆ柇鎵弿缁撴灉鏄惁涓虹函鏁板瓧锛坕d锛�
const isNumericId = /^\d+$/.test(scanResult.trim());
-
+
if (isNumericId) {
// 濡傛灉鏄函鏁板瓧锛屾牴鎹� id 鑾峰彇宸ュ崟鏁版嵁
const workOrderId = scanResult.trim();
@@ -543,20 +660,23 @@
try {
const workRes = await getProductWorkOrderById({ id: workOrderId });
modal.closeLoading();
-
+
console.log("宸ュ崟鏌ヨ缁撴灉:", workRes);
-
+
if (workRes.code === 200 && workRes.data) {
// 鏂版帴鍙ｈ繑鍥炵殑鏄崟涓璞★紝涓嶆槸鏁扮粍
const workData = workRes.data;
console.log("宸ュ崟鏁版嵁:", workData);
-
+
orderRow = JSON.stringify({
id: workData.id || workOrderId,
- planQuantity: workData.planQuantity-workData.completeQuantity,
- productProcessRouteItemId: workData.productProcessRouteItemId || workData.浜у搧宸ヨ壓璺嚎椤笽D || "",
+ planQuantity: workData.planQuantity - workData.completeQuantity,
+ productProcessRouteItemId:
+ workData.productProcessRouteItemId ||
+ workData.浜у搧宸ヨ壓璺嚎椤笽D ||
+ "",
});
-
+
console.log("鏋勯�犵殑orderRow:", orderRow);
} else {
modal.msgError("鏈壘鍒板搴旂殑宸ュ崟淇℃伅");
@@ -585,7 +705,7 @@
console.error(e, "瑙ｆ瀽澶辫触====????=====");
orderRow = "";
}
-
+
// 楠岃瘉鏄惁涓烘湁鏁堢殑JSON
try {
JSON.parse(orderRow);
@@ -594,7 +714,7 @@
return;
}
}
-
+
console.log(orderRow, "orderRow======@@@@@@@@");
// 鎵爜鎴愬姛鍚庤烦杞埌鐢熶骇鎶ュ伐椤甸潰锛屽苟浼犻�抩rderRow鍙傛暟
uni.navigateTo({
--
Gitblit v1.9.3