Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

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/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;