Merge remote-tracking branch 'origin/master'

src/api/finance/order.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/finance/order/list',
+    url: '/api/finance/order/page',
     method: 'get',
     params: {
       ...params,

src/api/finance/ordergroupon.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/finance/ordergroupon/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/finance/ordergroupon/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/finance/ordergroupon/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/finance/ordergroupon/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/finance/ordergroupon/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/api/finance/ordergroupongoods.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/finance/ordergroupongoods/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/finance/ordergroupongoods/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/finance/ordergroupongoods/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/finance/ordergroupongoods/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/finance/ordergroupongoods/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/config/website.js

@@ -5,7 +5,7 @@ export default {
   title: "saber",
   logo: "S",
   key: 'saber',//配置主键,目前用于存储
-  indexTitle: 'Saber Admin',
+  indexTitle: '中意购-运营后台',
   clientId: 'saber', // 客户端id
   clientSecret: 'saber_secret', // 客户端密钥
   tenantMode: true, // 是否开启租户模式

src/option/groupon/grouponOption.js

@@ -0,0 +1,135 @@
+import {getByParentId} from "../../api/mall/categoryinfo";
+
+export const grouponOption = {
+    height: 'auto',
+    calcHeight: 30,
+    border: true,
+    index: false,
+    viewBtn: true,
+    delBtn:false,
+    editBtn: false,
+    addBtn: false,
+    selection: true,
+    // dialogClickModal: false,
+    labelWidth: 150,
+    searchIcon: true,
+    searchIndex: 3,
+    menu: false,
+    tip: false,
+    column: [
+    {
+        label: "商品封面",
+        prop: "goodsCover",
+        addDisplay: false,
+        viewDisplay: false,
+        editDisplay: false,
+        type: 'img',
+    },
+    {
+        label: "商品名称",
+        prop: "goodsName",
+        search: true,
+        width: 280,
+        overHidden: true,
+    },
+    {
+        label: "规格",
+        prop: "goodsSpec",
+        editDisplay: false,
+        rules: [{
+            required: true,
+            message: "请输入规格",
+            trigger: "blur"
+        }]
+    },
+    {
+        label: "供应商",
+        prop: "supplierName",
+        search: true,
+        addDisplay: false,
+        editDisplay: false
+    },
+    {
+        label: "分类",
+        prop: "categoryIdArr",
+        hide: true,
+        search: true,
+        lazy: true,
+        rules: [{
+            required: true,
+            message: "请选择分类",
+            trigger: "blur"
+        }],
+        type: "cascader",
+        filterable: true,
+        checkStrictly: true,
+        lazyLoad(node, resolve) {
+            let parentId;
+            let stop_level = 2;
+            let level = node.level;
+            let list = [];
+
+            if (node.level === 0) {
+                parentId = 0;
+                getByParentId(0).then((res) => {
+                    list = res.data.data;
+                    list = (list || []).map(ele => {
+                        return Object.assign(ele, {
+                            leaf: level >= stop_level
+                        })
+                    })
+                    resolve(list)
+                })
+            } else {
+                parentId = node.data.id;
+                getByParentId(node.data.id).then((res) => {
+                    list = res.data.data;
+                    list = (list || []).map(ele => {
+                        return Object.assign(ele, {
+                            leaf: level >= stop_level
+                        })
+                    })
+                    resolve(list)
+                })
+            }
+        },
+        props: {
+            label: "title",
+            value: "key"
+        },
+    },
+    {
+        label: "品牌",
+        prop: "brandId",
+        hide: true,
+        search: true,
+        rules: [{
+            required: true,
+            message: "请选择品牌",
+            trigger: "blur"
+        }],
+        type: "select",
+        remote: true,
+        dicUrl: "/api/mall/brandsinfo/getByName?brandName={{key}}",
+        props: {
+            label: "brandName",
+            value: "id"
+        },
+        dataType: "string",
+    },
+    {
+        label: "价格",
+        prop: "salePrice",
+        precision: 2,
+        type: "number",
+        formatter:(val,value)=>{
+            return Number(value).toFixed(2);
+        },
+        rules: [{
+            required: true,
+            message: "请输入销售价",
+            trigger: "blur"
+        }],
+    },
+    ]
+}

src/views/finance/order.vue

@@ -0,0 +1,359 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+      </template>
+
+      <template slot="orderStateDesc" slot-scope="scope" >
+        <el-tag v-if="scope.row.orderState === 1">{{scope.row.orderStateDesc}}</el-tag>
+        <el-tag v-else-if="scope.row.orderState === 2" type="warning">{{scope.row.orderStateDesc}}</el-tag>
+        <el-tag v-else-if="scope.row.orderState === 4"type="success">{{scope.row.orderStateDesc}}</el-tag>
+        <el-tag v-else-if="scope.row.orderState === 5"type="danger">{{scope.row.orderStateDesc}}</el-tag>
+      </template>
+
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/finance/order";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          searchIcon: true,
+          searchIndex: 3,
+          menuWidth: 100,
+          border: true,
+          viewBtn: true,
+          editBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "订单号",
+              prop: "orderNo",
+              search: true,
+              width: 170,
+            },
+            {
+              label: "订单来源",
+              width: 100,
+              prop: "source",
+              type: "select",
+              search: true,
+              dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=OrderSourceEnum",
+              props: {
+                label: "name",
+                value: "value"
+              },
+              dataType: "number",
+            },
+            {
+              label: "订单类型",
+              prop: "orderType",
+              type: "select",
+              search: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=order_type",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType: "number",
+            },
+            {
+              label: "买家昵称",
+              prop: "nickname",
+              search: true,
+            },
+            {
+              label: "订单状态",
+              prop: "orderState",
+              type: "select",
+              search: true,
+              hide: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=order_state",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType: "number",
+            },
+
+            {
+              label: "总金额",
+              prop: "totalAmount",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入总金额",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "订单金额",
+              prop: "paymentAmount",
+              formatter:(val,value,label)=>{
+                  return "￥" + value;
+              },
+            },
+            {
+              label: "支付方式",
+              prop: "paymentMode",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入支付方式",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "订单状态",
+              prop: "orderStateDesc",
+              slot:true,
+              width: 80
+            },
+            {
+              label: "支付时间",
+              prop: "paymentTime",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入支付时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支付状态",
+              prop: "paymentState",
+              hide: true
+            },
+            {
+              label: "优惠金额",
+              prop: "discountAmount",
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入优惠金额",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否售后",
+              prop: "isAftersales",
+              hide: true,
+              type: "select",
+              dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              // dataType: "number",
+            },
+            {
+              label: "发货时间",
+              prop: "sendTime",
+              hide: true,
+            },
+            {
+              label: "收货时间",
+              prop: "recordTime",
+              hide: true,
+            },
+            {
+              label: "下单时间",
+              prop: "createTime"
+            },
+            {
+              label: "下单时间",
+              prop: "orderTimeRange",
+              width: 150,
+              display: false,
+              hide: true,
+              search: true,
+              type: 'datetimerange',
+              searchRange:true,
+              defaultTime:['00:00:00', '23:59:59'],
+              format:'yyyy-MM-dd HH:mm:ss',
+              valueFormat:'yyyy-MM-dd HH:mm:ss',
+              startPlaceholder: '开始时间',
+              endPlaceholder: '结束时间',
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.order_add, false),
+          viewBtn: this.vaildData(this.permission.order_view, false),
+          delBtn: this.vaildData(this.permission.order_delete, false),
+          editBtn: this.vaildData(this.permission.order_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        const orderTimeRange = this.query.orderTimeRange;
+        if (orderTimeRange) {
+          this.query.startTime = orderTimeRange[0];
+          this.query.endTime = orderTimeRange[1];
+        }
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/finance/ordergroupon.vue

@@ -0,0 +1,245 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.ordergroupon_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/finance/ordergroupon";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "订单id",
+              prop: "orderId",
+              rules: [{
+                required: true,
+                message: "请输入订单id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "自提点ID",
+              prop: "selfTakeId",
+              rules: [{
+                required: true,
+                message: "请输入自提点ID",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "团购ID",
+              prop: "grouponId",
+              rules: [{
+                required: true,
+                message: "请输入团购ID",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "团长ID",
+              prop: "organizerId",
+              rules: [{
+                required: true,
+                message: "请输入团长ID",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "取货码",
+              prop: "pickupCode",
+              rules: [{
+                required: true,
+                message: "请输入取货码",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.ordergroupon_add, false),
+          viewBtn: this.vaildData(this.permission.ordergroupon_view, false),
+          delBtn: this.vaildData(this.permission.ordergroupon_delete, false),
+          editBtn: this.vaildData(this.permission.ordergroupon_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/finance/ordergroupongoods.vue

@@ -0,0 +1,272 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.ordergroupongoods_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/finance/ordergroupongoods";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "订单id",
+              prop: "orderId",
+              rules: [{
+                required: true,
+                message: "请输入订单id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "商品ID",
+              prop: "goodsId",
+              rules: [{
+                required: true,
+                message: "请输入商品ID",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "商品数量",
+              prop: "goodsNum",
+              rules: [{
+                required: true,
+                message: "请输入商品数量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "团长ID",
+              prop: "organizerId",
+              rules: [{
+                required: true,
+                message: "请输入团长ID",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "商品金额",
+              prop: "goodsPrice",
+              rules: [{
+                required: true,
+                message: "请输入商品金额",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "商品名称",
+              prop: "goodsName",
+              rules: [{
+                required: true,
+                message: "请输入商品名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "商品图片",
+              prop: "goodsImage",
+              rules: [{
+                required: true,
+                message: "请输入商品图片",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "供应商ID",
+              prop: "supplierId",
+              rules: [{
+                required: true,
+                message: "请输入供应商ID",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.ordergroupongoods_add, false),
+          viewBtn: this.vaildData(this.permission.ordergroupongoods_view, false),
+          delBtn: this.vaildData(this.permission.ordergroupongoods_delete, false),
+          editBtn: this.vaildData(this.permission.ordergroupongoods_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/groupon/groupon.vue

@@ -21,15 +21,15 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
 
-      <template slot="status" slot-scope="scope" >
-        <el-tag v-if="scope.row.status === 1" type="success">{{scope.row.$status}}</el-tag>
-        <el-tag v-if="scope.row.status === 0" type="danger">{{scope.row.$status}}</el-tag>
+      <template slot="status" slot-scope="scope">
+        <el-tag v-if="scope.row.status === 1" type="success">{{ scope.row.$status }}</el-tag>
+        <el-tag v-if="scope.row.status === 0" type="danger">{{ scope.row.$status }}</el-tag>
       </template>
 
-      <template slot="auditStatus" slot-scope="scope" >
-        <el-tag v-if="scope.row.auditStatus === 0">{{scope.row.$auditStatus}}</el-tag>
-        <el-tag v-else-if="scope.row.auditStatus === 1" type="success">{{scope.row.$auditStatus}}</el-tag>
-        <el-tag v-else-if="scope.row.auditStatus === 2"type="danger">{{scope.row.$auditStatus}}</el-tag>
+      <template slot="auditStatus" slot-scope="scope">
+        <el-tag v-if="scope.row.auditStatus === 0">{{ scope.row.$auditStatus }}</el-tag>
+        <el-tag v-else-if="scope.row.auditStatus === 1" type="success">{{ scope.row.$auditStatus }}</el-tag>
+        <el-tag v-else-if="scope.row.auditStatus === 2" type="danger">{{ scope.row.$auditStatus }}</el-tag>
       </template>
 
       <template slot="menu" slot-scope="scope">
@@ -37,12 +37,14 @@
                    type="text"
                    size="small"
                    @click="openAuditBox(scope.row.id)"
-        >审核</el-button>
+        >审核
+        </el-button>
         <el-button v-if="scope.row.status == 0"
                    type="text"
                    size="small"
                    @click="modifyState(scope.row, 1)"
-        >启用</el-button>
+        >启用
+        </el-button>
         <el-button v-if="scope.row.status == 1"
                    type="text"
                    size="small"
@@ -50,6 +52,55 @@
         >禁用
         </el-button>
       </template>
+
+      <!--  添加商品插槽    -->
+      <template slot="goodsForm">
+        <el-button type="primary" size="mini" @click="addGoodsBox = true">添 加</el-button>
+        <el-table
+            :data="tableData"
+            style="width: 100%">
+          <el-table-column label="商品" width="280">
+            <template slot-scope="scope">
+              <el-row>
+                <el-col :span="4">
+                  <el-avatar shape="square" :size="45" fit="fit" :src="scope.row.goodsCover"></el-avatar>
+                </el-col>
+                <el-col :span="20">
+                  <span style="line-height: 40px; margin-left: 10px">{{ scope.row.goodsName }}</span>
+                </el-col>
+              </el-row>
+            </template>
+          </el-table-column>
+          <el-table-column label="规格" width="180">
+            <template slot-scope="scope">
+              <el-row>
+                <el-col :span="24">
+                  <span style="line-height: 40px;">{{ scope.row.goodsSpec }}</span>
+                </el-col>
+              </el-row>
+            </template>
+          </el-table-column>
+          <el-table-column label="供应商">
+            <template slot-scope="scope">
+              <el-row>
+                <el-col :span="24">
+                  <span style="line-height: 40px;">{{ scope.row.supplierName }}</span>
+                </el-col>
+              </el-row>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button
+                  size="mini"
+                  type="danger"
+                  @click="handleDeleteGood(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
+
+
     </avue-crud>
 
     <el-dialog title="拼团审核" @close="refreshChange"
@@ -78,320 +129,340 @@
         <el-button type="primary" @click="auditGoods()">确 定</el-button>
       </div>
     </el-dialog>
+
+    <!--  商品列表dialog  -->
+    <el-dialog title="添加商品"
+               append-to-body
+               :visible.sync="addGoodsBox"
+               :before-close="handleClose"
+               width="90%"
+               heigh="70%">
+      <avue-crud :option="grouponOption"
+                 :table-loading="grouponLoading"
+                 :data="grouponData"
+                 :page.sync="grouponPage"
+                 v-model="grouponForm"
+                 ref="grouponCrud"
+                 @search-change="grouponSearchChange"
+                 @search-reset="grouponSearchReset"
+                 @selection-change="grouponSelectionChange"
+                 @current-change="grouponCurrentChange"
+                 @size-change="grouponSizeChange"
+                 @refresh-change="grouponRefreshChange"
+                 @on-load="grouponOnLoad">
+
+        <template slot="menuLeft">
+          <el-button type="primary"
+                     size="small"
+                     @click="submit()">提 交
+          </el-button>
+        </template>
+      </avue-crud>
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove, audit, modifyStatus} from "@/api/groupon/groupon";
-  import {mapGetters} from "vuex";
+import {getList, getDetail, add, update, remove, audit, modifyStatus} from "@/api/groupon/groupon";
+import {getList as getGoodsList} from "@/api/mall/goodsinfo";
+import {grouponOption} from "../../option/groupon/grouponOption"
+import {mapGetters} from "vuex";
 
-  export default {
-    data() {
-      return {
-        auditList: [
-          {name: '通过', value: 1},{name: '驳回', value: 2}
-        ],
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        auditBox: false,
-        auditForm: {
-          auditStatus: '',
-          id: '',
-          remark: ''
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: false,
-          viewBtn: true,
-          editBtn: true,
-          delBtn: false,
-          selection: true,
-          dialogClickModal: false,
-          addBtnText: '发布团购',
-          column: [
-            {
-              label: "主标题",
-              prop: "mainTitle",
-              labelWidth: 120,
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入主标题",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "副标题",
-              prop: "subTitle",
-              labelWidth: 120,
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入副标题",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "团购开始时间",
-              prop: "grouponStartTime",
-              valueFormat: 'yyyy-MM-dd HH:mm:ss',
-              type: "datetime",
-              labelWidth: 120,
-              rules: [{
-                required: true,
-                message: "请输入团购开始时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "团购结束时间",
-              prop: "grouponEndTime",
-              valueFormat: 'yyyy-MM-dd HH:mm:ss',
-              type: "datetime",
-              labelWidth: 120,
-              rules: [{
-                required: true,
-                message: "请输入团购结束时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "取货开始时间",
-              prop: "takeStartTime",
-              type: "datetime",
-              labelWidth: 120,
-              valueFormat: 'yyyy-MM-dd HH:mm:ss',
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入取货开始时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "取货结束时间",
-              prop: "takeEndTime",
-              labelWidth: 120,
-              type: "datetime",
-              valueFormat: 'yyyy-MM-dd HH:mm:ss',
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入取货结束时间",
-                trigger: "blur"
-              }]
+export default {
+  data() {
+    return {
+      grouponOption: grouponOption,
+      tableData: [],
+      auditList: [
+        {name: '通过', value: 1}, {name: '驳回', value: 2}
+      ],
+      form: {},
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      auditBox: false,
+      addGoodsBox: false,
+      auditForm: {
+        auditStatus: '',
+        id: '',
+        remark: ''
+      },
+      selectionList: [],
+      option: {
+        height: 'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: false,
+        viewBtn: true,
+        editBtn: true,
+        delBtn: false,
+        selection: true,
+        dialogClickModal: false,
+        addBtnText: '发布团购',
+        column: [
+          {
+            label: "主标题",
+            prop: "mainTitle",
+            labelWidth: 120,
+            search: true,
+            rules: [{
+              required: true,
+              message: "请输入主标题",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "副标题",
+            prop: "subTitle",
+            labelWidth: 120,
+            hide: true,
+            rules: [{
+              required: true,
+              message: "请输入副标题",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "团购开始时间",
+            prop: "grouponStartTime",
+            valueFormat: 'yyyy-MM-dd HH:mm:ss',
+            type: "datetime",
+            labelWidth: 120,
+            rules: [{
+              required: true,
+              message: "请输入团购开始时间",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "团购结束时间",
+            prop: "grouponEndTime",
+            valueFormat: 'yyyy-MM-dd HH:mm:ss',
+            type: "datetime",
+            labelWidth: 120,
+            rules: [{
+              required: true,
+              message: "请输入团购结束时间",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "取货开始时间",
+            prop: "takeStartTime",
+            type: "datetime",
+            labelWidth: 120,
+            valueFormat: 'yyyy-MM-dd HH:mm:ss',
+            hide: true,
+            rules: [{
+              required: true,
+              message: "请输入取货开始时间",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "取货结束时间",
+            prop: "takeEndTime",
+            labelWidth: 120,
+            type: "datetime",
+            valueFormat: 'yyyy-MM-dd HH:mm:ss',
+            hide: true,
+            rules: [{
+              required: true,
+              message: "请输入取货结束时间",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "浏览量",
+            prop: "views",
+            labelWidth: 120,
+            addDisplay: false,
+            editDisplay: false,
+            hide: true,
+            width: 80,
+            rules: [{
+              required: true,
+              message: "请输入浏览量",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "状态",
+            prop: "status",
+            labelWidth: 120,
+            search: true,
+            slot: true,
+            rules: [{
+              required: true,
+              message: "请选择状态",
+              trigger: "blur"
+            }],
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=StatusEnum",
+            props: {
+              label: "name",
+              value: "value"
             },
-            {
-              label: "浏览量",
-              prop: "views",
-              labelWidth: 120,
-              addDisplay: false,
-              editDisplay: false,
-              hide: true,
-              width: 80,
-              rules: [{
-                required: true,
-                message: "请输入浏览量",
-                trigger: "blur"
-              }]
+            dataType: "number",
+          },
+          {
+            label: "审核状态",
+            prop: "auditStatus",
+            labelWidth: 120,
+            addDisplay: false,
+            editDisplay: false,
+            rules: [{
+              required: true,
+              message: "请输入审核状态",
+              trigger: "blur"
+            }],
+            search: true,
+            slot: true,
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=AuditStatusEnum",
+            props: {
+              label: "name",
+              value: "value"
             },
-            {
-              label: "状态",
-              prop: "status",
-              labelWidth: 120,
-              search: true,
-              slot:true,
-              rules: [{
-                required: true,
-                message: "请选择状态",
-                trigger: "blur"
-              }],
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=StatusEnum",
-              props: {
-                label: "name",
-                value: "value"
-              },
-              dataType: "number",
+            dataType: "number",
+          },
+          {
+            label: "团长",
+            prop: "organizerUserId",
+            labelWidth: 120,
+            rules: [{
+              required: true,
+              message: "请选择团长",
+              trigger: "blur"
+            }],
+            hide: true,
+            remote: true,
+            editDisplay: false,
+            viewDisplay: false,
+            editDisabled: true,
+            type: "select",
+            dicUrl: "/api/platform/userApp/list?username={{key}}&state=1&livingHall=1&size100",
+            props: {
+              label: "username",
+              value: "id"
             },
-            {
-              label: "审核状态",
-              prop: "auditStatus",
-              labelWidth: 120,
-              addDisplay: false,
-              editDisplay: false,
-              rules: [{
-                required: true,
-                message: "请输入审核状态",
-                trigger: "blur"
-              }],
-              search: true,
-              slot:true,
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=AuditStatusEnum",
-              props: {
-                label: "name",
-                value: "value"
-              },
-              dataType: "number",
+            dicFormatter: function (res) {
+              return res.data.records;
             },
-            {
-              label: "团长",
-              prop: "organizerUserId",
-              labelWidth: 120,
-              rules: [{
-                required: true,
-                message: "请选择团长",
-                trigger: "blur"
-              }],
-              hide: true,
-              remote: true,
-              editDisplay: false,
-              viewDisplay: false,
-              editDisabled: true,
-              type: "select",
-              dicUrl: "/api/platform/userApp/list?username={{key}}&state=1&livingHall=1&size100",
-              props: {
-                label: "username",
-                value: "id"
-              },
-              dicFormatter: function (res) {
-                return res.data.records;
-              },
+          },
+          {
+            label: "自提点",
+            prop: "selfTakeIds",
+            labelWidth: 120,
+            span: 24,
+            rules: [{
+              required: true,
+              message: "请选择自提点",
+              trigger: "blur"
+            }],
+            hide: true,
+            editDisplay: false,
+            viewDisplay: false,
+            editDisabled: true,
+            type: "select",
+            multiple: true,
+            remote: true,
+            dicUrl: "/api/groupon/selftake/page?name={{key}}",
+            props: {
+              label: "name",
+              value: "id"
             },
-            {
-              label: "自提点",
-              prop: "selfTakeIds",
-              labelWidth: 120,
-              span: 24,
-              rules: [{
-                required: true,
-                message: "请选择自提点",
-                trigger: "blur"
-              }],
-              hide: true,
-              editDisplay: false,
-              viewDisplay: false,
-              editDisabled: true,
-              type: "select",
-              multiple: true,
-              remote: true,
-              dicUrl: "/api/groupon/selftake/page?name={{key}}",
-              props: {
-                label: "name",
-                value: "id"
-              },
-              dicFormatter: function (res) {
-                return res.data.records;
-              },
+            dicFormatter: function (res) {
+              return res.data.records;
             },
-            // {
-            //   label: '团购轮播图',
-            //   labelWidth: 120,
-            //   prop: 'slideshow',
-            //   type: 'upload',
-            //   dataType: 'array',
-            //   listType: 'picture-card',
-            //   loadText: '上传中，请稍等',
-            //   accept: 'image/png, image/jpeg',
-            //   fileSize: 1024,
-            //   tip: '只能上传jpg/png文件，且不超过1M',
-            //   span: 24,
-            //   hide: true,
-            //   propsHttp: {
-            //     res: 'data',
-            //     url: 'link',
-            //   },
-            //   action: "/api/blade-resource/oss/endpoint/put-file-attach"
-            // },
-            // {
-            //   label: '团购详情图',
-            //   labelWidth: 120,
-            //   prop: 'detailImage',
-            //   type: 'upload',
-            //   dataType: 'array',
-            //   listType: 'picture-card',
-            //   loadText: '上传中，请稍等',
-            //   accept: 'image/png, image/jpeg',
-            //   fileSize: 1024,
-            //   tip: '只能上传jpg/png文件，且不超过1M',
-            //   limit: 25,
-            //   span: 24,
-            //   hide: true,
-            //   propsHttp: {
-            //     res: 'data',
-            //     url: 'link',
-            //   },
-            //   action: "/api/blade-resource/oss/endpoint/put-file-attach"
-            // },
-          ]
-        },
-        data: []
+          },
+          {
+            label: "团购商品",
+            prop: "goods",
+            span: 24,
+            fromslot: true,
+            editDisplay: false,
+            hide: true
+          },
+        ]
+      },
+      data: [],
+
+      grouponPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      grouponData: [],
+      grouponLoading: false,
+      grouponForm: {},
+      grouponQuery: {},
+      grouponSelectionList: []
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.groupon_add, false),
+        viewBtn: this.vaildData(this.permission.groupon_view, false),
+        delBtn: this.vaildData(this.permission.groupon_delete, false),
+        editBtn: this.vaildData(this.permission.groupon_edit, false)
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.groupon_add, false),
-          viewBtn: this.vaildData(this.permission.groupon_view, false),
-          delBtn: this.vaildData(this.permission.groupon_delete, false),
-          editBtn: this.vaildData(this.permission.groupon_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      let goodsIds = [];
+      this.tableData.forEach(e => {
+        goodsIds.push(e.goodsId)
+      })
+      row.goodsIds = goodsIds;
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        return ids.join(",");
-      }
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
     },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
+    rowUpdate(row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
           .then(() => {
             return remove(row.id);
           })
@@ -402,17 +473,17 @@
               message: "操作成功!"
             });
           });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
           .then(() => {
             return remove(this.ids);
           })
@@ -424,116 +495,189 @@
             });
             this.$refs.crud.toggleSelection();
           });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      this.tableData = [];
+      this.grouponSelectionList = [];
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    openAuditBox(id) {
+      this.auditBox = true;
+      this.auditForm.id = id;
+    },
+    auditGoods() {
+      audit(this.auditForm).then(() => {
+        this.auditBox = false;
         this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      openAuditBox(id) {
-        this.auditBox = true;
-        this.auditForm.id = id;
-      },
-      auditGoods() {
-        audit(this.auditForm).then(() => {
-          this.auditBox = false;
-          this.onLoad(this.page, this.query);
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    handleClose() {
+      this.addGoodsBox = false;
+      this.auditBox = false;
+      this.auditForm = {
+        auditStatus: '',
+        id: '',
+        remark: ''
+      };
+    },
+    modifyState(row, status) {
+      let title = status === 0 ? '确定禁用？' : '确定启用？';
+      this.$confirm(title, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: '修改中，请稍等...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        row.status = status;
+        modifyStatus(row).then(() => {
+          loading.close();
+          this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
         }, error => {
-          loading();
+          loading.close();
           console.log(error);
         });
-      },
-      handleClose() {
-        this.auditBox = false;
-        this.auditForm = {
-          auditStatus: '',
-          id: '',
-          remark: ''
-        };
-      },
-      modifyState(row, status) {
+      })
 
+    },
+    uploadError(error, column) {
+      this.$message.success('上传失败:' + error)
+      // console.log(error, column)
+    },
+    uploadAfter(res, done, loading, column) {
+      // console.log(res,column)
+      done()
+    },
 
-        let title = status === 0 ? '确定禁用？' : '确定启用？';
-        this.$confirm(title, {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          const loading = this.$loading({
-            lock: true,
-            text: '修改中，请稍等...',
-            spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)'
-          });
-          row.status = status;
-          modifyStatus(row).then(() => {
-            loading.close();
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          }, error => {
-            loading.close();
-            console.log(error);
-          });
-        })
 
-      },
-      uploadError(error, column) {
-        this.$message.success('上传失败:' + error)
-        // console.log(error, column)
-      },
-      uploadAfter(res, done, loading,column) {
-        // console.log(res,column)
-        done()
-      },
+    grouponSearchReset() {
+      this.grouponQuery = {};
+      this.grouponOnLoad(this.grouponPage);
+    },
+    grouponSearchChange(params, done) {
+      this.grouponQuery = params;
+      this.grouponPage.currentPage = 1;
+      this.grouponOnLoad(this.grouponPage, params);
+      done();
+    },
+    grouponSelectionChange(list) {
+      this.grouponSelectionList = list;
+    },
+    grouponSelectionClear() {
+      this.grouponSelectionList = [];
+      this.$refs.grouponCrud.toggleSelection();
+    },
+    grouponCurrentChange(currentPage){
+      this.grouponPage.currentPage = currentPage;
+    },
+    grouponSizeChange(pageSize){
+      this.grouponPage.pageSize = pageSize;
+    },
+    grouponRefreshChange() {
+      this.grouponOnLoad(this.grouponPage, this.grouponQuery);
+    },
+    grouponOnLoad(page, params = {}) {
+      this.grouponLoading = true;
+      if (this.grouponQuery.categoryIdArr) {
+        this.grouponQuery.goodsCategoryId = this.grouponQuery.categoryIdArr.join("-");
+        this.grouponQuery.categoryIdArr = null;
+      }
+      this.grouponQuery.auditStatus = 1;
+      this.grouponQuery.isSale = 1;
+
+      getGoodsList(page.currentPage, page.pageSize, Object.assign(params, this.grouponQuery)).then(res => {
+        const data = res.data.data;
+        this.grouponPage.total = data.total;
+        this.grouponData = data.records;
+        this.grouponLoading = false;
+        this.selectionClear();
+      });
+    },
+    submit() {
+      if (this.grouponSelectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+
+      let map = new Map();
+      this.tableData.forEach(row => {
+        map.set(row.goodsId, row.goodsId);
+      })
+
+      this.grouponSelectionList.forEach(e => {
+        let g = map.get(e.id);
+        if (!g) {
+          let goods = {
+            goodsId: e.id,
+            goodsName: e.goodsName,
+            goodsCover: e.goodsCover,
+            goodsSpec: e.goodsSpec,
+            supplierName: e.supplierName
+          }
+          this.tableData.push(goods);
+        }
+      })
+
+      this.addGoodsBox = false;
     }
-  };
+  }
+};
 </script>
 
 <style>

src/views/mall/categoryinfo.vue

@@ -110,15 +110,15 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "分类图标",
-              prop: "logoShow",
-              addDisplay: false,
-              viewDisplay: false,
-              editDisplay: false,
-              type: 'upload',
-              listType: 'picture-img',
-            },
+            // {
+            //   label: "分类图标",
+            //   prop: "logoShow",
+            //   addDisplay: false,
+            //   viewDisplay: false,
+            //   editDisplay: false,
+            //   type: 'upload',
+            //   listType: 'picture-img',
+            // },
             {
               label: "分类父",
               prop: "parentId",
@@ -134,23 +134,23 @@
               },
               dicUrl: '/api/mall/categoryinfo/getByParentId/0'
             },
-            {
-              label: '分类图标',
-              prop: 'logo',
-              type: 'upload',
-              listType: 'picture-img',
-              loadText: '上传中，请稍等',
-              accept: 'image/png, image/jpeg',
-              fileSize: 500,
-              tip: '只能上传jpg/png文件，且不超过500kb',
-              span: 24,
-              hide: true,
-              propsHttp: {
-                res: 'data',
-                url: 'link',
-              },
-              action: "/api/blade-resource/oss/endpoint/put-file-attach"
-            },
+            // {
+            //   label: '分类图标',
+            //   prop: 'logo',
+            //   type: 'upload',
+            //   listType: 'picture-img',
+            //   loadText: '上传中，请稍等',
+            //   accept: 'image/png, image/jpeg',
+            //   fileSize: 500,
+            //   tip: '只能上传jpg/png文件，且不超过500kb',
+            //   span: 24,
+            //   hide: true,
+            //   propsHttp: {
+            //     res: 'data',
+            //     url: 'link',
+            //   },
+            //   action: "/api/blade-resource/oss/endpoint/put-file-attach"
+            // },
           ]
         },
         data: []

src/views/mall/goodsinfo.vue

@@ -146,12 +146,43 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "规格",
+              prop: "goodsSpec",
+              editDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入规格",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "供应商",
+              prop: "supplierId",
+              editDisplay: false,
+              viewDisplay: false,
+              remote: true,
+              hide: true,
+              type: "select",
+              dicUrl: "/api/mall/store/list?userName={{key}}&state=1&auditState=1&size=30",
+              props: {
+                label: "userName",
+                value: "userId"
+              },
+              dicFormatter: function (res) {
+                return res.data.records;
+              },
+              rules: [{
+                required: true,
+                message: "请选择供应商",
+                trigger: "blur"
+              }]
+            },
             {
               label: "供应商",
               prop: "supplierName",
               search: true,
               addDisplay: false,
-              viewDisplay: false,
               editDisplay: false,
             },
             {