zhaoke 9 月之前
父节点
当前提交
1e19815751
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 1 3
      src/views/newBagDetails/components/baggageView.vue
  2. 1 1
      src/views/newBagDetails/index.vue

+ 1 - 3
src/views/newBagDetails/components/baggageView.vue

@@ -165,9 +165,7 @@ export default {
           }
           }
         }
         }
         if (stateProp == 'securityInspectionResults' && !stateValue) {
         if (stateProp == 'securityInspectionResults' && !stateValue) {
-          if (this.tableData.length < 2 && !arrs[index + 1].stateValue && !arrs[index + 1].loclValue && !arrs[index + 1].timeValue && !arrs[index + 2].stateValue && !arrs[index + 2].loclValue && !arrs[index + 2].timeValue) {
-            return 'step-circle-danger'
-          } else {
+          if (this.tableData.length >= 2 || arrs[index + 1].stateValue || arrs[index + 1].loclValue || arrs[index + 1].timeValue || arrs[index + 2].stateValue || arrs[index + 2].loclValue || arrs[index + 2].timeValue) {
             return 'step-circle-waring'
             return 'step-circle-waring'
           }
           }
         }
         }

+ 1 - 1
src/views/newBagDetails/index.vue

@@ -201,7 +201,7 @@ export default {
           for (const key in datasObj) {
           for (const key in datasObj) {
             this.msgs1.map(item => {
             this.msgs1.map(item => {
               if (item.columnName == key) {
               if (item.columnName == key) {
-                item.value = item.columnName == 'activeState' ? datasObj[key] == 0 ? 'N' : 'Y' : datasObj[key]
+                item.value = datasObj[key] != 0 && datasObj[key] != 1 ? datasObj[key] : datasObj[key] == 0 ? 'N' : 'Y'
               }
               }
             })
             })
           }
           }