From 4bff52e938ae2c260fe54d32ef680908868bb27e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 07 六月 2024 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/sysPictureBase/SysPictureBase.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/web/src/views/modules/sysPictureBase/SysPictureBase.vue b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
index b40228d..7914db7 100644
--- a/web/src/views/modules/sysPictureBase/SysPictureBase.vue
+++ b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
@@ -9,7 +9,7 @@
</el-form-item>
<el-form-item>
- <zt-dict v-model="dataForm.productType" dict="product" placeholder="璇烽�夋嫨浜у搧绫诲瀷" clearable></zt-dict>
+ <zt-dict v-model="dataForm.productType" dict="product" :additional=additional placeholder="璇烽�夋嫨浜у搧绫诲瀷" clearable></zt-dict>
</el-form-item>
<el-form-item>
<zt-button type="query" @click="table.query()"/>
@@ -29,10 +29,14 @@
</template>
</el-table-column>
<el-table-column prop="contentType" label="妫�绱㈠叧閿瓧"/>
- <el-table-column prop="remark" label="澶囨敞"/>
- <zt-table-column-dict prop="productType" label="浜у搧绫诲瀷" dict="product"/>
- <zt-table-column-handle :table="table"
- delete-perm="sysPictureBase::delete"/>
+ <zt-table-column-dict prop="productType" label="浜у搧绫诲瀷" dict="product" :additional=additional />
+ <zt-table-column-handle :table="table" edit-perm="sysPictureBase::delete"
+ delete-perm="sysPictureBase::delete">
+ <template slot-scope="scope">
+ <zt-table-button size="small" type="primary" @click="edit(scope.row)">淇敼
+ </zt-table-button>
+ </template>
+ </zt-table-column-handle>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
@@ -47,6 +51,7 @@
export default {
data() {
return {
+ additional: [{dictValue: '20', dictLabel: '杩愮畻鍥惧厓', remark: ''}],
url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=`,
dataForm: {
contentType: '',
@@ -72,6 +77,9 @@
await this.$tip.success()
this.$refs.tableObj.query()
}
+ },
+ edit(row){
+ this.$refs.addOrUpdate.$refs.dialog.init(row.id,row)
}
}
}
--
Gitblit v1.9.1