Paged_Img_RoutingDetail

pages/aps/ai/components/excute.vue

@@ -109,7 +109,7 @@ export default {
                     high: true
                 },
                 {
-                    key: "first_equip",
+                    key: "firsT_EQUIP_CODE",
                     title: this.l("first_equip"),
                     align: "left",
                     easy: true,

pages/aps/results/table-expand.vue

 <template>
-  <div class="result-aps">
+<div class="result-aps">
     <Row class="expand-row">
         <Col span="4">
         <span class="expand-key">工序序号</span>
@@ -20,7 +20,7 @@
         <span class="expand-key">计划结束时间</span>
         </Col>
         <Col span="3">
-        <span class="expand-key">设备编号</span>
+        <span class="expand-key">首选资源</span>
         </Col>
     </Row>
     <Row v-for="(item,index) in dataList" :key="item.index">
@@ -46,8 +46,9 @@
         <span>{{ item.equip_id }}</span>
         </Col>
     </Row>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "./api";
 export default {
@@ -76,18 +77,21 @@ export default {
     }
 };
 </script>
-<style lang='less'>
+
+<style lang="less">
 .result-aps {
     .expand-row {
         text-align: center;
         margin: 5px 0;
         font-weight: bold;
     }
+
     .expand-value {
         text-align: center;
         margin: 3px 0;
     }
 }
+
 td.ivu-table-expanded-cell {
     padding: 0 !important;
 }

pages/produce/api.js

 import Api from '@/plugins/request'
 export default {
-  index: `${PlanUrl}/orderexecutenew/paged_img`,
+  index: `${PlanUrl}/orderexecutenew/Paged_Img_RoutingDetail`,
   paged(params) {
-    return Api.post(`${PlanUrl}/orderexecutenew/paged_img`, params);
+    return Api.post(`${PlanUrl}/orderexecutenew/Paged_Img_RoutingDetail`, params);
   },
   getCardList(params) {
     return Api.post(`${PlanUrl}/orderexecutenew/list`, params);

pages/produce/execute/starOrder/index.vue

-
 <template>
-  <div>
+<div>
     <div class="star" v-if="dispatchStatus == 12">
-      <a class="start" @click="starFun"> <Icon type="md-play" />开工 </a>
+        <a class="start" @click="starFun">
+            <Icon type="md-play" />开工
+        </a>
     </div>
     <div class="star" v-else>
         <div class="flex fc-b">
-        <Button
-          class="button"
-          size="large"
-          type="primary"
-          @click="pauseFun"
-          v-show="btnTextStatus"
-        >
+            <Button class="button" size="large" type="primary" @click="pauseFun" v-show="btnTextStatus">
                 <Icon type="ios-pause" />
                 {{ btnText }}
             </Button>
-        <Button
-          class="button"
-          size="large"
-          type="primary"
-          @click="goPage(8, '数据填报')"
-        >
+            <Button class="button" size="large" type="primary" @click="goPage(8, '数据填报')">
                 <Icon type="logo-angular" />数据填报
             </Button>
-        <Button
-          class="button"
-          size="large"
-          type="primary"
-          @click="goPage(7, '质量判定')"
-        >
+            <Button class="button" size="large" type="primary" @click="goPage(7, '质量判定')">
                 <Icon type="ios-checkmark-circle-outline" />质量判定
             </Button>
             <Button class="button" size="large" type="primary" @click="transferFn">
@@ -67,12 +52,7 @@
                 <li>图号：{{ entity.drawnNumber }}</li>
                 <li>
                     状态：
-            <state
-              code="plan.order.status"
-              ref="state"
-              :value="entity.status"
-              type="text"
-            ></state>
+                    <state code="plan.order.status" ref="state" :value="entity.status" type="text"></state>
                 </li>
                 <li>订单编号：{{ entity.mesCode }}</li>
                 <li>批次号：{{ entity.batchNumber }}</li>
@@ -89,12 +69,7 @@
                 <li>准备工时：{{ entity.setupTime }}</li>
                 <li>
                     工单状态：
-            <state
-              code="taskList.status"
-              ref="state1"
-              :value="dispatchStatus"
-              type="text"
-            ></state>
+                    <state code="taskList.status" ref="state1" :value="dispatchStatus" type="text"></state>
                 </li>
             </ul>
         </div>
@@ -103,49 +78,22 @@
             <img src="@/assets/imgicon/chan_Pin.png" width="70%" height="100%" />
         </div>
     </div>
-    <Modal
-      v-model="ransferModal"
-      :title="transferTitle"
-      fullscreen
-      style="z-index: 99999"
-      :footer-hide="cardlist.length == 0"
-    >
+    <Modal v-model="ransferModal" :title="transferTitle" fullscreen style="z-index: 99999" :footer-hide="cardlist.length == 0">
         <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
-              >
+                        <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.product_code }}</Tag
-              >
+                        <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.product_code }}</Tag>
                     </div>
                 </div>
             </div>
             <div class="mass_box">
-          <UserSelect
-            ref="userSelected"
-            :datas="userlist"
-            v-model="user"
-            v-width="300"
-          />
+                <UserSelect ref="userSelected" :datas="userlist" v-model="user" v-width="300" />
             </div>
         </div>
         <div slot="footer">
