Merge pull request #6837 from GuoLiBin6/feat/glb-to-3.11/cloudenv

feat(v3.11/4947): extdb支持重跑未来账单
yunionio · Jun 28, 2024 · 79dacca · 79dacca
2 parents 96467bb + be47966
commit 79dacca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/containers/Cloudenv/views/billtasks/dialogs/Create.vue b/containers/Cloudenv/views/billtasks/dialogs/Create.vue
@@ -179,6 +179,7 @@ export default {
     dateDisabledEnd (value) {
       const dateStart = this.form.start_day
       if (dateStart && value < dateStart) return true
+      if (this.params.accountData?.provider === 'extdb' && this.form.task_type === 'pull_bill') return false
       if (value > this.$moment()) return this.form.task_type !== 'predict'
       return false
     },

diff --git a/containers/Cloudenv/views/cloudaccount/dialogs/ReRunBill.vue b/containers/Cloudenv/views/cloudaccount/dialogs/ReRunBill.vue
@@ -112,6 +112,7 @@ export default {
     dateDisabledEnd (value) {
       const dateStart = this.form.fc.getFieldValue('start_day')
       if (dateStart && value < dateStart) return true
+      if (this.params.data.every(item => item.provider === 'extdb')) return false
       if (value > this.$moment()) return true
       return false
     },