Commit 46bce7e6910c8d61138b7c0e18c95732deebeb8f

Authored by monkeyhouyi
1 parent 6bbb60ba

10/14号需求完善

src/assets/data.js
@@ -7,7 +7,7 @@ export const MediaPlatList = ['微信', '微博', '抖音', '今日头条', '小 @@ -7,7 +7,7 @@ export const MediaPlatList = ['微信', '微博', '抖音', '今日头条', '小
7 const reportStatusList = [ 7 const reportStatusList = [
8 {id: '577006621985604869', name: '未研判'}, 8 {id: '577006621985604869', name: '未研判'},
9 {id: '577006641364189019', name: '未下发'}, 9 {id: '577006641364189019', name: '未下发'},
10 - {id: '577004235234524513', name: '待处置'}, 10 + {id: '577006131314196155', name: '待处置'},
11 {id: '577006696312866053', name: '已处置'}, 11 {id: '577006696312866053', name: '已处置'},
12 {id: '577006666214540549', name: '已研判'}, 12 {id: '577006666214540549', name: '已研判'},
13 ]; 13 ];
14 \ No newline at end of file 14 \ No newline at end of file
src/assets/style/common.scss
@@ -89,7 +89,6 @@ a { @@ -89,7 +89,6 @@ a {
89 } 89 }
90 .text { 90 .text {
91 flex: 1; 91 flex: 1;
92 - height: 30px;  
93 } 92 }
94 } 93 }
95 94
src/views/DisposalSuggestions/Form.vue
@@ -8,105 +8,134 @@ @@ -8,105 +8,134 @@
8 width="60%" 8 width="60%"
9 > 9 >
10 <el-row :gutter="15" class="NCC-dialog-content" v-loading="loading"> 10 <el-row :gutter="15" class="NCC-dialog-content" v-loading="loading">
11 - <el-col :span="10" style="border-right: 1px solid #e6e6e6; height: 400px;"> 11 + <el-col :span="10" style="border-right: 1px solid #e6e6e6; height: 400px">
12 <el-row> 12 <el-row>
13 - <el-col :span="24" class="form_title"> 巡查上报详情 </el-col>  
14 - <el-col :span="24">  
15 - <div class="form-item">  
16 - <div class="label w-100">问题来源:</div>  
17 - {{ dataForm.reportSourceName || '--' }}  
18 - </div>  
19 - </el-col>  
20 - <el-col :span="24">  
21 - <div class="form-item">  
22 - <div class="label w-100">应用名称:</div>  
23 - {{ dataForm.platformNameStr || "--" }}  
24 - </div>  
25 - </el-col>  
26 - <el-col :span="24">  
27 - <div class="form-item">  
28 - <div class="label w-100">运营主体:</div>  
29 - {{ dataForm.companyStr || "--" }}  
30 - </div>  
31 - </el-col>  
32 - <el-col :span="24">  
33 - <div class="form-item">  
34 - <div class="label w-100">应用类型:</div>  
35 - {{ dataForm.platformTypeStr || "--" }}  
36 - </div>  
37 - </el-col>  
38 - <el-col :span="24" v-if="dataForm.platformType == '580634746028033285'">  
39 - <div class="form-item">  
40 - <div class="label w-100">归属平台:</div> 13 + <el-col :span="24" class="form_title"> 巡查上报详情 </el-col>
  14 + <el-col :span="24">
  15 + <div class="form-item">
  16 + <div class="label w-100">问题来源:</div>
  17 + <div class="text">{{ dataForm.reportSourceName || "--" }}</div>
  18 + </div>
  19 + </el-col>
  20 + <el-col :span="24">
  21 + <div class="form-item">
  22 + <div class="label w-100">应用名称:</div>
  23 + <div class="text">{{ dataForm.platformNameStr || "--" }}</div>
  24 + </div>
  25 + </el-col>
  26 + <el-col :span="24">
  27 + <div class="form-item">
  28 + <div class="label w-100">运营主体:</div>
  29 + <div class="text">{{ dataForm.companyStr || "--" }}</div>
  30 + </div>
  31 + </el-col>
  32 + <el-col :span="24">
  33 + <div class="form-item">
  34 + <div class="label w-100">应用类型:</div>
  35 + <div class="text">{{ dataForm.platformTypeStr || "--" }}</div>
  36 + </div>
  37 + </el-col>
  38 + <el-col
  39 + :span="24"
  40 + v-if="dataForm.platformType == '580634746028033285'"
  41 + >
  42 + <div class="form-item">
  43 + <div class="label w-100">归属平台:</div>
  44 + <div class="text">
41 {{ dataForm.selfMediaPlatformType || "--" }} 45 {{ dataForm.selfMediaPlatformType || "--" }}
42 </div> 46 </div>
43 - </el-col> 47 + </div>
  48 + </el-col>
  49 + <el-col :span="24">
  50 + <div class="form-item">
  51 + <div class="label w-100">问题类型:</div>
  52 + <div class="text">{{ dataForm.questionType || "--" }}</div>
  53 + </div>
  54 + </el-col>
  55 + <template v-if="dataForm.questionType == '错误表述'">
