From f06e221a61569d4c8fcfcdff774549177373b791 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Thu, 12 Mar 2020 09:52:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=98=E7=92=90=E7=8F=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Assembly/MakeAssemblyPlan/index.vue | 4 +- src/views/Assembly/MakeColdWorkPlan/index.vue | 4 +- .../Assembly/MakeElectricalAssembly/index.vue | 4 +- src/views/Assembly/MakePaintPlan/index.vue | 4 +- .../Inventory/CreatePickingList/index.vue | 35 +++--- .../ProjectPlanningManagement/index.vue | 102 +++++++++--------- .../ProjectPlanningManagementNew/index.vue | 80 ++++++++++---- 7 files changed, 140 insertions(+), 93 deletions(-) diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue index fe0b89ba..89cd429c 100644 --- a/src/views/Assembly/MakeAssemblyPlan/index.vue +++ b/src/views/Assembly/MakeAssemblyPlan/index.vue @@ -14,7 +14,7 @@ 增加装配计划 - 删除 + 删除 @@ -106,8 +106,8 @@
+ 确定 - 取消
diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue index 3bfcb215..8b8b816d 100644 --- a/src/views/Assembly/MakeColdWorkPlan/index.vue +++ b/src/views/Assembly/MakeColdWorkPlan/index.vue @@ -14,7 +14,7 @@ 增加装配计划 - 删除 + 删除 @@ -100,7 +100,7 @@
确定 - + 取消
diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue index e2bfe1a7..3b41ae67 100644 --- a/src/views/Assembly/MakeElectricalAssembly/index.vue +++ b/src/views/Assembly/MakeElectricalAssembly/index.vue @@ -14,7 +14,7 @@ 增加装配计划 - 删除 + 删除 @@ -100,7 +100,7 @@
确定 - + 取消
diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue index 854765ed..c8b948a5 100644 --- a/src/views/Assembly/MakePaintPlan/index.vue +++ b/src/views/Assembly/MakePaintPlan/index.vue @@ -14,7 +14,7 @@ 增加装配计划 - 删除 + 删除 @@ -100,7 +100,7 @@
确定 - + 取消
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 1bc0dbee..5bf8e4b3 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -3,7 +3,7 @@
- + {{ item.name }}
- + 查询 + 查询 + style="margin-left: 5px" + @change="searchTable()"/> 已领用 @@ -578,7 +580,13 @@ export default { }, // 查三表 searchTable() { - if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { + console.log(this.PartType, this.machineNumberValue) + if (this.PartType === '离线采购件') { + this.machineNumberValue = '' + this.groupNumberValue = '' + this.searchTable4() + } + if ((this.machineNumberValue !== '' && this.machineNumberValue !== null) || this.PartType === '离线采购件') { this.multipleSelection = [] this.multipleSelection1 = [] if (this.PartType === '标准件') { @@ -587,8 +595,6 @@ export default { this.searchTable1() } else if (this.PartType === '基本件') { this.searchTable2() - } else if (this.PartType === '离线采购件') { - this.searchTable4() } } else { this.$message.warning('请选择机床后再查询') @@ -627,16 +633,17 @@ export default { if (this.PickingValue === false) { this.loading1 = true 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 + console.log(response, 2) + this.tableData1 = response.data.rows + this.total1 = response.data.total this.loading1 = false }).catch(() => { this.loading1 = false }) } else { 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 + this.tableData1 = response.data.rows + this.total1 = response.data.total }) } }, @@ -650,16 +657,16 @@ export default { if (this.PickingValue === false) { this.loading2 = true 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 + this.tableData2 = response.data.rows + this.total2 = response.data.total this.loading2 = false }).catch(() => { this.loading2 = false }) } else { 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 + this.tableData2 = response.data.rows + this.total2 = response.data.total }) } }, diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue index a9fad44e..e4080737 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue @@ -454,57 +454,57 @@ export default { this.loading = false } else { for (let i = 0; i < response.data.rows.length; i++) { - if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null) { - response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0] - } - if (response.data.rows[i].发货节点 !== '' && response.data.rows[i].发货节点 !== null) { - response.data.rows[i].发货节点 = response.data.rows[i].发货节点.split(' ')[0] - } - if (response.data.rows[i].设备预验收节点 !== '' && response.data.rows[i].设备预验收节点 !== null) { - response.data.rows[i].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0] - } - if (response.data.rows[i].安装调试节点 !== '' && response.data.rows[i].安装调试节点 !== null) { - response.data.rows[i].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0] - } - if (response.data.rows[i].机床设计完成时间 !== '' && response.data.rows[i].机床设计完成时间 !== null) { - response.data.rows[i].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0] - } - if (response.data.rows[i].采购完成时间 !== '' && response.data.rows[i].采购完成时间 !== null) { - response.data.rows[i].采购完成时间 = response.data.rows[i].采购完成时间.split(' ')[0] - } - if (response.data.rows[i].备料完成时间 !== '' && response.data.rows[i].备料完成时间 !== null) { - response.data.rows[i].备料完成时间 = response.data.rows[i].备料完成时间.split(' ')[0] - } - if (response.data.rows[i].机床生产完成时间 !== '' && response.data.rows[i].机床生产完成时间 !== null) { - response.data.rows[i].机床生产完成时间 = response.data.rows[i].机床生产完成时间.split(' ')[0] - } - if (response.data.rows[i].机床装配完成时间 !== '' && response.data.rows[i].机床装配完成时间 !== null) { - response.data.rows[i].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0] - } - if (response.data.rows[i].机床设计实际完成时间 !== '' && response.data.rows[i].机床设计实际完成时间 !== null) { - response.data.rows[i].机床设计实际完成时间 = response.data.rows[i].机床设计实际完成时间.split(' ')[0] - } - if (response.data.rows[i].采购实际完成时间 !== '' && response.data.rows[i].采购实际完成时间 !== null) { - response.data.rows[i].采购实际完成时间 = response.data.rows[i].采购实际完成时间.split(' ')[0] - } - if (response.data.rows[i].备料实际完成时间 !== '' && response.data.rows[i].备料实际完成时间 !== null) { - response.data.rows[i].备料实际完成时间 = response.data.rows[i].备料实际完成时间.split(' ')[0] - } - if (response.data.rows[i].机床生产实际完成时间 !== '' && response.data.rows[i].机床生产实际完成时间 !== null) { - response.data.rows[i].机床生产实际完成时间 = response.data.rows[i].机床生产实际完成时间.split(' ')[0] - } - if (response.data.rows[i].机床装配实际完成时间 !== '' && response.data.rows[i].机床装配实际完成时间 !== null) { - response.data.rows[i].机床装配实际完成时间 = response.data.rows[i].机床装配实际完成时间.split(' ')[0] - } - if (response.data.rows[i].审图计划开始时间 !== '' && response.data.rows[i].审图计划开始时间 !== null) { - response.data.rows[i].审图计划开始时间 = response.data.rows[i].审图计划开始时间.split(' ')[0] - } - if (response.data.rows[i].审图计划完成时间 !== '' && response.data.rows[i].审图计划完成时间 !== null) { - response.data.rows[i].审图计划完成时间 = response.data.rows[i].审图计划完成时间.split(' ')[0] - } - if (response.data.rows[i].审图实际完成时间 !== '' && response.data.rows[i].审图实际完成时间 !== null) { - response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0] - } + // if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null) { + // response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0] + // } + // if (response.data.rows[i].发货节点 !== '' && response.data.rows[i].发货节点 !== null) { + // response.data.rows[i].发货节点 = response.data.rows[i].发货节点.split(' ')[0] + // } + // if (response.data.rows[i].设备预验收节点 !== '' && response.data.rows[i].设备预验收节点 !== null) { + // response.data.rows[i].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0] + // } + // if (response.data.rows[i].安装调试节点 !== '' && response.data.rows[i].安装调试节点 !== null) { + // response.data.rows[i].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0] + // } + // if (response.data.rows[i].机床设计完成时间 !== '' && response.data.rows[i].机床设计完成时间 !== null) { + // response.data.rows[i].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0] + // } + // if (response.data.rows[i].采购完成时间 !== '' && response.data.rows[i].采购完成时间 !== null) { + // response.data.rows[i].采购完成时间 = response.data.rows[i].采购完成时间.split(' ')[0] + // } + // if (response.data.rows[i].备料完成时间 !== '' && response.data.rows[i].备料完成时间 !== null) { + // response.data.rows[i].备料完成时间 = response.data.rows[i].备料完成时间.split(' ')[0] + // } + // if (response.data.rows[i].机床生产完成时间 !== '' && response.data.rows[i].机床生产完成时间 !== null) { + // response.data.rows[i].机床生产完成时间 = response.data.rows[i].机床生产完成时间.split(' ')[0] + // } + // if (response.data.rows[i].机床装配完成时间 !== '' && response.data.rows[i].机床装配完成时间 !== null) { + // response.data.rows[i].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0] + // } + // if (response.data.rows[i].机床设计实际完成时间 !== '' && response.data.rows[i].机床设计实际完成时间 !== null) { + // response.data.rows[i].机床设计实际完成时间 = response.data.rows[i].机床设计实际完成时间.split(' ')[0] + // } + // if (response.data.rows[i].采购实际完成时间 !== '' && response.data.rows[i].采购实际完成时间 !== null) { + // response.data.rows[i].采购实际完成时间 = response.data.rows[i].采购实际完成时间.split(' ')[0] + // } + // if (response.data.rows[i].备料实际完成时间 !== '' && response.data.rows[i].备料实际完成时间 !== null) { + // response.data.rows[i].备料实际完成时间 = response.data.rows[i].备料实际完成时间.split(' ')[0] + // } + // if (response.data.rows[i].机床生产实际完成时间 !== '' && response.data.rows[i].机床生产实际完成时间 !== null) { + // response.data.rows[i].机床生产实际完成时间 = response.data.rows[i].机床生产实际完成时间.split(' ')[0] + // } + // if (response.data.rows[i].机床装配实际完成时间 !== '' && response.data.rows[i].机床装配实际完成时间 !== null) { + // response.data.rows[i].机床装配实际完成时间 = response.data.rows[i].机床装配实际完成时间.split(' ')[0] + // } + // if (response.data.rows[i].审图计划开始时间 !== '' && response.data.rows[i].审图计划开始时间 !== null) { + // response.data.rows[i].审图计划开始时间 = response.data.rows[i].审图计划开始时间.split(' ')[0] + // } + // if (response.data.rows[i].审图计划完成时间 !== '' && response.data.rows[i].审图计划完成时间 !== null) { + // response.data.rows[i].审图计划完成时间 = response.data.rows[i].审图计划完成时间.split(' ')[0] + // } + // if (response.data.rows[i].审图实际完成时间 !== '' && response.data.rows[i].审图实际完成时间 !== null) { + // response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0] + // } this.tableData.push({ edit: false, 项目编号: response.data.rows[i].项目编号, diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue index 400a7ed3..813ea972 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue @@ -35,7 +35,7 @@ - +