From ecd3de3cd507a17acbfa0db4c63db0882b108269 Mon Sep 17 00:00:00 2001 From: yanggongyan <929128837@qq.com> Date: Wed, 5 Feb 2020 10:28:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B8=AC=E8=A9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractDetailsInquiry.js | 0 src/utils/curd.js | 24 +++ src/utils/request.js | 11 +- .../ContractDetailsInquiry/index.vue | 106 +++++++++- .../MonthEndHourAccounting/index.vue | 2 +- .../ContractInformationManagement/index.vue | 56 +++--- .../WorkshopProcurement/ExcelExport/index.vue | 186 ++++++++++++++++++ 7 files changed, 345 insertions(+), 40 deletions(-) delete mode 100644 src/api/ManufacturingCenter/ContractDetailsInquiry.js create mode 100644 src/views/WorkshopProcurement/ExcelExport/index.vue diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiry.js b/src/api/ManufacturingCenter/ContractDetailsInquiry.js deleted file mode 100644 index e69de29b..00000000 diff --git a/src/utils/curd.js b/src/utils/curd.js index 664ddb7e..5bbc55eb 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -5,6 +5,30 @@ Created by hedekun import { type } from './tool' // type判断传入值的类型，比typeof更详细 export default { install(Vue) { + Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) { + var paramStr = '' + var paramarray = [] + if (data !== undefined) { + for (let i = 0; i < data.length; i++) { + paramarray.push({ + name: data[i][0], + value: data[i][1], + type: data[i][2], + output: data[i][3] + }) + } + paramStr = JSON.stringify(paramarray) + } + var obj = [] + obj[0] = {} + obj[0].type = type + obj[0].name = name + obj[0].param = paramStr + obj[0].pageSize = pageSize + obj[0].pageList = pageList + var numn = JSON.stringify(obj[0]) + return numn + } // 用于打开增加框，方法能重置表单，并使表单内容回到初始化状态。 // 传入参数 // 1）表单名称，字符串形式如'form'，必须 diff --git a/src/utils/request.js b/src/utils/request.js index 4112ffa0..c06db966 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.0.100:8074/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.100:8074/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.1.5:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.5:8079/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 @@ -26,12 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ -<<<<<<< HEAD - - baseURL: `http://192.168.0.100:8074/submit/MESCommonBase.ashx`, -======= - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, ->>>>>>> 4fb54f4d3ea13e7c327b17bde7ac4ffc21b9b821 + baseURL: `http://192.168.1.5:8079/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue index e4cccfff..2daef2e2 100644 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -2,7 +2,7 @@
项目名称 - + 机床名称 - + + 分组 + + + + 规格及型号 + + 加工总工时（小时）: + + 计划总工时（小时）: + + 查询 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -29,7 +123,13 @@ export default { project: [], projectValue: '', // 项目名称 machineValue: '', // 机床名称 - machine: [] + machine: [], + part: [], // 分組 + partValue: '', + specificationValue: '', // 规格型号 + totalProcessingHours: '', // 加工总工时 + totalPlannedHours: '', // 计划总工时 + tableData: [] // 详情表 } }, created() { diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue index 4a51526e..84431c84 100644 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue @@ -69,7 +69,7 @@ diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index a832a446..ecab7e45 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -427,7 +427,7 @@
- + - + @@ -340,16 +348,16 @@ {{ scope.row.出库数量1 }} - - - + + + + + + @@ -358,7 +366,7 @@ - + @@ -384,7 +392,7 @@ - + { if (res.data[0].result === '1') { this.$message.success('操作成功') - this.pickingListNumber = '' this.searchList() } else { this.$message.error('操作失败') @@ -580,67 +588,68 @@ export default { }, // 标准件 searchTable0() { - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 - this.materialModel ? check4 = 1 : check4 = 0 - this.materialSpec ? check5 = 1 : check5 = 0 - if (this.PickingValue !== 0 && this.PickingValue !== 1) { - check6 = 0 + console.log(this.PickingValue, 111) + if (this.PickingValue === false) { + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent0, this.pageSize0, 1).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } else { - check6 = 1 + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent0, this.pageSize0, 1).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent0, this.pageSize0, 1).then(response => { - this.tableData0 = response.data.rows - this.total0 = response.data.total - }) }, // 外购件 searchTable1() { - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 - this.materialModel ? check4 = 1 : check4 = 0 - this.materialSpec ? check5 = 1 : check5 = 0 - if (this.PickingValue !== 0 && this.PickingValue !== 1) { - check6 = 0 + console.log(this.PickingValue, 111) + if (this.PickingValue === false) { + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent1, this.pageSize1, 2).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } else { - check6 = 1 + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent1, this.pageSize1, 2).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent1, this.pageSize1, 2).then(response => { - this.tableData1 = response.data.rows - this.total1 = response.data.total - }) }, // 基本件 searchTable2() { - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 this.Name ? check3 = 1 : check3 = 0 - this.materialModel ? check4 = 1 : check4 = 0 - this.materialSpec ? check5 = 1 : check5 = 0 - if (this.PickingValue !== 0 && this.PickingValue !== 1) { - check6 = 0 + console.log(this.PickingValue, 111) + if (this.PickingValue === false) { + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent2, this.pageSize2, 3).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } else { - check6 = 1 + searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent2, this.pageSize2, 3).then(response => { + this.tableData0 = response.data.rows + this.total0 = response.data.total + }) } - searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, check4, this.materialModel, check5, this.materialSpec, check6, this.PickingValue, this.pageCurrent2, this.pageSize2, 3).then(response => { - this.tableData2 = response.data.rows - this.total2 = response.data.total - }) }, // 离线采购件 searchTable4() { this.listLoading = true this.tableDataBasic = [] - let check1, check2, check3 + let check1 this.Name ? check1 = 1 : check1 = 0 - this.materialSpec ? check2 = 1 : check2 = 0 - this.materialModel ? check3 = 1 : check3 = 0 - searchPart(check1, this.Name, check2, this.materialSpec, check3, this.materialModel, this.pageCurrent4, this.pageSize4).then(response => { + searchPart(check1, this.Name, this.pageCurrent4, this.pageSize4).then(response => { this.tableDataBasic = response.data.rows this.total4 = response.data.total this.listLoading = false @@ -689,10 +698,11 @@ export default { }, // 查询领料单列表 searchList() { - let check, isElectrical - this.pickingListNumber ? check = 1 : check = 0 + let check, isElectrical, check1 + this.pickingListPeople ? check = 1 : check = 0 + this.startTime ? check1 = 1 : (check1 = 0, this.startTime = '') Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长 - searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber, isElectrical).then(response => { + searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListPeople, isElectrical, check1, this.startTime[0], this.startTime[1]).then(response => { this.pickListTable1 = response.data.rows this.total3 = response.data.total }) @@ -754,7 +764,6 @@ export default { request(param).then(res => { if (res.data[0].result === '1') { this.$message.success('操作成功') - this.pickingListNumber = '' this.searchList() } else { this.$message.error('操作失败') @@ -793,6 +802,9 @@ export default { handleSelectionChange(val) { this.multipleSelection = val }, + handleSelectionChange1(val) { + this.multipleSelection1 = val + }, // 选入 selectInto() { if (this.PartType === '离线采购件') { diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue index c32bcfb9..f56a6752 100644 --- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue +++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue @@ -105,7 +105,7 @@ width="80px" > @@ -199,7 +199,7 @@ -
停产后,将重新补投两种零件，一种是接着加工(执行原来的加工计划)，另一种是从第一序重新加工(重新制定零件的加工计划)，补投的零件号后加B
+
报废后,将重新补投两种零件，一种是接着加工(执行原来的加工计划)，另一种是从第一序重新加工(重新制定零件的加工计划)，补投的零件号后加B
补投接着加工零件数量 diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index 0cdeaa5e..4fe01283 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -25,8 +25,8 @@ :label="item.label" :value="item.value"/> - 查询 - 加急件 + 查询 + 加急件
From 9ca5d2448919f3572ff67893efa52e2671a8a7e8 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Thu, 6 Feb 2020 17:27:13 +0800 Subject: [PATCH 3/4] ip --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index 5948c0da..1840b290 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFil export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.5:8079/submit/MESCommonBase.ashx`, + baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service From 5c02dac392f37ce7f9155dd2e6a8bdd704da69bb Mon Sep 17 00:00:00 2001 From: sujiaqi Date: Thu, 6 Feb 2020 23:06:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=B6=E9=80=A0=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=88=B6=E9=80=A0=EF=BC=88=E9=9B=B6=E4=BB=B6=E5=88=86=E9=85=8D?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=83=BD=E5=8A=9B=E5=B9=B3=E8=A1=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InitialProduction/index.vue | 14 ++++++++------ .../ManufacturingCenter/PartAssignment/index.vue | 10 +++++----- .../ProductionCapacityBalance/index.vue | 16 ++++++++-------- .../OutsourcingPaymentPlanManagement/index.vue | 4 ++-- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 5fe39080..f268c55d 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -29,7 +29,7 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 @@ -103,7 +103,7 @@ type="selection" align="center" width="35"/> - + @@ -148,18 +148,20 @@ {{ scope.row.零件类型名称 }} - +