From ec7cc88fca8de4b3c56f8ebee074fb7ce71ebf1e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 02 七月 2025 10:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/information.vue | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/admin/src/views/business/information.vue b/admin/src/views/business/information.vue
index 131fb7c..2263d20 100644
--- a/admin/src/views/business/information.vue
+++ b/admin/src/views/business/information.vue
@@ -7,8 +7,8 @@
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
<el-select v-model="searchForm.status" clearable @change="search" placeholder="鐘舵��">
- <el-option label="姝ｅ父" value="1"></el-option>
- <el-option label="绂佺敤" value="0"></el-option>
+ <el-option label="姝ｅ父" value="0"></el-option>
+ <el-option label="绂佺敤" value="1"></el-option>
</el-select>
</el-form-item>
<section>
@@ -19,10 +19,11 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:information:create', 'business:information:delete']">
- <li><el-button type="primary" @click="$refs.operaInformationWindow.open('鏂板缓鍔ㄦ�佽祫璁�')" icon="el-icon-plus" v-permissions="['business:information:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaInformationWindow.open('鏂板缓鍔ㄦ�佽祫璁�',null,searchForm.type)" icon="el-icon-plus" v-permissions="['business:information:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:information:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@@ -63,7 +64,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInformationWindow.open('缂栬緫鍔ㄦ�佽祫璁�', row)" icon="el-icon-edit" v-permissions="['business:information:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaInformationWindow.open('缂栬緫鍔ㄦ�佽祫璁�', row,searchForm.type)" icon="el-icon-edit" v-permissions="['business:information:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:information:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -112,22 +113,9 @@
showContent: '',
showTitle: '',
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- remark: '',
+ type:0,
title: '',
- describe: '',
- imgurl: '',
- thumbnailImgurl: '',
- type: '',
- jumpType: '',
- contnet: '',
- sortnum: '',
- status: ''
+ status: null
}
}
},
--
Gitblit v1.9.3