From f7abd9284856f789221221df03f4eaf9e0809243 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Thu, 19 Sep 2024 17:22:13 +0800
Subject: [PATCH] 1.基础信息库-筛选：应用信息、运营主体信息（原公司信息）2个页面，查询条件都新增“所属区（市）县”（仅市级账号新增），列表中的字段“所属区县”也要同步改名。2、基础信息库-新增运营主体/应用：网站要新增“域名”字段；新增应用时，选择运营主体后，已有信息直接同步显示，不再重复录入；新增运营主体的“联系方式”删除，和“联系电话”重复了；新增运营主体中的“社会信用代码”少了“码”，调整一下；“所属外协”删除，没有所属外协。

---
 src/views/baseCaseHandling/Form.vue  |  1 -
 src/views/baseCaseHandling/index.vue | 30 ++++++++++++++++++++++++++++++
 src/views/baseComapnyInfo/Form.vue   | 12 ++++++------
 src/views/baseComapnyInfo/index.vue  | 20 +++++++++++++++++---
 src/views/baseSystemInfo/index.vue   | 37 +++++++++++++++++++++++++------------
 5 files changed, 78 insertions(+), 22 deletions(-)

diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue
index 433db27..656c82f 100644
--- a/src/views/baseCaseHandling/Form.vue
+++ b/src/views/baseCaseHandling/Form.vue
@@ -281,7 +281,6 @@ export default {
       })
     },
     selectBlur(e) {
-      if(!this.isSHILevel) return;
       let value = e.target.value;
       if(!value) return;
       this.dataForm.systemName = e.target.value;
diff --git a/src/views/baseCaseHandling/index.vue b/src/views/baseCaseHandling/index.vue
index 1a0d677..e2fc9eb 100644
--- a/src/views/baseCaseHandling/index.vue
+++ b/src/views/baseCaseHandling/index.vue
@@ -48,6 +48,7 @@
                 </el-form-item>
                 <div class="NCC-common-search-box-right">
                   <el-button type="success" icon="el-icon-plus" size="mini" @click="addOrUpdateHandle('', false, '0')">新增</el-button>
+                  <el-button type="primary" icon="el-icon-download" size="mini" @click="toExport" :loading="exportBtnLoading">导出</el-button>
                 </div>
               </el-col>
             </el-form>
@@ -157,6 +158,7 @@ export default {
       stateOptions: [],
       areaOptions: [],
       systemOptions: [],
+      exportBtnLoading: false,
     };
   },
   computed: {
@@ -256,6 +258,34 @@ export default {
         })
         .catch(() => {});
     },
