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

pages/aps/aps/api.js

 import Api from '@/plugins/request'
 export default {
-    index:`${resourceUrl}mesparttaskplansimulate/paged`,
-    paged(params){
-    return Api.post(`${resourceUrl}mesparttaskplansimulate/paged`,params);
-    },
-    get(params){
-    return Api.get(`${resourceUrl}mesparttaskplansimulate/get`,params);
-    },
-    create(params){
-    return Api.post(`${resourceUrl}mesparttaskplansimulate/create`,params);
-    },
-    update(params){
-    return Api.post(`${resourceUrl}mesparttaskplansimulate/update`,params);
-    },
-    //删除：
-    delete(params) {
-    return Api.delete(`${resourceUrl}mesparttaskplansimulate/delete`,{params:params});
-    },
-    }
\ No newline at end of file
+  index: `${resourceUrl}mesparttaskplansimulate/paged`,
+  paged(params) {
+    return Api.post(`${resourceUrl}mesparttaskplansimulate/paged`, params);
+  },
+  get(params) {
+    return Api.get(`${resourceUrl}mesparttaskplansimulate/get`, params);
+  },
+  create(params) {
+    return Api.post(`${resourceUrl}mesparttaskplansimulate/create`, params);
+  },
+  update(params) {
+    return Api.post(`${resourceUrl}mesparttaskplansimulate/update`, params);
+  },
+  //删除：
+  delete(params) {
+    return Api.delete(`${resourceUrl}mesparttaskplansimulate/delete`, {
+      params: params
+    });
+  },
+  //获取排产池数据列表
+  getall() {
+    return Api.get(`${aps}/Mes_part_task_plan_simulate/getall`);
+  },
+  //点开排产池列表查看对应的工序
+  getbyorderid(params) {
+    return Api.get(`${aps}/mes_op_task_plan_simulate/getbyorderid`, params);
+  },
+  //订单优先级
+  orderpriority(params) {
+    return Api.post(`${aps}/apspoolappservices/orderpriority`, params);
+  },
+  //删除工序
+  removeoptasksimluate(params) {
+    return Api.post(`${aps}/apspoolappservices/removeoptasksimluate`, params);
+  },
+  //恢复工艺
+  recoveryoptasksimluate(params) {
+    return Api.post(`${aps}/apspoolappservices/recoveryoptasksimluate`, params);
+  },
+
+  //移出排产池
+  shiftoutapspool(params) {
+    return Api.post(`${aps}/apspoolappservices/shiftoutapspool`, params);
+  },
+  //排产计算
+  apsprepareandcalc(params) {
+    return Api.post(`${aps}/apspoolappservices/apsprepareandcalc`, params);
+  },
+  //排产方案下发
+  processschemedispatch(params) {
+    return Api.post(`${aps}/apspoolappservices/processschemedispatch`, params);
+  },
+  //APS排产前数据合法性校验
+  recoveryoptasksimluate(params) {
+    return Api.post(`${aps}/apspoolappservices/apsdatachecked`, params);
+  },
+}

pages/aps/aps/index.vue

@@ -128,7 +128,7 @@ export default {
           render: (h, params) => {
             return h(Expand, {
               props: {
-                row: params.row.id
+                rowId: params.row.id
               }
             })
           }
@@ -272,11 +272,22 @@ export default {
   },
   mounted() {
     console.log(this)
+
   },
   async fetch({ store, params }) {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   methods: {
+    //排产池加载数据列表
+    loadList()
+    {
+      Api.getall().then((res)=>{
+        if(res.success)
+        {
+         // this.list=res.result
+        }
+      })
+    },
     addOk() {
       this.$refs.grid.load()
       this.addModal = false
@@ -284,9 +295,6 @@ export default {
       this.editModal = false
       this.curId = 0
     },
-    search() {
-      this.$refs.grid.reload(this.easySearch)
-    },
     detail(id) {
       this.detailModal = true
       this.curId = id

pages/aps/plan/index.vue

@@ -444,7 +444,7 @@ export default {
     },
     //跳转到aps排产池（有判断）
     goAps() {
-      Api.moveintoaps().then((res) => {
+      Api.moveintoaps().then(res => {
         if (res.success) {
           if (res.result.res) {
             this.$router.push({
@@ -456,6 +456,10 @@ export default {
           }
         }
       });
+      this.$router.push({
+        name: "aps-aps"
+        // params: { customerId: id }
+      });
     },
     addOk() {
       this.$refs.grid.load();

static/config.js

@@ -47,7 +47,7 @@ const systemApi = {
   window.certificateUrl = `http://${address}:10090/api/services/app`; //Process-api
   window.crmUrl = `http://${address}:10100/api/services/app`; //crm客户、合同、项目管理
   window.iconImg = `http://${hostAddress}:3000/imgicon/`; //待办任务图标路径
-  window.aps = `http://${apsUrl}:10091/api/services/app`;//aps手工排产
+  window.aps = `http://${apsUrl}:10110/api/services/app`;//aps手工排产
   //oidc配置：
   window.authConfig = {
     authority: `http://${address}:10010`,