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/components/HandlingDetails.vue

 <template>
   <div>
-    <a-drawer
-      :title="title"
-      placement="right"
-      width="700px"
-      :visible="Visible"
-      @close="onClose"
-    >
+    <a-drawer :title="title" placement="right" width="700px" :visible="Visible" @close="onClose">
       <!-- 评价  -->
       <div v-if="type == 1">
         <a-steps direction="vertical" :current="1">
@@ -15,94 +9,63 @@
             <div slot="description" class="transact-step">
               <a-row :gutter="[0, 10]">
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">评价人：</span
-                    >{{
+                  <span><span class="lable">评价人：</span>{{
                     detailsInfo.idcard_Name ? detailsInfo.idcard_Name : "--"
-                    }}</span
-                  >
+                  }}</span>
                 </a-col>
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">手机号:</span
-                    >{{ detailsInfo.phone ? detailsInfo.phone : "--" }}</span
-                  >
+                  <span><span class="lable">手机号:</span>{{ detailsInfo.phone ? detailsInfo.phone : "--" }}</span>
                 </a-col>
               </a-row>
               <a-row :gutter="[0, 10]">
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">身份证号：</span
-                    >{{
+                  <span><span class="lable">身份证号：</span>{{
                     detailsInfo.idcard_IDCardNo
                       ? detailsInfo.idcard_IDCardNo
                       : "--"
-                    }}</span
-                  >
+                  }}</span>
                 </a-col>
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">窗口编号：</span
-                    >{{
+                  <span><span class="lable">窗口编号：</span>{{
                     detailsInfo.window_fronum
                       ? detailsInfo.window_fronum
                       : "--"
-                    }}</span
-                  >
+                  }}</span>
                 </a-col>
               </a-row>
               <a-row :gutter="[0, 10]">
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">评价选项：</span
-                    >{{
+                  <span><span class="lable">评价选项：</span>{{
                     detailsInfo.option_id ? detailsInfo.option_id : "--"
-                    }}</span
-                  >
+                  }}</span>
                 </a-col>
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">评价时间：</span
-                    >{{
+                  <span><span class="lable">评价时间：</span>{{
                     detailsInfo.create_time ? detailsInfo.create_time : "--"
-                    }}</span
-                  >
+                  }}</span>
                 </a-col>
               </a-row>
               <a-row :gutter="[0, 10]">
                 <a-col :span="24">
                   <span class="lable">评价指标：</span>
-                  <a-tag
-                    color="blue"
-                    class="mb-1"
-                    v-for="(item, index) in detailsInfo.content"
-                    :key="index"
-                  >
+                  <a-tag color="blue" class="mb-1" v-for="(item, index) in detailsInfo.content" :key="index">
                     {{ item }}
                   </a-tag>
                 </a-col>
               </a-row>
               <a-row :gutter="[0, 10]">
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">评价来源：</span
-                    >{{ detailsInfo.source ? detailsInfo.source : "--" }}</span
-                  >
+                  <span><span class="lable">评价来源：</span>{{ detailsInfo.source ? detailsInfo.source : "--" }}</span>
                 </a-col>
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">评价设备：</span
-                    >{{
+                  <span><span class="lable">评价设备：</span>{{
                     detailsInfo.devicenum ? detailsInfo.devicenum : "--"
-                    }}</span
-                  >
+                  }}</span>
                 </a-col>
               </a-row>
               <a-row :gutter="[0, 10]">
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">评价状态：</span
-                    >{{
+                  <span><span class="lable">评价状态：</span>{{
                     !detailsInfo.evaluatestatus
                       ? "--"
                       : detailsInfo.evaluatestatus == 1
@@ -116,28 +79,17 @@
                               : detailsInfo.evaluatestatus == 5
                                 ? "用户评价超时"
                                 : "收到图片等待签名"
-                    }}</span
-                  >
+                  }}</span>
                 </a-col>
                 <a-col :span="12">
                   <span>
                     <span class="lable">评价人照片：</span>
