Commit f0d64cc9c0a2dfc7a9a635847a06e171308b3695
1 parent
7e62c38f
优化
Showing
10 changed files
with
136 additions
and
56 deletions
src/views/DisposalSuggestions/Form.vue
| ... | ... | @@ -119,6 +119,12 @@ |
| 119 | 119 | <div class="label w-120">处置建议:</div> |
| 120 | 120 | <div class="text">{{ v.judgmentOpinion }}</div> |
| 121 | 121 | </div> |
| 122 | + <div class="form-item" v-if="v.judgmentFileUrl"> | |
| 123 | + <div class="label w-120">处置附件:</div> | |
| 124 | + <div class="text" style="width: calc(100% - 120px);"> | |
| 125 | + <NCC-UploadFz v-model="v.judgmentFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> | |
| 126 | + </div> | |
| 127 | + </div> | |
| 122 | 128 | </el-col> |
| 123 | 129 | <el-col :span="24" v-for="(v, index) in dataForm.disposalSuggestions" :key="index + 'disposalSuggestions'" style="border: #f6f6f6 solid 1px; border-radius: 10px; padding: 8px; margin-bottom: 5px;"> |
| 124 | 130 | <div class="title">处置信息{{ index + 1 }}</div> |
| ... | ... | @@ -126,10 +132,10 @@ |
| 126 | 132 | <div class="label w-120">处置结果:</div> |
| 127 | 133 | <div class="text">{{ v.disposalSuggestion }}</div> |
| 128 | 134 | </div> |
| 129 | - <div class="form-item" v-if="v.fileUrl"> | |
| 135 | + <div class="form-item" v-if="v.disposalResultFileUrl"> | |
| 130 | 136 | <div class="label w-120">处置附件:</div> |
| 131 | 137 | <div class="text" style="width: calc(100% - 120px);"> |
| 132 | - <NCC-UploadFz v-model="v.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> | |
| 138 | + <NCC-UploadFz v-model="v.disposalResultFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> | |
| 133 | 139 | </div> |
| 134 | 140 | </div> |
| 135 | 141 | </el-col> |
| ... | ... | @@ -242,7 +248,7 @@ |
| 242 | 248 | </el-radio-group> |
| 243 | 249 | </el-form-item> |
| 244 | 250 | </el-col> |
| 245 | - <el-col :span="24" v-if="showSuggsetion"> | |
| 251 | + <el-col :span="24"> | |
| 246 | 252 | <el-form-item label="处置建议" prop="judgmentOpinions"> |
| 247 | 253 | <el-input |
| 248 | 254 | v-model="suggestionForm.judgmentOpinions" |
| ... | ... | @@ -256,6 +262,11 @@ |
| 256 | 262 | </el-input> |
| 257 | 263 | </el-form-item> |
| 258 | 264 | </el-col> |
| 265 | + <el-col :span="24"> | |
| 266 | + <el-form-item label="上传附件" prop="judgmentFileUrl"> | |
| 267 | + <NCC-UploadFz v-model="suggestionForm.judgmentFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" /> | |
| 268 | + </el-form-item> | |
| 269 | + </el-col> | |
| 259 | 270 | </el-form> |
| 260 | 271 | </el-row> |
| 261 | 272 | </el-col> |
| ... | ... | @@ -300,6 +311,7 @@ export default { |
| 300 | 311 | obtainEvidence: [], |
| 301 | 312 | annex: [], |
| 302 | 313 | externalAssistanceId: undefined, |
| 314 | + judgmentFileUrl: [], | |
| 303 | 315 | }, |
| 304 | 316 | sourceOptions: [], |
| 305 | 317 | platformTypeOptions: [], | ... | ... |
src/views/DisposalSuggestions/HandleForm.vue
| ... | ... | @@ -120,6 +120,12 @@ |
| 120 | 120 | <div class="label w-120">处置建议:</div> |
| 121 | 121 | <div class="text">{{ v.judgmentOpinion }}</div> |
| 122 | 122 | </div> |
| 123 | + <div class="form-item" v-if="v.judgmentFileUrl"> | |
| 124 | + <div class="label w-120">处置附件:</div> | |
| 125 | + <div class="text" style="width: calc(100% - 120px);"> | |
| 126 | + <NCC-UploadFz v-model="v.judgmentFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> | |
| 127 | + </div> | |
| 128 | + </div> | |
| 123 | 129 | </el-col> |
| 124 | 130 | <el-col :span="24" v-for="(v, i) in dataForm.disposalSuggestions" :key="i" style="border: #f6f6f6 solid 1px; border-radius: 10px; padding: 8px; margin-bottom: 5px;"> |
| 125 | 131 | <div class="title">处置信息{{ i + 1 }}</div> |
| ... | ... | @@ -127,10 +133,10 @@ |
| 127 | 133 | <div class="label w-120">处置结果:</div> |
| 128 | 134 | <div class="text">{{ v.disposalSuggestion }}</div> |
| 129 | 135 | </div> |
| 130 | - <div class="form-item" v-if="v.fileUrl"> | |
| 136 | + <div class="form-item" v-if="v.disposalResultFileUrl"> | |
| 131 | 137 | <div class="label w-120">处置附件:</div> |
| 132 | 138 | <div class="text" style="width: calc(100% - 120px);"> |
| 133 | - <NCC-UploadFz v-model="v.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> | |
| 139 | + <NCC-UploadFz v-model="v.disposalResultFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> | |
| 134 | 140 | </div> |
| 135 | 141 | </div> |
| 136 | 142 | </el-col> |
| ... | ... | @@ -283,6 +289,7 @@ |
| 283 | 289 | }, |
| 284 | 290 | watch: {}, |
| 285 | 291 | created() { |
| 292 | + this.initAreaTypeList(); | |
| 286 | 293 | this.getSourceOptions(); |
| 287 | 294 | // this.getplatformTypeOptions(); |
| 288 | 295 | // this.getquestionTypeOptions(); |
| ... | ... | @@ -331,6 +338,7 @@ |
| 331 | 338 | this.loading = false; |
| 332 | 339 | this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName); |
| 333 | 340 | this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions); |
| 341 | + console.log(this.dataForm.areaName); | |
| 334 | 342 | this.suggestionForm.area = res.data.areaId |
| 335 | 343 | if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = []; |
| 336 | 344 | if (!this.dataForm.annex) this.dataForm.annex = []; | ... | ... |
src/views/DisposalSuggestions/index.vue
| ... | ... | @@ -32,12 +32,15 @@ |
| 32 | 32 | </el-col> |
| 33 | 33 | <el-col :span="3"> |
| 34 | 34 | <el-form-item label=""> |
| 35 | - <el-input v-model="query.questionType" placeholder="请选择问题类型" clearable/> | |
| 35 | + <el-select v-model="query.questionType" placeholder="请选择问题类型" clearable> | |
| 36 | + <el-option v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" :value="item.id" /> | |
| 37 | + </el-select> | |
| 38 | + <!-- <el-input v-model="query.questionType" placeholder="请选择问题类型" clearable/> --> | |
| 36 | 39 | </el-form-item> |
| 37 | 40 | </el-col> |
| 38 | 41 | <el-col :span="3"> |
| 39 | 42 | <el-form-item label=""> |
| 40 | - <el-select v-model="query.state" placeholder="请选择类型" clearable> | |
| 43 | + <el-select v-model="query.state" placeholder="请选择状态" clearable> | |
| 41 | 44 | <el-option v-for="item in stateOptions" :key="item" :label="item" :value="item"/> |
| 42 | 45 | </el-select> |
| 43 | 46 | </el-form-item> |
| ... | ... | @@ -110,9 +113,9 @@ |
| 110 | 113 | </el-table-column> --> |
| 111 | 114 | <el-table-column label="操作" fixed="right" width="200"> |
| 112 | 115 | <template slot-scope="scope"> |
| 113 | - <template v-if="userId == scope.row.creatorUserId"> | |
| 114 | - <el-button type="text" @click="addForm(scope.row.id)" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">编辑</el-button> | |
| 115 | - <el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">删除</el-button> | |
| 116 | + <template v-if="userId == scope.row.creatorUserId && (scope.row.stage == '577006621985604869' || scope.row.stage =='577006641364189019')"> | |
| 117 | + <el-button type="text" @click="addForm(scope.row.id)">编辑</el-button> | |
| 118 | + <el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除</el-button> | |
| 116 | 119 | </template> |
| 117 | 120 | <el-button type="text" @click="addOrUpdateHandle(scope.row.id, false, 'edit')" v-if="isSHILevel && scope.row.stage == '577006666214540549'" >建议修改</el-button> |
| 118 | 121 | <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’ / 已处置 ‘577006696312866053’ 可以研判 --> |
| ... | ... | @@ -192,7 +195,14 @@ export default { |
| 192 | 195 | { fullName: "自主巡查发现", id: "自主巡查发现" }, |
| 193 | 196 | ], |
| 194 | 197 | systemTypeOptions: [], |
| 195 | - questionTypeOptions: [], | |
| 198 | + questionTypeOptions: [ | |
| 199 | + { fullName: "存在有害信息", id: "577006944540165381" }, | |
| 200 | + { fullName: "内容审核不到位", id: "577006978564359429" }, | |
| 201 | + { fullName: "错误表述", id: "584886326260663557" }, | |
| 202 | + { fullName: "删除链接", id: "591435954770674949" }, | |
| 203 | + { fullName: "样本查删", id: "591436151911351557" }, | |
| 204 | + { fullName: "其他", id: "0" }, | |
| 205 | + ], | |
| 196 | 206 | questionClassOptions: [ |
| 197 | 207 | { fullName: "选项一", id: "1" }, |
| 198 | 208 | { fullName: "选项二", id: "2" }, | ... | ... |
src/views/baseCaseHandling/Form.vue
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 | </el-col> |
| 27 | 27 | <el-col :span="24"> |
| 28 | 28 | <el-form-item label="来源登记" prop="sourceRegistration"> |
| 29 | - <el-input v-model="dataForm.sourceRegistration" placeholder="请输入来源登记" clearable :disabled="formType != 0"/> | |
| 29 | + <el-input v-model="dataForm.sourceRegistration" placeholder="请输入来源登记" clearable /> | |
| 30 | 30 | </el-form-item> |
| 31 | 31 | </el-col> |
| 32 | 32 | <!-- <el-col :span="24"> |
| ... | ... | @@ -92,7 +92,7 @@ |
| 92 | 92 | </el-col> |
| 93 | 93 | <el-col :span="24"> |
| 94 | 94 | <el-form-item label="备案号" prop="recordNumber"> |
| 95 | - <el-input v-model="dataForm.recordNumber" placeholder="请输入备案号" clearable :disabled="formType == 2"/> | |
| 95 | + <el-input v-model="dataForm.recordNumber" placeholder="请输入备案号" clearable /> | |
| 96 | 96 | </el-form-item> |
| 97 | 97 | </el-col> |
| 98 | 98 | <el-col :span="24" v-if="isSHILevel"> |
| ... | ... | @@ -111,20 +111,20 @@ |
| 111 | 111 | </el-col> |
| 112 | 112 | <el-col :span="24"> |
| 113 | 113 | <el-form-item label="违法原因" prop="illegalReasons"> |
| 114 | - <el-input type="textarea" v-model="dataForm.illegalReasons" placeholder="请输入违法原因" clearable maxlength="200" :disabled="formType == 2"/> | |
| 114 | + <el-input type="textarea" v-model="dataForm.illegalReasons" placeholder="请输入违法原因" clearable maxlength="200" /> | |
| 115 | 115 | </el-form-item> |
| 116 | 116 | </el-col> |
| 117 | 117 | <el-col :span="24"> |
| 118 | 118 | <el-form-item label="处罚要求" prop="punishmentRequirements"> |
| 119 | - <el-input type="textarea" v-model="dataForm.punishmentRequirements" placeholder="请输入处罚要求" clearable maxlength="200" :disabled="formType == 2"/> | |
| 119 | + <el-input type="textarea" v-model="dataForm.punishmentRequirements" placeholder="请输入处罚要求" clearable maxlength="200" /> | |
| 120 | 120 | </el-form-item> |
| 121 | 121 | </el-col> |
| 122 | 122 | <el-col :span="24"> |
| 123 | 123 | <el-form-item label="处罚内容" prop="punishmentContent"> |
| 124 | - <el-input type="textarea" v-model="dataForm.punishmentContent" placeholder="请输入处罚内容" clearable maxlength="200" :disabled="formType == 2"/> | |
| 124 | + <el-input type="textarea" v-model="dataForm.punishmentContent" placeholder="请输入处罚内容" clearable maxlength="200" /> | |
| 125 | 125 | </el-form-item> |
| 126 | 126 | </el-col> |
| 127 | - <el-col :span="24" v-if="isSHILevel"> | |
| 127 | + <el-col :span="24" > | |
| 128 | 128 | <el-form-item label="执法方式" prop="enforceType"> |
| 129 | 129 | <el-radio-group v-model="dataForm.enforceType"> |
| 130 | 130 | <el-radio label="柔性执法">柔性执法</el-radio> |
| ... | ... | @@ -132,13 +132,13 @@ |
| 132 | 132 | </el-radio-group> |
| 133 | 133 | </el-form-item> |
| 134 | 134 | </el-col> |
| 135 | - <el-col :span="24" v-if="!isSHILevel && formType == 2"> | |
| 135 | + <el-col :span="24" > | |
| 136 | 136 | <el-form-item label="执法说明" prop="enforcecontent"> |
| 137 | 137 | <el-input type="textarea" v-model="dataForm.enforcecontent" placeholder="请输入执法说明" clearable maxlength="200"/> |
| 138 | 138 | </el-form-item> |
| 139 | 139 | </el-col> |
| 140 | 140 | <!-- 立案审批、调查(询问)笔录、案件处理意见、执法约谈、行政处罚意见告知、行政处罚决定、行政处罚结案报告、其他(每个流程都为填空+上传附件,非必填) --> |
| 141 | - <template v-if="formType == 2"> | |
| 141 | + <template> | |
| 142 | 142 | <el-col :span="24"> |
| 143 | 143 | <el-form-item label="立案审批" prop="registerApproval"> |
| 144 | 144 | <el-input type="textarea" v-model="dataForm.registerApproval" placeholder="请输入立案审批" clearable maxlength="200"/> |
| ... | ... | @@ -426,12 +426,12 @@ export default { |
| 426 | 426 | districtCounty: [ |
| 427 | 427 | { required: true, message: "请选择所属区域", trigger: "change" } |
| 428 | 428 | ], |
| 429 | - enforceType: [ | |
| 430 | - { required: true, message: "请选择执法方式", trigger: "bulr" } | |
| 431 | - ], | |
| 432 | - enforcecontent: [ | |
| 433 | - { required: true, message: "请填写执法说明", trigger: "bulr" } | |
| 434 | - ], | |
| 429 | + // enforceType: [ | |
| 430 | + // { required: true, message: "请选择执法方式", trigger: "bulr" } | |
| 431 | + // ], | |
| 432 | + // enforcecontent: [ | |
| 433 | + // { required: true, message: "请填写执法说明", trigger: "bulr" } | |
| 434 | + // ], | |
| 435 | 435 | }, |
| 436 | 436 | systemOption: [], |
| 437 | 437 | system_loading: false, |
| ... | ... | @@ -586,7 +586,7 @@ export default { |
| 586 | 586 | this.$emit("refresh"); |
| 587 | 587 | }, |
| 588 | 588 | init(id, isDetail, type) { |
| 589 | - // type 0 上报/下派 1 处理 | |
| 589 | + // type 0 新增 1 编辑 2 处理 | |
| 590 | 590 | this.formType = type || '0'; |
| 591 | 591 | this.dataForm.id = id || undefined; |
| 592 | 592 | this.isDetail = isDetail || false; | ... | ... |
src/views/baseCaseHandling/index.vue
| ... | ... | @@ -87,7 +87,7 @@ |
| 87 | 87 | <el-table-column prop="illegalReasons" label="违法原因" align="left" show-overflow-tooltip/> |
| 88 | 88 | <el-table-column prop="punishmentRequirements" label="处罚要求" align="left" show-overflow-tooltip/> |
| 89 | 89 | <el-table-column prop="punishmentContent" label="处罚内容" align="left" show-overflow-tooltip/> |
| 90 | - <el-table-column label="状态" prop="state" align="left" > | |
| 90 | + <el-table-column label="状态" prop="state" align="left" width="100"> | |
| 91 | 91 | <template slot-scope="scope"> |
| 92 | 92 | <el-tag :type="ncc.getStateTagType(scope.row.state, stateOptions)">{{ scope.row.state | dynamicTextUP(stateOptions) }}</el-tag> |
| 93 | 93 | </template> |
| ... | ... | @@ -100,7 +100,7 @@ |
| 100 | 100 | <el-table-column label="操作" fixed="right" width="180"> |
| 101 | 101 | <template slot-scope="scope"> |
| 102 | 102 | <el-button size="mini" type="text" @click="addOrUpdateHandle(scope.row.id, true) " >详情</el-button> |
| 103 | - <el-button type="text" v-if="scope.row.state == '592592903172261125' && scope.row.creatorUserId != $store.state.user.id" @click="addOrUpdateHandle(scope.row.id, false, '2')" >处理</el-button> | |
| 103 | + <el-button type="text" v-if="(scope.row.state == '592592903172261125' && !isSHILevel) || (scope.row.state == '594684878927787126' && isSHILevel)" @click="addOrUpdateHandle(scope.row.id, false, '2')" >处理</el-button> | |
| 104 | 104 | <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="addOrUpdateHandle(scope.row.id, false, '1')" >编辑</el-button> |
| 105 | 105 | <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="toReportCase(scope.row.id)" >{{isSHILevel ? '下发' : '上报'}}</el-button> |
| 106 | 106 | <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button> |
| ... | ... | @@ -170,6 +170,15 @@ export default { |
| 170 | 170 | { fullName: "选项一", id: "选项一" }, |
| 171 | 171 | { fullName: "", id: "选项二" }, |
| 172 | 172 | ], |
| 173 | + stateList: [ | |
| 174 | + { fullName: "未上报", id: "592592614457345285" }, | |
| 175 | + { fullName: "未下发", id: "592592756363232517" }, | |
| 176 | + { fullName: "待处理", id: "592592903172261125" }, | |
| 177 | + { fullName: "下发待处理", id: "592592903172261125" }, | |
| 178 | + { fullName: "上报待处理", id: "594684878927787126" }, | |
| 179 | + { fullName: "已处理", id: "592592999649641733" }, | |
| 180 | + { fullName: "仅保存", id: "593238431962760453" }, | |
| 181 | + ], | |
| 173 | 182 | stateOptions: [], |
| 174 | 183 | areaOptions: [], |
| 175 | 184 | systemOptions: [], | ... | ... |
src/views/baseInspectionReport/Form.vue
| ... | ... | @@ -268,6 +268,12 @@ |
| 268 | 268 | <div class="label w-120">处置建议:</div> |
| 269 | 269 | <div class="text">{{ v.judgmentOpinion }}</div> |
| 270 | 270 | </div> |
| 271 | + <div class="form-item" v-if="v.judgmentFileUrl"> | |
| 272 | + <div class="label w-120">处置附件:</div> | |
| 273 | + <div class="text" style="width: calc(100% - 120px);"> | |
| 274 | + <NCC-UploadFz v-model="v.judgmentFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> | |
| 275 | + </div> | |
| 276 | + </div> | |
| 271 | 277 | </el-col> |
| 272 | 278 | <el-col v-for="(v, i) in dataForm.disposalSuggestions" :key="i" style="border: #f6f6f6 solid 1px; border-radius: 10px; padding: 8px; margin-bottom: 5px;"> |
| 273 | 279 | <div class="title">处置信息{{ i + 1 }}</div> |
| ... | ... | @@ -275,10 +281,10 @@ |
| 275 | 281 | <div class="label w-120">处置结果:</div> |
| 276 | 282 | <div class="text">{{ v.disposalSuggestion }}</div> |
| 277 | 283 | </div> |
| 278 | - <div class="form-item" v-if="v.fileUrl"> | |
| 284 | + <div class="form-item" v-if="v.disposalResultFileUrl"> | |
| 279 | 285 | <div class="label w-120">处置附件:</div> |
| 280 | 286 | <div class="text" style="width: calc(100% - 120px);"> |
| 281 | - <NCC-UploadFz v-model="v.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> | |
| 287 | + <NCC-UploadFz v-model="v.disposalResultFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> | |
| 282 | 288 | </div> |
| 283 | 289 | </div> |
| 284 | 290 | </el-col> |
| ... | ... | @@ -585,7 +591,6 @@ export default { |
| 585 | 591 | dataFormSubmit() { |
| 586 | 592 | this.$refs["elForm"].validate(async (valid) => { |
| 587 | 593 | if (valid) { |
| 588 | - console.log(this.dataForm, 'this.dataForm'); | |
| 589 | 594 | let obj = { |
| 590 | 595 | ...this.dataForm, |
| 591 | 596 | questionType: this.dataForm.questionType == '0' ? this.dataForm.otherQuestionType : this.dataForm.questionType, | ... | ... |
src/views/baseListHazardousSamples/index.vue
| ... | ... | @@ -60,7 +60,10 @@ |
| 60 | 60 | </el-col> |
| 61 | 61 | <el-col :span="5"> |
| 62 | 62 | <el-form-item label=""> |
| 63 | - <el-input v-model="query.questionType" clearable placeholder="请输入问题类型" /> | |
| 63 | + <el-select v-model="query.questionType" placeholder="请选择问题类型" clearable> | |
| 64 | + <el-option v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" :value="item.id" /> | |
| 65 | + </el-select> | |
| 66 | + <!-- <el-input v-model="query.questionType" clearable placeholder="请输入问题类型" /> --> | |
| 64 | 67 | </el-form-item> |
| 65 | 68 | </el-col> |
| 66 | 69 | <el-col :span="3"> |
| ... | ... | @@ -128,6 +131,14 @@ export default { |
| 128 | 131 | company: undefined, |
| 129 | 132 | questionType: undefined, |
| 130 | 133 | }, |
| 134 | + questionTypeOptions: [ | |
| 135 | + { fullName: "存在有害信息", id: "577006944540165381" }, | |
| 136 | + { fullName: "内容审核不到位", id: "577006978564359429" }, | |
| 137 | + { fullName: "错误表述", id: "584886326260663557" }, | |
| 138 | + { fullName: "删除链接", id: "591435954770674949" }, | |
| 139 | + { fullName: "样本查删", id: "591436151911351557" }, | |
| 140 | + { fullName: "其他", id: "0" }, | |
| 141 | + ], | |
| 131 | 142 | list: [], |
| 132 | 143 | listLoading: false, |
| 133 | 144 | multipleSelection: [], | ... | ... |
src/views/basePrincipalResponsibility/index.vue
| ... | ... | @@ -13,7 +13,10 @@ |
| 13 | 13 | </el-col> |
| 14 | 14 | <el-col :span="6"> |
| 15 | 15 | <el-form-item label=""> |
| 16 | - <el-input v-model="query.fileType" placeholder="请输入文件类型" clearable/> | |
| 16 | + <el-select v-model="query.fileType" placeholder="请选择文件类型" clearable> | |
| 17 | + <el-option v-for="(item, index) in fileTypeOptions" :key="index" :label="item.fullName" :value="item.id" /> | |
| 18 | + </el-select> | |
| 19 | + <!-- <el-input v-model="query.fileType" placeholder="请输入文件类型" clearable/> --> | |
| 17 | 20 | </el-form-item> |
| 18 | 21 | </el-col> |
| 19 | 22 | <el-col :span="4"> |
| ... | ... | @@ -113,10 +116,9 @@ export default { |
| 113 | 116 | this.getfileTypeOptions(); |
| 114 | 117 | }, |
| 115 | 118 | methods: { |
| 116 | - getfileTypeOptions() { | |
| 117 | - getDictionaryDataSelector("577087166203561221").then((res) => { | |
| 118 | - this.fileTypeOptions = res.data.list; | |
| 119 | - }); | |
| 119 | + async getfileTypeOptions() { | |
| 120 | + let res = await getDictionaryDataSelector('577087166203561221'); | |
| 121 | + this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }]; | |
| 120 | 122 | }, |
| 121 | 123 | initData() { |
| 122 | 124 | this.listLoading = true; | ... | ... |
src/views/overView/Overview.vue
| ... | ... | @@ -258,27 +258,45 @@ export default { |
| 258 | 258 | val && this.getAllMsgList(); |
| 259 | 259 | }, |
| 260 | 260 | checkDetail(row, isDetail) { |
| 261 | - this.MsgFormVisible = true; | |
| 262 | - this.$nextTick(() => { | |
| 263 | - this.$refs.MsgForm.init(row.id, isDetail); | |
| 264 | - }) | |
| 261 | + let type1 = row.communicationAreaList.some((v) => v.IsRead) | |
| 262 | + let type2 = row.communicationOutList.some((v) => v.IsRead) | |
| 263 | + if(!isDetail && (type1 || type2)) { | |
| 264 | + this.$message({ | |
| 265 | + message: '该消息已有区县/外协阅读无法编辑!', | |
| 266 | + type: 'warning' | |
| 267 | + }); | |
| 268 | + } else { | |
| 269 | + this.MsgFormVisible = true; | |
| 270 | + this.$nextTick(() => { | |
| 271 | + this.$refs.MsgForm.init(row.id, isDetail); | |
| 272 | + }) | |
| 273 | + } | |
| 265 | 274 | }, |
| 266 | 275 | delNew(row) { |
| 267 | - this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', { | |
| 268 | - confirmButtonText: '确定', | |
| 269 | - cancelButtonText: '取消', | |
| 270 | - type: 'warning' | |
| 271 | - }).then(async () => { | |
| 272 | - let res = await request({ | |
| 273 | - url: `/SubDev/ZyOaArticle/${row.id}`, | |
| 274 | - method: "DELETE", | |
| 275 | - }); | |
| 276 | + let type1 = row.communicationAreaList.some((v) => v.IsRead) | |
| 277 | + let type2 = row.communicationOutList.some((v) => v.IsRead) | |
| 278 | + if(type1 || type2) { | |
| 276 | 279 | this.$message({ |
| 277 | - message: res.msg, | |
| 278 | - type: 'success' | |
| 280 | + message: '该消息已有区县阅读无法编辑!', | |
| 281 | + type: 'warning' | |
| 279 | 282 | }); |
| 280 | - this.getAllMsgList(); | |
| 281 | - }); | |
| 283 | + } else { | |
| 284 | + this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', { | |
| 285 | + confirmButtonText: '确定', | |
| 286 | + cancelButtonText: '取消', | |
| 287 | + type: 'warning' | |
| 288 | + }).then(async () => { | |
| 289 | + let res = await request({ | |
| 290 | + url: `/SubDev/ZyOaArticle/${row.id}`, | |
| 291 | + method: "DELETE", | |
| 292 | + }); | |
| 293 | + this.$message({ | |
| 294 | + message: res.msg, | |
| 295 | + type: 'success' | |
| 296 | + }); | |
| 297 | + this.getAllMsgList(); | |
| 298 | + }); | |
| 299 | + } | |
| 282 | 300 | }, |
| 283 | 301 | |
| 284 | 302 | // 发布消息通知 |
| ... | ... | @@ -365,7 +383,7 @@ export default { |
| 365 | 383 | let openObject = this.getDialog(type); |
| 366 | 384 | this[openObject.visible] = true; |
| 367 | 385 | this.$nextTick(() => { |
| 368 | - this.$refs[`${openObject.node}`].init(row.taskCorrelationId, openObject.isDetail, 1); | |
| 386 | + this.$refs[`${openObject.node}`].init(row.taskCorrelationId, openObject.isDetail, openObject.type); | |
| 369 | 387 | }) |
| 370 | 388 | } |
| 371 | 389 | }, |
| ... | ... | @@ -410,7 +428,7 @@ export default { |
| 410 | 428 | break; |
| 411 | 429 | case '案件处理': |
| 412 | 430 | case '网信执法': |
| 413 | - return { visible: 'HandFormVisible', node: 'HandForm', isDetail: false, type: 1} | |
| 431 | + return { visible: 'HandFormVisible', node: 'HandForm', isDetail: false, type: 2} | |
| 414 | 432 | break; |
| 415 | 433 | case '研判': |
| 416 | 434 | return { visible: 'DisposalFormVisible', node: 'DisposalForm', isDetail: false} | ... | ... |
src/views/overView/msgForm.vue
| ... | ... | @@ -90,6 +90,11 @@ |
| 90 | 90 | <div class="msg-title">{{ dataForm.title }}</div> |
| 91 | 91 | <div class="content" v-html="dataForm.bodyContent"></div> |
| 92 | 92 | <div class="files" v-if="isSHILevel"> |
| 93 | + <h4>附件</h4> | |
| 94 | + <div style="margin-bottom: 10px;"> | |
| 95 | + <NCC-UploadFz v-if="dataForm.imgUrl && dataForm.imgUrl.length" v-model="dataForm.imgUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/> | |
| 96 | + <div style="margin-top: 10px;" v-else>无附件</div> | |
| 97 | + </div> | |
| 93 | 98 | <h4>查看情况</h4> |
| 94 | 99 | <div style="font-size: 12px; margin: 8px;"> |
| 95 | 100 | 注:<el-tag type="success" size="mini">区县</el-tag>表示 【已查看】 的区县, <el-tag type="danger" size="mini">区县</el-tag>表示 【未查看】 的区县 | ... | ... |