dev01 1 year ago
parent
commit
9478e7e1ca

+ 5 - 2
src/client/reports.client.ts

@@ -8,7 +8,7 @@ import type { Response } from "@/types/response.types";
 
 const _url = withPrefix("/api/srUserReport")
 
-export async function query(page: number, companyIds?: number[], field?: string, keyword?: string, status?: number): Promise<ReportsResponse> {
+export async function query(page: number, companyIds?: number[], field?: string, keyword?: string, status?: number, upChain?: number): Promise<ReportsResponse> {
   //const params: any = { page, companyIds, field, keyword }
   // if (companyId) {
   //   params['companyId'] = companyId;
@@ -24,8 +24,11 @@ export async function query(page: number, companyIds?: number[], field?: string,
   if (status || status == 0) {
     param += `&status=${status}`
   }
+  if (upChain || upChain == 0) {
+    param += `&upChain=${upChain}`
+  }
 
-  const resp = await httpClient.get<Response<ReportsResponse>>(_url(`/all/?page=${page}&${param}`))
+  const resp = await httpClient.get<Response<ReportsResponse>>(_url(`/all/?current=${page}&${param}`))
   return resp.data.data
 }
 

+ 2 - 2
src/services/reports.service.ts

@@ -1,8 +1,8 @@
 import * as reportsClient from "@/client/reports.client"
 import type { ReportSaveRequest } from "@/types/report.types";
 
-export async function query(page?: number, companyIds?: number[], field?: string, keyword?: string, status?: number) {
-  return reportsClient.query(page || 1, companyIds, field, keyword, status);
+export async function query(page?: number, companyIds?: number[], field?: string, keyword?: string, status?: number, upChain?: number) {
+  return reportsClient.query(page || 1, companyIds, field, keyword, status, upChain);
 }
 
 export async function upper(id: number) {

File diff suppressed because it is too large
+ 5 - 1
src/views/report/ReportDetailView.vue


+ 27 - 1
src/views/report/ReportListView.vue

@@ -30,7 +30,23 @@ const reportStatus = ref([
   },
 ]);
 
+const reportChain = ref([
+  {
+    label: "全部",
+    value: undefined,
+  },
+  {
+    label: "未上链",
+    value: 0,
+  },
+  {
+    label: "已上链",
+    value: 1,
+  },
+]);
+
 const status = ref(undefined);
+const chain = ref(undefined);
 
 interface CompanyAggProp {
   id?: number;
@@ -62,7 +78,7 @@ function fetchReports(
 ) {
   spinning.value = true;
   reportsService
-    .query(page, companyIds, field, keyword, status.value)
+    .query(page, companyIds, field, keyword, status.value, chain.value)
     .then((resp) => {
       total.value = resp.total;
       reports.value = resp.reports;
@@ -149,6 +165,12 @@ onMounted(() => {
         v-model:value="status"
         @change="onFilterChange()"
       />
+      <span class="filter-box-wrap-line"></span>
+      <a-radio-group
+        :options="reportChain"
+        v-model:value="chain"
+        @change="onFilterChange()"
+      />
     </div>
 
     <a-row class="main-content" :gutter="24">
@@ -187,6 +209,10 @@ onMounted(() => {
   .filter-box-wrap {
     display: flex;
     margin: 1.5em 21.1%;
+
+    .filter-box-wrap-line {
+      width: 5em;
+    }
   }
   .main-content {
     margin-top: 1.5em;

+ 5 - 1
src/views/report/components/report-list/ReportItem.vue

@@ -57,7 +57,7 @@ function onUpper(id: number) {
           @click="onUpper(data.id)"
           >上链</a-button
         >
-        <span v-else>已上链</span></a
+        <span v-else class="text-buttom">已上链</span></a
       >
     </template>
 
@@ -99,4 +99,8 @@ function onUpper(id: number) {
 a {
   color: #000;
 }
+.text-buttom {
+  font-size: 16px;
+  margin-right: 1em;
+}
 </style>