From 1c3ff07cf9148009c6fc4c9bc403177518b6fa6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 7 Jul 2025 14:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/zh/hy/hy.api.ts      |   6 +
 src/views/zh/hy/hy.data.ts     |  29 ++++-
 src/views/zh/hy/tdcs/index.vue |   2 +-
 src/views/zh/hy/tdzl/index.vue |  82 ++++++++++++-
 src/views/zh/hy/wg/index.vue   | 212 +++++++++------------------------
 5 files changed, 172 insertions(+), 159 deletions(-)

diff --git a/src/views/zh/hy/hy.api.ts b/src/views/zh/hy/hy.api.ts
index d148234..413b166 100644
--- a/src/views/zh/hy/hy.api.ts
+++ b/src/views/zh/hy/hy.api.ts
@@ -9,6 +9,7 @@ enum Api {
   wgList = '/zh/hy/queryHyWgList',
   allTdcsList = '/zh/hy/queryAllHyTdcsList',
   queryHyjlList = '/zh/hy/queryHyjlList',
+  queryHywgList = '/zh/hy/queryHywgList',
 }
 
 /**
@@ -51,3 +52,8 @@ export const allTdcsList = (params) => defHttp.get({ url: Api.allTdcsList, param
  * @param params
  */
 export const queryHyjlList = (params) => defHttp.get({ url: Api.queryHyjlList, params });
+/**
+ * 查询会员违规投递历史
+ * @param params
+ */
+export const queryHywgList = (params) => defHttp.get({ url: Api.queryHywgList, params });
diff --git a/src/views/zh/hy/hy.data.ts b/src/views/zh/hy/hy.data.ts
index 5f86ae7..34c4369 100644
--- a/src/views/zh/hy/hy.data.ts
+++ b/src/views/zh/hy/hy.data.ts
@@ -133,7 +133,7 @@ export const tdzlColumns : BasicColumn[] =[
     align: 'center'
   },
   {
-    title: '小区名称',
+    title: '会员',
     dataIndex: 'name',
     key: 'name',
     align: 'center'
@@ -235,3 +235,30 @@ export const detailTdcsColumns : BasicColumn[] =[
   },
 ]
 
