Browse Source

fix:[填报表单]优化

lkf
15881625488@163.com 2 months ago
parent
commit
f2f96e44d8
6 changed files with 15 additions and 6 deletions
  1. +6
    -2
      src/views/business/comps/select/SelectTemplate.vue
  2. +1
    -0
      src/views/business/comps/select/SelectTemplateDialog.vue
  3. +1
    -1
      src/views/business/study/comp/jhbd/Bj.vue
  4. +1
    -1
      src/views/business/study/comp/sqbd/Bj.vue
  5. +3
    -1
      src/views/business/study/comp/tbbd/Bj.vue
  6. +3
    -1
      src/views/business/study/comp/ytbd/Bj.vue

+ 6
- 2
src/views/business/comps/select/SelectTemplate.vue View File

@ -37,6 +37,10 @@ export default {
type: Number, type: Number,
default: null default: null
}, },
studySubjectId: {
type: Number,
default: null
},
}, },
watch: { watch: {
value: { value: {
@ -50,7 +54,7 @@ export default {
handler(v) { handler(v) {
this.selected.name=v || '' this.selected.name=v || ''
} }
},
}
}, },
data() { data() {
return { return {
@ -65,7 +69,7 @@ export default {
methods: { methods: {
showSelectTemplate(){ showSelectTemplate(){
if(!this.disabled){ if(!this.disabled){
this.$refs.selectTemplateDialog.show({needPre:this.needPre,studyType:this.studyType,studyFormType:this.studyFormType})
this.$refs.selectTemplateDialog.show({needPre:this.needPre,studyType:this.studyType,studyFormType:this.studyFormType,studySubjectId:this.studySubjectId})
} }
}, },
handleChange(obj) { handleChange(obj) {

+ 1
- 0
src/views/business/comps/select/SelectTemplateDialog.vue View File

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

+ 1
- 1
src/views/business/study/comp/jhbd/Bj.vue View File

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

+ 1
- 1
src/views/business/study/comp/sqbd/Bj.vue View File

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

+ 3
- 1
src/views/business/study/comp/tbbd/Bj.vue View File

@ -46,7 +46,7 @@
<el-form-item :label="bdmbTitle" prop="templateId"> <el-form-item :label="bdmbTitle" prop="templateId">
<SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''" <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''"
:name="form.templateMc" :studyType="studyType" :studyFormType="studyFormType" :name="form.templateMc" :studyType="studyType" :studyFormType="studyFormType"
@change="selectTemplateChange" :needPre="1" />
@change="selectTemplateChange" :needPre="1" :studySubjectId="studySubjectId"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -479,6 +479,7 @@ export default {
studyType: null, studyType: null,
studyFormType: null, studyFormType: null,
ccwzlist: [], ccwzlist: [],
studySubjectId:null,
} }
}, },
computed: { computed: {
@ -576,6 +577,7 @@ export default {
params = JSON.parse(caesarDecipher(this.$route.params.key)) params = JSON.parse(caesarDecipher(this.$route.params.key))
this.studyType = params.studyType || null this.studyType = params.studyType || null
this.studyFormType = params.studyFormType || null this.studyFormType = params.studyFormType || null
this.studySubjectId = params.studySubjectId || null
} catch (e) { } catch (e) {
console.log('参数错误') console.log('参数错误')
} }

+ 3
- 1
src/views/business/study/comp/ytbd/Bj.vue View File

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

Loading…
Cancel
Save