合并所有页面

src/store/index.js

@@ -18,6 +18,7 @@ import visitor from './modules/visitor'
 import lobby from './modules/lobby'
 import followup from './modules/followup'
 import sysyrole from './modules/role'
+import goods from './modules/goods'
 import sysmenu from './modules/sysmenu'
 
 Vue.use(Vuex)
@@ -42,7 +43,8 @@ const store = new Vuex.Store({
     lobby,
     followup,
     sysyrole,
-    sysmenu
+    goods,
+    sysmenu,
   }
 })
 

src/store/modules/goods.js

@@ -0,0 +1,71 @@
+import { interact, replaceApiParams } from '../../utils'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    goodsList: [],
+    goodsInfo: {},
+    goodsTypes: [],
+    goodsSpecs: [],
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.goodsList = payload || []
+    },
+    updateInfo (state, payload) {
+      state.goodsInfo = payload || {}
+    },
+    updateTypes (state, payload) {
+      state.goodsTypes = payload || {}
+    },
+    updateSpecs (state, payload) {
+      state.goodsSpecs = payload || {}
+    }
+  },
+  actions: {
+    GetGoodsList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        interact(apis.goodsManager.getGoodsList, payload).then(res => {
+          commit('updateList', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    GetGoodTypes ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        interact(apis.goodsManager.getGoodsTypeList, payload).then(res => {
+          commit('updateTypes', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    GetGoodSpecs ({ commit }, payload) {
+      interact(apis.goodsManager.getGoodsSpecList, payload).then(res => {
+        commit('updateSpecs', res)
+      })
+    },
+    GetGoodsByID ({ commit }, { id }) {
+      interact(replaceApiParams(apis.goodsManager.getGoodsByID, { id })).then(res => {
+        commit('updateInfo', res)
+      })
+    },
+    AddGoods ({ commit }, payload) {
+      interact(apis.goodsManager.addGoods, payload).then(res => {
+        commit('updateInfo', res)
+      })
+    },
+    UpdateGoods (_, payload) {
+      interact(replaceApiParams(apis.goodsManager.updateGoods, { id: payload.GoodsId }), payload).then(x => x)
+    },
+    DelGoods (_, { id, callback }) {
+      interact(replaceApiParams(apis.goodsManager.deleteGoods.url, { id: id })).then(callback)
+    },
+    SetNull ({ commit }) {
+      commit('updateInfo', {})
+    },
+    UpdateInfo ({ commit }, payload) {
+      commit('updateInfo', payload)
+    }
+  }
+}

src/store/modules/role.js

@@ -1,5 +1,5 @@
 import lodash from 'lodash'
-import { interact, replaceApiParams } from '../../utils'
+import { interact } from '../../utils'
 import apis from '../../config/api'
 
 export default {

src/views/goodsManager/goodManager/edit.vue

@@ -0,0 +1,255 @@
+<template>
+  <div class="subPage">
+    <form class="mainForm">
+      <ul>
+         <li class="flex-h">
+          <span>选择案场：<em>*</em></span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="Case" placeholder="请选择">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>商品名称：<em>*</em></span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入商品名称"
+                v-model="detail.GoodsName"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>商品图片：<em>*</em></span>
+          <div class="flex-item">
+            <div class="red-hint">建议上传150*150尺寸的图片</div>
+            <div style="width:50%">
+              <el-upload
+                class="avatar-uploader"
+                action='string'
+                :before-upload="toolClass.beforeUpload"
+                :http-request="toolClass.upload"
+                :show-file-list="false"
+                :on-success="handleAvatarSuccess">
+                <img v-if="Image" :src="Image" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>商品价格：<em>*</em></span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入商品价格"
+                v-model="detail.Price"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>商品规格：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="detailSpecs" multiple placeholder="请选择" style="width:100%;">
+                <el-option
+                  v-for="item in ((Case || '') === '' ? [] : specs.list)"
+                  :key="item.SpecId"
+                  :label="item.SpecName"
+                  :value="item.SpecId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>商品类别：<em>*</em></span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="TypeId" placeholder="请选择商品类型">
+                <el-option
+                  v-for="item in ((Case || '') === '' ? [] : types.list)"
+                  :key="item.TypeId"
+                  :label="item.TypeName"
+                  :value="item.TypeId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
+        <li style="text-align:center">
+          <el-button type="primary" size="mini" @click='submit'>保存</el-button>
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
+        </li>
+      </ul>
+    </form>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers, mapState, mapActions } from 'vuex'
+
+const { mapState: mapGoodsState, mapActions: mapGoodsActions } = createNamespacedHelpers('goods')
+export default {
+  name: '',
+  data () {
+    return {
+      limit: 1,
+      dialogVisible: false,
+      infoSpecs: null,
+    }
+  },
+  components: {},
+  computed: {
+    ...mapGoodsState({
+      detail: x => x.goodsInfo,
+      types: x => x.goodsTypes,
+      specs: x => x.goodsSpecs,
+    }),
+    ...mapState({
+      cases: x => x.app.cases.list,
+      caseid: x => x.app.cases.default,
+      orgid: x => x.app.user.OrgId,
+    }),
+    Case: {
+      get () {
+        return this.detail.CaseId
+      },
+      set (val) {
+        this.UpdateInfo({ ...this.detail, CaseId: val })
+        this.detail.TypeId = ''
+        this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
+        this.GetGoodSpecs({ pagesize: 1000, caseid: this.Case })
+      }
+    },
+    detailSpecs: {
+      get () {
+        // console.log(this.infoSpecs || (this.detail.Specs || []).map(x => x.SpecId))
+        return this.infoSpecs || (this.detail.Specs || []).map(x => x.SpecId)
+      },
+      set (val) {
+        this.infoSpecs = val
+      },
+    },
+    Image () {
+      return ((this.detail.Images || [])[0] || {}).ImgUrl
+    },
+    TypeId: {
+      get () {
+        return this.detail.TypeId
+      },
+      set (val) {
+        this.UpdateInfo({ ...this.detail, TypeId: val })
+      },
+    },
+  },
+  methods: {
+    ...mapGoodsActions([
+      'GetGoodTypes',
+      'GetGoodsByID',
+      'AddGoods',
+      'UpdateGoods',
+      'SetNull',
+      'UpdateInfo',
+      'GetGoodSpecs',
+    ]),
+    ...mapActions([
+      'picSize'
+    ]),
+    submit () {
+      this.detail.specs = JSON.stringify(this.detailSpecs.map(x => ({ SpecId: x, GoodsPrice: this.detail.Price })))
+      this.detail.images = (this.detail.Images || []).map(x => {
+        if (x.response) {
+          return x.response.result.url
+        } else {
+          return x.ImgUrl
+        }
+      }).join(',')
+      if ((this.detail.CaseId || '') === '') {
+        this.$message({
+          type: 'error',
+          message: '案场不能为空'
+        })
+        return false
+      }
+      if ((this.detail.GoodsName || '') === '') {
+        this.$message({
+          type: 'error',
+          message: '商品名称不能为空'
+        })
+        return false
+      }
+      if ((this.detail.Images || '') === '') {
+        this.$message({
+          type: 'error',
+          message: '图片不能为空'
+        })
+        return false
+      }
+      if ((this.detail.Price || '') === '') {
+        this.$message({
+          type: 'error',
+          message: '价格不能为空'
+        })
+        return false
+      }
+      if ((this.detail.TypeId || '') === '') {
+        this.$message({
+          type: 'error',
+          message: '类别不能为空'
+        })
+        return false
+      }
+      if ((this.detail.GoodsId || '') === '') {
+        this.detail.OrgId = this.orgid
+        this.AddGoods(this.detail)
+      } else {
+        if ((this.detail.CaseId || '') === '') {
+          this.$message({
+            type: 'error',
+            message: '案场不能为空'
+          })
+          return false
+        }
+        this.UpdateGoods(this.detail)
+      }
+      this.$message({
+        type: 'success',
+        message: '操作成功'
+      })
+      this.$router.push({ name: 'goodsInfo' })
+    },
+    cancel () {
+      this.$router.go(-1)
+    },
+    handleAvatarSuccess (res, file) {
+      this.UpdateInfo({ ...this.detail, Images: [{ ImgUrl: res.result.url }] })
+    },
+  },
+  created () {
+    this.picSize({ w: 150, h: 150 })
+    const { id } = this.$route.query
+    if (id && id !== '') {
+      this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
+      this.GetGoodSpecs({ pagesize: 1000, caseid: this.Case })
+      this.GetGoodsByID({ id: id })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

src/views/goodsManager/goodManager/index.vue

@@ -0,0 +1,213 @@
+<template>
+  <div class="subPage">
+    <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click='addRole'>新增商品</el-button>
+        </div>
+        <ul>
+          <li>
+            <!-- <span>选择案场：</span> -->
+            <el-select v-model="CaseId" placeholder="请选择">
+              <el-option
+                key="all"
+                label="所有案场"
+                value="all">
+              </el-option>
+              <el-option
+                v-for="item in cases"
+                :key="item.CaseId"
+                :label="item.CaseName"
+                :value="item.CaseId">
+              </el-option>
+            </el-select>
+          </li>
+          <li>
+            <el-input
+              placeholder="请输入商品名称"
+              v-model="postData.name"
+            >
+            </el-input>
+          </li>
+          <li>
+            <span>商品类型：</span>
+            <el-select v-model="postData.type" placeholder="请选择">
+              <el-option
+                v-for="item in types.list"
+                :key="item.TypeId"
+                :label="item.TypeName"
+                :value="item.TypeId">
+              </el-option>
+            </el-select>
+          </li>
+        </ul>
+        <el-button
+          size="mini"
+          type="primary" @click="search">搜索</el-button>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+    <div class="system-table-box">
+      <el-table :data="goods.list" stripe style="width: 100%">
+        <el-table-column prop="GoodsName" label="商品名称">
+        </el-table-column>
+        <el-table-column label="图片" width="300">
+          <template slot-scope="scope">
+            <img :src="((scope.row.Images || [])[0] || {}).ImgUrl" style="width:200px;" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="Price" label="价格">
+        </el-table-column>
+        <el-table-column label="类型">
+          <template slot-scope="scope">
+            <label>{{getTypeName(scope.row.TypeId)}}</label>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格">
+          <template slot-scope="scope">
+            <label>{{getSpecNames(scope.row.Specs)}}</label>
+          </template>
+        </el-table-column>
+        <el-table-column label="案场">
+          <template slot-scope="scope">
+            <label>{{getCaseName(scope.row.CaseId)}}</label>
+          </template>
+        </el-table-column>
+        <el-table-column fixed='right' label="操作" width="300">
+          <template slot-scope="scope">
+            <el-button size="mini" type="warning" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-pagination
+    @size-change="handleSizeChange"
+    @current-change="handleCurrentChange"
+    :current-page.sync="currentPage"
+    :page-size="postData.pagesize"
+    layout="prev, pager, next, jumper"
+    :total="goods.pagenum">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers, mapState } from 'vuex'
+import tableSearch from '@/components/tableSearch/index'
+
+const { mapState: mapGoodsState, mapActions: mapGoodsActions } = createNamespacedHelpers('goods')
+
+export default {
+  name: '',
+  data () {
+    return {
+      currentPage: 0, // 当前页码
+      key: '',
+      postData: {
+        caseid: '',
+        name: '',
+        type: '',
+        page: 1,
+        pagesize: 10,
+      },
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    ...mapGoodsState({
+      goods: x => x.goodsList,
+      types: x => x.goodsTypes,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+        this.GetGoodTypes({ pagesize: 1000, caseid: this.CaseId === 'all' ? '' : this.CaseId })
+      }
+    }
+  },
+  components: {
+    tableSearch
+  },
+  methods: {
+    ...mapGoodsActions([
+      'GetGoodsList',
+      'GetGoodTypes',
+      'DelGoods',
+      'SetNull',
+    ]),
+    getTypeName (typeid) {
+      return (this.types.list.filter(x => x.TypeId === typeid)[0] || {}).TypeName
+    },
+    getSpecNames (specs) {
+      return (specs || []).map(x => x.SpecName).join(',')
+    },
+    getCaseName (caseid) {
+      return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
+    },
+    search () { // 搜索
+      this.postData.page = 1
+      this.currentList = []
+      this.getList()
+    },
+    getList () {
+      this.GetGoodsList({ ...this.postData, caseid: this.CaseId === 'all' ? '' : this.CaseId })
+    },
+    handleSizeChange (val) {
+      console.log(`每页 ${val} 条`)
+    },
+    handleCurrentChange (val) {
+      this.postData.page = this.currentPage
+      this.getList()
+    },
+    handleEdit (index, row) {
+      // 编辑
+      this.SetNull()
+      this.$router.push({ name: 'editGoods', query: { id: row.GoodsId } })
+    },
+    handleDelete (index, row) {
+      // 删除
+      this.$confirm('确认删除此商品?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.DelGoods({ id: row.GoodsId, callback: this.delCallBack })
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+    },
+    delCallBack () {
+      this.$message({
+        type: 'success',
+        message: '删除成功!'
+      })
+      this.getList()
+    },
+    addRole () {
+      this.SetNull()
+      this.$router.push({ name: 'addGoods' })
+    },
+  },
+  created () {
+    this.GetGoodTypes({ pagesize: 1000, caseid: this.CaseId })
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/goodsManager/goodsSpecManager/add.vue

@@ -0,0 +1,105 @@
+<template>
+  <div class="subPage">
+    <form class="mainForm">
+      <ul>
+        <li class="flex-h">
+          <span>规格名：<em>*</em></span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入规格名"
+                v-model="postData.SpecName"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>选择案场：<em>*</em></span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="CaseId" placeholder="请选择">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
+        <li style="text-align:center">
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
+        </li>
+      </ul>
+    </form>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: '',
+  data () {
+    return {
+      postData: {
+        SpecId: '', // 规格id（新增传空值）
+        SpecName: '', // 规格名称
+        Status: '', // 状态（无状态可传空值）
+        OrgId: '', // 机构id
+        CaseId: '', // 案场id
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId === '' ? this.defaultCaseId || '' : this.postData.CaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
+      }
+    }
+  },
+  components: {},
+  methods: {
+    submit () { // 提交数据
+      if (this.postData.SpecName === '') {
+        this.$message({
+          message: '规格名不能为空',
+          type: 'error'
+        })
+        return false
+      }
+      this.postData.OrgId = this.OrgId
+      if (this.postData.CaseId === '') this.postData.CaseId = this.CaseId
+      this.$ajax(this.$api.goodsManager.addGoodsSpec.url, {
+        method: this.$api.goodsManager.addGoodsSpec.method,
+        data: this.postData
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.$router.push({ name: 'goodsSpecManager' })
+      })
+    },
+    cancel () {
+      this.$router.push({ name: 'goodsSpecManager' })
+    }
+  },
+  mounted () { }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

src/views/goodsManager/goodsSpecManager/edit.vue

@@ -0,0 +1,115 @@
+<template>
+  <div class="subPage">
+    <form class="mainForm">
+      <ul>
+        <li class="flex-h">
+          <span>规格名：<em>*</em></span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input
+                placeholder="请输入规格名"
+                v-model="postData.SpecName"
+                clearable>
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>选择案场：<em>*</em></span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="CaseId" placeholder="请选择">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
+        <li style="text-align:center">
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
+        </li>
+      </ul>
+    </form>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: '',
+  data () {
+    return {
+      postData: {
+        SpecId: '',
+        SpecName: '',
+        Status: '',
+        OrgId: '',
+        CaseId: ''
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId === '' ? this.defaultCaseId || '' : this.postData.CaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
+      }
+    }
+  },
+  components: {},
+  created () {
+    this.getInfo()
+  },
+  methods: {
+    getInfo () { // 获取规格信息
+      this.$ajax(this.$api.goodsManager.getGoodsSpecById.url, {
+        method: this.$api.goodsManager.getGoodsSpecById.method,
+        urlData: {id: this.$route.query.id}
+      }).then(res => {
+        this.postData = res
+      })
+    },
+    submit () { // 提交数据
+      if (this.postData.SpecName === '') {
+        this.$message({
+          type: 'error',
+          message: '规格名称不能为空'
+        })
+        return false
+      }
+      this.$ajax(this.$api.goodsManager.editGoodsSpec.url, {
+        method: this.$api.goodsManager.editGoodsSpec.method,
+        data: this.postData,
+        urlData: {id: this.postData.SpecId}
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.$router.push({ name: 'goodsSpecManager' })
+      })
+    },
+    cancel () {
+      this.$router.go(-1)
+    }
+  },
+  mounted () { }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

src/views/goodsManager/goodsSpecManager/index.vue

@@ -0,0 +1,164 @@
+<template>
+  <div class="subPage">
+    <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click="addGoodsSpec">新增商品规格</el-button>
+        </div>
+        <ul>
+          <li>
+            <!-- <span>选择案场：</span> -->
+            <el-select v-model="CaseId" placeholder="请选择">
+              <el-option
+                key="all"
+                label="所有案场"
+                value="all">
+              </el-option>
+              <el-option
+                v-for="item in cases"
+                :key="item.CaseId"
+                :label="item.CaseName"
+                :value="item.CaseId">
+              </el-option>
+            </el-select>
+          </li>
+        </ul>
+        <el-button
+          size="mini"
+          type="primary" @click="search">搜索</el-button>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+    <div class="system-table-box">
+      <el-table
+        :data="currentList"
+        stripe
+        style="width: 100%">
+        <el-table-column
+          prop="SpecName"
+          label="规格名">
+        </el-table-column>
+        <el-table-column
+          label="所属案场">
+          <template slot-scope="scope">
+            <label>{{getCaseName(scope.row.CaseId)}}</label>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="warning"
+              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-pagination
+      @current-change="handleCurrentChange"
+      :current-page.sync="postData.page"
+      :page-size="postData.pagesize"
+      layout="prev, pager, next, jumper"
+      :total="total">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: '',
+  data () {
+    return {
+      total: 0,
+      postData: { // 表格搜索条件
+        CaseId: '', // 案场id
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
+      },
+      currentList: []
+    }
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
+      }
+    }
+  },
+  methods: {
+    getCaseName (caseid) {
+      return (this.cases.filter(x => x.CaseId === caseid)[0] || {}).CaseName
+    },
+    search () { // 搜索
+      this.postData.page = 1
+      this.currentList = []
+      this.getList()
+    },
+    getList () { // 获取列表
+      this.$ajax(this.$api.goodsManager.getGoodsSpecList.url, {
+        method: this.$api.goodsManager.getGoodsSpecList.method,
+        queryData: { ...this.postData, caseid: this.CaseId === 'all' ? '' : this.CaseId }
+      }).then(res => {
+        this.currentList = res.list
+        this.postData.page = res.page
+        this.total = res.pagenum
+      })
+    },
+    handleCurrentChange (val) { // 跳转到分页
+      this.getList()
+    },
+    handleEdit (index, row) { // 编辑
+      this.$router.push({ name: 'editGoodsSpec', query: { id: row.SpecId } })
+    },
+    handleDelete (index, row) { // 删除
+      let name = '确认删除规格“' + row.SpecName + '”?'
+      this.$confirm(name, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$ajax(this.$api.goodsManager.deleteGoodsSpec.url, {
+          method: this.$api.goodsManager.deleteGoodsSpec.method,
+          urlData: { id: row.SpecId }
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          this.search()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    addGoodsSpec () {
+      this.$router.push({ name: 'addGoodsSpec' })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

src/views/goodsManager/goodsTypeManager/index.vue

@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <div>
+      <el-button type="success" @click="addGoodsType">新增商品类型</el-button>
+    </div>
+    <el-card class="marginTB" shadow="hover">
+      <el-table
+        :data="currentList"
+        stripe
+        style="width: 100%">
+        <el-table-column
+          prop="typeName"
+          label="商品种类">
+        </el-table-column>
+        <el-table-column
+          prop="englishName"
+          label="英文名称">
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="warning"
+              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-pagination
+      @current-change="handleCurrentChange"
+      :current-page.sync="postData.page"
+      :page-size="postData.pagesize"
+      layout="prev, pager, next, jumper"
+      :total="total">
+    </el-pagination>
+    <el-dialog title="维护类型" :visible.sync="dialogFormVisible" width="30%">
+      <el-form :model="typeDetail">
+        <el-form-item label="商品种类" label-width="80px">
+          <el-input v-model="typeDetail.typeName" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="英文名称" label-width="80px">
+          <el-input v-model="typeDetail.englishName" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitTypeDetail">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: '',
+  data () {
+    return {
+      total: 0,
+      dialogFormVisible: false,
+      postData: { // 表格搜索条件
+        caseid: '', // 案场id
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
+      },
+      currentList: [],
+      typeDetail: {},
+      typeDetailTPL: {
+        typeId: '', // 种类id（新增可传空值）
+        typeName: '', // 种类名称
+        caseId: '', // 案场id
+        orgId: '', // 机构id
+        creatUser: '', // 创建者（传空值）
+        creatTime: '', // 创建时间（传空值）
+        status: '', // 状态（传空值）
+        englishName: '',
+      },
+    }
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+  computed: {
+    ...mapState({
+    }),
+  },
+  methods: {
+    getList () { // 获取列表
+      // this.$ajax(this.$api.goodsManager.getGoodsTypeList.url, {
+      //   method: this.$api.goodsManager.getGoodsTypeList.method,
+      //   queryData: { ...this.postData, caseid: this.CaseId === 'all' ? '' : this.CaseId }
+      // }).then(res => {
+      //   // for (var n = 0; n < res.list.length; n++) {
+      //   //   res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
+      //   // }
+      //   this.currentList = res.list
+      //   this.postData.page = res.page
+      //   this.total = res.pagenum
+      // })
+    },
+    handleCurrentChange () { // 跳转到分页
+      this.getList()
+    },
+    handleEdit (index, row) { // 编辑
+      this.typeDetail = row
+      this.dialogFormVisible = true
+    },
+    handleDelete (index, row) { // 删除
+      let name = '确认删除类型“' + row.typeName + '”?'
+      this.$confirm(name, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // this.$ajax(this.$api.goodsManager.deleteGoodsType.url, {
+        //   method: this.$api.goodsManager.deleteGoodsType.method,
+        //   urlData: { id: row.TypeId }
+        // }).then(res => {
+        //   this.$message({
+        //     type: 'success',
+        //     message: '删除成功!'
+        //   })
+        //   this.search()
+        // })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    addGoodsType () {
+      this.typeDetail = { ...this.typeDetailTPL }
+      this.dialogFormVisible = true
+    },
+    submitTypeDetail () {
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+.marginTB {
+  margin: 20px auto;
+}
+</style>

src/views/index.js

@@ -211,6 +211,15 @@ const pages = [
           title: '车辆管理',
         },
       },
+      {
+        path: 'goodstype',
+        name: 'goodstype',
+        component: () => import('./goodsManager/goodsTypeManager'),
+        meta: {
+          menuShow: true,
+          title: '商品类型管理',
+        },
+      }
     ]
   },
 

src/views/sysuser/role/add/add.vue

@@ -51,7 +51,7 @@ export default {
     getCheckedNodes() {
       let idSet = new Set();
       const checkedNodes = this.$refs.tree.getCheckedNodes();
-      checkedNodes.map((item,index) => {
+      checkedNodes.map((item) => {
           idSet.add(item.menuId)
           idSet.add(item.menuPid)
       })

src/views/sysuser/role/edi/edi.vue

@@ -56,7 +56,7 @@ export default {
     getCheckedNodes() {
       let idSet = new Set();
       const checkedNodes = this.$refs.tree.getCheckedNodes();
-      checkedNodes.map((item,index) => {
+      checkedNodes.map((item) => {
           idSet.add(item.menuId)
       })
 
@@ -77,7 +77,7 @@ export default {
         })
     },
     menusParsing(array) {
-        array.map((item,index) => {
+        array.map((item) => {
             this.checkedMenuKeys.push(item.menuId)
             if (item.children !== null) {
                 this.menusParsing(item.children)

src/views/sysuser/role/list.vue

@@ -136,7 +136,7 @@ export default {
     },
     handleSelectionChange(val) {
       this.ids = []
-      val.map((item,index)=> {
+      val.map((item)=> {
         this.ids.push(item.roleId);
       })
     }