管理基本完成

.env.development

@@ -1,21 +1,6 @@
-OUT_PUT_DIR=dist/supervision-portal
+OUT_PUT_DIR=dist/machinery-portal
 
-VUE_APP_BACKEND_URL=http://127.0.0.1:8086/supervision-server
+VUE_APP_BACKEND_URL=http://127.0.0.1:8086/machinery-server
 #VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/enterprise-server
 #VUE_APP_BACKEND_URL=http://qylhhapi.xiaoxinda.com/enterprise-server
 
-#手机企业版
-VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
-#手机校园版
-VUE_APP_COMPANY_HEALTH_WECHAT_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd.html
-#大屏企业版
-VUE_APP_COMPANY_HEALTH_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
-#大屏校园版
-VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html
-#打卡点二维码地址
-VUE_APP_PUNCHLOCATION_URL=http://yktwechat.xiaoxinda.com/#/health/codeScene
-
-#绑定微信
-VUE_APP_SCAN_CODE_LOGIN=7001
-VUE_APP_BIND_WECHAT_CODE=8001
-VUE_APP_BIND_PERSON_WECHAT_CODE=9001

.env.production

@@ -1,4 +1,4 @@
-OUT_PUT_DIR=dist/qylhh-admin
+OUT_PUT_DIR=dist/machinery-portal
 
 VUE_APP_BACKEND_URL=http://qylhhapi.xiaoxinda.com/enterprise-server
 

.env.test

@@ -1,4 +1,4 @@
-OUT_PUT_DIR=dist/enterprise-portal
+OUT_PUT_DIR=dist/machinery-portal
 
 VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/enterprise-server
 

src/api/base/catalogues.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/catalogues/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/catalogues/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/catalogues/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/catalogues/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/catalogues/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/catalogues/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/catalogues/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function query(formData) {
+  return request.post(constant.serverUrl + "/base/catalogues/query", formData);
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove,query
+}

src/api/base/commodity.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/commodity/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/commodity/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/commodity/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/commodity/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/commodity/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/commodity/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/commodity/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/routers/modules/base.js

@@ -1,13 +1,22 @@
 var routers = [
-    // {
-    //     path: '/base/organization/list',
-    //     name: 'BaseOrganizationList',
-    //     component: () => import('@/views/base/organization-list.vue'),
-    //     meta: {
-    //             roles: ["admin"],
-    //             title: '组织机构管理'
-    //     }
-    // },
+    {
+        path: '/base/catalogues/list',
+        name: 'BaseCataloguesList',
+        component: () => import('@/views/base/catalogues-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '商品类型管理'
+        }
+    },
+    {
+        path: '/base/commodity/list',
+        name: 'BaseCommodityList',
+        component: () => import('@/views/base/commodity-list.vue'),
+        meta: {
+                roles: ["admin"],
+                title: '商品管理'
+        }
+    },
 ]
 
 export default routers;

src/views/base/catalogues-detail.vue

