From 1e2807ad476d9dd13f20ff605072c4c61ed1a6a7 Mon Sep 17 00:00:00 2001 From: schry <2433098676@qq.com> Date: Fri, 16 Jun 2023 15:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=9F=A5=E8=AF=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/udi/trace/search/index.vue | 13 +++++++------ src/views/udi/trace/searchLive/index.vue | 6 ++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue index f42fda7..e0c0987 100644 --- a/src/views/udi/trace/search/index.vue +++ b/src/views/udi/trace/search/index.vue @@ -733,7 +733,7 @@ export default { limit: 10, }, manuOrderQuery: { - recordCode: null, + recordCode: "", page: 1, limit: 10, }, @@ -800,6 +800,7 @@ export default { //清空校验结果表 this.listCodeRel = null; this.loading = true; + this.manuOrderQuery.recordCode = this.list.recordCode getTraceManuOrderList(this.manuOrderQuery).then((res) => { this.loading = false; if (res.code === 20000) { @@ -822,9 +823,13 @@ export default { // 执行逻辑代码 this.filterQuery.page = 1; this.getList() + if(!(this.list == undefined || this.list.length <= 0)){ + this.manuOrderQuery.recordCode = this.list.recordCode + this.getManuOrderList() + } // 使用递归法定时执行定时器 if(this.list == undefined || this.list.length <= 0){ - this.monitorOrder = setTimeout(this.orderTimeOut, 10000); + this.monitorOrder = setTimeout(this.orderTimeOut, 1000); } // if (this.list != null) { // clearTimeout(this.monitorOrder); @@ -1008,10 +1013,6 @@ export default { this.list = res.data || []; this.total = res.data.total || 0; console.log(this.list) - if (this.list.recordCode != null || this.list.recordCode != "") { - this.manuOrderQuery.recordCode = this.list.recordCode - this.getManuOrderList() - } } else { this.$message.error(res.message); this.list = []; diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue index 2c2c39c..3b27ff4 100644 --- a/src/views/udi/trace/searchLive/index.vue +++ b/src/views/udi/trace/searchLive/index.vue @@ -852,6 +852,10 @@ export default { // 执行逻辑代码 this.filterQuery.page = 1; this.getList() + if(!(this.list == undefined || this.list.length <= 0)){ + this.manuOrderQuery.recordCode = this.list.recordCode + this.getManuOrderList() + } // 使用递归法定时执行定时器 if(this.list == undefined || this.list.length <= 0){ this.monitorOrder = setTimeout(this.orderTimeOut, 1000); @@ -1039,8 +1043,6 @@ export default { this.list = res.data || []; this.total = res.data.total || 0; console.log(this.list) - this.manuOrderQuery.recordCode = res.data.recordCode - this.getManuOrderList() } else { this.$message.error(res.message); this.list = [];