优化

frontend/src/views/virtual/orders/cards.vue

@@ -9,33 +9,7 @@
     :z-index="source === 0 ? 1000 : 500"
   >
     <div class="page-handle-wrap">
-      <ul class="handle-wraper bd-b">
+      <div class="search-wrap">
-        <li class="f-l">
-          <div class="text-exp">
-            <Row v-if="counts">
-              <a @click="sort" class="umar-r10">
-                <b>已选{{counts}}张</b>
-              </a>
-              <a @click="clearSelect">
-                <b>清空</b>
-              </a>
-            </Row>
-            <b v-else>全部信息</b>
-          </div>
-        </li>
-
-        <li class="f-r">
-          <div class="handle-item">
-            <Button @click="search.show=!search.show" ghost icon="ios-search" type="primary">搜索</Button>
-          </div>
-
-          <div class="handle-item">
-            <Button @click="index(1)" icon="md-refresh">刷新</Button>
-          </div>
-        </li>
-      </ul>
-
-      <div class="search-wrap" v-show="search.show">
         <ul class="handle-wraper">
           <li class="handle-item w-250">
             <Select clearable placeholder="运营商" v-model="params.carrier_operator">
@@ -62,6 +36,15 @@
               v-model.trim="params.time"
             ></DatePicker>
           </li>
+
+          <li class="f-r">
+            <div class="handle-item">
+              <Button @click="index()" ghost type="primary">立即搜索</Button>
+            </div>
+            <div class="handle-item">
+              <Button @click="resetSearch" ghost type="warning">重置搜索</Button>
+            </div>
+          </li>
         </ul>
 
         <ul class="handle-wraper">
@@ -100,19 +83,31 @@
           <li class="handle-item w-250">
             <Input placeholder="SIM" type="textarea" v-model="params.sim"/>
           </li>
-
-          <li class="f-r">
-            <div class="handle-item">
-              <Button @click="index()" ghost type="primary">立即搜索</Button>
-            </div>
-            <div class="handle-item">
-              <Button @click="resetSearch" ghost type="warning">重置搜索</Button>
-            </div>
-          </li>
         </ul>
       </div>
     </div>
 
+    <div class="page-list-wrap umar-b10">
+      <li class="f-r">
+        <div class="text-exp">
+          <Row v-if="counts">
+            <a @click="sort" class="umar-r10">
+              <b>已选 {{counts}} / {{filterTotal}} 张</b>
+            </a>
+            <a @click="clearSelect">
+              <b>清空</b>
+            </a>
+          </Row>
+          <Row v-else>
+            <b class="umar-r10">共 {{filterTotal}} / {{total}} 张</b>
+            <a @click="selectAll">
+              <b>全选</b>
+            </a>
+          </Row>
+        </div>
+      </li>
+    </div>
+
     <div class="page-list-wrap">
       <Row :gutter="8">
         <Col span="18">

frontend/src/views/virtual/orders/js/cards.js

@@ -24,6 +24,18 @@ export default {
     }
   },
   computed: {
+    filterTotal() {
+      return this.filterOrders.filter(el => {
+        return el.shipments !== el.counts;
+      }).reduce((acc, cur) => {
+        return acc + cur.counts;
+      }, 0);
+    },
+    total() {
+      return this.orders.reduce((acc, cur) => {
+        return acc + cur.counts;
+      }, 0);
+    },
     ...mapGetters(['orders', 'cards', 'selected', 'selectedMapped', 'counts', 'getFilterUsedCards', 'getSelectedByOrderId', 'relations', 'relationObj', 'real_companies', 'real_packages'])
   },
   data() {
@@ -32,9 +44,6 @@ export default {
       loading: false,
       orderLoading: false,
       cardLoading: false,
-      search: {
-        show: true
-      },
       page: {
         total: 0,
         limit: 10,
@@ -62,14 +71,8 @@ export default {
             let value = false;
             let indeterminate = false;
 
-            let total = this.orders.reduce((acc, cur) => {
+            value = !!this.counts;
-              return acc + cur.counts;
+            indeterminate = this.total !== this.counts;
-            }, 0);
-
-            let counts = this.counts;
-
-            value = !!counts;
-            indeterminate = total !== counts;
 
             return h("Checkbox", {
               props: {
@@ -78,7 +81,7 @@ export default {
               },
               on: {
                 input: value => {
-                  let order_id = this.filterOrders.filter(el => {
+                  let order_id = this.showOrders.filter(el => {
                     return el.shipments !== el.counts;
                   }).map(item => {
                     return item.id;
@@ -594,6 +597,15 @@ export default {
       });
 
       this.$store.commit('SET_REAL_ORDERS', orders);
+    },
+    selectAll() {
+      let order_id = this.filterOrders.filter(el => {
+        return el.shipments !== el.counts;
+      }).map(item => {
+        return item.id;
+      });
+
+      this.handleSelectOrder(order_id, true);
     }
   }
 };

resources/views/index.blade.php

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-3e2248ef.ced8e72d.css rel=prefetch><link href=/css/chunk-cc3e3910.48b8d490.css rel=prefetch><link href=/js/chunk-00ae0766.3874cd10.js rel=prefetch><link href=/js/chunk-07a274ec.c3ad5dec.js rel=prefetch><link href=/js/chunk-3e2248ef.c312da93.js rel=prefetch><link href=/js/chunk-cc3e3910.2afb37d0.js rel=prefetch><link href=/css/app.d71a8195.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.62107448.js rel=preload as=script><link href=/js/chunk-vendors.ed6443e8.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.d71a8195.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.ed6443e8.js></script><script src=/js/app.62107448.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-3e2248ef.ced8e72d.css rel=prefetch><link href=/css/chunk-c60e073c.e6078d3a.css rel=prefetch><link href=/js/chunk-00ae0766.3874cd10.js rel=prefetch><link href=/js/chunk-07a274ec.c3ad5dec.js rel=prefetch><link href=/js/chunk-3e2248ef.c312da93.js rel=prefetch><link href=/js/chunk-c60e073c.b8df4549.js rel=prefetch><link href=/css/app.d71a8195.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.0f66b04d.js rel=preload as=script><link href=/js/chunk-vendors.ed6443e8.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.d71a8195.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.ed6443e8.js></script><script src=/js/app.0f66b04d.js></script></body></html>