Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/eam/repairOrderFinishedReport/modules/ApprovelModal.vue

@@ -132,6 +132,7 @@
          }
        }).finally(() => {
          that.confirmLoading = false
          that.$emit('loadData')
          that.close()
        })

@@ -154,6 +155,7 @@
          }
        }).finally(() => {
          that.confirmLoading = false
          that.$emit('loadData')
          that.close()
        })
      }