@@ -153,57 +101,61 @@
             <Button class="button" type="primary" @click="ransOk">确定</Button>
         </div>
     </Modal>
-  </div>
+    <Modal v-model="workOrderPauseModal" title="工单暂停原因" width="800" footer-hide class="suspend">
+        <EntryPause @on-ok="pauseOk" ref="addBug" :info="info" />
+    </Modal>
+</div>
 </template>
+
 <script>
 import Api from "../api";
+import EntryPause from "../../../order/monitoring/entryPause";
 import ApiTech from "../../../technology/productMix/product/api";
 export default {
     name: "starOrder",
+    components: {
+        EntryPause
+    },
     data() {
         return {
             starmodal: true,
             downUrl: fileUrlDown,
-      contentMsge:
-        "<ul><li>暂停 2020-02-06  15:35</li><li>继续 2020-02-06  15:35</li></ul>",
+            contentMsge: "<ul><li>暂停 2020-02-06  15:35</li><li>继续 2020-02-06  15:35</li></ul>",
             ransferModal: false,
             transferTitle: "确认转序",
             images: [],
-      iamges1: [
-        {
+            iamges1: [{
                 thumbnail: iconImg + "noPic_product.png",
                 source: iconImg + "noPic_product.png",
-        },
-      ],
+            }, ],
             entity: {},
             id: Number(this.$route.query.id),
             orderId: Number(this.$route.query.orderId),
             dispatchStatus: Number(this.$route.query.dispatchStatus),
             eid: "",
-      btnText:
-        Number(this.$route.query.dispatchStatus) == 14
-          ? "暂停"
-          : Number(this.$route.query.dispatchStatus) == 5
-          ? "继续"
-          : "",
-      btnTextStatus:
-        Number(this.$route.query.dispatchStatus) == 14
-          ? true
-          : Number(this.$route.query.dispatchStatus) == 5
-          ? true
-          : false,
+            btnText: Number(this.$route.query.dispatchStatus) == 14 ?
+                "暂停" : Number(this.$route.query.dispatchStatus) == 5 ?
+                "继续" : "",
+            btnTextStatus: Number(this.$route.query.dispatchStatus) == 14 ?
+                true : Number(this.$route.query.dispatchStatus) == 5 ?
+                true : false,
             cardlist: [],
             detailId: null,
             nextDetailId: null,
             operatorId: null,
             userlist: [],
             user: null,
+            workOrderPauseModal: false,
+            info: {}
         };
     },
     created() {
         // this.treeHeight = window.innerHeight - 120;
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary");
     },
     mounted() {
@@ -243,20 +195,21 @@ export default {
                 orderid: this.orderId + "",
             };
             if (this.btnText == "暂停") {
-        Api.entrypause(params)
-          .then((res) => {
-            if (res.success) {
-              this.$Message.success("暂停成功！");
-              this.dispatchStatus = 5;
-              this.btnText = "继续";
-              this.textBtn();
-            } else {
-              this.$Message.error("暂停失败！");
-            }
-          })
-          .catch((err) => {
-            this.$Message.error("连接错误");
-          });
+                this.pause();
+                // Api.entrypause(params)
+                //     .then((res) => {
+                //         if (res.success) {
+                //             this.$Message.success("暂停成功！");
+                //             this.dispatchStatus = 5;
+                //             this.btnText = "继续";
+                //             this.textBtn();
+                //         } else {
+                //             this.$Message.error("暂停失败！");
+                //         }
+                //     })
+                //     .catch((err) => {
+                //         this.$Message.error("连接错误");
+                //     });
             } else if (this.btnText == "继续") {
                 Api.entrentrycontinuestart(params)
                     .then((res) => {
@@ -274,6 +227,21 @@ export default {
                     });
             }
         },
+        pause() {
+            //暂停工单
+            this.info = {
+                dispatch_id: this.id,
+                execute_id: Number(this.$route.query.executeId),
+                order_id: this.orderId
+            };
+            this.workOrderPauseModal = true;
+        },
+        pauseOk() {
+            this.workOrderPauseModal = false;
+            this.dispatchStatus = 5;
+            this.btnText = "继续";
+            this.textBtn();
+        },
         textBtn() {
             //控制第一个按钮的text及显示
             if (this.dispatchStatus == 14) {
@@ -301,7 +269,9 @@ export default {
                     if (r.success && r.result) {
                         this.entity = r.result;
                         if (r.result.productId && r.result.productId > 0) {
-              ApiTech.get({ id: r.result.productId }).then((res) => {
+                            ApiTech.get({
+                                id: r.result.productId
+                            }).then((res) => {
                                 if (res.success && res.result) {
                                     if (
                                         res.result.productUrlList &&

pages/produce/orderSupport.vue

@@ -368,7 +368,7 @@ export default {
             this.newModel = true;
         },
         loaddata(orderid) {
-            var url = `${technologyUrl}/ordermateriallist/getbyorderid?id=` + orderid;
+            var url = `${technologyUrl}ordermateriallist/getbyorderid?id=` + orderid;
             service.get(`${url}`).then(response => {
                 this.formValidate = response.result.orderMaterial;