Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/1.0

@@ -110,7 +110,7 @@
                     maxSortId: fts.sort.first.model,
                     middleSortId: fts.sort.second.model,
                     smallSortId: fts.sort.third.model,
-                    isPublished: fts.publishStatus.model,
+                    isPublished: fts.publishStatus.model !== -1 ? fts.publishStatus.model : null,
                     brandId: fts.brand.model !== -1 ? fts.brand.model : null,
                     auditStatus: fts.verifyStatus.model !== -1 ? fts.verifyStatus.model : null,
                     stock: fts.stockStatus.model !== -1 ? this.filters.stockStatus.model : null

@@ -4,7 +4,7 @@
  * @date: 2017/04/13
  */
 const auditStatus = {
-    0: '无状态',
+    0: '新品未上架',
     1: '上架待审核',
     2: '上架驳回',
     3: '已下架'
@@ -129,7 +129,7 @@ export default () => {
                     },
                     {
                         value: 0,
-                        label: '从未发布'
+                        label: '新品未上架'
                     },
                     {
                         value: 1,

@@ -62,6 +62,10 @@ export default () => {
                     {
                         value: 3,
                         label: '收货完成'
+                    },
+                    {
+                        value: 4,
+                        label: '已取消'
                     }
                 ]
             }
@@ -150,7 +154,8 @@ export default () => {
                         const txtMap = {
                             1: '已处理',
                             2: '已处理（超时）',
-                            3: '收货完成'
+                            3: '收货完成',
+                            4: '已取消'
                         };
 
                         ot = ot === 'N' ? true : false;
@@ -158,8 +163,8 @@ export default () => {
                             type = 2;
                         }
 
-                        if (status === 3) {
-                            type = 3;
+                        if (status !== 2) {
+                            type = status;
                         }
 
                         return `<span v-if="${ot}">${txtMap[type]}</span>

@@ -78,7 +78,7 @@
             const params = {
                 pageNo: 1,
                 pageSize: 20,
-                statusList: [2, 3]
+                statusList: [2, 3, 4]
             };
 
             this.productList(params);
@@ -88,7 +88,7 @@
                 let data = {
                     pageNo: 1,
                     pageSize: 20,
-                    statusList: [2, 3]
+                    statusList: [2, 3, 4]
                 };
 
                 if (!this.useFilterSign) {
@@ -151,7 +151,7 @@
                 }
 
                 if (status === -1) {
-                    values.statusList = [2, 3];
+                    values.statusList = [2, 3, 4];
                 } else if (status === -2) {
                     values.statusList = [2];
                 } else {

@@ -96,7 +96,7 @@
                 };
                 const mapKeys = {
                     expressNumber: 'expressNo',
-                    sknFactoryCode: 'prodCode',
+                    productSkn: 'prodCode',
                     skuFactoryCode: 'prodBarCode',
                     proReqFormId: 'orderNo'
                 };
@@ -118,8 +118,8 @@
                     return;
                 }
 
-                if (typeof data.sknFactoryCode !== 'undefined' &&
-                    !_.isFinite(+data.sknFactoryCode)) {
+                if (typeof data.productSkn !== 'undefined' &&
+                    !_.isFinite(+data.productSkn)) {
                     this.$Message.error('SKN编码只能是数字', 3);
                     return;
                 }