Prechádzať zdrojové kódy

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into deploy

lilei 4 rokov pred
rodič
commit
287ca4f9d9

+ 9 - 31
src/config/router.config.js

@@ -726,16 +726,16 @@ export const asyncRouterMap = [
                 }
               },
               {
-                  path: 'waitDispatch/:sn',
-                  name: 'waitDispatch',
-                  component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/waitDispatch/edit.vue'),
-                  meta: {
-                    title: '下推',
-                    icon: 'monitor',
-                    hidden: true
-                    // permission: 'M_salesNew'
-                  }
+                path: 'waitDispatch/:sn',
+                name: 'waitDispatch',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/waitDispatch/edit.vue'),
+                meta: {
+                  title: '下推',
+                  icon: 'monitor',
+                  hidden: true
+                  // permission: 'M_salesNew'
                 }
+              }
             ]
           },
           {
@@ -1236,28 +1236,6 @@ export const asyncRouterMap = [
                   // permission: 'M_goodsManage_list'
                 }
               },
-              {
-                path: 'add',
-                name: 'promotionRulesManagementAdd',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/promotionRulesManagement/promotionRules/edit.vue'),
-                meta: {
-                  title: '新增促销规则',
-                  icon: 'pull-request',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: 'edit/:id',
-                name: 'promotionRulesManagementEdit',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/promotionRulesManagement/promotionRules/edit.vue'),
-                meta: {
-                  title: '编辑促销规则',
-                  icon: 'pull-request',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
               {
                 path: 'detail/:id/:sn',
                 name: 'promotionRulesManagementDetail',

+ 15 - 42
src/views/promotionRulesManagement/promotionRules/chooseProductsModal.vue

@@ -61,24 +61,13 @@
           ref="table"
           size="small"
           :rowKey="(record) => record.productSn"
-          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange }"
           :data-source="loadData"
           :columns="columns"
           :pagination="paginationProps"
-          :scroll="{ y: 400 }"
           :loading="loading"
           bordered>
         </a-table>
-        <!-- <s-table
-          class="sTable"
-          ref="table"
-          size="small"
-          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-          :rowKey="(record) => record.id"
-          :columns="columns"
-          :data="loadData"
-          bordered>
-        </s-table> -->
       </div>
       <!-- 按钮 -->
       <div class="btn-con">
@@ -137,19 +126,6 @@ export default {
         { title: '产品编码', dataIndex: 'code', align: 'center' },
         { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } }
       ],
-      // 加载数据方法 必须为 Promise 对象
-      // loadData: parameter => {
-      //   this.disabled = true
-      //   return productList(Object.assign(parameter, this.queryParam)).then(res => {
-      //     const data = res.data
-      //     const no = (data.pageNo - 1) * data.pageSize
-      //     for (var i = 0; i < data.list.length; i++) {
-      //       data.list[i].no = no + i + 1
-      //     }
-      //     this.disabled = false
-      //     return data
-      //   })
-      // },
       loadData: [],
       pageNo: 1, //  分页页码
       pageSize: 10, //  分页 每页多少条
@@ -187,27 +163,24 @@ export default {
       this.$emit('ok', this.selectedRows)
       this.isShow = false
     },
-    onSelectChange (selectedRowKeys, selectedRows) {
-      const _this = this
-      console.log('selectedRowKeys changed: ', selectedRowKeys, selectedRows)
+    onChange (selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
-      // this.selectedRows = []
-      // loadData
-      // this.loadData.map(item => {
-      //   _this.selectedRowKeys.map(subItem => {
-      //     if (item.productSn == subItem) {
-      //       _this.selectedRows.push(item)
-      //       console.log(111)
-      //     }
-      //   })
-      // })
-
-      // console.log(_this.selectedRows, '+++++++++')
+    },
+    onSelectChange (record, selected, selectedRows, nativeEvent) {
+      const _this = this
+      if (selected) { //  选择
+        this.selectedRows.push(record)
+      } else { //  取消
+        this.selectedRows.map((item, index) => {
+          if (item.productSn == record.productSn) {
+            _this.selectedRows.splice(index, 1)
+          }
+        })
+      }
     },
     // 产品列表
     getProductList (pageNo) {
-      this.pageNo = this.pageNo || pageNo
+      this.pageNo = pageNo || this.pageNo
       this.disabled = true
       const params = {
         pageNo: this.pageNo,