整机多工艺

pages/aps/complete/api.js

 import Api from '@/plugins/request'
 export default {
+    // getpooltypeorderlist(params) {
+    //     return Api.get(`${PlanUrl}/messchedule/getpooltypeorderlist`, params); //排产池订单数据
+    // },
     getpooltypeorderlist(params) {
-        return Api.get(`${PlanUrl}/messchedule/getpooltypeorderlist`, params); //排产池订单数据
+        return Api.get(`${PlanUrl}/messchedule/getpooltypeorderlist_new`, params); //排产池订单数据
     },
     cmonestepschedule(params) {
         return Api.post(`${PlanUrl}/messchedule/cmonestepschedule`, params); //整机排产--一级排产
@@ -12,4 +15,8 @@ export default {
     shiftoutofcmorflpool(params) {
         return Api.post(`${PlanUrl}/messchedule/shiftoutofcmorflpool`, params); //删除订单
     },
+    getorderroutings(params) {
+        return Api.get(`${PlanUrl}/messchedule/getorderroutings`, params); //查看工艺
+    },
+    
 }
\ No newline at end of file

pages/aps/complete/index.vue

@@ -40,11 +40,21 @@
             <div class="fa">产品名称：{{ li.productName }}</div>
             <div class="time-s">产品数量：{{ li.quantity }}</div>
             <div class="time-s">
-              <span>工序：{{ li.drawnNumber }}</span>
+              <span>图号：{{ li.drawnNumber }}</span>
             </div>
-            <div class="time-s">
+            <!-- <div class="time-s">
               {{ li.demandFinishDate }} ~ {{ li.demandStartDate }}
-            </div>
+            </div> -->
+            <Row class="time-s">
+              <Col :span="19">
+                <div>
+                  {{ li.demandFinishDate }} — {{ li.demandStartDate }}
+                </div></Col
+              >
+              <Col :span="5" class="order-ringht"
+                ><a @click="seeDetail(li.id)"> 查看工艺 </a></Col
+              >
+            </Row>
           </div>
         </div>
       </div>
@@ -111,6 +121,9 @@
         </Form>
       </div>
     </div>
+    <Modal v-model="seeModal" title="查看工艺" footer-hide width="800">
+      <Table border :columns="columns1" :data="data1"></Table>
+    </Modal>
   </div>
 </template>
 <script>
@@ -125,6 +138,7 @@ export default {
     return {
       list: [],
       workShop: [],
+      seeModal: false,
       listClass: [],
       status: "0", //全部排产-1，0为未排产；2为已排查；
       formItem: {
@@ -140,8 +154,22 @@ export default {
       },
       user: "",
       showSet: false,
-
       orderIds: [],
+      data1: [],
+      columns1: [
+        {
+          title: "工艺名称",
+          key: "name",
+        },
+        {
+          title: "工艺编号",
+          key: "code",
+        },
+        {
+          title: "版本",
+          key: "version",
+        },
+      ],
     };
   },
   created() {
@@ -149,6 +177,14 @@ export default {
     this.getWorkshop();
   },
   methods: {
+    seeDetail(id) {
+      this.seeModal = true;
+      Api.getorderroutings({ id: id }).then((r) => {
+        if (r.result) {
+          this.data1 = r.result;
+        }
+      });
+    },
     viewClose() {
       this.$router.push("/aps/plan");
     },
@@ -376,6 +412,9 @@ export default {
           height: 32px;
           line-height: 32px;
           color: @table-color;
+          .order-ringht {
+            text-align: center;
+          }
         }
       }
     }

pages/aps/stream/index.vue

@@ -18,7 +18,7 @@
             <!-- </RadioGroup> -->
           </Col>
         </Row>
-        <div class="left-down">
+        <div class="left-down1">
           <div
             class="left-body"
             v-for="(li, index) in list"
@@ -35,7 +35,7 @@
             <div class="fa">产品名称：{{ li.productName }}</div>
             <div class="time-s">
               <!-- <Icon type="ios-copy" /> -->
-              <span>工序：{{ li.drawnNumber }}</span>
+              <span>图号：{{ li.drawnNumber }}</span>
             </div>
             <div class="time-s">
               {{ li.demandFinishDate }} — {{ li.demandStartDate }}
@@ -455,7 +455,7 @@ export default {
   },
 };
 </script>
-<style lang="less">
+<style lang="less" >
 @import "../../../assets/css/custom.less";
 .addclass {
   border-color: rgba(38, 128, 235, 0.5) !important;
@@ -486,7 +486,7 @@ export default {
         text-align: right;
       }
     }
-    .left-down {
+    .left-down1 {
       height: 82vh;
       overflow: auto;
       .left-body:hover {