Merge branch 'master' of xwh/kmall-pt-general into master

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

@@ -53,7 +53,7 @@
             </i-col>
 
             <i-col span="3">
-                <i-input v-model="q.barCode"  placeholder="条形码"/>
+                <i-input v-model="q.barCode"  placeholder="条形码" @on-enter="barCodeEnter"/>
             </i-col>
 
             <i-col span="3">

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

@@ -81,8 +81,19 @@ let vm = new Vue({
             $.get("../pdf/printPdf?type="+vm.q.pdfType+"&sku="+vm.q.sku+"&barCode="+vm.q.barCode+"&head="+vm.q.isHead+"&headUrl="+vm.q.headUrl+"&storeId="+vm.q.storeId, function (r) {
                 vm.mall2OrderingEarlyWarningReminds = r.mall2OrderingEarlyWarningReminds;
             });
-			alert("exportPdf")
-		}
+		},
+        barCodeEnter:function () {
+            if (vm.q.storeId==''){
+                alert("请先选择门店")
+                return;
+            }
+            if (vm.q.sku==''){
+                alert("请先输入sku")
+                return;
+            }
+
+            this.exportPdf();
+        }
 
 	},
     mounted() {