diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/mes/pro/proroute/routeprocess.vue index f94db31..5373862 100644 --- a/src/views/mes/pro/proroute/routeprocess.vue +++ b/src/views/mes/pro/proroute/routeprocess.vue @@ -456,7 +456,8 @@ import { getRouteprocess, delRouteprocess, addRouteprocess, - updateRouteprocess, listRouteprocessTwo, + updateRouteprocess, + listRouteprocessTwo, } from "@/api/mes/pro/routeprocess"; import { listProcess } from "@/api/mes/pro/process"; import { getToken } from "@/utils/auth"; @@ -866,16 +867,17 @@ export default { }); } - let aa = {routeId: this.form.routeId,orderNum: this.form.orderNum} + let aa = { routeId: this.form.routeId, orderNum: this.form.orderNum }; listRouteprocessTwo(aa).then((resp) => { resp.data.forEach((item) => { - getRouteprocess(item.recordId).then((response) => { - updateRouteprocess(response.data).then(() => {}); + getRouteprocess(item.recordId).then((response) => { + const { originalName, ...newObj } = response.data; + updateRouteprocess(newObj).then(() => { + this.getList(); }); + }); }); - this.getList(); }); - } }); }, diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue index 1d405df..f7e0b4b 100644 --- a/src/views/mes/wm/itemrecpt/index.vue +++ b/src/views/mes/wm/itemrecpt/index.vue @@ -707,6 +707,7 @@ export default { var queryParams = { pageNum: 1, pageSize: 10000, + status: 0, }; // 托盘查询 listMdItem(queryParams).then((response) => { @@ -732,7 +733,7 @@ export default { axios // .get("http://192.168.2.104:8077/manage/matter/storageItem", { .post( - "http://192.168.2.7:8077/manage/matter/storageItem", + "http://192.168.2.104:8077/manage/matter/storageItem", this.perform ) .then(function (res) { diff --git a/vue.config.js b/vue.config.js index 1dd33c2..9419505 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,8 +35,12 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy "/prod-api": { + // 蚂蚁工业 // target: `http://192.168.2.104:8063`, - target: `http://192.168.50.191:8063`, + // 内网 + // target: `http://192.168.50.191:8063`, + // 线上 + target: `http://mes.jshengzheng.com:7072`, changeOrigin: true, // pathRewrite: { // ['^' + process.env.VUE_APP_BASE_API]: '' @@ -44,7 +48,8 @@ module.exports = { }, "/ureport": { // target: `http://192.168.2.104:8063`, - target: `http://192.168.50.191:8063`, + // target: `http://192.168.50.191:8063`, + target: `http://mes.jshengzheng.com:7072`, ws: false, changeOrigin: true, pathRewrite: {