Hotfix0509

src/views/topicManage/index.vue

@@ -7,13 +7,13 @@
         <div class="component-content screenSet" id="screenSet">
             <div class="search-title">查询条件</div>
             <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;">
-                <el-form ref="serchForm" :model="searchParam" label-width="75px" style="width:100%;">
-                   <!-- <el-col :span="6">
-                        <el-form-item label="话题名称:">
-                            <el-input clearable v-model="searchParam.theme" size="mini" placeholder="请输入话题名称"></el-input>
+                <el-form ref="serchForm" :model="searchParam" label-width="120px" style="width:100%;">
+                   <el-col :span="6">
+                        <el-form-item label="话题名称/内容:">
+                            <el-input clearable v-model="searchParam.content" size="mini" placeholder="请输入话题名称"></el-input>
                         </el-form-item>
                     </el-col>
-					<el-col :span="6">
+					<!-- <el-col :span="6">
 					    <el-form-item label="创建日期:">
 					        <el-date-picker v-model="searchParam.time" size="mini" type="date" placeholder="选择日期"></el-date-picker>
 					    </el-form-item>
@@ -42,8 +42,8 @@
                         </el-form-item>
                     </el-col> -->
                     <el-col  style="text-align:right;padding:0 30px 15px 0;">
-                        <!-- <el-button type="primary" size="small" @click="search">查询</el-button>
-                        <el-button type="default" size="small" @click="reseat">重置</el-button> -->
+                        <el-button type="primary" size="small" @click="search">查询</el-button>
+                        <el-button type="default" size="small" @click="reseat">重置</el-button>
 						<el-button type="primary" size="small" @click="createTopic">新建话题</el-button>
                     </el-col>
                 </el-form>
@@ -55,6 +55,7 @@
                 <el-table-column type="index" prop="topOrder" label="排序" min-width="50" align="center"></el-table-column>
                 <el-table-column prop="id" label="Id" min-width="50" align="center"></el-table-column>
 				<el-table-column prop="subject" label="话题名称" min-width="100" align="center"></el-table-column>
+                <el-table-column prop="content" label="话题内容" min-width="100" align="center"></el-table-column>
 				<el-table-column prop="createdName" label="创建人" min-width="50" align="center"></el-table-column>
 				<el-table-column prop="createdtime" label="创建日期" min-width="100" align="center"></el-table-column>
 				<el-table-column prop="modifiedName" label="最后修改人" min-width="100" align="center"></el-table-column>
@@ -66,18 +67,18 @@
 				<el-table-column prop="modifiedtime" label="修改日期" min-width="100" align="center"></el-table-column>
                 <el-table-column prop="status" label="状态" min-width="80" align="center">
                     <template slot-scope="scope">
-                        <span v-if="!scope.row.official">已发布</span>
-                        <span v-else>{{ scope.row.releaseStatus == 2 ? '已发布' : '未发布'}}</span>
+                        <!-- <span v-if="scope.row.official">已发布</span> -->
+                        <span >{{ scope.row.releaseStatus == 2 ? '已发布' : '未发布'}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" align="center" min-width="200">
                     <template slot-scope="scope">
-                        <el-button type="primary" size="small" @click="edit(scope.row)">编辑</el-button>
-                        <el-button type="primary"  v-if="!scope.row.official" size="small" @click="optFun(scope.row)" disabled>下线</el-button>
-                        <el-button type="primary" v-if="scope.row.releaseStatus == 2 && scope.row.official" size="small" @click="optFun(scope.row)" >下线</el-button>
-                        <el-button type="primary" v-if="scope.row.releaseStatus != 2 && scope.row.official" size="small" @click="optFun(scope.row)" >发布</el-button>
-						<el-button v-if="scope.row.toporder == 0" type="primary" size="small" @click="topicManage(scope.row,'置顶')">置顶</el-button>
-						<el-button v-else type="primary" size="small" @click="topicManage(scope.row,'取消置顶')">取消置顶</el-button>
+                        <el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button>
+                        <!-- <el-button type="primary"   size="small" @click="optFun(scope.row)" disabled>下线</el-button> -->
+                        <el-button type="text" size="small" @click="optFun(scope.row,1)" >下架</el-button>
+                        <el-button type="text" v-if="scope.row.releaseStatus == 1" size="small" @click="optFun(scope.row,2)" >发布</el-button>
+						<el-button v-if="scope.row.toporder == 0" type="text" size="small" @click="topicManage(scope.row,'置顶')">置顶</el-button>
+						<el-button v-else type="text" size="small" @click="topicManage(scope.row,'取消置顶')">取消置顶</el-button>
                     </template>
                 </el-table-column>
                 <div slot="empty">
@@ -122,13 +123,7 @@ export default {
             curmbFirst: '组件',
             curmbSecond: '讨论组件',
             searchParam: {
-				theme:'',
-				type:'',
-				name:'',
-			
-				status: '',
-                pageNo: 1,
-                pageSize: 15
+				content:'',
             },
 			category:[
 				{
@@ -197,6 +192,7 @@ export default {
 			let _this = this;
 			this.loading = true;
             let parm = {
+                content:this.searchParam.content,
 				discussId:this.discussId,
 				pageNo:this.pageNo,
 				pageSize:this.pageSize
@@ -223,15 +219,9 @@ export default {
 
         // 重置
         reseat() {
-            this.searchParam = Object.assign({},{
-                theme:'',
-                type:'',
-                name:'',
-                category:'',
-                status: '',
-                pageNo: 1,
-                pageSize: 15
-            })
+            this.searchParam = {
+                content:'',
+            }
            this.getData()
         },
 
@@ -301,14 +291,14 @@ export default {
 		},
 
         // 发布、下线
-        optFun(row) {
-			let status = 0,str = '',_this = this,index = 0;
+        optFun(row,index) {
+			let status = 0,str = '',_this = this;
 				str = row.releaseStatus == 2 ? '下架' : '发布'
-				if(row.releaseStatus == 2){
-					index = 1
-				}else if(row.releaseStatus == 1){
-					index = 2
-				}
+				// if(row.releaseStatus == 2){
+				// 	index = 1
+				// }else if(row.releaseStatus == 1){
+				// 	index = 2
+				// }
 				let parm = {
 					topic:{
                         id: row.id,