Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/components/Pagination/index.vue

@@ -31,12 +31,12 @@ export default {
     },
     limit: {
       type: Number,
-      default: 20
+      default: 5
     },
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [5,10, 20, 30, 50]
       }
     },
     // 移动端页码按钮的数量端默认值5

src/views/business/resource/mjy/comps/mjy/Xq.vue

@@ -136,7 +136,7 @@
           </div>
           <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
-          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+          <pagination v-show="jcgjTotal > 0" :total="jcgjTotal"
             @pagination="getJjcgjList" />
         </div>
       </div>
@@ -168,7 +168,7 @@ export default {
       queryJcgjParams: {
         pageNum: 1,
         mjyId: null,
-        pageSize: 10,
+        pageSize: 5,
       }
     }
   },

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

@@ -41,8 +41,8 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
-                  <SelectTemplate v-model="form.templateId" :disabled="true" :needPre="1"
-                    :name="form.templateMc" @change="selectTemplateChange" />
+                  <SelectTemplate v-model="form.templateId" :disabled="true" :needPre="1" :name="form.templateMc"
+                    @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -70,12 +70,12 @@
       </div>
     </div>
 
-   
+
     <el-dialog :title="$t('page.business.study.studyFormPlan.tjjl')" :visible.sync="openSubmit" width="500px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formSubmit" :model="form" :rules="rulesApprove" label-width="120px">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
-          <el-row>
+        <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPlan.shryId')" prop="fshryId">
               <SelectDeptUser v-model="form.fshryId" :name="form.fhryMc" key="shryId" @change="selectDeptUserChange" />
