Merge remote-tracking branch 'origin/dev' into dev

26774114 · houjn@hikoon.cn · 0f3a9acd · d065d273 · 26774114
Commit 26774114 authored Apr 22, 2023 by houjn@hikoon.cn
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

updateError.vue src/views/ecw/box/updateError.vue +9 -7

No files found.
--- a/src/views/ecw/box/updateError.vue
+++ b/src/views/ecw/box/updateError.vue
@@ -53,6 +53,7 @@ export default {
        if (valid) {
          let text = "";
          // 自定义
+          if (this.updateObj.updateOrder) {
            if (this.updateObj.updateOrder === "0") {
              text = this.updateObj.customize;
            } else {
@@ -61,6 +62,7 @@ export default {
              );
              text = this.$l(dict, "label");
            }
+          }

          const { orderList } = this.errorInfo;
          updateAbnormalOrder({