xcx

src/pages/system/caseManager/caseInfo/index.vue

     </div>
     <div class="system-table-box">
       <el-table
-        :data="tableData"
+        :data="currentList"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="id"
+          prop="CaseId"
           label="ID">
         </el-table-column>
         <el-table-column
-          prop="caseName"
+          prop="CaseName"
           label="案场名称">
         </el-table-column>
         <el-table-column
-          prop="address"
+          prop="CaseAddress"
           label="地址">
         </el-table-column>
-        <el-table-column
-          prop="leader"
-          label="负责人">
-        </el-table-column>
-        <el-table-column
-          prop="phone"
-          label="手机号码">
-        </el-table-column>
-        <el-table-column
-          prop="availableAmount"
-          label="账户可用金额">
-        </el-table-column>
-        <el-table-column
-          prop="creatPerson"
-          label="创建人">
-        </el-table-column>
-        <el-table-column
-          prop="creatTime"
-          label="创建时间">
-        </el-table-column>
         <el-table-column label="操作" width="200">
           <template slot-scope="scope">
             <el-button
       </el-table>
     </div>
     <el-pagination
-      @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page.sync="currentPage"
-      :page-size="10"
+      :current-page.sync="postData.page"
+      :page-size="postData.pagesize"
       layout="prev, pager, next, jumper"
-      :total="100">
+      :total="total">
     </el-pagination>
   </div>
 </template>
   name: '',
   data () {
     return {
-      currentPage: 0, // 当前页码
-      tableSearch: { // 表格搜索条件
-        key: '', // 搜索关键字
-        sort: '', // 排序规则
+      total: 0,
+      postData: { // 表格搜索条件
+        name: '', // 案场名称
+        page: 0, // 当前页码
+        pagesize: 10, // 请求数据量
       },
-      tableData: [{
-        id: 'xxx',
-        caseName: 'xxx',
-        address: 'xxx',
-        leader: 'xxx',
-        phone: 'xxx',
-        availableAmount: 'xxx',
-        creatPerson: 'xxx',
-        creatTime: 'xxx'
-      }, {
-        id: 'xxx',
-        caseName: 'xxx',
-        address: 'xxx',
-        leader: 'xxx',
-        phone: 'xxx',
-        availableAmount: 'xxx',
-        creatPerson: 'xxx',
-        creatTime: 'xxx'
-      }, {
-        id: 'xxx',
-        caseName: 'xxx',
-        address: 'xxx',
-        leader: 'xxx',
-        phone: 'xxx',
-        availableAmount: 'xxx',
-        creatPerson: 'xxx',
-        creatTime: 'xxx'
-      }, {
-        id: 'xxx',
-        caseName: 'xxx',
-        address: 'xxx',
-        leader: 'xxx',
-        phone: 'xxx',
-        availableAmount: 'xxx',
-        creatPerson: 'xxx',
-        creatTime: 'xxx'
-      }]
+      currentList: []
     }
   },
   components: {
     tableSearch,
   },
   mounted () {
-    this.$nextTick(function () {})
+    this.$nextTick(function () { })
+  },
+  created () {
+    this.getList()
   },
   methods: {
+    getList () { // 获取列表
+      this.$ajax(this.$api.caseManager.getCaseList.url, {
+        method: this.$api.caseManager.getCaseList.method,
+        queryData: this.postData
+      }).then(res => {
+        this.currentList = res.list
+        this.postData.page = res.page
+        this.total = res.pagenum
+      })
+    },
     redirection (pathName) { // 重定向
       this.$router.push({ name: pathName })
     },
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
-    },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
+    handleCurrentChange (val) { // 跳转到分页
+      this.getList()
     },
     editItem (index, row) { // 修改
       // console.log(index, row)
       console.log(index, row)
     },
     searchList (key) { // 搜索列表
-      console.log(key)
+      this.postData.name = key
+      this.currentList = []
+      this.postData.page = 0
+      this.getList()
     }
   }
 }

src/pages/system/channelManager/channelList/index.vue

         <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>
-        <tableSearch @exportSearchKey="searchList"></tableSearch>
+        <el-button
+          size="mini"
+          type="primary" @click="search">搜索</el-button>
       </div>
       <div class="moreFilter"></div>
     </div>
       </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: [{
-        channelName: 'xxx',
-        channelCode: 'xxx'
-      }, {
-        channelName: 'xxx',
-        channelCode: 'xxx'
-      }, {
-        channelName: 'xxx',
-        channelCode: 'xxx'
-      }, {
-        channelName: 'xxx',
-        channelCode: 'xxx'
-      }]
+      currentList: []
     }
   },
