xcx

src/pages/system/goodsManager/goodsSpecManager/add.vue

@@ -56,12 +56,13 @@ export default {
   },
   computed: {
     ...mapState({
-      cases: x => x.app.cases,
+      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.cases || []).filter(x => x.IsBelong === 1))[0] || {}).CaseId || '' : this.postData.CaseId
+        return this.postData.CaseId === '' ? this.defaultCaseId || '' : this.postData.CaseId
       },
       set (val) {
         this.postData.CaseId = val
@@ -73,8 +74,8 @@ export default {
     submit () { // 提交数据
       this.postData.OrgId = this.OrgId
       if (this.postData.CaseId === '') this.postData.CaseId = this.CaseId
-      this.$ajax(this.$api.system.addGoodsSpec.url, {
-        method: this.$api.system.addGoodsSpec.method,
+      this.$ajax(this.$api.goodsManager.addGoodsSpec.url, {
+        method: this.$api.goodsManager.addGoodsSpec.method,
         data: this.postData
       }).then(res => {
         this.$message({

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

@@ -8,7 +8,7 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入规格名"
-                v-model="postData.goodsSpec"
+                v-model="postData.SpecName"
                 clearable>
               </el-input>
             </div>
@@ -29,14 +29,45 @@ export default {
   data () {
     return {
       postData: {
-        goodsSpec: ''
+        SpecId: '',
+        SpecName: '',
+        Status: '',
+        OrgId: '',
+        CaseId: ''
       }
     }
   },
   components: {},
+  created () {
+    this.getInfo()
+  },
   methods: {
-    submit () {
-      console.log(this.postData)
+    getInfo () { // 获取规格信息
+      this.$ajax(this.$api.goodsManager.getGoodsSpecById.url, {
+        method: this.$api.goodsManager.getGoodsSpecById.method,
+        data: { 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
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.$router.push({ name: 'goodsSpecManager' })
+      })
     },
     cancel () {
       this.$router.go(-1)

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

@@ -8,29 +8,29 @@
         <ul>
           <li>
             <span>选择案场：</span>
-            <el-select v-model="tableSearch.caseId" placeholder="请选择">
+            <el-select v-model="CaseId" placeholder="请选择">
               <el-option
-                v-for="item in caseList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                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="getList">搜索</el-button>
+          type="primary" @click="search">搜索</el-button>
       </div>
       <div class="moreFilter"></div>
     </div>
     <div class="system-table-box">
       <el-table
-        :data="tableData"
+        :data="currentList"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="specName"
+          prop="SpecName"
           label="规格名">
         </el-table-column>
         <el-table-column label="操作">
@@ -48,68 +48,74 @@
       </el-table>
     </div>
     <el-pagination
-      @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page.sync="currentPage"
-      :page-size="10"
+      :current-page.sync="postData.page+1"
+      :page-size="postData.pagesize"
       layout="prev, pager, next, jumper"
-      :total="100">
+      :total="total">
     </el-pagination>
   </div>
 </template>
 
 <script>
 import tableSearch from '@/components/tableSearch/index'
-import { createNamespacedHelpers } from 'vuex'
-
-const { mapState: mapCaseState } = createNamespacedHelpers('case')
+import { mapState } from 'vuex'
 
 export default {
   name: '',
   data () {
     return {
-      currentPage: 0, // 当前页码
-      tableSearch: { // 表格搜索条件
-        key: '', // 搜索关键字
-        caseId: '', // 案场id
+      total: 0,
+      postData: { // 表格搜索条件
+        CaseId: '', // 案场id
+        page: 0, // 当前页码
+        pagesize: 10, // 请求数据量
       },
-      tableData: [{
-        specName: 'xxx'
-      }, {
-        specName: 'xxx'
-      }, {
-        specName: 'xxx'
-      }, {
-        specName: 'xxx'
-      }]
+      currentList: []
     }
   },
+  created () {
+    this.getList()
+  },
   computed: {
-    ...mapCaseState({
-      caseList: x => x.caseList,
-    })
+    ...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
+      }
+    }
   },
   components: {
     tableSearch,
   },
   methods: {
+    search () {
+      this.postData.page = 0
+      this.currentList = []
+      this.getList()
+    },
     getList () {
-      this.$ajax(this.$api.system.getGoodsSpecList.url, {
-        method: this.$api.system.getGoodsSpecList.method,
-        data: this.tableSearch
+      this.$ajax(this.$api.goodsManager.getGoodsSpecList.url, {
+        method: this.$api.goodsManager.getGoodsSpecList.method,
+        data: { ...this.postData, CaseId: this.CaseId }
       }).then(res => {
-        console.log(JSON.stringify(res))
+        this.currentList = res.list
+        this.postData.page = res.page
+        this.total = res.pagenum
       })
     },
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
-    },
     handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
+      this.postData.page = val - 1
+      this.getList()
     },
     handleEdit (index, row) { // 编辑
-      console.log(index, row)
-      this.$router.push({ name: 'editGoodsSpec' })
+      this.$router.push({ name: 'editGoodsSpec', query: {id: row.SpecId} })
     },
     handleDelete (index, row) { // 删除
       console.log(index, row)

src/store/app.js

@@ -25,7 +25,9 @@ function packChildren (data) {
     for (let i = 0; i < cp.length; i += 1) {
       if (cp[i].MenuId === it.FatherId) {
         found = true
-        cp[i].children = [...(cp[i].children || []), cp[inx]]
+        if (it.IsShow === 1) {
+          cp[i].children = [...(cp[i].children || []), cp[inx]]
+        }
         break
       }
     }
@@ -55,13 +57,15 @@ export default {
       state.menusRaw = data.menus
       state.roles = data.roles
       state.user = data.user
-      let defaultCase = 0
       state.menus = packChildren(data.menus)
+
+      let defaultCase = 0
       for (let i = 0; i < data.cases.length; i++) {
         if (data.cases[i].IsBelong === 1) {
           defaultCase = data.cases[i].CaseId
         }
       }
+
       state.cases = {
         list: data.cases,
         default: defaultCase

src/util/api.js

@@ -10,7 +10,9 @@ const $api = {
     init: { // 初始化菜单
       method: 'get',
       url: `${baseUrl}/common/system/init`
-    },
+    }
+  },
+  goodsManager: {
     getGoodsSpecList: { // 商品规格列表
       method: 'get',
       url: `${baseUrl}/common/spec/goods`
@@ -19,9 +21,13 @@ const $api = {
       method: 'POST',
       url: `${baseUrl}/common/spec/goods`
     },
+    getGoodsSpecById: { // 根据id获取商品规格
+      method: 'get',
+      url: `${baseUrl}/common/spec/goods/:id`
+    },
     editGoodsSpec: { // 编辑商品规格
       method: 'put',
-      url: `${baseUrl}/common/spec/goods`
+      url: `${baseUrl}/common/spec/goods/:id`
     }
   },
   cms: {