-                    <a-avatar
-                      v-if="!detailsInfo.picture"
-                      shape="square"
-                      :size="40"
-                      icon="user"
-                    />
-                    <img
-                      v-else
-                      :src="baseurl + '/' + detailsInfo.picture"
-                      @click="
+                    <a-avatar v-if="!detailsInfo.picture" shape="square" :size="40" icon="user" />
+                    <img v-else :src="baseurl + '/' + detailsInfo.picture" @click="
                       $viewerApi({
                         images: [baseurl + '/' + detailsInfo.picture],
                       })
-                      "
-                      class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]"
-                    />
+                      " class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]" />
                   </span>
                 </a-col>
               </a-row>
@@ -152,16 +104,11 @@
           <div class="elapsed-time">
             <p class="elapsed-time-title">
               <span>总耗时：</span>
-              <span
-                >{{ detailsInfo.alltime ? detailsInfo.alltime : "--" }}
+              <span>{{ detailsInfo.alltime ? detailsInfo.alltime : "--" }}
                 <span v-if="detailsInfo.alltime">
-                  <a-icon
-                    v-if="
+                  <a-icon v-if="
                     compareTime(detailsInfo.alltime, detailsInfo.p_alltime)
-                    "
-                    type="arrow-up"
-                    style="color: #ff4d4f"
-                  />
+                  " type="arrow-up" style="color: #ff4d4f" />
                   <a-icon v-else type="arrow-down" style="color: #1bbc9b" />
                 </span>
               </span>
@@ -180,13 +127,9 @@
                 detailsInfo.waittime ? detailsInfo.waittime : "--"
               }}</span>
               <span v-if="detailsInfo.waittime">
-                <a-icon
-                  v-if="
+                <a-icon v-if="
                   compareTime(detailsInfo.waittime, detailsInfo.p_waittime)
-                  "
-                  type="arrow-up"
-                  style="color: #ff4d4f"
-                />
+                " type="arrow-up" style="color: #ff4d4f" />
                 <a-icon v-else type="arrow-down" style="color: #1bbc9b" />
               </span>
             </p>
@@ -202,11 +145,8 @@
               <span>办理时间：</span>
               <span>{{ detailsInfo.bltime ? detailsInfo.bltime : "--" }}</span>
               <span v-if="detailsInfo.bltime">
-                <a-icon
-                  v-if="compareTime(detailsInfo.bltime, detailsInfo.p_bltime)"
-                  type="arrow-up"
-                  style="color: #ff4d4f"
-                />
+                <a-icon v-if="compareTime(detailsInfo.bltime, detailsInfo.p_bltime)" type="arrow-up"
+                  style="color: #ff4d4f" />
                 <a-icon v-else type="arrow-down" style="color: #1bbc9b" />
               </span>
             </p>
@@ -233,12 +173,10 @@
               </a-row>
               <a-row :gutter="[0, 8]">
                 <a-col :span="12">
-                  <span>排队编号：</span
-                  >{{ detailsInfo.flownum ? detailsInfo.flownum : "--" }}
+                  <span>排队编号：</span>{{ detailsInfo.flownum ? detailsInfo.flownum : "--" }}
                 </a-col>
                 <a-col :span="12">
-                  <span>取号方式：</span
-                  >{{ detailsInfo.wy_signin === 0 ? "现场取号" : "线上取号" }}
+                  <span>取号方式：</span>{{ detailsInfo.wy_signin === 0 ? "现场取号" : "线上取号" }}
                 </a-col>
               </a-row>
               <a-row :gutter="[0, 8]">
@@ -262,15 +200,12 @@
               </div>
             </div>
           </a-step>
-          <a-step
-            title="办理中"
-            v-if="detailsInfo.style === 1 || detailsInfo.style === 4"
-          >
+          <a-step title="办理中" v-if="detailsInfo.style === 1 || detailsInfo.style === 4">
             <a-icon type="environment" slot="icon" />
             <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 }}
@@ -302,44 +237,30 @@
               </a-row>
               <a-row :gutter="[0, 8]">
                 <a-col :span="12">
