From 099489e358307222a9963668956d62151eecf574 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 13:31:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=AE=9A=E9=A2=9D?= =?UTF-8?q?=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- .../QuotaFormulation/index.vue | 86 +++++++++++-------- 2 files changed, 50 insertions(+), 38 deletions(-) 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].工艺计划流水号 + }) + } + } + }) }) } }, From ff28e5f0ac8933e1032374b8de1fb9f10b45c118 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 13:41:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 15 --------------- src/views/BasicData/PersonnelManagement/index.vue | 3 --- .../WorkshopProcessMaintenance/index.vue | 4 ++-- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 17fe11bf..c4850253 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -10,22 +10,7 @@ export const name = `OP8888` export const upload = `http://localhost:8411/submit/uploadFile.ashx` export const download = `http://localhost:8411/submit/downloadFile.ashx` const service = axios.create({ -<<<<<<< HEAD baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, -======= - - // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, ->>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d - // baseURL: `http://localhost: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`, - // baseURL: `http://192.168.137.85:8411/submit/MESCommonBase.ashx`, // 李鑫 - - // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index 56a3237e..050a1deb 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -538,7 +538,6 @@ export default { }, addPeople() { if (this.id) { -<<<<<<< HEAD addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => { if (response.data[0].result === '1') { this.i = 1 @@ -548,11 +547,9 @@ export default { this.$message.error('添加失败') } }) -======= this.people_title = '新增人员' this.people_DFV = true this.addForm('people_form') ->>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d } else { this.$message.warning(`请选择部门名称`) } diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue index 8d45eb2c..23add9cb 100644 --- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -222,8 +222,8 @@ export default { ProcessClassification: [{ required: true, message: '请输入工艺分类名称', trigger: 'blur' }] }, rules2: { - Process: [{ required: true, message: '请输入工艺名称' }], - ProcessShort: [{ required: true, message: '请输入工艺名称简称' }] + Process: [{ required: true, message: '请输入工艺名称', trigger: 'blur' }], + ProcessShort: [{ required: true, message: '请输入工艺名称简称', trigger: 'blur' }] }, rules3: { TechnologicalRequirements: [{ required: true, message: '请输入工艺要求', trigger: 'blur' }] From c301637c34580c90709c0ef15a092143c1cebaca Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 13:51:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/BasicData/PersonnelManagement/index.vue | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index 050a1deb..8fdd3e83 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -538,15 +538,6 @@ export default { }, addPeople() { if (this.id) { - addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => { - if (response.data[0].result === '1') { - this.i = 1 - this.handleNodeClick() - this.$message.success('添加成功') - } else { - this.$message.error('添加失败') - } - }) this.people_title = '新增人员' this.people_DFV = true this.addForm('people_form') From c7dbdb4c4bceb2738eed82ae2022c7d528474c90 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 19:23:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Outsourcing/PreorderAssociation/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index 6da8b560..4538a52f 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -97,10 +97,10 @@ 选择 - + From 352af60c30301365554609d0bf7d2666e3f8a40a Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 5 Dec 2018 19:59:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Outsourcing/PreorderAssociation/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index 4538a52f..b92cd5a1 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -242,7 +242,6 @@ export default { this.checkBox = [] this.tableData2 = [] searchTable2(row.工艺计划流水号).then(response => { - console.log(response.data) this.num1 = row.工艺计划流水号 if (response.data.length === 0) { this.loading0 = false