diff --git a/src/utils/index.js b/src/utils/index.js index c7f7c1c32e0d9a868d400486911040173181521f..dc2d15808b8b3b5c6c2277cc3ed5c262a4561d76 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -489,7 +489,6 @@ export function formatDicList(list, value, connector = ",") { } }) } - console.log('字典', list, value, result) return result } /** diff --git a/src/views/followupresearch/index.vue b/src/views/followupresearch/index.vue index 45ffb40b87f2b52887c2afdd512f07f9ffe12989..37197a301e18ed5402147bc645054948257b5a2d 100644 --- a/src/views/followupresearch/index.vue +++ b/src/views/followupresearch/index.vue @@ -25,6 +25,7 @@ import FormComponents from "@/components/FormComponents" import CustomsTable from "@/components/CustomsTable" import paginationMixin from "@/components/TabComponents/mixin" +import { getCurrentFormByType } from "@/api/coop-group.js" import { getFollowSurvey } from "@/api/followup" import { getDictDetail } from "@/api/dict.js" export default { @@ -35,6 +36,7 @@ export default { mixins: [paginationMixin], data() { return { + formId:"", //随访表单类型 listLoading: false, keyword: "", modifiedFlag: false, @@ -308,6 +310,7 @@ export default { this.formEdit = JSON.parse(sessionStorage.getItem('followResearch-form')) ||{} this.pageSize = Number(sessionStorage.getItem('followResearch-pageSize')) || 1 this.pageIndex = Number(sessionStorage.getItem('followResearch-pageIndex')) || 10 + this.getCurrentFormByType(2) // this.handleSearch() //调试注释 }, methods: { @@ -337,7 +340,9 @@ export default { this.listLoading = true let params={ pageSize:this.pageSize, - pageNum:this.pageIndex + pageNum:this.pageIndex, + formId:this.formId, + patientFrom:sessionStorage.getItem('selectedIndex') //筛查场景 } if(this.formEdit){ params=Object.assign(this.formEdit,params) @@ -385,7 +390,19 @@ export default { // } // } // }) - // } + // }, + //获取随访表单类型 + getCurrentFormByType(type) { + getCurrentFormByType({ + type, + groupId: this.$store.state.user.group.groupId || '', + }) + .then((res) => { + if (res.code === 1) { + this.formId = res.data[0].id + } + }) + }, }, }