分页

package.json

@@ -56,7 +56,8 @@
     "vue-template-compiler": "^2.6.14",
     "vue-video-player": "^5.0.2",
     "vuex": "^3.6.2",
-    "vxe-table": "3",
+    "vxe-table": "^2.11.0",
+    "xe-utils": "3.5.31",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {

pnpm-lock.yaml

@@ -144,8 +144,11 @@ importers:
         specifier: ^3.6.2
         version: 3.6.2(vue@2.7.16)
       vxe-table:
-        specifier: '3'
-        version: 3.12.9(vue@2.7.16)
+        specifier: ^2.11.0
+        version: 2.11.0(vue@2.7.16)
+      xe-utils:
+        specifier: 3.5.31
+        version: 3.5.31
       xlsx:
         specifier: ^0.18.5
         version: 0.18.5
@@ -4572,11 +4575,10 @@ packages:
     peerDependencies:
       vue: ^2.0.0
 
-  vxe-pc-ui@3.3.76:
-    resolution: {integrity: sha512-zpbm0clvy/+YPeBZUQWx5UZYAZRjaw+t79vN3IPD4PHcbcFYvZ9F/9DkQZsu6zk/Avzo+cATqhYjCSd25fyvBQ==}
-
-  vxe-table@3.12.9:
-    resolution: {integrity: sha512-GgqECZngH/5nje8fT4PC+16xd2+fVyC+WeG5luQO7/++PiefL+u2VZDRA9kXJwODBkqnZqahlGb3jBs36zOMTg==}
+  vxe-table@2.11.0:
+    resolution: {integrity: sha512-dDLV2Iiy/8Yiy14MX91TQb2HsW9K5ZYS3+xIjBmKc5JFMEHeuB8SxaFShSXhVk9GNTd+/u0GqvQhDoQ1WXAwnw==}
+    peerDependencies:
+      vue: ^2.6.0
 
   wangeditor@4.7.15:
     resolution: {integrity: sha512-aPTdREd8BxXVyJ5MI+LU83FQ7u1EPd341iXIorRNYSOvoimNoZ4nPg+yn3FGbB93/owEa6buLw8wdhYnMCJQLg==}
@@ -4737,6 +4739,9 @@ packages:
       utf-8-validate:
         optional: true
 
+  xe-utils@3.5.31:
+    resolution: {integrity: sha512-oS4yv8qktvlE0wc9yYkitDidEmThc5qN0UTRvKCvrWnejxbTyIxbwfrdZmPKdKGZtB+/U8cEAMFywLJjHtD11A==}
+
   xe-utils@3.7.0:
     resolution: {integrity: sha512-2pndXCEivB7+xWCdCDth/LJ5ngAAstUOoHTGBQauwTqc03M3Cl1tYbNhPUqi4Lcj+UNZnnc8fANbFWjb6TMx6A==}
 
@@ -9631,17 +9636,9 @@ snapshots:
     dependencies:
       vue: 2.7.16
 
-  vxe-pc-ui@3.3.76(vue@2.7.16):
+  vxe-table@2.11.0(vue@2.7.16):
     dependencies:
-      '@vxe-ui/core': 3.0.26(vue@2.7.16)
-    transitivePeerDependencies:
-      - vue
-
-  vxe-table@3.12.9(vue@2.7.16):
-    dependencies:
-      vxe-pc-ui: 3.3.76(vue@2.7.16)
-    transitivePeerDependencies:
-      - vue
+      vue: 2.7.16
 
   wangeditor@4.7.15:
     dependencies:
@@ -9856,6 +9853,8 @@ snapshots:
       bufferutil: 4.0.9
       utf-8-validate: 5.0.10
 
+  xe-utils@3.5.31: {}
+
   xe-utils@3.7.0: {}
 
   xhr@2.4.0:

src/api/serviceManagement/servicesToBeReviewed/index.js

@@ -0,0 +1,11 @@
+import request from '@/router/axios';
+
+
+// 获取数据
+export function getTaskV2PageApi(query) {
+  return request({
+    url: ' /admin/task/v2/page',
+    method: 'get',
+    params: query
+  });
+}

src/const/crud/admin/user.js

@@ -1,4 +1,4 @@
-import {getDetails} from '@/api/admin/user';
+import { getDetails } from '@/api/admin/user';
 
 export const tableOption = {
   border: true,
@@ -87,7 +87,6 @@ export const tableOption = {
       label: '人员角色',
       prop: 'role',
       type: 'select',
-      multiple: true,
       slot: true,
       formslot: true,
       overHidden: true,
@@ -345,7 +344,7 @@ export const recordReviewTableOption = {
 
       dicUrl: '/admin/wmdaagent/listByDept',
       type: 'select',
-      formatter: function(row) {
+      formatter: function (row) {
         return row.deptId + '';
       },
       props: {

src/main.js

@@ -1,7 +1,9 @@
 import 'babel-polyfill';
 import 'classlist-polyfill';
 import Vue from 'vue';
-
+import 'xe-utils';
+import VXETable from 'vxe-table';
+import 'vxe-table/lib/style.css';
 import VueAxios from 'vue-axios';
 import App from './App';
 import './permission'; // 权限
@@ -20,8 +22,6 @@ import AvueFormDesign from 'pig-avue-form-design';
 import basicContainer from './components/basic-container/main';
 import ViewUI from 'view-design'; //iview
 import 'view-design/dist/styles/iview.css'; //iview
-import VXETable from 'vxe-table';
-import 'vxe-table/lib/style.css';
 import AvueUeditor from 'avue-plugin-ueditor';
 import VueCropper from 'vue-cropper';
 import AvueMap from 'avue-plugin-map';

src/views/serviceManagement/servicesToBeReviewed/index.js

@@ -0,0 +1,51 @@
+export const tableOptin = {
+  border: true,
+  index: true,
+  indexLabel: '序号',
+  menuAlign: 'center',
+  searchMenuSpan: 6,
+  editBtn: false,
+  delBtn: false,
+  dialogClickModal: false,
+  dialogCloseBtn: false,
+  align: 'center',
+  addBtn: false,
+  column: [
+    {
+      label: '服务编号',
+      prop: 'taskNumber'
+    },
+    {
+      abel: '执行包名称',
+      prop: 'pkgName'
+    },
+    {
+      label: '服务类型',
+      prop: 'taskTypeId'
+    },
+    {
+      label: '服务分值',
+      prop: 'taskScore'
+    },
+    {
+      label: '推广员姓名',
+      prop: 'salesName'
+    },
+    {
+      label: '服务提交时间',
+      prop: 'createTime'
+    },
+    {
+      label: '审核状态',
+      prop: 'taskStatus'
+    },
+    {
+      label: '服务提供商',
+      prop: 'entName'
+    },
+    {
+      label: '服务产品',
+      prop: 'skuName'
+    }
+  ]
+};

src/views/serviceManagement/servicesToBeReviewed/index.vue

@@ -1,7 +1,109 @@
 <template>
-  <div>服务待审核</div>
+  <basic-container>
+    <!-- <avue-crud
+      ref="crud"
+      :page.sync="page"
+      :data="tableData"
+      :table-loading="tableLoading"
+      @refresh-change="refreshChange"
+      @size-change="sizeChange"
+      @current-change="currentChange"
+      :option="tableOptin"
+    >
+      <template slot="menu" slot-scope="scope">
+        <el-button type="text" size="small" icon="el-icon-reading" @click="detailFn(scope.row)">{{ scope.row.read ? '已读' : '查阅' }} </el-button>
+      </template>
+    </avue-crud> -->
+
+    <vxe-table border show-overflow highlight-hover-row height="1000" :sort-config="{ trigger: 'cell' }" :data="tableData">
+      <vxe-table-column type="seq" width="100"></vxe-table-column>
+      <vxe-table-column field="taskNumber" title="服务编号"></vxe-table-column>
+      <vxe-table-column field="pkgName" title="执行包名称"></vxe-table-column>
+      <vxe-table-column field="taskTypeId" title="服务类型"></vxe-table-column>
+      <vxe-table-column field="taskScore" title="服务分值"></vxe-table-column>
+      <vxe-table-column field="salesName" title="推广员姓名"></vxe-table-column>
+      <vxe-table-column field="createTime" title="服务提交时间"></vxe-table-column>
+      <vxe-table-column field="taskStatus" title="审核状态"></vxe-table-column>
+      <vxe-table-column field="entName" title="服务提供商"></vxe-table-column>
+      <vxe-table-column field="skuName" title="服务产品"></vxe-table-column>
+    </vxe-table>
+    <vxe-pager
+      :current-page.sync="page.currentPage"
+      :page-size.sync="page.pageSize"
+      :total="page.total"
+      :page-sizes="page.pageSizes"
+      @page-change="pageChange"
+      :layouts="['PrevJump', 'PrevPage', 'JumpNumber', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']"
+    >
+    </vxe-pager>
+  </basic-container>
 </template>
 
-<script></script>
+<script>
+import { getTaskV2PageApi } from '@/api/serviceManagement/servicesToBeReviewed/index';
+import { tableOptin } from './index.js';
+
+export default {
+  data() {
+    return {
+      tableOptin,
+      tableData: [],
+      tableLoading: false,
+      page: {
+        pageSizes: [10, 50, 100, 300, 500],
+        total: 0, // 总页数
+        currentPage: 1, // 当前页数
+        pageSize: 300 // 每页显示多少条
+      }
+    };
+  },
+  created() {
+    this.getList(this.page);
+  },
+  methods: {
+    async getList(page, params) {
+      console.log('page', page);
+
+      this.tableLoading = true;
+      const obj = Object.assign(
+        {
+          current: page.currentPage,
+          size: page.pageSize
+        },
+        params,
+        {
+          nodeId: 1,
+          year: 2024,
+          quarter: 4
+        }
+      );
+      const res = await getTaskV2PageApi(obj);
+      this.tableLoading = false;
+      if (res.data.code === 0) {
+        this.tableData = res.data.data.records;
+        this.page.total = res.data.data.total;
+      }
+      console.log('res', res);
+    },
+    pageChange(obj) {
+      console.log('obj', obj);
+      this.page.currentPage = obj.currentPage;
+      this.page.pageSize = obj.pageSize;
+      this.getList(this.page);
+    },
+    refreshChange() {
+      this.getList(this.page);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.getList(this.page);
+    },
+    currentChange(current) {
+      this.page.currentPage = current;
+      this.getList(this.page);
+    }
+  }
+};
+</script>
 
 <style lang="scss" scoped></style>

src/views/servicePackageMonitoring/riskEventInfoDisplay/index.vue

@@ -13,13 +13,7 @@
     >
       <!-- 操作栏 -->
       <template slot="menu" slot-scope="scope">
-        <el-button
-          type="text"
-          size="small"
-          icon="el-icon-reading"
-          @click="detailFn(scope.row)"
-          >{{ scope.row.read ? "已读" : "查阅" }}
-        </el-button>
+        <el-button type="text" size="small" icon="el-icon-reading" @click="detailFn(scope.row)">{{ scope.row.read ? '已读' : '查阅' }} </el-button>
       </template>
     </avue-crud>
     <detail ref="detailDialogRef" @success="refreshChange" />
@@ -27,9 +21,9 @@
 </template>
 
 <script>
-import { fetchWarnList } from "@/api/riskEventWarningSettings.js";
-import { infoTableOption } from "@/const/crud/riskEventWarningSettings.js";
-import detail from "./components/detail.vue";
+import { fetchWarnList } from '@/api/riskEventWarningSettings.js';
+import { infoTableOption } from '@/const/crud/riskEventWarningSettings.js';
+import detail from './components/detail.vue';
 
 export default {
   components: { detail },
@@ -59,7 +53,7 @@ export default {
       if (res.data.code === 0) {
         this.tableData = res.data.data.records;
         this.page.total = res.data.data.total;
-        console.log("tableData", this.tableData);
+        console.log('tableData', this.tableData);
       }
       this.tableLoading = false;
     },
@@ -68,6 +62,7 @@ export default {
       this.$refs.detailDialogRef.detail(row);
     },
 
+
     refreshChange() {
       this.getList(this.page);
     },