Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

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,