diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index fa17a7d5..44549e45 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, remarks) { +export function addData(num1, num2, id, time, remarks) { return request({ url: '', method: 'post', @@ -105,11 +105,11 @@ export function addData(num1, num2, id, remarks) { ModularID: router.currentRoute.path, type: '2', name: '车间管理_基本件采购_请购单_增加数据', - param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&备注=' + remarks + param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time + '&备注=' + remarks } }) } -export function editData(RequisitionList, num1) { +export function editData(RequisitionList, num1, time) { return request({ url: '', method: 'post', @@ -118,7 +118,7 @@ export function editData(RequisitionList, num1) { ModularID: router.currentRoute.path, type: '2', name: '车间管理_基本件采购_请购单_编辑数据', - param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1 + param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1 + '&请购时间=' + time } }) } @@ -252,7 +252,7 @@ export function Production(num, MaterialNum, Number, projectFloatValue, machineF } }) } -export function PartCallbackInformation() { +export function PartCallbackInformation(check, partNumber, check1, dateRange0, dateRange1) { return request({ url: '', method: 'post', @@ -260,11 +260,12 @@ export function PartCallbackInformation() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '采购管理_退回记录_基本件_查询数据' + name: '采购管理_退回记录_基本件_查询数据', + param: `零件图号_check=${check}&零件图号=${partNumber}&时间_check=${check1}&开始时间=${dateRange0}&结束时间=${dateRange1}` } }) } -export function PartCallbackInformation1() { +export function PartCallbackInformation1(check, partNumber1, check1, dateRange10, dateRange11) { return request({ url: '', method: 'post', @@ -272,7 +273,8 @@ export function PartCallbackInformation1() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '采购管理_退回记录_标准件和外购件_查询数据' + name: '采购管理_退回记录_标准件和外购件_查询数据', + param: `零件图号_check=${check}&零件图号=${partNumber1}&时间_check=${check1}&开始时间=${dateRange10}&结束时间=${dateRange11}` } }) } diff --git a/src/api/PurchasingCenter/InvoiceSettlementApplication.js b/src/api/PurchasingCenter/InvoiceSettlementApplication.js index e0221422..384fac06 100644 --- a/src/api/PurchasingCenter/InvoiceSettlementApplication.js +++ b/src/api/PurchasingCenter/InvoiceSettlementApplication.js @@ -38,8 +38,8 @@ export function searchTable1(...group) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_发票结算申请单_查询数据', - param: `发票号_check=${group[0]}&发票号=${group[1]}&供应商名称_check=${group[2]}&供应商名称=${group[3]}`, - Pagination: group[4] + '&' + group[5] + param: `发票号_check=${group[0]}&发票号=${group[1]}&供应商名称_check=${group[2]}&供应商名称=${group[3]}&时间段_check=${group[4]}&开始日期=${group[5]}&结束日期=${group[6]}`, + Pagination: group[7] + '&' + group[8] } }) } diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index 1d7928ef..228aa296 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -30,7 +30,7 @@ export function searchContract(check, num1, num2) { }) } // 查询请款表 -export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num) { +export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num, check3) { return request({ url: '', method: 'post', @@ -39,7 +39,7 @@ export function searchRequestFund(pageCurrent, pageSize, check1, start, end, che ModularID: router.currentRoute.path, type: '1', name: '采购管理_采购合同_请款_查询数据', - param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}`, + param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}&查询当前_check=${check3}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 79f25ef2..45fe1dc4 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.总数量 }} - + - + @@ -211,10 +211,10 @@ - + 查询 请购单 - 删除 + 删除 导出 @@ -301,7 +301,7 @@
- +
@@ -325,6 +325,17 @@ readonly style="width:160px;"/> + + + + + + + - + @@ -417,20 +440,20 @@ {{ scope.row.退回时间 }} - - - + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + @@ -515,6 +550,10 @@ export default { inject: ['reload'], data() { return { + dateRange: '', + partNumber: '', + dateRange1: '', + partNumber1: '', DeliveryTime: '', // 三表下达时间 projectFloatValue: '', machineNumberValue: '', @@ -665,35 +704,43 @@ export default { }) } }) - PartCallbackInformation().then(response => { - for (let i = 0; i < response.data.length; i++) { - if (response.data[i].退回时间 !== '') { - response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0] - } - if (response.data[i].是否确认 === 0) { - this.value += 1 - } - } - this.tableData9 = response.data - }) - PartCallbackInformation1().then(response => { - for (let i = 0; i < response.data.length; i++) { - if (response.data[i].退回时间 !== '') { - response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0] - } - if (response.data[i].是否确认 === 0) { - this.value1 += 1 - } - } - this.tableData10 = response.data - }) } }, PartCallbackInformation() { + let check, check1 this.dialogFormVisible1 = true + this.tableData9 = [] + this.partNumber ? check = 1 : check = 0 + this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '') + PartCallbackInformation(check, this.partNumber, check1, this.dateRange[0], this.dateRange[1]).then(response => { + for (let i = 0; i < response.data.length; i++) { + if (response.data[i].退回时间 !== '') { + response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0] + } + if (response.data[i].是否确认 === 0) { + this.value += 1 + } + } + this.tableData9 = response.data + }) }, PartCallbackInformation1() { this.dialogFormVisible2 = true + let check, check1 + this.tableData10 = [] + this.partNumber1 ? check = 1 : check = 0 + this.dateRange1 ? check1 = 1 : (check1 = 0, this.dateRange1 = '') + PartCallbackInformation1(check, this.partNumber1, check1, this.dateRange1[0], this.dateRange1[1]).then(response => { + for (let i = 0; i < response.data.length; i++) { + if (response.data[i].退回时间 !== '') { + response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0] + } + if (response.data[i].是否确认 === 0) { + this.value1 += 1 + } + } + this.tableData10 = response.data + }) }, submit(row) { submit(row.基本件流水号).then(response => { @@ -923,7 +970,7 @@ export default { submitAdd(formName) { this.$refs[formName].validate((valid) => { if (valid) { - addData(this.form.请购车间, this.name, this.id, this.form.Remarks).then(response => { + addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') this.dialogFormVisible = false @@ -945,11 +992,12 @@ 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.请购车间).then(response => { + editData(this.RequisitionList, this.form.请购车间, this.form.请购时间).then(response => { if (response.data[0].result === '1') { this.$message.success('编辑成功') this.dialogFormVisible = false @@ -978,19 +1026,6 @@ 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/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue index 1186d10a..f981a3ba 100644 --- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue +++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue @@ -17,14 +17,14 @@ - - + + - + @@ -39,7 +39,7 @@ {{ scope.row.零件名称 }} - + @@ -64,7 +64,7 @@ {{ scope.row.外协厂家名称 }} - + diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue index 7f49e22d..95622e92 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue @@ -4,6 +4,19 @@
+ @@ -59,6 +72,11 @@ {{ scope.row.发票金额 }} + + + - + + + + @@ -210,7 +215,11 @@ export default { console.log(column + '-' + column.prop + '-' + column.order, 11111) if (column.prop === '供应商名称') { this.partName = 1 - } else if (column.prop === '离线合同编号') { this.partName = 2 } else { + } else if (column.prop === '离线合同编号') { + this.partName = 2 + } else if (column.prop === '创建日期') { + this.partName = 3 + } else { this.partName = '' } console.log(this.ordername, 9990999) diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index 9c9ebbba..6c464d78 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -23,6 +23,7 @@ end-placeholder="结束日期"/> 查询 请款 + 查询全部 导出
@@ -258,6 +259,7 @@ import { getNowTime, timeToStamp } from '@/utils/tool' export default { data() { return { + searchAll: false, selectContents: [], getDate: null, tableData0: [], @@ -464,10 +466,11 @@ export default { this.searchTable1() }, searchTable1() { // 查请款信息 - let check1, check2 + let check1, check2, check3 this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '') this.supplierValue ? check2 = 1 : check2 = 0 - searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue).then(response => { + this.searchAll === false ? check3 = 1 : check3 = 0 + searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue, check3).then(response => { this.tableData1 = response.data.rows this.total1 = response.data.total }) diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index 55443f9d..fe591ee2 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -92,7 +92,7 @@ - + 打回 @@ -313,7 +313,7 @@ 已分配 - + 打回 @@ -493,7 +493,7 @@ 已分配 - + 分配 + @click="executeReturn2">分配 打回 + style="margin-left: 50px" + @click="allocateTask2">打回 diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue index 5a235f8e..ce112085 100644 --- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue +++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue @@ -1,14 +1,47 @@