perf: 优化办事指南数据管理

base-manager-ui/admin/src/components/YTable.vue

@@ -54,7 +54,7 @@ export default {
       type: Number,
       default: 10,
     },
-    current: {
+    page: {
       required: true,
       type: Number,
       default: 1,
@@ -119,10 +119,10 @@ export default {
     },
     Current: {
       get() {
-        return this.current;
+        return this.page;
       },
       set(value) {
-        this.$emit("update:current", value);
+        this.$emit("update:page", value);
       },
     },
     Pagination() {

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue

@@ -30,7 +30,7 @@
           :expandIconColumnIndex="2"
           :data="siteBusinessTable.data"
           :pageSize.sync="siteBusinessTable.size"
-          :current.sync="siteBusinessTable.current"
+          :page.sync="siteBusinessTable.page"
           :total="siteBusinessTable.total"
           :loading="siteBusinessTable.loading"
           size="middle"
@@ -87,7 +87,7 @@
           :expandIconColumnIndex="2"
           :data="businessTable.data"
           :pageSize.sync="businessTable.size"
-          :current.sync="businessTable.current"
+          :page.sync="businessTable.page"
           :total="businessTable.total"
           :loading="businessTable.loading"
           size="middle"
@@ -156,7 +156,7 @@ export default {
             customRender: (text, record, index) => {
               if (record.parentId === 0) {
                 return (
-                  (this.siteBusinessTable.current - 1) *
+                  (this.siteBusinessTable.page - 1) *
                     this.siteBusinessTable.size +
                   index +
                   1
@@ -178,7 +178,7 @@ export default {
           },
         ],
         total: 0,
-        current: 1,
+        page: 1,
         size: 10,
         data: [],
       },
@@ -192,7 +192,7 @@ export default {
             customRender: (text, record, index) => {
               if (record.parentId === 0) {
                 return (
-                  (this.businessTable.current - 1) * this.businessTable.size +
+                  (this.businessTable.page - 1) * this.businessTable.size +
                   index +
                   1
                 );
@@ -213,7 +213,7 @@ export default {
           },
         ],
         total: 0,
-        current: 1,
+        page: 1,
         size: 10,
         data: [],
       },
@@ -255,15 +255,15 @@ export default {
     async getSiteBusinessData() {
       this.siteBusinessTable.loading = true;
       let res = await siteBusinessList({
-        page: this.siteBusinessTable.current,
+        page: this.siteBusinessTable.page,
         size: this.siteBusinessTable.size,
         siteId: this.siteId,
         businessName: `%${this.serchSiteBusiness}%`,
       });
       let { code, data } = res.data;
       if (code === 1) {
-        if (!data.data.length && this.siteBusinessTable.current > 1) {
-          this.siteBusinessTable.current -= 1;
+        if (!data.data.length && this.siteBusinessTable.page > 1) {
+          this.siteBusinessTable.page -= 1;
           this.getSiteBusinessData();
         }
         this.siteBusinessTable.total = data.pageInfo.totalResult;
@@ -275,15 +275,15 @@ export default {
     async getBusinessListData() {
       this.businessTable.loading = true;
       let res = await businessList({
-        page: this.businessTable.current,
+        page: this.businessTable.page,
         size: this.businessTable.size,
         name: `%${this.serchData}%`,
         businessType: 0, //一体化业务
       });
       let { code, data } = res.data;
       if (code === 1) {
-        if (!data.data.length && this.businessTable.current > 1) {
-          this.businessTable.current -= 1;
+        if (!data.data.length && this.businessTable.page > 1) {
+          this.businessTable.page -= 1;
           this.getBusinessListData();
         }
         this.businessTable.total = data.pageInfo.totalResult;
@@ -294,7 +294,7 @@ export default {
 
     // 站点业务搜索
     onSiteBusinessSearch() {
-      this.siteBusinessTable.current = 1;
+      this.siteBusinessTable.page = 1;
       this.getSiteBusinessData();
     },
     // 删除站点业务
@@ -401,7 +401,7 @@ export default {
     },
     // 搜索一体化业务
     async onSearch() {
-      this.businessTable.current = 1;
+      this.businessTable.page = 1;
       this.getBusinessListData();
     },
     // 一体化业务加入站点

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue

@@ -61,7 +61,7 @@
           :columns="siteMatterTable.columns"
           :data="siteMatterTable.data"
           :pageSize.sync="siteMatterTable.size"
-          :current.sync="siteMatterTable.current"
+          :page.sync="siteMatterTable.page"
           :total="siteMatterTable.total"
           :loading="siteMatterTable.loading"
           size="middle"
@@ -177,7 +177,7 @@
           :columns="baseMatterTable.columns"
           :data="baseMatterTable.data"
           :pageSize.sync="baseMatterTable.size"
-          :current.sync="baseMatterTable.current"
+          :page.sync="baseMatterTable.page"
           :total="baseMatterTable.total"
           :loading="baseMatterTable.loading"
           size="middle"
@@ -270,7 +270,7 @@ export default {
         data: [],
         total: 0,
         size: 10,
-        current: 1,
+        page: 1,
         search: {
           source: undefined, // 事项来源
           matterName: "", // 事项名称
@@ -282,7 +282,7 @@ export default {
             width: "50px",
             customRender: (text, record, index) => {
               return (
-                (this.siteMatterTable.current - 1) * this.siteMatterTable.size +
+                (this.siteMatterTable.page - 1) * this.siteMatterTable.size +
                 index +
                 1
               );
@@ -322,7 +322,7 @@ export default {
         data: [],
         total: 0,
         size: 10,
-        current: 1,
+        page: 1,
         search: {
           source: undefined, // 事项来源
           matterName: "", // 事项名称
@@ -334,7 +334,7 @@ export default {
             width: "50px",
             customRender: (text, record, index) => {
               return (
-                (this.baseMatterTable.current - 1) * this.baseMatterTable.size +
+                (this.baseMatterTable.page - 1) * this.baseMatterTable.size +
                 index +
                 1
               );
@@ -397,7 +397,7 @@ export default {
     async getMatterSiteData() {
       this.siteMatterTable.loading = true;
       let res = await getSiteMatterList({
-        page: this.siteMatterTable.current,
+        page: this.siteMatterTable.page,
         size: this.siteMatterTable.size,
         siteId: this.siteId,
         source: this.siteMatterTable.search.source,
@@ -406,8 +406,8 @@ export default {
       });
       if (res.data.code == 1) {
         let { pageInfo, data } = res.data.data;
-        if (!data.length && this.siteMatterTable.current > 1) {
-          this.siteMatterTable.current -= 1;
+        if (!data.length && this.siteMatterTable.page > 1) {
+          this.siteMatterTable.page -= 1;
           this.getMatterSiteData();
         }
         this.siteMatterTable.total = pageInfo.totalResult;
@@ -420,7 +420,7 @@ export default {
       this.baseMatterTable.loading = true;
       let res = await getMatterListSubList({
         siteId: this.siteId,
-        page: this.baseMatterTable.current,
+        page: this.baseMatterTable.page,
         size: this.baseMatterTable.size,
         matterName: `%${this.baseMatterTable.search.matterName}%`,
         source: this.baseMatterTable.search.source,
@@ -428,8 +428,8 @@ export default {
       });
       if (res.data.code === 1) {
         let { pageInfo, data, dict } = res.data.data;
-        if (!data.length && this.baseMatterTable.current > 1) {
-          this.baseMatterTable.current -= 1;
+        if (!data.length && this.baseMatterTable.page > 1) {
+          this.baseMatterTable.page -= 1;
           this.getMatterListData();
         }
         this.baseMatterTable.data = data;
@@ -440,7 +440,7 @@ export default {
     },
     // 站点事项搜索
     onSearchSiteMatter() {
-      this.siteMatterTable.current = 1;
+      this.siteMatterTable.page = 1;
       this.getMatterSiteData();
     },
     // 左边移除站点事项
@@ -508,7 +508,7 @@ export default {
     },
     // 基础事项搜索
     onSearchBaseMatter() {
-      this.baseMatterTable.current = 1;
+      this.baseMatterTable.page = 1;
       this.getMatterListData();
     },
     // 加入

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue

@@ -26,7 +26,7 @@
           :columns="siteBusinessTable.columns"
           :data="siteBusinessTable.data"
           :pageSize.sync="siteBusinessTable.size"
-          :current.sync="siteBusinessTable.current"
+          :page.sync="siteBusinessTable.page"
           :total="siteBusinessTable.total"
           :loading="siteBusinessTable.loading"
           size="middle"
@@ -98,7 +98,7 @@
           :columns="siteMatterTable.columns"
           :data="siteMatterTable.data"
           :pageSize.sync="siteMatterTable.size"
-          :current.sync="siteMatterTable.current"
+          :page.sync="siteMatterTable.page"
           :total="siteMatterTable.total"
           :loading="siteMatterTable.loading"
           size="middle"
@@ -274,7 +274,7 @@ export default {
         data: [],
         total: 0,
         size: 10,
-        current: 1,
+        page: 1,
         search: {
           siteBusinessName: "", // 站点业务名称
         },
@@ -284,7 +284,7 @@ export default {
             width: "50px",
             customRender: (text, record, index) => {
               return (
-                (this.siteBusinessTable.current - 1) *
+                (this.siteBusinessTable.page - 1) *
                   this.siteBusinessTable.size +
                 index +
                 1
@@ -312,7 +312,7 @@ export default {
         data: [],
         total: 0,
         size: 10,
-        current: 1,
+        page: 1,
         search: {
           deptCode: undefined, // 部门编码
           matterName: "", // 事项名称
@@ -323,7 +323,7 @@ export default {
             width: "50px",
             customRender: (text, record, index) => {
               return (
-                (this.siteMatterTable.current - 1) * this.siteMatterTable.size +
+                (this.siteMatterTable.page - 1) * this.siteMatterTable.size +
                 index +
                 1
               );
@@ -403,15 +403,15 @@ export default {
     async getBusinessMatterData() {
       this.siteBusinessTable.loading = true;
       let res = await getBusinesslistData({
-        page: this.siteBusinessTable.current,
+        page: this.siteBusinessTable.page,
         size: this.siteBusinessTable.size,
         siteId: Number(this.siteId),
         siteBusinessName: `%${this.siteBusinessTable.search.siteBusinessName}%`,
       });
       if (res.data.code == 1) {
         let { total, data } = res.data.data;
-        if (!data.length && this.siteBusinessTable.current > 1) {
-          this.siteBusinessTable.current -= 1;
+        if (!data.length && this.siteBusinessTable.page > 1) {
+          this.siteBusinessTable.page -= 1;
           this.getBusinessMatterData();
         }
         this.siteBusinessTable.total = total;
@@ -457,7 +457,7 @@ export default {
     async getMatterSiteData() {
       this.siteMatterTable.loading = true;
       let res = await getSiteMatterList({
-        page: this.siteMatterTable.current,
+        page: this.siteMatterTable.page,
         size: this.siteMatterTable.size,
         matterName: `%${this.siteMatterTable.search.matterName}%`,
         siteId: this.siteId,
@@ -465,8 +465,8 @@ export default {
       });
       if (res.data.code == 1) {
         let { pageInfo, data } = res.data.data;
-        if (!data.length && this.siteMatterTable.current > 1) {
-          this.siteMatterTable.current -= 1;
+        if (!data.length && this.siteMatterTable.page > 1) {
+          this.siteMatterTable.page -= 1;
           this.getMatterSiteData();
         }
         this.siteMatterTable.total = pageInfo.totalResult;
@@ -477,7 +477,7 @@ export default {
 
     // 站点关联业务列表搜索
     async onSiteBusinessSearch() {
-      this.siteBusinessTable.current = 1;
+      this.siteBusinessTable.page = 1;
       this.getBusinessMatterData();
     },
 
@@ -617,7 +617,7 @@ export default {
     },
     // 站点事项搜索
     onSearchSiteMatter() {
-      this.siteMatterTable.current = 1;
+      this.siteMatterTable.page = 1;
       this.getMatterSiteData();
     },
     // 关联

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs4.vue

@@ -20,7 +20,7 @@
                 showSearch
                 style="min-width: 120px"
                 allowClear
-                v-model="dept"
+                v-model="searchForm.deptCode"
                 class="select-department"
                 placeholder="全部部门"
                 optionFilterProp="label"
@@ -37,15 +37,20 @@
               <a-select
                 style="width: 120px"
                 allowClear
-                v-model="source"
+                v-model="searchForm.source"
                 class="select-department"
                 placeholder="全部来源"
               >
-                <a-select-option :value="0"> 一体化添加 </a-select-option>
-                <a-select-option :value="1"> 手动添加 </a-select-option>
+                <a-select-option
+                  v-for="(v, key) in sourceType"
+                  :key="key"
+                  :value="Number(key)"
+                >
+                  {{ v }}
+                </a-select-option>
               </a-select>
               <a-input-search
-                v-model="searchVal"
+                v-model="searchForm.matterName"
                 placeholder="请输入事项名称搜索"
                 enter-button="搜索"
                 @search="onSearch"
@@ -57,39 +62,23 @@
       </div>
       <div class="table-content">
         <!-- 表格 -->
-        <a-table
-          bordered
-          size="middle"
+        <y-table
+          :columns="columns"
+          :data="matterSiteData"
+          :pageSize.sync="searchForm.size"
+          :page.sync="searchForm.page"
+          :total="total"
           :loading="loading"
-          :pagination="{
-            showTotal: (total) => `共 ${total} 条`,
-            current: current,
-            total: total,
-            pageSize: size,
-            size: 'middle',
-            showSizeChanger: true,
-            showQuickJumper: true,
-            pageSizeOptions: pageSizeOptions,
-            onChange: changePage,
-            onShowSizeChange: showSizeChange,
-          }"
+          size="middle"
           :scroll="{ y: 550 }"
-          :columns="columns"
-          :data-source="matterSiteData"
-          :rowKey="(record) => record.id"
           :row-selection="{
             selectedRowKeys: selectedRowKeys,
             onChange: onSelectChange,
           }"
+          @changePagination="getMatterSiteData"
         >
-          <template slot="index" slot-scope="text, record, index">
-            <span>
-              {{ (current - 1) * size + index + 1 }}
-            </span>
-          </template>
-
           <!-- 事项名称 -->
-          <template slot="matterName" slot-scope="text">
+          <template slot="matterName" slot-scope="{ text }">
             <a-tooltip placement="topLeft">
               <template slot="title">
                 {{ text }}
@@ -98,46 +87,46 @@
             </a-tooltip>
           </template>
           <!-- 事项来源 -->
-          <template slot="source" slot-scope="text">
+          <template slot="source" slot-scope="{ text }">
             <a-tag v-if="text == 0" color="green"> 一体化添加 </a-tag>
             <a-tag v-else color="blue"> 手动添加 </a-tag>
           </template>
 
           <!-- 大厅入驻事项 -->
-          <template slot="hallCheckIn" slot-scope="text">
+          <template slot="hallCheckIn" slot-scope="{ record }">
             <y-switch
-              v-model="text.hallCheckIn"
-              @onChange="changeHallCheckIn(text)"
+              v-model="record.hallCheckIn"
+              @onChange="changeHallCheckIn(record)"
             ></y-switch>
           </template>
           <!-- 帮办代办 -->
-          <template slot="agent" slot-scope="text">
+          <template slot="agent" slot-scope="{ record }">
             <y-switch
-              v-model="text.agent"
-              @onChange="changeAgent($event, text)"
+              v-model="record.agent"
+              @onChange="changeAgent($event, record)"
             ></y-switch>
           </template>
 
           <!-- 操作 -->
-          <template slot="action" slot-scope="text">
+          <template slot="action" slot-scope="{ record }">
             <a-space size="middle">
               <div
                 class="workguide_btn"
-                :style="{ color: text.hot == 1 ? '#03d76f' : '#1890FF' }"
-                @click="handleSiteEdit(text, 'hot')"
+                :style="{ color: record.hot == 1 ? '#03d76f' : '#1890FF' }"
+                @click="handleSiteEdit(record, 'hot')"
               >
-                {{ text.hot == 1 ? "取消热门" : "设置热门" }}
+                {{ record.hot == 1 ? "取消热门" : "设置热门" }}
               </div>
               <div
                 class="workguide_btn"
                 style="width: 60px"
-                @click="handleSiteEdit(text, 'display')"
+                @click="handleSiteEdit(record, 'display')"
               >
-                {{ text.display == 1 ? "取消展示" : "展示" }}
+                {{ record.display == 1 ? "取消展示" : "展示" }}
               </div>
             </a-space>
           </template>
-        </a-table>
+        </y-table>
       </div>
     </div>
     <!-- 帮办代办人员信息 -->
@@ -155,82 +144,92 @@ import {
   addSitematter,
   batchSaveSitematter,
 } from "@/services/matter";
-import { pageSizeOptions } from "@/config/pageConfig.js";
 import { getDeptList } from "@/services/dept";
 import YSwitch from "@/components/yswitch/YSwitch.vue";
 import local from "@/utils/local";
 import SetAgent from "../group/SetAgent.vue";
-const columns = [
-  {
-    title: "序号",
-    width: "50px",
-    scopedSlots: { customRender: "index" },
-  },
-  {
-    title: "部门",
-    width: "20%",
-    dataIndex: "deptName",
-  },
-  {
-    title: "事项名称",
-    // ellipsis: true,
-    align: "left",
-    dataIndex: "matterName",
-    scopedSlots: {
-      customRender: "matterName",
-    },
-  },
-  {
-    title: "事项来源",
-    dataIndex: "source",
-    scopedSlots: {
-      customRender: "source",
-    },
-  },
-  {
-    title: "大厅入驻事项",
-    scopedSlots: {
-      customRender: "hallCheckIn",
-    },
-  },
-  {
-    title: "帮办代办",
-    scopedSlots: {
-      customRender: "agent",
-    },
-  },
-  {
-    title: "操作",
-    width: "200px",
-    scopedSlots: {
-      customRender: "action",
-    },
-  },
-];
+import YTable from "@/components/YTable.vue";
+const sourceType = {
+  0: "一体化添加",
+  1: "手动添加",
+};
 
 export default {
   components: {
     YSwitch,
     SetAgent,
+    YTable,
   },
   data() {
     return {
-      columns,
+      sourceType,
+      siteId: local.getLocal("siteId"), // 站点id
+      columns: [
+        {
+          title: "序号",
+          width: "50px",
+          customRender: (text, record, index) => {
+            return (
+              (this.searchForm.page - 1) * this.searchForm.size + index + 1
+            );
+          },
+        },
+        {
+          title: "部门",
+          width: "20%",
+          dataIndex: "deptName",
+        },
+        {
+          title: "事项名称",
+          // ellipsis: true,
+          align: "left",
+          dataIndex: "matterName",
+          scopedSlots: {
+            customRender: "matterName",
+          },
+        },
+        {
+          title: "事项来源",
+          dataIndex: "source",
+          scopedSlots: {
+            customRender: "source",
+          },
+        },
+        {
+          title: "大厅入驻事项",
+          scopedSlots: {
+            customRender: "hallCheckIn",
+          },
+        },
+        {
+          title: "帮办代办",
+          scopedSlots: {
+            customRender: "agent",
+          },
+        },
+        {
+          title: "操作",
+          width: "200px",
+          scopedSlots: {
+            customRender: "action",
+          },
+        },
+      ],
       loading: false,
       addVisile: false,
-      source: undefined, // 左边来源
       selectedRowKeys: [],
       selectedRows: [],
       matterSiteData: [], // 站点事项
       matterDataList: [], //事项列表数据
-      current: 1,
-      total: 0,
-      size: 10,
-      pageSizeOptions,
-      siteId: local.getLocal("siteId"), // 站点id
       deptList: [], // 站点部门
-      searchVal: "", // 站点事项搜索
-      dept: undefined, // 部门搜索
+      total: 0,
+      searchForm: {
+        page: 1,
+        size: 10,
+        matterName: "", // 站点事项名称搜索
+        deptCode: undefined, // 部门搜索
+        source: undefined, // 来源 0:一体化添加，1：自建
+      },
     };
   },
   created() {
@@ -240,53 +239,36 @@ export default {
 
   methods: {
     // 获取部门列表
-    async getDeptListData(obj = {}) {
-      this.deptLoading = true;
+    async getDeptListData() {
       let res = await getDeptList({
         siteId: this.siteId,
         page: 1,
         size: -1,
-        ...obj,
       });
-      this.deptLoading = false;
       let { code, data } = res.data;
       if (code === 1) {
         this.deptList = data.data;
       }
     },
     // 获取站点事项
-    async getMatterSiteData(search = {}) {
+    async getMatterSiteData() {
       this.loading = true;
       let res = await getSiteMatterList({
-        page: this.current,
-        size: this.size,
         siteId: this.siteId,
-        source: this.source,
-        matterName: `%${this.searchVal}%`,
-        deptCode: this.dept,
-        ...search,
+        ...this.searchForm,
+        matterName: `%${this.searchForm.matterName}%`,
       });
-      let { pageInfo, data } = res.data.data;
-      this.total = pageInfo.totalResult;
-      this.matterSiteData = data;
+      if (res.data.code == 1) {
+        let { pageInfo, data } = res.data.data;
+        this.total = pageInfo.totalResult;
+        this.matterSiteData = data;
+      }
       this.loading = false;
     },
 
     // 搜索
     onSearch() {
-      this.current = 1;
-      this.getMatterSiteData();
-    },
-
-    // 左翻页
-    changePage(num) {
-      this.current = num;
-      this.getMatterSiteData();
-    },
-    // 左边改变每页显示数量
-    showSizeChange(current, size) {
-      this.current = current;
-      this.size = size;
+      this.searchForm.page = 1;
       this.getMatterSiteData();
     },
 
@@ -307,12 +289,12 @@ export default {
           display = 1;
         }
       }
-      let obj = {
+      let form = {
         id: row.id,
       };
-      if (hot != "undefined") obj.hot = hot;
-      if (display != "undefined") obj.display = display;
-      let res = await addSitematter(obj);
+      if (hot != "undefined") form.hot = hot;
+      if (display != "undefined") form.display = display;
+      let res = await addSitematter(form);
       if (res.data.code == 1) {
         this.$message.success("设置成功");
         this.getMatterSiteData();