+export const wghysColumns : BasicColumn[] =[
+  {
+    title: '序号',
+    dataIndex: 'rowNumber',
+    key: 'rowNumber',
+    align: 'center'
+  },
+  {
+    title: '日期',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center'
+  },
+  {
+    title: '违规会员数',
+    dataIndex: 'value',
+    key: 'value',
+    align: 'center'
+  },
+  {
+    title: '操作',
+    key: 'action',
+    align: 'center',
+    width: '150px',
+  }
+]
+
diff --git a/src/views/zh/hy/tdcs/index.vue b/src/views/zh/hy/tdcs/index.vue
index 7c48401..bc0a8ed 100644
--- a/src/views/zh/hy/tdcs/index.vue
+++ b/src/views/zh/hy/tdcs/index.vue
@@ -157,7 +157,7 @@ const handleView = async (record) => {
 async function loadDetailDate(){
   try {
     detailData.value = [];
-    const res = await queryHyjlList({ beginTime:parmas.beginTime,endTime:parmas.endTime,housingestateId:parmas.housingestateId,phone:detailParmas.phone,invalid:detailParmas.invalid });
+    const res = await queryHywgList({ beginTime:parmas.beginTime,endTime:parmas.endTime,housingestateId:parmas.housingestateId,phone:detailParmas.phone,invalid:detailParmas.invalid });
     detailData.value = res;
     detailVisible.value = true;
   } catch (error) {
diff --git a/src/views/zh/hy/tdzl/index.vue b/src/views/zh/hy/tdzl/index.vue
index ff1d47c..720bae3 100644
--- a/src/views/zh/hy/tdzl/index.vue
+++ b/src/views/zh/hy/tdzl/index.vue
@@ -22,21 +22,64 @@
             <a-select-option :value="item.housingestateId" v-for="item in housingestates" :key="item.housingestateId">{{item.housingestateName}}</a-select-option>
           </a-select>
         </a-col>
+        <a-col :span="3">
+          <a-radio-group v-model:value="izList" button-style="solid" @change="loadDate">
+            <a-radio-button :value="false">统计图</a-radio-button>
+            <a-radio-button :value="true">列表页</a-radio-button>
+          </a-radio-group>
+        </a-col>
       </a-row>
-      <Bar :chartData="dataSource" height="80vh" :option="{ title: { text: '会员投递重量排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递重量'"></Bar>
+      <Bar v-show="!izList" :chartData="dataSource" height="80vh" :option="{ title: { text: '会员投递重量排行榜', left: 'center' }}" :itemStyle="{ normal: {label : {show: true, position: 'top'}}}" :seriesName="'投递重量'"></Bar>
+      <div v-show="izList" style="margin-top: 20px;">
+        <a-table :dataSource="dataSource" :columns="tdzlColumns">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <a-button type="link" @click="handleView(record)">查看</a-button>
+            </template>
+          </template>
+        </a-table>
+      </div>
     </a-card>
+    <!-- 查看详情弹窗 -->
+    <a-modal v-model:visible="detailVisible" title="会员投递详情" width="80%" :footer="null">
+      <a-row>
+        <a-col :span="20">
+          <div style="margin: 5px 0px 5px 20px">订单状态
+            <a-select ref="select"
+                      placeholder="请选订单状态"
+                      v-model:value="detailParmas.invalid"
+                      style="width: 200px;margin-left: 5px;"
+                      @change="loadDetailDate">
+              <a-select-option value="" >全部</a-select-option>
+              <a-select-option value="0">正常</a-select-option>
+              <a-select-option value="1">违规</a-select-option>
+              <a-select-option value="2">部分违规</a-select-option>
+              <a-select-option value="3">待审核</a-select-option>
+              <a-select-option value="4">异常</a-select-option>
+              <a-select-option value="5">忽略</a-select-option>
+            </a-select>
+          </div>
+        </a-col>
+      </a-row>
+      <a-table :dataSource="detailData" :columns="detailTdcsColumns" rowKey="rowNumber">
+      </a-table>
+    </a-modal>
   </div>
 </template>
 
 <script lang="ts" setup>
   import {ref, unref, reactive, onMounted} from 'vue';
   import Bar from '/@/components/chart/Bar.vue';
-  import { tdzlList,housingestateList } from '../hy.api';
+  import {tdzlList, housingestateList, queryHyjlList} from '../hy.api';
+  import { tdzlColumns,detailTdcsColumns } from '../hy.data';
   import type { Dayjs } from 'dayjs';
   const valueFormat = 'YYYY-MM-DD';
   const dataSource = ref([]);
   const dateValue = ref();
   const housingestates = ref();
+  const izList = ref(false)
+  const detailVisible = ref(false);
+  const detailData = ref([]);
 
   async function getHousingestates(){
     housingestates.value = await housingestateList();
@@ -46,6 +89,14 @@
     beginTime: '',
     endTime: '',
     type: '1',
+    housingestateId: '',
+    pageSize: 10,
+    type: '1',
+  })
+
+  const detailParmas = reactive<any>({
+    phone: '',
+    invalid: '',
   })
 
   function changeType (){
@@ -79,16 +130,41 @@
   };
 
   async function loadDate() {
-    const res = await tdzlList(parmas);
+    if(izList.value){
+      parmas.pageSize=-1
+    }else{
+      parmas.pageSize=10
+    }
+    const resData = await tdzlList(parmas);
+    const res = resData.records;
     dataSource.value = [];
     for (let i = 0; i < res.length; i++) {
       dataSource.value.push({
+        rowNumber: res[i].rowNumber,
         name: `${res[i].phone}`,
         value: res[i].weight,
       });
     }
   }
 
+  // 查看详情
+  const handleView = async (record) => {
+    detailParmas.phone = record.name;
+    loadDetailDate();
+  }
+
+  // 查看详情
+  async function loadDetailDate(){
+    try {
+      detailData.value = [];
+      const res = await queryHyjlList({ beginTime:parmas.beginTime,endTime:parmas.endTime,housingestateId:parmas.housingestateId,phone:detailParmas.phone,invalid:detailParmas.invalid });
+      detailData.value = res;
+      detailVisible.value = true;
+    } catch (error) {
+      console.error('获取详情失败:', error);
+    }
+  }
+
   function getPreviousDate(days){
     const date = new Date();
     date.setDate(date.getDate() - days);
diff --git a/src/views/zh/hy/wg/index.vue b/src/views/zh/hy/wg/index.vue
index 74076fe..40b8344 100644
--- a/src/views/zh/hy/wg/index.vue
+++ b/src/views/zh/hy/wg/index.vue
@@ -2,7 +2,7 @@
   <div class="p-4">
     <a-card :bordered="false" style="height: 100%">
       <a-row>
-        <a-col :span="21" v-show="!izList">
+        <a-col :span="20">
           <a-radio-group v-model:value="parmas.type" @change="changeType">
             <a-radio-button value="1">近3天</a-radio-button>
             <a-radio-button value="2">近7天</a-radio-button>
@@ -19,20 +19,8 @@
               item.housingestateName }}</a-select-option>
           </a-select>
         </a-col>
-        <a-col :span="21" v-show="izList">
-          <a-form layout="inline" :model="parmas" :labelCol="{ style: { width: 'auto', paddingRight: '90px' } }"
-            :wrapperCol="{ style: { display: 'flex', alignItems: 'center' } }">
-            <a-form-item label="违规次数">
-              <a-input-number v-model:value="parmas.countMin" placeholder="最小次数" :min="0" />
-              <span class="ant-form-text" style="margin: 0 8px;">至</span>
-              <a-input-number v-model:value="parmas.countMax" placeholder="最大次数" :min="0" />
-            </a-form-item>
-          </a-form>
-          <a-button type="link" @click="loadListDate">查询</a-button>
-          <a-button type="link" @click="resetListData">重置</a-button>
-        </a-col>
         <a-col :span="3">
-          <a-radio-group v-model:value="izList" button-style="solid">
+          <a-radio-group v-model:value="izList" button-style="solid" @change="loadDate">
             <a-radio-button :value="false">统计图</a-radio-button>
             <a-radio-button :value="true">列表页</a-radio-button>
           </a-radio-group>
@@ -40,26 +28,35 @@
       </a-row>
       <Bar v-show="!izList" :chartData="dataSource" height="80vh"
         :option="{ title: { text: '会员违规信息统计', left: 'center' } }"
-        :itemStyle="{ normal: { label: { show: true, position: 'top' } } }" :seriesName="'违规次数'"></Bar>
-      <a-table v-show="izList" :dataSource="tableData" :columns="columns">
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'action'">
-            <a-button type="link" @click="handleView(record)">查看</a-button>
+        :itemStyle="{ normal: { label: { show: true, position: 'top' } } }" :seriesName="'违规会员数'"></Bar>
+      <div v-show="izList" style="margin-top: 20px;">
+        <a-table :dataSource="dataSource" :columns="wghysColumns">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <a-button type="link" @click="handleView(record)">查看</a-button>
+            </template>
           </template>
-        </template>
-      </a-table>
+        </a-table>
+      </div>
     </a-card>
     <!-- 查看详情弹窗 -->
     <a-modal v-model:visible="detailVisible" title="会员投递详情" width="80%" :footer="null">
-      <a-table :dataSource="detailData" :columns="detailColumns" rowKey="phone">
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'action'">
-            <a-space>
-              <a-button type="link" @click="handleMark(record)">标记</a-button>
-              <a-button type="link" danger @click="handleBlock(record)">屏蔽</a-button>
-            </a-space>
-          </template>
-        </template>
+      <a-row>
+        <a-col :span="20">
+          <div style="margin: 5px 0px 5px 20px">订单状态
+            <a-select ref="select"
+                      placeholder="请选订单状态"
+                      v-model:value="detailParmas.invalid"
+                      style="width: 200px;margin-left: 5px;"
+                      @change="loadDetailDate">
+              <a-select-option value="" >全部</a-select-option>
+              <a-select-option value="1">违规</a-select-option>
+              <a-select-option value="2">部分违规</a-select-option>
+            </a-select>
+          </div>
+        </a-col>
+      </a-row>
+      <a-table :dataSource="detailData" :columns="detailTdcsColumns" rowKey="rowNumber">
       </a-table>
     </a-modal>
   </div>
@@ -68,101 +65,16 @@
 <script lang="ts" setup>
 import { ref, unref, reactive, onMounted } from 'vue';
 import Bar from '/@/components/chart/Bar.vue';
-import { wgList, allTdcsList, housingestateList, queryHyjlList } from '../hy.api';
-
+import {wgList, housingestateList, queryHywgList} from '../hy.api';
+import { wghysColumns,detailTdcsColumns } from '../hy.data';
 const valueFormat = 'YYYY-MM-DD';
 const dataSource = ref([]);
 const dateValue = ref();
 const housingestates = ref();
 const izList = ref(false)
-const tableData = ref([])
 const detailVisible = ref(false);
 const detailData = ref([]);
 
-const columns = ref([
-  {
-    title: '会员',
-    dataIndex: 'name',
-    key: 'name',
-    align: 'center'
-  },
-  {
-    title: '投递次数',
-    dataIndex: 'value',
-    key: 'value',
-    align: 'center'
-  },
-  {
-    title: '操作',
-    key: 'action',
-    align: 'center',
-    width: '150px',
-  }
-])
-
-const detailColumns = ref([
-  {
-    title: '会员手机号',
-    dataIndex: 'phone',
-    key: 'phone',
-    align: 'center'
-  },
-  {
-    title: '金额',
-    dataIndex: 'money',
-    key: 'money',
-    align: 'center'
-  },
-  {
-    title: '重量',
-    dataIndex: 'weight',
-    key: 'weight',
-    align: 'center'
-  },
-  {
-    title: '投递时间',
-    dataIndex: 'addTime',
-    key: 'addTime',
-    align: 'center'
-  },
-  {
-    title: '订单是否有效',
-    dataIndex: 'invalid',
-    key: 'invalid',
-    align: 'center'
-  },
-  {
-    title: '订单开始重量',
-    dataIndex: 'startWeight',
-    key: 'startWeight',
-    align: 'center'
-  },
-  {
-    title: '订单结束重量',
-    dataIndex: 'endWeight',
-    key: 'endWeight',
-    align: 'center'
-  },
-  {
-    title: '厂家更新时间',
-    dataIndex: 'updatedAt',
-    key: 'updatedAt',
-    align: 'center'
-  },
-  {
-    title: '扣除金额',
-    dataIndex: 'deductMoney',
-    key: 'deductMoney',
-    align: 'center'
-  },
-  {
-    title: '操作',
-    key: 'action',
-    align: 'center',
-    width: '200px',
-  }
-]);
-
 async function getHousingestates() {
   housingestates.value = await housingestateList();
 }
@@ -170,9 +82,14 @@ async function getHousingestates() {
 const parmas = reactive<any>({
   beginTime: '',
   endTime: '',
+  housingestateId: '',
+  pageSize: 10,
   type: '1',
-  countMin: null,
-  countMax: null,
+})
+
+const detailParmas = reactive<any>({
+  shortDay: '',
+  invalid: '',
 })
 
 function changeType() {
@@ -202,44 +119,46 @@ function handleHousinges() {
 };
 
 async function loadDate() {
-  const res = await wgList(parmas);
+  if(izList.value){
+    parmas.pageSize=-1
+  }else{
+    parmas.pageSize=10
+  }
+  const resData = await wgList(parmas);
+  const res = resData.records;
   dataSource.value = [];
   for (let i = 0; i < res.length; i++) {
     dataSource.value.push({
+      rowNumber: res[i].rowNumber,
       name: `${res[i].shortDay}`,
       value: res[i].cn,
     });
   }
 }
 
-async function loadListDate() {
-  const res = await allTdcsList({ countMin: parmas.countMin, countMax: parmas.countMax });
-  tableData.value = [];
-  for (let i = 0; i < res.length; i++) {
-    tableData.value.push({
-      name: `${res[i].phone}`,
-      value: res[i].cn,
-    });
-  }
-}
-
-//重置
-function resetListData() {
-  parmas.countMin = null
-  parmas.countMax = null
-  loadListDate()
+// 查看详情
+const handleView = async (record) => {
+  detailParmas.shortDay = record.name;
+  loadDetailDate();
 }
 
 // 查看详情
-const handleView = async (record) => {
+async function loadDetailDate(){
   try {
-    const res = await queryHyjlList({ phone: record.name });
+    detailData.value = [];
+    let detailParams = {
+      beginTime:detailParmas.shortDay+' 00:00:00',
+      endTime:detailParmas.shortDay+' 23:59:59',
+      housingestateId:parmas.housingestateId,
+      invalid:detailParmas.invalid
+    };
+    const res = await queryHywgList(detailParams);
     detailData.value = res;
     detailVisible.value = true;
   } catch (error) {
     console.error('获取详情失败:', error);
   }
-};
+}
 
 function getPreviousDate(days) {
   const date = new Date();
@@ -251,27 +170,12 @@ function getPreviousDate(days) {
   return formattedDate;
 }
 
-// 新增的方法
-const handleMark = (record) => {
-  console.log('标记记录:', record);
-  // 这里可以添加标记逻辑，如调用API等
-  // 示例: markRecord(record.phone);
-};
-
-const handleBlock = (record) => {
-  console.log('屏蔽记录:', record);
-  // 这里可以添加屏蔽逻辑，如调用API等
-  // 示例: blockRecord(record.phone);
-};
-
-
 onMounted(() => {
   if (parmas.type == '1') {
     parmas.beginTime = getPreviousDate(2) + ' 00:00:00';
     parmas.endTime = getPreviousDate(0) + ' 23:59:59';
   }
   loadDate();
-  loadListDate();
   getHousingestates();
 })