-  computed: {
-    ...mapCaseState({
-      caseList: x => x.caseList,
-    })
+  created () {
+    this.getList()
   },
-  components: {
-    tableSearch,
+  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: {
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
+    search () { // 搜索
+      this.postData.page = 0
+      this.currentList = []
+      this.getList()
     },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
+    getList () { // 获取列表
+      this.$ajax(this.$api.goodsManager.getGoodsTypeList.url, {
+        method: this.$api.goodsManager.getGoodsTypeList.method,
+        data: { ...this.postData, CaseId: 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 (val) { // 跳转到分页
+      this.postData.page = val - 1
+      this.getList()
     },
     handleEdit (index, row) { // 编辑
-      console.log(index, row)
-      this.$router.push({ name: 'editChannel' })
+      this.$router.push({ name: 'editGoodsType', query: { id: row.TypeId } })
     },
     handleDelete (index, row) { // 删除
-      console.log(index, row)
-      this.$confirm('确认删除此渠道?', '提示', {
+      let name = '确认删除规格“' + row.TypeName + '”?'
+      this.$confirm(name, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
+        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({
         })
       })
     },
-    searchList (key) { // 搜索列表
-      console.log(key)
-    },
     addChannel () {
       this.$router.push({ name: 'addChannel' })
     }

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

     </div>
     <el-pagination
       @current-change="handleCurrentChange"
-      :current-page.sync="postData.page+1"
+      :current-page.sync="postData.page"
       :page-size="postData.pagesize"
       layout="prev, pager, next, jumper"
       :total="total">
 </template>
 
 <script>
-import tableSearch from '@/components/tableSearch/index'
 import { mapState } from 'vuex'
 
 export default {
       }
     }
   },
-  components: {
-    tableSearch,
-  },
   methods: {
-    search () {
+    search () { // 搜索
       this.postData.page = 0
       this.currentList = []
       this.getList()
     },
-    getList () {
+    getList () { // 获取列表
       this.$ajax(this.$api.goodsManager.getGoodsSpecList.url, {
         method: this.$api.goodsManager.getGoodsSpecList.method,
-        data: { ...this.postData, CaseId: this.CaseId }
+        queryData: { ...this.postData, CaseId: this.CaseId }
       }).then(res => {
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum
       })
     },
-    handleCurrentChange (val) {
-      this.postData.page = val - 1
+    handleCurrentChange (val) { // 跳转到分页
       this.getList()
     },
     handleEdit (index, row) { // 编辑

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

             <div style="width:50%">
               <el-input
                 placeholder="请输入商品种类"
-                v-model="postData.goodsType"
+                v-model="postData.TypeName"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <span>商品种类code：</span>
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-input
-                placeholder="请输入商品种类code"
-                v-model="postData.goodsTypeCode"
-                clearable>
-              </el-input>
+              <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>
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: '',
   data () {
     return {
       postData: {
-        goodsType: '',
-        goodsTypeCode: ''
+        TypeId: '', // 种类id（新增可传空值）
+        TypeName: '', // 种类名称
+        CaseId: '', // 案场id
+        OrgId: '', // 机构id
+        CreatUser: '', // 创建者（传空值）
+        CreatTime: '', // 创建时间（传空值）
+        Status: '', // 状态（传空值）
       },
       caseAreaList: [
         {
       ]
     }
   },
+  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 () {
-      console.log(this.postData)
+      this.postData.OrgId = this.OrgId
+      if (this.postData.CaseId === '') this.postData.CaseId = this.CaseId
+      this.$ajax(this.$api.goodsManager.addGoodsType.url, {
+        method: this.$api.goodsManager.addGoodsType.method,
+        data: this.postData
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.$router.push({ name: 'goodsTypeManager' })
+      })
     },
     cancel () {
-      this.$router.go(-1)
+      this.$router.push({ name: 'goodsTypeManager' })
     }
   },
   mounted () { }

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

             <div style="width:50%">
               <el-input
                 placeholder="请输入商品种类"
-                v-model="postData.goodsType"
+                v-model="postData.TypeName"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <span>商品种类code：</span>
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-input
-                placeholder="请输入商品种类code"
-                v-model="postData.goodsTypeCode"
-                clearable>
-              </el-input>
+              <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">保存</el-button>
-          <el-button type="danger" size="mini">取消</el-button>
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
         </li>
       </ul>
     </form>
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: '',
   data () {
     return {
       postData: {
-        goodsType: '',
-        goodsTypeCode: ''
+        TypeId: '',
+        TypeName: '',
+        Status: '',
+        OrgId: '',
+        CaseId: ''
       },
-      caseAreaList: [
-        {
-          value: '0',
-          label: '区域A'
-        }
-      ]
+    }
+  },
+  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.getGoodsTypeById.url, {
+        method: this.$api.goodsManager.getGoodsTypeById.method,
+        urlData: {id: this.$route.query.id}
+      }).then(res => {
+        console.log(res)
+        this.postData = res
+      })
+    },
+    submit () { // 提交数据
+      if (this.postData.TypeName === '') {
+        this.$message({
+          type: 'error',
+          message: '种类名称不能为空'
+        })
+        return false
+      }
+      this.$ajax(this.$api.goodsManager.editGoodsType.url, {
+        method: this.$api.goodsManager.editGoodsType.method,
+        data: this.postData,
+        urlData: {id: this.postData.TypeId}
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.$router.push({ name: 'goodsTypeManager' })
+      })
+    },
+    cancel () {
+      this.$router.go(-1)
+    }
   },
-  mounted () { }
 }
 </script>
 

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

         <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>
-        <tableSearch @exportSearchKey="searchList"></tableSearch>
+        <el-button
+          size="mini"
+          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="goodsType"
+          prop="TypeName"
           label="商品种类">
         </el-table-column>
         <el-table-column
-          prop="caseName"
+          prop="CaseName"
           label="所属案场">
         </el-table-column>
         <el-table-column label="操作">
       </el-table>
     </div>
     <el-pagination
-      @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page.sync="currentPage"
-      :page-size="10"
+      :current-page.sync="postData.page"
+      :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: [{
-        goodsType: 'xxx',
-        caseName: 'xxx'
-      }, {
-        goodsType: 'xxx',
-        caseName: 'xxx'
-      }, {
-        goodsType: 'xxx',
-        caseName: 'xxx'
-      }, {
-        goodsType: 'xxx',
-        caseName: 'xxx'
-      }]
+      currentList: []
     }
   },
-  computed: {
-    ...mapCaseState({
-      caseList: x => x.caseList,
-    })
+  created () {
+    this.getList()
   },
-  components: {
-    tableSearch,
+  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: {
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
+    search () { // 搜索
+      this.postData.page = 0
+      this.currentList = []
+      this.getList()
     },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
+    getList () { // 获取列表
+      this.$ajax(this.$api.goodsManager.getGoodsTypeList.url, {
+        method: this.$api.goodsManager.getGoodsTypeList.method,
+        queryData: { ...this.postData, CaseId: 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 (val) { // 跳转到分页
+      this.getList()
     },
     handleEdit (index, row) { // 编辑
-      console.log(index, row)
-      this.$router.push({ name: 'editGoodsType' })
+      this.$router.push({ name: 'editGoodsType', query: { id: row.TypeId } })
     },
     handleDelete (index, row) { // 删除
-      console.log(index, row)
-      this.$confirm('确认删除此渠道?', '提示', {
+      let name = '确认删除规格“' + row.TypeName + '”?'
+      this.$confirm(name, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
+        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({
         })
       })
     },
-    searchList (key) { // 搜索列表
-      console.log(key)
-    },
     addGoodsType () {
       this.$router.push({ name: 'addGoodsType' })
     }

src/util/api.js

       url: `${baseUrl}/common/system/init`
     }
   },
+  channelManager: {
+    getChannelList: { // 渠道列表
+      method: 'get',
+      url: `${baseUrl}/common/`
+    },
+  },
+  caseManager: {
+    getCaseList: { // 获取案场列表
+      method: 'get',
+      url: `${baseUrl}/common/case/info`
+    },
+  },
   goodsManager: {
     getGoodsSpecList: { // 商品规格列表
       method: 'get',
       url: `${baseUrl}/common/spec/goods`
     },
     addGoodsSpec: { // 新增商品规格
-      method: 'POST',
+      method: 'post',
       url: `${baseUrl}/common/spec/goods`
     },
     getGoodsSpecById: { // 根据id获取商品规格
       url: `${baseUrl}/common/spec/goods/:id`
     },
     deleteGoodsSpec: { // 删除商品规格
-      method: 'DELETE',
+      method: 'delete',
       url: `${baseUrl}/common/spec/goods/:id`
-    }
+    },
+    getGoodsTypeList: { // 商品种类列表
+      method: 'get',
+      url: `${baseUrl}/common/type/goods`
+    },
+    addGoodsType: { // 新增商品种类
+      method: 'post',
+      url: `${baseUrl}/common/type/goods`
+    },
+    getGoodsTypeById: { // 根据id获取商品种类
+      method: 'get',
+      url: `${baseUrl}/common/type/goods/:id`
+    },
+    editGoodsType: { // 编辑商品种类
+      method: 'put',
+      url: `${baseUrl}/common/type/goods/:id`
+    },
+    deleteGoodsType: { // 删除商品种类
+      method: 'delete',
+      url: `${baseUrl}/common/type/goods/:id`
+    },
   },
   cms: {
     location: { // 图片位置