Commit 541d55ac3e9cee0579669e7a44ff4c8888e58f65
1 parent
4755ec66
优化
Showing
17 changed files
with
328 additions
and
200 deletions
src/assets/style/common.scss
src/components/CompanyForm/index.vue
| ... | ... | @@ -17,8 +17,7 @@ |
| 17 | 17 | class="NCC-dialog NCC-dialog_center company-dialog" |
| 18 | 18 | > |
| 19 | 19 | <el-row :gutter="15" class="NCC-dialog-content"> |
| 20 | - <el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right" | |
| 21 | - :disabled="!!isDetail" :rules="rules"> | |
| 20 | + <el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right" :rules="rules"> | |
| 22 | 21 | <el-col :span="24" v-if="false"> |
| 23 | 22 | <el-form-item label="主键" prop="id"> |
| 24 | 23 | <el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{ "width": "100%" }'> |
| ... | ... | @@ -59,6 +58,25 @@ |
| 59 | 58 | </el-form-item> |
| 60 | 59 | </el-col> |
| 61 | 60 | <el-col :span="24"> |
| 61 | + <el-form-item label="资质证明" prop="qualificationCertificate"> | |
| 62 | + <NCC-UploadFz v-model="dataForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" /> | |
| 63 | + </el-form-item> | |
| 64 | + </el-col> | |
| 65 | + <el-col :span="24"> | |
| 66 | + <el-form-item label="联系人" prop="contactUser"> | |
| 67 | + <el-input v-model="dataForm.contactUser" placeholder="请输入联系人" clearable | |
| 68 | + :style='{ "width": "100%" }'> | |
| 69 | + </el-input> | |
| 70 | + </el-form-item> | |
| 71 | + </el-col> | |
| 72 | + <el-col :span="24"> | |
| 73 | + <el-form-item label="联系电话" prop="contactPhone"> | |
| 74 | + <el-input v-model="dataForm.contactPhone" placeholder="请输入联系电话" clearable | |
| 75 | + :style='{ "width": "100%" }'> | |
| 76 | + </el-input> | |
| 77 | + </el-form-item> | |
| 78 | + </el-col> | |
| 79 | + <el-col :span="24"> | |
| 62 | 80 | <el-form-item label="所属区县" prop="areaId"> |
| 63 | 81 | <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px"> |
| 64 | 82 | <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio> |
| ... | ... | @@ -103,6 +121,8 @@ export default { |
| 103 | 121 | contactInformation: undefined, |
| 104 | 122 | qualificationCertificate: [], |
| 105 | 123 | otherInfo: undefined, |
| 124 | + contactUser: undefined, | |
| 125 | + contactPhone: undefined | |
| 106 | 126 | }, |
| 107 | 127 | rules: { |
| 108 | 128 | companyName: [ |
| ... | ... | @@ -112,10 +132,10 @@ export default { |
| 112 | 132 | trigger: 'blur' |
| 113 | 133 | }, |
| 114 | 134 | ], |
| 115 | - contactInformation: [ | |
| 135 | + contactPhone: [ | |
| 116 | 136 | { |
| 117 | 137 | pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/, |
| 118 | - message: '请输入正确的联系方式', | |
| 138 | + message: '请输入正确的联系电话', | |
| 119 | 139 | trigger: 'blur' |
| 120 | 140 | }, |
| 121 | 141 | ], |
| ... | ... | @@ -126,15 +146,15 @@ export default { |
| 126 | 146 | watch: {}, |
| 127 | 147 | mounted() {}, |
| 128 | 148 | created() { |
| 129 | - this.initAreaTypeList(); | |
| 130 | 149 | }, |
| 131 | 150 | methods: { |
| 132 | 151 | close() { |
| 133 | 152 | this.visible = false; |
| 134 | 153 | }, |
| 135 | - openDialog() { | |
| 136 | - this.visible = true; | |
| 137 | - this.$refs['elForm'].resetFields(); | |
| 154 | + async openDialog() { | |
| 155 | + this.visible = true; | |
| 156 | + await this.initAreaTypeList(); | |
| 157 | + this.$refs['elForm'].resetFields(); | |
| 138 | 158 | }, |
| 139 | 159 | async dataFormSubmit() { |
| 140 | 160 | this.$refs['elForm'].validate((valid) => { | ... | ... |
src/components/Generator/components/Upload/UploadFz.vue
| ... | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 | <el-upload :action="define.comUploadUrl+'/'+type" :headers="uploadHeaders" ref="elUpload" |
| 4 | 4 | :on-success="handleSuccess" :multiple="limit!==1" :show-file-list="false" :accept="accept" |
| 5 | 5 | :before-upload="beforeUpload" :on-exceed="handleExceed" :disabled="disabled" :limit="limit" v-if="!disabled"> |
| 6 | - <el-button size="small" icon="el-icon-upload" :disabled="disabled">{{buttonText}}</el-button> | |
| 6 | + <el-button size="small" icon="el-icon-upload" :disabled="disabled" :on-preview="handlePreview">{{buttonText}}</el-button> | |
| 7 | 7 | <div slot="tip" class="el-upload__tip" v-show="showTip"> |
| 8 | 8 | 只能上传不超过{{fileSize}}{{sizeUnit}}的{{accept}}文件 |
| 9 | 9 | </div> |
| ... | ... | @@ -117,6 +117,9 @@ export default { |
| 117 | 117 | handleExceed(files, fileList) { |
| 118 | 118 | this.$message.warning(`当前限制最多可以上传${this.limit}个文件`); |
| 119 | 119 | }, |
| 120 | + handlePreview(file) { | |
| 121 | + // console.log(file); | |
| 122 | + }, | |
| 120 | 123 | handleRemove(file, index) { |
| 121 | 124 | this.fileList.splice(index, 1) |
| 122 | 125 | this.$refs.elUpload.uploadFiles.splice(index, 1) | ... | ... |
src/components/InfoForm/index.vue
| ... | ... | @@ -32,7 +32,6 @@ |
| 32 | 32 | v-model="infoForm.companyId" |
| 33 | 33 | placeholder="请选择运营主体" |
| 34 | 34 | clearable |
| 35 | - v-loadMore="nextCompanyList" | |
| 36 | 35 | style="width: 100%" |
| 37 | 36 | @change="companyChange" |
| 38 | 37 | > |
| ... | ... | @@ -47,7 +46,7 @@ |
| 47 | 46 | </el-form-item> |
| 48 | 47 | </el-col> |
| 49 | 48 | <el-col :span="4"> |
| 50 | - <companyForm /> | |
| 49 | + <companyForm @refresh="initCompanyList"/> | |
| 51 | 50 | </el-col> |
| 52 | 51 | </el-col> |
| 53 | 52 | <el-col :span="24" v-if="isShowCompanyInfo"> |
| ... | ... | @@ -73,7 +72,16 @@ |
| 73 | 72 | </div> |
| 74 | 73 | </div> |
| 75 | 74 | </el-col> |
| 76 | - <el-col :span="24"> | |
| 75 | + <el-col :span="12"> | |
| 76 | + <el-form-item label="应用名称" prop="systemName"> | |
| 77 | + <el-input | |
| 78 | + v-model="infoForm.systemName" | |
| 79 | + placeholder="请输入应用名称" | |
| 80 | + maxlength="50" | |
| 81 | + ></el-input> | |
| 82 | + </el-form-item> | |
| 83 | + </el-col> | |
| 84 | + <el-col :span="12"> | |
| 77 | 85 | <el-form-item label="应用类型" prop="systemType"> |
| 78 | 86 | <el-radio-group v-model="infoForm.systemType"> |
| 79 | 87 | <el-radio |
| ... | ... | @@ -86,17 +94,34 @@ |
| 86 | 94 | </el-radio-group> |
| 87 | 95 | </el-form-item> |
| 88 | 96 | </el-col> |
| 89 | - <el-col :span="24" v-show="isFilings"> | |
| 90 | - <el-col :span="12"> | |
| 91 | - <el-form-item label="特殊备案类型" prop="specialRecordType"> | |
| 97 | + <el-col :span="12"> | |
| 98 | + <el-form-item label="应用分类" prop="systemClass"> | |
| 99 | + <el-select | |
| 100 | + v-model="infoForm.systemClass" | |
| 101 | + placeholder="请选择应用分类" | |
| 102 | + :disabled="!infoForm.systemType" | |
| 103 | + style="width: 100%" | |
| 104 | + > | |
| 105 | + <el-option | |
| 106 | + v-for="item in systemClassOptions" | |
| 107 | + :key="item.Id" | |
| 108 | + :label="item.ClassName" | |
| 109 | + :value="item.Id" | |
| 110 | + > | |
| 111 | + </el-option> | |
| 112 | + </el-select> | |
| 113 | + </el-form-item> | |
| 114 | + </el-col> | |
| 115 | + <el-col :span="12" v-show="isFilings"> | |
| 116 | + <el-form-item label="特殊备案类型" prop="specialRecordType"> | |
| 92 | 117 | <el-select v-model="infoForm.specialRecordType" placeholder="请选择特殊备案类型" style="width: 100%;"> |
| 93 | 118 | <el-option v-for="v in specialRecordTypeOption" :key="v.id" :label="v.fullName" :value="v.id" /> |
| 94 | 119 | </el-select> |
| 95 | - </el-form-item> | |
| 96 | - </el-col> | |
| 97 | - <el-col :span="24"> | |
| 98 | - <el-form-item label="特殊备案内容" prop="specialRecordContent"> | |
| 99 | - <el-input | |
| 120 | + </el-form-item> | |
| 121 | + </el-col> | |
| 122 | + <el-col :span="24" v-show="isFilings"> | |
| 123 | + <el-form-item label="特殊备案内容" prop="specialRecordContent"> | |
| 124 | + <el-input | |
| 100 | 125 | v-model="infoForm.specialRecordContent" |
| 101 | 126 | placeholder="请输入" |
| 102 | 127 | show-word-limit |
| ... | ... | @@ -104,19 +129,19 @@ |
| 104 | 129 | type="textarea" |
| 105 | 130 | :autosize="{ minRows: 4, maxRows: 4 }" |
| 106 | 131 | > |
| 107 | - </el-input> | |
| 108 | - </el-form-item> | |
| 109 | - </el-col> | |
| 110 | - <el-col :span="12"> | |
| 111 | - <el-form-item label="特殊备案号" prop="specialRecordNumber"> | |
| 132 | + </el-input> | |
| 133 | + </el-form-item> | |
| 134 | + </el-col> | |
| 135 | + <el-col :span="12" v-show="isFilings"> | |
| 136 | + <el-form-item label="特殊备案号" prop="specialRecordNumber"> | |
| 112 | 137 | <el-input |
| 113 | 138 | v-model="infoForm.specialRecordNumber" |
| 114 | 139 | placeholder="请输入特殊备案号" |
| 115 | 140 | maxlength="200" |
| 116 | 141 | ></el-input> |
| 117 | - </el-form-item> | |
| 118 | - </el-col> | |
| 119 | - <el-col :span="12"> | |
| 142 | + </el-form-item> | |
| 143 | + </el-col> | |
| 144 | + <el-col :span="12" v-show="isFilings"> | |
| 120 | 145 | <el-form-item label="特殊备案时间" prop="specialRecordTime"> |
| 121 | 146 | <el-date-picker |
| 122 | 147 | v-model="infoForm.specialRecordTime" |
| ... | ... | @@ -125,33 +150,42 @@ |
| 125 | 150 | style="width: 100%;"> |
| 126 | 151 | </el-date-picker> |
| 127 | 152 | </el-form-item> |
| 128 | - </el-col> | |
| 129 | 153 | </el-col> |
| 130 | - <el-col :span="12"> | |
| 131 | - <el-form-item label="应用名称" prop="systemName"> | |
| 132 | - <el-input | |
| 133 | - v-model="infoForm.systemName" | |
| 134 | - placeholder="请输入系统名称" | |
| 135 | - maxlength="50" | |
| 136 | - ></el-input> | |
| 154 | + <!-- APP增加字段“安装次数” --> | |
| 155 | + <el-col :span="12" v-show="infoForm.systemType == '576280004254500101'"> | |
| 156 | + <el-form-item label="安装次数" prop="systemDownloadVolume"> | |
| 157 | + <el-input-number | |
| 158 | + v-model="infoForm.systemDownloadVolume" | |
| 159 | + placeholder="请输入安装次数" | |
| 160 | + :min="0" | |
| 161 | + :precision="0" | |
| 162 | + controls-position="right" | |
| 163 | + style="width: 100%;" | |
| 164 | + ></el-input-number> | |
| 137 | 165 | </el-form-item> |
| 138 | 166 | </el-col> |
| 139 | - <el-col :span="12"> | |
| 140 | - <el-form-item label="应用分类" prop="systemClass"> | |
| 141 | - <el-select | |
| 142 | - v-model="infoForm.systemClass" | |
| 143 | - placeholder="请选择系统分类" | |
| 144 | - :disabled="!infoForm.systemType" | |
| 145 | - style="width: 100%" | |
| 146 | - > | |
| 147 | - <el-option | |
| 148 | - v-for="item in systemClassOptions" | |
| 149 | - :key="item.Id" | |
| 150 | - :label="item.ClassName" | |
| 151 | - :value="item.Id" | |
| 152 | - > | |
| 153 | - </el-option> | |
| 154 | - </el-select> | |
| 167 | + <el-col :span="12" v-show="infoForm.systemType == '576280043370579205' || infoForm.systemType == '576280085330396421'"> | |
| 168 | + <el-form-item label="月活" prop="MAU"> | |
| 169 | + <el-input-number | |
| 170 | + v-model="infoForm.MAU" | |
| 171 | + placeholder="请输入月活" | |
| 172 | + :min="0" | |
| 173 | + :precision="0" | |
| 174 | + controls-position="right" | |
| 175 | + style="width: 100%;" | |
| 176 | + ></el-input-number> | |
| 177 | + </el-form-item> | |
| 178 | + </el-col> | |
| 179 | + <el-col :span="12" v-show="infoForm.systemType == '580634746028033285'"> | |
| 180 | + <el-form-item label="粉丝量" prop="followerCount"> | |
| 181 | + <el-input-number | |
| 182 | + v-model="infoForm.followerCount" | |
| 183 | + placeholder="请输入粉丝量" | |
| 184 | + :min="0" | |
| 185 | + :precision="0" | |
| 186 | + controls-position="right" | |
| 187 | + style="width: 100%;" | |
| 188 | + ></el-input-number> | |
| 155 | 189 | </el-form-item> |
| 156 | 190 | </el-col> |
| 157 | 191 | <el-col :span="12"> |
| ... | ... | @@ -181,7 +215,7 @@ |
| 181 | 215 | ></el-input> |
| 182 | 216 | </el-form-item> |
| 183 | 217 | </el-col> |
| 184 | - <el-col :span="12"> | |
| 218 | + <!-- <el-col :span="12"> | |
| 185 | 219 | <el-form-item label="下载量" prop="systemDownloadVolume"> |
| 186 | 220 | <el-input |
| 187 | 221 | v-model.number="infoForm.systemDownloadVolume" |
| ... | ... | @@ -189,7 +223,7 @@ |
| 189 | 223 | placeholder="请输入下载量" |
| 190 | 224 | ></el-input> |
| 191 | 225 | </el-form-item> |
| 192 | - </el-col> | |
| 226 | + </el-col> --> | |
| 193 | 227 | <el-col :span="12"> |
| 194 | 228 | <el-form-item label="版本" prop="version"> |
| 195 | 229 | <el-input |
| ... | ... | @@ -258,7 +292,7 @@ |
| 258 | 292 | </el-form> |
| 259 | 293 | </div> |
| 260 | 294 | <span slot="footer" class="dialog-footer"> |
| 261 | - <el-button @click="close">取消</el-button> | |
| 295 | + <el-button @click="visible = false">取消</el-button> | |
| 262 | 296 | <el-button type="primary" @click="confirm" :loading="btnLoading">确认</el-button> |
| 263 | 297 | </span> |
| 264 | 298 | </el-dialog> |
| ... | ... | @@ -266,11 +300,10 @@ |
| 266 | 300 | </template> |
| 267 | 301 | |
| 268 | 302 | <script> |
| 269 | -import { getCompanyInfoList, getCompanyInfoById } from "@/api/baseData/company"; | |
| 270 | -import { getSystemTypeList, uploader } from "@/api/common"; | |
| 271 | -import { getSystemClassSelect } from "@/api/baseData/systemClass"; | |
| 272 | -import { getAreaSelect } from "@/api/baseData/area"; | |
| 303 | +import { getCompanyInfoById } from "@/api/baseData/company"; | |
| 304 | +import { uploader } from "@/api/common"; | |
| 273 | 305 | import { addSystem, updataSystem, getSystemDetail } from "@/api/baseData/info"; |
| 306 | +import request from "@/utils/request"; | |
| 274 | 307 | import infoMixin from "@/mixins/info"; |
| 275 | 308 | |
| 276 | 309 | export default { |
| ... | ... | @@ -290,6 +323,7 @@ export default { |
| 290 | 323 | return { |
| 291 | 324 | uploadHeaders: { Authorization: this.$store.getters.token }, |
| 292 | 325 | visible: false, |
| 326 | + isDetail: false, | |
| 293 | 327 | infoForm_loading: false, |
| 294 | 328 | infoForm: { |
| 295 | 329 | companyId: "", // 主体企业 |
| ... | ... | @@ -311,21 +345,23 @@ export default { |
| 311 | 345 | specialRecordNumber: '', |
| 312 | 346 | specialRecordTime: '', |
| 313 | 347 | systemIconModel: '', |
| 348 | + MAU: '', | |
| 349 | + followerCount: 0, | |
| 314 | 350 | }, |
| 315 | 351 | infoRules: { |
| 316 | 352 | systemName: { |
| 317 | 353 | required: true, |
| 318 | - message: "请输入系统名称", | |
| 354 | + message: "请输入应用名称", | |
| 319 | 355 | trigger: "blur", |
| 320 | 356 | }, |
| 321 | 357 | systemClass: { |
| 322 | 358 | required: true, |
| 323 | - message: "请输入系统分类", | |
| 359 | + message: "请输入应用分类", | |
| 324 | 360 | trigger: "blur", |
| 325 | 361 | }, |
| 326 | 362 | systemType: { |
| 327 | 363 | required: true, |
| 328 | - message: "请输入系统类型", | |
| 364 | + message: "请输入应用类型", | |
| 329 | 365 | trigger: "blur", |
| 330 | 366 | }, |
| 331 | 367 | companyId: { |
| ... | ... | @@ -367,7 +403,11 @@ export default { |
| 367 | 403 | methods: { |
| 368 | 404 | handleAvatarSuccess(response, file, fileList) { |
| 369 | 405 | if(response.code != 200) return; |
| 370 | - this.infoForm.systemIconModel = response.data; | |
| 406 | + this.infoForm.systemIconModel = { | |
| 407 | + fileId: response.data.name, | |
| 408 | + name: file.name, | |
| 409 | + url: response.data.url, | |
| 410 | + }; | |
| 371 | 411 | this.$forceUpdate(); |
| 372 | 412 | this.$message({ |
| 373 | 413 | showClose: true, |
| ... | ... | @@ -377,15 +417,12 @@ export default { |
| 377 | 417 | }, |
| 378 | 418 | // 请求公司列表 |
| 379 | 419 | async initCompanyList() { |
| 380 | - let { data } = await getCompanyInfoList(this.listQuery_company); | |
| 381 | - this.companyOptions = [...this.companyOptions, ...data.list]; | |
| 382 | - this.total_company = data.pagination.total; | |
| 383 | - }, | |
| 384 | - // 无限下拉 | |
| 385 | - nextCompanyList() { | |
| 386 | - if (this.total_company != 0 && this.total_company == this.companyOptions.length) return; | |
| 387 | - this.listQuery_company.pageIndex++; | |
| 388 | - this.initCompanyList(); | |
| 420 | + request({ | |
| 421 | + url: `/Extend/basecomapnyinfo/GetNoPagingList`, | |
| 422 | + method: "GET", | |
| 423 | + }).then(({data}) => { | |
| 424 | + this.companyOptions = data; | |
| 425 | + }) | |
| 389 | 426 | }, |
| 390 | 427 | async companyChange(val) { |
| 391 | 428 | // 公司信息 |
| ... | ... | @@ -437,13 +474,16 @@ export default { |
| 437 | 474 | async initForm() { |
| 438 | 475 | let { data } = await getSystemDetail(this.systemId); |
| 439 | 476 | this.infoForm = data; |
| 440 | - this.handleSystemTypeChange(data.systemType); | |
| 477 | + this.handleSystemTypeChange(data.systemType, data.systemClass); | |
| 441 | 478 | data.companyId && await this.companyChange(data.companyId); |
| 442 | 479 | this.$forceUpdate(); |
| 443 | 480 | }, |
| 444 | 481 | handleSystemTypeChange(val) { |
| 445 | 482 | this.isFilings = Boolean(val != '580634746028033285'); |
| 446 | - this.infoForm.systemClass = ""; | |
| 483 | + this.infoForm.systemClass = this.infoForm.systemClass || ''; | |
| 484 | + this.infoForm.systemDownloadVolume = this.infoForm.systemDownloadVolume || ''; | |
| 485 | + this.infoForm.MAU = this.infoForm.MAU || ''; | |
| 486 | + this.infoForm.followerCount = this.infoForm.followerCount || ''; | |
| 447 | 487 | this.initSystemClassList(val); |
| 448 | 488 | }, |
| 449 | 489 | async confirm() { | ... | ... |
src/main.js
| ... | ... | @@ -58,6 +58,14 @@ Vue.directive('loadMore', { |
| 58 | 58 | }) |
| 59 | 59 | } |
| 60 | 60 | }) |
| 61 | +Vue.directive('removeAriaHidden', { | |
| 62 | + bind(el, binding) { | |
| 63 | + let ariaEls = el.querySelectorAll('.el-radio__original'); | |
| 64 | + ariaEls.forEach((item) => { | |
| 65 | + item.removeAttribute('aria-hidden'); | |
| 66 | + }); | |
| 67 | + } | |
| 68 | +}); | |
| 61 | 69 | export default new Vue({ |
| 62 | 70 | router, |
| 63 | 71 | store, | ... | ... |
src/views/DisposalSuggestions/Form.vue
| ... | ... | @@ -6,28 +6,39 @@ |
| 6 | 6 | class="NCC-dialog NCC-dialog_center" |
| 7 | 7 | lock-scroll |
| 8 | 8 | width="60%" |
| 9 | - v-loading="loading" | |
| 10 | 9 | > |
| 11 | - <el-row :gutter="15" class="NCC-dialog-content"> | |
| 10 | + <el-row :gutter="15" class="NCC-dialog-content" v-loading="loading"> | |
| 12 | 11 | <el-col :span="10" style="border-right: 1px solid #e6e6e6; height: 400px;"> |
| 13 | 12 | <el-row> |
| 14 | 13 | <el-col :span="24" class="form_title"> 巡查上报详情 </el-col> |
| 15 | 14 | <el-col :span="24"> |
| 16 | 15 | <div class="form-item"> |
| 17 | 16 | <div class="label w-100">问题来源:</div> |
| 18 | - {{ dataForm.source || "--" }} | |
| 17 | + {{ dataForm.reportSourceName || '--' }} | |
| 19 | 18 | </div> |
| 20 | 19 | </el-col> |
| 21 | 20 | <el-col :span="24"> |
| 22 | 21 | <div class="form-item"> |
| 23 | - <div class="label w-100">系统名称:</div> | |
| 24 | - {{ dataForm.platformName || "--" }} | |
| 22 | + <div class="label w-100">应用名称:</div> | |
| 23 | + {{ dataForm.platformNameStr || "--" }} | |
| 25 | 24 | </div> |
| 26 | 25 | </el-col> |
| 27 | 26 | <el-col :span="24"> |
| 28 | 27 | <div class="form-item"> |
| 29 | - <div class="label w-100">系统类型:</div> | |
| 30 | - {{ dataForm.platformType || "--" }} | |
| 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> | |
| 41 | + {{ dataForm.selfMediaPlatformType || "--" }} | |
| 31 | 42 | </div> |
| 32 | 43 | </el-col> |
| 33 | 44 | <el-col :span="24"> |
| ... | ... | @@ -52,25 +63,14 @@ |
| 52 | 63 | </template> |
| 53 | 64 | <el-col :span="24"> |
| 54 | 65 | <div class="form-item"> |
| 55 | - <div class="label w-100">关键词:</div> | |
| 56 | - {{ dataForm.questionClass || "--" }} | |
| 57 | - </div> | |
| 58 | - </el-col> | |
| 59 | - <el-col :span="24"> | |
| 60 | - <div class="form-item"> | |
| 61 | 66 | <div class="label w-100">问题内容:</div> |
| 62 | 67 | {{ dataForm.questionContent || "--" }} |
| 63 | 68 | </div> |
| 64 | 69 | </el-col> |
| 65 | 70 | <el-col :span="24"> |
| 66 | 71 | <div class="form-item"> |
| 67 | - <div class="label w-100">有害链接:</div> | |
| 68 | - {{ dataForm.link || "--" }} | |
| 69 | - </div> | |
| 70 | - </el-col> | |
| 71 | - <el-col :span="24"> | |
| 72 | - <div class="form-item"> | |
| 73 | - <div class="label w-100">取证内容:</div> | |
| 72 | + <div class="label w-100">关键词:</div> | |
| 73 | + {{ dataForm.questionClass || "--" }} | |
| 74 | 74 | </div> |
| 75 | 75 | </el-col> |
| 76 | 76 | <el-col :span="24"> |
| ... | ... | @@ -109,10 +109,10 @@ |
| 109 | 109 | </el-radio-group> |
| 110 | 110 | </el-form-item> |
| 111 | 111 | </el-col> |
| 112 | - <el-col :span="24" v-if="!dataForm.areaId && showarea"> | |
| 112 | + <el-col :span="24" v-show="(!dataForm.areaId || dataForm.areaId == '580548871316383493') && showarea"> | |
| 113 | 113 | <el-form-item label="所属区县" prop="area"> |
| 114 | - <el-radio-group v-model="suggestionForm.area" placeholder="请选择所属区县" style="line-height: 22px"> | |
| 115 | - <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio> | |
| 114 | + <el-radio-group v-removeAriaHidden v-model="suggestionForm.area" placeholder="请选择所属区县" style="line-height: 22px" @change="suggestionFormAreaChange"> | |
| 115 | + <el-radio v-for="v in areaOptions.filter(j => j.id != '580548871316383493')" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio> | |
| 116 | 116 | </el-radio-group> |
| 117 | 117 | </el-form-item> |
| 118 | 118 | </el-col> |
| ... | ... | @@ -158,6 +158,8 @@ export default { |
| 158 | 158 | dataForm: { |
| 159 | 159 | id: undefined, |
| 160 | 160 | platformName: undefined, |
| 161 | + platformNameStr: undefined, | |
| 162 | + platformTypeStr: undefined, | |
| 161 | 163 | platformType: undefined, |
| 162 | 164 | questionType: undefined, |
| 163 | 165 | questionClass: undefined, |
| ... | ... | @@ -166,10 +168,7 @@ export default { |
| 166 | 168 | obtainEvidence: [], |
| 167 | 169 | annex: [], |
| 168 | 170 | }, |
| 169 | - sourceOptions: [ | |
| 170 | - { fullName: "市网信办线索", id: "市网信办线索" }, | |
| 171 | - { fullName: "自主巡查发现", id: "自主巡查发现" }, | |
| 172 | - ], | |
| 171 | + sourceOptions: [], | |
| 173 | 172 | platformTypeOptions: [], |
| 174 | 173 | questionTypeOptions: [], |
| 175 | 174 | questionClassOptions: [ |
| ... | ... | @@ -214,13 +213,19 @@ export default { |
| 214 | 213 | }, |
| 215 | 214 | watch: {}, |
| 216 | 215 | created() { |
| 216 | + this.getSourceOptions(); | |
| 217 | 217 | this.initAreaTypeList(); |
| 218 | - this.getplatformTypeOptions(); | |
| 219 | - this.getquestionTypeOptions(); | |
| 220 | 218 | this.getjudgmentClassOptions(); |
| 221 | 219 | }, |
| 222 | 220 | mounted() {}, |
| 223 | 221 | methods: { |
| 222 | + async getSourceOptions() { | |
| 223 | + let { data } = await request({ | |
| 224 | + url: `/Extend/baseinspectionreport/GetReportSourceList`, | |
| 225 | + method: "GET", | |
| 226 | + }); | |
| 227 | + this.sourceOptions = data; | |
| 228 | + }, | |
| 224 | 229 | getplatformTypeOptions() { |
| 225 | 230 | getDictionaryDataSelector("576279943168656645").then((res) => { |
| 226 | 231 | this.platformTypeOptions = res.data.list; |
| ... | ... | @@ -246,20 +251,27 @@ export default { |
| 246 | 251 | this.dataForm.id = id || 0; |
| 247 | 252 | this.visible = true; |
| 248 | 253 | this.showSuggsetion = false; |
| 254 | + this.showarea = false; | |
| 249 | 255 | this.$nextTick(async () => { |
| 250 | 256 | this.$refs["suggestionForm"].resetFields(); |
| 251 | 257 | if (this.dataForm.id) { |
| 252 | 258 | this.loading = true; |
| 253 | 259 | let res = await getDetail(this.dataForm.id); |
| 254 | 260 | this.dataForm = res.data; |
| 255 | - this.loading = false; | |
| 256 | 261 | this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions); |
| 257 | - this.suggestionForm.area = res.data.areaId | |
| 262 | + this.suggestionFormAreaChange(res.data.areaId) | |
| 263 | + this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName; | |
| 258 | 264 | if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = []; |
| 259 | 265 | if (!this.dataForm.annex) this.dataForm.annex = []; |
| 266 | + this.loading = false; | |
| 260 | 267 | } |
| 261 | 268 | }); |
| 262 | 269 | }, |
| 270 | + suggestionFormAreaChange(val) { | |
| 271 | + if(val == '580548871316383493') return; | |
| 272 | + this.suggestionForm.area = val; | |
| 273 | + this.$forceUpdate(); | |
| 274 | + }, | |
| 263 | 275 | judgmentClassChange(v) { |
| 264 | 276 | this.suggestionForm.judgmentOpinions = ''; |
| 265 | 277 | this.showSuggsetion = Boolean(v == "590769458901943557" || v == "590769521820697861"); // 进一步处置,不采纳 | ... | ... |
src/views/DisposalSuggestions/HandleForm.vue
| ... | ... | @@ -15,19 +15,19 @@ |
| 15 | 15 | <el-col :span="24"> |
| 16 | 16 | <div class="form-item"> |
| 17 | 17 | <div class="label w-100">问题来源:</div> |
| 18 | - {{ dataForm.source || "--" }} | |
| 18 | + {{ dataForm.reportSourceName || "--" }} | |
| 19 | 19 | </div> |
| 20 | 20 | </el-col> |
| 21 | 21 | <el-col :span="24"> |
| 22 | 22 | <div class="form-item"> |
| 23 | 23 | <div class="label w-100">应用名称:</div> |
| 24 | - {{ dataForm.platformName || "--" }} | |
| 24 | + {{ dataForm.platformNameStr || "--" }} | |
| 25 | 25 | </div> |
| 26 | 26 | </el-col> |
| 27 | 27 | <el-col :span="24"> |
| 28 | 28 | <div class="form-item"> |
| 29 | 29 | <div class="label w-100">应用类型:</div> |
| 30 | - {{ dataForm.platformType || "--" }} | |
| 30 | + {{ dataForm.platformTypeStr || "--" }} | |
| 31 | 31 | </div> |
| 32 | 32 | </el-col> |
| 33 | 33 | <el-col :span="24"> |
| ... | ... | @@ -52,25 +52,14 @@ |
| 52 | 52 | </template> |
| 53 | 53 | <el-col :span="24"> |
| 54 | 54 | <div class="form-item"> |
| 55 | - <div class="label w-100">关键词</div> | |
| 56 | - {{ dataForm.questionClass || "--" }} | |
| 57 | - </div> | |
| 58 | - </el-col> | |
| 59 | - <el-col :span="24"> | |
| 60 | - <div class="form-item"> | |
| 61 | 55 | <div class="label w-100">问题内容:</div> |
| 62 | 56 | {{ dataForm.questionContent || "--" }} |
| 63 | 57 | </div> |
| 64 | 58 | </el-col> |
| 65 | 59 | <el-col :span="24"> |
| 66 | 60 | <div class="form-item"> |
| 67 | - <div class="label w-100">有害链接:</div> | |
| 68 | - {{ dataForm.link || "--" }} | |
| 69 | - </div> | |
| 70 | - </el-col> | |
| 71 | - <el-col :span="24"> | |
| 72 | - <div class="form-item"> | |
| 73 | - <div class="label w-100">取证内容</div> | |
| 61 | + <div class="label w-100">关键词</div> | |
| 62 | + {{ dataForm.questionClass || "--" }} | |
| 74 | 63 | </div> |
| 75 | 64 | </el-col> |
| 76 | 65 | <el-col :span="24"> |
| ... | ... | @@ -185,13 +174,20 @@ |
| 185 | 174 | }, |
| 186 | 175 | watch: {}, |
| 187 | 176 | created() { |
| 188 | - this.initAreaTypeList(); | |
| 189 | - this.getplatformTypeOptions(); | |
| 190 | - this.getquestionTypeOptions(); | |
| 191 | - this.getjudgmentClassOptions(); | |
| 177 | + this.getSourceOptions(); | |
| 178 | + // this.getplatformTypeOptions(); | |
| 179 | + // this.getquestionTypeOptions(); | |
| 180 | + // this.getjudgmentClassOptions(); | |
| 192 | 181 | }, |
| 193 | 182 | mounted() {}, |
| 194 | 183 | methods: { |
| 184 | + async getSourceOptions() { | |
| 185 | + let { data } = await request({ | |
| 186 | + url: `/Extend/baseinspectionreport/GetReportSourceList`, | |
| 187 | + method: "GET", | |
| 188 | + }); | |
| 189 | + this.sourceOptions = data; | |
| 190 | + }, | |
| 195 | 191 | getplatformTypeOptions() { |
| 196 | 192 | getDictionaryDataSelector("576279943168656645").then((res) => { |
| 197 | 193 | this.platformTypeOptions = res.data.list; |
| ... | ... | @@ -224,6 +220,7 @@ |
| 224 | 220 | let res = await getDetail(this.dataForm.id); |
| 225 | 221 | this.dataForm = res.data; |
| 226 | 222 | this.loading = false; |
| 223 | + this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName; | |
| 227 | 224 | this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions); |
| 228 | 225 | this.suggestionForm.area = res.data.areaId |
| 229 | 226 | if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = []; | ... | ... |
src/views/DisposalSuggestions/index.vue
| 1 | 1 | <template> |
| 2 | 2 | <div class="SystemInfo item-box common-info-box"> |
| 3 | - <div class="item-title">上报线索研判</div> | |
| 3 | + <div class="item-title">{{isSHILevel ? '上报线索研判' : '巡查处理'}}上报线索研判</div> | |
| 4 | 4 | <div class="item-body"> |
| 5 | 5 | <div class="NCC-common-layout"> |
| 6 | 6 | <div class="NCC-common-layout-center"> |
| ... | ... | @@ -44,7 +44,7 @@ |
| 44 | 44 | <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left"> |
| 45 | 45 | <template slot-scope="scope">{{ scope.row.questionType | dynamicText(questionTypeOptions) }}</template> |
| 46 | 46 | </el-table-column> |
| 47 | - <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> | |
| 47 | + <!-- <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> --> | |
| 48 | 48 | <el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" /> |
| 49 | 49 | <el-table-column show-overflow-tooltip prop="creatorTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat"/> |
| 50 | 50 | <!-- <el-table-column show-overflow-tooltip prop="disposalSuggestions" label="处置建议" align="left" /> | ... | ... |
src/views/baseComapnyInfo/Form.vue
| ... | ... | @@ -44,6 +44,25 @@ |
| 44 | 44 | </el-form-item> |
| 45 | 45 | </el-col> |
| 46 | 46 | <el-col :span="24"> |
| 47 | + <el-form-item label="资质证明" prop="qualificationCertificate"> | |
| 48 | + <NCC-UploadFz v-model="dataForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" /> | |
| 49 | + </el-form-item> | |
| 50 | + </el-col> | |
| 51 | + <el-col :span="24"> | |
| 52 | + <el-form-item label="联系人" prop="contactUser"> | |
| 53 | + <el-input v-model="dataForm.contactUser" placeholder="请输入联系人" clearable | |
| 54 | + :style='{ "width": "100%" }'> | |
| 55 | + </el-input> | |
| 56 | + </el-form-item> | |
| 57 | + </el-col> | |
| 58 | + <el-col :span="24"> | |
| 59 | + <el-form-item label="联系电话" prop="contactPhone"> | |
| 60 | + <el-input v-model="dataForm.contactPhone" placeholder="请输入联系电话" clearable | |
| 61 | + :style='{ "width": "100%" }'> | |
| 62 | + </el-input> | |
| 63 | + </el-form-item> | |
| 64 | + </el-col> | |
| 65 | + <el-col :span="24"> | |
| 47 | 66 | <el-form-item label="所属区县" prop="areaId"> |
| 48 | 67 | <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px"> |
| 49 | 68 | <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio> |
| ... | ... | @@ -91,6 +110,8 @@ export default { |
| 91 | 110 | qualificationCertificate: [], |
| 92 | 111 | otherInfo: undefined, |
| 93 | 112 | areaId: undefined, |
| 113 | + contactUser: undefined, | |
| 114 | + contactPhone: undefined | |
| 94 | 115 | }, |
| 95 | 116 | rules: { |
| 96 | 117 | companyName: [ |
| ... | ... | @@ -100,10 +121,10 @@ export default { |
| 100 | 121 | trigger: 'blur' |
| 101 | 122 | }, |
| 102 | 123 | ], |
| 103 | - contactInformation: [ | |
| 124 | + contactPhone: [ | |
| 104 | 125 | { |
| 105 | 126 | pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/, |
| 106 | - message: '请输入正确的联系方式', | |
| 127 | + message: '请输入正确的联系段话', | |
| 107 | 128 | trigger: 'blur' |
| 108 | 129 | }, |
| 109 | 130 | ], | ... | ... |
src/views/baseInspectionReport/Form.vue
| ... | ... | @@ -3,12 +3,12 @@ |
| 3 | 3 | :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" |
| 4 | 4 | :close-on-click-modal="false" |
| 5 | 5 | :visible.sync="visible" |
| 6 | - class="NCC-dialog NCC-dialog_center baseInspectionReportForm" | |
| 6 | + class="NCC-dialog NCC-dialog_center dialog-box baseInspectionReportForm" | |
| 7 | 7 | lock-scroll |
| 8 | 8 | width="50%" |
| 9 | 9 | :modal="false" |
| 10 | 10 | > |
| 11 | - <el-row :gutter="15" class="NCC-dialog-content" v-if="!isDetail"> | |
| 11 | + <el-row :gutter="15" class="NCC-dialog-content" v-if="!isDetail" v-loading="form_loading"> | |
| 12 | 12 | <el-form |
| 13 | 13 | ref="elForm" |
| 14 | 14 | :model="dataForm" |
| ... | ... | @@ -75,7 +75,7 @@ |
| 75 | 75 | </el-radio-group> |
| 76 | 76 | </el-form-item> |
| 77 | 77 | </el-col> |
| 78 | - <el-col :span="23" v-show="dataForm.platformType == '580634746028033285' && !isDisabledTypeByName"> | |
| 78 | + <el-col :span="23" v-show="dataForm.platformType == '580634746028033285'"> | |
| 79 | 79 | <el-form-item label="归属平台" prop="selfMediaPlatformType"> |
| 80 | 80 | <el-radio-group v-model="dataForm.selfMediaPlatformType" :disabled="!!this.dataForm.id"> |
| 81 | 81 | <el-radio v-for="(item, index) in mediaPlatList" :key="index" :label="item" >{{ item }}</el-radio> |
| ... | ... | @@ -198,6 +198,7 @@ export default { |
| 198 | 198 | visible: false, |
| 199 | 199 | name_loading: false, |
| 200 | 200 | isDetail: false, |
| 201 | + form_loading: true, | |
| 201 | 202 | dataForm: { |
| 202 | 203 | id: undefined, |
| 203 | 204 | reportSource: undefined, |
| ... | ... | @@ -252,13 +253,7 @@ export default { |
| 252 | 253 | } |
| 253 | 254 | }, |
| 254 | 255 | watch: {}, |
| 255 | - created() { | |
| 256 | - this.initCompanyList(); | |
| 257 | - this.loadList(); | |
| 258 | - this.getSourceOptions(); | |
| 259 | - this.getplatformTypeOptions(); | |
| 260 | - this.getquestionTypeOptions(); | |
| 261 | - }, | |
| 256 | + created() {}, | |
| 262 | 257 | mounted() {}, |
| 263 | 258 | methods: { |
| 264 | 259 | async initCompanyList() { |
| ... | ... | @@ -305,14 +300,13 @@ export default { |
| 305 | 300 | this.platformTypeOptions = list; |
| 306 | 301 | }, |
| 307 | 302 | async getSourceOptions() { |
| 308 | - request({ | |
| 303 | + let { data } = await request({ | |
| 309 | 304 | url: `/Extend/baseinspectionreport/GetReportSourceList`, |
| 310 | 305 | method: "GET", |
| 311 | - }).then(({data}) => { | |
| 312 | - this.sourceOptions = data; | |
| 313 | - }) | |
| 306 | + }); | |
| 307 | + this.sourceOptions = data; | |
| 314 | 308 | }, |
| 315 | - getquestionTypeOptions() { | |
| 309 | + async getquestionTypeOptions() { | |
| 316 | 310 | getDictionaryDataSelector("577006814432855301").then((res) => { |
| 317 | 311 | this.questionTypeOptions = [...res.data.list, {Id: '0', fullName: '其他'}]; |
| 318 | 312 | }); |
| ... | ... | @@ -320,14 +314,22 @@ export default { |
| 320 | 314 | goBack() { |
| 321 | 315 | this.$emit("refresh"); |
| 322 | 316 | }, |
| 323 | - init(id, isDetail) { | |
| 317 | + async init(id, isDetail) { | |
| 324 | 318 | this.dataForm.id = id || ''; |
| 325 | 319 | this.visible = true; |
| 326 | 320 | this.isDetail = isDetail || false; |
| 321 | + this.form_loading = true; | |
| 322 | + await this.initCompanyList(); | |
| 323 | + await this.loadList(); | |
| 324 | + await this.getSourceOptions(); | |
| 325 | + await this.getplatformTypeOptions(); | |
| 326 | + await this.getquestionTypeOptions(); | |
| 327 | 327 | this.$nextTick(async () => { |
| 328 | 328 | !isDetail && this.$refs["elForm"].resetFields(); |
| 329 | 329 | if (this.dataForm.id) { |
| 330 | + this.form_loading = true; | |
| 330 | 331 | let res = await getDetail(this.dataForm.id); |
| 332 | + if(res.code != 200) return this.form_loading = false; | |
| 331 | 333 | if(!res.data) return; |
| 332 | 334 | this.dataForm = res.data; |
| 333 | 335 | if(this.questionTypeOptions.findIndex(v => v.fullName == this.dataForm.questionType) == -1) { |
| ... | ... | @@ -335,16 +337,20 @@ export default { |
| 335 | 337 | this.dataForm.questionType = '其他'; |
| 336 | 338 | } |
| 337 | 339 | this.dataForm.selfMediaPlatformType = res.data.selfMediaPlatformType || '--'; |
| 340 | + this.form_loading = false; | |
| 341 | + } else { | |
| 342 | + this.form_loading = false; | |
| 338 | 343 | } |
| 339 | 344 | }); |
| 340 | 345 | }, |
| 341 | 346 | dataFormSubmit() { |
| 342 | 347 | this.$refs["elForm"].validate(async (valid) => { |
| 343 | 348 | if (valid) { |
| 349 | + console.log(this.dataForm); | |
| 344 | 350 | let obj = { |
| 345 | 351 | ...this.dataForm, |
| 346 | 352 | questionType: this.dataForm.questionType == '其他' ? this.dataForm.otherQuestionType : this.dataForm.questionType, |
| 347 | - selfMediaPlatformType: this.dataForm.selfMediaPlatformType == '其他' ? this.dataForm.selfMediaPlatformTypeOther : this.dataForm.questionType, | |
| 353 | + selfMediaPlatformType: this.dataForm.selfMediaPlatformType == '其他' ? this.dataForm.selfMediaPlatformTypeOther : this.dataForm.selfMediaPlatformType, | |
| 348 | 354 | } |
| 349 | 355 | this.btnLoading = true; |
| 350 | 356 | let res = !this.dataForm.id ? await addForm(obj) : await updataForm(obj); | ... | ... |
src/views/baseInspectionReport/index.vue
| ... | ... | @@ -13,7 +13,7 @@ |
| 13 | 13 | </el-col> |
| 14 | 14 | <el-col :span="4"> |
| 15 | 15 | <el-form-item label=""> |
| 16 | - <el-select v-model="query.platformType" placeholder="请选择应用类型" clearable > | |
| 16 | + <el-select v-model="query.platformType" placeholder="请选择系统类型" clearable > | |
| 17 | 17 | <el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id" /> |
| 18 | 18 | </el-select> |
| 19 | 19 | </el-form-item> | ... | ... |
src/views/basePrincipalResponsibility/Form.vue
| ... | ... | @@ -94,7 +94,7 @@ |
| 94 | 94 | loading: false, |
| 95 | 95 | visible: false, |
| 96 | 96 | isDetail: false, |
| 97 | - dialogLoading: false, | |
| 97 | + dialogLoading: true, | |
| 98 | 98 | dataForm: { |
| 99 | 99 | id:'', |
| 100 | 100 | id:undefined, |
| ... | ... | @@ -128,7 +128,7 @@ |
| 128 | 128 | methods: { |
| 129 | 129 | getfileTypeOptions(){ |
| 130 | 130 | getDictionaryDataSelector('577087166203561221').then(res => { |
| 131 | - this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }] | |
| 131 | + this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }]; | |
| 132 | 132 | }); |
| 133 | 133 | }, |
| 134 | 134 | goBack() { |
| ... | ... | @@ -147,6 +147,7 @@ |
| 147 | 147 | method: 'get' |
| 148 | 148 | }).then(res =>{ |
| 149 | 149 | this.dataForm = res.data; |
| 150 | + this.dataForm.fileUrl = res.data.fileUrlModel; | |
| 150 | 151 | this.setTileType(res.data.fileType); |
| 151 | 152 | this.dialogLoading = false; |
| 152 | 153 | }).catch(() => this.dialogLoading = false) |
| ... | ... | @@ -167,6 +168,7 @@ |
| 167 | 168 | this.$refs['elForm'].validate((valid) => { |
| 168 | 169 | if (valid) { |
| 169 | 170 | this.dataForm.fileType = this.dataForm.fileType == '0' ? this.dataForm.otherFileType : this.dataForm.fileType; |
| 171 | + delete this.dataForm.fileUrlModel; | |
| 170 | 172 | this.btnLoading = true; |
| 171 | 173 | if (!this.dataForm.id) { |
| 172 | 174 | request({ | ... | ... |
src/views/baseSpecialAction/index.vue
| ... | ... | @@ -14,7 +14,9 @@ |
| 14 | 14 | <el-col :span="6"> |
| 15 | 15 | <el-form-item label=""> |
| 16 | 16 | <el-select v-model="query.state" placeholder="请选择状态" clearable> |
| 17 | + <el-option label="已存档" value="已存档"></el-option> | |
| 17 | 18 | <el-option label="已发布" value="已发布"></el-option> |
| 19 | + <el-option label="已发布并部署" value="已发布并部署"></el-option> | |
| 18 | 20 | <el-option label="未发布" value="未发布"></el-option> |
| 19 | 21 | </el-select> |
| 20 | 22 | </el-form-item> | ... | ... |
src/views/baseSpecialhandle/index.vue
| ... | ... | @@ -50,7 +50,7 @@ |
| 50 | 50 | <template slot-scope="scope"> |
| 51 | 51 | <el-button type="text" @click="toDetail(scope.row)">行动详情</el-button> |
| 52 | 52 | <el-button type="text" @click="toFillForm(scope.row)" :disabled="ncc.timeDeadLine(scope.row.deadline) == 'danger' && scope.row.state == '已填写'">{{scope.row.state == '已填写' ? '修改' : '处理'}}</el-button> |
| 53 | - <el-button type="text" @click="toFillForm(scope.row, true)" :disabled="scope.row.state != '已填写'" v-if="isSHILevel">处理情况</el-button> | |
| 53 | + <el-button type="text" @click="toFillForm(scope.row, true)" :disabled="scope.row.state != '已填写'">详情</el-button> | |
| 54 | 54 | </template> |
| 55 | 55 | </el-table-column> |
| 56 | 56 | </NCC-table> |
| ... | ... | @@ -77,6 +77,7 @@ |
| 77 | 77 | import NCCForm from '@/views/baseSpecialAction/dynamicModel/list/Form' |
| 78 | 78 | import request from "@/utils/request"; |
| 79 | 79 | import FormPage from "@/views/baseSpecialAction/FormPage.vue"; |
| 80 | +import { Loading } from 'element-ui'; | |
| 80 | 81 | |
| 81 | 82 | export default { |
| 82 | 83 | components: { NCCForm, FormPage }, |
| ... | ... | @@ -157,6 +158,12 @@ export default { |
| 157 | 158 | }); |
| 158 | 159 | }, |
| 159 | 160 | toFillForm(row, isDetail) { |
| 161 | + let loadingInstance = Loading.service({ | |
| 162 | + lock: true, | |
| 163 | + text: 'Loading', | |
| 164 | + spinner: 'el-icon-loading', | |
| 165 | + background: 'rgba(255, 255, 255, 0.7)' | |
| 166 | + }); | |
| 160 | 167 | this.dialogVisible = true; |
| 161 | 168 | var Itemid = row.itemId || '';//数据id,没有的话就是新增 ,有的话就是修改 |
| 162 | 169 | var modelId = row.formId;//关联的表单id |
| ... | ... | @@ -172,7 +179,8 @@ export default { |
| 172 | 179 | formData = JSON.parse(res.data.formData); |
| 173 | 180 | formData.disabled = isDetail || false; |
| 174 | 181 | let form = JSON.stringify(formData); |
| 175 | - this.$refs.NCCForm.init(form, modelId, Itemid, isPreview, useFormPermission, taskId, isDetail) | |
| 182 | + this.$refs.NCCForm.init(form, modelId, Itemid, isPreview, useFormPermission, taskId, isDetail); | |
| 183 | + loadingInstance.close(); | |
| 176 | 184 | }); |
| 177 | 185 | |
| 178 | 186 | // this.nestedPageUrl = `http://8.130.38.56:8043/old/#/previewModel?isPreview=1&id=${row.originId}`; | ... | ... |
src/views/baseSystemInfo/DetailForm.vue
| ... | ... | @@ -23,6 +23,18 @@ |
| 23 | 23 | <p class="text">{{ dataForm.systemType | dynamicTextUP(systemTypeOptions) }}</p> |
| 24 | 24 | </div> |
| 25 | 25 | </el-col> |
| 26 | + <el-col :span="24"> | |
| 27 | + <div class="form-item"> | |
| 28 | + <div class="label w-100">应用名称:</div> | |
| 29 | + <p class="text">{{ dataForm.systemName || "--" }}</p> | |
| 30 | + </div> | |
| 31 | + </el-col> | |
| 32 | + <el-col :span="24"> | |
| 33 | + <div class="form-item"> | |
| 34 | + <div class="label w-100">应用分类:</div> | |
| 35 | + <p class="text">{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}</p> | |
| 36 | + </div> | |
| 37 | + </el-col> | |
| 26 | 38 | <template |
| 27 | 39 | v-if=" |
| 28 | 40 | dataForm.systemType && |
| ... | ... | @@ -54,17 +66,23 @@ |
| 54 | 66 | </div> |
| 55 | 67 | </el-col> |
| 56 | 68 | </template> |
| 57 | - <el-col :span="24"> | |
| 58 | - <div class="form-item"> | |
| 59 | - <div class="label w-100">应用名称:</div> | |
| 60 | - <p class="text">{{ dataForm.systemName || "--" }}</p> | |
| 61 | - </div> | |
| 69 | + <el-col :span="24" v-if="dataForm.systemType == '576280004254500101'"> | |
| 70 | + <div class="form-item"> | |
| 71 | + <div class="label w-100">安装次数:</div> | |
| 72 | + <p class="text">{{ dataForm.systemDownloadVolume || "--" }}<span class="start-span">更新时间:{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p> | |
| 73 | + </div> | |
| 62 | 74 | </el-col> |
| 63 | - <el-col :span="24"> | |
| 64 | - <div class="form-item"> | |
| 65 | - <div class="label w-100">应用分类:</div> | |
| 66 | - <p class="text">{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}</p> | |
| 67 | - </div> | |
| 75 | + <el-col :span="24" v-if="dataForm.systemType == '576280043370579205' || dataForm.systemType == '576280085330396421'"> | |
| 76 | + <div class="form-item"> | |
| 77 | + <div class="label w-100">月活:</div> | |
| 78 | + <p class="text">{{ dataForm.MAU || "--" }}<span class="start-span">更新时间:{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p> | |
| 79 | + </div> | |
| 80 | + </el-col> | |
| 81 | + <el-col :span="24" v-if="dataForm.systemType == '580634746028033285'"> | |
| 82 | + <div class="form-item"> | |
| 83 | + <div class="label w-100">粉丝量:</div> | |
| 84 | + <p class="text">{{ dataForm.followerCount || "--" }}<span class="start-span">更新时间:{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p> | |
| 85 | + </div> | |
| 68 | 86 | </el-col> |
| 69 | 87 | <el-col :span="24"> |
| 70 | 88 | <div class="form-item"> |
| ... | ... | @@ -84,12 +102,12 @@ |
| 84 | 102 | <p class="text">{{ dataForm.domain || "--" }}</p> |
| 85 | 103 | </div> |
| 86 | 104 | </el-col> |
| 87 | - <el-col :span="24"> | |
| 105 | + <!-- <el-col :span="24"> | |
| 88 | 106 | <div class="form-item"> |
| 89 | 107 | <div class="label w-100">下载量:</div> |
| 90 | 108 | <p class="text">{{ dataForm.systemDownloadVolume || "--" }}</p> |
| 91 | 109 | </div> |
| 92 | - </el-col> | |
| 110 | + </el-col> --> | |
| 93 | 111 | <el-col :span="24"> |
| 94 | 112 | <div class="form-item"> |
| 95 | 113 | <div class="label w-100">版本:</div> |
| ... | ... | @@ -158,7 +176,7 @@ |
| 158 | 176 | <el-col :span="24"> |
| 159 | 177 | <div class="form-item"> |
| 160 | 178 | <div class="label w-100">联系方式:</div> |
| 161 | - <p class="text">{{ companyForm.contactPhone || "--" }}</p> | |
| 179 | + <p class="text">{{ companyForm.contactInformation || "--" }}</p> | |
| 162 | 180 | </div> |
| 163 | 181 | </el-col> |
| 164 | 182 | <el-col :span="24"> |
| ... | ... | @@ -432,7 +450,7 @@ export default { |
| 432 | 450 | }); |
| 433 | 451 | }, |
| 434 | 452 | |
| 435 | - addOrUpdateHandle(row, isDetail) { | |
| 453 | + addOrUpdateHandle(row) { | |
| 436 | 454 | switch (this.activeName) { |
| 437 | 455 | case "3": |
| 438 | 456 | this.ReportFormVisible = true; |
| ... | ... | @@ -495,4 +513,10 @@ export default { |
| 495 | 513 | border-radius: 6px; |
| 496 | 514 | margin-left: 10px; |
| 497 | 515 | } |
| 516 | +.start-span { | |
| 517 | + margin-left: 10px; | |
| 518 | + color: red; | |
| 519 | + font-size: 12px; | |
| 520 | + line-height: 30px; | |
| 521 | +} | |
| 498 | 522 | </style> | ... | ... |
src/views/baseSystemInfo/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | <div class="NCC-common-layout-center"> |
| 8 | 8 | <el-row class="NCC-common-search-box" :gutter="5"> |
| 9 | 9 | <el-form @submit.native.prevent size="mini"> |
| 10 | - <el-col :span="5"> | |
| 10 | + <el-col :span="4"> | |
| 11 | 11 | <el-form-item label=""> |
| 12 | 12 | <el-input |
| 13 | 13 | clearable |
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | <el-col :span="3"> |
| 37 | 37 | <el-form-item label=""> |
| 38 | 38 | <el-select |
| 39 | - v-model="query.proId" | |
| 39 | + v-model="query.systemClass" | |
| 40 | 40 | placeholder="请选择应用分类" |
| 41 | 41 | :disabled="!query.systemType" |
| 42 | 42 | clearable |
| ... | ... | @@ -66,14 +66,10 @@ |
| 66 | 66 | /> |
| 67 | 67 | </el-form-item> |
| 68 | 68 | </el-col> |
| 69 | - <el-col :span="2"> | |
| 69 | + <el-col :span="3"> | |
| 70 | 70 | <el-form-item> |
| 71 | - <el-button | |
| 72 | - type="primary" | |
| 73 | - icon="el-icon-search" | |
| 74 | - @click="search()" | |
| 75 | - >搜索</el-button | |
| 76 | - > | |
| 71 | + <el-button type="primary" icon="el-icon-search" @click="search()" >搜索</el-button> | |
| 72 | + <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button> | |
| 77 | 73 | </el-form-item> |
| 78 | 74 | </el-col> |
| 79 | 75 | </el-form> |
| ... | ... | @@ -96,36 +92,16 @@ |
| 96 | 92 | </el-row> |
| 97 | 93 | <div class="NCC-common-layout-main NCC-flex-main"> |
| 98 | 94 | <NCC-table v-loading="loading" :data="infoDataList"> |
| 99 | - <el-table-column | |
| 100 | - show-overflow-tooltip | |
| 101 | - prop="companyName" | |
| 102 | - label="运营主体名称" | |
| 103 | - align="center" | |
| 104 | - /> | |
| 105 | - <el-table-column | |
| 106 | - show-overflow-tooltip | |
| 107 | - prop="systemName" | |
| 108 | - label="应用名称" | |
| 109 | - align="center" | |
| 110 | - /> | |
| 95 | + <el-table-column show-overflow-tooltip prop="companyName" label="运营主体名称" align="center"/> | |
| 96 | + <el-table-column show-overflow-tooltip prop="systemName" label="应用名称" align="center"/> | |
| 111 | 97 | <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip> |
| 112 | 98 | <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template> |
| 113 | 99 | </el-table-column> |
| 114 | - <el-table-column label="应用分类" prop="systemClass" align="left" show-overflow-tooltip> | |
| 100 | + <el-table-column label="应用分类" prop="systemClassStr" align="left" show-overflow-tooltip> | |
| 115 | 101 | <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> --> |
| 116 | 102 | </el-table-column> |
| 117 | - <el-table-column | |
| 118 | - show-overflow-tooltip | |
| 119 | - prop="contactUser" | |
| 120 | - label="联系人" | |
| 121 | - align="center" | |
| 122 | - /> | |
| 123 | - <el-table-column | |
| 124 | - show-overflow-tooltip | |
| 125 | - prop="contactPhone" | |
| 126 | - label="联系电话" | |
| 127 | - align="center" | |
| 128 | - /> | |
| 103 | + <el-table-column show-overflow-tooltip prop="contactUser" label="联系人" align="center"/> | |
| 104 | + <el-table-column show-overflow-tooltip prop="contactPhone" label="联系电话" align="center"/> | |
| 129 | 105 | <el-table-column label="所属区域" prop="areaId" align="left" show-overflow-tooltip> |
| 130 | 106 | <template slot-scope="scope">{{ scope.row.areaId | dynamicText(areaOptions) }}</template> |
| 131 | 107 | </el-table-column> | ... | ... |
src/views/overView/Overview.vue
| ... | ... | @@ -151,6 +151,7 @@ import HandForm from '@/views/baseCaseHandling/Form.vue' |
| 151 | 151 | import DisposalForm from "@/views/DisposalSuggestions/Form.vue"; |
| 152 | 152 | // 巡查处理 |
| 153 | 153 | import DisposalHandleForm from "@/views/DisposalSuggestions/HandleForm.vue"; |
| 154 | +import { Loading } from 'element-ui'; | |
| 154 | 155 | export default { |
| 155 | 156 | name: "Overview", |
| 156 | 157 | components: { MsgForm, HandleInspectForm, NCCForm, HandForm, DisposalForm, DisposalHandleForm }, |
| ... | ... | @@ -308,6 +309,12 @@ export default { |
| 308 | 309 | }, |
| 309 | 310 | async handleTask(row) { |
| 310 | 311 | if(row.taskType == '专项行动') { |
| 312 | + let loadingInstance = Loading.service({ | |
| 313 | + lock: true, | |
| 314 | + text: 'Loading', | |
| 315 | + spinner: 'el-icon-loading', | |
| 316 | + background: 'rgba(255, 255, 255, 0.7)' | |
| 317 | + }); | |
| 311 | 318 | this.formVisible = true; |
| 312 | 319 | // let data = await this.getBaseSpecialActionInfo('588008032122701061'); |
| 313 | 320 | let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId); |
| ... | ... | @@ -323,7 +330,8 @@ export default { |
| 323 | 330 | params:null |
| 324 | 331 | }).then(res => { |
| 325 | 332 | formData = res.data.formData; |
| 326 | - this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId) | |
| 333 | + this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId); | |
| 334 | + loadingInstance.close(); | |
| 327 | 335 | }); |
| 328 | 336 | } else { |
| 329 | 337 | let type = row.taskType; | ... | ... |