44 <el-col :span="24"> 56 <el-col :span="24">
45 <div class="form-item"> 57 <div class="form-item">
46 - <div class="label w-100">问题类型:</div>  
47 - {{ dataForm.questionType || "--" }}  
48 - </div>  
49 - </el-col>  
50 - <template v-if="dataForm.questionType == '错误表述'">  
51 - <el-col :span="24">  
52 - <div class="form-item">  
53 - <div class="label w-100">正确描述:</div> 58 + <div class="label w-100">正确描述:</div>
  59 + <div class="text">
54 {{ dataForm.accurateDescription || "--" }} 60 {{ dataForm.accurateDescription || "--" }}
55 </div> 61 </div>
56 - </el-col>  
57 - <el-col :span="24">  
58 - <div class="form-item">  
59 - <div class="label w-100">错误描述:</div>  
60 - {{ dataForm.incorrectDescription || "--" }}  
61 - </div>  
62 - </el-col>  
63 - </template>  
64 - <el-col :span="24">  
65 - <div class="form-item">  
66 - <div class="label w-100">问题内容:</div>  
67 - {{ dataForm.questionContent || "--" }}  
68 - </div>  
69 - </el-col>  
70 - <el-col :span="24">  
71 - <div class="form-item">  
72 - <div class="label w-100">关键词:</div>  
73 - {{ dataForm.questionClass || "--" }}  
74 </div> 62 </div>
75 </el-col> 63 </el-col>
76 <el-col :span="24"> 64 <el-col :span="24">
77 <div class="form-item"> 65 <div class="form-item">
78 - <div class="label w-100">所属区域:</div>  
79 - {{ dataForm.areaName || "--" }}  
80 - </div>  
81 - </el-col>  
82 - <!-- <el-col :span="24">  
83 - <div class="form-item">  
84 - <div class="label w-100">所属外协:</div>  
85 - {{ dataForm.externalAssistanceId || "--" }}  
86 - </div>  
87 - </el-col> -->  
88 - <el-col :span="24" v-if="dataForm.annex && dataForm.annex.length">  
89 - <div class="form-item">  
90 - <div class="label w-100">附件:</div>  
91 - <div class="text" style="width: calc(100% - 100px);">  
92 - <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> 66 + <div class="label w-100">错误描述:</div>
  67 + <div class="text">
  68 + {{ dataForm.incorrectDescription || "--" }}
93 </div> 69 </div>
94 </div> 70 </div>
95 </el-col> 71 </el-col>
96 - <el-col :span="24" v-if="dataForm.disposalSuggestions">  
97 - <div class="form-item">  
98 - <div class="label w-100">处置结果:</div>  
99 - {{ dataForm.disposalSuggestions || "--" }} 72 + </template>
  73 + <el-col :span="24">
  74 + <div class="form-item">
  75 + <div class="label w-100">问题内容:</div>
  76 + <div class="text">{{ dataForm.questionContent || "--" }}</div>
  77 + </div>
  78 + </el-col>
  79 + <el-col :span="24">
  80 + <div class="form-item">
  81 + <div class="label w-100">链接:</div>
  82 + <div class="text">{{ dataForm.link || "--" }}</div>
  83 + </div>
  84 + </el-col>
  85 + <el-col :span="24">
  86 + <div class="form-item">
  87 + <div class="label w-100">关键词:</div>
  88 + <div class="text">{{ dataForm.questionClass || "--" }}</div>
  89 + </div>
  90 + </el-col>
  91 + <el-col :span="24">
  92 + <el-col class="form-item">
  93 + <div class="label w-100">附件:</div>
  94 + <div class="text">
  95 + <NCC-UploadFz
  96 + v-model="dataForm.annex"
  97 + :fileSize="5"
  98 + sizeUnit="MB"
  99 + :limit="9"
  100 + buttonText="点击上传"
  101 + disabled
  102 + />
100 </div> 103 </div>
101 </el-col> 104 </el-col>
102 - <el-col :span="24" v-if="dataForm.disposalResult && dataForm.disposalResult.length">  
103 - <div class="form-item">  
104 - <div class="label w-100">处置附件:</div>  
105 - <div class="text" style="width: calc(100% - 100px);">  
106 - <NCC-UploadFz v-model="dataForm.disposalResult" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>  
107 - </div> 105 + </el-col>
  106 + <el-col :span="24">
  107 + <div class="form-item">
  108 + <div class="label w-100">所属区域:</div>
  109 + <div class="text">{{ dataForm.areaName || "--" }}</div>
  110 + </div>
  111 + </el-col>
  112 + <el-col :span="24">
  113 + <div class="form-item">
  114 + <div class="label w-100">处置建议:</div>
  115 + <div class="text">{{ dataForm.judgmentOpinions || "--" }}</div>
  116 + </div>
  117 + </el-col>
  118 + <el-col :span="24">
  119 + <div class="form-item">
  120 + <div class="label w-100">处置结果:</div>
  121 + <div class="text">{{ dataForm.disposalSuggestions || "--" }}</div>
  122 + </div>
  123 + </el-col>
  124 + <el-col :span="24">
  125 + <el-col class="form-item">
  126 + <div class="label w-100">处置附件:</div>
  127 + <div class="text" v-if="dataForm.judgmentOpinions">
  128 + <NCC-UploadFz
  129 + v-model="dataForm.judgmentOpinions"
  130 + :fileSize="5"
  131 + sizeUnit="MB"
  132 + :limit="9"
  133 + buttonText="点击上传"
  134 + disabled
  135 + />
