From 03ea193468fe07ee216e6916a1dd55a5adf68479 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 28 十一月 2022 11:47:39 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master
---
src/views/operate/fivepack/threepack/components/content.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/operate/fivepack/threepack/components/content.vue b/src/views/operate/fivepack/threepack/components/content.vue
index 5efe156..c2d6a7b 100644
--- a/src/views/operate/fivepack/threepack/components/content.vue
+++ b/src/views/operate/fivepack/threepack/components/content.vue
@@ -18,7 +18,7 @@
<el-button icon="el-icon-delete-solid" @click="handleReset">閲嶇疆</el-button>
</div>
</div>
- <el-button v-if="isStorePage()" type="primary" icon="el-icon-plus" @click="handleView(null, 'add')">娣诲姞</el-button>
+ <el-button v-if="isStorePage()" type="primary" icon="el-icon-plus" @click="handleView(null, 'create')">娣诲姞</el-button>
</div>
</header>
<main>
@@ -38,7 +38,10 @@
</el-table-column>
<el-table-column prop="storeAddress" label="搴楅摵璇︾粏鍦板潃" min-width="10">
</el-table-column>
- <el-table-column prop="relationVideo" label="鍏宠仈鎽勫儚鏈�" min-width="10">
+ <el-table-column prop="videoPoint" label="鍏宠仈鎽勫儚鏈�" min-width="10">
+ <template v-if="scope.row.videoId" slot-scope="scope">
+ <span>{{ scope.row.videoPoint.name }}</span>
+ </template>
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="20">
<template slot-scope="scope">
@@ -58,8 +61,9 @@
</el-table>
<!-- 鏌ョ湅淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%"
- :title="dialogType ? '淇敼搴楅摵淇℃伅' : '鏌ョ湅搴楅摵淇℃伅'" :before-close="handleClose">
- <updateUser :dialogType="dialogType" :storeInfo="storeInfo" :isStorePage="isStorePage()" @closeDialog="closeDialog" />
+ :destroy-on-close="true"
+ :title="dialogType === 'view' ? '鏌ョ湅搴楅摵淇℃伅' : '淇敼搴楅摵淇℃伅'" :before-close="handleClose">
+ <updateUser v-if="dialogUpdate" :dialogType="dialogType" :storeInfo="storeInfo" :isStorePage="isStorePage()" @closeDialog="closeDialog" />
</el-dialog>
<!-- 鍒嗛〉 -->
<div class="pagination">
@@ -87,7 +91,7 @@
return {
storeCode: null,
storeStatus: null,
- options: [{ label: '缁忚惀', value: 1 }, { label: '鍊掗棴', value: 2 }],
+ options: [{ label: '鍏ㄩ儴', value: 0 }, { label: '缁忚惀', value: 1 }, { label: '鍊掗棴', value: 2 }],
tableData: [],
dialogUpdate: false,
currentPage: 1,
@@ -101,7 +105,8 @@
methods: {
search() {
- getStoreInfoList({ keyword: this.storeCode })
+ const status = this.storeStatus === 0 ? null : this.storeStatus;
+ getStoreInfoList({ keyword: this.storeCode, status })
.then(({ list, pageSize, totalPage }) => {
this.tableData = list;
this.pageSize = pageSize;
@@ -125,7 +130,7 @@
handleDelete(id) {
deleteStoreInfo(id)
.then(() => {
- this.$message({ type: 'success', message });
+ this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
this.search();
})
.catch(err => this.$message({ type: 'error', message: err }));
--
Gitblit v1.8.0