diff --git a/src/utils/request.js b/src/utils/request.js index 1af64819..2ce7de49 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,7 +15,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.0.105:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue index 63d20dc6..fe1f2ecf 100644 --- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue +++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue @@ -175,7 +175,7 @@ export default { this.fetchData() }, methods: { - fetchData() { // 初始化未编制零件号、材料、公差 + fetchData() { // 初始化未编制零件号 getPerson().then(response => { for (let i = 0; i < response.data.length; i++) { this.person.push({ @@ -255,49 +255,61 @@ export default { this.num0 = '' if (this.radio === 1) { detailInfo(this.partNumValue).then(response => { - this.typeValue = response.data[0].零件类型名称 - this.partName = response.data[0].零件名称 - this.batchNum = response.data[0].批次数量 - this.num0 = response.data[0].工艺计划流水号 - console.log(response.data[0].工艺计划流水号, 520) - this.material = response.data[0].材料 + if (response.data.length !== 0) { + this.typeValue = response.data[0].零件类型名称 + this.partName = response.data[0].零件名称 + this.batchNum = response.data[0].批次数量 + this.num0 = response.data[0].工艺计划流水号 + this.material = response.data[0].材料 + } + }).then(() => { mainTable(this.num0).then(response => { - for (let i = 0; i < response.data.length; i++) { - this.tableData.push({ - name: response.data[i].工艺名称, - request: response.data[i].工艺要求, - num1: response.data[i].工序流水号, - Settlement: response.data[i].准结定额工时, - singleton: response.data[i].单件定额工时, - lingjian: response.data[i].零件图号, - numm: response.data[i].工艺计划流水号 - }) + if (response.data.length === 0) { + this.listLoading = false + } else { + for (let i = 0; i < response.data.length; i++) { + this.tableData.push({ + name: response.data[i].工艺名称, + request: response.data[i].工艺要求, + num1: response.data[i].工序流水号, + Settlement: response.data[i].准结定额工时, + singleton: response.data[i].单件定额工时, + lingjian: response.data[i].零件图号, + numm: response.data[i].工艺计划流水号 + }) + } + this.listLoading = false } - this.listLoading = false }) }) } else { detailInfo(this.partNumValue).then(response => { - this.typeValue = response.data[0].零件类型名称 - this.partName = response.data[0].零件名称 - this.batchNum = response.data[0].批次数量 - this.num0 = response.data[0].工艺计划流水号 - this.material = response.data[0].材料 - }) - mainTable1(this.partNumValue).then(response => { - for (let i = 0; i < response.data.length; i++) { - this.tableData.push({ - name: response.data[i].工艺名称, - request: response.data[i].工艺要求, - num1: response.data[i].工序流水号, - Settlement: response.data[i].准结定额工时, - singleton: response.data[i].单件定额工时, - budget: response.data[i].外协预算价格1, - lingjian: response.data[i].零件图号, - numm: response.data[i].工艺计划流水号 - }) + if (response.data.length !== 0) { + this.typeValue = response.data[0].零件类型名称 + this.partName = response.data[0].零件名称 + this.batchNum = response.data[0].批次数量 + this.num0 = response.data[0].工艺计划流水号 + this.material = response.data[0].材料 } - this.listLoading = false + }).then(() => { + mainTable1(this.partNumValue).then(response => { + if (response.data.length === 0) { + this.listLoading = false + } else { + for (let i = 0; i < response.data.length; i++) { + this.tableData.push({ + name: response.data[i].工艺名称, + request: response.data[i].工艺要求, + num1: response.data[i].工序流水号, + Settlement: response.data[i].准结定额工时, + singleton: response.data[i].单件定额工时, + budget: response.data[i].外协预算价格1, + lingjian: response.data[i].零件图号, + numm: response.data[i].工艺计划流水号 + }) + } + } + }) }) } },