diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index 36493fd5..512900ca 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -19,7 +19,7 @@ export function initSupplier11(num) { type: '3', name: ` SELECT distinct 供应商流水号,供应商名称 FROM 采购管理_询价单_视图 - where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}` + where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and (是否未通过 is null or 是否未通过 <> 1) and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}` } }) } diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index ffe6a4f2..cfca577d 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -38,38 +38,38 @@ export function searchLxPurchaseOrder(pageCurrent, pageSize, check1, num, check2 }) } // 查询采购计划明细 -export function searchMateriel(num, check, num1) { +export function searchMateriel(num) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_采购计划明细_查询数据_未选入', - param: `采购计划流水号=${num}&零件图号_check=${check}&零件图号=${num1}` + param: `供应商=${num}` } }) } // 查询离线采购计划明细 -export function searchLxMateriel(num, check, num1) { +export function searchLxMateriel(num) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_离线采购计划明细_查询数据_未选入', - param: `离线采购计划流水号=${num}&零件图号_check=${check}&零件图号=${num1}` + param: `供应商流水号=${num}` } }) } // 查询到货单 -export function searchArriveOrder(num8, num9, num2, num3, num5, num6, num7, pageCurrent, pageSize) { +export function searchArriveOrder(num8, num9, num6, num7, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_到货单查询_新', - param: `供应商流水号_check=${num8}&供应商流水号=${num9}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}&是否关联_check=${num6}&是否关联=${num7}`, + param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -87,14 +87,14 @@ export function addPurchaseOrder(num5, num6, num7) { }) } // 编辑采购单 -export function editPurchaseOrder(num5, num6, num7, num8) { +export function editPurchaseOrder(num5, num6, num8) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_编辑到货单', - param: `备注=${num5}&到货单流水号=${num6}&供应商流水号=${num7}}&日期=${num8}` + param: `备注=${num5}&到货单流水号=${num6}&日期=${num8}` } }) } @@ -144,14 +144,14 @@ export function EditArrivalOrderMX(num, num2, num3, num4, num5) { } }) } -export function AddArrivalOrderMX(num, num1, num2, num3, num4, num5) { +export function AddArrivalOrderMX(num, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, id) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_新增到货单明细', - param: `到货单流水号=${num}&材料=${num1}&数量=${num2}&单位=${num3}&单价=${num4}&金额=${num5}` + param: `到货单流水号=${num}&材料=${num1}&数量=${num2}&单位=${num3}&单价=${num4}&金额=${num5}&工艺计划流水号组=${num6}&采购计划明细流水号组=${num7}&本次到货数量组=${num8}&离线采购计划明细流水号组=${num9}&到货重量组=${num10}&到货金额组=${num11}&考勤编号=${id}` } }) } @@ -168,14 +168,14 @@ export function deleteMateriel(num1, num2, num3) { }) } // 关联材料 -export function addMateriel(num1, num2, num3, num4, num5, id) { +export function addMateriel(num1, num2, num3, num4, num5, num6, num7, id) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_到货单明细关联', - param: `到货单明细流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}&本次到货数量组=${num4}&离线采购计划明细流水号组=${num5}&考勤编号=${id}` + param: `到货单明细流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}&本次到货数量组=${num4}&离线采购计划明细流水号组=${num5}&到货重量组=${num6}&到货金额组=${num7}&考勤编号=${id}` } }) } diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js index 2b27a0fd..2fc72e8a 100644 --- a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js +++ b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js @@ -26,14 +26,14 @@ export function searchInvoiceDetail(num) { }) } // 发票增加 -export function addInvoice(time1, money, send, remark, num3) { +export function addInvoice(time1, money, send, remark, num3, num4) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_发票_增加数据', - param: `开票时间=${time1}&开票金额=${money}&发票号=${send}&备注=${remark}&供应商=${num3}` + param: `开票时间=${time1}&开票金额=${money}&发票号=${send}&备注=${remark}&供应商=${num3}&到货单流水号组=${num4}` } }) } diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue index 1d82de05..3e89344a 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue @@ -67,22 +67,22 @@ @@ -101,7 +101,7 @@ @@ -111,7 +111,7 @@ @@ -121,7 +121,7 @@ diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index c44c6c94..5c5ca59f 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -2,17 +2,24 @@
- + - - - - + + + + + + + - - + + 成组采购 取消成组采购 - - + + - + - + @@ -56,10 +63,10 @@ - + - + @@ -79,35 +86,35 @@ - - + + - + - + - + - + - + @@ -122,7 +129,7 @@ @change="update(scope.row)"/> - + @@ -337,6 +344,7 @@ export default { contractNumValue: '', contractNumType: 0, RequisitionNumber: '', + supplierNames: [], contract: [{ label: '合同模板1', value: 1 @@ -356,6 +364,7 @@ export default { supplierName: '', // 供应商 supplier: [], supplierValue: '', // 供应商流水号 + supplierValues: [], enterpriseNature: '', // 企业性质 createDate: '', // 创立日期 registeredCapital: '', // 注册资本 @@ -439,6 +448,7 @@ export default { }, created() { this.fetchData() + this.searchSupplier() }, methods: { linkGroup() { @@ -482,6 +492,8 @@ export default { }) }, searchData() { + this.contractSum = 0.00 + this.contractSum2 = 0.00 for (let i = 0; i < this.contractNum.length; i++) { if (this.contractNum[i].value === this.contractNumValue) { this.contractNumType = this.contractNum[i].id @@ -496,6 +508,7 @@ export default { console.log(this.tableData5) }) searchData2(this.contractNumValue).then(response => { + console.log(response, 2233) this.tableData4 = response.data this.machineValue = response.data[0].机床流水号 this.form3.机床 = response.data[0].机床图号 @@ -523,24 +536,44 @@ export default { }) }, calculateContractSum() { // 计算合同总额 - this.contractSum = 0 - this.contractSum1 = 0 - this.costAccount = 0 - this.riseFallPoint = 0 - this.tableData4 = [] - for (let i = 0; i < this.groupNum2.length; i++) { - this.groupNum2[i].金额 = parseFloat(this.groupNum2[i].单价) * parseFloat(this.groupNum2[i].零件数量) - this.contractSum1 += parseFloat(this.groupNum2[i].金额) - this.tableData4.push(this.groupNum2[i]) - } - this.contractSum = (this.contractSum1).toFixed(2) - this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 - this.costAccount = this.contractSum - if (parseInt(this.costAccount) === 0) { - this.$message.error('成本核算不可为0') - } else { - this.riseFallPoint = (this.contractSum - this.costAccount) / this.costAccount - this.riseFallPoint = this.riseFallPoint.toFixed(2) + if (this.contractNumType === 0) { + this.contractSum = 0 + this.contractSum1 = 0 + this.costAccount = 0 + this.riseFallPoint = 0 + this.tableData4 = [] + for (let i = 0; i < this.groupNum2.length; i++) { + this.groupNum2[i].金额 = parseFloat(this.groupNum2[i].单价) * parseFloat(this.groupNum2[i].零件数量) + this.contractSum1 += parseFloat(this.groupNum2[i].金额) + this.tableData4.push(this.groupNum2[i]) + } + this.contractSum = (this.contractSum1).toFixed(2) + this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 + this.costAccount = this.contractSum + if (parseInt(this.costAccount) === 0) { + this.$message.error('成本核算不可为0') + } else { + this.riseFallPoint = (this.contractSum - this.costAccount) / this.costAccount + this.riseFallPoint = this.riseFallPoint.toFixed(2) + } + } else if (this.contractNumType === 1) { + this.contractSum = 0 + this.contractSum1 = 0 + this.costAccount = 0 + this.riseFallPoint = 0 + for (let i = 0; i < this.groupNum5.length; i++) { + this.contractSum1 += parseFloat((parseInt(this.groupNum5[i].数量) * parseFloat(this.groupNum5[i].单价)).toFixed(2)) + } + console.log(this.contractSum1, this.groupNum5, 898989) + this.contractSum = (this.contractSum1).toFixed(2) + this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 + this.costAccount = this.contractSum + if (parseInt(this.costAccount) === 0) { + this.$message.error('成本核算不可为0') + } else { + this.riseFallPoint = (this.contractSum - this.costAccount) / this.costAccount + this.riseFallPoint = this.riseFallPoint.toFixed(2) + } } }, fetchData() { @@ -581,6 +614,12 @@ export default { response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0] } } + for (let i = 0; i < response.data.length; i++) { + this.supplierValues.push({ + label: response.data[i].供应商名称, + value: response.data[i].供应商流水号 + }) + } this.tableData01 = response.data }) }, diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue index 2fedc6e8..8e0826f4 100644 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -1,32 +1,7 @@