From 784e2ad4a58c677115566da804920fdf041f06ac Mon Sep 17 00:00:00 2001
From: zhh <zh@thinkerx.com>
Date: Tue, 13 Nov 2018 13:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A2=98=E6=8E=A8=E8=8D=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/subject.js                            | 10 +++-
 .../components/ProductRelationDetail.vue      |  2 +-
 src/views/sms/brand/index.vue                 |  2 +-
 src/views/sms/hot/index.vue                   |  2 +-
 src/views/sms/new/index.vue                   |  2 +-
 src/views/sms/subject/index.vue               | 51 +++++++++++--------
 6 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/api/subject.js b/src/api/subject.js
index c11e6ec..6c06c12 100644
--- a/src/api/subject.js
+++ b/src/api/subject.js
@@ -1,7 +1,15 @@
 import request from '@/utils/request'
-export function fetchList() {
+export function fetchListAll() {
   return request({
     url:'/subject/listAll',
     method:'get',
   })
 }
+
+export function fetchList(params) {
+  return request({
+    url:'/subject/list',
+    method:'get',
+    params:params
+  })
+}
diff --git a/src/views/pms/product/components/ProductRelationDetail.vue b/src/views/pms/product/components/ProductRelationDetail.vue
index a892c30..70e94ae 100644
--- a/src/views/pms/product/components/ProductRelationDetail.vue
+++ b/src/views/pms/product/components/ProductRelationDetail.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-  import {fetchList as fetchSubjectList} from '@/api/subject'
+  import {fetchListAll as fetchSubjectList} from '@/api/subject'
   import {fetchList as fetchPrefrenceAreaList} from '@/api/prefrenceArea'
 
   export default {
diff --git a/src/views/sms/brand/index.vue b/src/views/sms/brand/index.vue
index 6b4d2f8..decf3e3 100644
--- a/src/views/sms/brand/index.vue
+++ b/src/views/sms/brand/index.vue
@@ -231,7 +231,6 @@
     },
     created() {
       this.getList();
-      this.getDialogList();
     },
     filters:{
       formatRecommendStatus(status){
@@ -301,6 +300,7 @@
       },
       handleSelectBrand(){
         this.selectDialogVisible=true;
+        this.getDialogList();
       },
       handleSelectSearch(){
         this.getDialogList();
diff --git a/src/views/sms/hot/index.vue b/src/views/sms/hot/index.vue
index ef2a3a1..adf72fe 100644
--- a/src/views/sms/hot/index.vue
+++ b/src/views/sms/hot/index.vue
@@ -231,7 +231,6 @@
     },
     created() {
       this.getList();
-      this.getDialogList();
     },
     filters:{
       formatRecommendStatus(status){
@@ -300,6 +299,7 @@
       },
       handleSelectProduct(){
         this.selectDialogVisible=true;
+        this.getDialogList();
       },
       handleSelectSearch(){
         this.getDialogList();
diff --git a/src/views/sms/new/index.vue b/src/views/sms/new/index.vue
index ac39c6e..531699f 100644
--- a/src/views/sms/new/index.vue
+++ b/src/views/sms/new/index.vue
@@ -231,7 +231,6 @@
     },
     created() {
       this.getList();
-      this.getDialogList();
     },
     filters:{
       formatRecommendStatus(status){
@@ -300,6 +299,7 @@
       },
       handleSelectProduct(){
         this.selectDialogVisible=true;
+        this.getDialogList();
       },
       handleSelectSearch(){
         this.getDialogList();
diff --git a/src/views/sms/subject/index.vue b/src/views/sms/subject/index.vue
index f84b864..a01cbab 100644
--- a/src/views/sms/subject/index.vue
+++ b/src/views/sms/subject/index.vue
@@ -21,7 +21,7 @@
       <div style="margin-top: 15px">
         <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
           <el-form-item label="专题名称：">
-            <el-input v-model="listQuery.subjectName" class="input-width" placeholder="商品名称"></el-input>
+            <el-input v-model="listQuery.subjectName" class="input-width" placeholder="专题名称"></el-input>
           </el-form-item>
           <el-form-item label="推荐状态：">
             <el-select v-model="listQuery.recommendStatus" placeholder="全部" clearable class="input-width">
@@ -38,10 +38,10 @@
     <el-card class="operate-container" shadow="never">
       <i class="el-icon-tickets"></i>
       <span>数据列表</span>
-      <el-button size="mini" class="btn-add" @click="handleSelectProduct()">选择专题</el-button>
+      <el-button size="mini" class="btn-add" @click="handleSelectSubject()">选择专题</el-button>
     </el-card>
     <div class="table-container">
-      <el-table ref="newProductTable"
+      <el-table ref="newSubjectTable"
                 :data="list"
                 style="width: 100%;"
                 @selection-change="handleSelectionChange"
@@ -126,13 +126,13 @@
                 @selection-change="handleDialogSelectionChange" border>
         <el-table-column type="selection" width="60" align="center"></el-table-column>
         <el-table-column label="专题名称" align="center">
-          <template slot-scope="scope">{{scope.row.name}}</template>
+          <template slot-scope="scope">{{scope.row.title}}</template>
         </el-table-column>
-        <el-table-column label="货号" width="160" align="center">
-          <template slot-scope="scope">NO.{{scope.row.productSn}}</template>
+        <el-table-column label="所属分类" width="160" align="center">
+          <template slot-scope="scope">{{scope.row.categoryName}}</template>
         </el-table-column>
-        <el-table-column label="价格" width="120" align="center">
-          <template slot-scope="scope">￥{{scope.row.price}}</template>
+        <el-table-column label="添加时间" width="160" align="center">
+          <template slot-scope="scope">{{scope.row.createTime | formatTime}}</template>
         </el-table-column>
       </el-table>
       <div class="pagination-container">
@@ -171,7 +171,8 @@
 </template>
 <script>
   import {fetchList,updateRecommendStatus,deleteHomeSubject,createHomeSubject,updateHomeSubjectSort} from '@/api/homeSubject';
-  import {fetchList as fetchProductList} from '@/api/product';
+  import {fetchList as fetchSubjectList} from '@/api/subject';
+  import {formatDate} from '@/utils/date';
 
   const defaultListQuery = {
     pageNum: 1,
@@ -231,7 +232,6 @@
     },
     created() {
       this.getList();
-      this.getDialogList();
     },
     filters:{
       formatRecommendStatus(status){
@@ -240,7 +240,14 @@
         }else{
           return '未推荐';
         }
-      }
+      },
+      formatTime(time){
+        if(time==null||time===''){
+          return 'N/A';
+        }
+        let date = new Date(time);
+        return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+      },
     },
     methods: {
       handleResetSearch() {
@@ -266,7 +273,7 @@
         this.updateRecommendStatusStatus(row.id,row.recommendStatus);
       },
       handleDelete(index,row){
-        this.deleteProduct(row.id);
+        this.deleteSubject(row.id);
       },
       handleBatchOperate(){
         if (this.multipleSelection < 1) {
@@ -289,7 +296,7 @@
           this.updateRecommendStatusStatus(ids,0);
         } else if(this.operateType===2){
           //删除
-          this.deleteProduct(ids);
+          this.deleteSubject(ids);
         }else {
           this.$message({
             message: '请选择批量操作类型',
@@ -298,8 +305,10 @@
           });
         }
       },
-      handleSelectProduct(){
+      handleSelectSubject(){
         this.selectDialogVisible=true;
+        this.dialogData.listQuery.keyword=null;
+        this.getDialogList();
       },
       handleSelectSearch(){
         this.getDialogList();
@@ -325,11 +334,11 @@
           });
           return;
         }
-        let selectProducts = [];
+        let selectSubjects = [];
         for (let i = 0; i < this.dialogData.multipleSelection.length; i++) {
-          selectProducts.push({
-            productId:this.dialogData.multipleSelection[i].id,
-            productName:this.dialogData.multipleSelection[i].name
+          selectSubjects.push({
+            subjectId:this.dialogData.multipleSelection[i].id,
+            subjectName:this.dialogData.multipleSelection[i].title
           });
         }
         this.$confirm('使用要进行添加操作?', '提示', {
@@ -337,7 +346,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          createHomeSubject(selectProducts).then(response=>{
+          createHomeSubject(selectSubjects).then(response=>{
             this.selectDialogVisible=false;
             this.dialogData.multipleSelection=[];
             this.getList();
@@ -401,7 +410,7 @@
           this.getList();
         });
       },
-      deleteProduct(ids){
+      deleteSubject(ids){
         this.$confirm('是否要删除该推荐?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -419,7 +428,7 @@
         })
       },
       getDialogList(){
-        fetchProductList(this.dialogData.listQuery).then(response=>{
+        fetchSubjectList(this.dialogData.listQuery).then(response=>{
           this.dialogData.list=response.data.list;
           this.dialogData.total=response.data.total;
         })