diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue index b281107..800f916 100644 --- a/src/components/InfoForm/index.vue +++ b/src/components/InfoForm/index.vue @@ -288,6 +288,19 @@ + + + + {{ + v.fullName + }} + + + @@ -347,6 +360,7 @@ export default { systemIconModel: '', MAU: '', followerCount: 0, + externalAssistanceId: '', }, infoRules: { systemName: { @@ -392,6 +406,7 @@ export default { systemTypeOptions: [], systemClassOptions: [], specialRecordTypeOption: [], + communicationOutOptions: [], areaOptions: [], btnLoading: false, isFilings: false, @@ -466,6 +481,7 @@ export default { this.infoForm_loading = true; await this.initCompanyList(); await this.initSystemTypeList(); + await this.initCommunicationOutOptions(); await this.initAreaTypeList(); await this.initSpecialRecordTypeOption(); this.type == "edit" && (await this.initForm()); diff --git a/src/mixins/info.js b/src/mixins/info.js index 15898b4..0c7f1cd 100644 --- a/src/mixins/info.js +++ b/src/mixins/info.js @@ -7,6 +7,7 @@ export default { systemClassOptions: [], specialRecordTypeOption: [], stateOptions: [], + communicationOutOptions: [], } }, created() {}, @@ -36,6 +37,11 @@ export default { !list && (list = await this.$store.dispatch('getTypeListByCode', 'stateType')); this.stateOptions = list; }, + async initCommunicationOutOptions() { + let list = this.$store.state.meta.externalAssistanceList; + !list && (list = await this.$store.dispatch("getTypeListByCode", "externalAssistance")); + this.communicationOutOptions = list; + }, }, } \ No newline at end of file diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue index e38a39c..d46d169 100644 --- a/src/views/DisposalSuggestions/index.vue +++ b/src/views/DisposalSuggestions/index.vue @@ -58,7 +58,8 @@ - {{ scope.row.stage == '577006641364189019' ? '下发' : '研判'}} + + 研判 处理 详情 diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue index d8f1b1a..a304479 100644 --- a/src/views/baseSystemInfo/DetailForm.vue +++ b/src/views/baseSystemInfo/DetailForm.vue @@ -139,6 +139,18 @@ 无 + + + 所属区域: + {{ dataForm.areaId | dynamicText(areaOptions) }} + + + + + 所属外协: + {{ dataForm.externalAssistanceId ? '外协一' : "--" }} + + @@ -274,7 +286,7 @@ import HandForm from '@/views/baseCaseHandling/Form.vue' // 案件处理 import ReportForm from '@/views/baseInspectionReport/Form.vue' // 案件处理 export default { components: {HandForm, ReportForm}, - props: [], + props: ['areaOptions'], data() { return { loading: false, diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue index e6831f4..35472bc 100644 --- a/src/views/baseSystemInfo/index.vue +++ b/src/views/baseSystemInfo/index.vue @@ -9,61 +9,31 @@ - + - - + + - - + + - + - + @@ -75,14 +45,7 @@ 导出模板 - + 导入 @@ -120,67 +83,31 @@ - + - - + + - - {{ - v.fullName - }} + + {{ v.fullName }} - + - 取 消 确 定 - + - + @@ -314,7 +241,7 @@ export default { search() { this.listQuery = { currentPage: 1, - pageSize: 10, + pageSize: 20, sort: "desc", sidx: "", };
{{ dataForm.areaId | dynamicText(areaOptions) }}
{{ dataForm.externalAssistanceId ? '外协一' : "--" }}