diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js index e0f7fc7c..aa68d1bb 100644 --- a/src/api/Outsourcing/OutsourcingTaskExecution.js +++ b/src/api/Outsourcing/OutsourcingTaskExecution.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 初始化获取已生成的外协加工任务单初始化获取已生成的外协加工任务单 +// 初始化获取已生成的外协加工任务单 export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize) { return request({ url: '', diff --git a/src/utils/request.js b/src/utils/request.js index c4edcdbc..38aeec07 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://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.231: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/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index dff9fd8a..6186ad48 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -24,7 +24,7 @@ - + 取消 - 确 定 + 确定 @@ -531,6 +531,7 @@ export default { this.tableData = [] this.tableData1 = [] getTable(this.NumValue, this.pageList, this.pageSize).then(response => { + console.log(this.NumValue, this.pageList, this.pageSize) this.total = parseInt(response.data.total) for (let i = 0; i < response.data.rows.length; i++) { this.tableData.push({ diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index 20f7c440..889424bc 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -1436,7 +1436,8 @@ export default { handleSelectionChange(val) { this.processNum = val }, - getSpareParts() { // 选入零件 + // 选入零件 + getSpareParts() { if (this.Number !== null) { this.result = 0 for (let i = 0; i < this.processNum.length; i++) {