Commit f7abd9284856f789221221df03f4eaf9e0809243

Authored by monkeyhouyi
1 parent f5dee0fd

1.基础信息库-筛选:应用信息、运营主体信息(原公司信息)2个页面,查询条件都新增“所属区(市)县”(仅市级账号新增),列表中的字段“所属区县”也要同步改名。2…

…、基础信息库-新增运营主体/应用:网站要新增“域名”字段;新增应用时,选择运营主体后,已有信息直接同步显示,不再重复录入;新增运营主体的“联系方式”删除,和“联系电话”重复了;新增运营主体中的“社会信用代码”少了“码”,调整一下;“所属外协”删除,没有所属外协。
src/views/baseCaseHandling/Form.vue
@@ -281,7 +281,6 @@ export default { @@ -281,7 +281,6 @@ export default {
281 }) 281 })
282 }, 282 },
283 selectBlur(e) { 283 selectBlur(e) {
284 - if(!this.isSHILevel) return;  
285 let value = e.target.value; 284 let value = e.target.value;
286 if(!value) return; 285 if(!value) return;
287 this.dataForm.systemName = e.target.value; 286 this.dataForm.systemName = e.target.value;
src/views/baseCaseHandling/index.vue
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
48 </el-form-item> 48 </el-form-item>
49 <div class="NCC-common-search-box-right"> 49 <div class="NCC-common-search-box-right">
50 <el-button type="success" icon="el-icon-plus" size="mini" @click="addOrUpdateHandle('', false, '0')">新增</el-button> 50 <el-button type="success" icon="el-icon-plus" size="mini" @click="addOrUpdateHandle('', false, '0')">新增</el-button>
  51 + <el-button type="primary" icon="el-icon-download" size="mini" @click="toExport" :loading="exportBtnLoading">导出</el-button>
51 </div> 52 </div>
52 </el-col> 53 </el-col>
53 </el-form> 54 </el-form>
@@ -157,6 +158,7 @@ export default { @@ -157,6 +158,7 @@ export default {
157 stateOptions: [], 158 stateOptions: [],
158 areaOptions: [], 159 areaOptions: [],
159 systemOptions: [], 160 systemOptions: [],
  161 + exportBtnLoading: false,
160 }; 162 };
161 }, 163 },
162 computed: { 164 computed: {
@@ -256,6 +258,34 @@ export default { @@ -256,6 +258,34 @@ export default {
256 }) 258 })
257 .catch(() => {}); 259 .catch(() => {});
258 }, 260 },
  261 + // 导出
  262 + toExport() {
  263 + let _query = {
  264 + ...this.query,
  265 + };
  266 + let query = {};
  267 + for (let key in _query) {
  268 + if (Array.isArray(_query[key])) {
  269 + query[key] = _query[key].join();
  270 + } else {
  271 + query[key] = _query[key];
  272 + }
  273 + }
  274 + this.exportBtnLoading = true;
  275 + request({
  276 + url: ``,
  277 + method: "POST",
  278 + data: query,
  279 + }).then((res) => {
  280 + const url = process.env.VUE_APP_BASE_API + res.data.url;
  281 + const link = document.createElement("a");
  282 + link.href = url;
  283 + link.download = res.data.name;
  284 + link.click();
  285 + this.exportBtnLoading = false;
  286 + }).catch(() => this.exportBtnLoading = false);
  287 + },
  288 +
