0901PM

config/index.js

@@ -12,7 +12,7 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        target: 'http://192.168.0.62:8080', //wf
+        target: 'http://localhost:8080', //wf
         // target: 'http://192.168.0.11:8088', //zys
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

src/pages/system/goodsManager/goodManager/edit.vue

@@ -0,0 +1,202 @@
+<template>
+  <div class="subPage">
+    <form class="mainForm">
+      <ul>
+         <li class="flex-h">
+          <span>选择案场：</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>商品名称：</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>商品图片：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-upload
+                :action="$api.file.image.url"
+                :limit='limit'
+                list-type="picture-card"
+                :file-list='imgsArr'
+                :on-success="handlePictureCardPreview"
+                :on-remove="handleRemove"
+                :on-exceed="exceed">
+                <i class="el-icon-plus"></i>
+              </el-upload>
+              <el-dialog :visible.sync="dialogVisible">
+                <img width="100%" :src="imgs" alt="">
+              </el-dialog>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>商品价格：</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="detail.specs" multiple placeholder="请选择" style="width:100%;">
+                <el-option
+                  v-for="item in specs.list"
+                  :key="item.SpecId"
+                  :label="item.SpecName"
+                  :value="item.SpecId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>商品类别：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="detail.TypeId" placeholder="请选择商品类型">
+                <el-option
+                  v-for="item in 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 } from 'vuex'
+
+const { mapState: mapGoodsState, mapActions: mapGoodsActions } = createNamespacedHelpers('goods')
+export default {
+  name: '',
+  data () {
+    return {
+      imgs: '',
+      imgsArr: [],
+      limit: 1,
+      dialogVisible: false,
+    }
+  },
+  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 || this.caseid
+      },
+      set (val) {
+        this.UpdateInfo({...this.detail, CaseId: val})
+        this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
+        this.GetGoodSpecs({ pagesize: 1000, caseid: this.Case })
+      }
+    }
+  },
+  methods: {
+    ...mapGoodsActions([
+      'GetGoodTypes',
+      'GetGoodsByID',
+      'AddGoods',
+      'UpdateGoods',
+      'SetRoleNull',
+      'UpdateInfo',
+      'GetGoodSpecs',
+    ]),
+    submit () {
+      this.detail.specs = JSON.stringify(this.detail.specs.map(x => ({SpecId: x, GoodsPrice: this.detail.Price})))
+      if ((this.detail.EquipmentId || '') === '') {
+        this.detail.OrgId = this.orgid
+        if (!this.detail.CaseId || this.detail.CaseId === '') {
+          this.detail.CaseId = this.caseid
+        }
+        this.detail.images = this.imgs
+        this.AddGoods(this.detail)
+      } else {
+        this.UpdateGoods(this.detail)
+      }
+      this.$message({
+        type: 'success',
+        message: '操作成功'
+      })
+      this.$router.push({ name: 'goodsInfo' })
+    },
+    cancel () {
+      this.$router.go(-1)
+    },
+    handlePictureCardPreview (res, file, fileList) {
+      this.imgs = res.result.url
+      this.dialogVisible = false
+      this.imgsArr = fileList
+    },
+    handleRemove (file, fileList) {
+      this.imgsArr = fileList
+    },
+    exceed () {
+      this.$message({
+        message: '超过可传的图片上限',
+        type: 'info',
+        duration: 1000
+      })
+    }
+  },
+  created () {
+    this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
+    this.GetGoodSpecs({ pagesize: 1000, caseid: this.Case })
+    const { id } = this.$route.query
+    if (id && id !== '') {
+      this.GetGoodsByID({ id: id })
+    } else {
+      this.SetRoleNull()
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+</style>

src/pages/system/goodsManager/goodManager/index.vue

@@ -0,0 +1,179 @@
+<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
+                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="RoleName" label="角色名">
+        </el-table-column>
+        <el-table-column label="创建时间" width="300">
+          <template slot-scope="scope">
+            <label>{{FormatDate(scope.row.CreateDate)}}</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 })
+      }
+    }
+  },
+  components: {
+    tableSearch
+  },
+  methods: {
+    ...mapGoodsActions([
+      'GetGoodsList',
+      'GetGoodTypes',
+    ]),
+    search () { // 搜索
+      this.postData.page = 1
+      this.currentList = []
+      this.getList()
+    },
+    getList () {
+      this.GetGoodsList({...this.postData, caseid: this.CaseId})
+    },
+    handleSizeChange (val) {
+      console.log(`每页 ${val} 条`)
+    },
+    handleCurrentChange (val) {
+      this.GetRolesList({ page: val })
+      console.log(`当前页: ${val}`)
+    },
+    handleEdit (index, row) {
+      // 编辑
+      this.$router.push({ name: 'editGoods', query: { id: row.GooddId } })
+    },
+    handleDelete (index, row) {
+      // 删除
+      console.log(index, row)
+      this.$confirm('确认删除此角色?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.DelRole({id: row.RoleId, callback: this.delCallBack})
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+    },
+    delCallBack () {
+      this.$message({
+        type: 'success',
+        message: '删除成功!'
+      })
+      this.getList()
+    },
+    addRole () {
+      this.$router.push({ name: 'editGoods' })
+    },
+  },
+  mounted () {
+    this.GetGoodTypes({ pagesize: 1000, caseid: this.CaseId })
+    this.$nextTick(function () {
+      this.getList()
+    })
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

src/pages/system/page.js

@@ -35,6 +35,8 @@ import editGoodsType from './goodsManager/goodsTypeManager/edit' // 编辑商品
 import goodsSpecManager from './goodsManager/goodsSpecManager/index' // 商品规格管理
 import addGoodsSpec from './goodsManager/goodsSpecManager/add' // 新增商品规格
 import editGoodsSpec from './goodsManager/goodsSpecManager/edit' // 编辑商品规格管理
+import goodsList from './goodsManager/goodManager/index' // 商品管理
+import editGoods from './goodsManager/goodManager/edit' // 商品编辑
 
 import cmsManager from './cmsManager/index' // cms管理
 import bannerManager from './cmsManager/bannerManager/index' // 轮播图管理
@@ -231,6 +233,16 @@ export default {
             component: editGoodsSpec,
             children: []
           }]
+        }, { // 商品管理
+          path: 'goodsInfo',
+          name: 'goodsInfo',
+          component: goodsList,
+          children: [{ // 编辑商品
+            path: 'editGoods',
+            name: 'editGoods',
+            component: editGoods,
+            children: []
+          }]
         }],
       }, { // cms管理
         path: 'cmsManager',

src/store/goods/goods.js

@@ -0,0 +1,103 @@
+import ajax from '../../util/ajax'
+import api from '../../util/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) {
+      ajax(api.goodsManager.getGoodsList.url, {
+        method: api.goodsManager.getGoodsList.method,
+        queryData: {
+          ...payload,
+        }
+      }).then(res => {
+        commit('updateList', res)
+      })
+    },
+    GetGoodTypes ({ commit }, payload) {
+      ajax(api.goodsManager.getGoodsTypeList.url, {
+        method: api.goodsManager.getGoodsTypeList.method,
+        queryData: {
+          ...payload,
+        }
+      }).then(res => {
+        commit('updateTypes', res)
+      })
+    },
+    GetGoodSpecs ({ commit }, payload) {
+      ajax(api.goodsManager.getGoodsSpecList.url, {
+        method: api.goodsManager.getGoodsSpecList.method,
+        queryData: {
+          ...payload,
+        }
+      }).then(res => {
+        commit('updateSpecs', res)
+      })
+    },
+    GetGoodsByID ({ commit }, { id }) {
+      ajax(api.goodsManager.getGoodsByID.url, {
+        method: api.goodsManager.getGoodsByID.method,
+        urlData: {
+          id: id,
+        }
+      }).then(res => {
+        commit('updateInfo', res)
+      })
+    },
+    AddGoods ({ commit }, payload) {
+      ajax(api.goodsManager.addGoods.url, {
+        method: api.goodsManager.addGoods.method,
+        data: {
+          ...payload
+        }
+      }).then(res => {
+        commit('updateInfo', res)
+      })
+    },
+    UpdateGoods ({ commit }, payload) {
+      ajax(api.goodsManager.updateGoods.url, {
+        method: api.goodsManager.updateGoods.method,
+        data: {
+          ...payload
+        }
+      }).then(res => {
+      })
+    },
+    DelGoods ({ commit }, { id, callback }) {
+      ajax(api.goodsManager.deleteGoods.url, {
+        method: api.goodsManager.deleteGoods.method,
+        urlData: {
+          id: id,
+        }
+      }).then(res => {
+        callback()
+      })
+    },
+    SetRoleNull ({ commit }) {
+      commit('updateInfo', {})
+    },
+    UpdateInfo ({ commit }, payload) {
+      commit('updateInfo', payload)
+    }
+  }
+}