@@ -174,7 +174,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -251,39 +251,37 @@ export default {
     },
     async saveNext() {
       let content = await this.$refs.templateTable.getFormData()
-      this.form.bdnr = JSON.stringify(content)
-      this.$modal.loading()
-      studyFormPlan_bc(this.form).then(response => {
-        this.$emit('close')
-        this.$modal.closeLoading()
-      }).finally(() => {
-        this.$modal.closeLoading()
-      })
+      if (content) {
+        this.form.bdnr = JSON.stringify(content)
+        this.$modal.loading()
+        studyFormPlan_bc(this.form).then(response => {
+          this.$emit('close')
+          this.$modal.closeLoading()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      }
     },
     tj() {
       this.$refs["formSubmit"].validate(valid => {
         if (valid) {
-          this.dotj()
+          this.$modal.loading()
+          studyFormPlan_tj(this.form).then(response => {
+            this.$emit('close')
+            this.openSubmit = false
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
     },
-     async showtijiao() {
+    async showtijiao() {
       let content = await this.$refs.templateTable.getFormData()
       if (content) {
-      this.openSubmit = true
+        this.form.bdnr = JSON.stringify(content)
+        this.openSubmit = true
       }
-    },
-    async dotj() {
-      let content = await this.$refs.templateTable.getFormData()
-      this.form.bdnr = JSON.stringify(content)
-      this.$modal.loading()
-      studyFormPlan_tj(this.form).then(response => {
-        this.$emit('close')
-        this.openSubmit = false
-        this.$modal.closeLoading()
-      }).finally(() => {
-        this.$modal.closeLoading()
-      })
     }
   }
 }

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

@@ -18,7 +18,7 @@
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="actFill" :templateData="form"/>
+          <TemplateTable ref="templateTable" :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 +109,7 @@
 </template>
 
 <script>
-import { studyFormPlan_fhtg, studyFormPlan_fhjj,  studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
+import { 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';
@@ -154,13 +154,13 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
   },
   methods: {
-   
+
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
@@ -201,16 +201,21 @@ export default {
         this.$modal.closeLoading()
       })
     },
-    showApprove(qmyy) {
-      this.openApprove = true
-      this.resetApprove()
-      this.formApprove.id = this.form.id
-      this.formApprove.qmyy = qmyy
-      if (qmyy == '复核通过') {
-        this.openTitle = 'page.business.study.studyFormPlan.fhtg'
-      } else if (qmyy == '复核拒绝') {
-        this.openTitle = 'page.business.study.studyFormPlan.fhjj'
-      } 
+    async showApprove(qmyy) {
+      let content = await this.$refs.templateTable.getFormData()
+      if (content) {
+        this.openApprove = true
+        this.resetApprove()
+        this.formApprove.bdnr = JSON.stringify(content)
+        this.formApprove.id = this.form.id
+        this.formApprove.qmyy = qmyy
+        if (qmyy == '复核通过') {
+          this.openTitle = 'page.business.study.studyFormPlan.fhtg'
+        } else if (qmyy == '复核拒绝') {
+          this.openTitle = 'page.business.study.studyFormPlan.fhjj'
+        }
+      }
+
     },
     resetApprove() {
       this.resetForm("formApprove")
@@ -226,32 +231,27 @@ export default {
     approve() {
       this.$refs["formApprove"].validate(valid => {
         if (valid) {
-          this.doapprove()
+          this.$modal.loading()
+          if (this.formApprove.qmyy == '复核通过') {
+            studyFormPlan_fhtg(this.formApprove).then(response => {
+              this.openApprove = false
+              this.$modal.closeLoading()
+              this.$emit('close')
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          } else if (this.formApprove.qmyy == '复核拒绝') {
+            this.formApprove.remark = this.formApprove.reason
+            studyFormPlan_fhjj(this.formApprove).then(response => {
+              this.openApprove = false
+              this.$modal.closeLoading()
+              this.$emit('close')
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          }
         }
       })
-    },
-    async doapprove() {
-      let content = await this.$refs.templateTable.getFormData()
-      this.formApprove.bdnr = JSON.stringify(content)
-      this.$modal.loading()
-      if (this.formApprove.qmyy == '复核通过') {
-        studyFormPlan_fhtg(this.formApprove).then(response => {
-          this.openApprove = false
-          this.$modal.closeLoading()
-          this.$emit('close')
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      } else if (this.formApprove.qmyy == '复核拒绝') {
-        this.formApprove.remark=this.formApprove.reason
-        studyFormPlan_fhjj(this.formApprove).then(response => {
-          this.openApprove = false
-          this.$modal.closeLoading()
-          this.$emit('close')
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      } 
     }
   }
 }

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

@@ -16,7 +16,7 @@
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="actFill" :templateData="form" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="review" :templateData="form" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>
@@ -137,7 +137,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -184,12 +184,13 @@ export default {
         this.$modal.closeLoading()
       })
     },
-   async showApprove() {
+    async showApprove() {
       let content = await this.$refs.templateTable.getFormData()
       if (content) {
+        this.openApprove = true
         this.resetApprove()
+        this.formApprove.bdnr = JSON.stringify(content)
         this.formApprove.id = this.form.id
-        this.openApprove = true
       }
     },
     resetApprove() {
@@ -204,21 +205,16 @@ export default {
     approve() {
       this.$refs["formApprove"].validate(valid => {
         if (valid) {
-          this.doapprove()
+          this.$modal.loading()
+          studyFormPlan_sy(this.formApprove).then(response => {
+            this.openApprove = false
+            this.$modal.closeLoading()
+            this.$emit('close')
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
-    },
-     async doapprove() {
-      let content = await this.$refs.templateTable.getFormData()
-      this.formApprove.bdnr = JSON.stringify(content)
-      this.$modal.loading()
-      studyFormPlan_sy(this.formApprove).then(response => {
-        this.openApprove = false
-        this.$modal.closeLoading()
-        this.$emit('close')
-      }).finally(() => {
-        this.$modal.closeLoading()
-      })
     }
   }
 }

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

@@ -26,7 +26,7 @@
             <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormPlan.dcbhsjgj') }}
             </el-button>
           </div>
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="actFill" :templateData="form"/>
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="audit" :templateData="form"/>
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>

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

@@ -41,8 +41,8 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
-                  <SelectTemplate v-model="form.templateId" :disabled="true"
-                    :name="form.templateMc" @change="selectTemplateChange" />
+                  <SelectTemplate v-model="form.templateId" :disabled="true" :name="form.templateMc"
+                    @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -181,7 +181,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -260,6 +260,7 @@ export default {
     async showtijjiao() {
       let content = await this.$refs.templateTable.getFormData()
       if (content) {
+        this.form.bdnr = JSON.stringify(content)
         this.openSubmit = true
       }
     },
@@ -279,23 +280,16 @@ export default {
     tj() {
       this.$refs["formSubmit"].validate(valid => {
         if (valid) {
-          this.dotj()
+          this.$modal.loading()
+          studyFormApply_tj(this.form).then(response => {
+            this.$emit('close')
+            this.openSubmit = false
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
-    },
-    async dotj() {
-      let content = await this.$refs.templateTable.getFormData()
-      if (content) {
-        this.form.bdnr = JSON.stringify(content)
-        this.$modal.loading()
-        studyFormApply_tj(this.form).then(response => {
-          this.$emit('close')
-          this.openSubmit = false
-          this.$modal.closeLoading()
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }
     }
   }
 }

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

@@ -18,7 +18,7 @@
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="readonly" />
+          <TemplateTable ref="templateTable" :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>
@@ -154,13 +154,12 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
   },
   methods: {
-
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormApply_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
@@ -201,15 +200,19 @@ export default {
         this.$modal.closeLoading()
       })
     },
-    showApprove(qmyy) {
-      this.openApprove = true
-      this.resetApprove()
-      this.formApprove.id = this.form.id
-      this.formApprove.qmyy = qmyy
-      if (qmyy == '复核通过') {
-        this.openTitle = 'page.business.study.studyFormApply.fhtg'
-      } else if (qmyy == '复核拒绝') {
-        this.openTitle = 'page.business.study.studyFormApply.fhjj'
+    async showApprove(qmyy) {
+      let content = await this.$refs.templateTable.getFormData()
+      if (content) {
+        this.openApprove = true
+        this.resetApprove()
+        this.formApprove.bdnr = JSON.stringify(content)
+        this.formApprove.id = this.form.id
+        this.formApprove.qmyy = qmyy
+        if (qmyy == '复核通过') {
+          this.openTitle = 'page.business.study.studyFormApply.fhtg'
+        } else if (qmyy == '复核拒绝') {
+          this.openTitle = 'page.business.study.studyFormApply.fhjj'
+        }
       }
     },
     resetApprove() {
@@ -226,34 +229,27 @@ export default {
     approve() {
       this.$refs["formApprove"].validate(valid => {
         if (valid) {
-          this.doapprove()
+          this.$modal.loading()
+          if (this.formApprove.qmyy == '复核通过') {
+            studyFormApply_fhtg(this.formApprove).then(response => {
+              this.openApprove = false
+              this.$modal.closeLoading()
+              this.$emit('close')
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          } else if (this.formApprove.qmyy == '复核拒绝') {
+            this.formApprove.remark = this.formApprove.reason
+            studyFormApply_fhjj(this.formApprove).then(response => {
+              this.openApprove = false
+              this.$modal.closeLoading()
+              this.$emit('close')
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          }
         }
       })
-    },
-    async doapprove() {
-      let content = await this.$refs.templateTable.getFormData()
-      if (content) {
-        this.formApprove.bdnr = JSON.stringify(content)
-        this.$modal.loading()
-        if (this.formApprove.qmyy == '复核通过') {
-          studyFormApply_fhtg(this.formApprove).then(response => {
-            this.openApprove = false
-            this.$modal.closeLoading()
-            this.$emit('close')
-          }).finally(() => {
-            this.$modal.closeLoading()
-          })
-        } else if (this.formApprove.qmyy == '复核拒绝') {
-          this.formApprove.remark = this.formApprove.reason
-          studyFormApply_fhjj(this.formApprove).then(response => {
-            this.openApprove = false
-            this.$modal.closeLoading()
-            this.$emit('close')
-          }).finally(() => {
-            this.$modal.closeLoading()
-          })
-        }
-      }
     }
   }
 }

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

@@ -18,7 +18,7 @@
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="readonly" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="audit" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormApply.qmxx') }}</div>

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

@@ -16,7 +16,7 @@
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="readonly" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="review" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormApply.qmxx') }}</div>
@@ -137,13 +137,12 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
   },
   methods: {
-
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormApply_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
@@ -187,9 +186,10 @@ export default {
     async showApprove() {
       let content = await this.$refs.templateTable.getFormData()
       if (content) {
+        this.openApprove = true
         this.resetApprove()
+        this.formApprove.bdnr = JSON.stringify(content)
         this.formApprove.id = this.form.id
-        this.openApprove = true
       }
     },
     resetApprove() {
@@ -205,23 +205,16 @@ export default {
     approve() {
       this.$refs["formApprove"].validate(valid => {
         if (valid) {
-          this.doapprove()
+          this.$modal.loading()
+          studyFormApply_sy(this.formApprove).then(response => {
+            this.openApprove = false
+            this.$modal.closeLoading()
+            this.$emit('close')
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
-    },
-    async doapprove() {
-      let content = await this.$refs.templateTable.getFormData()
-      if (content) {
-        this.formApprove.bdnr = JSON.stringify(content)
-        this.$modal.loading()
-        studyFormApply_sy(this.formApprove).then(response => {
-          this.openApprove = false
-          this.$modal.closeLoading()
-          this.$emit('close')
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }
     }
   }
 }

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

@@ -28,7 +28,7 @@
             <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormApply.dcbhsjgj') }}
             </el-button>
           </div>
-          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="readonly" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="audit" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormApply.qmxx') }}</div>

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

@@ -84,7 +84,7 @@
     <el-dialog :title="$t('page.business.study.studyFormFill.tjjl')" :visible.sync="openApprove" width="1200px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
-       <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <el-row>
           <el-col :psna="24">
             <el-form-item>
@@ -146,6 +146,7 @@
 
 <script>
 import { studyFormFill_bc, studyFormFill_tj, studyFormFill_info } from "@/api/business/study/studyFormFill"
+import { study_info } from "@/api/business/study/study"
 import { mapGetters } from 'vuex'
 import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
@@ -181,7 +182,7 @@ export default {
       },
       openApprove: false,
       formApprove: {},
-      bdmbTitle:this.$t('page.business.form.bdmb'),
+      bdmbTitle: this.$t('page.business.form.bdmb'),
       rulesApprove: {
         qmrmm: [{
           required: true,
@@ -208,7 +209,7 @@ export default {
       if (parseInt(formId) > 0) {
         if (fromYt + '' == "10") {
           this.showIndex = 1
-          this.bdmbTitle=this.$t('page.business.study.studyFormFill.ytbd')
+          this.bdmbTitle = this.$t('page.business.study.studyFormFill.ytbd')
         } else {
           this.showIndex = 2
         }
@@ -220,13 +221,21 @@ export default {
         })
       } else {
         this.showIndex = 1
-        this.form = _.merge({}, this.form, { stydyId: studyId })
+        this.$modal.loading()
+        study_info({ id: studyId }).then(response => {
+          this.form = _.merge({}, this.form, { stydyId: studyId, resourceStudy: response.data.resource })
+          this.$modal.closeLoading()
+        })
       }
     },
-    showApprove() {
-      this.resetApprove()
-      this.formApprove.id = this.form.id
-      this.openApprove = true
+    async showApprove() {
+      let content = await this.$refs.templateTable.getFormData()
+      if (content) {
+        this.form.bdnr = JSON.stringify(content)
+        this.resetApprove()
+        this.formApprove.id = this.form.id
+        this.openApprove = true
+      }
     },
     resetApprove() {
       this.formApprove = {
@@ -274,6 +283,8 @@ export default {
         templateMc: null,
         templateSn: null,
         bdnr: null,
+        resource: null,
+        resourceStudy: null,
         fzrsh: null,
         shryId: null,
         sfbl: null,
@@ -299,33 +310,30 @@ export default {
     },
     async saveNext() {
       let content = await this.$refs.templateTable.getFormData()
-      this.form.bdnr = JSON.stringify(content)
-      this.$modal.loading()
-      studyFormFill_bc(this.form).then(response => {
-        this.$modal.closeLoading()
-        this.cancel()
-      }).finally(() => {
-        this.$modal.closeLoading()
-      })
+      if (content) {
+        this.form.bdnr = JSON.stringify(content)
+        this.$modal.loading()
+        studyFormFill_bc(this.form).then(response => {
+          this.$modal.closeLoading()
+          this.cancel()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      }
     },
     tj() {
       this.$refs["formApprove"].validate(valid => {
         if (valid) {
-          this.dotj()
+          this.$modal.loading()
+          studyFormFill_tj(this.formApprove).then(response => {
+            this.openApprove = false
+            this.$modal.closeLoading()
+            this.cancel()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
-    },
-    async dotj() {
-      let content = await this.$refs.templateTable.getFormData()
-      this.formApprove.bdnr = JSON.stringify(content)
-      this.$modal.loading()
-      studyFormFill_tj(this.formApprove).then(response => {
-        this.openApprove = false
-        this.$modal.closeLoading()
-        this.cancel()
-      }).finally(() => {
-        this.$modal.closeLoading()
-      })
     }
   }
 }

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

@@ -161,7 +161,6 @@ export default {
   created() {
   },
   methods: {
-
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
@@ -202,17 +201,21 @@ export default {
         this.$modal.closeLoading()
       })
     },
-    showApprove(qmyy) {
-      this.openApprove = true
-      this.resetApprove()
-      this.formApprove.id = this.form.id
-      this.formApprove.qmyy = qmyy
-      if (qmyy == '复核通过') {
-        this.openTitle = 'page.business.study.studyFormFill.fhtg'
-      } else if (qmyy == '复核拒绝') {
-        this.openTitle = 'page.business.study.studyFormFill.fhjj'
-      } else if (qmyy == '通过') {
-        this.openTitle = 'page.business.study.studyFormFill.tongguo'
+    async showApprove(qmyy) {
+      let content = await this.$refs.templateTable.getFormData()
+      if (content) {
+        this.openApprove = true
+        this.resetApprove()
+        this.formApprove.id = this.form.id
+        this.formApprove.bdnr = JSON.stringify(content)
+        this.formApprove.qmyy = qmyy
+        if (qmyy == '复核通过') {
+          this.openTitle = 'page.business.study.studyFormFill.fhtg'
+        } else if (qmyy == '复核拒绝') {
+          this.openTitle = 'page.business.study.studyFormFill.fhjj'
+        } else if (qmyy == '通过') {
+          this.openTitle = 'page.business.study.studyFormFill.tongguo'
+        }
       }
     },
     resetApprove() {
@@ -229,40 +232,35 @@ export default {
     approve() {
       this.$refs["formApprove"].validate(valid => {
         if (valid) {
-          this.doapprove()
+          this.$modal.loading()
+          if (this.formApprove.qmyy == '复核通过') {
+            studyFormFill_fhtg(this.formApprove).then(response => {
+              this.openApprove = false
+              this.$modal.closeLoading()
+              this.$emit('close')
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          } else if (this.formApprove.qmyy == '复核拒绝') {
+            this.formApprove.remark = this.formApprove.reason
+            studyFormFill_fhjj(this.formApprove).then(response => {
+              this.openApprove = false
+              this.$modal.closeLoading()
+              this.$emit('close')
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          } else {
+            studyFormFill_tg(this.formApprove).then(response => {
+              this.openApprove = false
+              this.$modal.closeLoading()
+              this.$emit('close')
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          }
         }
       })
-    },
-    async doapprove() {
-      let content = await this.$refs.templateTable.getFormData()
-      this.formApprove.bdnr = JSON.stringify(content)
-      this.$modal.loading()
-      if (this.formApprove.qmyy == '复核通过') {
-        studyFormFill_fhtg(this.formApprove).then(response => {
-          this.openApprove = false
-          this.$modal.closeLoading()
-          this.$emit('close')
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      } else if (this.formApprove.qmyy == '复核拒绝') {
-        this.formApprove.remark = this.formApprove.reason
-        studyFormFill_fhjj(this.formApprove).then(response => {
-          this.openApprove = false
-          this.$modal.closeLoading()
-          this.$emit('close')
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      } else {
-        studyFormFill_tg(this.formApprove).then(response => {
-          this.openApprove = false
-          this.$modal.closeLoading()
-          this.$emit('close')
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }
     }
   }
 }

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

@@ -143,7 +143,6 @@ export default {
   created() {
   },
   methods: {
-
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
@@ -184,10 +183,14 @@ export default {
         this.$modal.closeLoading()
       })
     },
-    showApprove() {
-      this.resetApprove()
-      this.formApprove.id = this.form.id
-      this.openApprove = true
+    async showApprove() {
+      let content = await this.$refs.templateTable.getFormData()
+      if (content) {
+        this.resetApprove()
+        this.formApprove.id = this.form.id
+        this.formApprove.bdnr = JSON.stringify(content)
+        this.openApprove = true
+      }
     },
     resetApprove() {
       this.formApprove = {

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

@@ -28,7 +28,7 @@
             <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormFill.dcbhsjgj') }}
             </el-button>
           </div>
-          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="actFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="audit" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>

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

@@ -65,7 +65,7 @@
           </el-form>
         </div>
         <div class="content" v-if="showIndex == 2">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="preFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="templateData" fillType="preFill" />
         </div>
       </div>
     </div>
@@ -144,7 +144,6 @@ export default {
   components: { SelectTemplate, SelectDeptUser, TemplateTable },
   data() {
     return {
-      open: false,
       showIndex: 1,
       form: {},
       openSubmit: false,
@@ -178,11 +177,12 @@ export default {
         }]
 
       },
+      templateData: {}
     }
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -235,7 +235,6 @@ export default {
         studyFormPre_info({ id: row.id }).then(response => {
           this.form = response.data
           this.form.qmyy = '制作提交预制表单'
-          this.open = true
           this.$modal.closeLoading()
         }).finally(() => {
           this.$modal.closeLoading()
@@ -243,9 +242,8 @@ export default {
       } else {
         this.showIndex = 1
         this.form = _.merge({}, this.form, row)
-        this.open = true
       }
-
+      this.templateData = deepClone(this.form)
     },
     save() {
       this.$refs["form"].validate(valid => {
@@ -276,29 +274,23 @@ export default {
     async showtj() {
       let content = await this.$refs.templateTable.getFormData()
       if (content) {
-      this.openSubmit = true
+        this.form.bdnr = JSON.stringify(content)
+        this.openSubmit = true
       }
     },
     tj() {
       this.$refs["formSubmit"].validate(valid => {
         if (valid) {
-          this.dotj()
+          this.$modal.loading()
+          studyFormPre_tj(this.form).then(response => {
+            this.$emit('close')
+            this.openSubmit = false
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
-    },
-    async dotj() {
-      let content = await this.$refs.templateTable.getFormData()
-      if (content) {
-        this.form.bdnr = JSON.stringify(content)
-        this.$modal.loading()
-        studyFormPre_tj(this.form).then(response => {
-          this.$emit('close')
-          this.openSubmit = false
-          this.$modal.closeLoading()
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }
     }
   }
 }

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

@@ -179,7 +179,6 @@ export default {
   created() {
   },
   methods: {
-   
     cancel() {
       this.$emit('close')
     },

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

@@ -55,6 +55,7 @@
     <el-dialog :title="$t('page.business.study.studyFormPre.cjjl')" :visible.sync="openApprove" width="500px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
+        <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <el-alert :title="$t('page.business.study.studyFormPre.ts')" :closable="false" type="success">
         </el-alert>
         <el-row>
@@ -232,7 +233,13 @@ export default {
             localStorage.setItem(key, JSON.stringify({
               url: this.$route.fullPath
             }))
-            this.$tab.openPage(response.data.bdmc, '/study/formFillBj/' + response.data.id + "/10/" + key+'/'+response.data.studyId)
+            if (this.$route.fullPath.indexOf('/study/') > -1) {
+              this.$tab.openPage(response.data.bdmc, '/study/formFillBj/' + response.data.id + "/10/" + key + '/' + response.data.studyId)
+            } else if (this.$route.fullPath.indexOf('/nonTrial/') > -1) {
+              this.$tab.openPage(response.data.bdmc, '/nonTrial/formFillBj/' + response.data.id + "/10/" + key + '/' + response.data.studyId)
+            } else {
+              this.$tab.openPage(response.data.bdmc, '/drug/formFillBj/' + response.data.id + "/10/" + key + '/' + response.data.studyId)
+            }
             this.$emit('close')
             this.openApprove = false
             this.$modal.closeLoading()