259 search() { 289 search() {
260 this.listQuery = { 290 this.listQuery = {
261 currentPage: 1, 291 currentPage: 1,
src/views/baseComapnyInfo/Form.vue
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
18 </el-form-item> 18 </el-form-item>
19 </el-col> 19 </el-col>
20 <el-col :span="24"> 20 <el-col :span="24">
21 - <el-form-item label="社会信用代" prop="socialCreditAgency">  
22 - <el-input v-model="dataForm.socialCreditAgency" placeholder="请输入社会信用代" clearable 21 + <el-form-item label="社会信用代码" prop="socialCreditAgency">
  22 + <el-input v-model="dataForm.socialCreditAgency" placeholder="请输入社会信用代码" clearable
23 :style='{ "width": "100%" }'> 23 :style='{ "width": "100%" }'>
24 </el-input> 24 </el-input>
25 </el-form-item> 25 </el-form-item>
@@ -36,13 +36,13 @@ @@ -36,13 +36,13 @@
36 </el-input> 36 </el-input>
37 </el-form-item> 37 </el-form-item>
38 </el-col> 38 </el-col>
39 - <el-col :span="24"> 39 + <!-- <el-col :span="24">
40 <el-form-item label="联系方式" prop="contactInformation"> 40 <el-form-item label="联系方式" prop="contactInformation">
41 <el-input v-model="dataForm.contactInformation" placeholder="请输入联系方式" clearable 41 <el-input v-model="dataForm.contactInformation" placeholder="请输入联系方式" clearable
42 :style='{ "width": "100%" }'> 42 :style='{ "width": "100%" }'>
43 </el-input> 43 </el-input>
44 </el-form-item> 44 </el-form-item>
45 - </el-col> 45 + </el-col> -->
46 <el-col :span="24"> 46 <el-col :span="24">
47 <el-form-item label="资质证明" prop="qualificationCertificate"> 47 <el-form-item label="资质证明" prop="qualificationCertificate">
48 <NCC-UploadFz v-model="dataForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" /> 48 <NCC-UploadFz v-model="dataForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" />
@@ -63,8 +63,8 @@ @@ -63,8 +63,8 @@
63 </el-form-item> 63 </el-form-item>
64 </el-col> 64 </el-col>
65 <el-col :span="24"> 65 <el-col :span="24">
66 - <el-form-item label="所属区县" prop="areaId">  
67 - <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px"> 66 + <el-form-item label="所属区(市)县" prop="areaId">
  67 + <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区(市)县" style="line-height: 22px">
68 <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio> 68 <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
69 </el-radio-group> 69 </el-radio-group>
70 </el-form-item> 70 </el-form-item>
src/views/baseComapnyInfo/index.vue
@@ -6,17 +6,24 @@ @@ -6,17 +6,24 @@
6 <div class="NCC-common-layout-center"> 6 <div class="NCC-common-layout-center">
7 <el-row class="NCC-common-search-box" :gutter="16"> 7 <el-row class="NCC-common-search-box" :gutter="16">
8 <el-form @submit.native.prevent size="mini"> 8 <el-form @submit.native.prevent size="mini">
9 - <el-col :span="5"> 9 + <el-col :span="4">
  10 + <el-form-item label="">
  11 + <el-select v-model="query.areaId" placeholder="请选择所属区(市)县" clearable>
  12 + <el-option v-for="item in areaOptions" :key="item.id" :label="item.fullName" :value="item.id"/>
  13 + </el-select>
  14 + </el-form-item>
  15 + </el-col>
  16 + <el-col :span="3">
10 <el-form-item label=""> 17 <el-form-item label="">
11 <el-input v-model="query.companyName" placeholder="运营主体名称" clearable/> 18 <el-input v-model="query.companyName" placeholder="运营主体名称" clearable/>
12 </el-form-item> 19 </el-form-item>
13 </el-col> 20 </el-col>
14 - <el-col :span="5"> 21 + <el-col :span="3">
15 <el-form-item label=""> 22 <el-form-item label="">
16 <el-input v-model="query.legalPerson" placeholder="运营主体法人" clearable/> 23 <el-input v-model="query.legalPerson" placeholder="运营主体法人" clearable/>
17 </el-form-item> 24 </el-form-item>
18 </el-col> 25 </el-col>
19 - <el-col :span="5"> 26 + <el-col :span="3">
20 <el-form-item label=""> 27 <el-form-item label="">
21 <el-input v-model="query.socialCreditAgency" placeholder="社会信用代" clearable/> 28 <el-input v-model="query.socialCreditAgency" placeholder="社会信用代" clearable/>
22 </el-form-item> 29 </el-form-item>
@@ -24,6 +31,7 @@ @@ -24,6 +31,7 @@
24 <el-col :span="4"> 31 <el-col :span="4">
25 <el-form-item> 32 <el-form-item>
26 <el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button> 33 <el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button>
  34 + <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
27 </el-form-item> 35 </el-form-item>
28 </el-col> 36 </el-col>
29 </el-form> 37 </el-form>
@@ -53,6 +61,9 @@ @@ -53,6 +61,9 @@
53 <el-table-column prop="legalPerson" label="运营主体法人" show-overflow-tooltip align="left"/> 61 <el-table-column prop="legalPerson" label="运营主体法人" show-overflow-tooltip align="left"/>
54 <el-table-column prop="address" label="公司地址" align="left" /> 62 <el-table-column prop="address" label="公司地址" align="left" />
55 <el-table-column prop="contactInformation" show-overflow-tooltip label="联系方式" align="left"/> 63 <el-table-column prop="contactInformation" show-overflow-tooltip label="联系方式" align="left"/>
  64 + <el-table-column label="所属区(市)县" prop="areaId" align="left" show-overflow-tooltip>
  65 + <template slot-scope="scope">{{ scope.row.areaId | dynamicText(areaOptions) }}</template>
  66 + </el-table-column>
56 <el-table-column label="操作" fixed="right" width="100"> 67 <el-table-column label="操作" fixed="right" width="100">
57 <template slot-scope="scope"> 68 <template slot-scope="scope">
58 <el-button type="text" @click="addOrUpdateHandle(scope.row.id, false)">编辑</el-button> 69 <el-button type="text" @click="addOrUpdateHandle(scope.row.id, false)">编辑</el-button>
@@ -78,8 +89,10 @@ import { @@ -78,8 +89,10 @@ import {
78 import NCCForm from "./Form"; 89 import NCCForm from "./Form";
79 import ExportBox from "./ExportBox"; 90 import ExportBox from "./ExportBox";
80 import request from "@/utils/request"; 91 import request from "@/utils/request";
  92 +import infoMixin from "@/mixins/info";
81 import define from '@/utils/define' 93 import define from '@/utils/define'
82 export default { 94 export default {
  95 + mixins: [infoMixin],
83 components: { NCCForm, ExportBox }, 96 components: { NCCForm, ExportBox },
84 data() { 97 data() {
85 return { 98 return {
@@ -115,6 +128,7 @@ export default { @@ -115,6 +128,7 @@ export default {
115 }, 128 },
116 computed: {}, 129 computed: {},
117 created() { 130 created() {
  131 + this.initAreaTypeList();
118 this.initData(); 132 this.initData();
119 }, 133 },
120 methods: { 134 methods: {
src/views/baseSystemInfo/index.vue
@@ -7,10 +7,17 @@ @@ -7,10 +7,17 @@
7 <div class="NCC-common-layout-center"> 7 <div class="NCC-common-layout-center">
8 <el-row class="NCC-common-search-box" :gutter="5"> 8 <el-row class="NCC-common-search-box" :gutter="5">
9 <el-form @submit.native.prevent size="mini"> 9 <el-form @submit.native.prevent size="mini">
10 - <el-col :span="4"> 10 + <!-- <el-col :span="3">
11 <el-form-item label=""> 11 <el-form-item label="">
12 <el-input clearable v-model="query.keyword" placeholder="请输入应用名称、运营主体名称进行查询"/> 12 <el-input clearable v-model="query.keyword" placeholder="请输入应用名称、运营主体名称进行查询"/>
13 </el-form-item> 13 </el-form-item>
  14 + </el-col> -->
  15 + <el-col :span="3">
  16 + <el-form-item label="">
  17 + <el-select v-model="query.areaId" placeholder="请选择所属区(市)县" clearable>
  18 + <el-option v-for="item in areaOptions" :key="item.id" :label="item.fullName" :value="item.id"/>
  19 + </el-select>
  20 + </el-form-item>
14 </el-col> 21 </el-col>
15 <el-col :span="3"> 22 <el-col :span="3">
16 <el-form-item label=""> 23 <el-form-item label="">
@@ -65,9 +72,9 @@ @@ -65,9 +72,9 @@
65 <el-table-column label="应用分类" prop="systemClassStr" align="left" show-overflow-tooltip> 72 <el-table-column label="应用分类" prop="systemClassStr" align="left" show-overflow-tooltip>
66 <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> --> 73 <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> -->
67 </el-table-column> 74 </el-table-column>
68 - <el-table-column show-overflow-tooltip prop="contactUser" label="联系人" align="center"/>  
69 - <el-table-column show-overflow-tooltip prop="contactPhone" label="联系电话" align="center"/>  
70 - <el-table-column label="所属区域" prop="areaId" align="left" show-overflow-tooltip> 75 + <el-table-column show-overflow-tooltip prop="principalName" label="联系人" align="center"/>
  76 + <el-table-column show-overflow-tooltip prop="principalPhone" label="联系电话" align="center"/>
  77 + <el-table-column label="所属区(市)县" prop="areaId" align="left" show-overflow-tooltip>
71 <template slot-scope="scope">{{ scope.row.areaId | dynamicText(areaOptions) }}</template> 78 <template slot-scope="scope">{{ scope.row.areaId | dynamicText(areaOptions) }}</template>
72 </el-table-column> 79 </el-table-column>
73 <el-table-column label="操作" width="250"> 80 <el-table-column label="操作" width="250">
@@ -212,14 +219,20 @@ export default { @@ -212,14 +219,20 @@ export default {
212 }, 219 },
213 methods: { 220 methods: {
214 uploadSuccess(response, file, fileList) { 221 uploadSuccess(response, file, fileList) {
215 - this.$message({  
216 - showClose: true,  
217 - message: response.msg,  
218 - type: response.code == 200 ? 'success' : 'error',  
219 - close: () => {  
220 - response.code == 200 && this.initData();  
221 - }  
222 - }); 222 + if(response.code == 200) {
  223 + this.$message({
  224 + type: 'success',
  225 + message: response.msg,
  226 + onClose: () => {
  227 + this.initData()
  228 + }
  229 + });
  230 + } else {
  231 + this.$message({
  232 + type: 'error',
  233 + message: response.msg,
  234 + });
  235 + }
223 }, 236 },
224 handleSystemTypeChange(val) { 237 handleSystemTypeChange(val) {
225 this.query.systemClass = ""; 238 this.query.systemClass = "";