diff --git a/src/utils/request.js b/src/utils/request.js index 69fb2138..1668f767 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,7 +19,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 89d9bb97..676e867a 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -43,9 +43,10 @@ 查询 + 是否核准 在制零件工艺调整 - 切换编辑模式 + 切换编辑模式
种类: @@ -57,9 +58,8 @@ - 是否核准 规格: - + 投产总数量:
@@ -81,8 +81,6 @@ 计算公差 - 复制并保存 - 粘贴 典艺 @@ -90,7 +88,9 @@
删除 - 保存 + 复制并保存 + + 保存 @@ -353,10 +353,9 @@ - + - @@ -834,6 +833,8 @@ export default { }, WYbtn() { // 完艺按钮 this.tableData4 = [] + this.tuhaoValue = '' + this.remark1 = '' this.dialogFormVisible1 = true }, selectPerson(row) { // 选择工艺员 @@ -1218,20 +1219,15 @@ export default { .doing-row4 { background: #f0f9eb; } - .el-card { margin-bottom: 15px; } - .el-date-editor { width: 150px } - span { margin: 10px 0 10px 10px; } - -