diff --git a/src/assets/data.js b/src/assets/data.js index 604b3a7..c6e1095 100644 --- a/src/assets/data.js +++ b/src/assets/data.js @@ -7,7 +7,7 @@ export const MediaPlatList = ['微信', '微博', '抖音', '今日头条', '小 const reportStatusList = [ {id: '577006621985604869', name: '未研判'}, {id: '577006641364189019', name: '未下发'}, - {id: '577004235234524513', name: '待处置'}, + {id: '577006131314196155', name: '待处置'}, {id: '577006696312866053', name: '已处置'}, {id: '577006666214540549', name: '已研判'}, ]; \ No newline at end of file diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss index 0c13132..f20948b 100644 --- a/src/assets/style/common.scss +++ b/src/assets/style/common.scss @@ -89,7 +89,6 @@ a { } .text { flex: 1; - height: 30px; } } diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue index 3c6740b..0d33df9 100644 --- a/src/views/DisposalSuggestions/Form.vue +++ b/src/views/DisposalSuggestions/Form.vue @@ -8,105 +8,134 @@ width="60%" > - + - 巡查上报详情 - -
-
问题来源：
- {{ dataForm.reportSourceName || '--' }} -
- - -
-
应用名称：
- {{ dataForm.platformNameStr || "--" }} -
- - -
-
运营主体：
- {{ dataForm.companyStr || "--" }} -
- - -
-
应用类型：
- {{ dataForm.platformTypeStr || "--" }} -
- - -
-
归属平台：
+ 巡查上报详情 + +
+
问题来源：
+
{{ dataForm.reportSourceName || "--" }}
+
+ + +
+
应用名称：
+
{{ dataForm.platformNameStr || "--" }}
+
+ + +
+
运营主体：
+
{{ dataForm.companyStr || "--" }}
+
+ + +
+
应用类型：
+
{{ dataForm.platformTypeStr || "--" }}
+
+ + +
+
归属平台：
+
{{ dataForm.selfMediaPlatformType || "--" }}
- +
+ + +
+
问题类型：
+
{{ dataForm.questionType || "--" }}
+
+ + + +
+
问题内容：
+
{{ dataForm.questionContent || "--" }}
+
+ + +
+
链接：
+
{{ dataForm.link || "--" }}
+
+ + +
+
关键词：
+
{{ dataForm.questionClass || "--" }}
+
+ + + +
附件：
+
+
- -
-
处置附件：
-
- -
+ + +
+
所属区域：
+
{{ dataForm.areaName || "--" }}
+
+ + +
+
处置建议：
+
{{ dataForm.judgmentOpinions || "--" }}
+
+ + +
+
处置结果：
+
{{ dataForm.disposalSuggestions || "--" }}
+
+ + + +
处置附件：
+
+
+ @@ -127,21 +156,55 @@ size="medium" @change="judgmentClassChange" > - {{v.FullName}} + {{ v.FullName }} - + - - {{ v.fullName }} + + {{ v.fullName }} - + - - {{ v.fullName }} + + {{ v.fullName }} @@ -165,7 +228,9 @@ 取 消 - 确 定 + 确 定 @@ -174,10 +239,13 @@ import request from "@/utils/request"; import infoMixin from "@/mixins/info"; import { dynamicText } from "@/filters/index"; import { getDictionaryDataSelector } from "@/api/systemData/dictionary"; -import { getDetail, disposalSuggestionsAPI } from "@/api/systemData/dataInterface"; +import { + getDetail, + disposalSuggestionsAPI, +} from "@/api/systemData/dataInterface"; export default { components: {}, - mixins: [infoMixin], + mixins: [infoMixin], props: [], data() { return { @@ -215,19 +283,17 @@ export default { judgmentOpinions: "", //判断意见 reviewType: "", //判断分类 deadline: "", - area: '', - externalAssistanceId: '', + area: "", + externalAssistanceId: "", }, rules: { reviewType: [ { required: true, message: "请选择审核类型", trigger: "blur" }, ], - area: [ - { required: true, message: "请选择所属区域", trigger: "bulr" }, - ], + area: [{ required: true, message: "请选择所属区域", trigger: "bulr" }], judgmentOpinions: [ - { required: true, message: "请填写研判意见", trigger: "bulr" } - ] + { required: true, message: "请填写研判意见", trigger: "bulr" }, + ], }, showSuggsetion: false, showarea: false, @@ -244,9 +310,7 @@ export default { }, }, watch: {}, - created() { - - }, + created() {}, mounted() {}, methods: { async getSourceOptions() { @@ -269,10 +333,10 @@ export default { async getjudgmentClassOptions() { await request({ url: `/Extend/BaseInspectionReport/GetReviewTypeList`, - method: 'GET', - }).then(res => { + method: "GET", + }).then((res) => { this.judgmentClassOption = res.data; - }) + }); }, goBack() { this.$emit("refresh"); @@ -292,8 +356,15 @@ export default { if (this.dataForm.id) { let res = await getDetail(this.dataForm.id); this.dataForm = res.data; - this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions); - this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName); + this.dataForm.areaName = dynamicText( + res.data.areaId, + this.areaOptions + ); + this.sourceOptions.length && + this.dataForm.reportSource && + (this.dataForm.reportSourceName = this.sourceOptions.find( + (v) => v.Id == this.dataForm.reportSource + ).FullName); if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = []; if (!this.dataForm.annex) this.dataForm.annex = []; this.loading = false; @@ -303,9 +374,13 @@ export default { }); }, judgmentClassChange(v) { - this.suggestionForm.judgmentOpinions = ''; - this.showSuggsetion = Boolean(v == "590769458901943557" || v == "590769521820697861"); // 进一步处置，不采纳 - this.showarea = Boolean(v == "590769199001896197" || v == "590769458901943557"); // 执法，进一步处置 + this.suggestionForm.judgmentOpinions = ""; + this.showSuggsetion = Boolean( + v == "590769458901943557" || v == "590769521820697861" + ); // 进一步处置，不采纳 + this.showarea = Boolean( + v == "590769199001896197" || v == "590769458901943557" + ); // 执法，进一步处置 }, dataFormSubmit() { this.$refs["suggestionForm"].validate(async (valid) => { @@ -316,7 +391,7 @@ export default { }; this.btnLoading = true; let res = await disposalSuggestionsAPI(obj); - if(res.code != 200) return this.btnLoading = false; + if (res.code != 200) return (this.btnLoading = false); this.$message({ message: res.msg, type: "success", diff --git a/src/views/DisposalSuggestions/HandleForm.vue b/src/views/DisposalSuggestions/HandleForm.vue index fdeea3c..32c64a0 100644 --- a/src/views/DisposalSuggestions/HandleForm.vue +++ b/src/views/DisposalSuggestions/HandleForm.vue @@ -15,68 +15,128 @@
问题来源：
- {{ dataForm.reportSourceName || "--" }} +
{{ dataForm.reportSourceName || "--" }}
应用名称：
- {{ dataForm.platformNameStr || "--" }} +
{{ dataForm.platformNameStr || "--" }}
+
+ + +
+
运营主体：
+
{{ dataForm.companyStr || "--" }}
应用类型：
- {{ dataForm.platformTypeStr || "--" }} +
{{ dataForm.platformTypeStr || "--" }}
+
+ + +
+
归属平台：
+
+ {{ dataForm.selfMediaPlatformType || "--" }} +
问题类型：
- {{ dataForm.questionType || "--" }} +
{{ dataForm.questionType || "--" }}
 -
+
问题内容：
- {{ dataForm.questionContent || "--" }} +
{{ dataForm.questionContent || "--" }}
-
关键词
- {{ dataForm.questionClass || "--" }} +
链接：
+
{{ dataForm.link || "--" }}
 - +
+
关键词：
+
{{ dataForm.questionClass || "--" }}
+
+ + +
附件：
-
- +
+
+ + + +
+
所属区域：
+
{{ dataForm.areaName || "--" }}
 - +
处置建议：
- {{ dataForm.judgmentOpinions || "--" }} +
{{ dataForm.judgmentOpinions || "--" }}
 - + +
+
处置结果：
+
{{ dataForm.disposalSuggestions || "--" }}
+
+ + + +
处置附件：
+
+ +
+ + diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue index 4c6eab5..6b9b1b5 100644 --- a/src/views/DisposalSuggestions/index.vue +++ b/src/views/DisposalSuggestions/index.vue @@ -1,6 +1,6 @@ diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue index 8646815..2e398be 100644 --- a/src/views/baseInspectionReport/Form.vue +++ b/src/views/baseInspectionReport/Form.vue @@ -215,14 +215,33 @@
- + + +
研判类型：
+
{{ dataForm.state || "--" }}
+ + +
所属区域：
+
{{ dataForm.areaName || "--" }}
+ + +
所属外协：
+
外协一
+ +
处置建议：
{{ dataForm.judgmentOpinions || '--' }}
 - +
处置结果：
{{ dataForm.disposalSuggestions || '--' }}
 + +
处置附件：
+
+ +
+ @@ -235,10 +254,13 @@ import request from "@/utils/request"; import { getDictionaryDataSelector } from "@/api/systemData/dictionary"; import { getDetail, addForm, updataForm } from "@/api/systemData/dataInterface"; +import { dynamicText } from "@/filters/index"; +import infoMixin from "@/mixins/info"; import { MediaPlatList } from "@/assets/data" import { getInfoList } from "@/api/baseData/info"; export default { components: {}, + mixins: [infoMixin], props: [], data() { return { @@ -290,10 +312,11 @@ export default { sourceOptions: [], platformTypeOptions: [], questionTypeOptions: [], - nameOptions: [], + nameOptions: [], // 应用名称 mediaPlatList: MediaPlatList, companyOptions: [], btnLoading: false, + areaOptions: [], }; }, computed: { @@ -380,6 +403,7 @@ export default { if(!data) return; this.nameOptions = data; }); + if(!type) return; !obj && this.nameOptions == []; this.dataForm.platformName = ''; this.dataForm.platformType = ''; @@ -424,15 +448,18 @@ export default { this.visible = true; this.isDetail = isDetail || false; this.form_loading = true; + await this.initAreaTypeList(); await this.initAllList(); this.$nextTick(async () => { !isDetail && this.$refs["elForm"].resetFields(); if (this.dataForm.id) { this.form_loading = true; let res = await getDetail(this.dataForm.id); + await this.companyChange(res.data.company, false); if(res.code != 200) return this.form_loading = false; if(!res.data) return; this.dataForm = res.data; + res.data.areaId && (this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions)); this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName); if(this.questionTypeOptions.findIndex(v => v.fullName == this.dataForm.questionType) == -1) { this.dataForm.otherQuestionType = res.data.questionType; diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue index 22de56d..a0d1479 100644 --- a/src/views/baseInspectionReport/index.vue +++ b/src/views/baseInspectionReport/index.vue @@ -68,9 +68,10 @@ - + + - +