合并冲突

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

@@ -270,7 +270,9 @@
             <div slot="description">
               <a-row :gutter="[0, 8]">
                 <a-col :span="12">
-                  <span>办理窗口：</span>{{ detailsInfo.window_name +detailsInfo.window_fromnum }}
+                  <span>办理窗口：</span>{{ detailsInfo.window_name }}-{{
+                    detailsInfo.window_fromnum
+                  }}
                 </a-col>
                 <a-col :span="12">
                   <span>开始办理时间：</span>{{ detailsInfo.calltime }}
@@ -517,4 +519,4 @@ export default {
     color: #656565;
   }
 }
-</style>
+</style>
\ No newline at end of file

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

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