fix:[填报表单]致命bug

src/views/business/comps/select/SelectTemplate.vue

@@ -37,7 +37,7 @@ export default {
       type: Number,
       default: null
     },
-    studySubjectId: {
+    selectedDeptId: {
       type: Number,
       default: null
     },
@@ -69,7 +69,7 @@ export default {
   methods: {
     showSelectTemplate(){
       if(!this.disabled){
-        this.$refs.selectTemplateDialog.show({needPre:this.needPre,studyType:this.studyType,studyFormType:this.studyFormType,studySubjectId:this.studySubjectId})
+        this.$refs.selectTemplateDialog.show({needPre:this.needPre,studyType:this.studyType,studyFormType:this.studyFormType,selectedDeptId:this.selectedDeptId})
       }
     },
     handleChange(obj) {

src/views/business/comps/select/SelectTemplateDialog.vue

@@ -81,7 +81,7 @@ export default {
       this.selectedId = row.id
     },
     show(val) {
-      this.searchForm.deptId=val.studySubjectId
+      this.searchForm.deptId=val.selectedDeptId
       this.searchForm = _.merge({}, this.searchForm, val)
       this.selectedId = null
       this.search()

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

@@ -42,7 +42,7 @@
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
                   <SelectTemplate v-model="form.templateId" :studyType="studyType" :studyFormType="studyFormType"  :needPre="1" :name="form.templateMc"
-                    @change="selectTemplateChange" :studySubjectId="-1"/>
+                    @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
             </el-row>

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

@@ -42,7 +42,7 @@
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
                   <SelectTemplate v-model="form.templateId" :studyType="studyType" :studyFormType="studyFormType"  :name="form.templateMc"
-                    @change="selectTemplateChange" :studySubjectId="-1"/>
+                    @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
             </el-row>

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" :studySubjectId="studySubjectId"/>
+                    @change="selectTemplateChange" :needPre="1" :selectedDeptId="selectedDeptId"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -479,7 +479,7 @@ export default {
       studyType: null,
       studyFormType: null,
       ccwzlist: [],
-      studySubjectId:null,
+      selectedDeptId:null,
     }
   },
   computed: {
@@ -577,7 +577,7 @@ export default {
           params = JSON.parse(caesarDecipher(this.$route.params.key))
           this.studyType = params.studyType || null
           this.studyFormType = params.studyFormType || null
-          this.studySubjectId = params.studySubjectId || null
+          this.selectedDeptId = params.selectedDeptId || null
         } catch (e) {
           console.log('参数错误')
         }

src/views/business/study/comp/tbbdList.vue

@@ -203,7 +203,13 @@ export default {
       default: () => {
         return {}
       }
-    }
+    },
+    selectedDeptId:{
+      type:[Number,String],
+      default:()=>{
+        return null
+      }
+    },
   },
   computed: {
     ...mapGetters([
@@ -426,6 +432,7 @@ export default {
             studyId: this.searchForm.studyId,
             studyType: 1,
             studyFormType:5,
+            selectedDeptId:this.selectedDeptId,
             id: null
           }))
           this.$tab.openPage(this.$t('page.business.study.studyFormFill.xzbd'), '/study/formFillBj/' + params)
@@ -448,6 +455,7 @@ export default {
             studyId: this.searchForm.studyId,
             studyType: 1,
             studyFormType:5,
+            selectedDeptId:this.selectedDeptId,
             formId: row.id
           }))
           this.$tab.openPage(row.bdmc, '/study/formFillBj/' + params)

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

@@ -42,7 +42,7 @@
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
                   <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''" :needPre="10"
-                    :name="form.templateMc" :studyType="studyType" :studySubjectId="studySubjectId"  :studyFormType="studyFormType" @change="selectTemplateChange" />
+                    :name="form.templateMc" :studyType="studyType" :selectedDeptId="selectedDeptId"  :studyFormType="studyFormType" @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -155,7 +155,7 @@ export default {
       open: false,
       openSubmit: false,
       permitForSecectUser: '',
-      studySubjectId:null,
+      selectedDeptId:null,
       rulesApprove: {
         qmrmm: [{
           required: true,
@@ -268,7 +268,7 @@ export default {
       this.permitForSecectUser = row.permitForSecectUser
       this.studyType = row.studyType||null
       this.studyFormType = row.studyFormType||null
-      this.studySubjectId=row.studySubjectId||null
+      this.selectedDeptId=row.selectedDeptId||null
       if (row && row.id) {
         this.showIndex = 2
         this.$modal.loading()

src/views/business/study/comp/ytbdList.vue

@@ -215,7 +215,13 @@ export default {
       default: () => {
         return {}
       }
-    }
+    },
+    selectedDeptId:{
+      type:[Number,String],
+      default:()=>{
+        return null
+      }
+    },
   },
   computed: {
     ...mapGetters([
@@ -439,6 +445,7 @@ export default {
         studySn: this.searchForm.studySn,
         studyMc: this.searchForm.studyMc,
         studyId: this.searchForm.studyId,
+        selectedDeptId:this.selectedDeptId,
         studyType: 1,
         studySubjectId: this.searchForm.studySubjectId,
         permitForSecectUser: 'business:studyFormPre:sh'
@@ -446,7 +453,7 @@ export default {
     },
     edit(row) {
       this.$modal.loading()
-      studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => {
+      studyMethod_getReadAllMethodStatus({ selectedDeptId:this.selectedDeptId,userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => {
         if (response.data.toUrl) {
           this.toRead(response.data)
         } else {