门店商品添加批次编号列表，修改是否在途

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsBatchController.java

@@ -113,6 +113,6 @@ public class GoodsBatchController {
     @ResponseBody
     public R queryListBySku(@RequestParam String sku) {
         List<GoodsBatchEntity> list = goodsBatchService.queryListBySku(sku);
-        return R.ok().put("goodsBatchList",list);
+        return R.ok().put("list",list);
     }
 }

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

@@ -39,7 +39,12 @@
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="goodsTransportInfoDetail" :rules="ruleValidate" :label-width="80">
             <Form-item label="是否在途" prop="wayStatus">
-                <i-input v-model="goodsTransportInfoDetail.wayStatus" placeholder="是否在途"/>
+                <!--<i-input v-model="goodsTransportInfoDetail.wayStatus" placeholder="是否在途"/>-->
+                <i-select v-model="goodsTransportInfoDetail.wayStatus" placeholder="是否在途"
+                          label-in-value style="width: 268px;">
+                    <i-option :value="0" :key="0">是</i-option>
+                    <i-option :value="1" :key="1">否</i-option>
+                </i-select>
             </Form-item>
             <Form-item label="商品sku" prop="sku">
                 <i-input v-model="goodsTransportInfoDetail.sku" placeholder="商品sku"/>
@@ -51,7 +56,7 @@
                 <i-input v-model="goodsTransportInfoDetail.originCountry" placeholder="原产地"/>
             </Form-item>
             <Form-item label="数量" prop="num">
-                <i-input v-model="goodsTransportInfoDetail.num" placeholder="数量"/>
+                <i-input type="number" v-model="goodsTransportInfoDetail.num" placeholder="数量"/>
             </Form-item>
             <!--<Form-item label="创建人编号" prop="createrSn">-->
                 <!--<i-input v-model="goodsTransportInfoDetail.createrSn" placeholder="创建人编号"/>-->

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

@@ -204,7 +204,12 @@
                 </i-select>
             </Form-item>
             <Form-item v-if="showInput" label="批次编号" prop="batchSn">
-                <i-input v-model="productStoreRela.batchSn" placeholder="批次编号" style="width: 268px;"/>
+                <!--<i-input v-model="productStoreRela.batchSn" placeholder="批次编号" style="width: 268px;"/>-->
+                <i-select v-model="productStoreRela.batchSn" placeholder="批次编号" @on-change="changeBatch"
+                          label-in-value style="width: 268px;">
+                    <i-option v-for="batch in batchList" :value="batch.id" :key="batch.id">{{batch.batchSn}}
+                    </i-option>
+                </i-select>
             </Form-item>
             <Form-item v-if="showInput" label="批次到期日期" prop="batchExpireDate">
                 <i-input type='date' v-model="productStoreRela.batchExpireDate" placeholder="批次到期日期" style="width: 268px;"/>

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

@@ -204,7 +204,11 @@ var vm = new Vue({
         stockNum: '',
         isSupplierShowByThirdSn: false,
         roleType: false,
-        isHotShow: false
+        isHotShow: false,
+        // 批次编号列表
+        batchList:[],
+        // 当前选择的批次对象
+        nowBatch:{}
     },
     methods: {
         getIsSupplierShowByThirdSn: function () {
@@ -235,7 +239,10 @@ var vm = new Vue({
                     }else{
                         vm.isStockShare = false;
                     }
+                    // 调用查询出批次列表
+                    vm.getGoodsBatchList(r.goods.sku);
                 });
+
             }
         },
         changeSupplerGoods: function (opt) {
@@ -334,6 +341,7 @@ var vm = new Vue({
             vm.getMacro();
             vm.showInput = false;
             vm.showInputSpecification = false;
+            vm.batchList = [];
         },
         update: function (event) {
             var id = getSelectedRow();
@@ -590,11 +598,34 @@ var vm = new Vue({
                 vm.storesList = r.list;
             });
         },
+        /**
+         * 小问号写的批次编号列表查询
+         * @param sku
+         */
         getGoodsBatchList: function(sku){
-            $.get("../goodsbatch/goodsBatchList?sku="+sku,function (r) {
-
+            // sku要改成动态的，现在是测试
+            $.get("../goodsbatch/queryListBySku?sku="+sku,function (r) {
+                vm.batchList = r.list;
             });
         },
+        /**
+         * 每次切换批次编号都会调用的方法
+         * @param opt
+         */
+        changeBatch : function(opt){
+            var batchId = opt.value;
+            if(typeof batchId === 'number' && !isNaN(batchId)){
+                $.get("../goodsbatch/info/"+batchId, function (r) {
+                    if (r.code != 500) {
+                        vm.nowBatch = r.goodsBatch;
+                        // 把编号id和过期时间赋值上去
+                        vm.productStoreRela.batchSn = vm.nowBatch.batchSn;
+                        vm.productStoreRela.batchExpireDate = transDate(vm.nowBatch.batchExpireDate, 'yyyy-MM-dd');
+                        console.log(vm.productStoreRela);
+                    }
+                });
+            }
+        },
         addAttrRow: function () {
             let goodsId = '';
             if (vm.goods) {