From ff817dab1f7b3e762896446afbcd68579381adcf Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 02 二月 2026 16:52:10 +0800
Subject: [PATCH] 危险作业审批模块开发
---
src/pages/index.vue | 45 +++++++++++++---------
src/pages.json | 7 +++
src/pages/cooperativeOffice/collaborativeApproval/index8.vue | 17 ++++++++
src/pages/cooperativeOffice/collaborativeApproval/index.vue | 5 +-
4 files changed, 54 insertions(+), 20 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index 02997dd..b8d4389 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -710,6 +710,13 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "pages/cooperativeOffice/collaborativeApproval/index8",
+ "style": {
+ "navigationBarTitleText": "鍗遍櫓浣滀笟瀹℃壒",
+ "navigationStyle": "custom"
+ }
+ },
],
"subPackages": [
{
diff --git a/src/pages/cooperativeOffice/collaborativeApproval/index.vue b/src/pages/cooperativeOffice/collaborativeApproval/index.vue
index 9f42801..e9060cd 100644
--- a/src/pages/cooperativeOffice/collaborativeApproval/index.vue
+++ b/src/pages/cooperativeOffice/collaborativeApproval/index.vue
@@ -100,14 +100,14 @@
<u-button type="primary"
size="small"
class="action-btn edit"
- :disabled="item.approveStatus == 2 || item.approveStatus == 1 || item.approveStatus == 4"
+ :disabled="item.approveStatus == 2 || item.approveStatus == 1 || item.approveStatus == 4 || item.approveStatus == 8"
@click="handleItemClick(item)">
缂栬緫
</u-button>
<u-button type="success"
size="small"
class="action-btn approve"
- :disabled="item.approveUserCurrentId == null || item.approveStatus == 2 || item.approveStatus == 3 || item.approveStatus == 4 || item.approveUserCurrentId !== userStore.id"
+ :disabled="item.approveUserCurrentId == null || item.approveStatus == 2 || item.approveStatus == 3 || item.approveStatus == 4 || item.approveStatus == 8 || item.approveUserCurrentId !== userStore.id"
@click="approve(item)">
瀹℃牳
</u-button>
@@ -157,6 +157,7 @@
5: "閲囪喘绠＄悊",
6: "鎶ヤ环绠＄悊",
7: "鍑哄簱绠＄悊",
+ 8: "鍗遍櫓浣滀笟绠＄悊",
};
return titleMap[type] || "瀹℃壒绠＄悊";
};
diff --git a/src/pages/cooperativeOffice/collaborativeApproval/index8.vue b/src/pages/cooperativeOffice/collaborativeApproval/index8.vue
new file mode 100644
index 0000000..f0db8a1
--- /dev/null
+++ b/src/pages/cooperativeOffice/collaborativeApproval/index8.vue
@@ -0,0 +1,17 @@
+<template>
+ <view class="container">
+ <!-- 寮曞叆index.vue缁勪欢骞朵紶閫掑弬鏁� -->
+ <ApprovalProcessIndex :approveType="8" />
+ </view>
+</template>
+
+<script setup>
+ import ApprovalProcessIndex from "./index.vue";
+</script>
+
+<style scoped>
+ .container {
+ width: 100%;
+ height: 100%;
+ }
+</style>
\ No newline at end of file
diff --git a/src/pages/index.vue b/src/pages/index.vue
index dcda116..dab005e 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,24 +1,24 @@
<template>
<view class="content">
-<!-- <view class="header-section">-->
-<!-- <view class="currentFactory">-->
-<!-- <up-text type="primary"-->
-<!-- :text="userStore.currentFactoryName"-->
-<!-- @click="show = true"-->
-<!-- size="18"-->
-<!-- class="factoryName"-->
-<!-- suffixIcon="arrow-right"-->
-<!-- :iconStyle="iconStyle"></up-text>-->
-<!-- </view>-->
-<!-- <up-picker :show="show"-->
-<!-- :columns="factoryList"-->
-<!-- @confirm="changeFactory"-->
-<!-- @cancel="show = false"></up-picker>-->
-<!-- </view>-->
+ <!-- <view class="header-section">-->
+ <!-- <view class="currentFactory">-->
+ <!-- <up-text type="primary"-->
+ <!-- :text="userStore.currentFactoryName"-->
+ <!-- @click="show = true"-->
+ <!-- size="18"-->
+ <!-- class="factoryName"-->
+ <!-- suffixIcon="arrow-right"-->
+ <!-- :iconStyle="iconStyle"></up-text>-->
+ <!-- </view>-->
+ <!-- <up-picker :show="show"-->
+ <!-- :columns="factoryList"-->
+ <!-- @confirm="changeFactory"-->
+ <!-- @cancel="show = false"></up-picker>-->
+ <!-- </view>-->
<view class="hero-section">
<view class="bg-img">
<view class="hero-content">
-<!-- <text class="hero-title">鍐涙嘲浼熶笟</text>-->
+ <!-- <text class="hero-title">鍐涙嘲浼熶笟</text>-->
</view>
<view class="hero-wave"></view>
</view>
@@ -220,7 +220,7 @@
import modal from "@/plugins/modal";
import useUserStore from "@/store/modules/user";
- const userStore = useUserStore();;
+ const userStore = useUserStore();
const show = ref(false);
const factoryList = ref([]);
const factoryListTem = ref([]);
@@ -306,6 +306,10 @@
{
icon: "/static/images/icon/caigoutaizhang@2x.png",
label: "鍗遍櫓婧愮鐞�",
+ },
+ {
+ icon: "/static/images/icon/caigoutaizhang@2x.png",
+ label: "鍗遍櫓浣滀笟",
},
]);
// 鍗忓悓鍔炲叕鍔熻兘鏁版嵁
@@ -679,6 +683,11 @@
url: "/pages/safeProduction/hazardSourceLedger/index",
});
break;
+ case "鍗遍櫓浣滀笟":
+ uni.navigateTo({
+ url: "/pages/cooperativeOffice/collaborativeApproval/index8",
+ });
+ break;
default:
uni.showToast({
title: `鐐瑰嚮浜�${item.label}`,
@@ -699,7 +708,7 @@
factoryListTem.value = res.data;
res.data.forEach(item => {
factoryList.value[0].push(item.deptName);
- })
+ });
} else {
// 濡傛灉res.data涓嶆槸鏁扮粍锛岃缃负绌烘暟缁�
factoryList.value = [];
--
Gitblit v1.9.3