Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-08 9b18523c852a24806937ebb4de3a231abef9173d

 src/views/basic/warehouse/warehouse-form.vue

@@ -322,6 +322,9 @@
              this.visible = false
              this.isSubmit = false
              this.$emit('refreshDataList')
            }).catch(error=>{
              console.error(error);
              this.isSubmit = false
            })
          } else {
            addObj(this.dataForm).then((data) => {
@@ -329,6 +332,9 @@
              this.visible = false
              this.isSubmit = false
              this.$emit('refreshDataList')
            }).catch(error=>{
              console.error(error);
              this.isSubmit = false
            })
          }
        } else {