Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/stock/cancelStockOrder.vue

@@ -158,8 +158,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7, 10, 50, 100]"
-          :page-size="7"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
           background
           style="margin-top:20px;float: right"
           layout="total, sizes, prev, pager, next, jumper"
@@ -219,7 +219,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/config/dealer.vue

@@ -103,8 +103,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
+          :page-sizes="[10,50,100]"
+          :page-size="10"
           background
           align="right"
           style="margin-top:20px;"
@@ -141,7 +141,7 @@ export default {
       pageTotal: 0,
       pageSelect: 0,
       page: 1,
-      limit: 7,
+      limit: 10,
 
       loading: false,
 

src/xt_pages/stock/config/goodInfo.vue

@@ -121,8 +121,8 @@
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :page-sizes="[7]"
-      :page-size="7"
+      :page-sizes="[10, 50, 100]"
+      :page-size="10"
       background
       align="right"
       style="margin-top:20px;"
@@ -159,7 +159,7 @@ export default {
       pageTotal: 0,
       pageSelect: 0,
       page: 1,
-      limit: 7,
+      limit: 10,
       keywords: "",
       goodInfo: {
         loading: false,

src/xt_pages/stock/config/goodType.vue

@@ -124,8 +124,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
           background
           align="right"
           style="margin-top:20px;"
@@ -232,7 +232,7 @@ export default {
       pageTotal: 0,
       pageSelect: 0,
       page: 1,
-      limit: 7,
+      limit: 10,
       keywords: "",
       goodType: {
         loading: false,

src/xt_pages/stock/config/manufacturer.vue

@@ -103,8 +103,8 @@
           <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[7]"
-            :page-size="7"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
             background
             align="right"
             style="margin-top:20px;"
@@ -142,7 +142,7 @@ export default {
       pageSelect: 0,
 
       page: 1,
-      limit: 7,
+      limit: 10,
       loading: false,
 
       manufacturer_code: "",

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -154,8 +154,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -211,7 +211,7 @@ export default {
       searchKey: "",
       type: 4,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -154,8 +154,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -211,7 +211,7 @@ export default {
       searchKey: "",
       type: 3,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/detail/stockInDetail.vue

@@ -167,8 +167,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -228,7 +228,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       manufacturer_id: "",
       dealer_id: "",
       order_type: "",

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -166,8 +166,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -224,7 +224,7 @@ export default {
       searchKey: "",
       type: 2,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -158,8 +158,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -217,7 +217,7 @@ export default {
       searchKey: "",
       type: 2,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -160,8 +160,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7, 10, 50, 100]"
-          :page-size="7"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
           background
           style="margin-top:20px;float: right"
           layout="total, sizes, prev, pager, next, jumper"
@@ -222,7 +222,7 @@ export default {
       ],
       type: 2,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherStockInOrder.vue

@@ -162,8 +162,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -223,7 +223,7 @@ export default {
         { path: false, name: "其他入库单" }
       ],
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherStockOutOrder.vue

@@ -156,8 +156,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -215,7 +215,7 @@ export default {
       ],
       searchKey: "",
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/salesReturnOrder.vue

@@ -156,8 +156,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -218,7 +218,7 @@ export default {
       ],
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/stockInOrder.vue

@@ -161,8 +161,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -254,7 +254,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/stockOutOrder.vue

@@ -155,8 +155,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -214,7 +214,7 @@ export default {
         { path: false, name: "出库单" }
       ],
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/stockQuery.vue

@@ -109,8 +109,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         align="right"
         style="margin-top:20px;"
@@ -154,7 +154,7 @@ export default {
       start_time: "",
       end_time: "",
       page: 1,
-      limit: 7,
+      limit: 10,
       goodType: [],
       goodInfo: [],
       WarehouseInfo: {