Merge branch 'product-kk' into product

pages/dncmnc/dnc/datalist.vue

@@ -9,7 +9,7 @@
           <p class="dispatch_part_top">
             <b class="mr10">设备列表</b>
             共 {{listSheBei.length}} 台  
-            <!-- {{ids}} -->
+            <span style="display:none">{{ids}}</span>
           </p>
           <div class="dispatch_part_body" :style="{height:byheight}">
             <h4 class="tc" v-if="this.listSheBei.length==0">暂无数据</h4>
@@ -33,12 +33,13 @@
               <p class="show_btn">
                 <a @click="showRow(item.id,item.btnShow)">
                   <Tooltip content="所属程序列表">
-                    <Icon v-if="btnModal" type="ios-arrow-down" />
+                    <Icon v-if="item.btnShow" type="ios-arrow-down" />
                     <Icon v-else type="ios-arrow-up" />
                   </Tooltip>
                 </a>
               </p>
-              <div class="h60" v-if="!btnModal">
+              <div class="h60" v-if="item.btnShow">
+                <span style="display:none"> {{liOrderIds}} </span>
                 <Row class="card_body02" v-for="(li,index) in item.row" :key="index">
                   <Col span="8" class="dispatch_li">
                     <Checkbox v-model="li.checked">程序名：{{li.mdcNmae}}</Checkbox>
@@ -46,7 +47,6 @@
                   <Col span="8" class="dispatch_li">大小：{{li.size}}</Col>
                   <Col span="8" class="dispatch_li">下载时间：{{li.downTime}}</Col>
                 </Row>
-                <!-- {{liOrderIds}} -->
               </div>
             </div>
           </div>
@@ -100,7 +100,7 @@
     </Modal>
     <!-- 底部 -->
     <FooterToolbar style="height:65px" v-show="showOperate&&footerToolbar">
-      <!-- <span>已选程序：{{chengXuIds.length}}</span> -->
+      <!-- <span v-if="beyong">已选程序：{{chengXuIds.length}}</span> -->
       <Button class="span ml20" type="primary" v-if="xiaZai" @click="downFile">下载</Button>
       <Button class="span ml20" type="primary" v-if="beyong" @click="fileBeyong">文本对比</Button>
       <Button @click="footerToolbar=false">取消</Button>
@@ -200,21 +200,19 @@ export default {
             {
               mdcNmae: "00123_281",
               id:101,
-              size: "128Mb",
+              size: "120Mb",
               downTime: "2020-05-26  10:30:26",
               checked: false
-            },
-            {
+            },{
               mdcNmae: "00123_282",
               id:102,
-              size: "128Mb",
+              size: "133Mb",
               downTime: "2020-05-26  10:30:26",
               checked: false
-            },
-            {
+            },{
               mdcNmae: "00123_283",
               id:103,
-              size: "128Mb",
+              size: "100Mb",
               downTime: "2020-05-26  10:30:26",
               checked: false
             }
@@ -230,25 +228,59 @@ export default {
           id: 2,
           row: [
             {
-              mdcNmae: "00123_281",
+              mdcNmae: "00123_284",
               id:201,
               size: "128Mb",
               downTime: "2020-05-26  10:30:26",
               checked: false
-            },
-            {
-              mdcNmae: "00123_282",
+            },{
+              mdcNmae: "00123_285",
               id:202,
-              size: "128Mb",
+              size: "118Mb",
               downTime: "2020-05-26  10:30:26",
               checked: false
-            },
-            {
-              mdcNmae: "00123_283",
+            },{
+              mdcNmae: "00123_286",
               id:203,
+              size: "100Mb",
+              downTime: "2020-05-26  10:30:26",
+              checked: false
+            }
+          ]
+        },{
+          dncCode: "19212_0665003",
+          dncName: "数控机床03",
+          dncUser: "刘蕾",
+          dncArea: "区域03",
+          dncStatue: "空闲",
+          checked: false,
+          btnShow: false,
+          id: 3,
+          row: [
+            {
+              mdcNmae: "00123_287",
+              id:201,
               size: "128Mb",
               downTime: "2020-05-26  10:30:26",
               checked: false
+            },{
+              mdcNmae: "00123_288",
+              id:202,
+              size: "110Mb",
+              downTime: "2020-05-26  10:30:26",
+              checked: false
+            },{
+              mdcNmae: "00123_289",
+              id:203,
+              size: "130Mb",
+              downTime: "2020-05-26  10:30:26",
+              checked: false
+            },{
+              mdcNmae: "00123_290",
+              id:203,
+              size: "135Mb",
+              downTime: "2020-05-26  10:30:26",
+              checked: false
             }
           ]
         }
@@ -292,7 +324,6 @@ export default {
           endTime: "2020/05/26 "
         }
       ],
-      btnModal: true,//箭头
       listTitle: [], //订单号列表
       newList: [], //选中数据
       chaiModal: false, //拆分弹框
@@ -386,14 +417,12 @@ export default {
       this.footerToolbar = true;
     },
     // 切换箭头
-    showRow(id,btn){
-      // console.log(id)
-      // let ss=!btnModal
-      // this.listSheBei.map(u=>{
-
-      // })
-      // console.log(btnModal = ss)
-      this.btnModal = !this.btnModal
+    showRow(rowid,btn){
+      this.listSheBei.map(u=>{
+        if(u.id==rowid){
+          u.btnShow = !u.btnShow
+        }
+      })
     },
     // 获取查询人员
     getselectuser(id) {
@@ -472,7 +501,7 @@ export default {
       this.getUserInfoFn();
     },
     downFile(){
-      this.$Message.success("下载文件")
+      this.$Message.success("下载文件中...")
     },
     fileBeyong(){
       this.$Message.success("对比文件")
@@ -609,8 +638,13 @@ export default {
         }
       });
       if (ids.length > 0) {
+        // if(this.liOrderIds.length>0){
+        //   this.$Message.info("设备和所属程序不能同时选择！")
+        // }else{
           this.footerToolbar = true;
           this.xiaZai = true;
+          this.beyong = false;       
+        // }
       }
       return ids;
     },
@@ -633,23 +667,35 @@ export default {
       return orders;
     },
     liOrderIds() {
-      let liOrderIds = [];
-      let rowList ;
-      this.listSheBei.map(u => { rowList = u.row });
-      // rowList.map(item=>{ rowData.push(item) })
-      // rowList.map(tm=>{
-      //   if(tm.checked){
-      //     liOrderIds.push(tm.id)
-      //   }
-      // })
-
+      let rowList = [] ;
+      let liOrderIds = [] ;
+      let cardData = this.listSheBei;
+      for(let i=0;i<cardData.length;i++){
+        cardData[i].row.map(u=>{
+          rowList.push(u)
+        })
+      }
+      rowList.map(tem => {
+        if (tem.checked) {
+          liOrderIds.push(tem.id);
+        }
+      });
+      if(liOrderIds.length > 0){
+        if(this.ids.length > 0){
+          this.$Message.info("设备和所属程序不能同时选择！")
+          this.footerToolbar = false;
+        }else{
+          this.footerToolbar = true;
+          this.xiaZai = false;
+          this.beyong = true;  
+        }
+      }
+        return liOrderIds;
       // this.footerToolbar = true;
-      return rowList;
     },
     showOperate() {
       return (
-        this.ids.length > 0 && (this.chengXuIds.length > 0 )
-        // || this.liOrderIds.length > 0
+        (this.ids.length > 0 || this.liOrderIds.length > 0) && (this.chengXuIds.length > 0 )
       );
     }
   },