Commit df22ed7d1123289c5b24f9fe3143cc8fc4cdad5e
1 parent
5a954ed5
运营主体可手动输入
Showing
4 changed files
with
36 additions
and
4 deletions
src/components/CompanyForm/index.vue
| @@ -78,7 +78,7 @@ | @@ -78,7 +78,7 @@ | ||
| 78 | </el-col> | 78 | </el-col> |
| 79 | <el-col :span="24"> | 79 | <el-col :span="24"> |
| 80 | <el-form-item label="所属区县" prop="areaId"> | 80 | <el-form-item label="所属区县" prop="areaId"> |
| 81 | - <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px"> | 81 | + <el-radio-group v-removeAriaHidden v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px"> |
| 82 | <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio> | 82 | <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio> |
| 83 | </el-radio-group> | 83 | </el-radio-group> |
| 84 | </el-form-item> | 84 | </el-form-item> |
| @@ -122,7 +122,8 @@ export default { | @@ -122,7 +122,8 @@ export default { | ||
| 122 | qualificationCertificate: [], | 122 | qualificationCertificate: [], |
| 123 | otherInfo: undefined, | 123 | otherInfo: undefined, |
| 124 | contactUser: undefined, | 124 | contactUser: undefined, |
| 125 | - contactPhone: undefined | 125 | + contactPhone: undefined, |
| 126 | + areaId: undefined, | ||
| 126 | }, | 127 | }, |
| 127 | rules: { | 128 | rules: { |
| 128 | companyName: [ | 129 | companyName: [ |
src/views/baseCaseHandling/Form.vue
| @@ -45,11 +45,14 @@ | @@ -45,11 +45,14 @@ | ||
| 45 | <el-col :span="24"> | 45 | <el-col :span="24"> |
| 46 | <el-form-item label="运营主体" prop="registeredEntity"> | 46 | <el-form-item label="运营主体" prop="registeredEntity"> |
| 47 | <el-select | 47 | <el-select |
| 48 | + ref="companySelect" | ||
| 48 | v-model="dataForm.registeredEntity" | 49 | v-model="dataForm.registeredEntity" |
| 49 | placeholder="请选择运营主体" | 50 | placeholder="请选择运营主体" |
| 50 | clearable | 51 | clearable |
| 51 | filterable | 52 | filterable |
| 52 | style="width: 100%" | 53 | style="width: 100%" |
| 54 | + @blur.native.capture="selectCompanyBlur" | ||
| 55 | + @visible-change="visibleNameCompanyChange" | ||
| 53 | :disabled="formType != 0 || dataForm.isHaveSystem" | 56 | :disabled="formType != 0 || dataForm.isHaveSystem" |
| 54 | > | 57 | > |
| 55 | <el-option | 58 | <el-option |
| @@ -306,6 +309,17 @@ export default { | @@ -306,6 +309,17 @@ export default { | ||
| 306 | let input = this.$refs.select.$children[0].$refs.input; | 309 | let input = this.$refs.select.$children[0].$refs.input; |
| 307 | input.blur(); | 310 | input.blur(); |
| 308 | }, | 311 | }, |
| 312 | + // 运营主体改变 | ||
| 313 | + selectCompanyBlur(e) { | ||
| 314 | + let value = e.target.value; | ||
| 315 | + if(!value) return; | ||
| 316 | + this.dataForm.registeredEntity = e.target.value; | ||
| 317 | + }, | ||
| 318 | + visibleNameCompanyChange(val) { | ||
| 319 | + if (val) return | ||
| 320 | + let input = this.$refs.companySelect.$children[0].$refs.input; | ||
| 321 | + input.blur(); | ||
| 322 | + }, | ||
| 309 | goBack() { | 323 | goBack() { |
| 310 | this.$emit("refresh"); | 324 | this.$emit("refresh"); |
| 311 | }, | 325 | }, |
src/views/baseInspectionReport/Form.vue
| @@ -52,11 +52,14 @@ | @@ -52,11 +52,14 @@ | ||
| 52 | <el-col :span="23"> | 52 | <el-col :span="23"> |
| 53 | <el-form-item label="运营主体" prop="company"> | 53 | <el-form-item label="运营主体" prop="company"> |
| 54 | <el-select | 54 | <el-select |
| 55 | + ref="companySelect" | ||
| 55 | v-model="dataForm.company" | 56 | v-model="dataForm.company" |
| 56 | placeholder="请选择运营主体" | 57 | placeholder="请选择运营主体" |
| 57 | clearable | 58 | clearable |
| 58 | filterable | 59 | filterable |
| 59 | style="width: 100%" | 60 | style="width: 100%" |
| 61 | + @blur.native.capture="selectCompanyBlur" | ||
| 62 | + @visible-change="visibleNameCompanyChange" | ||
| 60 | :disabled='isDisabledTypeByName || !!this.dataForm.id' | 63 | :disabled='isDisabledTypeByName || !!this.dataForm.id' |
| 61 | > | 64 | > |
| 62 | <el-option | 65 | <el-option |
| @@ -327,6 +330,18 @@ export default { | @@ -327,6 +330,18 @@ export default { | ||
| 327 | let input = this.$refs.select.$children[0].$refs.input; | 330 | let input = this.$refs.select.$children[0].$refs.input; |
| 328 | input.blur(); | 331 | input.blur(); |
| 329 | }, | 332 | }, |
| 333 | + | ||
| 334 | + // 运营主体改变 | ||
| 335 | + selectCompanyBlur(e) { | ||
| 336 | + let value = e.target.value; | ||
| 337 | + if(!value) return; | ||
| 338 | + this.dataForm.company = e.target.value; | ||
| 339 | + }, | ||
| 340 | + visibleNameCompanyChange(val) { | ||
| 341 | + if (val) return | ||
| 342 | + let input = this.$refs.companySelect.$children[0].$refs.input; | ||
| 343 | + input.blur(); | ||
| 344 | + }, | ||
| 330 | loadList() { | 345 | loadList() { |
| 331 | this.name_loading = true; | 346 | this.name_loading = true; |
| 332 | request({ | 347 | request({ |
src/views/baseSystemInfo/index.vue
| @@ -92,7 +92,9 @@ | @@ -92,7 +92,9 @@ | ||
| 92 | </el-row> | 92 | </el-row> |
| 93 | <div class="NCC-common-layout-main NCC-flex-main"> | 93 | <div class="NCC-common-layout-main NCC-flex-main"> |
| 94 | <NCC-table v-loading="loading" :data="infoDataList"> | 94 | <NCC-table v-loading="loading" :data="infoDataList"> |
| 95 | - <el-table-column show-overflow-tooltip prop="companyName" label="运营主体名称" align="center"/> | 95 | + <el-table-column show-overflow-tooltip prop="companyName" label="运营主体名称" align="center"> |
| 96 | + <template slot-scope="scope">{{ scope.row.companyName || scope.row.companyId }}</template> | ||
| 97 | + </el-table-column> | ||
| 96 | <el-table-column show-overflow-tooltip prop="systemName" label="应用名称" align="center"/> | 98 | <el-table-column show-overflow-tooltip prop="systemName" label="应用名称" align="center"/> |
| 97 | <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip> | 99 | <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip> |
| 98 | <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template> | 100 | <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template> |
| @@ -213,7 +215,7 @@ export default { | @@ -213,7 +215,7 @@ export default { | ||
| 213 | }, | 215 | }, |
| 214 | listQuery: { | 216 | listQuery: { |
| 215 | currentPage: 1, | 217 | currentPage: 1, |
| 216 | - pageSize: 10, | 218 | + pageSize: 20, |
| 217 | sort: "desc", | 219 | sort: "desc", |
| 218 | sidx: "", | 220 | sidx: "", |
| 219 | }, | 221 | }, |