diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index aa50614..bf185eb 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -141,7 +141,7 @@
显示/隐藏搜索栏
重置
- 查询
@@ -466,19 +466,25 @@
style="width: 100%"
border highlight-current-row>
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -770,7 +776,8 @@ export default {
companyNameList: [],
formateCompanyName: null,
formateInOutType: null,
- formateSourceType: null
+ formateSourceType: null,
+ searchIng: false,
}
},
methods: {
@@ -831,9 +838,11 @@ export default {
orderTimeOut() {
// 执行逻辑代码
this.filterQuery.page = 1;
-
+ this.searchIng = true;
if ((this.list == undefined || this.list.length <= 0)) {
this.getRecordResult()
+ } else {
+ this.searchIng = false;
}
// 使用递归法定时执行定时器
if (this.list == undefined || this.list.length <= 0) {
diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue
index b743a9d..996195b 100644
--- a/src/views/udi/trace/searchLive/index.vue
+++ b/src/views/udi/trace/searchLive/index.vue
@@ -498,44 +498,19 @@
style="width: 100%"
border highlight-current-row>
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
@@ -385,11 +386,11 @@ export default {
formatTaskType(row) {
switch (row.taskType) {
case 1:
- return '生产订单';
+ return '生产单据';
case 2:
- return '入库订单';
+ return '出入库单据';
case 3:
- return '出库订单';
+ return '出入库单据';
default:
return '任务类型有误！！';
}