diff --git a/src/config/getData2.js b/src/config/getData2.js index 144b88e..b2ed306 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -123,9 +123,10 @@ export const checkBucket = (code, option, bill) => post('api/pda/st/in/checkBuck option: option }) // 1.3获取单据信息 -export const getBillDtl = (page, size) => post('api/pda/st/in/getBillDtl', { +export const getBillDtl = (page, size, pcsn) => post('api/pda/st/in/getBillDtl', { page: page, - size: size + size: size, + pcsn: pcsn }) // 1.4 确认组盘 export const confirmVehicle = (option, vehicle, rows, point, bill, level) => post('api/pda/st/in/confirmVehicle', { @@ -185,11 +186,13 @@ export const askVehicle = (row, point) => post('api/pda/st/in/askVehicle', { point: point }) // 1.6获取软废单据信息 -export const getRecBillDtl = (page, size, mater, code) => post('api/pda/st/in/getRecBillDtl', { +export const getRecBillDtl = (page, size, mater, code, startTime, endTime) => post('api/pda/st/in/getRecBillDtl', { page: page, size: size, material_search: mater, - bill_code: code + bill_code: code, + startTime: startTime, + endTime: endTime }) // 1.9 获取软废等级下拉框(进页面查询) export const inIetIvtLevel = () => post('api/pda/st/in/getIvtLevel', {}) diff --git a/src/pages/xinrui/storage/instorage/SearchRelatedBill.vue b/src/pages/xinrui/storage/instorage/SearchRelatedBill.vue index a8094be..3da3ede 100644 --- a/src/pages/xinrui/storage/instorage/SearchRelatedBill.vue +++ b/src/pages/xinrui/storage/instorage/SearchRelatedBill.vue @@ -2,6 +2,14 @@
+
+
+
批次
+
+ +
+
+
@@ -37,6 +45,7 @@
{{desc}}
+
@@ -52,19 +61,30 @@ export default { }, data () { return { + val1: '', dataList: [], pkId: '', pkObj: {}, page: 1, size: '10', busy: false, - desc: '加载数据中...' + desc: '' } }, created () { - this._getBillDtl() + // this._getBillDtl() }, methods: { + toSearch () { + this.dataList = [] + this.pkId = '' + this.pkObj = {} + this.page = 1 + this.size = '10' + this.busy = false + this.desc = '' + this._getBillDtl() + }, toCheck (e) { this.pkId = this.pkId === e.source_billdtl_id ? '' : e.source_billdtl_id this.pkObj = this.pkId === e.source_billdtl_id ? e : {} @@ -80,7 +100,8 @@ export default { async loadMore () { this.busy = true this.page++ - let res = await getBillDtl(this.page + '', this.size) + this.desc = '加载数据中...' + let res = await getBillDtl(this.page + '', this.size, this.val1) if (res.code === '1') { let newArr = [] res.rows.map(el => { newArr.push(Object.assign({}, el, {checked: 0})) }) @@ -97,7 +118,7 @@ export default { } }, async _getBillDtl () { - let res = await getBillDtl(this.page + '', this.size) + let res = await getBillDtl(this.page + '', this.size, this.val1) if (res.code === '1') { let newArr = [] res.rows.map(el => { newArr.push(Object.assign({}, el, {checked: 0})) }) diff --git a/src/pages/xinrui/storage/instorage/SearchSoftWasteBill.vue b/src/pages/xinrui/storage/instorage/SearchSoftWasteBill.vue index 85b4916..cdfee18 100644 --- a/src/pages/xinrui/storage/instorage/SearchSoftWasteBill.vue +++ b/src/pages/xinrui/storage/instorage/SearchSoftWasteBill.vue @@ -15,6 +15,37 @@ +
+
开始时间
+
+
+ {{ startDateText }} +
+
+
+
+
结束时间
+
+
+ {{ endDateText }} +
+
+
+ + + + +
@@ -54,15 +85,31 @@