diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index 3c169558..56698104 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -62,14 +62,14 @@ export function searchLxMateriel(num, check, num1) { }) } // 查询到货单 -export function searchArriveOrder(num8, num9, num6, num7, pageCurrent, pageSize) { +export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_到货单查询_新', - param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}`, + param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index a8dbc081..eede78fb 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -10,18 +10,20 @@ :label="item.label" :value="item.value"/> - - - - - - - - - - - - + 请款时间段: + + 查询 新增到货单 @@ -245,7 +247,7 @@ - + 供应商 @@ -274,7 +276,7 @@
-
+
@@ -505,6 +507,37 @@ import { ExcelWaiGou } from '@/utils/request' export default { data() { return { + check1: 0, + check2: 0, + dateRange: '', + expands: [], + pickerOptions: { + shortcuts: [{ + text: '上季度', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3) + picker.$emit('pick', [start, end]) + } + }, { + text: '过去半年', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2) + picker.$emit('pick', [start, end]) + } + }, { + text: '过去一年', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 365) + picker.$emit('pick', [start, end]) + } + }] + }, excle_row: [], supplierNameValue: '', supplierName: [], // 供应商 @@ -628,7 +661,7 @@ export default { created() { this.fetchdata() this.searchTable2() - this.searchTable4() + // this.searchTable4() }, methods: { saveData(row) { @@ -711,7 +744,7 @@ export default { const sums = [] columns.forEach((column, index) => { if (index === 1) { - sums[index] = '总数量:' + sums[index] = '总重量:' return } else if (index === 2) { const values = data.map(item => Number(item['数量'])) @@ -804,12 +837,13 @@ export default { this.tableData5 = [] this.tableData6 = [] this.supplierNameValue ? this.check = 1 : this.check = 0 + this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '') if (this.PickingValue === 0 || this.PickingValue === 1) { this.check2 = 1 } else { this.check2 = 0 } - searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.pageCurrent4, this.pageSize4).then(response => { + searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => { this.tableData4 = response.data.rows this.total4 = response.data.total })