Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/Home.vue

@@ -24,7 +24,7 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
-                    @change="setDiyDateRange"
+                    @input="setDiyDateRange"
                     value-format="yyyy-MM-dd"
                     :picker-options="pickerOptions">
                   </el-date-picker>

src/components/customerManage/customerOrder.vue

@@ -523,7 +523,6 @@ export default {
                     Id: "8",
                     show:
                       item.OrderStatus != 2 &&
-                      item.OrderStatus != 5 &&
                       item.OrderStatus != 6
                         ? true
                         : false,

src/components/customerManage/myCustomerOrder.vue

@@ -485,8 +485,7 @@ export default {
                     Name: "订单收损",
                     Id: "8",
                     show:
-                      item.OrderStatus != 2 &&
-                      item.OrderStatus != 5 &&
+                      item.OrderStatus != 2 &&                      
                       item.OrderStatus != 6
                         ? true
                         : false,

src/components/guestManagement/Agreement.vue

@@ -1105,7 +1105,7 @@
                                         {
                                             Name: '订单收损',
                                             Id: '8',
-                                            show: item.OrderStatus != 2 && item.OrderStatus != 5 &&
+                                            show: item.OrderStatus != 2 && 
                                                 item.OrderStatus != 6 ? true : false
                                         },
                                         {