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">
+        <Col span="4">
         <span class="expand-key">工序序号</span>
-      </Col>
-      <Col span="3">
+        </Col>
+        <Col span="3">
         <span class="expand-key">工序名称</span>
-      </Col>
-      <Col span="3">
+        </Col>
+        <Col span="3">
         <span class="expand-key">投入数量</span>
-      </Col>
-      <Col span="3">
+        </Col>
+        <Col span="3">
         <span class="expand-key">派工数量</span>
-      </Col>
-      <Col span="4">
+        </Col>
+        <Col span="4">
         <span class="expand-key">计划开始时间</span>
-      </Col>
-      <Col span="4">
+        </Col>
+        <Col span="4">
         <span class="expand-key">计划结束时间</span>
-      </Col>
-      <Col span="3">
-        <span class="expand-key">设备编号</span>
-      </Col>
+        </Col>
+        <Col span="3">
+        <span class="expand-key">首选资源</span>
+        </Col>
     </Row>
     <Row v-for="(item,index) in dataList" :key="item.index">
-      <Col span="4" class="expand-value">
+        <Col span="4" class="expand-value">
         <span>{{ item.task_seq }}</span>
-      </Col>
-      <Col span="3" class="expand-value">
+        </Col>
+        <Col span="3" class="expand-value">
         <span>{{ item.task_name }}</span>
-      </Col>
-      <Col span="3" class="expand-value">
+        </Col>
+        <Col span="3" class="expand-value">
         <span>{{ item.put_into_qty }}</span>
-      </Col>
-      <Col span="3" class="expand-value">
+        </Col>
+        <Col span="3" class="expand-value">
         <span>{{ item.dispatch_qty }}</span>
-      </Col>
-      <Col span="4" class="expand-value">
+        </Col>
+        <Col span="4" class="expand-value">
         <span>{{ item.plan_start }}</span>
-      </Col>
-      <Col span="4" class="expand-value">
+        </Col>
+        <Col span="4" class="expand-value">
         <span>{{ item.plan_finish }}</span>
-      </Col>
-      <Col span="3" class="expand-value">
+        </Col>
+        <Col span="3" class="expand-value">
         <span>{{ item.equip_id }}</span>
-      </Col>
+        </Col>
     </Row>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "./api";
 export default {
-  props: {
-    row: Object
-  },
-  data() {
-    return {
-      dataList: []
-    };
-  },
-  mounted() {
-    this.getList(this.row);
-  },
-  methods: {
-    getList(row) {
-      Api.getdetail({
-        part_task_pk: row.id,
-        scheduleId: row.schedule_id
-      }).then(r => {
-        if (r.success) {
-          this.dataList = r.result;
+    props: {
+        row: Object
+    },
+    data() {
+        return {
+            dataList: []
+        };
+    },
+    mounted() {
+        this.getList(this.row);
+    },
+    methods: {
+        getList(row) {
+            Api.getdetail({
+                part_task_pk: row.id,
+                scheduleId: row.schedule_id
+            }).then(r => {
+                if (r.success) {
+                    this.dataList = r.result;
+                }
+            });
         }
-      });
     }
-  }
 };
 </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;
-  }
+    .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;
+    padding: 0 !important;
 }
-</style>
\ No newline at end of file
+</style>

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;