diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue index a588356..ce2c03d 100644 --- a/src/components/InfoForm/index.vue +++ b/src/components/InfoForm/index.vue @@ -27,10 +27,10 @@ - + - + - + - + + +
+
区县处理说明
+ {{ dataForm.disposalSuggestions || "--" }} +
+ diff --git a/src/views/DisposalSuggestions/HandleForm.vue b/src/views/DisposalSuggestions/HandleForm.vue new file mode 100644 index 0000000..980c4f9 --- /dev/null +++ b/src/views/DisposalSuggestions/HandleForm.vue @@ -0,0 +1,267 @@ + + + + \ No newline at end of file diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue index 681cb12..c29fce1 100644 --- a/src/views/DisposalSuggestions/index.vue +++ b/src/views/DisposalSuggestions/index.vue @@ -57,7 +57,8 @@ --> @@ -65,6 +66,7 @@ + @@ -74,9 +76,10 @@ import request from '@/utils/request' import infoMixin from "@/mixins/info"; import NCCForm from './Form' + import HandleForm from './HandleForm' import { getListForJudge, previewDataInterface } from '@/api/systemData/dataInterface' export default { - components: { NCCForm }, + components: { NCCForm, HandleForm }, mixins: [infoMixin], data() { return { @@ -115,9 +118,16 @@ questionTypeOptions : [], questionClassOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}], stageOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}], + + HandleFormVisible: false } }, - computed: {}, + computed: { + isSHILevel() { + // 判断角色是否为‘市级办公室’ + return this.$store.state.user.islader; + }, + }, created() { this.initSystemTypeList(); this.initData() @@ -161,8 +171,16 @@ }, refresh(isrRefresh) { this.formVisible = false + this.HandleFormVisible = false if (isrRefresh) this.reset() }, + // 处理 + toHandle(id, isDetail) { + this.HandleFormVisible = true + this.$nextTick(() => { + this.$refs.HandleForm.init(id, isDetail) + }) + }, reset() { for (let key in this.query) { this.query[key] = undefined diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue index dbdabb3..7b0d198 100644 --- a/src/views/baseSystemInfo/index.vue +++ b/src/views/baseSystemInfo/index.vue @@ -99,7 +99,7 @@ - + import request from "@/utils/request"; -import { getInfoList } from "@/api/baseData/info"; +import { getList } from "@/api/baseData/info"; import { applnyChageArea } from "@/api/baseData/info"; import infoMixin from "@/mixins/info"; import InspectionForm from "./InspectForm.vue"; @@ -317,7 +317,7 @@ export default { ...this.listQuery, ...this.query, }; - getInfoList(query).then(({ data }) => { + getList(query).then(({ data }) => { let list = []; data.list.length && data.list.forEach((v) => { diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue index 778f248..0aa5d15 100644 --- a/src/views/overView/Overview.vue +++ b/src/views/overView/Overview.vue @@ -132,7 +132,12 @@ + + + + + @@ -142,10 +147,13 @@ import MsgForm from "./msgForm.vue" import HandleInspectForm from "@/views/baseSystemInfo/HandleInspectForm.vue" import NCCForm from '@/views/baseSpecialAction/dynamicModel/list/Form' import HandForm from '@/views/baseCaseHandling/Form.vue' - +// 研判 +import DisposalForm from "@/views/DisposalSuggestions/Form.vue"; +// 巡查处理 +import DisposalHandleForm from "@/views/DisposalSuggestions/HandleForm.vue"; export default { name: "Overview", - components: { MsgForm, HandleInspectForm, NCCForm, HandForm }, + components: { MsgForm, HandleInspectForm, NCCForm, HandForm, DisposalForm, DisposalHandleForm }, data() { return { todoTableData: [], @@ -177,6 +185,8 @@ export default { HandleInspectFormVisible: false, formVisible: false, HandFormVisible: false, + DisposalHandleFormVisible: false, + DisposalFormVisible: false, }; }, created() { @@ -297,12 +307,7 @@ export default { this.getAllTaskList(); }, async handleTask(row) { - if(row.taskType == '归属地变更') { - this.HandleInspectFormVisible = true; - this.$nextTick(() => { - this.$refs.HandleInspectForm.init(row.taskCorrelationId, true); - }) - } else if(row.taskType == '专项行动') { + if(row.taskType == '专项行动') { this.formVisible = true; // let data = await this.getBaseSpecialActionInfo('588008032122701061'); let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId); @@ -320,13 +325,41 @@ export default { formData = res.data.formData; this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId) }); - } else if(row.taskType == '案件处理') { - this.HandFormVisible = true; + } else { + let type = row.taskType; + if(row.taskType == '核查处理' || row.taskType == '研判') { + let str = row.taskTitle; + type = str.slice(1, str.indexOf('】')); + } + let openObject = this.getDialog(type); + this[openObject.visible] = true; this.$nextTick(() => { - this.$refs.HandForm.init(row.taskCorrelationId, false, 1); + this.$refs[`${openObject.node}`].init(row.taskCorrelationId, true, openObject.isDetail, 1); }) } }, + getDialog(type) { + switch (type) { + case '归属地变更': + return { visible: 'HandleInspectFormVisible', node: 'HandleInspectForm', isDetail: true } + break; + case '专项行动': + + break; + case '案件处理': + case '网信执法': + return { visible: 'HandFormVisible', node: 'HandForm', isDetail: false, type: 1} + break; + case '研判': + return { visible: 'DisposalFormVisible', node: 'DisposalForm', isDetail: false} + break; + case '进一步处置': + return { visible: 'DisposalHandleFormVisible', node: 'DisposalHandleForm', isDetail: false} + break; + default: + break; + } + }, async getBaseSpecialActionInfo(id) { let {data} = await request({ url: `/Extend/BaseSpecialActionInfo/${id}`, diff --git a/vue.config.js b/vue.config.js index 591096c..ded260e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -18,7 +18,6 @@ module.exports = defineConfig({ '/api': { // 跨域请求的地址 target: process.env.VUE_APP_BASE_API + '/api', - // target: 'http://localhost:2015/api', changeOrigin: true, // 是否允许跨域请求，在本地会创建一个虚拟服务端，发送接收请求数据，这样服务端和服务端进行数据的交互就不会有跨域问题 // 路径重写，替换请求地址 pathRewrite: {