Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/package.json

@@ -5,6 +5,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
+    "serve2": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build": "vue-cli-service build --mode production",
     "beta": "vue-cli-service build --mode beta",
     "test": "vue-cli-service build --mode test",

base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue

@@ -399,7 +399,7 @@ export default {
         file.type === "image/png" ||
         file.type === "image/gif";
       if (!isJpgOrPng) {
-        this.$message.error("请上传jpeg或者png图片!");
+        this.$message.error("请上传jpeg,png或者gif图片!");
       }
       const isLt5M = file.size / 1024 / 1024 < 5;
       if (!isLt5M) {

portal-manager-ui/admin/src/components/reportformsForm/DepartmentSearch.vue

@@ -86,7 +86,7 @@
       <y-range-picker valueFormat="YYYY-MM-DD" v-model="searchForm.time" />
       <a-input
         allowClear
-        placeholder="请输入评价人姓名或窗口编号搜索"
+        placeholder="请输入评价人姓名或排队编号搜索"
         v-model="searchForm.info"
       />
       <a-button block class="search-btn" icon="search" @click="handleSearch">

portal-manager-ui/admin/src/components/reportformsForm/MatterSearch.vue

@@ -86,7 +86,7 @@
       <y-range-picker valueFormat="YYYY-MM-DD" v-model="searchForm.time" />
       <a-input
         allowClear
-        placeholder="请输入评价人姓名或窗口编号搜索"
+        placeholder="请输入评价人姓名或排队编号搜索"
         v-model="searchForm.info"
       />
       <a-button block class="search-btn" icon="search" @click="handleSearch">

portal-manager-ui/admin/src/components/reportformsForm/WindowSearch.vue

@@ -86,7 +86,7 @@
       <y-range-picker valueFormat="YYYY-MM-DD" v-model="searchForm.time" />
       <a-input
         allowClear
-        placeholder="请输入评价人姓名或窗口编号搜索"
+        placeholder="请输入评价人姓名或排队编号搜索"
         v-model="searchForm.info"
       />
       <a-button block class="search-btn" icon="search" @click="handleSearch">

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",
                 },
               },

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,
@@ -328,7 +349,7 @@ export default {
           this.tHeader,
           this.filterVal,
           data,
-          "办理事项评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
+          "一号一评记录报表" + this.$moment().format("YYYYMMDDHHmmss")
         );
       } else {
         this.dataSection(this.getDataList, {}, (data) => {
@@ -347,7 +368,7 @@ export default {
             this.tHeader,
             this.filterVal,
             data,
-            "办理事项评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
+            "一号一评记录报表" + this.$moment().format("YYYYMMDDHHmmss")
           );
         });
       }

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/staffLeft.vue

@@ -253,7 +253,7 @@ export default {
           this.tHeader,
           this.filterVal,
           data,
-          "办理事项评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
+          "一号一评记录报表" + this.$moment().format("YYYYMMDDHHmmss")
         );
       } else {
         this.dataSection(this.getDataList, {}, (data) => {
@@ -272,7 +272,7 @@ export default {
             this.tHeader,
             this.filterVal,
             data,
-            "办理事项评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
+            "一号一评记录报表" + this.$moment().format("YYYYMMDDHHmmss")
           );
         });
       }

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowLeft.vue

@@ -253,7 +253,7 @@ export default {
           this.tHeader,
           this.filterVal,
           data,
-          "办理事项评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
+          "一号一评记录报表" + this.$moment().format("YYYYMMDDHHmmss")
         );
       } else {
         this.dataSection(this.getDataList, {}, (data) => {
@@ -272,7 +272,7 @@ export default {
             this.tHeader,
             this.filterVal,
             data,
-            "办理事项评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
+            "一号一评记录报表" + this.$moment().format("YYYYMMDDHHmmss")
           );
         });
       }