From e9c515bb8fa0c9ba471ae375bb818e3c3a39807d Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Wed, 8 Apr 2020 17:53:36 +0800 Subject: [PATCH 1/6] a --- .../InitialProduction/index.vue | 6 +++- .../PartAssignment/index.vue | 10 ++++-- .../SparePartsForScrap/index.vue | 35 ++++++++++++------- .../MarketingCenter/CreateProject/index.vue | 13 +++++-- 4 files changed, 46 insertions(+), 18 deletions(-) diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index c2ec74fa..c686acf1 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -379,7 +379,7 @@
取消 - 确定 + 确定
@@ -394,6 +394,7 @@ import Cookie from 'js-cookie' export default { data() { return { + openUrgentItem_disable: false, checked_hebing: true, checked_UrgentItem: false, UrgentItem: 0, @@ -619,6 +620,7 @@ export default { if (this.$refs['form10'] !== undefined) { this.$refs['form10'].resetFields() } + this.openUrgentItem_disable = false this.dialogFormVisible10 = true }, typeChange() { @@ -705,11 +707,13 @@ export default { submit10(formName) { this.$refs[formName].validate((valid) => { if (valid) { + this.openUrgentItem_disable = true addUrgentItem(this.form10.机床号, this.form10.组号, this.form10.零件图号, this.form10.零件名称, this.form10.规格, this.form10.零件数量, this.form10.零件备注, this.id, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time).then(response => { if (response.data[0].result === '1') { this.$message.success('添加成功') this.dialogFormVisible10 = false } else { + this.openUrgentItem_disable = false this.$message.error('添加失败') } }) diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index e4b1ee95..11399733 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -345,7 +345,7 @@
取消 - 确定 + 确定 确定
@@ -566,6 +566,7 @@ export default { inject: ['reload'], data() { return { + handleAdd_disable: false, dateRange: '', partNumber: '', dateRange1: '', @@ -1037,19 +1038,24 @@ export default { }) }, handleAdd() { + this.handleAdd_disable = false this.addForm('form', [this.dialogFormVisible = true, this.title = '增加']) this.form.请购时间 = getNowShotTime() }, submitAdd(formName) { this.$refs[formName].validate((valid) => { if (valid) { + this.handleAdd_disable = true addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') this.dialogFormVisible = false this.tableData6 = [] this.searchTable1() - } else { this.$message.error('增加失败') } + } else { + this.$message.error('增加失败') + this.handleAdd_disable = false + } }) } else { console.log('error submit!!') diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue index 941e7c47..e005f608 100644 --- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue +++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue @@ -231,7 +231,7 @@ 开始工序 - 补投重新生产零件 + 补投重新生产零件 @@ -291,7 +291,7 @@
取消 - 确定 + 确定
@@ -310,7 +310,7 @@
- 确定 + 确定
@@ -323,6 +323,8 @@ import { mapGetters } from 'vuex' export default { data() { return { + handleEdit_disable: false, + editB_disable: false, index: 0, remark1: '', remark2: '', @@ -483,12 +485,12 @@ export default { if (this.$refs['form2'] !== undefined) { this.$refs['form2'].resetFields() } - console.log(index) this.index = index this.remark1 = '' this.remark2 = '' this.PCNumber = parseInt(row.批次数量) this.title = row.零件名称 + this.handleEdit_disable = false this.dialogeditVisible = true this.form.input1 = row.零件图号 this.code = row.工艺计划流水号 @@ -498,6 +500,7 @@ export default { this.$refs[formName].validate((valid) => { if (valid) { if (this.form2.报废数量 > 0) { + this.handleEdit_disable = true editSpare(this.code, this.form2.报废数量, this.form2.报废原因, this.form2.报废时间, this.id).then(response => { if (response.data[0].result === '1') { this.$message.success('报废成功') @@ -509,6 +512,7 @@ export default { } // this.fetchTableData() } else { + this.handleEdit_disable = false this.$message.success('报废失败') } }) @@ -538,15 +542,20 @@ export default { editB() { if (this.spareNumber - this.SupplementationNumber > 0) { if (this.inputC > 0) { - editA(this.CutCodeBefore, this.inputC).then(response => { - if (response.data[0].result === '1') { - this.$message.success('补投成功') - this.fetchTableData() - this.inputC = 0 - } else { - this.$message.error('补投失败') - } - }) + if (!this.editB_disable) { + this.editB_disable = true + editA(this.CutCodeBefore, this.inputC).then(response => { + if (response.data[0].result === '1') { + this.$message.success('补投成功') + this.fetchTableData() + this.inputC = 0 + this.editB_disable = false + } else { + this.editB_disable = false + this.$message.error('补投失败') + } + }) + } } else { this.$message.warning('补投数量不能为零') } diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue index 11b0a7a2..6f099527 100644 --- a/src/views/MarketingCenter/CreateProject/index.vue +++ b/src/views/MarketingCenter/CreateProject/index.vue @@ -157,7 +157,7 @@
取消 - 确 定 + 确 定
@@ -177,7 +177,7 @@
取消 - 确 定 + 确 定
@@ -193,6 +193,8 @@ export default { }, data() { return { + ADD_disable: false, + addMachine_disable: false, contractNumber_check: '', contractNumber: '', // 合同编号 entryName: [], @@ -344,6 +346,7 @@ export default { }, ADD() { this.addForm('form') + this.ADD_disable = false this.dialogFormVisible1 = true this.form.contractSigningDate = getNowTime()// new Date() this.temp = 1 @@ -364,6 +367,7 @@ export default { }) }, addTableData1() { + this.ADD_disable = true addList(this.form.EntryName, this.form.remark, this.form.contractSigningDate).then(response => { this.dialogFormVisible1 = false if (response.data[0].result === '1') { @@ -371,6 +375,7 @@ export default { this.title = '' this.fetchTableData1() } else { + this.ADD_disable = false this.$message.error('添加失败') } }) @@ -424,12 +429,14 @@ export default { }, addMachine(row) { this.projectNum = row.项目流水号 + this.addMachine_disable = false this.dialogFormVisible2 = true this.title1 = '新增机床' this.addForm('form1') this.form1.项目名称 = row.项目名称 }, submitMachine() { + this.addMachine_disable = true function a() { selectMachine(this.projectNum).then(response => { this.tableData2 = response.data @@ -438,8 +445,10 @@ export default { } if (this.flag === 1) { this.addTable(submitMachine, [this.projectNum, this.form1.设备型号, this.form1.设备名称, this.form1.机床数量], 'form1', a) + this.addMachine_disable = false } else { this.editTable(editMachine, [this.c, this.form1.设备型号, this.form1.设备名称, this.form1.机床数量], 'form1', a) + this.addMachine_disable = false } }, deleteMachine(row) { From 9525a0fdc26e38332de76b37ad1dc8b86515be95 Mon Sep 17 00:00:00 2001 From: liushuai Date: Wed, 8 Apr 2020 18:05:24 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractDetailsInquiryMetalworking.js | 47 ++++ .../MonthEndHourAccountingMetalworking.js | 18 ++ .../ContractApprovalQuery/index.vue | 2 +- .../ContractApprovalQuery1/index.vue | 2 +- .../index.vue | 236 ++++++++++++++++++ .../index.vue | 235 +++++++++++++++++ .../RequestApprovalQuery/index.vue | 2 +- .../RequestApprovalQuery1/index.vue | 2 +- .../ScheduleCompletionDetails/index.vue | 40 ++- .../RequestApprovalQuery2/index.vue | 2 +- 10 files changed, 571 insertions(+), 15 deletions(-) create mode 100644 src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js create mode 100644 src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js create mode 100644 src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue create mode 100644 src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js b/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js new file mode 100644 index 00000000..5bd24d55 --- /dev/null +++ b/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化 项目名称 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据_总计划' + } + }) +} + +// 查询机床 +export function initMachine(projectNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_机床名称_查询数据2', + param: `项目流水号=${projectNum}` + } + }) +} + +// 查询项目详情 +export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '项目工时统计_合同详情查询_工时综合查询', + param: `项目流水号=${projectNum}&机床流水号=${machineValue}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + } + }) +} diff --git a/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js b/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js new file mode 100644 index 00000000..b66afd92 --- /dev/null +++ b/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function searchTable(num, time, time1, order, orderName, check, name, check1, partNumber, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '工艺月底工时核算_查询数据_最新', + param: '筛选=' + num + '&开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName + '&操作工_check=' + check + '&操作工=' + name + '&零件图号_check=' + check1 + '&零件图号=' + partNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue index cb1b504a..7a22c634 100644 --- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue +++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue @@ -28,7 +28,7 @@ 导出 - +