+     // 导出
+     toExport() {
+      let _query = {
+        ...this.query,
+      };
+      let query = {};
+      for (let key in _query) {
+        if (Array.isArray(_query[key])) {
+          query[key] = _query[key].join();
+        } else {
+          query[key] = _query[key];
+        }
+      }
+      this.exportBtnLoading = true;
+      request({
+        url: ``,
+        method: "POST",
+        data: query,
+      }).then((res) => {
+        const url = process.env.VUE_APP_BASE_API + res.data.url;
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = res.data.name;
+        link.click();
+        this.exportBtnLoading = false;
+      }).catch(() => this.exportBtnLoading = false);
+    },
+
     search() {
       this.listQuery = {
         currentPage: 1,
diff --git a/src/views/baseComapnyInfo/Form.vue b/src/views/baseComapnyInfo/Form.vue
index eb743a3..17c8d0a 100644
--- a/src/views/baseComapnyInfo/Form.vue
+++ b/src/views/baseComapnyInfo/Form.vue
@@ -18,8 +18,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="社会信用代" prop="socialCreditAgency">
-						<el-input v-model="dataForm.socialCreditAgency" placeholder="请输入社会信用代" clearable
+					<el-form-item label="社会信用代码" prop="socialCreditAgency">
+						<el-input v-model="dataForm.socialCreditAgency" placeholder="请输入社会信用代码" clearable
 							:style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
@@ -36,13 +36,13 @@
 						</el-input>
 					</el-form-item>
 				</el-col>
-				<el-col :span="24">
+				<!-- <el-col :span="24">
 					<el-form-item label="联系方式" prop="contactInformation">
 						<el-input v-model="dataForm.contactInformation" placeholder="请输入联系方式" clearable
 							:style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 				<el-col :span="24">
 					<el-form-item label="资质证明" prop="qualificationCertificate">
 						<NCC-UploadFz v-model="dataForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" />
@@ -63,8 +63,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-         		  <el-form-item label="所属区县" prop="areaId">
-         		    <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px">
+         		  <el-form-item label="所属区（市）县" prop="areaId">
+         		    <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区（市）县" style="line-height: 22px">
          		      <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
          		    </el-radio-group>
          		  </el-form-item>
diff --git a/src/views/baseComapnyInfo/index.vue b/src/views/baseComapnyInfo/index.vue
index 9f2dbf1..7444142 100644
--- a/src/views/baseComapnyInfo/index.vue
+++ b/src/views/baseComapnyInfo/index.vue
@@ -6,17 +6,24 @@
         <div class="NCC-common-layout-center">
           <el-row class="NCC-common-search-box" :gutter="16">
             <el-form @submit.native.prevent size="mini">
-              <el-col :span="5">
+              <el-col :span="4">
+                <el-form-item label="">
+                  <el-select v-model="query.areaId" placeholder="请选择所属区（市）县" clearable>
+                    <el-option v-for="item in areaOptions" :key="item.id" :label="item.fullName" :value="item.id"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="3">
                 <el-form-item label="">
                   <el-input v-model="query.companyName" placeholder="运营主体名称" clearable/>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="3">
                 <el-form-item label="">
                   <el-input v-model="query.legalPerson" placeholder="运营主体法人" clearable/>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="3">
                 <el-form-item label="">
                   <el-input v-model="query.socialCreditAgency" placeholder="社会信用代" clearable/>
                 </el-form-item>
@@ -24,6 +31,7 @@
               <el-col :span="4">
                 <el-form-item>
                   <el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button>
+                  <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
                 </el-form-item>
               </el-col>
             </el-form>
@@ -53,6 +61,9 @@
               <el-table-column prop="legalPerson" label="运营主体法人" show-overflow-tooltip align="left"/>
               <el-table-column prop="address" label="公司地址" align="left" />
               <el-table-column prop="contactInformation" show-overflow-tooltip label="联系方式" align="left"/>
+              <el-table-column label="所属区（市）县" prop="areaId" align="left" show-overflow-tooltip>
+                <template slot-scope="scope">{{ scope.row.areaId | dynamicText(areaOptions) }}</template>
+              </el-table-column>
               <el-table-column label="操作" fixed="right" width="100">
                 <template slot-scope="scope">
                   <el-button type="text" @click="addOrUpdateHandle(scope.row.id, false)">编辑</el-button>
@@ -78,8 +89,10 @@ import {
 import NCCForm from "./Form";
 import ExportBox from "./ExportBox";
 import request from "@/utils/request";
+import infoMixin from "@/mixins/info";
 import define from '@/utils/define'
 export default {
+  mixins: [infoMixin],
   components: { NCCForm, ExportBox },
   data() {
     return {
@@ -115,6 +128,7 @@ export default {
   },
   computed: {},
   created() {
+    this.initAreaTypeList();
     this.initData();
   },
   methods: {
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 35472bc..73823d9 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -7,10 +7,17 @@
         <div class="NCC-common-layout-center">
           <el-row class="NCC-common-search-box" :gutter="5">
             <el-form @submit.native.prevent size="mini">
-              <el-col :span="4">
+              <!-- <el-col :span="3">
                 <el-form-item label="">
                   <el-input clearable v-model="query.keyword" placeholder="请输入应用名称、运营主体名称进行查询"/>
                 </el-form-item>
+              </el-col> -->
+              <el-col :span="3">
+                <el-form-item label="">
+                  <el-select v-model="query.areaId" placeholder="请选择所属区（市）县" clearable>
+                    <el-option v-for="item in areaOptions" :key="item.id" :label="item.fullName" :value="item.id"/>
+                  </el-select>
+                </el-form-item>
               </el-col>
               <el-col :span="3">
                 <el-form-item label="">
@@ -65,9 +72,9 @@
               <el-table-column label="应用分类" prop="systemClassStr" align="left" show-overflow-tooltip>
                 <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> -->
               </el-table-column>
-              <el-table-column show-overflow-tooltip prop="contactUser" label="联系人" align="center"/>
-              <el-table-column show-overflow-tooltip prop="contactPhone" label="联系电话" align="center"/>
-              <el-table-column label="所属区域" prop="areaId" align="left" show-overflow-tooltip>
+              <el-table-column show-overflow-tooltip prop="principalName" label="联系人" align="center"/>
+              <el-table-column show-overflow-tooltip prop="principalPhone" label="联系电话" align="center"/>
+              <el-table-column label="所属区（市）县" prop="areaId" align="left" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.areaId | dynamicText(areaOptions) }}</template>
               </el-table-column>
               <el-table-column label="操作" width="250">
@@ -212,14 +219,20 @@ export default {
   },
   methods: {
     uploadSuccess(response, file, fileList) {
-        this.$message({
-          showClose: true,
-          message: response.msg,
-          type: response.code == 200 ? 'success' : 'error',
-          close: () => {
-            response.code == 200 && this.initData();
-          }
-        });
+      if(response.code == 200) {
+          this.$message({
+              type: 'success',
+              message: response.msg,
+              onClose: () => {
+                  this.initData()
+              }
+          });
+      } else {
+          this.$message({
+            type: 'error',
+            message: response.msg,
+          });
+      }
     },
     handleSystemTypeChange(val) {
       this.query.systemClass = "";
--
libgit2 0.21.4