From 0927a960d1cba395682d1992b8b0d70f39be2c2a Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 17:59:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/mainPlan/pipeProduceStatics/index.vue | 4 ++--
src/views/mainPlan/gasPlanning/index.vue | 4 ++--
src/views/basicData/calendar/index.vue | 2 +-
src/views/basicData/standardProcess/index.vue | 6 ++++++
src/views/mainPlan/gasProduceStatics/index.vue | 4 ++--
5 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/views/basicData/calendar/index.vue b/src/views/basicData/calendar/index.vue
index da87e7b..b519ebf 100644
--- a/src/views/basicData/calendar/index.vue
+++ b/src/views/basicData/calendar/index.vue
@@ -38,7 +38,7 @@
plain
icon="Plus"
@click="handleAdd"
- v-hasPermi="['aps:calendar:update']"
+ v-hasPermi="['aps:calendar:add']"
>鏂板</el-button
>
</el-col>
diff --git a/src/views/basicData/standardProcess/index.vue b/src/views/basicData/standardProcess/index.vue
index 5625f8c..6f58e01 100644
--- a/src/views/basicData/standardProcess/index.vue
+++ b/src/views/basicData/standardProcess/index.vue
@@ -430,6 +430,12 @@
width: 150,
align: "center",
},
+ {
+ title: "涓撲笟",
+ field: "major",
+ width: 150,
+ align: "center",
+ },
]);
const data = reactive({
diff --git a/src/views/mainPlan/gasPlanning/index.vue b/src/views/mainPlan/gasPlanning/index.vue
index f103442..6d2aa2e 100644
--- a/src/views/mainPlan/gasPlanning/index.vue
+++ b/src/views/mainPlan/gasPlanning/index.vue
@@ -156,7 +156,7 @@
> -->
<template #default="{ row }">
<template v-if="hasEditStatus(row)">
- <el-button @click="saveRowEvent(row)">淇濆瓨</el-button>
+ <el-button @click="saveRowEvent(row)" v-hasPermi="['aps:gasPipelineCapacityPlan:add']">淇濆瓨</el-button>
<el-button @click="cancelRowEvent()">鍙栨秷</el-button>
</template>
<template v-else>
@@ -286,7 +286,7 @@
> -->
<template #default="{ row }">
<template v-if="hasEditStatus1(row)">
- <el-button @click="saveRowEvent1(row)">淇濆瓨</el-button>
+ <el-button @click="saveRowEvent1(row)" v-hasPermi="['aps:gasPipelineCapacityPlan:add']">淇濆瓨</el-button>
<el-button @click="cancelRowEvent1()">鍙栨秷</el-button>
</template>
<template v-else>
diff --git a/src/views/mainPlan/gasProduceStatics/index.vue b/src/views/mainPlan/gasProduceStatics/index.vue
index bf51924..48632c6 100644
--- a/src/views/mainPlan/gasProduceStatics/index.vue
+++ b/src/views/mainPlan/gasProduceStatics/index.vue
@@ -58,7 +58,7 @@
plain
icon="Download"
@click="handleExport"
- v-hasPermi="['apsPartRouteStat:export']"
+ v-hasPermi="['aps:apsGasPipingRouteStat:exportExcel']"
>瀵煎嚭</el-button
>
</el-col>
@@ -68,7 +68,7 @@
plain
icon="Refresh"
@click="handleRefresh"
- v-hasPermi="['apsPartRouteStat:edit']"
+ v-hasPermi="['aps:apsGasPipingRouteStat:computeCapacity']"
>鏇存柊</el-button
>
</el-col>
diff --git a/src/views/mainPlan/pipeProduceStatics/index.vue b/src/views/mainPlan/pipeProduceStatics/index.vue
index 03fd0d5..48cbdf6 100644
--- a/src/views/mainPlan/pipeProduceStatics/index.vue
+++ b/src/views/mainPlan/pipeProduceStatics/index.vue
@@ -58,7 +58,7 @@
plain
icon="Download"
@click="handleExport"
- v-hasPermi="['apsPartRouteStat:export']"
+ v-hasPermi="['aps:apsGasPipingRouteStat:exportExcel']"
>瀵煎嚭</el-button
>
</el-col>
@@ -68,7 +68,7 @@
plain
icon="Refresh"
@click="handleRefresh"
- v-hasPermi="['apsPartRouteStat:edit']"
+ v-hasPermi="['aps:apsGasPipingRouteStat:computeCapacity']"
>鏇存柊</el-button
>
</el-col>
--
Gitblit v1.9.3