工单执行

i18n/locale/zh-CN.js

@@ -1487,7 +1487,9 @@ export default {
         endTime: '结束时间',
         planEndTime: '计划结束时间',
         action: '操作',
-        subWorkHourStatus:'工时状态'
+        subWorkHourStatus:'工时状态',
+        routingHeaderCode:'工艺编号',
+        routingHeaderName:'工艺名称'
     },
     product_level: {
         name: '名称',

pages/aps/dispatch/index.vue

@@ -48,7 +48,7 @@
               :name="item.mesCode"
             >
               <h3 class="h3_bg">
-                订单号22：{{ item[0].mesCode }}
+                订单号：{{ item[0].mesCode }}
                 <Tag class="h3_tag">{{ item.length }}</Tag
                 >&nbsp;&nbsp;&nbsp; 工艺规程：{{ item[0].routingHeaderCode }} / {{ item[0].routingHeaderName }}
               </h3>
@@ -122,7 +122,7 @@
                     <Checkbox
                       v-model="item.checked"
                       :disabled="item.status != -1"
-                      >订单号11：{{ item.mesCode }}</Checkbox
+                      >订单号：{{ item.mesCode }}</Checkbox
                     >
                   </p>
                   <div class="h60">

pages/produce/api.js

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

pages/produce/orderlist.vue

@@ -104,18 +104,23 @@
                 />-->
               </Col>
               <Col span="16" class="row">
-                <p>{{ l("beginTime") }}：{{ row.beginTime }}</p>
+                <p>
+                  工艺：{{ row.routingHeaderCode }} /
+                  {{ row.routingHeaderName }}
+                </p>
+                <!-- <p>工艺名称：{{ row.routingHeaderName }}</p> -->
+                <p>{{ l("beginTime") }}：{{ row.begin_time }}</p>
                 <p>
                   <span v-if="getStatus(row.status)"
                     >{{ l("planEndTime") }}：</span
                   >
                   <span v-else>{{ l("endTime") }}：</span>
-                  {{ row.endTime }}
+                  {{ row.end_time }}
                 </p>
-                <p v-if="getStatus(row.status) && getTimes(row.endTime) > 0">
+                <p v-if="getStatus(row.status) && getTimes(row.end_time) > 0">
                   剩余时间：
                   <OutputTime
-                    :value="getTimes(row.endTime)"
+                    :value="getTimes(row.end_time)"
                     style="display: inline"
                   ></OutputTime>
                 </p>
@@ -208,6 +213,20 @@ export default {
           width: 240,
           align: "left",
         },
+        {
+          key: "routingHeaderCode",
+          title: this.l("routingHeaderCode"),
+          align: "center",
+          width: 180,
+          high: true,
+        },
+        {
+          key: "routingHeaderName",
+          title: this.l("routingHeaderName"),
+          align: "center",
+          width: 180,
+          high: true,
+        },
         {
           key: "status",
           title: this.l("status"),