Merge branch 'master' of zj/kmall-pt into master

kmall-admin/src/main/webapp/WEB-INF/page/shop/goods.html

@@ -134,7 +134,7 @@
                 </Row>
                 <!--<i-form ref="formValidate" :model="goods" :rules="ruleValidate" :label-width="80">-->
                     <Form-item label="商户" prop="merchSn">
-                        <i-select v-model="goods.merchSn" filterable placeholder="商户" label-in-value>
+                        <i-select v-model="goods.merchSn" filterable placeholder="商户" @on-change="showMerchInfo" label-in-value>
                             <i-option v-for="merch in merchList" :value="merch.merchSn" :key="merch.merchSn">{{merch.merchName}}</i-option>
                         </i-select>
                     </Form-item>

kmall-admin/src/main/webapp/WEB-INF/page/shop/storeProductStock.html

@@ -98,10 +98,11 @@
         <p slot="title">{{title}}</p>
         <i-form ref="formValidate" :model="productStoreRela" :rules="ruleValidate" :label-width="80">
             <Form-item label="门店" prop="storeId">
-                <i-select v-model="productStoreRela.storeId" placeholder="门店" filterable
+                <i-select v-model="productStoreRela.storeId" placeholder="门店" filterable @on-change="getGoods"
                           label-in-value>
                     <i-option v-for="store in stores" :value="store.id"
-                              :key="store.id">{{store.storeName}}
+                              :key="store.id">
+                        {{store.storeName}}
                     </i-option>
                 </i-select>
             </Form-item>

kmall-admin/src/main/webapp/js/shop/goods.js

@@ -196,9 +196,6 @@ var vm = new Vue({
             vm.cusNationCodeList = [];
             vm.attributeEntityList = [{'id': '', 'goodsId': '', 'attributeId': '', 'value': '', 'isDelete': 0}];
             vm.getMacro();
-            vm.getBrand();
-            vm.getSuppliers();
-            vm.getFreights();
             vm.getCusUnitCodeList();
             vm.getCusNationCode();
             vm.getMerchList();
@@ -218,11 +215,8 @@ var vm = new Vue({
             opt.flag = 1;
             vm.getAttributes(opt);
             vm.getMacro();
-            vm.getBrand();
-            vm.getSuppliers();
             vm.getCusUnitCodeList();
             vm.getCusNationCode();
-            vm.getFreights();
             vm.getGoodsGallery(id);
             vm.getMerchList();
             vm.showInput = true;
@@ -236,13 +230,13 @@ var vm = new Vue({
                 vm.macros = r.list;
             });
         },
-        getBrand: function () {
-            $.get("../brand/queryAll", function (r) {
+        getBrand: function (merchSn) {
+            $.get("../brand/queryAll?merchSn=" + merchSn, function (r) {
                 vm.brands = r.list;
             });
         },
-        getSuppliers: function () {
-            $.get("../supplier/queryAll", function (r) {
+        getSuppliers: function (merchSn) {
+            $.get("../supplier/queryAll?merchSn=" + merchSn, function (r) {
                 vm.suppliers = r.list;
             });
         },
@@ -256,8 +250,8 @@ var vm = new Vue({
                 vm.cusNationCodeList = r.list;
             });
         },
-        getFreights: function() {
-            $.get("../freight/queryAll", function (r) {
+        getFreights: function(merchSn) {
+            $.get("../freight/queryAll?merchSn=" + merchSn, function (r) {
                 vm.freights = r.list;
             });
         },
@@ -604,14 +598,24 @@ var vm = new Vue({
         goodsExport: function () {
             vm.fileList = false;
         },
+        showMerchInfo:function(opt){
+            var merchSn = opt.value;
+            vm.getCategories(merchSn);
+            vm.getFreights(merchSn);
+            vm.getBrand(merchSn);
+            vm.getSuppliers(merchSn);
+        },
+        getCategories: function (merchSn) {
+            $.get("../category/getCategorySelect?isShow=1&merchSn=" + merchSn, function (r) {
+                vm.categories = r.list;
+            });
+        },
     },
     mounted() {
         // this.uploadList = this.$refs.upload.fileList;
         $.get("../category/getCategorySelect", function (r) {
             vm.queryCategories = r.list;
         });
-        $.get("../category/getCategorySelect?isShow=1", function (r) {
-            vm.categories = r.list;
-        });
+
     }
 });

kmall-admin/src/main/webapp/js/shop/storeProductStock.js

@@ -162,7 +162,6 @@ var vm = new Vue({
             vm.uploadList = [];
             vm.productStoreRela = { stockNum: '', retailPrice: '', marketPrice: '' };
             vm.getMacro();
-            vm.getGoods();
             vm.showInput = false;
         },
         update: function (event) {
@@ -175,7 +174,6 @@ var vm = new Vue({
             vm.uploadList = [];
             vm.getInfo(id);
             vm.getMacro();
-            vm.getGoods();
             vm.showInput = false;
             if (vm.productStoreRela.goodsBizType == 11) {
                 vm.showInput = true;
@@ -235,8 +233,16 @@ var vm = new Vue({
                 vm.productStoreRela = r.productStoreRela;
             });
         },
-        getGoods: function () {
-            $.get("../goods/queryAll/", function (r) {
+        getGoods: function (opt) {
+
+            var storeId = opt.value;
+            var merchSn = "";
+            for (var i = 0; i < vm.stores.length; i ++ ) {
+                if(vm.stores[i].id == storeId)
+                    merchSn = vm.stores[i].merchSn;
+            }
+
+            $.get("../goods/queryAll?merchSn=" + merchSn, function (r) {
                 vm.goodss = r.list;
             });
         },