@@ -0,0 +1,218 @@
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="名称" prop="title">
+          <el-input
+            v-model="formModel.title"
+            placeholder="请输入名称"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="简介" prop="content">
+          <el-input
+            v-model="formModel.content"
+            placeholder="请输入简介"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="图标" prop="iconUrl">
+          <el-upload
+            name="photoFile"
+            class="avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            :headers="headers"
+            :data="uploadData"
+            :on-success="iconHandleAvatarSuccess"
+            :before-upload="iconBeforeAvatarUpload"
+            :auto-upload="true"
+            accept="image/png,image/jpeg"
+            list-type="picture-card">
+            <img v-if="formModel.iconUrl" :src="formModel.iconUrl" class="avatar" style="width:144px; height:144px;">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="上级" prop="parentId">
+          <el-select-tree
+            :props="parent"
+            :options="parentResult"
+            v-model="formModel.parentId"
+            style="width:300px;"
+            size="mediumn"
+            height="200"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="序号" prop="sort">
+          <el-input
+            v-model="formModel.sort"
+            placeholder="请输入序号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import cataloguesApi from "@/api/base/catalogues";
+import SelectTree from "@/components/SelectTree";
+import { getToken } from "@/utils/auth";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        title: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+        sort: [{ required: true, message: "序号不能为空", trigger: "blur" }],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      //上传图片start
+      uploadImgUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "machinery",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      //上传图片end
+      parentResult: [],
+      parent: {
+        // 配置项（必选）
+        value: "id",
+        label: "title"
+      }
+    };
+  },
+  methods: {
+    iconHandleAvatarSuccess(res, file) {
+      this.loading = false;
+      var self = this;
+
+      self.formModel.iconUrl = res.data.fileUrl;
+    },
+    iconBeforeAvatarUpload(file) {
+      this.loading = true;
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 2MB!");
+        this.loading = false;
+      }
+      return isLt2M;
+    },
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return cataloguesApi.add(self.formModel);
+            } else {
+              return cataloguesApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+    handleReset(name) {
+      this.queryMenu();
+    },
+    queryMenu(keywords) {
+      var formData = new FormData();
+      formData.append("keywords",keywords);
+
+      return cataloguesApi.query(formData).then(response=>{
+        var jsonData = response.data;
+
+        if(jsonData.result){
+          this.parentResult = jsonData.data;
+        }
+        else{
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+  },
+  mounted: function () {
+    this.queryMenu("");
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return cataloguesApi.create();
+      } else {
+        return cataloguesApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "el-select-tree": SelectTree
+  },
+};
+</script>

src/views/base/catalogues-list.vue

@@ -0,0 +1,324 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/base/catalogues">商品类型管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="名称" prop="title">
+        <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
+      </el-form-item>
+      <el-form-item label="上级" prop="parentId">
+        <el-select-tree
+          :props="parent"
+          :options="parentResult"
+          v-model="queryModel.parentId"
+          size="mini"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column label="图标" width="150">
+        <template slot-scope="{row}">
+          <el-image v-if="row.iconUrl != null" style="width: 100px; height: 100px" fit="contain" :src="row.iconUrl"></el-image>
+          <!-- <img v-if="row.iconUrl != null" :src="row.iconUrl" height="100" width="100"/> -->
+          <img v-else src="../../assets/noPicture.png" height="100" width="100"/>
+        </template>
+      </el-table-column>
+      <el-table-column prop="title" label="名称" width="180"></el-table-column>
+      <el-table-column prop="content" label="简介" width="300"></el-table-column>
+      <el-table-column prop="parentName" label="上级" width="180"></el-table-column>
+      <el-table-column prop="sort" label="序号" width="180"></el-table-column>
+      <el-table-column label="操作" width="150" fixed="right">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <catalogues-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></catalogues-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CataloguesDetail from "./catalogues-detail";
+import cataloguesApi from "@/api/base/catalogues";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        title: "",
+        content: "",
+        iconUrl: "",
+        parentId: "",
+        sort: "",
+        delFlag: "",
+        createTime: "",
+        createBy: "",
+        updateTime: "",
+        updateBy: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      parentResult: [],
+      parent: {
+        // 配置项（必选）
+        value: "id",
+        label: "title"
+      }
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("title", self.queryModel.title);
+      formData.append("parentId", self.queryModel.parentId);
+
+      cataloguesApi.pageList(formData).then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          cataloguesApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        cataloguesApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    queryMenu(keywords) {
+      var formData = new FormData();
+      formData.append("keywords",keywords);
+
+      return cataloguesApi.query(formData).then(response=>{
+        var jsonData = response.data;
+
+        if(jsonData.result){
+          this.parentResult = jsonData.data;
+        }
+        else{
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+  },
+  mounted: function () {
+    this.queryMenu("");
+    this.changePage(1);
+  },
+  components: {
+    "catalogues-detail": CataloguesDetail,
+    "el-select-tree": SelectTree
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/commodity-detail.vue

@@ -0,0 +1,283 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <!-- <el-form-item label="类型编号" prop="cataloguesId">
+          <el-input
+            v-model="formModel.cataloguesId"
+            placeholder="请输入类型编号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="商品类型" prop="cataloguesId">
+          <el-select-tree
+            :props="cataloguesId"
+            :options="cataloguesIdResult"
+            v-model="formModel.cataloguesId"
+            style="width: 300px"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="商品型号" prop="productModel">
+          <el-input
+            v-model="formModel.productModel"
+            placeholder="请输入商品型号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="商品图标" prop="productIcon">
+          <el-upload
+            name="photoFile"
+            class="avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            :headers="headers"
+            :data="uploadData"
+            :on-success="iconHandleAvatarSuccess"
+            :before-upload="iconBeforeAvatarUpload"
+            :auto-upload="true"
+            accept="image/png,image/jpeg"
+            list-type="picture-card">
+            <img v-if="formModel.productIcon" :src="formModel.productIcon" class="avatar" style="width:144px; height:144px;">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <!-- <el-form-item label="商品介绍" prop="productContent">
+          <el-input
+            v-model="formModel.productContent"
+            placeholder="请输入商品介绍"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="商品介绍" prop="productContent">
+          <mce-editor
+            ref="editor"
+            uploadName="upfile"
+            v-model="formModel.productContent"
+            :url="uploadUrl"
+            :config="editorConfig"
+          ></mce-editor>
+        </el-form-item>
+        <!-- <el-form-item label="商品图纸" prop="productPicture">
+          <el-input
+            v-model="formModel.productPicture"
+            placeholder="请输入商品图纸"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="商品图纸" prop="productPicture">
+          <el-upload
+            name="photoFile"
+            class="avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            :headers="headers"
+            :data="uploadData"
+            :on-success="picHandleAvatarSuccess"
+            :before-upload="picBeforeAvatarUpload"
+            :auto-upload="true"
+            accept="image/png,image/jpeg"
+            list-type="picture-card">
+            <img v-if="formModel.productPicture" :src="formModel.productPicture" class="avatar" style="width:144px; height:144px;">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="商品库存" prop="productStock">
+          <el-input 
+            v-model="formModel.productStock" 
+            placeholder="请输入商品库存" 
+            style="width: 300px" 
+            @input="formModel.productStock=formModel.productStock.replace(/[^\d]/g,'')"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import commodityApi from "@/api/base/commodity";
+import cataloguesApi from "@/api/base/catalogues";
+import SelectTree from "@/components/SelectTree";
+import MceEditor from "@/components/Tinymce";
+import { getToken } from "@/utils/auth";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        cataloguesId: [
+          { required: true, message: "类型编号不能为空", trigger: "blur" },
+        ],
+        productModel: [
+          { required: true, message: "商品型号不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      cataloguesIdResult: [],
+      cataloguesId: {
+        // 配置项（必选）
+        value: "id",
+        label: "name"
+      },
+      uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
+      editorConfig: {
+        height: 200,
+        width: "95%",
+      },
+      //上传图片start
+      uploadImgUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "machinery",
+      },
+      headers: {
+        Authorization: getToken(),
+      },
+      //上传图片end
+    };
+  },
+  created() {
+    var self = this;
+
+    var formData = new FormData();
+    cataloguesApi.query(formData).then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.cataloguesIdResult = jsonData.data;
+        }
+      }
+    });
+  },
+  methods: {
+    iconHandleAvatarSuccess(res, file) {
+      this.loading = false;
+      var self = this;
+
+      self.formModel.productIcon = res.data.fileUrl;
+    },
+    iconBeforeAvatarUpload(file) {
+      this.loading = true;
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 2MB!");
+        this.loading = false;
+      }
+      return isLt2M;
+    },
+    picHandleAvatarSuccess(res, file) {
+      this.loading = false;
+      var self = this;
+
+      self.formModel.productPicture = res.data.fileUrl;
+    },
+    picBeforeAvatarUpload(file) {
+      this.loading = true;
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 2MB!");
+        this.loading = false;
+      }
+      return isLt2M;
+    },
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            self.formModel.productContent = self.$refs.editor.getContent();
+            if (id == null || id.length == 0) {
+              return commodityApi.add(self.formModel);
+            } else {
+              return commodityApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return commodityApi.create();
+      } else {
+        return commodityApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          if (self.formModel.productContent != null) {
+            self.$refs.editor.setContent(self.formModel.productContent);
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "mce-editor": MceEditor,
+    "el-select-tree": SelectTree
+  },
+};
+</script>

src/views/base/commodity-list.vue

@@ -0,0 +1,346 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/base/commodity">商品管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="商品类型" prop="cataloguesId">
+        <el-select-tree
+          :props="cataloguesId"
+          :options="cataloguesIdResult"
+          v-model="queryModel.cataloguesId"
+          size="mini"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="商品型号" prop="productModel">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.productModel"
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="cataloguesName" label="类型编号" width="180"></el-table-column>
+      <el-table-column prop="productModel" label="商品型号" width="180"></el-table-column>
+      <el-table-column label="商品图标" width="150">
+        <template slot-scope="{row}">
+          <el-image v-if="row.productIcon != null" style="width: 100px; height: 100px" fit="contain" :src="row.productIcon"></el-image>
+          <img v-else src="../../assets/noPicture.png" height="100" width="100"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品图纸" width="150">
+        <template slot-scope="{row}">
+          <el-image v-if="row.productPicture != null" style="width: 100px; height: 100px" fit="contain" :src="row.productPicture"></el-image>
+          <img v-else src="../../assets/noPicture.png" height="100" width="100"/>
+        </template>
+      </el-table-column>
+      <el-table-column prop="productStock" label="商品库存" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <commodity-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></commodity-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CommodityDetail from "./commodity-detail";
+import commodityApi from "@/api/base/commodity";
+import cataloguesApi from "@/api/base/catalogues";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        cataloguesId: "",
+        productModel: "",
+        productIcon: "",
+        productContent: "",
+        productPicture: "",
+        productStock: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      cataloguesIdResult: [],
+      cataloguesId: {
+        // 配置项（必选）
+        value: "id",
+        label: "name"
+      }
+    };
+  },
+  created() {
+    var self = this;
+
+    var formData = new FormData();
+    cataloguesApi.query(formData).then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.cataloguesIdResult = jsonData.data;
+        }
+      }
+    });
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("cataloguesId", self.queryModel.cataloguesId);
+      formData.append("productModel", self.queryModel.productModel);
+      formData.append("productIcon", self.queryModel.productIcon);
+      formData.append("productContent", self.queryModel.productContent);
+      formData.append("productPicture", self.queryModel.productPicture);
+      formData.append("productStock", self.queryModel.productStock);
+      formData.append("delFlag", self.queryModel.delFlag);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("updateTime", self.queryModel.updateTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      commodityApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          commodityApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        commodityApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "commodity-detail": CommodityDetail,
+    "el-select-tree": SelectTree
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/sys/user-list.vue

@@ -211,8 +211,7 @@ export default {
       props: {
         // 配置项（必选）
         value: "id",
-        label: "name",
-        children: "children"
+        label: "name"
       },
       // companyInfoResult:[]
     };