From 94f06e38321658505d3a83057063082e2f837e87 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Wed, 4 Sep 2024 11:40:34 +0800
Subject: [PATCH] 优化

---
 src/views/DisposalSuggestions/index.vue  |  2 +-
 src/views/baseCaseHandling/Form.vue      |  5 ++++-
 src/views/baseInspectionReport/Form.vue  | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 src/views/baseInspectionReport/index.vue | 28 ++++++++++++++++++++--------
 src/views/baseSystemInfo/index.vue       | 53 ++++++++++++++++++++++++++++++++---------------------
 5 files changed, 108 insertions(+), 42 deletions(-)

diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index c2210d3..4f22aaa 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -46,7 +46,7 @@
                    </el-table-column>
                    <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" />
 				    <el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" />
-                    <el-table-column show-overflow-tooltip prop="" label="录入时间" align="left" />
+                    <el-table-column show-overflow-tooltip prop="creatorTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat"/>
                    <!-- <el-table-column show-overflow-tooltip prop="disposalSuggestions" label="处置建议" align="left" />
                    <el-table-column show-overflow-tooltip prop="id" label="主键" align="left" />
                    <el-table-column show-overflow-tooltip prop="department" label="部门" align="left" />
diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue
index a61460d..e3074dd 100644
--- a/src/views/baseCaseHandling/Form.vue
+++ b/src/views/baseCaseHandling/Form.vue
@@ -201,7 +201,10 @@ export default {
 	    },
       rules: {
         systemName: [
-          { required: true, message: "请选择系统名称", trigger: "change" }
+          { required: true, message: "请选择应用名称", trigger: "bulr" }
+        ],
+        registeredEntity: [
+          { required: true, message: "请选择运营主体", trigger: "bulr" }
         ],
         districtCounty: [
           { required: true, message: "请选择所属区域", trigger: "change" }
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index fc97082..f5236b8 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -24,8 +24,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="问题来源" prop="source">
-            <el-radio-group v-model="dataForm.source">
+          <el-form-item label="问题来源" prop="reportSource">
+            <el-radio-group v-model="dataForm.reportSource">
               <el-radio v-for="(item, index) in sourceOptions" :key="index" :label="item.Id">{{ item.FullName }}</el-radio>
             </el-radio-group>
           </el-form-item>
@@ -49,6 +49,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="23">
+          <el-form-item label="运营主体" prop="company">
+            <el-select
+              v-model="dataForm.company"
+              placeholder="请选择运营主体"
+              clearable
+              filterable 
+              style="width: 100%"
+              :disabled='isDisabledTypeByName || !!this.dataForm.id'
+            >
+              <el-option
+                v-for="item in companyOptions"
+                :key="item.id"
+                :label="item.companyName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23">
           <el-form-item label="应用类型" prop="platformType">
             <el-radio-group v-model="dataForm.platformType" :disabled='isDisabledTypeByName || !!this.dataForm.id'>
               <el-radio v-for="(item, index) in platformTypeOptions" :key="index" :label="item.Id">{{ item.FullName }}</el-radio>
@@ -105,8 +125,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="附件" prop="obtainEvidence">
-            <NCC-UploadFz v-model="dataForm.obtainEvidence" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" />
+          <el-form-item label="附件" prop="annex">
+            <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" />
           </el-form-item>
         </el-col>
       </el-form>
@@ -114,13 +134,17 @@
     <el-row v-else>
       <el-col class="form-item">
         <div class="label">问题来源：</div>
-        <div class="text">{{ dataForm.source || '--' }}</div>
+        <div class="text">{{ dataForm.reportSource || '--' }}</div>
       </el-col>
       <el-col class="form-item">
         <div class="label">应用名称：</div>
         <div class="text">{{ dataForm.platformName || '--' }}</div>
       </el-col>
       <el-col class="form-item">
+        <div class="label">运营主体：</div>
+        <div class="text">{{ dataForm.company || '--' }}</div>
+      </el-col>
+      <el-col class="form-item">
         <div class="label">应用类型：</div>
         <div class="text">{{ dataForm.platformType || '--' }}</div>
       </el-col>
@@ -155,7 +179,7 @@
     </el-row>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :loading="btnLoading">确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -176,7 +200,7 @@ export default {
       isDetail: false,
       dataForm: {
         id: undefined,
-        source: undefined,
+        reportSource: undefined,
         platformName: '',
         selfMediaPlatformType: '',
         platformType: undefined,
@@ -186,17 +210,20 @@ export default {
         link: undefined,
         accurateDescription: undefined,
         incorrectDescription: undefined,
-        obtainEvidence: [],
         annex: [],
         otherQuestionType: undefined,
         selfMediaPlatformTypeOther: undefined,
+        company: undefined,
       },
       rules: {
         platformName: [
-          { required: true, message: "请选择系统名称", trigger: "blur" },
+          { required: true, message: "请选择应用名称", trigger: "blur" },
+        ],
+        company: [
+          { required: true, message: "请选择运营主体", trigger: "blur" },
         ],
         platformType: [
-          { required: true, message: "请选择系统类型", trigger: "blur" },
+          { required: true, message: "请选择应用类型", trigger: "blur" },
         ],
         questionType: [
           { required: true, message: "请选择问题类型", trigger: "blur" },
@@ -210,6 +237,8 @@ export default {
       questionTypeOptions: [],
       nameOptions: [],
       mediaPlatList: MediaPlatList,
+      companyOptions: [],
+      btnLoading: false,
     };
   },
   computed: {
@@ -221,6 +250,7 @@ export default {
   },
   watch: {},
   created() {
+    this.initCompanyList();
     this.loadList();
     this.getSourceOptions();
     this.getplatformTypeOptions();
@@ -228,6 +258,14 @@ export default {
   },
   mounted() {},
   methods: {
+    async initCompanyList() {
+      request({
+        url: `/Extend/basecomapnyinfo/GetNoPagingList`,
+        method: "GET",
+      }).then(({data}) => {
+        this.companyOptions = data;
+      })
+    },
     selectBlur(e) {
       let value = e.target.value;
       if(!value) return;
@@ -238,6 +276,7 @@ export default {
       let obj = this.nameOptions.find(v => type == 'blur' ? val == v.fullName : val == v.id);
       if(!obj) return;
       this.dataForm.platformName = obj ? obj.id : val;
+      this.dataForm.company = this.companyOptions.find(v => v.id == obj.companyId || v.companyName == obj.companyId).id;
       this.dataForm.platformType = this.platformTypeOptions.find(v => v.Id == obj.systemType || v.FullName == obj.systemType).Id;
       this.dataForm.selfMediaPlatformType = obj ? obj.platform : '';
     },
@@ -292,7 +331,6 @@ export default {
             this.dataForm.questionType = '其他';
           }
           this.dataForm.selfMediaPlatformType = res.data.selfMediaPlatformType || '--';
-          if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = [];
           if (!this.dataForm.annex) this.dataForm.annex = [];
         }
       });
@@ -305,7 +343,9 @@ export default {
             questionType: this.dataForm.questionType == '其他' ? this.dataForm.otherQuestionType : this.dataForm.questionType,
             selfMediaPlatformType: this.dataForm.selfMediaPlatformType == '其他' ? this.dataForm.selfMediaPlatformTypeOther : this.dataForm.questionType,
           }
+          this.btnLoading = true;
           let res = !this.dataForm.id ? await addForm(obj) : await updataForm(obj);
+          if (res.code != 200) return this.btnLoading = false;
           this.$message({
             message: res.msg,
             type: "success",
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index 991d433..3335405 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -58,7 +58,7 @@
 					<el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left" />
 					<!-- <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> -->
 					<el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" />
-					<el-table-column show-overflow-tooltip prop="" label="录入时间" align="left" />
+					<el-table-column show-overflow-tooltip prop="creatorTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat"/>
 					<!-- <el-table-column show-overflow-tooltip prop="department" label="部门" align="left" /> -->
 					<!-- <el-table-column show-overflow-tooltip label="问题分类" prop="questionClass" align="left">
 							<template slot-scope="scope">{{ scope.row.questionClass | dynamicText(questionClassOptions) }}</template>
@@ -203,13 +203,14 @@ import { message } from '@/utils/message';
             },
             exportData(type) {
                 let obj = {}
+                this.listLoading = true;
                 if(type) {
                     obj = {
                         url: '/Extend/BaseInspectionReport/Actions/GenerateImportTemplate',
                         method: "GET",
+                        responseType: 'blob',
                     }
                 } else {
-                    this.listLoading = true;
                     let _query = {
                         ...this.listQuery,
                         ...this.query
@@ -226,15 +227,26 @@ import { message } from '@/utils/message';
                         url: '/Extend/BaseInspectionReport/Actions/Export',
                         method: "POST",
                         data: query,
+                        responseType: 'blob',
                     }
                 }
                 request(obj).then((res) => {
-                  console.log(res);
-                  const url = define.APIURl + res.data.url;
-                  const link = document.createElement("a");
-                  link.href = url;
-                  link.download = res.data.name;
-                  link.click();
+                  if(type) {
+                    const blob = new Blob([res], {type: 'application/json'});
+                    const url = window.URL.createObjectURL(blob);
+                    let link = document.createElement('a');
+                    link.style.display = 'none';
+                    link.href = url;
+                    link.download = '线索录入模板.xlsx';
+                    link.click();
+                  } else {
+                    if(res.code != 200) return;
+                    const url = define.APIURl + res.data.url;
+                    const link = document.createElement("a");
+                    link.href = url;
+                    link.download = res.data ? res.data.name : '线索录入模板.xlsx';
+                    link.click();
+                  }
                 });
                 this.listLoading = false;
             },
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 5fe0c0c..051f001 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -78,8 +78,9 @@
               </el-col>
             </el-form>
             <div class="NCC-common-search-box-right">
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData('demo')">导出模板</el-button>
               <!-- <el-button type="success" icon="el-icon-upload2" size="mini">导入</el-button> -->
-              <el-button type="primary" icon="el-icon-download" size="mini" @click="toExport">导出</el-button>
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button>
             </div>
           </el-row>
           <div class="NCC-common-layout-main NCC-flex-main">
@@ -206,6 +207,7 @@ import InspectionForm from "./InspectForm.vue";
 import DetailForm from './DetailForm.vue';
 import ChangeRecord from "./ChangeRecord.vue";
 import ExportBox from "./ExportBox.vue";
+import define from '@/utils/define'
 
 export default {
   name: "SystemInfo",
@@ -390,29 +392,38 @@ export default {
         this.initList();
       });
     },
-    toExport() {
-      let _query = {
-        ...this.query,
+    exportData(type) {
+      let obj = {};
+      if(type) {
+        obj = {
+          url: '/Extend/basesysteminfo/Actions/GenerateImportTemplate',
+          method: "GET",
+        }
+      } else {
+        obj ={
+          url: '/Extend/basesysteminfo/Actions/Export',
+          method: "POST",
+          data: this.query,
+        }
       };
-      let query = {};
-      for (let key in _query) {
-        if (Array.isArray(_query[key])) {
-          query[key] = _query[key].join();
+      request(obj).then((res) => {
+        if(type) {
+          const blob = new Blob([res], {type: 'application/json'});
+          const url = window.URL.createObjectURL(blob);
+          let link = document.createElement('a');
+          link.style.display = 'none';
+          link.href = url;
+          link.download = '应用信息模板.xlsx';
+          link.click();
         } else {
-          query[key] = _query[key];
+          if(res.code != 200) return;
+          const url = define.APIURl + res.data.url;
+          const link = document.createElement("a");
+          link.href = url;
+          link.download = res.data.name;
+          link.click();
         }
-      }
-      request({
-        url: `/Extend/basesysteminfo/Actions/Export`,
-        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();
-      });
+      })
     },
     download(data) {
       let query = { ...data, ...this.listQuery, ...this.query };
--
libgit2 0.21.4