From e314062d428d9fe2fe0fa89cb5ee5c02f4ec5155 Mon Sep 17 00:00:00 2001 From: liushuai Date: Sat, 21 Mar 2020 17:10:21 +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 --- src/api/ManufacturingCenter/PartAssignment.js | 8 +- src/api/PurchasingCenter/MaterialMProcure.js | 8 +- .../PurchasingCenter/OfflineContractSearch.js | 4 +- .../index.vue | 6 +- .../ContractDetailsInquiry/index.vue | 2 +- .../MonthEndHourAccounting/index.vue | 2 +- .../PartAssignment/index.vue | 71 +- .../index.vue | 50 +- .../OutsourcingTaskExecution/index.vue | 26 +- .../InvoiceSettlementApplication/index.vue | 93 +-- .../MaterialMProcure/index.vue | 110 ++- .../OfflineContract/index.vue | 4 +- .../OfflineContractSearch/index.vue | 85 ++- .../PurchaseSituationSearch/index.vue | 3 + .../AccountingPrice/index.vue | 56 +- .../ArrivalStateSearch/index.vue | 2 +- .../CreatingProcurementContracts/index.vue | 18 +- .../InvoiceSettlementApprove1/index.vue | 690 +++--------------- .../NewArrivalList/index.vue | 10 +- .../ProcurementContractEnquiry/index.vue | 10 +- .../PurchaseContractRequestFund1/index.vue | 4 +- .../RequestOutsourcingMaterials/index.vue | 2 +- .../manufacturingPurchaseArrival/index.vue | 2 +- 23 files changed, 473 insertions(+), 793 deletions(-) diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index 56b04b14..fa17a7d5 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -96,7 +96,7 @@ export function searchTable1(PurchaseOrder, check4) { } }) } -export function addData(num1, num2, id, time, remarks) { +export function addData(num1, num2, id, remarks) { return request({ url: '', method: 'post', @@ -105,11 +105,11 @@ export function addData(num1, num2, id, time, remarks) { ModularID: router.currentRoute.path, type: '2', name: '车间管理_基本件采购_请购单_增加数据', - param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time + '&备注=' + remarks + param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&备注=' + remarks } }) } -export function editData(RequisitionList, num1, time) { +export function editData(RequisitionList, num1) { return request({ url: '', method: 'post', @@ -118,7 +118,7 @@ export function editData(RequisitionList, num1, time) { ModularID: router.currentRoute.path, type: '2', name: '车间管理_基本件采购_请购单_编辑数据', - param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1 + '&请购时间=' + time + param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1 } }) } diff --git a/src/api/PurchasingCenter/MaterialMProcure.js b/src/api/PurchasingCenter/MaterialMProcure.js index ea3834fe..63eeb5d0 100644 --- a/src/api/PurchasingCenter/MaterialMProcure.js +++ b/src/api/PurchasingCenter/MaterialMProcure.js @@ -89,7 +89,7 @@ export function initMaterialSource() { } }) } -export function searchmaterial(check1, MaterialName, check2, FullNameOfMaterial, check3, MaterialSpecification, check4, MaterialModel, pageCurrent, pageSize, check5, MaterialCategoryValue, check6, MaterialVarietyValue, check7, MeasurementUnitValue, check8, MaterialSourceValue, check9, supplierValue) { +export function searchmaterial(check1, MaterialName, check2, FullNameOfMaterial, check3, MaterialSpecification, check4, MaterialModel, pageCurrent, pageSize, check5, MaterialCategoryValue, check6, MaterialVarietyValue, check7, MeasurementUnitValue, check8, MaterialSourceValue, check9, supplierValue, check, dateRange0, dateRange1) { return request({ url: '', method: 'post', @@ -98,7 +98,7 @@ export function searchmaterial(check1, MaterialName, check2, FullNameOfMaterial, ModularID: router.currentRoute.path, type: '1', name: '库存管理_物料主文件_基本_采购部_查询数据_分页', - param: '物料流水号_check=0&物料代码_check=0&物料名称_check=' + check1 + '=int&物料名称=' + MaterialName + '&物料全名_check=' + check2 + '=int&物料全名=' + FullNameOfMaterial + '&物料规格_check=' + check3 + '=int&物料规格=' + MaterialSpecification + '&物料型号_check=' + check4 + '=int&物料型号=' + MaterialModel + '&物料类别流水号_check=' + check5 + '=int&物料类别流水号=' + MaterialCategoryValue + '&物料品种流水号_check=' + check6 + '=int&物料品种流水号=' + MaterialVarietyValue + '&供货商流水号_check=' + check9 + '&供货商流水号=' + supplierValue + '&计量单位流水号_check=' + check7 + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号_check=' + check8 + '&物料来源流水号=' + MaterialSourceValue + '&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output' + param: '物料流水号_check=0&物料代码_check=0&物料名称_check=' + check1 + '=int&物料名称=' + MaterialName + '&物料全名_check=' + check2 + '=int&物料全名=' + FullNameOfMaterial + '&物料规格_check=' + check3 + '=int&物料规格=' + MaterialSpecification + '&物料型号_check=' + check4 + '=int&物料型号=' + MaterialModel + '&物料类别流水号_check=' + check5 + '=int&物料类别流水号=' + MaterialCategoryValue + '&物料品种流水号_check=' + check6 + '=int&物料品种流水号=' + MaterialVarietyValue + '&供货商流水号_check=' + check9 + '&供货商流水号=' + supplierValue + '&计量单位流水号_check=' + check7 + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号_check=' + check8 + '&物料来源流水号=' + MaterialSourceValue + '&时间_check=' + check + '&开始时间=' + dateRange0 + '&结束时间=' + dateRange1 + '&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output' } }) } @@ -116,7 +116,7 @@ export function getSupplier(check, num, pageCurrent, pageSize) { } }) } -export function addData(MaterialVariety, MaterialName, FullNameOfMaterial, MaterialSpecification, MaterialModel, MeasurementUnitValue, MaterialSourceValue, supplierValue1) { +export function addData(MaterialVariety, MaterialName, FullNameOfMaterial, MaterialSpecification, MaterialModel, MeasurementUnitValue, MaterialSourceValue, supplierValue1, id) { return request({ url: '', method: 'post', @@ -125,7 +125,7 @@ export function addData(MaterialVariety, MaterialName, FullNameOfMaterial, Mater ModularID: router.currentRoute.path, type: '2', name: '库存管理_物料主文件_基本_采购部_增加数据', - param: '物料品种流水号=' + MaterialVariety + '&物料名称\\=' + MaterialName + '&物料全名\\=' + FullNameOfMaterial + '&物料规格\\=' + MaterialSpecification + '&物料型号\\=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 + param: '物料品种流水号=' + MaterialVariety + '&物料名称\\=' + MaterialName + '&物料全名\\=' + FullNameOfMaterial + '&物料规格\\=' + MaterialSpecification + '&物料型号\\=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 + '&申请人=' + id } }) } diff --git a/src/api/PurchasingCenter/OfflineContractSearch.js b/src/api/PurchasingCenter/OfflineContractSearch.js index 5ec4cd35..c7949bda 100644 --- a/src/api/PurchasingCenter/OfflineContractSearch.js +++ b/src/api/PurchasingCenter/OfflineContractSearch.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 查询离线合同 -export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2, name) { +export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2, name, order, partName, check3, dateRange0, dateRange1) { return request({ url: '', method: 'post', @@ -12,7 +12,7 @@ export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2 ModularID: router.currentRoute.path, type: '1', name: '采购管理_离线合同_查询数据', - param: `离线合同编号_check=${check1}&离线合同编号=${num}&供应商名称_check=${check2}&供应商名称=${name}&是否不包含编辑中=1`, + param: `离线合同编号_check=${check1}&离线合同编号=${num}&供应商名称_check=${check2}&供应商名称=${name}&排序方式=${order}&排序名称=${partName}&时间_check=${check3}&开始时间=${dateRange0}&结束时间=${dateRange1}&是否不包含编辑中=1`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index a1178e23..d667ecf7 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -44,7 +44,7 @@ type="date" placeholder="选择结束日期"/> - + - + - + diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue index f0e24d88..cdacd5eb 100644 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -185,7 +185,7 @@ export default { 加工工时: response.data.result[i].设备工时, 扫码工时: response.data.result[i].扫码工时, 辅助工时: response.data.result[i].辅助工时, - 工时比值: Number(response.data.result[i].计划工时) === 0 ? 0 : Math.round(response.data.result[i].扫码工时 / Number(response.data.result[i].计划工时) * 100) / 100.00, + 工时比值: Number(response.data.result[i].计划工时) === 0 ? 0 : Math.round(response.data.result[i].完成工时 / Number(response.data.result[i].计划工时) * 100) / 100.00, 加工日期: response.data.result[i].操作时间, 图号及规格: response.data.result[i].零件图号_零件工艺计划, 修补工时: response.data.result[i].修补工时, diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue index 98b17c56..16d8dc37 100644 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue @@ -210,7 +210,7 @@ export default { this.check ? check2 = 1 : check2 = 0 searchTable(check2, this.startTime[0], this.startTime[1], this.orderName, this.order, check, this.name, check1, this.partNumber, this.pageCurrent, this.pageSize).then(response => { response.data.rows.map(v => { - this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round(parseInt(v.扫码工时) / parseInt(v.计划工时) * 100) / 100.00)) + this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round(parseInt(v.完成工时) / parseInt(v.计划工时) * 100) / 100.00)) }) this.tableData = response.data.rows this.total = response.data.total diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index d8febfd7..79f25ef2 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -32,14 +32,14 @@ - + - + - + @@ -69,19 +69,19 @@ {{ scope.row.总数量 }} - + - + @@ -89,22 +89,22 @@ - + - + - + - + @@ -124,12 +124,12 @@ {{ scope.row.总数量 }} - + - + @@ -139,22 +139,22 @@ - + - + - + - + @@ -174,12 +174,12 @@ {{ scope.row.总数量 }} - + - + @@ -301,7 +301,7 @@
- +
@@ -325,17 +325,6 @@ readonly style="width:160px;"/> - - - - { if (valid) { - addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => { + addData(this.form.请购车间, this.name, this.id, this.form.Remarks).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') this.dialogFormVisible = false @@ -956,12 +945,11 @@ export default { this.dialogFormVisible = true this.RequisitionList = row.请购单流水号 this.form.请购车间 = row.请购车间 - this.form.请购时间 = row.请购时间 }, submitEdit(formName) { // 提交单据编辑 this.$refs[formName].validate((valid) => { if (valid) { - editData(this.RequisitionList, this.form.请购车间, this.form.请购时间).then(response => { + editData(this.RequisitionList, this.form.请购车间).then(response => { if (response.data[0].result === '1') { this.$message.success('编辑成功') this.dialogFormVisible = false @@ -990,6 +978,19 @@ export default { this.$message.success('删除成功') this.tableData6 = [] this.searchTable1() + if (this.PartType === '基本件') { + searchPart(this.groupFloatValue).then(response => { + this.tableData1 = response.data + }) + } else if (this.PartType === '外购件') { + searchPart1(this.groupFloatValue, 2).then(response => { + this.tableData2 = response.data + }) + } else if (this.PartType === '标准件') { + searchPart1(this.groupFloatValue, 1).then(response => { + this.tableData3 = response.data + }) + } } else { this.$message.error('删除失败') } diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index a8970932..37cb6374 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -1,6 +1,6 @@ - + @@ -108,8 +108,8 @@ @@ -136,7 +136,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -244,7 +244,6 @@ export default { methods: { // 获取表格1数据 getParts() { - this.外协厂家流水号 = '' this.loading = true this.tableData = [] var check @@ -258,6 +257,11 @@ export default { } }) }, + checkNumber() { + // content.withdrawAmount = (withdrawAmount.match(/^\d*(\.?\d{0,2})/g)[0]) || null + this.form1.开票金额 = Number(this.form1.开票金额).toFixed(2) + this.form2.付款金额 = Number(this.form2.付款金额).toFixed(2) + }, rowClick(row) { this.外协厂家流水号 = row.外协厂家流水号 this.外协厂家流水号_Select = row.外协厂家流水号 @@ -286,7 +290,9 @@ export default { getInvoice() { this.loading2 = true this.tableData2 = [] - getInvoice(this.外协厂家流水号_Select, this.pageCurrent2, this.pageSize2).then(response => { + var check2 + this.startTime ? check2 = 1 : (check2 = 0, this.startTime = '') + getInvoice(this.外协厂家流水号_Select, check2, this.startTime[0], this.startTime[1], this.pageCurrent2, this.pageSize2).then(response => { this.loading2 = false if (response.data.rows.length !== 0) { this.tableData2 = response.data.rows @@ -298,7 +304,9 @@ export default { getPayment() { this.loading3 = true this.tableData3 = [] - getPayment(this.外协厂家流水号_Select, this.pageCurrent2, this.pageSize2).then(response => { + var check2 + this.startTime ? check2 = 1 : (check2 = 0, this.startTime = '') + getPayment(this.外协厂家流水号_Select, check2, this.startTime[0], this.startTime[1], this.pageCurrent2, this.pageSize2).then(response => { this.loading3 = false if (response.data.rows.length !== 0) { this.tableData3 = response.data.rows diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index ec3597ce..d2e6cb0a 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -1,7 +1,7 @@