-                  <span>评价时间：</span
-                  >{{ detailsInfo.pj_time ? detailsInfo.pj_time : "--" }}
+                  <span>评价时间：</span>{{ detailsInfo.pj_time ? detailsInfo.pj_time : "--" }}
                 </a-col>
               </a-row>
               <a-row :gutter="[0, 8]">
                 <a-col :span="24">
                   <span>评价指标：</span>
-                  <a-tag
-                    color="blue"
-                    class="mb-1"
-                    v-for="(item, index) in detailsInfo.content"
-                    :key="index"
-                  >
+                  <a-tag color="blue" class="mb-1" v-for="(item, index) in detailsInfo.content" :key="index">
                     {{ item }}
                   </a-tag>
                 </a-col>
               </a-row>
               <a-row :gutter="[0, 10]">
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">评价来源：</span
-                    >{{ detailsInfo.source ? detailsInfo.source : "--" }}</span
-                  >
+                  <span><span class="lable">评价来源：</span>{{ detailsInfo.source ? detailsInfo.source : "--" }}</span>
                 </a-col>
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">评价设备：</span
-                    >{{
+                  <span><span class="lable">评价设备：</span>{{
                     detailsInfo.devicenum ? detailsInfo.devicenum : "--"
-                    }}</span
-                  >
+                  }}</span>
                 </a-col>
               </a-row>
               <a-row :gutter="[0, 10]">
                 <a-col :span="12">
-                  <span
-                    ><span class="lable">评价状态：</span
-                    >{{
+                  <span><span class="lable">评价状态：</span>{{
                     !detailsInfo.evaluatestatus
                       ? "--"
                       : detailsInfo.evaluatestatus == 1
@@ -353,28 +274,17 @@
                               : detailsInfo.evaluatestatus == 5
                                 ? "用户评价超时"
                                 : "收到图片等待签名"
-                    }}</span
-                  >
+                  }}</span>
                 </a-col>
                 <a-col :span="12">
                   <span>
                     <span class="lable">评价人照片：</span>
-                    <a-avatar
-                      v-if="!detailsInfo.picture"
-                      shape="square"
-                      :size="40"
-                      icon="user"
-                    />
-                    <img
-                      v-else
-                      :src="baseurl + '/' + detailsInfo.picture"
-                      @click="
+                    <a-avatar v-if="!detailsInfo.picture" shape="square" :size="40" icon="user" />
+                    <img v-else :src="baseurl + '/' + detailsInfo.picture" @click="
                       $viewerApi({
                         images: [baseurl + '/' + detailsInfo.picture],
                       })
-                      "
-                      class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]"
-                    />
+                      " class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]" />
                   </span>
                 </a-col>
               </a-row>
@@ -437,7 +347,7 @@ export default {
       return 1;
     },
   },
-  created() {},
+  created() { },
   methods: {
     onClose() {
       this.Visible = false;
@@ -470,6 +380,7 @@ export default {
 :deep(.ant-steps-item-title) {
   color: #1890ff !important;
 }
+
 .header {
   height: 90px;
   margin-bottom: 20px;
@@ -479,15 +390,19 @@ export default {
   display: flex;
   justify-content: space-around;
   align-items: center;
+
   .elapsed-time-title {
     font-size: 16px;
   }
+
   .time {
     color: #1890ff;
   }
 }
+
 .transact-step {
   position: relative;
+
   .transact-tips1,
   .transact-tips2,
   .transact-tips3 {
@@ -504,14 +419,17 @@ export default {
     right: 0px;
     transform: rotate(45deg);
   }
+
   .transact-tips1 {
     border: 8px solid rgba(0, 168, 112, 0.1);
     color: #00a870;
   }
+
   .transact-tips2 {
     border: 8px solid rgba(8, 87, 232, 0.1);
     color: #0857e8;
   }
+
   .transact-tips3 {
     border: 8px solid rgba(101, 101, 101, 0.1);
     color: #656565;

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")
           );
         });
       }