整机排产

pages/aps/complete/api.js

@@ -9,6 +9,7 @@ export default {
     cmtwostepschedule(params) {
         return Api.post(`${PlanUrl}/messchedule/cmtwostepschedule`, params); //整机排产--二级排产
     },
+    
     // getlist(params) {
     //     return Api.get(`${PlanUrl}/mes_sys_shop_info/getlist`, params); //手工排产:查询所在车间下的所有班组信息
     // },

pages/aps/stream/index.vue

@@ -11,38 +11,40 @@
           </RadioGroup>
         </Col>
       </Row>
-      <div
-        class="left-body"
-        v-for="(li,index) in list"
-        :key="index"
-        @click="listData(li)"
-        :class="isactive == index ? 'addclass' : '' "
-      >
-        <Row class="title-i">
-          <Col :span="20" class="order-code">订单号：{{li.order_id}}</Col>
-          <Col :span="4" class="order-ringht">
-            <Icon type="md-close" @click="close" />
-          </Col>
-        </Row>
-        <div class="fa">{{li.routing_version}}</div>
-        <div class="time-s">
-          <!-- <Icon type="ios-copy" /> -->
-          <span>工序：{{li.routing_schema}}</span>
+      <div class="left-down">
+        <div
+          class="left-body"
+          v-for="(li,index) in list"
+          :key="index"
+          @click="listData(li,index)"
+          :class="isactive == index ? 'addclass' : '' "
+        >
+          <Row class="title-i">
+            <Col :span="20" class="order-code">订单号：{{li.mesCode}}</Col>
+            <Col :span="4" class="order-ringht">
+              <Icon type="md-close" @click="close" />
+            </Col>
+          </Row>
+          <div class="fa">产品名称：{{li.productName}}</div>
+          <div class="time-s">
+            <!-- <Icon type="ios-copy" /> -->
+            <span>工序：{{li.drawnNumber}}</span>
+          </div>
+          <div class="time-s">{{li.demandFinishDate}} — {{li.demandStartDate}}</div>
         </div>
-        <div class="time-s">{{li.demand_start}} — {{li.demand_finish}}</div>
       </div>
     </div>
     <div class="aps-r">
       <!-- <div class="g-list">工序列表</div> -->
       <Row class="g-list">
         <Col :span="2" class="chan-chi">工序列表</Col>
-        <Col :span="22" class="l-ringht">
+        <!-- <Col :span="22" class="l-ringht">
           <RadioGroup v-model="status" type="button" @on-change="changeRodio" size="small">
             <Radio label="0">全部</Radio>
             <Radio label="1">未排产</Radio>
             <Radio label="2">已排查</Radio>
           </RadioGroup>
-        </Col>
+        </Col>-->
       </Row>
       <div class="right-body">
         <div class="list">
@@ -50,14 +52,14 @@
             <TimelineItem v-for="(item, index) in result" :key="index">
               <Badge :count="index+ 1" slot="dot" :type="type(index)"></Badge>
               <div class="set-name">
-                <span @click="sets(item.routingHeaderId)">{{item.taskname}}</span> &nbsp
+                <span @click="sets(item.routingHeaderId)">工序名称：{{item.name}}</span> &nbsp
                 <Tooltip content="拆分工序" placement="top">
                   <Icon type="md-bluetooth" @click="split" />
                 </Tooltip>
                 <Icon type="ios-trash" @click="remove" />
               </div>
-              <div>{{item.equip_id}}</div>
-              <div>{{item.equip_type}}</div>
+              <div>任务顺序：{{item.task_seq}}</div>
+              <div>数量：{{item.quantity}}</div>
               <div>{{item.resources_Type_Name}}</div>
             </TimelineItem>
           </Timeline>
@@ -144,18 +146,27 @@ export default {
     },
     //排产池列表
     orderlist() {
-      Api.getpooltypeorderlist({ PoolType: 3,status:this.status }).then(r => {
+      Api.getpooltypeorderlist({ PoolType: 3, status: this.status }).then(r => {
         // console.log(r)
-        if (r.success) {
+        if (r.result) {
           r.result.forEach(e => {
             return (e.checked = false);
           });
           this.list = r.result;
+
+          if (r.result[0]) {
+            this.tagTata(r.result[0].id);
+          } else {
+            this.result = [];
+          }
+        } else {
+          this.$Message.info("排产池数据请求失败");
         }
       });
     },
     //点击选中排产订单
-    listData(li) {
+    listData(li, index) {
+      console.log(li);
       this.isactive = index;
       this.group.orderId = li.id;
       this.tagTata(li.id);
@@ -169,9 +180,9 @@ export default {
       });
     },
     //工序排产过滤
-    changeRodio(a) {
-      console.log(a);
-    },
+    // changeRodio(a) {
+    //   console.log(a);
+    // },
     //删除排产订单
     close() {
       this.$Modal.confirm({
@@ -250,9 +261,9 @@ export default {
   .aps-l {
     width: 20%;
     border-right: 1px solid #e4e6ed;
-    height: 86vh;
+
     padding: 0 15px 10px 10px;
-    overflow: auto;
+
     .row-p {
       border-bottom: 1px solid #e4e6ed;
       padding: 5px;
@@ -265,48 +276,53 @@ export default {
         text-align: right;
       }
     }
-    .left-body:hover {
-      cursor: pointer;
-      border-color: rgba(38, 128, 235, 0.5);
-      .title-i {
-        background: rgba(38, 128, 235, 0.5) !important;
+    .left-down {
+      height: 82vh;
+      overflow: auto;
+      .left-body:hover {
+        cursor: pointer;
+        border-color: rgba(38, 128, 235, 0.5);
+        .title-i {
+          background: rgba(38, 128, 235, 0.5) !important;
+        }
       }
-    }
-    .left-body {
-      margin-top: 15px;
-      border: 1px solid rgba(228, 230, 237, 1);
-      border-radius: 4px;
-      .title-i {
-        padding: 0 8px;
-        height: 34px;
-        line-height: 34px;
-        color: #515a6e;
-        background: #e4e6ed;
-        .order-ringht {
-          text-align: right;
-          .ivu-icon {
-            cursor: pointer;
+      .left-body {
+        margin-top: 15px;
+        border: 1px solid rgba(228, 230, 237, 1);
+        border-radius: 4px;
+        .title-i {
+          padding: 0 8px;
+          height: 34px;
+          line-height: 34px;
+          color: #515a6e;
+          background: #e4e6ed;
+          .order-ringht {
+            text-align: right;
+            .ivu-icon {
+              cursor: pointer;
+            }
           }
         }
-      }
 
-      .fa {
-        height: 32px;
-        line-height: 32px;
-        color: rgba(38, 128, 235, 1);
-        padding: 5px 8px 0 8px;
-      }
-      .time-s {
-        padding: 0 8px;
-        height: 32px;
-        line-height: 32px;
-        color: #515a6e;
+        .fa {
+          height: 32px;
+          line-height: 32px;
+          color: rgba(38, 128, 235, 1);
+          padding: 5px 8px 0 8px;
+        }
+        .time-s {
+          padding: 0 8px;
+          height: 32px;
+          line-height: 32px;
+          color: #515a6e;
+        }
       }
     }
   }
   .aps-r {
     width: 80%;
     padding: 0 15px;
+
     .g-list {
       font-size: 14px;
       width: 100%;
@@ -323,6 +339,8 @@ export default {
     }
     .right-body {
       margin-top: 15px;
+      height: 82vh;
+      overflow: auto;
       .list {
         padding-left: 10px;
         .set-name {