Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

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

@@ -8,12 +8,27 @@
             <div style="width:50%">
               <el-input
                 placeholder="请输入规格名"
-                v-model="postData.goodsSpec"
+                v-model="postData.SpecName"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
+        <li class="flex-h">
+          <span>选择案场：</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>
@@ -24,22 +39,53 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: '',
   data () {
     return {
       postData: {
-        goodsSpec: ''
+        SpecId: '', // 规格id（新增传空值）
+        SpecName: '', // 规格名称
+        Status: '', // 状态（无状态可传空值）
+        OrgId: '', // 机构id
+        CaseId: '', // 案场id
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId === '' ? (((this.cases || []).filter(x => x.IsBelong === 1))[0] || {}).CaseId || '' : this.postData.CaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
       }
     }
   },
   components: {},
   methods: {
-    submit () {
-      console.log(this.postData)
+    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,
+        data: this.postData
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.$router.push({ name: 'goodsSpecManager' })
+      })
     },
     cancel () {
-      this.$router.go(-1)
+      this.$router.push({ name: 'goodsSpecManager' })
     }
   },
   mounted () { }

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

@@ -18,7 +18,9 @@
             </el-select>
           </li>
         </ul>
-        <tableSearch @exportSearchKey="searchList"></tableSearch>
+        <el-button
+          size="mini"
+          type="primary" @click="getList">搜索</el-button>
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -91,6 +93,14 @@ export default {
     tableSearch,
   },
   methods: {
+    getList () {
+      this.$ajax(this.$api.system.getGoodsSpecList.url, {
+        method: this.$api.system.getGoodsSpecList.method,
+        data: this.tableSearch
+      }).then(res => {
+        console.log(JSON.stringify(res))
+      })
+    },
     handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
     },
@@ -119,9 +129,6 @@ export default {
         })
       })
     },
-    searchList (key) { // 搜索列表
-      console.log(key)
-    },
     addGoodsSpec () {
       this.$router.push({ name: 'addGoodsSpec' })
     }

src/store/app.js

@@ -60,7 +60,7 @@ export default {
       // 扁平 routerData
       // 同时构造出 含有 title 的 parent 数据
       const routeList = flatten([], routerData[1].children, state.menusRaw)
-      console.log(state, routerData[1].children, routeList)
+      // console.log(state, routerData[1].children, routeList)
 
       // 过滤出与 name 相同的 route 节点
       const currentRoute = routeList.filter(x => x.Url === Url)[0]
@@ -73,10 +73,9 @@ export default {
     updateSystemInfo (context) { // 这里的context和我们使用的$store拥有相同的对象和方法
       this.$ajax(this.$api.system.init.url, {
         method: this.$api.system.init.method
+      }).then(res => {
+        context.commit('init', res)
       })
-        .then(res => {
-          context.commit('init', res)
-        })
     }
   }
 }

src/util/api.js

@@ -6,10 +6,22 @@ const $api = {
       url: `${baseUrl}/guest/signin`
     }
   },
-  system: { // 初始化菜单
-    init: {
+  system: {
+    init: { // 初始化菜单
       method: 'get',
       url: `${baseUrl}/common/system/env`
+    },
+    getGoodsSpecList: { // 商品规格列表
+      method: 'get',
+      url: `${baseUrl}/common/spec/goods`
+    },
+    addGoodsSpec: { // 新增商品规格
+      method: 'POST',
+      url: `${baseUrl}/common/spec/goods`
+    },
+    editGoodsSpec: { // 编辑商品规格
+      method: 'put',
+      url: `${baseUrl}/common/spec/goods`
     }
   },
   cms: {