diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index 56be1bc..d4fea9a 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -150,13 +150,26 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -371,15 +412,39 @@ export default {
cpmctymcList: [],
ggxhList: [],
nameCodeList: [],
- companyNameList: []
+ companyNameList: [],
+ formateCompanyName: null,
+ formateInOutType: null,
+ formateSourceType: null
}
},
methods: {
+ formaterSourceType(row){
+ if (row.sourceType == 1) {
+ this.formateSourceType = "起始位置"
+ return "起始位置"
+ }else if (row.sourceType == 2){
+ this.formateSourceType = "中间位置"
+ return "中间位置"
+ }else {
+ this.formateSourceType = "结束位置"
+ return "结束位置"
+ }
+ },
+ formaterInOutType(row){
+ if (row.inOutType == 1) {
+ this.formateInOutType = "入库"
+ return "入库"
+ }else {
+ this.formateInOutType = "出库"
+ return "出库"
+ }
+ },
formatCompanyName(row){
let temp = this.companyNameList.find(item=>{
return item.id == row.companyIdFk
})
-
+ this.formateCompanyName = temp.companyName
return temp && temp.companyName
},
getCompanyName(){
diff --git a/src/views/udi/trace/searchLive/index.vue b/src/views/udi/trace/searchLive/index.vue
index 8889a35..6d970fb 100644
--- a/src/views/udi/trace/searchLive/index.vue
+++ b/src/views/udi/trace/searchLive/index.vue
@@ -173,12 +173,26 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
@@ -221,12 +235,6 @@
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
-
-
+
-
-
+
-
-
-
+
+
-
-
+
+
+
-
-
+
@@ -297,14 +314,14 @@
-
-
+
-
-
+
@@ -312,14 +329,14 @@
-
-
+
-
-
+
@@ -327,35 +344,60 @@
-
-
+
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-