From e93b1dddf4f99f83d05688baceeb59cacdd82ec8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 17 十月 2024 17:29:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/platformReason.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/platform/platformReason.vue b/admin/src/views/platform/platformReason.vue
index 181267c..580b420 100644
--- a/admin/src/views/platform/platformReason.vue
+++ b/admin/src/views/platform/platformReason.vue
@@ -38,7 +38,8 @@
<el-table-column prop="reason" label="鍏ュ洯鍘熷洜" fixed min-width="100px"></el-table-column>
<el-table-column prop="groupName" label="瀵瑰簲浣滀笟鏈堝彴缁�" fixed min-width="150px"></el-table-column>
<el-table-column prop="limitNum" label="浣滀笟閲�(涓囧彧/澶�)" min-width="120px"></el-table-column>
- <el-table-column prop="reason" label="璇存槑" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="sortnum" label="鎺掑簭鐮�" fixed min-width="80px"></el-table-column>
+ <el-table-column prop="remark" label="璇存槑" fixed min-width="100px"></el-table-column>
<el-table-column label="绂�/鍚敤" min-width="120px" >
<template slot-scope="{row}">
<el-switch
@@ -60,7 +61,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaPlatformReasonWindow.open('缂栬緫鏈堝彴鍏ュ洯鍘熷洜', row)" icon="el-icon-edit" v-permissions="['business:platformreason:update']">瀹℃壒娴�</el-button>
+ <el-button type="text" @click="$refs.OperaPlatformApproveTemplWindow.open('鏈堝彴鍏ュ洯鍘熷洜瀹℃壒娴�', row)" icon="el-icon-edit" v-permissions="['business:platformreason:update']">瀹℃壒娴�</el-button>
<el-button type="text" @click="$refs.OperaPlatformReasonWindow.open('缂栬緫鏈堝彴鍏ュ洯鍘熷洜', row)" icon="el-icon-edit" v-permissions="['business:platformreason:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:platformreason:delete']">鍒犻櫎</el-button>
</template>
@@ -75,6 +76,7 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaPlatformReasonWindow ref="OperaPlatformReasonWindow" @success="handlePageChange"/>
+ <OperaPlatformApproveTemplWindow ref="OperaPlatformApproveTemplWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -84,11 +86,12 @@
import SearchFormCollapse from '@/components/common/SearchFormCollapse'
import Pagination from '@/components/common/Pagination'
import OperaPlatformReasonWindow from '@/components/business/OperaPlatformReasonWindow'
+import OperaPlatformApproveTemplWindow from '@/components/business/OperaPlatformApproveTemplWindow'
import { allList } from '@/api/platform/platformGroup'
export default {
name: 'Platform',
extends: BaseTable,
- components: { SearchFormCollapse, TableLayout, Pagination, OperaPlatformReasonWindow },
+ components: { SearchFormCollapse, TableLayout, Pagination, OperaPlatformReasonWindow, OperaPlatformApproveTemplWindow },
data () {
return {
groupList: [],
--
Gitblit v1.9.3