Merge pull request '商品一键上下架、选择油站修复' (#15) from lc into master

Reviewed-on: #15

src/api/product/productAttr.js

@@ -61,6 +61,13 @@ export default {
       data
     })
   },
+  batchShelves(data) {
+    return request({
+      url: `/${service_name}/mallProductInfo/upOrDownShelves`,
+      method: 'post',
+      data
+    })
+  },
   getAllSites(data) {
     return request({
       url: `/${service_name}/mallProductSiteRelation/getAllSites`,

src/views/product/productAdd/components/OilStationSelection.vue

@@ -12,8 +12,8 @@
       </el-form-item>
     </el-form>
     <el-table max-height="500" @selection-change="selectionChange" v-loading="loading" ref="table" :data="tableList"
-            highlight-current-row empty-text="暂无数据" class="mt14">
-            <el-table-column type="selection" width="55">
+              :row-key="(row) => row.siteId" highlight-current-row empty-text="暂无数据" class="mt14">
+      <el-table-column type="selection" reserve-selection width="55">
       </el-table-column>
       <el-table-column label="油站名称" prop="siteName"></el-table-column>
       <el-table-column label="渠道" prop="channel"></el-table-column>
@@ -24,9 +24,10 @@
   </div>
 </template>
 <script>
-import productApi from '@/api/product/productAttr.js';
+import productApi from '@/api/product/productAttr.js'
+
 export default {
-    name: "OilStationSelection",
+  name: 'OilStationSelection',
   props: {
     OilStationSelectionList: {
       type: Array,
@@ -34,7 +35,7 @@ export default {
     },
     selectAttrId: {
       type: String,
-            default: () => ""
+      default: () => ''
     }
   },
   data() {
@@ -43,22 +44,22 @@ export default {
       loading: false,
       tableList: [],
       page: {
-                "currentPage": 1,
-                "pageSize": 10,
-                "totalCount": 0,
-                "params": {
-                    "siteName": ""
-                },
+        'currentPage': 1,
+        'pageSize': 10,
+        'totalCount': 0,
+        'params': {
+          'siteName': ''
+        }
       }
     }
   },
   watch: {
     OilStationSelectionList: {
       handler(n, o) {
-                this.$refs.table.clearSelection();
+        this.$refs.table.clearSelection()
         n.forEach(element => {
-                this.$refs.table.toggleRowSelection(element);
-                });
+          this.$refs.table.toggleRowSelection(element)
+        })
       },
       deep: true
     }
@@ -83,27 +84,28 @@ export default {
       return !!value
         && typeof value === 'object'
         && typeof value.then === 'function'
-                && typeof value.finally === 'function';
+        && typeof value.finally === 'function'
     },
     loadingFn(callback) {
-            this.loading = true;
+      this.loading = true
       if (this.isStrictPromise(callback)) {
         callback.finally(() => {
-                    this.loading = false;
+          this.loading = false
         })
-            };
+      }
+
     },
     getByPage() {
       this.loadingFn(productApi.getAllSites(this.page).then(res => {
-                // ({
-                //     data: this.tableList = [],
-                //     currentPage: this.page.currentPage,
-                //     pageSize: this.page.pageSize,
-                //     totalCount: this.page.totalCount
-                // } = res.data);
-                this.tableList = res.data
-                console.log(res)
-            }));
+        if (res.code === 20000) {
+          this.tableList = res.data.list
+          this.page.totalCount = parseInt(res.data.totalCount)
+
+        } else {
+          this.tableList = []
+          this.page.totalCount = 0
+        }
+      }))
     },
     handleCurrentChange(val) {
       this.page.currentPage = val
@@ -117,20 +119,20 @@ export default {
       productApi.delete(e).then(res => {
         if (res.code == 20000) {
           this.$message.success('操作成功')
-                    this.handleCurrentChange();
+          this.handleCurrentChange()
         }
       })
     },
     edit(row) {
       let data = Object.assign({}, row, {
-                name: this.selectAttrId.split("/")[1] || "",
+        name: this.selectAttrId.split('/')[1] || '',
         spec: [{
           value: row.attributeName,
-                    detail: row.attributeContent.split(",")
-                }],
+          detail: row.attributeContent.split(',')
+        }]
       })
-            this.$parent.$parent.selection = [data];
-            this.$parent.$parent.addAttr('typeUpdate');
+      this.$parent.$parent.selection = [data]
+      this.$parent.$parent.addAttr('typeUpdate')
     },
     init() {
       // this.getByPage();

src/views/product/productList/index.vue

@@ -41,8 +41,8 @@
         </el-form>
       </div>
       <div class="Button">
-        <el-button type="primary" class="mr14">添加商品</el-button>
-        <el-button type="success" class="mr14" @click="onCopy">商品采集</el-button>
+<!--        <el-button type="primary" class="mr14">添加商品</el-button>-->
+<!--        <el-button type="success" class="mr14" @click="onCopy">商品采集</el-button>-->
         <!-- <el-dropdown class="bnt mr14" @command="batchSelect">
           <el-button>批量修改<i class="el-icon-arrow-down el-icon--right"></i></el-button>
           <el-dropdown-menu slot="dropdown">
@@ -54,9 +54,11 @@
             <el-dropdown-item :command="6">活动推荐</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown> -->
-        <el-button @click="onDismount" v-show="artFrom.type === '1'">批量下架</el-button>
-        <el-button @click="onShelves" v-show="artFrom.type === '2'">批量上架</el-button>
-        <el-button class="export" @click="exports">导出</el-button>
+<!--        <el-button @click="onDismount" v-show="artFrom.type === '1'">批量下架</el-button>-->
+<!--        <el-button @click="onShelves" v-show="artFrom.type === '2'">批量上架</el-button>-->
+<!--        <el-button class="export" @click="exports">导出</el-button>-->
+        <el-button @click="batchShelves('1')">批量上架</el-button>
+        <el-button @click="batchShelves('2')">批量下架</el-button>
       </div>
       <el-table
         ref="table"
@@ -526,8 +528,6 @@ export default {
         }
       })
     },
-    getList() {},
-
     batchSub() {},
     clearBatchData(status) {},
     // 批量设置商品
@@ -588,10 +588,24 @@ export default {
     },
     getExcelData(excelData) {},
     freight() {},
-    // 批量上架
-    onShelves() {},
-    // 批量下架
-    onDismount() {},
+    // 批量上下架
+    batchShelves(productStatus) {
+      let selected = this.$refs.table.selection
+      if (selected&&selected.length>0){
+        let selectedIds = selected.map(item=>item.id)
+        productApi.batchShelves({
+          list:selectedIds,
+          productStatus:productStatus
+        }).then(res=>{
+          if (res.code===20000){
+            this.$message.success(res.msg)
+            this.getDataList()
+          }
+        })
+      }else {
+        this.$message.error('请选择需要操作的数据')
+      }
+    },
     getRowKey(row) {
       return row.id
     },