src/store/index.js

@@ -17,6 +17,7 @@ export const modules = {
   cms: () => require('./cms').default,
   role: () => require('./system/role').default,
   device: () => require('./case/device').default,
+  goods: () => require('./goods/goods').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/util/ajax.js

@@ -15,10 +15,11 @@ const Axios = axios.create({
 })
 
 Axios.interceptors.request.use((config) => {
+  config.urlData = {...config.urlData, org: 1}
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
   let urlData = qs.stringify(config.urlData)
   let queryData = qs.stringify(config.queryData)
-  // 判断是通过斜杠传参还是通过query传参
+  // 判断是通过斜杠传参
   if (config.url.indexOf(':') > -1) {
     if (typeof config.urlData === 'object') {
       config.url = Object.keys(config.urlData).reduce((url, k) => { // 此方法对每个元素进行处理
@@ -28,10 +29,9 @@ Axios.interceptors.request.use((config) => {
     } else {
       config.url = config.url.slice(0, config.url.indexOf(':')) + urlData
     }
-  } else {
-    if (queryData) {
-      config.url += '?' + queryData
-    }
+  }
+  if (queryData) {
+    config.url += '?' + queryData
   }
   let fm = new FormData()
   for (let k in config.data) {

src/util/api.js

@@ -1,6 +1,6 @@
 const baseUrl = '/api'
-const common = '/common'
-const guest = '/guest'
+const common = '/common/:org'
+const guest = '/guest/:org'
 
 const $api = {
   login: { // 登陆
@@ -26,35 +26,35 @@ const $api = {
   systemSet: {
     getUserList: { // 获取用户列表
       method: 'get',
-      url: `${baseUrl}/common/user`
+      url: `${baseUrl}${common}/user`
     },
     getUserInfo: { // 获取用户信息
       method: 'get',
-      url: `${baseUrl}/common/user/:id`
+      url: `${baseUrl}${common}/user/:id`
     },
     addUser: { // 新增用户
       method: 'post',
-      url: `${baseUrl}/common/user`
+      url: `${baseUrl}${common}/user`
     },
     editUser: { // 更新用户
       method: 'put',
-      url: `${baseUrl}/common/user`
+      url: `${baseUrl}${common}/user`
     },
     deleteUser: { // 删除用户
       method: 'delete',
-      url: `${baseUrl}/common/user/:id`
+      url: `${baseUrl}${common}/user/:id`
     },
     resetPassword: { // 重置用户密码
       method: 'put',
-      url: `${baseUrl}/common/user/password/reset`
+      url: `${baseUrl}${common}/user/password/reset`
     },
     bindRoles: { // 绑定角色
       method: 'put',
-      url: `${baseUrl}/common/userrole`
+      url: `${baseUrl}${common}/userrole`
     },
     getUserRoles: { // 获取用户绑定角色
       method: 'get',
-      url: `${baseUrl}/common/userrole`
+      url: `${baseUrl}${common}/userrole`
     },
   },
   channelManager: {
@@ -194,7 +194,7 @@ const $api = {
     },
     getUserTypeList: { // 获取用户类型列表
       method: 'get',
-      url: `${baseUrl}/common/usertype`
+      url: `${baseUrl}${common}/usertype`
     },
   },
   goodsManager: {
@@ -238,6 +238,26 @@ const $api = {
       method: 'delete',
       url: `${baseUrl}${common}/type/goods/:id`
     },
+    getGoodsList: {
+      method: 'get',
+      url: `${baseUrl}${common}/goods`
+    },
+    getGoodsByID: {
+      method: 'get',
+      url: `${baseUrl}${common}/goods/:id`
+    },
+    addGoods: {
+      method: 'post',
+      url: `${baseUrl}${common}/goods`
+    },
+    updateGoods: {
+      method: 'put',
+      url: `${baseUrl}${common}/goods/:id`
+    },
+    deleteGoods: {
+      method: 'delete',
+      url: `${baseUrl}${common}/goods/:id`
+    },
   },
   cms: {
     location: { // 图片位置(5A)