转续ing

assets/css/base.less

@@ -1432,3 +1432,6 @@ html [type=button] {
 .gdShow {
   box-shadow: 0px 0px 15px #333;
 }
+.bgDDD{
+  background:#DDD
+}
\ No newline at end of file

components/page/viewer.vue

 <template>
-  <div>
+  <div style="z-index:200">
     <viewer :options="options" :images="images" @inited="inited" class="viewer" ref="viewer">
       <template slot-scope="scope">
         <figure class="images">

pages/produce/execute/execute.less

@@ -514,6 +514,124 @@
     }
 }
 
+.wu_bgModal{
+    height: calc(100vh - 185px);
+    .mass_box{
+        padding: 0 50px;
+    }
+    .footer {
+        width: 100%;
+        position: absolute;
+        left: 0;
+        bottom: -5px;
+        height: 60px;
+        line-height: 60px;
+        background: rgba(0, 0, 0, 0.6);
+        color: #fff;
+        padding-left: 50px;
+    }
+    .mass_box{
+        h2{ height: 40px;}
+        // .weizhix{ color: #4d5055;}
+        .rangb{ color: #515A6E;}
+        .hege{ color: #2680EB;}
+        .fanxiu{ color: #FFA000;}
+        .feipin{ color: #FE7777;}
+        .chuanse{
+            button{
+                width: 88px;
+                height: 40px;
+                font-size: 16px;            
+                margin: 0 30px 0 0;
+                color: #fff;
+            }
+            .button04{ background: #2680EB; }
+            .button01{ background: #515A6E; }
+            .button02{ background: #FFA000; }
+            .button03{ background: #FE7777; }
+        }
+        .mass_list{
+            border: 1px solid #CACBD0;
+            border-radius: 4px;
+            padding: 10px 15px;
+            margin: 15px 0;
+            .btn_play{
+                margin: 0 0 20px 0;
+                color: #4d5055;
+            }
+            .list01{
+                min-height: 50px;
+                max-height: 155px;
+                overflow-x: auto;
+                .tag_card{
+                    cursor: pointer;
+                    margin: 0 20px 15px 0;
+                }
+                .ivu-tag-checked{
+                    border: 1px solid #2680EB !important;
+                }
+                .card_bor{
+                    border: 1px solid #2680EB !important;
+                }
+            }
+            .list02{
+                min-height: 50px;
+                max-height: 100px;
+                overflow-y: auto;
+                .tag_card02{
+                    margin: 0 20px 15px 0;
+                }
+            }
+        }
+        .hege_box{
+            .ivu-tag-dot-inner{
+                background: #2680EB;
+            }
+        }
+        .rangbu{
+            .list02{
+                .tag_card02{
+                    .ivu-tag-dot-inner{
+                        background: #515a6e;
+                    }
+                }
+            }
+        }
+        .fanxiu_box{
+            .list02{
+                .tag_card02{
+                    .ivu-tag-dot-inner{
+                        background: #FFA000;
+                    }
+                }
+            }
+        }
+        .fei_box{
+            width: calc(100% - 482px);
+            display: inline-block;
+            .list02{
+                .tag_card02{
+                    .ivu-tag-dot-inner{
+                        background: #FE7777;
+                    }
+                }
+            }
+        }
+        .fei_right{
+            float: right;
+            padding-top: 15px;
+            line-height: 50px;
+            width: 460px;
+        }
+    }
+    .futer{
+        width: 100%;
+        height: 60px;
+        position: absolute;
+        bottom: 1px;
+    }
+}
+
 .tech_box{
     height: calc(100vh - 110px);
     .ivu-layout-header{

pages/produce/execute/starOrder/index.vue

 
 <template>
-  <div class>
+  <div>
     <div class="star" v-if="dispatchStatus==12">
       <a class="start" @click="starFun">
         <Icon type="md-play" />开工
@@ -68,23 +68,48 @@
           <li>派工数量：{{entity.dispatchQuantity}}</li>
           <li>人员信息：{{entity.userNames}}</li>
           <li>准备工时：{{entity.setupTime}}</li>
-          <li>工单状态： <state code="taskList.status" ref="state1" :value="dispatchStatus" type="text"></state></li>
+          <li>
+            工单状态：
+            <state code="taskList.status" ref="state1" :value="dispatchStatus" type="text"></state>
+          </li>
         </ul>
       </div>
-      <div class="img_box fl" style="background:#DDD">
+      <div class="img_box fl bgDDD">
         <ViewerImg :images="images" />
       </div>
     </div>
-    <Modal v-model="ransferModal" :title="transferTitle" width="800">
-      <!-- <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" footer-hide/> -->
-      <div class="zhuanx">
-        <p class="line_p">
-          <Input prefix="ios-contact-outline" placeholder="请输入人员编号" style="width: auto" />
-         <!-- <UserSelect ref="userSelected" :multiple="true" style="width: 220px;margin:0 auto;"/> -->
-        </p>
-        <p class="line_p">
-          <Input prefix="ios-lock-outline" placeholder="请输入人员密码" style="width: auto" />
-        </p>
+    <Modal v-model="ransferModal" :title="transferTitle" fullscreen style="z-index:99999">
+      <div class="wu_bgModal">
+        <div class="mass_box">
+          <div class="mass_list">
+            <h2 class="btn_play tl">
+              选择产品（{{cardlist.length}}）
+              <Button class="button" type="primary" @click="allcheck">全选</Button>
+              <Button class="button" type="primary" @click="rechecked">反选</Button>
+            </h2>
+            <div class="list01 tl">
+              <Tag
+                type="dot"
+                :checkable="true"
+                class="tag_card"
+                size="large"
+                v-for="(item,index) in cardlist"
+                :name="item.id"
+                :key="index"
+                :checked="item.checked"
+                color="primary"
+                @on-change="changeCards"
+              >{{item.prefix}}.{{item.code}}</Tag>
+            </div>
+          </div>
+        </div>
+        <div class="mass_box">
+          <UserSelect ref="userSelected" v-width="300" />
+        </div>
+      </div>
+      <div slot="footer">
+      <Button class="button" @click="ransferModal=false">取消</Button>
+        <Button class="button" type="primary" @click="ransOk">确定</Button>
       </div>
     </Modal>
   </div>
@@ -125,7 +150,8 @@ export default {
           ? true
           : Number(this.$route.query.dispatchStatus) == 5
           ? true
-          : false
+          : false,
+      cardlist: []
     };
   },
   created() {
@@ -217,6 +243,7 @@ export default {
     },
     transferFn() {
       this.ransferModal = true;
+      this.getProduce();
     },
     load(v) {
       //加载基础数据
@@ -278,9 +305,58 @@ export default {
     show() {
       this.$viewer.show();
     },
-    goPage(type,title)
-    {
-    this.$parent.changeTitle(type,title)
+    goPage(type, title) {
+      this.$parent.changeTitle(type, title);
+    },
+    getProduce() {
+       this.cardlist=[]
+      let pid = Number(this.$route.query.id); // JSON.stringify()
+      Api.getpaged({ id: pid })
+        .then(res => {
+          if (res.success) {
+            let resoult = res.result;
+            resoult.filter(u => {
+              u.checked = false;
+              this.cardlist.push(u);
+            });
+          }
+        })
+        .catch(e => {
+          this.$Message.error("连接错误");
+        });
+    },
+    // 全选
+    allcheck() {
+      let cardslist = this.cardlist;
+      cardslist.map(a => {
+        a.checked = true;
+      });
+    },
+    // 反选
+    rechecked() {
+      let cardslist = this.cardlist;
+      cardslist.map(b => {
+        b.checked = !b.checked;
+      });
+    },
+    // 单选
+    changeCards(checked, name) {
+      let cardlist = this.cardlist;
+      cardlist.map((u, i) => {
+        if (u.id == name) {
+          u.checked = true;
+        }
+      });
+    },
+    ransOk() {
+       let cardlist = this.cardlist;
+       let upList=[]
+      cardlist.map((u, i) => {
+        if (u.checked) {
+          upList.push(u.id)
+        }
+      });
+      alert(JSON.stringify(upList));
     }
   },
   watch: {

src/assets/css/base.css

@@ -1067,3 +1067,6 @@ html [type=button] {
 .gdShow {
   box-shadow: 0px 0px 15px #333;
 }
+.bgDDD {
+  background: #DDD;
+}

src/assets/css/execute.css

@@ -41,7 +41,7 @@
 }
 .execute_box .gd_list {
   position: absolute;
-  top: 40%;
+  top: 43%;
   left: 0px;
   background: #2680EB;
   color: #fff;
@@ -52,7 +52,7 @@
 }
 .execute_box .gn_area {
   position: absolute;
-  top: 40%;
+  top: 43%;
   right: 0px;
   background: #515A6E;
   color: #fff;
@@ -84,13 +84,16 @@
   background: #ddd;
   margin: 10px 0 0 170px;
 }
+.execute_box .bottom_box {
+  height: calc(100vh - 145px);
+  overflow-y: auto;
+  padding: 15px 40px 0px;
+}
 .execute_box .pross_case {
   padding: 5px 50px 0;
-}
-.execute_box .pross_case .table_box {
   height: calc(100vh - 105px);
 }
-.execute_box .pross_case .table_box .card_box {
+.execute_box .pross_case .card_box {
   background: #F5F6FA;
   border: 1px solid #dedede7d;
   padding: 10px;
@@ -99,12 +102,40 @@
   margin: 10px 0 20px;
   line-height: 30px;
 }
-.execute_box .pross_case .table_box .card_box i {
+.execute_box .pross_case .card_box i {
   font-size: 62px;
 }
-.execute_box .pross_case .table_box .card_box:hover {
+.execute_box .pross_case .card_box:hover {
   box-shadow: 4px 5px 7px #d2d2d2bd;
 }
+.execute_box .pros_check {
+  height: calc(100vh - 175px);
+  padding: 0;
+}
+.card_body {
+  border: 1px solid #e4e6ed;
+  border-radius: 4px;
+  margin-bottom: 30px;
+}
+.card_body .title_i {
+  padding: 0 8px;
+  height: 35px;
+  line-height: 35px;
+  color: #fff;
+  background: #a7b8cc;
+  font-size: 15px;
+}
+.card_body .btn_click {
+  text-align: right;
+}
+.card_body .down_text {
+  background: #a7b8cc33;
+  padding: 5px 8px;
+  line-height: 32px;
+}
+.card_body .down_text i {
+  font-size: 62px;
+}
 .gd_box .ivu-drawer-wrap .ivu-drawer-left {
   width: 370px!important;
 }
@@ -133,7 +164,7 @@
 }
 .gd_box .ivu-drawer-wrap .ivu-drawer-left .ivu-drawer-content .ivu-drawer-body {
   padding: 0;
-  height: calc(100% - 210px);
+  height: calc(100% - 115px);
 }
 .gd_box .ivu-drawer-wrap .ivu-drawer-left .ivu-drawer-content .ivu-drawer-body .order_list .select_t {
   padding: 15px 20px;
@@ -335,7 +366,7 @@
   color: #fff;
 }
 .wu_bg {
-  height: calc(100vh - 100px);
+  height: calc(100vh - 115px);
 }
 .wu_bg .mass_box {
   padding: 0 50px;
@@ -354,12 +385,12 @@
 .wu_bg .mass_box h2 {
   height: 40px;
 }
-.wu_bg .mass_box .heger {
-  color: #2680EB;
-}
 .wu_bg .mass_box .rangb {
   color: #515A6E;
 }
+.wu_bg .mass_box .hege {
+  color: #2680EB;
+}
 .wu_bg .mass_box .fanxiu {
   color: #FFA000;
 }
@@ -373,6 +404,9 @@
   margin: 0 30px 0 0;
   color: #fff;
 }
+.wu_bg .mass_box .chuanse .button04 {
+  background: #2680EB;
+}
 .wu_bg .mass_box .chuanse .button01 {
   background: #515A6E;
 }
@@ -390,6 +424,7 @@
 }
 .wu_bg .mass_box .mass_list .btn_play {
   margin: 0 0 20px 0;
+  color: #4d5055;
 }
 .wu_bg .mass_box .mass_list .list01 {
   min-height: 50px;
@@ -414,6 +449,9 @@
 .wu_bg .mass_box .mass_list .list02 .tag_card02 {
   margin: 0 20px 15px 0;
 }
+.wu_bg .mass_box .hege_box .ivu-tag-dot-inner {
+  background: #2680EB;
+}
 .wu_bg .mass_box .rangbu .list02 .tag_card02 .ivu-tag-dot-inner {
   background: #515a6e;
 }
@@ -439,6 +477,118 @@
   position: absolute;
   bottom: 1px;
 }
+.wu_bgModal {
+  height: calc(100vh - 185px);
+}
+.wu_bgModal .mass_box {
+  padding: 0 50px;
+}
+.wu_bgModal .footer {
+  width: 100%;
+  position: absolute;
+  left: 0;
+  bottom: -5px;
+  height: 60px;
+  line-height: 60px;
+  background: rgba(0, 0, 0, 0.6);
+  color: #fff;
+  padding-left: 50px;
+}
+.wu_bgModal .mass_box h2 {
+  height: 40px;
+}
+.wu_bgModal .mass_box .rangb {
+  color: #515A6E;
+}
+.wu_bgModal .mass_box .hege {
+  color: #2680EB;
+}
+.wu_bgModal .mass_box .fanxiu {
+  color: #FFA000;
+}
+.wu_bgModal .mass_box .feipin {
+  color: #FE7777;
+}
+.wu_bgModal .mass_box .chuanse button {
+  width: 88px;
+  height: 40px;
+  font-size: 16px;
+  margin: 0 30px 0 0;
+  color: #fff;
+}
+.wu_bgModal .mass_box .chuanse .button04 {
+  background: #2680EB;
+}
+.wu_bgModal .mass_box .chuanse .button01 {
+  background: #515A6E;
+}
+.wu_bgModal .mass_box .chuanse .button02 {
+  background: #FFA000;
+}
+.wu_bgModal .mass_box .chuanse .button03 {
+  background: #FE7777;
+}
+.wu_bgModal .mass_box .mass_list {
+  border: 1px solid #CACBD0;
+  border-radius: 4px;
+  padding: 10px 15px;
+  margin: 15px 0;
+}
+.wu_bgModal .mass_box .mass_list .btn_play {
+  margin: 0 0 20px 0;
+  color: #4d5055;
+}
+.wu_bgModal .mass_box .mass_list .list01 {
+  min-height: 50px;
+  max-height: 155px;
+  overflow-x: auto;
+}
+.wu_bgModal .mass_box .mass_list .list01 .tag_card {
+  cursor: pointer;
+  margin: 0 20px 15px 0;
+}
+.wu_bgModal .mass_box .mass_list .list01 .ivu-tag-checked {
+  border: 1px solid #2680EB !important;
+}
+.wu_bgModal .mass_box .mass_list .list01 .card_bor {
+  border: 1px solid #2680EB !important;
+}
+.wu_bgModal .mass_box .mass_list .list02 {
+  min-height: 50px;
+  max-height: 100px;
+  overflow-y: auto;
+}
+.wu_bgModal .mass_box .mass_list .list02 .tag_card02 {
+  margin: 0 20px 15px 0;
+}
+.wu_bgModal .mass_box .hege_box .ivu-tag-dot-inner {
+  background: #2680EB;
+}
+.wu_bgModal .mass_box .rangbu .list02 .tag_card02 .ivu-tag-dot-inner {
+  background: #515a6e;
+}
+.wu_bgModal .mass_box .fanxiu_box .list02 .tag_card02 .ivu-tag-dot-inner {
+  background: #FFA000;
+}
+.wu_bgModal .mass_box .fei_box {
+  width: calc(100% - 482px);
+  display: inline-block;
+}
+.wu_bgModal .mass_box .fei_box .list02 .tag_card02 .ivu-tag-dot-inner {
+  background: #FE7777;
+}
+.wu_bgModal .mass_box .fei_right {
+  float: right;
+  padding-top: 15px;
+  line-height: 50px;
+  width: 460px;
+}
+.wu_bgModal .futer {
+  width: 100%;
+  height: 60px;
+  position: absolute;
+  bottom: 1px;
+}
 .tech_box {
   height: calc(100vh - 110px);
 }
@@ -548,3 +698,7 @@
   display: inline-block;
   color: #515a6e;
 }
+.zhuanx {
+  text-align: center;
+  line-height: 50px;
+}