+
@@ -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
})
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 58c26498..0790b283 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -192,7 +192,6 @@
-