From 051abca66db233f5dbde3f69aa706422e1ac9fd9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 16:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/views/business/pricingParam.vue | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/business/pricingParam.vue b/admin/src/views/business/pricingParam.vue
index 287d7e5..90d56b4 100644
--- a/admin/src/views/business/pricingParam.vue
+++ b/admin/src/views/business/pricingParam.vue
@@ -31,18 +31,10 @@
<el-table-column prop="status" label="鐘舵��" min-width="100px" align="center">
<template slot-scope="{row}">
<!-- 0鍚敤 1绂佺敤 -->
- <el-switch v-model="form.status" active-value="0" inactive-value="1" active-color="#13ce66"></el-switch>
+ <el-switch v-model="row.status" :active-value="0" :inactive-value="1" active-color="#13ce66" @change="changeStatus(row)"></el-switch>
</template>
</el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px" align="center"></el-table-column>
- <!-- <el-table-column prop="creator" label="鍒涘缓浜�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="缂栬緫鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="缂栬緫浜�" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�" min-width="100px"></el-table-column> -->
-
-
-
- <!-- <el-table-column prop="info" label="澶囨敞" min-width="100px"></el-table-column> -->
<el-table-column
v-if="containPermissions(['business:pricingparam:update', 'business:pricingparam:delete'])"
label="鎿嶄綔"
@@ -51,8 +43,9 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaPricingParamWindow.open('缂栬緫瀹氫环鏂规閰嶇疆', row)" icon="el-icon-edit" v-permissions="['business:pricingparam:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:pricingparam:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="$refs.priceConfiguration.open(`${row.name}瀹氫环鏂规`, row)">閰嶇疆璐圭巼</el-button>
+ <el-button type="text" @click="$refs.operaPricingParamWindow.open('缂栬緫瀹氫环鏂规閰嶇疆', row)" v-permissions="['business:pricingparam:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" v-permissions="['business:pricingparam:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -65,6 +58,7 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaPricingParamWindow ref="operaPricingParamWindow" @success="handlePageChange"/>
+ <PriceConfiguration ref="priceConfiguration" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -73,10 +67,12 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaPricingParamWindow from '@/components/business/OperaPricingParamWindow'
+import PriceConfiguration from '@/components/business/priceConfiguration'
+import { updateById } from '@/api/business/pricingParam'
export default {
name: 'PricingParam',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaPricingParamWindow },
+ components: { TableLayout, Pagination, OperaPricingParamWindow, PriceConfiguration },
data () {
return {
// 鎼滅储
@@ -104,6 +100,20 @@
'field.main': 'id'
})
this.search()
- }
+ },
+ methods: {
+ changeStatus(row) {
+ updateById(row)
+ .then(() => {
+ this.$tip.apiSuccess('鎴愬姛')
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.handlePageChange()
+ })
+ }
+ },
}
</script>
--
Gitblit v1.9.3