diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue index acdca70d..7ab925fe 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue @@ -281,6 +281,14 @@ import Tree from '@/views/claimAndRefund/return/tree.vue' export default { // name: "ReturnExamine", components: { dialogForm, Tree }, + props: { + query: { + type: Object, + default: () => { + return {} + }, + }, + }, data() { return { type: '', @@ -342,6 +350,8 @@ export default { } }, created() { + console.log('this.query', this.query) + this.queryParams = { ...this.queryParams,...this.query } this.initSelectData() this.InitIGetInfo() this.getTree() @@ -437,7 +447,20 @@ export default { resetQuery() { this.dateRange = [] // this.resetForm("queryForm"); - this.$refs.queryForm.resetFields() + // this.$refs.queryForm.resetFields() + this.queryParams = { + pageNum: 1, + pageSize: 10, + keyWord: '', //关键字 + unitId: '', //单位id + lotId: '', //工程id + taskStatus: '', //状态 + typeId: '', //工机具类型 + time: '', + agreementCode: '', //协议 + startTime: '', + endTime: '', + } this.$refs.mychildSon.inputValue = '' this.initSelectData() this.handleQuery() @@ -459,6 +482,7 @@ export default { // }) this.$emit('receiveView', row.id) + this.$emit('cacheQueryParams', this.queryParams) }, //退料按钮 handleReturn(row) { @@ -470,6 +494,7 @@ export default { // }, // }) this.$emit('receiveReturn', row) + this.$emit('cacheQueryParams', this.queryParams) }, /** 导出按钮操作 */ handleExport() { diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/index.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/index.vue index 26e4ada3..814af6ed 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/receive/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/receive/index.vue @@ -13,9 +13,11 @@ :rejectId="rejectId" :rejectTaskId="rejectTaskId" :lotName="lotName" + :query="queryParams" @receiveView="receiveView" @receiveReturn="receiveReturn" @goBackPage="goBack" + @cacheQueryParams="cacheQueryParams" /> @@ -38,6 +40,10 @@ export default { rejectTaskId: '', isView: false, lotName: '', // 退料工程 + queryParams: { + pageNum: 1, + pageSize: 10, + } } }, methods: { @@ -60,6 +66,10 @@ export default { goBack() { this.isShowComponent = 'Home' }, + // 缓存查询条件 + cacheQueryParams(params) { + this.queryParams = params + } }, }