fix:[模板管理]优化

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

@@ -189,7 +189,10 @@ export default {
     },
     getJjcgjList(val) {
       this.$modal.loading()
-      studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+      if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormPlan_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)

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

@@ -145,7 +145,10 @@ export default {
   methods: {
     getJjcgjList(val) {
       this.$modal.loading()
-      studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+        if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormPlan_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)

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

@@ -345,7 +345,10 @@ export default {
     },
     getJjcgjList(val) {
       this.$modal.loading()
-      studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+       if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormPlan_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)

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

@@ -190,7 +190,10 @@ export default {
     },
     getJjcgjList(val) {
       this.$modal.loading()
-      studyFormApply_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+      if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormApply_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)

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

@@ -165,7 +165,10 @@ export default {
 
     getJjcgjList(val) {
       this.$modal.loading()
-      studyFormApply_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+       if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormApply_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)

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

@@ -148,7 +148,10 @@ export default {
   methods: {
     getJjcgjList(val) {
       this.$modal.loading()
-      studyFormApply_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+      if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormApply_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)

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

@@ -346,7 +346,10 @@ export default {
     },
     getJjcgjList(val) {
       this.$modal.loading()
-      studyFormApply_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+      if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormApply_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)

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

@@ -46,7 +46,7 @@
                 <el-form-item :label="bdmbTitle" prop="templateId">
                   <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''"
                     :name="form.templateMc" :studyType="studyType" :studyFormType="studyFormType"
-                    @change="selectTemplateChange" :needPre="1" :selectedDeptId="selectedDeptId"/>
+                    @change="selectTemplateChange" :needPre="1" :selectedDeptId="selectedDeptId" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -174,15 +174,18 @@
               <div>{{ $t('page.business.study.studyFormFill.yltj') }}</div>
               <div style=" display: flex;  flex-wrap: wrap;  gap: 16px;">
                 <div v-for="(item, index) in resource" :key="'r' + index" style=" flex: 0 0 calc(50% - 11px);">
-                  {{ item.bh }}
-                  <el-input type="number" v-model="item.syl" maxlength="50" style="width:150px;">
-                    <template slot="append">
-                      <div style="width: 20px;">
+                  <div style="display: flex;">
+                    <div> {{ item.bh }}</div>
+                    <div>
+                      <el-input type="number" v-model="item.syl" maxlength="50" style="width:100px; margin:0px 0px  0px 5px;" />
+                    </div>
+                    <div>
+                      <div style="width: 70px;">
                         <BusinessSelect v-model="item.syldw" :showMax="false" dictType="business_tjdw">
                         </BusinessSelect>
                       </div>
-                    </template>
-                  </el-input>
+                    </div>
+                  </div>
                 </div>
               </div>
             </el-form-item>
@@ -479,7 +482,7 @@ export default {
       studyType: null,
       studyFormType: null,
       ccwzlist: [],
-      selectedDeptId:null,
+      selectedDeptId: null,
     }
   },
   computed: {
@@ -608,9 +611,9 @@ export default {
               this.templateData = deepClone(this.form)
               const obj = Object.assign({}, this.$route, { title: this.$t('page.business.study.studyFormFill.xzbd') })
               this.$tab.updatePage(obj);
-              let name=this.studyType==1?'试验':(this.studyType==5?'非试验表单':'麻精药表单')
-              let nameEn=this.studyType==1?'Study':(this.studyType==5?'Non-study':'ontrolled Drug')
-              this.saveSimpleLog({jcmc:'填报表单新增',jcmcEn:'Record Create',name:name,nameEn:nameEn})
+              let name = this.studyType == 1 ? '试验' : (this.studyType == 5 ? '非试验表单' : '麻精药表单')
+              let nameEn = this.studyType == 1 ? 'Study' : (this.studyType == 5 ? 'Non-study' : 'ontrolled Drug')
+              this.saveSimpleLog({ jcmc: '填报表单新增', jcmcEn: 'Record Create', name: name, nameEn: nameEn })
               this.$modal.closeLoading()
             })
           }

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

@@ -191,7 +191,10 @@ export default {
     },
     getJjcgjList(val) {
       this.$modal.loading()
-      studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+      if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormFill_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)

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

@@ -147,7 +147,10 @@ export default {
   methods: {
     getJjcgjList(val) {
       this.$modal.loading()
-      studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+      if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormFill_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)

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

@@ -352,7 +352,10 @@ export default {
     },
     getJjcgjList(val) {
       this.$modal.loading()
-      studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+      if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormFill_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)

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

@@ -182,10 +182,16 @@ export default {
       })
     },
     getJjcgjList(val) {
-      studyFormPre_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+      this.$modal.loading()
+      if(val){
+        this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val)
+      }
+      studyFormPre_jcgj(this.queryParamsJcgj).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     getQmxxList() {