From cbd5265de5730849e3e41c1a3eb5900e62653a79 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Wed, 23 Oct 2024 17:37:39 +0800
Subject: [PATCH] 优化

---
 src/components/CompanyForm/index.vue                    |  9 ++++++++-
 src/components/Generator/components/Upload/UploadFz.vue | 16 ++++++++++------
 src/views/DisposalSuggestions/index.vue                 | 38 +++++++++++++++++++++++---------------
 src/views/baseCaseHandling/index.vue                    | 10 ++++++++--
 src/views/baseComapnyInfo/Form.vue                      |  9 ++++++++-
 src/views/baseInspectionReport/Form.vue                 |  2 +-
 src/views/baseInspectionReport/index.vue                | 31 ++++++++++++++++++++++++-------
 src/views/basePrincipalResponsibility/Form.vue          |  2 +-
 src/views/basePrincipalResponsibility/index.vue         |  5 +++--
 src/views/baseSystemInfo/index.vue                      | 24 ++++++++----------------
 src/views/overView/Overview.vue                         |  2 +-
 src/views/overView/msgForm.vue                          |  9 +++++----
 12 files changed, 100 insertions(+), 57 deletions(-)

diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue
index d5ffe87..0ea566b 100644
--- a/src/components/CompanyForm/index.vue
+++ b/src/components/CompanyForm/index.vue
@@ -129,7 +129,14 @@ export default {
 			companyName: [
 				{
 					required: true,
-					message: '请输入公司名称',
+					message: '请输入运营主体/个人名称',
+					trigger: 'blur'
+				},
+			],
+			areaId: [
+				{
+					required: true,
+					message: '请选择所属区县',
 					trigger: 'blur'
 				},
 			],
diff --git a/src/components/Generator/components/Upload/UploadFz.vue b/src/components/Generator/components/Upload/UploadFz.vue
index 4ff1f54..c1d3eee 100644
--- a/src/components/Generator/components/Upload/UploadFz.vue
+++ b/src/components/Generator/components/Upload/UploadFz.vue
@@ -3,7 +3,7 @@
     <el-upload :action="define.comUploadUrl+'/'+type" :headers="uploadHeaders" ref="elUpload"
       :on-success="handleSuccess" :multiple="limit!==1" :show-file-list="false" :accept="accept"
       :before-upload="beforeUpload" :on-exceed="handleExceed" :disabled="disabled" :limit="limit" v-if="!disabled">
-      <el-button size="small" icon="el-icon-upload" :disabled="disabled" :on-preview="handlePreview">{{buttonText}}</el-button>
+      <el-button size="small" icon="el-icon-upload" v-if="!disabled" :disabled="disabled" :on-preview="handlePreview">{{buttonText}}</el-button>
       <div slot="tip" class="el-upload__tip" v-show="showTip">
         只能上传不超过{{fileSize}}{{sizeUnit}}的{{accept}}文件
       </div>
@@ -13,9 +13,12 @@
         name="el-list">
         <li class="el-upload-list__item is-success" v-for="(file,index) in fileList"
           :key="file.fileId">
-          <a class="el-upload-list__item-name" @click="handleClick(file)">
-            <i class="el-icon-document"></i>{{file.name}}
-          </a>
+          <div style="display: flex; align-items: center;">
+            <a class="el-upload-list__item-name" @click="handleChaeck(file,index)" style="width: 60px; margin-right: 5px;"><i class="el-icon-view"></i>查看</a>
+            <a class="el-upload-list__item-name" @click="handleClick(file)" style="flex: 1;">
+              <i class="el-icon-download"></i>{{file.name}}
+            </a>
+          </div>
           <label class="el-upload-list__item-status-label">
             <i class="el-icon-upload-success el-icon-circle-check"></i>
           </label>
@@ -127,9 +130,10 @@ export default {
       // this.$confirm(`确定移除${file.name}？`, '提示').then(() => {
       // }).catch(() => { })
     },
+    handleChaeck(file, index) {
+      window.open(`${this.define.comUrl}/api/File/Image/${this.type}/${file.fileId}`)
+    },
     handleClick(file) {
-      console.log(file);
-      
       // 点击下载文件
       if (!file.fileId) return
       getDownloadUrl(this.type, file.fileId, file.name).then(res => {
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index e7a821f..ccc990b 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="SystemInfo item-box common-info-box">
-    <div class="item-title">{{ isSHILevel ? "线索研判" : "巡查处理" }}</div>
+    <div class="item-title">{{ isSHILevel ? "线索研判" : "线索核查" }}</div>
     <div class="item-body">
       <div class="NCC-common-layout">
         <div class="NCC-common-layout-center">
@@ -11,7 +11,7 @@
                   <el-date-picker
                     v-model="query.creatorTime"
                     type="datetimerange"
-                    value-format="timestamp"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     format="yyyy-MM-dd HH:mm:ss"
                     start-placeholder="登记开始日期"
                     end-placeholder="登记结束日期"
@@ -90,15 +90,8 @@
                 label="应用名称"
                 align="left"
               />
-              <el-table-column
-                show-overflow-tooltip
-                label="应用类型"
-                prop="platformType"
-                align="left"
-              >
-                <template slot-scope="scope">{{
-                  scope.row.platformNameStr || scope.row.platformName
-                }}</template>
+              <el-table-column label="应用类型" prop="platformType" align="left" show-overflow-tooltip>
+                <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
@@ -281,6 +274,8 @@ export default {
       let _query = {
         ...this.listQuery,
         ...this.query,
+        startTime: this.query.creatorTime[0],
+        endTime: this.query.creatorTime[1],
       };
       let query = {};
       for (let key in _query) {
@@ -290,6 +285,8 @@ export default {
           query[key] = _query[key];
         }
       }
+      delete query.creatorTime;
+
       getListForJudge(query).then((res) => {
         this.list = res.data.list;
         this.total = res.data.pagination.total;
@@ -347,13 +344,24 @@ export default {
       this.initData();
     },
     exportData() {
+      let _query = {
+        ...this.query,
+        startTime: this.query.creatorTime[0],
+        endTime: this.query.creatorTime[1],
+      };
+      let query = {};
+      for (let key in _query) {
+        if (Array.isArray(_query[key])) {
+          query[key] = _query[key].join();
+        } else {
+          query[key] = _query[key];
+        }
+      }
+      delete query.creatorTime;
       let obj = {
         url: "/Extend/BaseInspectionReport/Actions/ExportByJudge",
         method: "POST",
-        data: {
-          ...this.query,
-          creatorTime: this.query.creatorTime.toString(),
-        },
+        data: query,
       };
       request(obj).then((res) => {
         if (res.code != 200) return;
diff --git a/src/views/baseCaseHandling/index.vue b/src/views/baseCaseHandling/index.vue
index a9b3a39..a66d4a4 100644
--- a/src/views/baseCaseHandling/index.vue
+++ b/src/views/baseCaseHandling/index.vue
@@ -11,7 +11,7 @@
                   <el-date-picker
                     v-model="query.registrationTime"
                     type="datetimerange"
-                    value-format="timestamp"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     format="yyyy-MM-dd HH:mm:ss"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
@@ -135,7 +135,7 @@ export default {
       showAll: false,
       query: {
         number: undefined,
-        registrationTime: undefined,
+        registrationTime: [],
         systemName: undefined,
         category: undefined,
         enforceType: undefined
@@ -208,6 +208,8 @@ export default {
       let _query = {
         ...this.listQuery,
         ...this.query,
+        startTime: this.query.registrationTime[0],
+        endTime: this.query.registrationTime[1],
       };
       let query = {};
       for (let key in _query) {
@@ -217,6 +219,7 @@ export default {
           query[key] = _query[key];
         }
       }
+      delete query.registrationTime;
       request({
         url: `/Extend/BaseCaseHandling`,
         method: "GET",
@@ -277,6 +280,8 @@ export default {
      toExport() {
       let _query = {
         ...this.query,
+        startTime: this.query.registrationTime[0],
+        endTime: this.query.registrationTime[1],
       };
       let query = {};
       for (let key in _query) {
@@ -286,6 +291,7 @@ export default {
           query[key] = _query[key];
         }
       }
+      delete query.registrationTime;
       this.exportBtnLoading = true;
       console.log(111);
       request({
diff --git a/src/views/baseComapnyInfo/Form.vue b/src/views/baseComapnyInfo/Form.vue
index c00c704..3a42aa5 100644
--- a/src/views/baseComapnyInfo/Form.vue
+++ b/src/views/baseComapnyInfo/Form.vue
@@ -117,7 +117,14 @@ export default {
 				companyName: [
 					{
 						required: true,
-						message: '请输入公司名称',
+						message: '请输入运营主体/个人名称',
+						trigger: 'blur'
+					},
+				],
+				areaId: [
+					{
+						required: true,
+						message: '请选择所属区县',
 						trigger: 'blur'
 					},
 				],
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index 040f974..749936a 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -473,7 +473,7 @@ export default {
           if(res.code != 200) return this.form_loading = false;
           if(!res.data) return;
           this.dataForm = res.data;
-          if(!this.isDetail) {
+          if(!this.isDetail && Array.isArray(this.dataForm.disposalSuggestions)) {
             let disposalSuggestions = this.dataForm.disposalSuggestions;
             this.dataForm.disposalSuggestions = disposalSuggestions[disposalSuggestions.length - 1].disposalSuggestion;
           }
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index b0555b8..aa01f84 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -11,7 +11,7 @@
                         <el-date-picker
                           v-model="query.creatorTime"
                           type="datetimerange"
-                          value-format="timestamp"
+                          value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd HH:mm:ss"
                           start-placeholder="登记开始日期"
                           end-placeholder="登记结束日期"
@@ -26,7 +26,7 @@
 					</el-col>
 					<el-col :span="3">
 						<el-form-item label="">
-							<el-select v-model="query.platformType" placeholder="请选择系统类型" clearable >
+							<el-select v-model="query.platformType" placeholder="请选择应用类型" clearable >
 								<el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id"  />
 							</el-select>
 						</el-form-item>
@@ -164,8 +164,11 @@
                 this.listLoading = true;
                 let _query = {
                     ...this.listQuery,
-                    ...this.query
+                    ...this.query,
+                    startTime: this.query.creatorTime[0],
+                    endTime: this.query.creatorTime[1],
                 };
+                
                 let query = {}
                 for (let key in _query) {
                     if (Array.isArray(_query[key])) {
@@ -174,6 +177,8 @@
                         query[key] = _query[key]
                     }
                 }
+                delete query.creatorTime;
+                
                 getList(query).then(res => {
                     if(res.data) {
                         this.list = res.data.list
@@ -229,13 +234,25 @@
                         responseType: 'blob',
                     }
                 } else {
+                    let _query = {
+                        ...this.query,
+                        startTime: this.query.creatorTime[0],
+                        endTime: this.query.creatorTime[1],
+                    };
+
+                    let query = {}
+                    for (let key in _query) {
+                        if (Array.isArray(_query[key])) {
+                            query[key] = _query[key].join()
+                        } else {
+                            query[key] = _query[key]
+                        }
+                    }
+                    delete query.creatorTime;
                     obj = {
                         url: '/Extend/BaseInspectionReport/Actions/Export',
                         method: "POST",
-                        data: {
-                            ...this.query,
-                            creatorTime: this.query.creatorTime.toString(),
-                        },
+                        data: query,
                     }
                 }
                 request(obj).then((res) => {
diff --git a/src/views/basePrincipalResponsibility/Form.vue b/src/views/basePrincipalResponsibility/Form.vue
index 10eedb6..6d56c45 100644
--- a/src/views/basePrincipalResponsibility/Form.vue
+++ b/src/views/basePrincipalResponsibility/Form.vue
@@ -39,7 +39,7 @@
 					</el-col>
 					<el-col :span="24" v-if="ncc.hasFormP('fileUrl')">
 						<el-form-item label="文件地址" prop="fileUrl">
-							<NCC-UploadFz v-model="dataForm.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
+							<NCC-UploadFz v-model="dataForm.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" :disabled="!!isDetail">
 							</NCC-UploadFz>
 						</el-form-item>
 					</el-col>
diff --git a/src/views/basePrincipalResponsibility/index.vue b/src/views/basePrincipalResponsibility/index.vue
index 20068fa..0ebd11a 100644
--- a/src/views/basePrincipalResponsibility/index.vue
+++ b/src/views/basePrincipalResponsibility/index.vue
@@ -36,13 +36,14 @@
                 <template slot-scope="scope">{{ scope.row.fileType | dynamicText(fileTypeOptions) }}</template>
               </el-table-column>
               <el-table-column prop="timeTakingEffect" label="生效时间" align="left" show-overflow-tooltip :formatter="ncc.tableDateFormat"/>
-              <el-table-column prop="content" label="具体内容" align="left" show-overflow-tooltip/>
+              <!-- <el-table-column prop="content" label="具体内容" align="left" show-overflow-tooltip/> -->
               <!-- <el-table-column prop="creatorUserId" label="创建用户" align="left" show-overflow-tooltip/> -->
               <el-table-column prop="creatorTime" label="创建时间" :formatter="ncc.tableDateFormat" align="left" show-overflow-tooltip/>
               <!-- <el-table-column prop="lastModifyUserId" label="修改用户" show-overflow-tooltip align="left"/> -->
               <!-- <el-table-column prop="lastModifyTime" :formatter="ncc.tableDateFormat" label="修改时间" align="left" show-overflow-tooltip/> -->
-              <el-table-column label="操作" fixed="right" width="100">
+              <el-table-column label="操作" fixed="right" width="150">
                 <template slot-scope="scope">
+                  <el-button type="text" @click="addOrUpdateHandle(scope.row.id, true)" >详情</el-button>
                   <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
                   <el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
                 </template>
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 42c06b4..0993e92 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -35,12 +35,12 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="">
-                  <el-input v-model="query.principalName" placeholder="请输入联系人"/>
+                  <el-input v-model="query.principalName" placeholder="请输入联系人" clearable/>
                 </el-form-item>
               </el-col>
               <el-col :span="3">
                 <el-form-item label="">
-                  <el-input v-model="query.principalPhone" placeholder="请输入联系电话"/>
+                  <el-input v-model="query.principalPhone" placeholder="请输入联系电话" clearable/>
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -222,20 +222,12 @@ export default {
   },
   methods: {
     uploadSuccess(response, file, fileList) {
-      if(response.code == 200) {
-          this.$message({
-              type: 'success',
-              message: response.msg,
-              onClose: () => {
-                  this.initData()
-              }
-          });
-      } else {
-          this.$message({
-            type: 'error',
-            message: response.msg,
-          });
-      }
+      let type = response.code == 200 ? 'success' : 'error';
+      this.$message({
+          type: type,
+          message: response.msg,
+      });
+      this.initList();
     },
     handleSystemTypeChange(val) {
       this.query.systemClass = "";
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index d5e02de..b40b0c2 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -358,7 +358,7 @@ export default {
         // });
       } else {
         let type = row.taskType;
-        if(row.taskType == '核查处理' || row.taskType == '研判') {
+        if(row.taskType == '核查处理' || row.taskType == '核查处置' || row.taskType == '研判') {
           let str = row.taskTitle;
           type = str.slice(1, str.indexOf('】'));
         }
diff --git a/src/views/overView/msgForm.vue b/src/views/overView/msgForm.vue
index 5b9936c..285ffa5 100644
--- a/src/views/overView/msgForm.vue
+++ b/src/views/overView/msgForm.vue
@@ -91,13 +91,15 @@
       <div class="content" v-html="dataForm.bodyContent"></div>
       <div class="files" v-if="isSHILevel">
         <h4>查看情况</h4>
+        <div style="font-size: 12px; margin: 8px;">
+          注：<el-tag type="success" size="mini">区县</el-tag>表示 【已查看】 的区县， <el-tag type="danger" size="mini">区县</el-tag>表示 【未查看】 的区县
+        </div>
         <div class="tag-group">
           <span class="tag-group__title title-tag">传递区域:</span>
           <el-tag
             v-for="(v, i) in dataForm.communicationAreaList"
             :key="i"
-            :type="`${v.IsRead ? 'success' : 'danger'}`"
-            :effect="`${v.IsRead ? 'dark' : 'plain'}`">
+            :type="`${v.IsRead ? 'success' : 'danger'}`">
             {{ v.FullName }}
           </el-tag>
         </div>
@@ -106,8 +108,7 @@
           <el-tag
             v-for="(v, i) in dataForm.communicationOutList"
             :key="i"
-            :type="`${v.IsRead ? 'success' : 'danger'}`"
-            :effect="`${v.IsRead ? 'dark' : 'plain'}`">
+            :type="`${v.IsRead ? 'success' : 'danger'}`">
             {{ v.FullName }}
           </el-tag>
         </div>
--
libgit2 0.21.4