Merge branch 'fix_bug_first_stage'

# Conflicts: # jero-web/src/components/CollectionType/index.vue
2022-07-05 19:48:17 +08:00
parent 7ddac7eb75 eb6ab02004
commit 4b092fc07c
15 changed files with 415 additions and 251 deletions
@@ -11,6 +11,7 @@
    <addFormData
      ref="addFormDataRef"
      @addFormClick="addFormClick"
+      @addFormWarning="addFormWarning"
      :flag="'1'"
      v-if="visible"
      :url="url"
@@ -59,6 +60,7 @@
        this.visible = false
      },
      add() {
+        this.confirmLoading = false
        this.title = this.$t('add')
        this.visible = true
        this.$nextTick(() => {
@@ -66,6 +68,7 @@
        })
      },
      edit(item) {
+        this.confirmLoading = false
        this.title = this.$t('edit')
        this.visible = true
        this.$nextTick(() => {
@@ -73,8 +76,12 @@
        })
      },
      handleSubmit() {
+        this.confirmLoading = true
        this.$refs.addFormDataRef.sumber()
      },
+      addFormWarning(){
+        this.confirmLoading = false
+      },
      addFormClick() {
        this.visible = false
      }