From 4d32454b1a74b736461631d0948641efd9a40f2b Mon Sep 17 00:00:00 2001 From: liushuai Date: Fri, 20 Mar 2020 18:06:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseSituationSearch.js | 4 +- src/api/PurchasingCenter/ReceiveCheck.js | 4 +- .../RequestOutsourcingMaterials.js | 15 ++- .../index.vue | 8 +- .../CreatePreparationBill/index.vue | 8 +- .../MonthEndHourAccounting/index.vue | 4 +- .../OutsourcingTaskExecution/index.vue | 26 ++++- .../Outsourcing/PreorderAssociation/index.vue | 63 ++++++----- .../PurchaseContractReview/index.vue | 66 +++++------ .../PurchaseContractSearch/index.vue | 33 ++++++ .../PurchaseSituationSearch/index.vue | 105 ++++++++++++++---- .../PurchasingCenter/ReceiveCheck/index.vue | 45 ++++++-- .../SupplierManagement/index.vue | 16 +-- .../CreatingPurchasingMaterials/index.vue | 38 +++---- .../OfflineProcurement/index.vue | 1 + .../OutsourcingMaterialsInvoice/index.vue | 30 ++++- .../OutsourcingMaterialsSearch/index.vue | 10 +- .../RequestOutsourcingMaterials/index.vue | 73 +++++++++--- src/views/layout/components/TagsView.vue | 3 + 19 files changed, 387 insertions(+), 165 deletions(-) diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js index 2d4cbd39..8c7d0931 100644 --- a/src/api/PurchasingCenter/PurchaseSituationSearch.js +++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js @@ -39,7 +39,7 @@ export function searchTable1(...params) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_采购部采购_查询物料_分配后_加供应商_新_LLJ', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&PageCount=1=int=output&ItemCount=1=int=output` + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[16]}&排序名称=${params[17]}&PageCount=1=int=output&ItemCount=1=int=output` // Pagination: params[4] + '&' + params[5] } }) @@ -54,7 +54,7 @@ export function searchTable2(...params) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新_LLJ', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&PageCount=1=int=output&ItemCount=1=int=output` + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[15]}&排序名称=${params[16]}&PageCount=1=int=output&ItemCount=1=int=output` // Pagination: params[4] + '&' + params[5] } }) diff --git a/src/api/PurchasingCenter/ReceiveCheck.js b/src/api/PurchasingCenter/ReceiveCheck.js index 170f47b5..a84e067d 100644 --- a/src/api/PurchasingCenter/ReceiveCheck.js +++ b/src/api/PurchasingCenter/ReceiveCheck.js @@ -44,7 +44,7 @@ export function searchGroup(num) { }) } // 初始化项目金额统计表 -export function searchReceiveCheck(check1, num1, check2, num2, check3, num3, check4, num4, pageCurrent, pageSize) { +export function searchReceiveCheck(check1, num1, check2, num2, check3, num3, check4, num4, pageCurrent, pageSize, order, partName) { return request({ url: '', method: 'post', @@ -53,7 +53,7 @@ export function searchReceiveCheck(check1, num1, check2, num2, check3, num3, che ModularID: router.currentRoute.path, type: '1', name: '采购管理_领用核算_查询数据', - param: `项目流水号_check=${check1}&项目流水号=${num1}&机床流水号_check=${check2}&机床流水号=${num2}&组件流水号_check=${check3}&组件流水号=${num3}&机床号物料名称_check=${check4}&机床号物料名称=${num4}&PageCurrent=${pageCurrent}=int&PageSize=${pageSize}=int&PageCount=1=int=output&ItemCount=1=int=output` + param: `项目流水号_check=${check1}&项目流水号=${num1}&机床流水号_check=${check2}&机床流水号=${num2}&组件流水号_check=${check3}&组件流水号=${num3}&机床号物料名称_check=${check4}&机床号物料名称=${num4}&PageCurrent=${pageCurrent}=int&PageSize=${pageSize}=int&排序方式=${order}=int&排序名称=${partName}=int&PageCount=1=int=output&ItemCount=1=int=output` } }) } diff --git a/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js b/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js index 03a0e2d7..501adfe2 100644 --- a/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js +++ b/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js @@ -87,4 +87,17 @@ export function cancelRequestFund(num) { } }) } - +// 取消请款明细 +export function deleteRequsetFundMX(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '备料管理_请款明细_删除数据', + param: `采购计划请款明细流水号=${num}&发票流水号=${num1}` + } + }) +} diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index cd5952c9..a1178e23 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -2,7 +2,7 @@
- + {{ item.name }}
- + - + diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index e4214918..8df72284 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -6,16 +6,16 @@ 查询 - - 查询全部 - - 外购备料 + 外购备料 自家备料 + + 查询全部 + diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue index b4596e77..98b17c56 100644 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue @@ -14,7 +14,9 @@ end-placeholder="结束日期"/> - 查询全部 + + 筛选 + 查询 导出 diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index 2a30ef8d..ec3597ce 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -3,7 +3,7 @@ 查询 - 打回车间 + 打回 @@ -52,8 +52,12 @@ @@ -102,7 +106,7 @@ @@ -615,7 +619,19 @@ export default { this.loading = true this.List3 = [] getParts(this.Number).then(response => { - this.List3 = response.data + if (response.data.length !== 0) { + for (let i = 0; i < response.data.length; i++) { + this.List3.push({ + 外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号, + 加工价格_成交: response.data[i].加工价格_成交.toFixed(2), + 机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '', + 零件图号: response.data[i].零件图号, + 零件名称: response.data[i].零件名称, + 批次数量: response.data[i].批次数量, + 外协工序: response.data[i].外协工序 + }) + } + } this.loading = false }) } else { this.$message.error('移除失败') } diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index aa22e3de..3d1c9ba5 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -2,7 +2,7 @@
- + {{ item.value2 }}
 - + { + this.tableData1 = response.data.rows + this.total1 = response.data.total + }).then(() => { + this.loading1 = false + }) } else { - this.check_entryNameValue = 0 + this.$message.warning('请输入查询条件') } - if (this.toolNumValue !== null && this.toolNumValue !== '') { - this.check_toolNumValue = 1 - } else { - this.check_toolNumValue = 0 - } - if (this.NumValue !== null && this.NumValue !== '') { - this.check_NumValue = 1 - } else { - this.check_NumValue = 0 - } - if (this.partName !== null && this.partName !== '') { - this.check_partName = 1 - } else { - this.check_partName = 0 - } - searchTable(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, this.pageCurrent1, this.pageSize1).then(response => { - this.tableData1 = response.data.rows - this.total1 = response.data.total - }).then(() => { - this.loading1 = false - }) }, searchTable2(row) { this.loading2 = true diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue index 0dc3c1f4..ec14f4d0 100644 --- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue @@ -38,38 +38,38 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -117,7 +117,7 @@ 未到货 - + @@ -156,7 +156,7 @@ - + - + - + @@ -185,12 +185,12 @@ {{ scope.row.物料型号 }} - + - + @@ -221,7 +221,7 @@ 未到货 - + @@ -260,7 +260,7 @@ - + - + - + @@ -289,7 +289,7 @@ {{ scope.row.零件图号 }} - + @@ -299,7 +299,7 @@ {{ scope.row.材料 }} - + @@ -332,7 +332,7 @@ 未到货 - + @@ -613,6 +613,27 @@ export default { this.pageCurrent2 = val this.searchTable2() }, + sortChange0(column, prop, order) { + console.log(column + '-' + column.prop + '-' + column.order, 11111) + if (column.prop === '组号') { + this.partName = 1 + } else if (column.prop === '物料名称') { this.partName = 2 } else if (column.prop === '物料规格') { + this.partName = 3 + } else if (column.prop === '供货商') { + this.partName = 4 + } else if (column.prop === '供应商名称') { + this.partName = 5 + } else { + this.partName = '' + } + console.log(this.ordername, 9990999) + if (column.order === 'ascending') { + this.order = 1 + } else if (column.order === 'descending') { this.order = 2 } else { + this.order = '' + } + this.searchTable0() + }, searchTable0() { // 查询标准件 this.tableData0 = [] let check1, check2, check3, check4, check5, check6 @@ -623,7 +644,7 @@ export default { this.model ? check5 = 1 : check5 = 0 this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') this.loading0 = true - searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => { + searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => { if (response.data.result !== 0) { for (let i = 0; i < response.data.result.length; i++) { this.tableData0.push({ @@ -659,6 +680,27 @@ export default { this.loading0 = false }) }, + sortChange1(column, prop, order) { + console.log(column + '-' + column.prop + '-' + column.order, 11111) + if (column.prop === '组号') { + this.partName = 1 + } else if (column.prop === '物料名称') { this.partName = 2 } else if (column.prop === '物料规格') { + this.partName = 3 + } else if (column.prop === '供货商') { + this.partName = 4 + } else if (column.prop === '供应商名称') { + this.partName = 5 + } else { + this.partName = '' + } + console.log(this.ordername, 9990999) + if (column.order === 'ascending') { + this.order = 1 + } else if (column.order === 'descending') { this.order = 2 } else { + this.order = '' + } + this.searchTable1() + }, searchTable1() { // 查询外购件 this.tableData1 = [] let check1, check2, check3, check4, check5, check6 @@ -669,7 +711,7 @@ export default { this.model ? check5 = 1 : check5 = 0 this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') this.loading1 = true - searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => { + searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => { console.log(response.data.result.length, 222) // this.total02 = parseInt(response.data.output[0].ItemCount) @@ -708,6 +750,27 @@ export default { this.loading1 = false }) }, + sortChange2(column, prop, order) { + console.log(column + '-' + column.prop + '-' + column.order, 11111) + if (column.prop === '组号') { + this.partName = 1 + } else if (column.prop === '物料名称') { this.partName = 2 } else if (column.prop === '物料规格') { + this.partName = 3 + } else if (column.prop === '供货商') { + this.partName = 4 + } else if (column.prop === '供应商名称') { + this.partName = 5 + } else { + this.partName = '' + } + console.log(this.ordername, 9990999) + if (column.order === 'ascending') { + this.order = 1 + } else if (column.order === 'descending') { this.order = 2 } else { + this.order = '' + } + this.searchTable2() + }, searchTable2() { // 查询基本件 let check1, check2, check3, check4, check5, check6 this.machineNumberValue ? check1 = 1 : check1 = 0 @@ -717,7 +780,7 @@ export default { this.model ? check5 = 1 : check5 = 0 this.loading2 = true this.startTime ? check6 = 1 : (check6 = 0, this.startTime = '') - searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1]).then(response => { + searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model, check6, this.startTime[0], this.startTime[1], this.order, this.partName).then(response => { this.tableData2 = response.data.result this.total2 = parseInt(response.data.output[0].ItemCount) this.loading2 = false diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue index c853570e..f2f64913 100644 --- a/src/views/PurchasingCenter/ReceiveCheck/index.vue +++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue @@ -39,19 +39,21 @@ 查询 - 导出 + 导出 + 领用合计（元）： + {{ totalPrice }} + border + @sort-change="sortChange"> @@ -78,18 +80,17 @@ {{ scope.row.物料规格 }} - + - - + @@ -104,7 +105,7 @@ {{ scope.row.小计 ? scope.row.小计.toFixed(2) : 0.00 }} - + @@ -145,7 +146,10 @@ export default { pageSize: 50, total: 0, sum: 0, - machinenum: '' + machinenum: '', + totalPrice: 0.00, + partName: '', + order: '' } }, created() { @@ -250,6 +254,20 @@ export default { }) return sums }, + sortChange(column, prop, order) { + console.log(column + '-' + column.prop + '-' + column.order, 11111) + if (column.prop === '领用时间') { + this.partName = 1 + } else { + this.partName = '' + } + if (column.order === 'ascending') { + this.order = 1 + } else if (column.order === 'descending') { this.order = 2 } else { + this.order = '' + } + this.searchProject() + }, searchProject() { // 查询 // if (!this.projectValue) { // this.$message.error('请选择项目') @@ -259,14 +277,17 @@ export default { this.groupValue ? check3 = 1 : check3 = 0 this.machinenum ? check4 = 1 : check4 = 0 this.loading = true - searchReceiveCheck(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum, this.pageCurrent, this.pageSize).then(response => { + searchReceiveCheck(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum, this.pageCurrent, this.pageSize, this.order, this.partName).then(response => { this.tableData1 = response.data.result + // for (let i = 0; i <= response.data.rows.length; i++) { + // this.totalPrice = (Number(this.totalPrice) + Number(response.data.rows[i].数量) * Number(response.data.rows[i].单价)).toFixed(2) + // } this.total = parseInt(response.data.output[0].ItemCount) this.loading = false }).then(() => { searchsum(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum).then(res => { - console.log(res.data) - this.sum = Number(res.data[0].合计).toFixed(2) + console.log(res.data, 121) + this.totalPrice = Number(res.data[0].合计).toFixed(2) }) }).catch(() => {}) this.loading = false diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue index 14a41cee..dfb575ba 100644 --- a/src/views/PurchasingCenter/SupplierManagement/index.vue +++ b/src/views/PurchasingCenter/SupplierManagement/index.vue @@ -3,10 +3,10 @@ - - - - + + + + @@ -63,16 +63,16 @@ - - 查询 - 新增供应商 + + + 供应商 -
供应商列表
+ - + - + - + @@ -233,7 +233,7 @@ - + diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue index 7e0191bd..03bf156f 100644 --- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue +++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue @@ -516,6 +516,7 @@ export default { submitAddPurchaseOrder() { // 新建采购单 this.$refs['form2'].validate((valid) => { if (valid) { + this.supplierName = this.form2.supplierNameValue addPurchaseOrder(this.form2.计划名称, this.form2.supplierNameValue).then(response => { if (response.data[0].result === '1') { this.$message.success('新建离线外购备料成功') diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue index 59faa355..fb69c62e 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue @@ -79,6 +79,11 @@ {{ scope.row.开票金额.toFixed(2) }} + + + - + - + + + + - + - + - + - + @@ -177,7 +195,7 @@ -