bug fixes

src/modules/offices/mixins/edit.js

@@ -8,6 +8,7 @@ export default {
   },
   data() {
     return {
+      loaded: false,
       detail: {},
       // 学期列表
       semesterList: [
@@ -87,9 +88,11 @@ export default {
     },
     // 获取详情
     getDetail() {
-      api.getAffair(this.pid).then(response => {
+      this.loaded = false
+      return api.getAffair(this.pid).then(response => {
         this.detail = response
         this.ruleForm = response.form
+        this.loaded = true
       })
     },
     // 返回

src/modules/offices/src/reportPaper/edit.vue

@@ -122,7 +122,9 @@ export default {
     '$route.query': {
       immediate: true,
       handler(query) {
-        this.payVisible = query.pay === '1'
+        if (query.pay === '1') {
+          this.handlePay()
+        }
       }
     }
   },
@@ -134,15 +136,21 @@ export default {
   },
   methods: {
     handleSubmitSuccess(response) {
-      if (!this.isEdit) {
-        this.$router
-          .replace({ name: 'pareportEdit', params: { id: response.data.id }, query: { id: this.affairId, pay: '1' } })
-          .then(this.getDetail)
-      }
+      if (this.isEdit) {
         this.handlePay()
+      } else {
+        this.$router.replace({
+          name: 'pareportEdit',
+          params: { id: response.data.id },
+          query: { id: this.affairId, pay: '1' }
+        })
+      }
     },
     // 去支付
-    handlePay() {
+    async handlePay() {
+      if (!this.loaded) {
+        await this.getDetail()
+      }
       this.payVisible = true
     },
     // 支付成功