108 </div> 136 </div>
109 </el-col> 137 </el-col>
  138 + </el-col>
110 </el-row> 139 </el-row>
111 </el-col> 140 </el-col>
112 <el-col :span="14"> 141 <el-col :span="14">
@@ -127,21 +156,55 @@ @@ -127,21 +156,55 @@
127 size="medium" 156 size="medium"
128 @change="judgmentClassChange" 157 @change="judgmentClassChange"
129 > 158 >
130 - <el-radio v-for="v in judgmentClassOption" :key="v.Id" :label="v.Id">{{v.FullName}}</el-radio> 159 + <el-radio
  160 + v-for="v in judgmentClassOption"
  161 + :key="v.Id"
  162 + :label="v.Id"
  163 + >{{ v.FullName }}</el-radio
  164 + >
131 </el-radio-group> 165 </el-radio-group>
132 </el-form-item> 166 </el-form-item>
133 </el-col> 167 </el-col>
134 - <el-col :span="24" v-if="(!dataForm.areaId || dataForm.areaId == '580548871316383493') && showarea"> 168 + <el-col
  169 + :span="24"
  170 + v-if="
  171 + (!dataForm.areaId || dataForm.areaId == '580548871316383493') &&
  172 + showarea
  173 + "
  174 + >
135 <el-form-item label="所属区县" prop="area"> 175 <el-form-item label="所属区县" prop="area">
136 - <el-radio-group v-removeAriaHidden v-model="suggestionForm.area" placeholder="请选择所属区县" style="line-height: 22px">  
137 - <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio> 176 + <el-radio-group
  177 + v-removeAriaHidden
  178 + v-model="suggestionForm.area"
  179 + placeholder="请选择所属区县"
  180 + style="line-height: 22px"
  181 + >
  182 + <el-radio
  183 + v-for="v in areaOptions"
  184 + :key="v.id"
  185 + :label="v.id"
  186 + >{{ v.fullName }}</el-radio
  187 + >
138 </el-radio-group> 188 </el-radio-group>
139 </el-form-item> 189 </el-form-item>
140 </el-col> 190 </el-col>
141 - <el-col :span="24" v-if="!dataForm.externalAssistanceId && showarea"> 191 + <el-col
  192 + :span="24"
  193 + v-if="!dataForm.externalAssistanceId && showarea"
  194 + >
142 <el-form-item label="所属外协" prop="externalAssistanceId"> 195 <el-form-item label="所属外协" prop="externalAssistanceId">
143 - <el-radio-group v-removeAriaHidden v-model="suggestionForm.externalAssistanceId" placeholder="请选择所属外协" style="line-height: 22px">  
144 - <el-radio v-for="v in communicationOutOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio> 196 + <el-radio-group
  197 + v-removeAriaHidden
  198 + v-model="suggestionForm.externalAssistanceId"
  199 + placeholder="请选择所属外协"
  200 + style="line-height: 22px"
  201 + >
  202 + <el-radio
  203 + v-for="v in communicationOutOptions"
  204 + :key="v.id"
  205 + :label="v.id"
  206 + >{{ v.fullName }}</el-radio
  207 + >
145 </el-radio-group> 208 </el-radio-group>
146 </el-form-item> 209 </el-form-item>
147 </el-col> 210 </el-col>
@@ -165,7 +228,9 @@ @@ -165,7 +228,9 @@
165 </el-row> 228 </el-row>
166 <span slot="footer" class="dialog-footer"> 229 <span slot="footer" class="dialog-footer">
167 <el-button @click="visible = false">取 消</el-button> 230 <el-button @click="visible = false">取 消</el-button>
168 - <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">确 定</el-button> 231 + <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
  232 + >确 定</el-button
  233 + >
169 </span> 234 </span>
170 </el-dialog> 235 </el-dialog>
171 </template> 236 </template>
@@ -174,10 +239,13 @@ import request from &quot;@/utils/request&quot;; @@ -174,10 +239,13 @@ import request from &quot;@/utils/request&quot;;
174 import infoMixin from "@/mixins/info"; 239 import infoMixin from "@/mixins/info";
175 import { dynamicText } from "@/filters/index"; 240 import { dynamicText } from "@/filters/index";
176 import { getDictionaryDataSelector } from "@/api/systemData/dictionary"; 241 import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
177 -import { getDetail, disposalSuggestionsAPI } from "@/api/systemData/dataInterface"; 242 +import {
  243 + getDetail,
  244 + disposalSuggestionsAPI,
  245 +} from "@/api/systemData/dataInterface";
