fix：[表单优化]

src/views/business/study/comp/jhbd/Bj.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -241,6 +241,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {
@@ -272,8 +273,9 @@ export default {
           this.form = response.data
           this.templateData = deepClone(this.form)
           this.open = true
-          this.$modal.closeLoading()
-        })
+        }).finally(() => {
+            this.$modal.closeLoading()
+          })
       } else {
         this.showIndex = 1
         this.form = _.merge({}, this.form, row)
@@ -287,7 +289,7 @@ export default {
           this.$modal.loading()
           studyFormPlan_bc(this.form).then(response => {
             this.$emit('close')
-            this.$modal.closeLoading()
+            this.open = false
           }).finally(() => {
             this.$modal.closeLoading()
           })
@@ -301,7 +303,7 @@ export default {
         this.$modal.loading()
         studyFormPlan_bc(this.form).then(response => {
           this.$emit('close')
-          this.$modal.closeLoading()
+          this.open = false
         }).finally(() => {
           this.$modal.closeLoading()
         })
@@ -313,8 +315,8 @@ export default {
           this.$modal.loading()
           studyFormPlan_tj(this.form).then(response => {
             this.$emit('close')
+            this.open = false
             this.openSubmit = false
-            this.$modal.closeLoading()
           }).finally(() => {
             this.$modal.closeLoading()
           })

src/views/business/study/comp/jhbd/Fh.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -18,7 +18,8 @@
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable"  emitName="onPlanFhCallback" @onPlanFhCallback="onPlanFhCallback" :sn="form.templateSn" fillType="qc" :templateData="form" />
+          <TemplateTable ref="templateTable" emitName="onPlanFhCallback" @onPlanFhCallback="onPlanFhCallback"
+            :sn="form.templateSn" fillType="qc" :templateData="form" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>
@@ -109,7 +110,7 @@
 </template>
 
 <script>
-import { studyFormPlan_updateFhyjjl,studyFormPlan_updateZdgxjl,studyFormPlan_fhtg, studyFormPlan_fhjj, studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
+import { studyFormPlan_updateFhyjjl, studyFormPlan_updateZdgxjl, studyFormPlan_fhtg, studyFormPlan_fhjj, studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -119,6 +120,7 @@ export default {
   components: { TemplateTable, JcgjList },
   data() {
     return {
+      open: false,
       form: {},
       qmxxList: [],
       totalQmxx: 0,
@@ -191,7 +193,6 @@ export default {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -206,6 +207,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {}
@@ -220,7 +222,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -263,8 +265,8 @@ export default {
           if (this.formApprove.qmyy == '复核通过') {
             studyFormPlan_fhtg(this.formApprove).then(response => {
               this.openApprove = false
-              this.$modal.closeLoading()
               this.$emit('close')
+              this.open = false
             }).finally(() => {
               this.$modal.closeLoading()
             })
@@ -272,8 +274,8 @@ export default {
             this.formApprove.remark = this.formApprove.reason
             studyFormPlan_fhjj(this.formApprove).then(response => {
               this.openApprove = false
-              this.$modal.closeLoading()
               this.$emit('close')
+              this.open = false
             }).finally(() => {
               this.$modal.closeLoading()
             })

src/views/business/study/comp/jhbd/Sy.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -108,6 +108,7 @@ export default {
   components: { TemplateTable, JcgjList },
   data() {
     return {
+      open: false,
       form: {},
       qmxxList: [],
       totalQmxx: 0,
@@ -143,14 +144,12 @@ export default {
   created() {
   },
   methods: {
-
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -165,6 +164,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {}
@@ -179,7 +179,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -196,7 +196,7 @@ export default {
     resetApprove() {
       this.formApprove = {
         id: null,
-        qmyy:this.$t('page.business.study.studyFormPlan.ysy'),
+        qmyy: this.$t('page.business.study.studyFormPlan.ysy'),
         remark: '',
         qmrmm: '',
       }
@@ -208,8 +208,8 @@ export default {
           this.$modal.loading()
           studyFormPlan_sy(this.formApprove).then(response => {
             this.openApprove = false
-            this.$modal.closeLoading()
             this.$emit('close')
+            this.open = false
           }).finally(() => {
             this.$modal.closeLoading()
           })

src/views/business/study/comp/jhbd/Xq.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -115,7 +115,6 @@ export default {
       this.$modal.loading()
       studyFormPlan_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx, lang: this.$store.getters.language.split("_")[0] })).then(response => {
         window.open(process.env.VUE_APP_FILE_DOMAIN + response.msg)
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -126,7 +125,6 @@ export default {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -141,6 +139,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {
@@ -164,7 +163,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })

src/views/business/study/comp/sqbd/Bj.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -75,7 +75,8 @@
           </el-form>
         </div>
         <div class="content" v-if="showIndex == 2">
-          <TemplateTable ref="templateTable" emitName="onApplyCallback" @onApplyCallback="onApplyCallback" :sn="form.templateSn" :templateData="form" fillType="actFill" />
+          <TemplateTable ref="templateTable" emitName="onApplyCallback" @onApplyCallback="onApplyCallback"
+            :sn="form.templateSn" :templateData="form" fillType="actFill" />
         </div>
       </div>
     </div>
@@ -127,12 +128,12 @@
 </template>
 
 <script>
-import { studyFormApply_bc, studyFormApply_tj, studyFormApply_info,studyFormApply_updateBdnr } from "@/api/business/study/studyFormApply"
+import { studyFormApply_bc, studyFormApply_tj, studyFormApply_info, studyFormApply_updateBdnr } from "@/api/business/study/studyFormApply"
 import { mapGetters } from 'vuex'
 import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
-import { deepClone,caesarDecipher } from "@/utils/index";
+import { deepClone, caesarDecipher } from "@/utils/index";
 
 export default {
   name: "Bj",
@@ -189,7 +190,7 @@ export default {
   created() {
   },
   methods: {
-     onApplyCallback(data) {
+    onApplyCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
       if (data.type == 'fieldChanged') {
@@ -241,6 +242,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {
@@ -273,6 +275,7 @@ export default {
           this.form = _.merge({}, this.form, response.data)
           this.templateData = deepClone(this.form)
           this.open = true
+        }).finally(() => {
           this.$modal.closeLoading()
         })
       } else {
@@ -288,7 +291,7 @@ export default {
           this.$modal.loading()
           studyFormApply_bc(this.form).then(response => {
             this.$emit('close')
-            this.$modal.closeLoading()
+            this.open = false
           }).finally(() => {
             this.$modal.closeLoading()
           })
@@ -309,7 +312,7 @@ export default {
         this.$modal.loading()
         studyFormApply_bc(this.form).then(response => {
           this.$emit('close')
-          this.$modal.closeLoading()
+          this.open = false
         }).finally(() => {
           this.$modal.closeLoading()
         })
@@ -322,7 +325,7 @@ export default {
           studyFormApply_tj(this.form).then(response => {
             this.$emit('close')
             this.openSubmit = false
-            this.$modal.closeLoading()
+            this.open = false
           }).finally(() => {
             this.$modal.closeLoading()
           })

src/views/business/study/comp/sqbd/Fh.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -18,7 +18,8 @@
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable"  emitName="onApplyFhCallback" @onApplyFhCallback="onApplyFhCallback" :sn="form.templateSn" :templateData="form" fillType="qc" />
+          <TemplateTable ref="templateTable" emitName="onApplyFhCallback" @onApplyFhCallback="onApplyFhCallback"
+            :sn="form.templateSn" :templateData="form" fillType="qc" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormApply.qmxx') }}</div>
@@ -109,7 +110,7 @@
 </template>
 
 <script>
-import { studyFormApply_updateFhyjjl,studyFormApply_updateZdgxjl,studyFormApply_fhtg, studyFormApply_fhjj, studyFormApply_info, studyFormApply_jcgj, studyFormApply_qmxx } from "@/api/business/study/studyFormApply"
+import { studyFormApply_updateFhyjjl, studyFormApply_updateZdgxjl, studyFormApply_fhtg, studyFormApply_fhjj, studyFormApply_info, studyFormApply_jcgj, studyFormApply_qmxx } from "@/api/business/study/studyFormApply"
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -122,6 +123,7 @@ export default {
       form: {},
       qmxxList: [],
       totalQmxx: 0,
+      open: false,
       loadingQmxx: true,
       queryParamsQmxx: {
         formId: null,
@@ -160,7 +162,7 @@ export default {
   created() {
   },
   methods: {
-     onApplyFhCallback(data) {
+    onApplyFhCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
       if (data.type == 'checkbox') {
@@ -205,6 +207,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {}
@@ -219,7 +222,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -234,10 +237,10 @@ export default {
         this.formApprove.qmyy = qmyy
         if (qmyy == '复核通过') {
           this.openTitle = 'page.business.study.studyFormApply.fhtg'
-        this.formApprove.qmyyMc = this.$t('page.business.study.studyFormApply.fhtg')
+          this.formApprove.qmyyMc = this.$t('page.business.study.studyFormApply.fhtg')
         } else if (qmyy == '复核拒绝') {
           this.openTitle = 'page.business.study.studyFormApply.fhjj'
-        this.formApprove.qmyyMc = this.$t('page.business.study.studyFormApply.fhjj')
+          this.formApprove.qmyyMc = this.$t('page.business.study.studyFormApply.fhjj')
         }
       }
     },
@@ -260,8 +263,8 @@ export default {
           if (this.formApprove.qmyy == '复核通过') {
             studyFormApply_fhtg(this.formApprove).then(response => {
               this.openApprove = false
-              this.$modal.closeLoading()
               this.$emit('close')
+              this.open = false
             }).finally(() => {
               this.$modal.closeLoading()
             })
@@ -269,8 +272,8 @@ export default {
             this.formApprove.remark = this.formApprove.reason
             studyFormApply_fhjj(this.formApprove).then(response => {
               this.openApprove = false
-              this.$modal.closeLoading()
               this.$emit('close')
+              this.open = false
             }).finally(() => {
               this.$modal.closeLoading()
             })

src/views/business/study/comp/sqbd/Sh.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -122,6 +122,7 @@ export default {
       form: {},
       qmxxList: [],
       totalQmxx: 0,
+      open: true,
       loadingQmxx: true,
       queryParamsQmxx: {
         formId: null,
@@ -154,7 +155,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -167,7 +168,6 @@ export default {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -182,6 +182,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {}
@@ -196,7 +197,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -233,8 +234,8 @@ export default {
           if (this.formApprove.qmyy == '审核通过') {
             studyFormApply_shtg(this.formApprove).then(response => {
               this.openApprove = false
-              this.$modal.closeLoading()
               this.$emit('close')
+              this.open = false
             }).finally(() => {
               this.$modal.closeLoading()
             })
@@ -242,8 +243,8 @@ export default {
             this.formApprove.remark = this.formApprove.reason
             studyFormApply_shjj(this.formApprove).then(response => {
               this.openApprove = false
-              this.$modal.closeLoading()
               this.$emit('close')
+              this.open = false
             }).finally(() => {
               this.$modal.closeLoading()
             })

src/views/business/study/comp/sqbd/Sy.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -111,6 +111,7 @@ export default {
       form: {},
       qmxxList: [],
       totalQmxx: 0,
+      open: true,
       loadingQmxx: true,
       queryParamsQmxx: {
         formId: null,
@@ -149,7 +150,6 @@ export default {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -164,6 +164,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {}
@@ -178,7 +179,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -195,7 +196,7 @@ export default {
     resetApprove() {
       this.formApprove = {
         id: null,
-        qmyy:  this.$t('page.business.study.studyFormApply.ysy'),
+        qmyy: this.$t('page.business.study.studyFormApply.ysy'),
         remark: '',
         bdnr: '',
         qmrmm: '',
@@ -208,8 +209,8 @@ export default {
           this.$modal.loading()
           studyFormApply_sy(this.formApprove).then(response => {
             this.openApprove = false
-            this.$modal.closeLoading()
             this.$emit('close')
+            this.open = false
           }).finally(() => {
             this.$modal.closeLoading()
           })

src/views/business/study/comp/sqbd/Xq.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -123,6 +123,7 @@ export default {
   data() {
     return {
       openApprove: false,
+      open: false,
       formApprove: {
         id: null,
         qmyy: $t('page.business.study.studyFormApply.cjjl'),
@@ -207,6 +208,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {
@@ -231,7 +233,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -241,9 +243,9 @@ export default {
         if (valid) {
           this.$modal.loading()
           studyFormApply_tb(this.formApprove).then(response => {
-            this.$emit('close')
             this.openApprove = false
-            this.$modal.closeLoading()
+            this.$emit('close')
+            this.open = false
           }).finally(() => {
             this.$modal.closeLoading()
           })

src/views/business/study/comp/tbbd/Bj.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" >
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -238,7 +238,6 @@ export default {
   components: { SelectTemplate, SelectDeptUser, TemplateTable, BusinessSelect },
   data() {
     return {
-      open: false,
       showIndex: 1,
       form: {},
       rules: {

src/views/business/study/comp/tbbd/Fh.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -20,8 +20,8 @@
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable emitName="onFillFhCallback" @onFillFhCallback="onFillFhCallback" ref="templateTable" :sn="form.templateSn"
-            :templateData="form" fillType="qc" />
+          <TemplateTable emitName="onFillFhCallback" @onFillFhCallback="onFillFhCallback" ref="templateTable"
+            :sn="form.templateSn" :templateData="form" fillType="qc" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>
@@ -122,6 +122,7 @@ export default {
   data() {
     return {
       form: {},
+      open: false,
       qmxxList: [],
       totalQmxx: 0,
       loadingQmxx: true,
@@ -193,7 +194,6 @@ export default {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -208,6 +208,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {}
@@ -222,7 +223,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -266,8 +267,8 @@ export default {
           if (this.formApprove.qmyy == '复核通过') {
             studyFormFill_fhtg(this.formApprove).then(response => {
               this.openApprove = false
-              this.$modal.closeLoading()
               this.$emit('close')
+              this.open = false
             }).finally(() => {
               this.$modal.closeLoading()
             })
@@ -275,16 +276,16 @@ export default {
             this.formApprove.remark = this.formApprove.reason
             studyFormFill_fhjj(this.formApprove).then(response => {
               this.openApprove = false
-              this.$modal.closeLoading()
               this.$emit('close')
+              this.open = false
             }).finally(() => {
               this.$modal.closeLoading()
             })
           } else {
             studyFormFill_tg(this.formApprove).then(response => {
               this.openApprove = false
-              this.$modal.closeLoading()
               this.$emit('close')
+              this.open = false
             }).finally(() => {
               this.$modal.closeLoading()
             })

src/views/business/study/comp/tbbd/Sy.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -111,6 +111,7 @@ export default {
       form: {},
       qmxxList: [],
       totalQmxx: 0,
+      open: false,
       loadingQmxx: true,
       queryParamsQmxx: {
         formId: null,
@@ -149,7 +150,6 @@ export default {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -164,6 +164,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {}
@@ -178,7 +179,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -195,7 +196,7 @@ export default {
     resetApprove() {
       this.formApprove = {
         id: null,
-        qmyy:  this.$t('page.business.study.studyFormFill.ysy'),
+        qmyy: this.$t('page.business.study.studyFormFill.ysy'),
         remark: '',
         qmrmm: '',
       }
@@ -207,8 +208,8 @@ export default {
           this.$modal.loading()
           studyFormFill_sy(this.formApprove).then(response => {
             this.openApprove = false
-            this.$modal.closeLoading()
             this.$emit('close')
+            this.open = false
           }).finally(() => {
             this.$modal.closeLoading()
           })

src/views/business/study/comp/tbbd/Xq.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -179,7 +179,6 @@ export default {
       this.$modal.loading()
       studyFormFill_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx, lang: this.$store.getters.language.split("_")[0] })).then(response => {
         window.open(process.env.VUE_APP_FILE_DOMAIN + response.msg)
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -205,7 +204,6 @@ export default {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -220,6 +218,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {
@@ -237,7 +236,6 @@ export default {
     show(row) {
       this.reset()
       this.$modal.loading()
-      debugger
       this.formApprove.id = row.id
       this.queryParamsJcgj.formId = row.id
       this.queryParamsQmxx.formId = row.id
@@ -245,7 +243,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -255,9 +253,9 @@ export default {
         if (valid) {
           this.$modal.loading()
           studyFormFill_tb(this.formApprove).then(response => {
-            this.$emit('close')
             this.openApprove = false
-            this.$modal.closeLoading()
+            this.$emit('close')
+            this.open = false
           }).finally(() => {
             this.$modal.closeLoading()
           })

src/views/business/study/comp/ytbd/Bj.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -152,6 +152,7 @@ export default {
     return {
       showIndex: 1,
       form: {},
+      open: false,
       openSubmit: false,
       rulesApprove: {
         qmrmm: [{
@@ -236,6 +237,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {
@@ -266,6 +268,7 @@ export default {
           this.form = _.merge({}, response.data, { permitForSecectUser: row.permitForSecectUser })
           this.form.qmyy = this.$t('page.business.study.studyFormPre.zztjyzbd')
           this.templateData = deepClone(this.form)
+          this.open = true
           this.$modal.closeLoading()
         }).finally(() => {
           this.$modal.closeLoading()
@@ -274,6 +277,7 @@ export default {
         this.showIndex = 1
         this.form = _.merge({}, this.form, row)
         this.templateData = deepClone(this.form)
+        this.open = true
       }
     },
     save() {
@@ -282,6 +286,7 @@ export default {
           this.$modal.loading()
           studyFormPre_bc(this.form).then(response => {
             this.$emit('close')
+            this.open = false
             this.$modal.closeLoading()
           }).finally(() => {
             this.$modal.closeLoading()
@@ -296,6 +301,7 @@ export default {
         this.$modal.loading()
         studyFormPre_bc(this.form).then(response => {
           this.$emit('close')
+          this.open = false
           this.$modal.closeLoading()
         }).finally(() => {
           this.$modal.closeLoading()
@@ -315,6 +321,7 @@ export default {
           this.$modal.loading()
           studyFormPre_tj(this.form).then(response => {
             this.$emit('close')
+            this.open = false
             this.openSubmit = false
             this.$modal.closeLoading()
           }).finally(() => {

src/views/business/study/comp/ytbd/Sh.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -12,7 +12,7 @@
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
           <el-button type="danger" @click="showReject">{{ $t('page.business.study.studyFormPre.reject') }}</el-button>
           <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormPre.approve')
-            }}</el-button>
+          }}</el-button>
         </div>
       </div>
       <div class="edit-content ">
@@ -122,6 +122,7 @@ export default {
   data() {
     return {
       showIndex: 1,
+      open: false,
       form: {},
       rules: {
         bdmc: [{
@@ -173,7 +174,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -181,6 +182,7 @@ export default {
   methods: {
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {
@@ -215,6 +217,7 @@ export default {
             this.openApprove = false
             this.$modal.closeLoading()
             this.$emit('close')
+            this.open = false
           }).finally(() => {
             this.$modal.closeLoading()
           })
@@ -233,6 +236,7 @@ export default {
             this.openReject = false
             this.$modal.closeLoading()
             this.$emit('close')
+            this.open = false
           }).finally(() => {
             this.$modal.closeLoading()
           })

src/views/business/study/comp/ytbd/Xq.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container">
+    <div class="edit-container" v-if="open">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -115,6 +115,7 @@ export default {
     return {
       isMatchSubject: false,
       openApprove: false,
+      open: false,
       formApprove: {
         id: null,
         qmyy: this.$t('page.business.study.studyFormPre.cjjl'),
@@ -194,6 +195,7 @@ export default {
     },
     cancel() {
       this.$emit('close')
+      this.open = false
     },
     reset() {
       this.form = {
@@ -221,6 +223,7 @@ export default {
         this.getQmxxList()
         this.getJjcgjList()
         this.getIsMatchSubject()
+        this.open = true
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -244,6 +247,7 @@ export default {
               this.$tab.openPage(response.data.bdmc, '/drug/formFillBj/' + params)
             }
             this.$emit('close')
+            this.open = false
             this.openApprove = false
             this.$modal.closeLoading()
           }).finally(() => {