Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

pages/aps/aps/add.vue

@@ -255,7 +255,6 @@ export default {
       this.list = [];
       this.list.push(obj);
       this.entity.shopId = this.list[0].value;
-
       this.multiple(this.entity.shopId);
     },
     multiple(id) {
@@ -264,7 +263,7 @@ export default {
       //shop_id 班组ID 可以为0
       Api.gettaskequips({
         part_task_pk: 0,
-        op_pk: this.entity.opTaskPk,
+        op_pk: 0,
         shop_id: id
       })
         .then(r => {
@@ -407,5 +406,4 @@ export default {
     margin-top: 15px;
   }
 }
-
 </style>
\ No newline at end of file

pages/aps/aps/api.js

@@ -84,4 +84,8 @@ export default {
   getEquiptypeList(params) {
     return Api.get(`${apsUrl}/mes_equip_info/getequiptypelist`, params);
   },
+  //获取任务工单相关设备
+  gettaskequips(params) {
+    return Api.get(`${apsUrl}/ser/gettaskequips`, params);
+  },
 }