diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue index 2db35883..a7866bab 100644 --- a/src/views/Assembly/AssemblyQualityInspection/index.vue +++ b/src/views/Assembly/AssemblyQualityInspection/index.vue @@ -176,8 +176,8 @@ export default { if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check4 = 1 } else { this.check4 = 0 } selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => { import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['是否合格', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '备注'] - const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '备注'] + const tHeader = ['检验情况', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '质检时间', '质检员', '备注'] + const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '质检时间', '姓名', '备注'] const list = response.data const data = this.formatJson(filterVal, list) excel.export_json_to_excel({ diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 3c5a1619..5e444455 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -8,10 +8,10 @@ 查询 - 外购备料 + 外购备料 - 自家备料 + 自家备料 查询全部 @@ -149,6 +149,8 @@ import $ from 'jquery' export default { data() { return { + edit2_loading: false, + edit_loading: false, a: 0, tableData2: [], partName: '', @@ -233,7 +235,13 @@ export default { this.tableData2 = val }, edit() { + this.edit_loading = true + var that = this + setTimeout(function() { + that.edit_loading = false + }, 5000) if (this.tableData2.length === 0) { + this.edit_loading = false this.$message.warning('暂无数据') } else { this.a = 0 @@ -250,8 +258,13 @@ export default { } }, edit2() { - console.log(this.$store.state.user.id, 9090) + this.edit2_loading = true + var that = this + setTimeout(function() { + that.edit2_loading = false + }, 5000) if (this.tableData2.length === 0) { + this.edit2_loading = false this.$message.warning('暂无数据') } else { this.a = 0 diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index df759298..9d84274d 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -186,13 +186,13 @@ 是否加急 - 备料投产 + 备料投产 - 投产 + 投产 - 打回 + 打回 加急件 @@ -394,6 +394,9 @@ import Cookie from 'js-cookie' export default { data() { return { + production10_Loading: false, + production_Loading: false, + back_Loading: false, // 20200427↑ openUrgentItem_disable: false, checked_hebing: true, checked_UrgentItem: false, @@ -984,18 +987,26 @@ export default { }, // 投产 production() { + this.production_Loading = true + var that = this + setTimeout(function() { + that.production_Loading = false + }, 5000) this.result = 0 this.UrgentItem = 0 if (this.time_machiningFinish === '' || this.time_machiningFinish === null) { + this.production_Loading = false this.$message.error('请输入加工结束时间') } else { this.shijiancuo1 = Date.parse(this.time_machiningStart) this.shijiancuo = Date.parse(this.time_machiningFinish) this.jieguo = this.shijiancuo1 - this.shijiancuo if (this.jieguo >= 0) { + this.production_Loading = false this.$message.error('加工结束时间应大于开始时间') } else { if (this.multipleSelection.length === 0) { + this.production_Loading = false this.$message.error('请至少选择一个零件') } else { if (this.checked_UrgentItem === true) { @@ -1104,18 +1115,26 @@ export default { }, // 备料投产 production10() { + this.production10_Loading = true + var that = this + setTimeout(function() { + that.production10_Loading = false + }, 5000) this.result = 0 this.UrgentItem = 0 if (this.time_machiningFinish === '' || this.time_machiningFinish === null) { + this.production10_Loading = false this.$message.error('请输入加工结束时间') } else { this.shijiancuo1 = Date.parse(this.time_machiningStart) this.shijiancuo = Date.parse(this.time_machiningFinish) this.jieguo = this.shijiancuo1 - this.shijiancuo if (this.jieguo >= 0) { + this.production10_Loading = false this.$message.error('加工结束时间应大于开始时间') } else { if (this.multipleSelection.length === 0) { + this.production10_Loading = false this.$message.error('请至少选择一个零件') } else { if (this.checked_UrgentItem === true) { @@ -1223,7 +1242,13 @@ export default { } }, back() { + this.back_Loading = true + var that = this + setTimeout(function() { + that.back_Loading = false + }, 5000) if (this.multipleSelection.length === 0) { + this.back_Loading = false this.$message.error('请至少选择一个零件') } else { this.a = 0 diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 6d8f65b5..40f15cbf 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -198,15 +198,15 @@ placeholder="选择交货期"/> 制造: - 制造部采购 + 制造部采购 金工: - 车间生产 + 车间生产 采购: - 采购部门采购 + 采购部门采购 @@ -559,6 +559,9 @@ export default { inject: ['reload'], data() { return { + purchaseRequisition_loading: false, + Production_loading: false, + PurchasingDepartment_loading: false, handleAdd_disable: false, dateRange: '', partNumber: '', @@ -1250,6 +1253,11 @@ export default { this.multipleSelection11 = val }, purchaseRequisition() { + this.purchaseRequisition_loading = true + var that = this + setTimeout(function() { + that.purchaseRequisition_loading = false + }, 5000) if (this.RequisitionList !== '') { if (this.time !== '' && this.time !== null) { if (this.multipleSelection.length !== 0) { @@ -1395,16 +1403,24 @@ export default { } } } else { + this.purchaseRequisition_loading = false this.$message.warning('请选择零件或物料') } } else { + this.purchaseRequisition_loading = false this.$message.warning('请选择交货期') } } else { + this.purchaseRequisition_loading = false this.$message.warning('请先选择请购单') } }, PurchasingDepartment() { + this.PurchasingDepartment_loading = true + var that = this + setTimeout(function() { + that.PurchasingDepartment_loading = false + }, 5000) if (this.time !== '' && this.time !== null) { if (this.multipleSelection.length !== 0) { if (this.PartType === '基本件') { @@ -1470,13 +1486,20 @@ export default { }) } } else { + this.PurchasingDepartment_loading = false this.$message.warning('请选择零件或物料') } } else { + this.PurchasingDepartment_loading = false this.$message.warning('请选择交货期') } }, Production() { + this.Production_loading = true + var that = this + setTimeout(function() { + that.Production_loading = false + }, 5000) if (this.PartType === '基本件' && this.multipleSelection.length !== 0) { this.MaterialNum = [] this.BasicPartsNumber = [] @@ -1504,6 +1527,7 @@ export default { } }) } else { + this.Production_loading = false this.$message.warning('请选择基本件') } }, diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue index c8b8708c..03b52e56 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue @@ -32,7 +32,7 @@ - + @@ -795,7 +795,21 @@ export default { } else if (row.计划完成时间 < row.任务开始时间) { this.$message.error('计划完成时间应大于任务开始时间') } else { - if (row.组件流水号 && row.任务名称 && row.负责人 && row.接收任务时间 && row.任务开始时间 && row.计划完成时间 && row.货期) { + if (!row.组件流水号) { + this.$message.error('请选择分组') + } else if (!row.任务名称) { + this.$message.error('请输入任务名称') + } else if (!row.负责人) { + this.$message.error('请选择负责人') + } else if (!row.接收任务时间) { + this.$message.error('请选择接收任务时间') + } else if (!row.任务开始时间) { + this.$message.error('请选择任务开始时间') + } else if (!row.计划完成时间) { + this.$message.error('请选择计划完成时间') + } else if (!row.货期) { + this.$message.error('请输入货期') + } else { editTable2(row.组件计划流水号, row.组件流水号, row.任务名称, row.负责人, row.接收任务时间, row.任务开始时间, row.计划完成时间, row.货期, row.实际完成时间, row.备注).then(response => { if (response.data[0].result === '1') { row.edit = false @@ -809,8 +823,6 @@ export default { this.$message.error('信息修改失败') } }) - } else { - this.$message.error('请未输入项') } } }, diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue index f44e0ebd..971015c2 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue @@ -45,7 +45,7 @@ - + diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue index 233c3946..efa7ce8a 100644 --- a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue +++ b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue @@ -66,6 +66,11 @@ {{ scope.row.审核情况内容 }} + + +