178 export default { 246 export default {
179 components: {}, 247 components: {},
180 - mixins: [infoMixin], 248 + mixins: [infoMixin],
181 props: [], 249 props: [],
182 data() { 250 data() {
183 return { 251 return {
@@ -215,19 +283,17 @@ export default { @@ -215,19 +283,17 @@ export default {
215 judgmentOpinions: "", //判断意见 283 judgmentOpinions: "", //判断意见
216 reviewType: "", //判断分类 284 reviewType: "", //判断分类
217 deadline: "", 285 deadline: "",
218 - area: '',  
219 - externalAssistanceId: '', 286 + area: "",
  287 + externalAssistanceId: "",
220 }, 288 },
221 rules: { 289 rules: {
222 reviewType: [ 290 reviewType: [
223 { required: true, message: "请选择审核类型", trigger: "blur" }, 291 { required: true, message: "请选择审核类型", trigger: "blur" },
224 ], 292 ],
225 - area: [  
226 - { required: true, message: "请选择所属区域", trigger: "bulr" },  
227 - ], 293 + area: [{ required: true, message: "请选择所属区域", trigger: "bulr" }],
228 judgmentOpinions: [ 294 judgmentOpinions: [
229 - { required: true, message: "请填写研判意见", trigger: "bulr" }  
230 - ] 295 + { required: true, message: "请填写研判意见", trigger: "bulr" },
  296 + ],
231 }, 297 },
232 showSuggsetion: false, 298 showSuggsetion: false,
233 showarea: false, 299 showarea: false,
@@ -244,9 +310,7 @@ export default { @@ -244,9 +310,7 @@ export default {
244 }, 310 },
245 }, 311 },
246 watch: {}, 312 watch: {},
247 - created() {  
248 -  
249 - }, 313 + created() {},
250 mounted() {}, 314 mounted() {},
251 methods: { 315 methods: {
252 async getSourceOptions() { 316 async getSourceOptions() {
@@ -269,10 +333,10 @@ export default { @@ -269,10 +333,10 @@ export default {
269 async getjudgmentClassOptions() { 333 async getjudgmentClassOptions() {
270 await request({ 334 await request({
271 url: `/Extend/BaseInspectionReport/GetReviewTypeList`, 335 url: `/Extend/BaseInspectionReport/GetReviewTypeList`,
272 - method: 'GET',  
273 - }).then(res => { 336 + method: "GET",
  337 + }).then((res) => {
274 this.judgmentClassOption = res.data; 338 this.judgmentClassOption = res.data;
275 - }) 339 + });
276 }, 340 },
277 goBack() { 341 goBack() {
278 this.$emit("refresh"); 342 this.$emit("refresh");
@@ -292,8 +356,15 @@ export default { @@ -292,8 +356,15 @@ export default {
292 if (this.dataForm.id) { 356 if (this.dataForm.id) {
293 let res = await getDetail(this.dataForm.id); 357 let res = await getDetail(this.dataForm.id);
294 this.dataForm = res.data; 358 this.dataForm = res.data;
295 - this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions);  
296 - this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName); 359 + this.dataForm.areaName = dynamicText(
  360 + res.data.areaId,
  361 + this.areaOptions
  362 + );
  363 + this.sourceOptions.length &&
  364 + this.dataForm.reportSource &&
  365 + (this.dataForm.reportSourceName = this.sourceOptions.find(
  366 + (v) => v.Id == this.dataForm.reportSource
  367 + ).FullName);
297 if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = []; 368 if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = [];
298 if (!this.dataForm.annex) this.dataForm.annex = []; 369 if (!this.dataForm.annex) this.dataForm.annex = [];
299 this.loading = false; 370 this.loading = false;
@@ -303,9 +374,13 @@ export default { @@ -303,9 +374,13 @@ export default {
303 }); 374 });
304 }, 375 },
305 judgmentClassChange(v) { 376 judgmentClassChange(v) {
306 - this.suggestionForm.judgmentOpinions = '';  
307 - this.showSuggsetion = Boolean(v == "590769458901943557" || v == "590769521820697861"); // 进一步处置,不采纳  
308 - this.showarea = Boolean(v == "590769199001896197" || v == "590769458901943557"); // 执法,进一步处置 377 + this.suggestionForm.judgmentOpinions = "";
  378 + this.showSuggsetion = Boolean(
  379 + v == "590769458901943557" || v == "590769521820697861"
  380 + ); // 进一步处置,不采纳
  381 + this.showarea = Boolean(
  382 + v == "590769199001896197" || v == "590769458901943557"
  383 + ); // 执法,进一步处置
309 }, 384 },
310 dataFormSubmit() { 385 dataFormSubmit() {
311 this.$refs["suggestionForm"].validate(async (valid) => { 386 this.$refs["suggestionForm"].validate(async (valid) => {
@@ -316,7 +391,7 @@ export default { @@ -316,7 +391,7 @@ export default {
316 }; 391 };
317 this.btnLoading = true; 392 this.btnLoading = true;
318 let res = await disposalSuggestionsAPI(obj); 393 let res = await disposalSuggestionsAPI(obj);
319 - if(res.code != 200) return this.btnLoading = false; 394 + if (res.code != 200) return (this.btnLoading = false);
320 this.$message({ 395 this.$message({
321 message: res.msg, 396 message: res.msg,
322 type: "success", 397 type: "success",
src/views/DisposalSuggestions/HandleForm.vue
@@ -15,68 +15,128 @@ @@ -15,68 +15,128 @@
15 <el-col :span="24"> 15 <el-col :span="24">
16 <div class="form-item"> 16 <div class="form-item">
17 <div class="label w-100">问题来源:</div> 17 <div class="label w-100">问题来源:</div>
18 - {{ dataForm.reportSourceName || "--" }} 18 + <div class="text">{{ dataForm.reportSourceName || "--" }}</div>
19 </div> 19 </div>
20 </el-col> 20 </el-col>
21 <el-col :span="24"> 21 <el-col :span="24">
22 <div class="form-item"> 22 <div class="form-item">
23 <div class="label w-100">应用名称:</div> 23 <div class="label w-100">应用名称:</div>
24 - {{ dataForm.platformNameStr || "--" }} 24 + <div class="text">{{ dataForm.platformNameStr || "--" }}</div>
  25 + </div>
  26 + </el-col>
  27 + <el-col :span="24">
  28 + <div class="form-item">
  29 + <div class="label w-100">运营主体:</div>
  30 + <div class="text">{{ dataForm.companyStr || "--" }}</div>
25 </div> 31 </div>
26 </el-col> 32 </el-col>
27 <el-col :span="24"> 33 <el-col :span="24">
28 <div class="form-item"> 34 <div class="form-item">
29 <div class="label w-100">应用类型:</div> 35 <div class="label w-100">应用类型:</div>
30 - {{ dataForm.platformTypeStr || "--" }} 36 + <div class="text">{{ dataForm.platformTypeStr || "--" }}</div>
  37 + </div>
  38 + </el-col>
  39 + <el-col
  40 + :span="24"
  41 + v-if="dataForm.platformType == '580634746028033285'"
  42 + >
  43 + <div class="form-item">
  44 + <div class="label w-100">归属平台:</div>
  45 + <div class="text">
  46 + {{ dataForm.selfMediaPlatformType || "--" }}
  47 + </div>
31 </div> 48 </div>
32 </el-col> 49 </el-col>
33 <el-col :span="24"> 50 <el-col :span="24">
34 <div class="form-item"> 51 <div class="form-item">
35 <div class="label w-100">问题类型:</div> 52 <div class="label w-100">问题类型:</div>
36 - {{ dataForm.questionType || "--" }} 53 + <div class="text">{{ dataForm.questionType || "--" }}</div>
37 </div> 54 </div>
38 </el-col> 55 </el-col>
39 <template v-if="dataForm.questionType == '错误表述'"> 56 <template v-if="dataForm.questionType == '错误表述'">
40 <el-col :span="24"> 57 <el-col :span="24">
41 <div class="form-item"> 58 <div class="form-item">
42 <div class="label w-100">正确描述:</div> 59 <div class="label w-100">正确描述:</div>
43 - {{ dataForm.accurateDescription || "--" }} 60 + <div class="text">
  61 + {{ dataForm.accurateDescription || "--" }}
  62 + </div>
44 </div> 63 </div>
45 </el-col> 64 </el-col>
46 <el-col :span="24"> 65 <el-col :span="24">
47 <div class="form-item"> 66 <div class="form-item">
48 <div class="label w-100">错误描述:</div> 67 <div class="label w-100">错误描述:</div>
49 - {{ dataForm.incorrectDescription || "--" }} 68 + <div class="text">
  69 + {{ dataForm.incorrectDescription || "--" }}
  70 + </div>
50 </div> 71 </div>
51 </el-col> 72 </el-col>
52 </template> 73 </template>
53 <el-col :span="24"> 74 <el-col :span="24">
54 - <div class="form-item"> 75 + <div class="form-item">
55 <div class="label w-100">问题内容:</div> 76 <div class="label w-100">问题内容:</div>
56 - {{ dataForm.questionContent || "--" }} 77 + <div class="text">{{ dataForm.questionContent || "--" }}</div>
57 </div> 78 </div>
58 </el-col> 79 </el-col>
59 <el-col :span="24"> 80 <el-col :span="24">
60 <div class="form-item"> 81 <div class="form-item">
61 - <div class="label w-100">关键词</div>  
62 - {{ dataForm.questionClass || "--" }} 82 + <div class="label w-100">链接:</div>
  83 + <div class="text">{{ dataForm.link || "--" }}</div>
63 </div> 84 </div>
64 </el-col> 85 </el-col>
65 - <el-col :span="24" v-if="dataForm.annex && dataForm.annex.length"> 86 + <el-col :span="24">
66 <div class="form-item"> 87 <div class="form-item">
  88 + <div class="label w-100">关键词:</div>
  89 + <div class="text">{{ dataForm.questionClass || "--" }}</div>
  90 + </div>
  91 + </el-col>
  92 + <el-col :span="24">
  93 + <el-col class="form-item">
67 <div class="label w-100">附件:</div> 94 <div class="label w-100">附件:</div>
68 - <div class="text" style="width: calc(100% - 100px);">  
69 - <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> 95 + <div class="text">
  96 + <NCC-UploadFz
  97 + v-model="dataForm.annex"
  98 + :fileSize="5"
  99 + sizeUnit="MB"
  100 + :limit="9"
  101 + buttonText="点击上传"
  102 + disabled
  103 + />
70 </div> 104 </div>
  105 + </el-col>
  106 + </el-col>
  107 + <el-col :span="24">
  108 + <div class="form-item">
  109 + <div class="label w-100">所属区域:</div>
  110 + <div class="text">{{ dataForm.areaName || "--" }}</div>
71 </div> 111 </div>
72 </el-col> 112 </el-col>
73 - <el-col :span="24" v-if="dataForm.judgmentOpinions"> 113 + <el-col :span="24">
74 <div class="form-item"> 114 <div class="form-item">
75 <div class="label w-100">处置建议:</div> 115 <div class="label w-100">处置建议:</div>
76 - {{ dataForm.judgmentOpinions || "--" }} 116 + <div class="text">{{ dataForm.judgmentOpinions || "--" }}</div>
77 </div> 117 </div>
78 </el-col> 118 </el-col>
79 - 119 + <el-col :span="24">
  120 + <div class="form-item">
  121 + <div class="label w-100">处置结果:</div>
  122 + <div class="text">{{ dataForm.disposalSuggestions || "--" }}</div>
  123 + </div>
  124 + </el-col>
  125 + <el-col :span="24">
  126 + <el-col class="form-item">
  127 + <div class="label w-100">处置附件:</div>
  128 + <div class="text" v-if="dataForm.judgmentOpinions">
  129 + <NCC-UploadFz
  130 + v-model="dataForm.judgmentOpinions"
  131 + :fileSize="5"
  132 + sizeUnit="MB"
  133 + :limit="9"
  134 + buttonText="点击上传"
  135 + disabled
  136 + />
  137 + </div>
  138 + </el-col>
  139 + </el-col>
80 </el-row> 140 </el-row>
81 </el-col> 141 </el-col>
82 <el-col :span="14"> 142 <el-col :span="14">
src/views/DisposalSuggestions/index.vue
1 <template> 1 <template>
2 <div class="SystemInfo item-box common-info-box"> 2 <div class="SystemInfo item-box common-info-box">
3 - <div class="item-title">{{isSHILevel ? '上报线索研判' : '巡查处理'}}</div> 3 + <div class="item-title">{{isSHILevel ? '线索研判' : '巡查处理'}}</div>
4 <div class="item-body"> 4 <div class="item-body">
5 <div class="NCC-common-layout"> 5 <div class="NCC-common-layout">
6 <div class="NCC-common-layout-center"> 6 <div class="NCC-common-layout-center">
@@ -55,10 +55,12 @@ @@ -55,10 +55,12 @@
55 <el-table-column show-overflow-tooltip label="应用类型" prop="platformType" align="left"> 55 <el-table-column show-overflow-tooltip label="应用类型" prop="platformType" align="left">
56 <template slot-scope="scope">{{ scope.row.platformNameStr || scope.row.platformName }}</template> 56 <template slot-scope="scope">{{ scope.row.platformNameStr || scope.row.platformName }}</template>
57 </el-table-column> 57 </el-table-column>
58 - <el-table-column show-overflow-tooltip label="问题类型" prop="leadNumber" align="left" ></el-table-column> 58 + <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left" ></el-table-column>
  59 + <el-table-column show-overflow-tooltip label="线索编号" prop="leadNumber" align="left" ></el-table-column>
59 <!-- <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> --> 60 <!-- <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> -->
60 - <el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" /> 61 + <!-- <el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" /> -->
61 <el-table-column show-overflow-tooltip prop="creatorTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat"/> 62 <el-table-column show-overflow-tooltip prop="creatorTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat"/>
  63 + <el-table-column show-overflow-tooltip prop="state" label="状态" align="left" />
62 <!-- <el-table-column show-overflow-tooltip prop="disposalSuggestions" label="处置建议" align="left" /> 64 <!-- <el-table-column show-overflow-tooltip prop="disposalSuggestions" label="处置建议" align="left" />
63 <el-table-column show-overflow-tooltip prop="id" label="主键" align="left" /> 65 <el-table-column show-overflow-tooltip prop="id" label="主键" align="left" />
64 <el-table-column show-overflow-tooltip prop="department" label="部门" align="left" /> 66 <el-table-column show-overflow-tooltip prop="department" label="部门" align="left" />
@@ -72,9 +74,9 @@ @@ -72,9 +74,9 @@
72 <template slot-scope="scope"> 74 <template slot-scope="scope">
73 <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’ / 已处置 ‘577006696312866053’ 可以研判 --> 75 <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’ / 已处置 ‘577006696312866053’ 可以研判 -->
74 <!-- <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="['577006621985604869', '577006641364189019', '577006696312866053'].includes(scope.row.stage) == -1">{{ scope.row.stage == '577006641364189019' ? '下发' : '研判'}}</el-button> --> 76 <!-- <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="['577006621985604869', '577006641364189019', '577006696312866053'].includes(scope.row.stage) == -1">{{ scope.row.stage == '577006641364189019' ? '下发' : '研判'}}</el-button> -->
75 - <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="['577006621985604869', '577006641364189019', '577006696312866053'].includes(scope.row.stage) == -1">研判</el-button> 77 + <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="!['577006621985604869', '577006641364189019', '577006696312866053'].includes(scope.row.stage)">研判</el-button>
76 <!-- 待处置进行处理 --> 78 <!-- 待处置进行处理 -->
77 - <el-button type="text" v-else @click="toHandle(scope.row.id)" :disabled="scope.row.stage == '577004235234524513'">处理</el-button> 79 + <el-button type="text" v-else @click="toHandle(scope.row.id)" :disabled="scope.row.stage != '577006131314196155'">处理</el-button>
78 <el-button type="text" @click="toDetail(scope.row.id)" >详情</el-button> 80 <el-button type="text" @click="toDetail(scope.row.id)" >详情</el-button>
79 </template> 81 </template>
80 </el-table-column> 82 </el-table-column>
src/views/baseInspectionReport/Form.vue
@@ -215,14 +215,33 @@ @@ -215,14 +215,33 @@
215 <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> 215 <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
216 </div> 216 </div>
217 </el-col> 217 </el-col>
218 - <el-col class="form-item" v-if="dataForm.judgmentOpinions"> 218 + <!-- 研判类型 -->
  219 + <el-col class="form-item">
  220 + <div class="label w-120">研判类型:</div>
  221 + <div class="text">{{ dataForm.state || "--" }}</div>
  222 + </el-col>
  223 + <el-col class="form-item">
  224 + <div class="label w-120">所属区域:</div>
  225 + <div class="text">{{ dataForm.areaName || "--" }}</div>
  226 + </el-col>
  227 + <el-col class="form-item" v-if="dataForm.externalAssistanceId">
  228 + <div class="label w-120">所属外协:</div>
  229 + <div class="text">外协一</div>
  230 + </el-col>
  231 + <el-col class="form-item">
219 <div class="label w-120">处置建议:</div> 232 <div class="label w-120">处置建议:</div>
220 <div class="text">{{ dataForm.judgmentOpinions || '--' }}</div> 233 <div class="text">{{ dataForm.judgmentOpinions || '--' }}</div>
221 </el-col> 234 </el-col>
222 - <el-col class="form-item" v-if="dataForm.disposalSuggestions"> 235 + <el-col class="form-item">
223 <div class="label w-120">处置结果:</div> 236 <div class="label w-120">处置结果:</div>
224 <div class="text">{{ dataForm.disposalSuggestions || '--' }}</div> 237 <div class="text">{{ dataForm.disposalSuggestions || '--' }}</div>
225 </el-col> 238 </el-col>
  239 + <el-col class="form-item">
  240 + <div class="label w-120">处置附件:</div>
  241 + <div class="text" style="width: calc(100% - 120px);" v-if="dataForm.disposalResultFileUrl">
  242 + <NCC-UploadFz v-model="dataForm.disposalResultFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
  243 + </div>
  244 + </el-col>
226 </el-row> 245 </el-row>
227 </el-row> 246 </el-row>
228 <span slot="footer" class="dialog-footer"> 247 <span slot="footer" class="dialog-footer">
@@ -235,10 +254,13 @@ @@ -235,10 +254,13 @@
235 import request from "@/utils/request"; 254 import request from "@/utils/request";
236 import { getDictionaryDataSelector } from "@/api/systemData/dictionary"; 255 import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
237 import { getDetail, addForm, updataForm } from "@/api/systemData/dataInterface"; 256 import { getDetail, addForm, updataForm } from "@/api/systemData/dataInterface";
  257 +import { dynamicText } from "@/filters/index";
  258 +import infoMixin from "@/mixins/info";
238 import { MediaPlatList } from "@/assets/data" 259 import { MediaPlatList } from "@/assets/data"
239 import { getInfoList } from "@/api/baseData/info"; 260 import { getInfoList } from "@/api/baseData/info";
240 export default { 261 export default {
241 components: {}, 262 components: {},
  263 + mixins: [infoMixin],
242 props: [], 264 props: [],
243 data() { 265 data() {
244 return { 266 return {
@@ -290,10 +312,11 @@ export default { @@ -290,10 +312,11 @@ export default {
290 sourceOptions: [], 312 sourceOptions: [],
291 platformTypeOptions: [], 313 platformTypeOptions: [],
292 questionTypeOptions: [], 314 questionTypeOptions: [],
293 - nameOptions: [], 315 + nameOptions: [], // 应用名称
294 mediaPlatList: MediaPlatList, 316 mediaPlatList: MediaPlatList,
295 companyOptions: [], 317 companyOptions: [],
296 btnLoading: false, 318 btnLoading: false,
  319 + areaOptions: [],
297 }; 320 };
298 }, 321 },
299 computed: { 322 computed: {
@@ -380,6 +403,7 @@ export default { @@ -380,6 +403,7 @@ export default {
380 if(!data) return; 403 if(!data) return;
381 this.nameOptions = data; 404 this.nameOptions = data;
382 }); 405 });
  406 + if(!type) return;
383 !obj && this.nameOptions == []; 407 !obj && this.nameOptions == [];
384 this.dataForm.platformName = ''; 408 this.dataForm.platformName = '';
385 this.dataForm.platformType = ''; 409 this.dataForm.platformType = '';
@@ -424,15 +448,18 @@ export default { @@ -424,15 +448,18 @@ export default {
424 this.visible = true; 448 this.visible = true;
425 this.isDetail = isDetail || false; 449 this.isDetail = isDetail || false;
426 this.form_loading = true; 450 this.form_loading = true;
  451 + await this.initAreaTypeList();
427 await this.initAllList(); 452 await this.initAllList();
428 this.$nextTick(async () => { 453 this.$nextTick(async () => {
429 !isDetail && this.$refs["elForm"].resetFields(); 454 !isDetail && this.$refs["elForm"].resetFields();
430 if (this.dataForm.id) { 455 if (this.dataForm.id) {
431 this.form_loading = true; 456 this.form_loading = true;
432 let res = await getDetail(this.dataForm.id); 457 let res = await getDetail(this.dataForm.id);
  458 + await this.companyChange(res.data.company, false);
433 if(res.code != 200) return this.form_loading = false; 459 if(res.code != 200) return this.form_loading = false;
434 if(!res.data) return; 460 if(!res.data) return;
435 this.dataForm = res.data; 461 this.dataForm = res.data;
  462 + res.data.areaId && (this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions));
436 this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName); 463 this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName);
437 if(this.questionTypeOptions.findIndex(v => v.fullName == this.dataForm.questionType) == -1) { 464 if(this.questionTypeOptions.findIndex(v => v.fullName == this.dataForm.questionType) == -1) {
438 this.dataForm.otherQuestionType = res.data.questionType; 465 this.dataForm.otherQuestionType = res.data.questionType;
src/views/baseInspectionReport/index.vue
@@ -68,9 +68,10 @@ @@ -68,9 +68,10 @@
68 <el-table-column show-overflow-tooltip label="应用类型" prop="platformType" align="left"> 68 <el-table-column show-overflow-tooltip label="应用类型" prop="platformType" align="left">
69 <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template> 69 <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
70 </el-table-column> 70 </el-table-column>
71 - <el-table-column show-overflow-tooltip label="问题类型" prop="leadNumber" align="left" ></el-table-column> 71 + <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left" ></el-table-column>
  72 + <el-table-column show-overflow-tooltip label="线索编号" prop="leadNumber" align="left" ></el-table-column>
72 <!-- <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> --> 73 <!-- <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> -->
73 - <el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" /> 74 + <!-- <el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" /> -->
74 <el-table-column show-overflow-tooltip prop="creatorTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat"/> 75 <el-table-column show-overflow-tooltip prop="creatorTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat"/>
75 <!-- <el-table-column show-overflow-tooltip prop="department" label="部门" align="left" /> --> 76 <!-- <el-table-column show-overflow-tooltip prop="department" label="部门" align="left" /> -->
76 <!-- <el-table-column show-overflow-tooltip label="问题分类" prop="questionClass" align="left"> 77 <!-- <el-table-column show-overflow-tooltip label="问题分类" prop="questionClass" align="left">
src/views/homePage/components/UserInfoPage.vue
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 <el-input 30 <el-input
31 v-model="user.realName" 31 v-model="user.realName"
32 placeholder="请输入用户名" 32 placeholder="请输入用户名"
  33 + disabled
33 /> 34 />
34 </el-form-item> 35 </el-form-item>
35 </el-form> 36 </el-form>