Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/components/currencyPage/index.vue

@@ -37,6 +37,9 @@
              :loading="loading"
              :disabled-hover="disabledHover"
              @on-selection-change="selectTable"
+             @on-select='select'
+             @on-select-cancel='selectTableCancel'
+             @on-select-all-cancel='selectTableAllCancel'
              :stripe="stripe"
              border
              :size="size"
@@ -211,6 +214,15 @@ export default {
     changeSelected (e) {
       this.$emit('changeSelected', e)
     },
+    selectTableCancel(e,row){
+      this.$emit('selectTableCancel',e,row)
+    },
+    select(e,row){
+      this.$emit('select',e,row)
+    },
+    selectTableAllCancel(e){
+      this.$emit('selectTableAllCancel',e)
+    }
   },
 }
 </script>
@@ -226,6 +238,6 @@ export default {
   overflow-y: auto;
   position: relative;
   top: 0px;
-  height: 670px;
+  height: 80%;
 }
 </style>

src/routerMap/index.js

@@ -1425,7 +1425,7 @@ const routerMap = [
     name: "RoomList", //房间列表
     meta: {
       index: 3,
-      keepAlive:true
+      // keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/roomList/list"], resolve),
@@ -1444,7 +1444,7 @@ const routerMap = [
     name: "WeightMemo", //码单列表
     meta: {
       index: 3,
-      keepAlive:true
+      // keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/weightMemo/list"], resolve),
@@ -1463,7 +1463,7 @@ const routerMap = [
     name: "matchList", //匹配列表-->列表
     meta: {
       index: 3,
-      keepAlive:true
+      // keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/MatchList/matchList"], resolve),

src/views/OrderMannage/BusinessOrderlist/list.vue

@@ -9,6 +9,8 @@
       @changePage="changePage"
       @changeSize="changeSize"
       @selectTable="selectTable"
+      @selectTableCancel="selectTableCancel"
+      @selectTableAllCancel='selectTableAllCancel'
       :tableColums="computedTable"
       :tableData="tableData"
       :max-height="500"
@@ -151,7 +153,9 @@
         </div>
       </template>
       <template slot="pageSlot">
+        <span style="position: absolute;font-size:14px">已选择{{haveSelected.length}}条订单</span>
         <div class="pageSlotStyle">
+          
           <Page
             :page-size-opts="[10, 20, 30, 40, 100, 1000]"
             @on-page-size-change="changeSize"
@@ -502,6 +506,8 @@ import { mapState } from "vuex";
 export default {
   data() {
     return {
+      selectPrint:[],
+      haveSelected:[],
       prints:[],
       showTableContentStr:[],
       showTable:{
@@ -1203,6 +1209,8 @@ export default {
     },
     getData(row) {
       this.loading = true;
+      row.page_size = this.page_size;
+      row.page_index = this.page_index;
       this.axios("/api/order_list_new", {
         params: { ...row },
       }).then((res) => {
@@ -1212,6 +1220,11 @@ export default {
             return this.$Message.error("列表数据返回格式不正确");
           }
           this.tableData = res.data.data;
+          this.tableData.map(v=>{
+            if(this.haveSelected.indexOf(v.order_no)>=0){
+              v._checked = true;
+            }
+          })
           this.total = res.data.total;
           this.handleSetHeader(res);
           
@@ -1360,12 +1373,56 @@ export default {
       //   },
       // });
     },
+    selectTableAllCancel(e){
+         this.tableData.forEach(v=>{
+           this.haveSelected.forEach((m,index)=>{
+             if(v.order_no==m){
+               this.haveSelected.splice(index,1)
+             }
+           })
+         })
+    },
+    selectTableCancel(e,row){
+     this.haveSelected.forEach((m,index)=>{
+       if(m==row.order_no){
+         this.haveSelected.splice(index,1)
+       }
+     })
+    },
     selectTable(e) {
+      let data=[];
       let result = [];
       let printData=[];
-      e.map(item=>{
-        printData.push({order_no:item.order_no,box_id:item.box_id})
+      e.forEach(v=>{
+        let obj = {
+              order_no:v.order_no,
+              box_id:v.box_id
+        }
+        this.selectPrint.push(obj)
+        this.haveSelected.push(v.order_no)
       })
+     
+    for (let i = 0; i < this.haveSelected.length; i++) {    // 首次遍历数组
+        if (data.indexOf(this.haveSelected[i]) === -1) {   // 判断索引有没有等于
+            data.push(this.haveSelected[i])
+        }
+    }
+    this.haveSelected = JSON.parse(JSON.stringify(data));
+    // for(let i = 0; i < this.selectPrint.length; i++){
+     
+        this.selectPrint.forEach(m=>{
+          data.forEach((v,index)=>{
+            if(m.order_no == v){
+              printData.push(m);
+              data.splice(index,1)
+            }
+          })
+        })
+    
+     
+      // e.map(item=>{
+      //   printData.push({order_no:item.order_no,box_id:item.box_id})
+      // })
       e.map((v) => result.push(v.order_no));
       this.selectIds = result;
       this.printData = printData;
@@ -1551,8 +1608,8 @@ export default {
   
         vertical-align: middle;
         
-        width: 150px;
-         margin-left:5px;
+        width: 50px;
+         margin-left:10px;
         height: 60px;
      
     }

src/views/OrderMannage/BusinessOrderlist/printlist.vue

@@ -476,8 +476,9 @@ export default {
     .right-img1 {
         /* position: absolute; */
         /* right: 0; */
-        margin-left:5px;
-        width: 100px;
+        margin-left:10px;
+        vertical-align: middle;
+        width: 50px;
         /* margin-bottom: 10px; */
         height: 60px;
         /* top: 0; */

src/views/leadMatch/roomList/edit.vue

@@ -67,7 +67,7 @@
               <span>图号：{{item.url_number}}</span>
               <span>产品名称：{{item.product_title}}</span>
               <span>批量数：{{item.number}}</span>
-              <span :style="item.state == 1?'':'color:red;'" v-show='$route.query.type!=3'>{{item.state == 0?'未匹配':item.state == 2?'匹配完成':'匹配中'}}</span>
+              <span :style="item.state == 1?{}:item.state==2?{color:'#08a108'}:{color:'red'}" v-show='$route.query.type!=3'>{{item.state == 0?'未匹配':item.state == 2?'匹配完成':'匹配中'}}</span>
             </div>
             <div class="table_header_right">
               <Button type="primary" size="small" :disabled="item.state==0?false:true" @click="del(item,index)" v-if="$route.query.type!=2">删除</Button>

src/views/leadMatch/weightMemo/edit.vue

@@ -68,7 +68,7 @@
               <span>产品名称：{{item.product_title}}</span>
                 <span>批量数：{{item.number}}</span>
                 <span>区域：{{item.region}}</span>
-              <span :style="item.state == 1?'':'color:red;'"
+              <span :style="item.state == 1?{}:item.state==2?{color:'#08a108'}:{color:'red'}"
                     v-if="$route.query.type != 3"
                     >{{item.state == 0?'未匹配':item.state == 2?'匹配完成':'匹配中'}}</span>
             </div>