From 21075c524c4d46c99e746357ed5beed29bc1cdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=90=AF=E6=9E=97?= <1940603613@qq.com>
Date: Thu, 9 May 2024 09:59:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E7=90=86=E4=BA=8B=E9=A1=B9=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=80=E5=8F=B7=E4=B8=80=E8=AF=84=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=8A=9E=E7=90=86=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E7=AA=97=E5=8F=A3=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 portal-manager-ui/admin/src/router/routes.js  |  2 +-
 .../components/HandlingDetails.vue            |  2 +-
 .../matterEvaluation.vue                      | 21 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/portal-manager-ui/admin/src/router/routes.js b/portal-manager-ui/admin/src/router/routes.js
index b9752991..5f3cc23c 100644
--- a/portal-manager-ui/admin/src/router/routes.js
+++ b/portal-manager-ui/admin/src/router/routes.js
@@ -337,7 +337,7 @@ const routes = [
                     /* webpackChunkName: "matterEvaluation" */ "@/views/dataAdmin/components/evaluationRecordReport/matterEvaluation.vue"
                   ),
                 meta: {
-                  title: "鍔炵悊浜嬮」璇勪环璁板綍鎶ヨ〃",
+                  title: "涓€鍙蜂竴璇勮褰曟姤琛�",
                   activeMenu: "/home/dataManagement",
                 },
               },
diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue
index 9355fffd..08ed1035 100644
--- a/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue
+++ b/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue
@@ -270,7 +270,7 @@
             <div slot="description">
               <a-row :gutter="[0, 8]">
                 <a-col :span="12">
-                  <span>鍔炵悊绐楀彛锛�</span>{{ detailsInfo.window_name }}
+                  <span>鍔炵悊绐楀彛锛�</span>{{ detailsInfo.window_name +detailsInfo.window_fromnum }}
                 </a-col>
                 <a-col :span="12">
                   <span>寮€濮嬪姙鐞嗘椂闂达細</span>{{ detailsInfo.calltime }}
diff --git a/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/matterEvaluation.vue b/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/matterEvaluation.vue
index 73f47a91..08eafef9 100644
--- a/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/matterEvaluation.vue
+++ b/portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/matterEvaluation.vue
@@ -6,6 +6,7 @@
       :data-source="tableData"
       :loading="loading"
       :scroll="{
+        x: 1500,
         y: 490,
       }"
       :row-selection="{
@@ -72,6 +73,8 @@ import { getEvaList, getEvaDetil, getQueEvaData } from "@/api/dataAdmin";
 const tHeader = [
   "鎺掗槦缂栧彿",
   "璇勪环閫夐」",
+  "鍔炵悊绐楀彛",
+  "宸ヤ綔浜哄憳",
   "璇勪环浜�",
   "韬唤璇佸彿",
   "鎵嬫満鍙�",
@@ -82,6 +85,8 @@ const tHeader = [
 const filterVal = [
   "flounum",
   "option_id",
+  "window",
+  "workman_name",
   "idcard_Name",
   "idcard_IDCardNo",
   "phone",
@@ -119,6 +124,22 @@ export default {
           return text ? text : "--";
         },
       },
+      {
+        title: "鍔炵悊绐楀彛",
+        width: 100,
+        dataIndex: "window",
+        customRender: (text) => {
+          return text ? text : "--";
+        },
+      },
+      {
+        title: "宸ヤ綔浜哄憳",
+        width: 100,
+        dataIndex: "workman_name",
+        customRender: (text) => {
+          return text ? text : "--";
+        },
+      },
       {
         title: "璇勪环浜�",
         width: 100,
-- 
2.24.3