feat:添加微官网注册报表

portal-manager-ui/admin/src/api/dataAdmin.js

@@ -129,3 +129,11 @@ export function getStorageList(params) {
 export function getOtherList(params) {
   return http.post(`${BASEURL}/pickup/reportform/otherlist`, params);
 }
+
+/**
+ *  微官网注册报表
+ */
+// 获取报表数据
+export function getRigusersList(params) {
+  return http.get(`${BASEURL}/admin/reportforms/rigusers`, params);
+}

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

@@ -409,9 +409,10 @@ export default {
         5: "好差评",
         6: "一体化评价",
       };
+      let data = [];
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
         // 深度克隆避免影响页面表格展示
-        let data = this.$_.cloneDeep(this.tableSelectedRows);
+        data = this.$_.cloneDeep(this.tableSelectedRows);
         data.forEach((item) => {
           Object.keys(obj).forEach((keys) => {
             if (item.pjxt == keys) {
@@ -419,14 +420,8 @@ export default {
             }
           });
         });
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          data,
-          "办事部门评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       } else {
-        let data = this.$_.cloneDeep(
+        data = this.$_.cloneDeep(
           await this.togetevalist({
             page: 1,
             size: -1,
@@ -440,13 +435,13 @@ export default {
             }
           });
         }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "办事部门评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
     // 删除

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

@@ -412,9 +412,10 @@ export default {
         5: "好差评",
         6: "一体化评价",
       };
+      let data = [];
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
         // 深度克隆避免影响页面表格展示
-        let data = this.$_.cloneDeep(this.tableSelectedRows);
+        data = this.$_.cloneDeep(this.tableSelectedRows);
         data.forEach((item) => {
           Object.keys(obj).forEach((keys) => {
             if (item.pjxt == keys) {
@@ -422,14 +423,8 @@ export default {
             }
           });
         });
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          data,
-          "办理事项评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       } else {
-        let data = this.$_.cloneDeep(
+        data = this.$_.cloneDeep(
           await this.togetevalist({
             page: 1,
             size: -1,
@@ -443,13 +438,13 @@ export default {
             }
           });
         }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "办理事项评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
     // 删除

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

@@ -415,9 +415,10 @@ export default {
         5: "好差评",
         6: "一体化评价",
       };
+      let data = [];
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
         // 深度克隆避免影响页面表格展示
-        let data = this.$_.cloneDeep(this.tableSelectedRows);
+        data = this.$_.cloneDeep(this.tableSelectedRows);
         data.forEach((item) => {
           Object.keys(obj).forEach((keys) => {
             if (item.pjxt == keys) {
@@ -425,14 +426,8 @@ export default {
             }
           });
         });
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          data,
-          "窗口服务评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       } else {
-        let data = this.$_.cloneDeep(
+        data = this.$_.cloneDeep(
           await this.togetevalist({
             page: 1,
             size: -1,
@@ -446,13 +441,13 @@ export default {
             }
           });
         }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "窗口服务评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
     // 删除

portal-manager-ui/admin/src/views/dataAdmin/components/fillRecordReport/fillForm.vue

@@ -301,9 +301,10 @@ export default {
         1: "本地打印",
         2: "在线提交",
       };
+      let data = [];
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
         // 深度克隆避免影响页面表格展示
-        let data = this.$_.cloneDeep(this.tableSelectedRows);
+        data = this.$_.cloneDeep(this.tableSelectedRows);
         data.forEach((item) => {
           Object.keys(obj).forEach((keys) => {
             if (item.type == keys) {
@@ -311,14 +312,8 @@ export default {
             }
           });
         });
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          data,
-          "填单记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       } else {
-        let data = this.$_.cloneDeep(
+        data = this.$_.cloneDeep(
           await this.togetPrintList({ page: 1, size: -1 })
         );
         if (!data.length) return;
@@ -329,13 +324,13 @@ export default {
             }
           });
         }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "填单记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
   },

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

@@ -332,9 +332,10 @@ export default {
     // 导出
     async handleExportTable() {
       this.btnLoading = true;
+      let data = [];
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
         // 深度克隆避免影响页面表格展示
-        let data = this.$_.cloneDeep(this.tableSelectedRows);
+        data = this.$_.cloneDeep(this.tableSelectedRows);
         for (let item of data) {
           Object.keys(this.statusItem).forEach((key) => {
             if (item.status == key) {
@@ -342,14 +343,8 @@ export default {
             }
           });
         }
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          data,
-          "预约记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       } else {
-        let data = this.$_.cloneDeep(
+        data = this.$_.cloneDeep(
           await this.getOrderList({ page: 1, size: -1 })
         );
         if (!data.length) return;
@@ -360,13 +355,13 @@ export default {
             }
           });
         }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "预约记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
   },

portal-manager-ui/admin/src/views/dataAdmin/components/microOfficialWebsite/components/FormDetails.vue

 <template>
   <div>
-        <a-drawer title="用户详情" placement="right" :closable="false" :visible="visible" closable @close="onClose"
-            width="600">
+    <a-drawer
+      title="用户详情"
+      :visible="visible"
+      width="600"
+      @close="Visible = false"
+    >
       <div class="drawerMain">
         <div class="drawerMain-top">
           <a-avatar :size="64" icon="user" />
           <div class="drawer-user">
-                        <span>NICKNAME</span>
+            <span>{{ userInfo.nickname || "--" }}</span>
             <span class="userTips">实名认证</span>
-                        <div class="userInfo">
-                            男，四川，成都
-                        </div>
+            <div class="userInfo">{{ userInfo.idcard_Sex }}，四川，成都</div>
           </div>
           <div class="someUserInfo">
             <div class="infoBox">
               <span class="infoTitle">openid：</span>
-                            <span class="infoContent">OPENID</span>
+              <span class="infoContent">{{ userInfo.openid }}</span>
             </div>
             <div class="infoBox">
               <span class="infoTitle">授权时间：</span>
-                            <span class="infoContent">2022-11-07 16:00:00</span>
+              <span class="infoContent">{{ userInfo.create_time }}</span>
             </div>
             <div class="infoBox">
               <span class="infoTitle">最近访问时间：</span>
-                            <span class="infoContent">2022-11-07 16:00:00</span>
+              <span class="infoContent">{{ userInfo.last_time || "--" }}</span>
             </div>
           </div>
           <a-divider />
@@ -34,25 +36,27 @@
             </div>
             <div class="infoBox">
               <span class="infoTitle">姓名：</span>
-                            <span class="infoContent">刘德华</span>
+              <span class="infoContent">{{ userInfo.idcard_Name }}</span>
             </div>
             <div class="infoBox">
               <span class="infoTitle">身份证号：</span>
-                            <span class="infoContent">513821199303021234</span>
+              <span class="infoContent">{{ userInfo.idcard_IDCardNo }}</span>
             </div>
             <div class="infoBox">
               <span class="infoTitle imgBox">身份证人像面：</span>
               <span class="infoContent">
-                                <img src="@/assets/images/logo.png" alt="">
+                <img v-if="userInfo.z_img" :src="userInfo.z_img" />
+                <span v-else>--</span>
               </span>
             </div>
             <div class="infoBox">
               <span class="infoTitle imgBox">身份证国徽面：</span>
               <span class="infoContent">
-                                <img src="@/assets/images/logo.png" alt="">
+                <img v-if="userInfo.b_img" :src="userInfo.z_img" />
+                <span v-else>--</span>
               </span>
             </div>
-                        <div class="infoBox">
+            <!-- <div class="infoBox">
               <span class="infoTitle">人脸认证：</span>
               <span class="infoContent">
                 <span class="state">已通过</span>
@@ -61,14 +65,16 @@
             <div class="infoBox">
               <span class="infoTitle">认证时间：</span>
               <span class="infoContent">513821199303021234</span>
-                        </div>
+            </div> -->
           </div>
           <a-divider />
-                    <div class="someUserInfo">
+          <!-- <div class="someUserInfo">
             <b>区块链信息</b>
             <div class="infoBox">
               <span class="infoTitle">哈希值：</span>
-                            <span class="infoContent">nd68as4d654q5w4d21ccx1cv5adsdaawqewd1c1c1zsda1s1gd2sa2</span>
+              <span class="infoContent"
+                >nd68as4d654q5w4d21ccx1cv5adsdaawqewd1c1c1zsda1s1gd2sa2</span
+              >
             </div>
             <div class="infoBox">
               <span class="infoTitle">区块高度：</span>
@@ -78,7 +84,7 @@
               <span class="infoTitle">创建时间：</span>
               <span class="infoContent">2022-11-07 16:00:00</span>
             </div>
-                    </div>
+          </div> -->
         </div>
       </div>
     </a-drawer>
@@ -87,16 +93,33 @@
 
 <script>
 export default {
-    name:"FormDetails",
-    props:{
-        visible:Boolean
+  name: "FormDetails",
+  props: {
+    visible: {
+      type: Boolean,
+      required: true,
+      default: false,
     },
-    methods:{
-        onClose(){
-            this.$emit('onClose')
-        }
-    }
-}
+    userInfo: {
+      type: Object,
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  computed: {
+    Visible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:visible", val);
+      },
+    },
+  },
+  methods: {},
+};
 </script>
 
 <style lang="less" scoped>
@@ -115,8 +138,8 @@ export default {
       position: absolute;
       top: -2px;
       display: inline-block;
-            color: #1A7AF8;
-            border: 1px solid #1A7AF8;
+      color: #1a7af8;
+      border: 1px solid #1a7af8;
       font-size: 12px;
       border-radius: 4px;
       padding: 3px 6px;
@@ -153,9 +176,9 @@ export default {
       .state {
         display: inline-block;
         padding: 0 6px;
-                border: 1px solid #40A850;
+        border: 1px solid #40a850;
         border-radius: 4px;
-                color: #40A850;
+        color: #40a850;
       }
 
       .imgBox {
@@ -167,7 +190,6 @@ export default {
         width: auto;
       }
     }
-
   }
 }
 </style>
\ No newline at end of file

portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/depositRecord.vue

@@ -272,9 +272,10 @@ export default {
         1: "未取件",
         2: "已取件",
       };
+      let data = [];
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
         // 深度克隆避免影响页面表格展示
-        let data = this.$_.cloneDeep(this.tableSelectedRows);
+        data = this.$_.cloneDeep(this.tableSelectedRows);
         for (let item of data) {
           Object.keys(obj).forEach((key) => {
             if (item.status == key) {
@@ -282,14 +283,8 @@ export default {
             }
           });
         }
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          data,
-          "存件记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       } else {
-        let data = this.$_.cloneDeep(
+        data = this.$_.cloneDeep(
           await this.getStorageList({ page: 1, size: -1 })
         );
         if (!data.length) return;
@@ -300,13 +295,13 @@ export default {
             }
           });
         }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "存件记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
   },

portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/otherRecord.vue

@@ -262,9 +262,10 @@ export default {
         2: "管理员",
         3: "邮递员",
       };
+      let data = [];
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
         // 深度克隆避免影响页面表格展示
-        let data = this.$_.cloneDeep(this.tableSelectedRows);
+        data = this.$_.cloneDeep(this.tableSelectedRows);
         for (let item of data) {
           Object.keys(obj).forEach((key) => {
             if (item.userType == key) {
@@ -277,14 +278,8 @@ export default {
             }
           });
         }
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          data,
-          "其他操作记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       } else {
-        let data = this.$_.cloneDeep(
+        data = this.$_.cloneDeep(
           await this.getOtherList({ page: 1, size: -1 })
         );
         if (!data.length) return;
@@ -300,13 +295,13 @@ export default {
             }
           });
         }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "其他操作记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
     // 过滤操作类型

portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/pickUpRecord.vue

@@ -201,7 +201,7 @@ export default {
       let res = await getSitePickupDevice();
       this.devList = res.data;
     },
-    // 获取取号记录报表
+    // 获取记录报表
     async getPickupList(search = {}) {
       let res = await getPickupList({
         page: this.current,
@@ -262,17 +262,17 @@ export default {
           return this.tableSelectedKeys.some((val) => v.id == val);
         });
     },
-
     // 导出
     async handleExportTable() {
       this.btnLoading = true;
+      let data = [];
       let obj = {
         1: "取件码取件",
         2: "身份证取件",
       };
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
         // 深度克隆避免影响页面表格展示
-        let data = this.$_.cloneDeep(this.tableSelectedRows);
+        data = this.$_.cloneDeep(this.tableSelectedRows);
         for (let item of data) {
           Object.keys(obj).forEach((key) => {
             if (item.type == key) {
@@ -280,14 +280,8 @@ export default {
             }
           });
         }
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          data,
-          "取件记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       } else {
-        let data = this.$_.cloneDeep(
+        data = this.$_.cloneDeep(
           await this.getPickupList({ page: 1, size: -1 })
         );
         if (!data.length) return;
@@ -298,13 +292,13 @@ export default {
             }
           });
         }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "取件记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
   },

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/callRecord.vue

@@ -457,9 +457,10 @@ export default {
         1: "办理中",
         4: "办理完成",
       };
+      let data = [];
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
         // 深度克隆避免影响页面表格展示
-        let data = this.$_.cloneDeep(this.tableSelectedRows);
+        data = this.$_.cloneDeep(this.tableSelectedRows);
         data.forEach((item) => {
           Object.keys(obj).forEach((keys) => {
             if (item.style == keys) {
@@ -467,14 +468,8 @@ export default {
             }
           });
         });
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          data,
-          "呼叫记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       } else {
-        let data = this.$_.cloneDeep(
+        data = this.$_.cloneDeep(
           await this.getCallQueListArr({
             page: 1,
             size: -1,
@@ -488,13 +483,13 @@ export default {
             }
           });
         }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "呼叫记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
   },

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue

@@ -451,9 +451,10 @@ export default {
         1: "办理中",
         4: "办理完成",
       };
+      let data = [];
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
         // 深度克隆避免影响页面表格展示
-        let data = this.$_.cloneDeep(this.tableSelectedRows);
+        data = this.$_.cloneDeep(this.tableSelectedRows);
         data.forEach((item) => {
           Object.keys(obj).forEach((keys) => {
             if (item.style == keys) {
@@ -461,14 +462,8 @@ export default {
             }
           });
         });
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          data,
-          "排队记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       } else {
-        let data = this.$_.cloneDeep(
+        data = this.$_.cloneDeep(
           await this.getQueueDataArr({ page: 1, size: -1 })
         );
         if (!data.length) return;
@@ -479,13 +474,13 @@ export default {
             }
           });
         }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "排队记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
   },

portal-manager-ui/admin/src/views/dataAdmin/components/sampleRecordReport/sampleForm.vue

@@ -245,15 +245,14 @@ export default {
     // 导出
     async handleExportTable() {
       this.btnLoading = true;
+      let data = [];
       if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          this.tableSelectedRows,
-          "样表记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
+        // 深度克隆避免影响页面表格展示
+        data = this.$_.cloneDeep(this.tableSelectedRows);
       } else {
-        let data = await this.getBillList({ page: 1, size: -1 });
+        data = this.$_.cloneDeep(
+          await this.togetBillList({ page: 1, size: -1 })
+        );
         if (!data.length) return;
         // for (let item of data) {
         //   Object.keys(obj).forEach((key) => {
@@ -262,13 +261,13 @@ export default {
         //     }
         //   });
         // }
+      }
       export2Excel(
         this.tHeader,
         this.filterVal,
         data,
         "样表记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
       this.btnLoading = false;
     },
   },