Merge remote-tracking branch 'origin/release/1.0' into release/1.0

@@ -3,7 +3,7 @@
         <LayoutFilter>
             <FilterItem :label="filters.sknCode.label">
                 <Input v-model.trim="filters.sknCode.model"
-                       :placeholder="filters.sknCode.holder"></Input>
+                       :placeholder="filters.sknCode.holder" :maxlength="9"></Input>
             </FilterItem>
             <FilterItem :label="filters.prodCode.label">
                 <Input v-model.trim="filters.prodCode.model"

@@ -3,7 +3,7 @@
         <LayoutFilter>
             <FilterItem :label="filters.sknCode.label">
                 <Input v-model.trim="filters.sknCode.model"
-                                :placeholder="filters.sknCode.holder"></Input>
+                                :placeholder="filters.sknCode.holder" :maxlength="9"></Input>
             </FilterItem>
             <FilterItem :label="filters.prodCode.label">
                 <Input v-model.trim="filters.prodCode.model"

@@ -3,7 +3,7 @@
         <LayoutFilter>
             <FilterItem :label="filters.sknCode.label">
                 <Input v-model.trim="filters.sknCode.model" :number="true"
-                       :placeholder="filters.sknCode.holder"></Input>
+                       :placeholder="filters.sknCode.holder" :maxlength="9"></Input>
             </FilterItem>
             <FilterItem label="选择类目">
                 <SelectCategory :value="categoryValue" @select-change="sortChange"></SelectCategory>

@@ -11,7 +11,7 @@
             </FilterItem>
             <FilterItem :label="filters.prodCode.label">
                 <Input v-model.trim.number="filters.prodCode.model"
-                       :placeholder="filters.prodCode.holder"></Input>
+                       :placeholder="filters.prodCode.holder" :maxlength="9"></Input>
             </FilterItem>
             <FilterItem :label="filters.merChantCode.label">
                 <Input v-model.trim="filters.merChantCode.model"

@@ -11,7 +11,7 @@
             </FilterItem>
             <FilterItem :label="filters.prodCode.label">
                 <Input v-model.trim.number="filters.prodCode.model"
-                       :placeholder="filters.prodCode.holder"></Input>
+                       :placeholder="filters.prodCode.holder" :maxlength="9"></Input>
             </FilterItem>
             <FilterItem :label="filters.prodBarCode.label">
                 <Input v-model.trim="filters.prodBarCode.model"
@@ -72,18 +72,22 @@
             },
             filterSearch() {
                 this.useFilter = true;
-                this.getExpList(this.params());
-                this.page.current = 1;
+                if (this.params()) {
+                    this.getExpList(this.params());
+                    this.page.current = 1;
+                }
             },
             clearFilter() {
                 this.useFilter = false;
-                this.getExpList(this.params());
-                this.page.current = 1;
+                if (this.params()) {
+                    this.getExpList(this.params());
+                    this.page.current = 1;
+                }
                 this.filters = dataStore().filters;
             },
             pageChange(page) {
                 let params = this.params();
-    
+
                 params.pageNo = page;
                 this.page.current = page;
                 this.getExpList(params);
@@ -96,32 +100,34 @@
                 };
                 const mapKeys = {
                     expressNumber: 'expressNo',
-                    productSkn: 'prodCode',
+                    skn: 'prodCode',
                     skuFactoryCode: 'prodBarCode',
                     proReqFormId: 'orderNo'
                 };
 
-                if (this.useFilter) {
-                    let val;
-    
-                    _.each(mapKeys, (v, k) => {
-                        val = '' + this.filters[v].model;
-                        if (val.length) {
-                            data[k] = this.filters[v].model;
-                        }
-                    });
+                if (!this.useFilter) {
+                    return data;
                 }
 
+                let val;
+
+                _.each(mapKeys, (v, k) => {
+                    val = '' + this.filters[v].model;
+                    if (val.length) {
+                        data[k] = this.filters[v].model;
+                    }
+                });
+
                 if (typeof data.proReqFormId !== 'undefined' &&
                     !_.isFinite(+data.proReqFormId)) {
                     this.$Message.error('调拨单号只能是数字', 3);
-                    return;
+                    return false;
                 }
 
-                if (typeof data.productSkn !== 'undefined' &&
-                    !_.isFinite(+data.productSkn)) {
+                if (typeof data.skn !== 'undefined' &&
+                    !_.isFinite(+data.skn)) {
                     this.$Message.error('SKN编码只能是数字', 3);
-                    return;
+                    return false;
                 }
 
                 return data;

@@ -7,7 +7,7 @@
             </FilterItem>
             <FilterItem :label="filters.prodCode.label">
                 <Input v-model.trim.number="filters.prodCode.model"
-                       :placeholder="filters.prodCode.holder"></Input>
+                       :placeholder="filters.prodCode.holder" :maxlength="9"></Input>
             </FilterItem>
             <FilterItem :label="filters.merChantCode.label">
                 <Input v-model.trim="filters.merChantCode.model"