From 1bbb64d8371bcb3572a7f7aaa73cfadbf13a5630 Mon Sep 17 00:00:00 2001
From: ycy <2861518472@qq.com>
Date: Tue, 9 Apr 2024 10:48:03 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E2=9C=A8=20feat:=E7=A5=A8=E6=8D=AE?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/finance-bill-manage/billDestroy.vue | 12 ++++++--
 src/stores/billDestroy.js                     | 29 +++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/pages/finance-bill-manage/billDestroy.vue b/src/pages/finance-bill-manage/billDestroy.vue
index 499baed..018893e 100644
--- a/src/pages/finance-bill-manage/billDestroy.vue
+++ b/src/pages/finance-bill-manage/billDestroy.vue
@@ -206,6 +206,13 @@ const columns = ref([
     align: "center",
     width: "100",
   },
+  {
+    colKey: "breakInfo",
+    title: "报损原因",
+    ellipsis: true,
+    align: "center",
+    width: "100",
+  },
   {
     colKey: "status",
     title: "操作",
@@ -337,12 +344,13 @@ const FORM_RULES = {
 const breakSub = async ({ validateResult, firstError }) => {
   if (validateResult === true) {
     dialogData.value = {
-      ...rowItem.row.value,
+      ...rowItem.value.row,
+      breakStatus: Number(dialogData.value.Status),
     };
     await destroyList.auditDestroyList(dialogData.value);
     getNewTable();
-    MessagePlugin.success("提交成功");
     visiblePost.value = false;
+    MessagePlugin.success("提交成功");
   } else {
     console.log("Validate Errors: ", firstError, validateResult);
   }
diff --git a/src/stores/billDestroy.js b/src/stores/billDestroy.js
index d4a463e..9cd9510 100644
--- a/src/stores/billDestroy.js
+++ b/src/stores/billDestroy.js
@@ -8,15 +8,32 @@ export const useDestroy = defineStore("destroyList", {
   },
   actions: {
     async getDestroyList() {
-      this.destroyList = JSON.parse(
-        localStorage.getItem("breakageList")
-      ).destroyList;
-      console.log(this.destroyList);
+      const storedData = localStorage.getItem("breakageList");
+      if (storedData) {
+        const parsedData = JSON.parse(storedData);
+        this.destroyList = parsedData.destroyList;
+      }
       return this.destroyList;
     },
     auditDestroyList(item) {
-      console.log(item);
-      // let arr = thisz
+      const storedData = localStorage.getItem("breakageList");
+      if (storedData) {
+        const parsedData = JSON.parse(storedData);
+        parsedData.destroyList = parsedData.destroyList.filter(
+          (i) => i.id !== item.id
+        );
+        parsedData.breakageList = parsedData.breakageList.map((i) => {
+          console.log(i.id, item.id);
+          if (i.id === item.id) {
+            console.log(item.breakStatus);
+            return { ...i, breakStatus: item.breakStatus }; // 返回更新后的对象
+          }
+          return i; // 保持其他项不变
+        });
+        console.log(parsedData.breakageList);
+        localStorage.setItem("breakageList", JSON.stringify(parsedData));
+        this.destroyList = parsedData.destroyList; // 更新store中的destroyList状态
+      }
     },
   },
   persist: true,

From 44a85343a5ccb4f7495aae336a604ec2fa36b1fa Mon Sep 17 00:00:00 2001
From: sundongyu <2811054731@qq.com>
Date: Tue, 9 Apr 2024 13:08:04 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E2=9C=A8=20feat:=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E5=9B=BE=E8=A1=A8=E8=A1=A8=E5=8F=AF=E4=BB=A5=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=A4=9A=E4=B8=AA=E7=BB=B4=E5=BA=A6=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/modules/sdy.js                           |  49 ++-
 package-lock.json                             |  28 ++
 package.json                                  |   1 +
 src/api/receivables-management/management.js  |  11 +-
 src/layout/components/LayoutAside.vue         |   3 +
 .../receivables-management/studentLoan.vue    | 402 ++++++++++++++++++
 src/router/modules/receivablesManagement.js   |   6 +
 7 files changed, 498 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/receivables-management/studentLoan.vue

diff --git a/mock/modules/sdy.js b/mock/modules/sdy.js
index f748914..cf606e8 100644
--- a/mock/modules/sdy.js
+++ b/mock/modules/sdy.js
@@ -13,6 +13,20 @@ const data = Mock.mock({
     }
   ]
 })
+const loans = Mock.mock({
+  "list|45": [
+    {
+      "id|+1": 1,
+      'proposer': '@cname',
+      'student': '@integer(100000000,999999999)',
+      'allowance': '@integer(10000,50000)',
+      'department': '@pick(["机电工程系","护理分院","建筑系","材料科学与工程系","环境科学与工程系"])',
+      'cation': '@pick(["2021-2022学年度","2022-2023学年度"])',
+      'loanTerm': '@pick(["已放款","未放款"])',
+      'timeofapplication': '@date("yyyy-MM-dd")',
+    }
+  ]
+})
 export default [
   {
     url: '/get-sdy-managment-list',
@@ -58,5 +72,38 @@ export default [
         code: 200,
       }
     }
-  }
+  },
+  // 借款管理
+  {
+    url: '/get-sdy-loan-list',
+    method: 'get',
+    response: () => {
+      return {
+        code: 200,
+        data: loans
+      }
+    }
+  },
+  // 添加借款人
+  {
+    url: '/post-sdy-loan-add',
+    method: 'post',
+    response: (req) => {
+      const newLoan = {
+        id: loans.list.length + 1,
+        proposer: req.body.proposer,
+        student: req.body.student,
+        allowance: req.body.allowance,
+        department: req.body.department,
+        cation: req.body.cation,
+        loanTerm: req.body.loanTerm,
+        timeofapplication: req.body.timeofapplication,
+      }
+      loans.list.push(newLoan)
+      return {
+        code: 200,
+        data: newLoan
+      }
+    }
+  },
 ]
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 7f33dcb..243e37f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "dependencies": {
         "axios": "^1.6.8",
         "dayjs": "^1.11.10",
+        "echarts": "^5.5.0",
         "less": "^4.2.0",
         "mockjs": "^1.1.0",
         "pinia": "^2.1.7",
@@ -1024,6 +1025,20 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/echarts": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.5.0.tgz",
+      "integrity": "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==",
+      "dependencies": {
+        "tslib": "2.3.0",
+        "zrender": "5.5.0"
+      }
+    },
+    "node_modules/echarts/node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "license": "MIT"
@@ -2058,6 +2073,19 @@
       "version": "3.1.1",
       "dev": true,
       "license": "ISC"
+    },
+    "node_modules/zrender": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.5.0.tgz",
+      "integrity": "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==",
+      "dependencies": {
+        "tslib": "2.3.0"
+      }
+    },
+    "node_modules/zrender/node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     }
   }
 }
diff --git a/package.json b/package.json
index 98f0615..a027f07 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
   "dependencies": {
     "axios": "^1.6.8",
     "dayjs": "^1.11.10",
+    "echarts": "^5.5.0",
     "less": "^4.2.0",
     "mockjs": "^1.1.0",
     "pinia": "^2.1.7",
diff --git a/src/api/receivables-management/management.js b/src/api/receivables-management/management.js
index f7740e3..317622d 100644
--- a/src/api/receivables-management/management.js
+++ b/src/api/receivables-management/management.js
@@ -1,8 +1,17 @@
 import request from '@/utils/request'
-
+// 收款管理
 export function APIReceivablesList() {
   return request.get('/get-sdy-managment-list')
 }
+//查询收款
 export function APIReceivablesAdd(data) {
   return request.post('/post-sdy-managment-find', data)
+}
+//贷款管理
+export function APILoansList() {
+  return request.get('/get-sdy-loan-list')
+}
+//查询贷款
+export function APILoansAdd(data) {
+  return request.post('/post-sdy-loan-add', data)
 }
\ No newline at end of file
diff --git a/src/layout/components/LayoutAside.vue b/src/layout/components/LayoutAside.vue
index 7647ca5..133932b 100644
--- a/src/layout/components/LayoutAside.vue
+++ b/src/layout/components/LayoutAside.vue
@@ -42,6 +42,9 @@
         <t-menu-item value="3-2" to="/billCollected">
           <span>学生收款</span>
         </t-menu-item>
+        <t-menu-item value="3-3" to="/student-loan">
+          <span>助学贷款</span>
+        </t-menu-item>
       </t-submenu>
       <t-submenu value="4" title="学生管理">
         <template #icon>
diff --git a/src/pages/receivables-management/studentLoan.vue b/src/pages/receivables-management/studentLoan.vue
new file mode 100644
index 0000000..7a20386
--- /dev/null
+++ b/src/pages/receivables-management/studentLoan.vue
@@ -0,0 +1,402 @@
+<template>
+  <div class="back-color">
+    <!-- 表单 -->
+    <div class="search-form">
+      <t-form
+        ref="form"
+        :data="formData"
+        reset-type="initial"
+        colon
+        @reset="onReset"
+        @submit="onSubmit"
+      >
+        <t-row>
+          <t-col :span="3">
+            <t-form-item label="学生姓名" name="name">
+              <t-input v-model="formData.name"></t-input>
+            </t-form-item>
+          </t-col>
+          <t-col :span="3">
+            <t-form-item label="学号" name="studentnumber">
+              <t-input v-model="formData.studentnumber"></t-input>
+            </t-form-item>
+          </t-col>
+          <t-col :push="4" :span="2">
+            <t-button type="submit" class="button" style="margin-left: -0.5rem"
+              >搜索</t-button
+            >
+            <t-button type="reset" style="margin-left: 1.5rem">重置</t-button>
+          </t-col>
+        </t-row>
+      </t-form>
+    </div>
+    <!-- 表格 -->
+    <div>
+      <div>
+        <t-row>
+          <t-col :span="3" :offset="10" style="margin-bottom: 0.5rem">
+            <t-button theme="default" variant="text" @click="onClick"
+              >申请助学贷款</t-button
+            >
+          </t-col>
+        </t-row>
+      </div>
+      <t-table
+        row-key="id"
+        :data="data"
+        :columns="columns"
+        table-layout="fixed"
+        size="medium"
+        :pagination="pagination"
+        :show-header="true"
+        cell-empty-content="-"
+        resizable
+        lazy-load
+        :loading="loading"
+        @row-click="handleRowClick"
+        @page-change="onPageChange"
+      >
+      </t-table>
+    </div>
+    <!-- 图表 -->
+    <div style="background-color: #fff; margin-top: 4rem; display: flex">
+      <div ref="chartContainer" style="width: 45rem; height: 35rem"></div>
+      <div>
+        <t-select
+          v-model="value"
+          placeholder="请选择"
+          :options="options"
+          size="medium"
+          @change="handleChange"
+          style="width: 200px; display: inline-block; margin-right: 20px"
+        />
+      </div>
+    </div>
+    <!-- 弹出框 -->
+    <div>
+      <t-space>
+        <t-dialog
+          v-model:visible="visible"
+          header="申请贷款"
+          width="20%"
+          :on-cancel="onCancel"
+          :on-close-btn-click="onCloseBtnClick"
+          :on-confirm="onConfirmAnother"
+          :close-on-overlay-click="false"
+        >
+          <t-space direction="vertical" style="width: 100%">
+            <t-space direction="vertical" size="large">
+              <t-form
+                ref="form"
+                :data="formData"
+                reset-type="initial"
+                colon
+                @reset="onReset"
+              >
+                <t-form-item label="申请人" name="name">
+                  <t-input v-model="addData.proposer"></t-input>
+                </t-form-item>
+                <t-form-item label="学号" name="RoutingAddress">
+                  <t-input v-model="addData.student"></t-input>
+                </t-form-item>
+                <t-form-item label="所在部门" name="RoutingAddress">
+                  <t-input v-model="addData.department"></t-input>
+                </t-form-item>
+                <t-form-item label="助学金额" name="RoutingAddress">
+                  <t-input v-model="addData.allowance"></t-input>
+                </t-form-item>
+                <t-form-item label="是否下款" name="RoutingAddress">
+                  <t-input v-model="addData.loanTerm"></t-input>
+                </t-form-item>
+                <t-form-item label="申请时间" name="RoutingAddress">
+                  <t-input v-model="addData.timeofapplication"></t-input>
+                </t-form-item>
+              </t-form>
+            </t-space>
+          </t-space>
+        </t-dialog>
+      </t-space>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import {
+  APILoansList,
+  APILoansAdd
+} from '@/api/receivables-management/management'
+import * as echarts from 'echarts'
+// 表格数据
+const data = ref([])
+// 搜索框
+const formData = ref({
+  name: '',
+  studentnumber: ''
+})
+// 加载状态
+const loading = ref(false)
+//表头数据
+const columns = ref([
+  { colKey: 'proposer', title: '申请人', width: '100' },
+  { colKey: 'student', title: '学号', width: '100' },
+  { colKey: 'department', title: '所在部门', width: '100' },
+  { colKey: 'allowance', title: '助学金额', width: '100' },
+  { colKey: 'loanTerm', title: '是否下款', width: '100' },
+  { colKey: 'timeofapplication', title: '申请时间', width: '100' },
+  { colKey: 'status', title: '操作', width: '100' }
+])
+//页码
+const pagination = ref({
+  defaultCurrent: 1,
+  defaultPageSize: 10,
+  total: 30
+})
+//弹出框
+const visible = ref(false)
+//弹出框表单数据
+const addData = ref({
+  proposer: '',
+  student: '',
+  department: '',
+  allowance: '',
+  loanTerm: '',
+  timeofapplication: ''
+})
+//图表数据
+const options = [
+  { label: '年', value: '年' },
+  { label: '部门', value: '部门' }
+]
+//图表选择
+const value = ref('年')
+const handleRowClick = e => {
+  console.log(e)
+}
+//监听页码变化了
+const onPageChange = () => {
+  loading.value = true
+  const timerId = setTimeout(() => {
+    loading.value = false
+    clearInterval(timerId)
+  }, 300)
+}
+//发送请求
+const LoansList = async () => {
+  const res = await APILoansList()
+  data.value = res.data.list
+  pagination.value.total = res.data.list.length
+}
+//表单重置
+const onReset = () => {
+  LoansList()
+}
+//表单提交
+const onSubmit = async () => {}
+//弹出框
+const onClick = context => {
+  console.log('点击了确认按钮，弹出弹窗', context)
+  visible.value = true
+}
+const onConfirmAnother = async context => {
+  console.log('点击了确认按钮', context)
+  await APILoansAdd(addData.value)
+  visible.value = false
+}
+const onCancel = context => {
+  console.log('点击了取消按钮', context)
+}
+const onCloseBtnClick = context => {
+  console.log('点击了关闭按钮', context)
+}
+// 图表
+
+const chartContainer = ref(null)
+let option = {
+  title: {
+    text: '助学贷学生明细表',
+    left: 'center'
+  },
+  tooltip: {
+    trigger: 'item',
+    formatter: '助学贷学生：{b}<br/>申请助学贷款：{c}人'
+  },
+  legend: {
+    left: 'left'
+  },
+  xAxis: {
+    type: 'category',
+    name: 'x',
+    splitLine: { show: false },
+    data: [
+      '1月',
+      '2月',
+      '3月',
+      '4月',
+      '5月',
+      '6月',
+      '7月',
+      '8月',
+      '9月',
+      '10月',
+      '11月',
+      '12月'
+    ]
+  },
+  grid: {
+    left: '0%',
+    right: '0%',
+    bottom: '0%',
+    containLabel: true
+  },
+  yAxis: {
+    type: 'log',
+    name: 'y',
+    minorSplitLine: {
+      show: true
+    }
+  },
+  series: [
+    {
+      name: '今年',
+      type: 'line',
+      data: [10, 3, 9, 27, 81, 247, 74, 80, 70, 30, 40, 50]
+    },
+    {
+      name: '去年',
+      type: 'line',
+      data: [12, 2, 4, 8, 16, 32, 64, 128, 25, 51, 50, 100]
+    }
+  ]
+}
+const eoption = option => {
+  const chart = echarts.init(chartContainer.value)
+  chart.setOption(option)
+}
+onMounted(() => {
+  eoption(option)
+})
+
+// 选择框
+const handleChange = value => {
+  if (value === '年') {
+    let option = {
+      title: {
+        text: '助学贷学生明细表',
+        left: 'center'
+      },
+      tooltip: {
+        trigger: 'item',
+        formatter: '助学贷学生：{b}<br/>申请助学贷款：{c}人'
+      },
+      legend: {
+        left: 'left'
+      },
+      xAxis: {
+        type: 'category',
+        name: 'x',
+        splitLine: { show: false },
+        data: [
+          '1月',
+          '2月',
+          '3月',
+          '4月',
+          '5月',
+          '6月',
+          '7月',
+          '8月',
+          '9月',
+          '10月',
+          '11月',
+          '12月'
+        ]
+      },
+      grid: {
+        left: '0%',
+        right: '0%',
+        bottom: '0%',
+        containLabel: true
+      },
+      yAxis: {
+        type: 'log',
+        name: 'y',
+        minorSplitLine: {
+          show: true
+        }
+      },
+      series: [
+        {
+          name: '今年',
+          type: 'line',
+          data: [10, 3, 9, 27, 81, 247, 74, 80, 70, 30, 40, 50]
+        },
+        {
+          name: '去年',
+          type: 'line',
+          data: [12, 2, 4, 8, 16, 32, 64, 128, 25, 51, 50, 100]
+        }
+      ]
+    }
+    eoption(option)
+  } else if (value === '部门') {
+    let option1 = {
+      title: {
+        text: '助学贷学生明细表',
+        left: 'center'
+      },
+      tooltip: {
+        trigger: 'item',
+        formatter: '助学贷学生：{b}<br/>申请助学贷款：{c}人'
+      },
+      legend: {
+        left: 'left'
+      },
+      xAxis: {
+        type: 'category',
+        name: 'x',
+        splitLine: { show: false },
+        data: ['机电工程系', '护理系', '建筑系', '人文系', '社会系']
+      },
+      grid: {
+        left: '0%',
+        right: '0%',
+        bottom: '0%',
+        containLabel: true
+      },
+      yAxis: {
+        type: 'log',
+        name: 'y',
+        minorSplitLine: {
+          show: true
+        }
+      },
+      series: [
+        {
+          name: '今年',
+          type: 'line',
+          data: [74, 80, 70, 30, 40, 50]
+        },
+        {
+          name: '去年',
+          type: 'line',
+          data: [64, 128, 25, 51, 50, 100]
+        }
+      ]
+    }
+    eoption(option1)
+  }
+}
+
+onMounted(() => {
+  LoansList()
+})
+</script>
+
+<style lang="less" scoped>
+.search-form {
+  margin-bottom: 1.5rem;
+  background-color: #fff;
+  height: 4rem;
+  padding-top: 1rem;
+}
+</style>
diff --git a/src/router/modules/receivablesManagement.js b/src/router/modules/receivablesManagement.js
index 6339314..1b84c36 100644
--- a/src/router/modules/receivablesManagement.js
+++ b/src/router/modules/receivablesManagement.js
@@ -25,6 +25,12 @@ const ReceivablesManagement = [
         name: "BillBill",
         component: () => import("@/pages/receivables-management/Bill.vue"),
         meta: { title: "票据", hidden: false },
+      },
+      {
+        path: "/student-loan",
+        name: "StudentLoan",
+        component: () => import("@/pages/receivables-management/studentLoan.vue"),
+        meta: { title: "助学贷款", },
       }
     ],
   },

From f71bc805665c0b7edade083f735ef5a678c07975 Mon Sep 17 00:00:00 2001
From: ycy <2861518472@qq.com>
Date: Tue, 9 Apr 2024 13:34:49 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/modules/ycy.js                           |  26 +-
 public/favicon.ico                            | Bin 4286 -> 0 bytes
 .../finance-bill-manage/detailReportList.js   |   7 +
 src/layout/components/LayoutAside.vue         |   3 +
 .../finance-bill-manage/billBreakage.vue      |   1 +
 src/pages/finance-bill-manage/billStock.vue   |  21 +-
 .../finance-bill-manage/detailReport.vue      | 227 ++++++++++++++++++
 src/router/modules/financeBillManage.js       |   9 +
 8 files changed, 276 insertions(+), 18 deletions(-)
 delete mode 100644 public/favicon.ico
 create mode 100644 src/api/finance-bill-manage/detailReportList.js
 create mode 100644 src/pages/finance-bill-manage/detailReport.vue

diff --git a/mock/modules/ycy.js b/mock/modules/ycy.js
index 69091dd..94304eb 100644
--- a/mock/modules/ycy.js
+++ b/mock/modules/ycy.js
@@ -8,7 +8,6 @@ const StockList = Mock.mock({
       billserial: "@integer(100000000,199999999)1",
       billType: "@integer(0,4)",
       stockNum: "@integer(1,2)",
-      unit: "@cword(张本,1)",
       stockDate: "@date",
       operator: "@cname",
       remark: " @integer(10000000000,19999999999)",
@@ -182,6 +181,21 @@ const breakageList = Mock.mock({
     },
   ],
 });
+//
+const detailReportList = Mock.mock({
+  "list|5": [
+    {
+      "id|+1": 0,
+      branch: "@cname",
+      stockNum: "@integer(1,20)张",
+      cancelNum: "@integer(0,20)张",
+      receiveNum: "@integer(0,20)张",
+      breakNum: "@integer(0,20)张",
+      destoryNum: "@integer(0,20)张",
+      grossBillRatio: "25%",
+    },
+  ],
+});
 
 export default [
   {
@@ -252,4 +266,14 @@ export default [
       };
     },
   },
+  {
+    url: "/api/detailReportList",
+    method: "get",
+    response: () => {
+      return {
+        code: 200,
+        data: detailReportList,
+      };
+    },
+  },
 ];
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index df36fcfb72584e00488330b560ebcf34a41c64c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

diff --git a/src/api/finance-bill-manage/detailReportList.js b/src/api/finance-bill-manage/detailReportList.js
new file mode 100644
index 0000000..82162bf
--- /dev/null
+++ b/src/api/finance-bill-manage/detailReportList.js
@@ -0,0 +1,7 @@
+import request from "@/utils/requestMock";
+
+const API = {
+  DETAILREPORT_LIST: "/detailReportList",
+};
+
+export const reqDetailReportList = () => request.get(API.DETAILREPORT_LIST);
diff --git a/src/layout/components/LayoutAside.vue b/src/layout/components/LayoutAside.vue
index 7647ca5..6803ec6 100644
--- a/src/layout/components/LayoutAside.vue
+++ b/src/layout/components/LayoutAside.vue
@@ -31,6 +31,9 @@
         <t-menu-item value="2-6" to="/Bill/BillDestroy">
           <span>票据核销</span>
         </t-menu-item>
+        <t-menu-item value="2-7" to="/Bill/DetailReport">
+          <span>报表明细</span>
+        </t-menu-item>
       </t-submenu>
       <t-submenu value="3" title="应收款管理">
         <template #icon>
diff --git a/src/pages/finance-bill-manage/billBreakage.vue b/src/pages/finance-bill-manage/billBreakage.vue
index 38f6784..1a1771e 100644
--- a/src/pages/finance-bill-manage/billBreakage.vue
+++ b/src/pages/finance-bill-manage/billBreakage.vue
@@ -174,6 +174,7 @@
                 <t-input
                   v-model="dialogData.billserial"
                   placeholder="请输入票据编号"
+                  maxlength="10"
                 ></t-input>
               </t-form-item>
               <t-form-item
diff --git a/src/pages/finance-bill-manage/billStock.vue b/src/pages/finance-bill-manage/billStock.vue
index c9593bb..9b86ff4 100644
--- a/src/pages/finance-bill-manage/billStock.vue
+++ b/src/pages/finance-bill-manage/billStock.vue
@@ -75,6 +75,9 @@
           class="table"
           :max-height="550"
         >
+          <template #stockNum="{ row }">
+            {{ `${row.stockNum}张` }}
+          </template>
           <template #billType="{ row }">
             <div v-for="item in billType" :key="item">
               <span v-if="row.billType === item.value">{{ item.label }}</span>
@@ -134,6 +137,7 @@
                 <t-input
                   v-model="dialogData.billserial"
                   placeholder="请输入票据编号"
+                  maxlength="10"
                 ></t-input>
               </t-form-item>
               <t-form-item
@@ -167,17 +171,6 @@
                   placeholder="请输入入库数量"
                 ></t-input>
               </t-form-item>
-              <t-form-item
-                label="入库单位"
-                name="unit"
-                :span="10"
-                style="margin-bottom: 0.5rem"
-              >
-                <t-input
-                  v-model="dialogData.unit"
-                  placeholder="请输入入库单位"
-                ></t-input>
-              </t-form-item>
               <t-form-item
                 label="入库时间"
                 name="stockDate"
@@ -260,12 +253,6 @@ const columns = ref([
     align: "center",
     width: "100",
   },
-  {
-    colKey: "unit",
-    title: "单位（如：本、张）",
-    align: "center",
-    width: "100",
-  },
   {
     colKey: "stockDate",
     title: "入库日期",
diff --git a/src/pages/finance-bill-manage/detailReport.vue b/src/pages/finance-bill-manage/detailReport.vue
new file mode 100644
index 0000000..e25e79e
--- /dev/null
+++ b/src/pages/finance-bill-manage/detailReport.vue
@@ -0,0 +1,227 @@
+<template>
+  <div class="back-color" style="overflow-y: hidden">
+    <t-layout style="height: 100%; background-color: #f5f7fb">
+      <t-header class="scarch-box">
+        <t-form
+          ref="form"
+          :data="scarchData"
+          label-width="calc(2em + 40px)"
+          layout="inline"
+          scroll-to-first-error="smooth"
+          class="scarch-from"
+          @reset="resetting"
+          @submit="headerQuery"
+        >
+          <div style="margin-left: 1rem">
+            <t-form-item label="部门:" name="branch">
+              <t-input v-model="scarchData.branch"></t-input>
+            </t-form-item>
+          </div>
+          <t-form-item style="margin-right: 1rem">
+            <t-button theme="primary" type="submit">查询</t-button>
+            <t-button theme="primary" type="reset">重置</t-button>
+          </t-form-item>
+        </t-form>
+      </t-header>
+      <t-content class="table-box">
+        <div class="table-header">
+          <div>
+            <h4 style="font-size: 110%">报表明细</h4>
+          </div>
+          <div>
+            <t-button
+              shape="circle"
+              theme="primary"
+              @click="refresh"
+              style="margin-left: 0.8rem"
+            >
+              <template #icon><load-icon /></template>
+            </t-button>
+          </div>
+        </div>
+        <t-base-table
+          hover
+          row-key="index"
+          :loading="loading"
+          :data="tableData"
+          :columns="columns"
+          :pagination="pagination"
+          class="table"
+          :max-height="550"
+        >
+          <template #quitneckNum="{ row }">
+            {{ `${row.quitneckNum}张` }}
+          </template>
+        </t-base-table>
+      </t-content>
+    </t-layout>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from "vue";
+import { MessagePlugin } from "tdesign-vue-next";
+import { LoadIcon } from "tdesign-icons-vue-next";
+import { reqDetailReportList } from "@/api/finance-bill-manage/detailReportList";
+
+const tableData = ref([]);
+const dataList = ref([]);
+const loading = ref(false);
+const columns = ref([
+  {
+    colKey: "serial-number",
+    title: "序号",
+    width: 50,
+  },
+  {
+    colKey: "branch",
+    title: "部门",
+    align: "center",
+    width: 100,
+  },
+  {
+    colKey: "stockNum",
+    title: "入库量",
+    align: "center",
+    width: 100,
+  },
+  {
+    colKey: "cancelNum",
+    title: "退库量",
+    align: "center",
+    width: 100,
+  },
+  {
+    colKey: "receiveNum",
+    title: "领用量",
+    align: "center",
+    width: 100,
+  },
+  {
+    colKey: "breakNum",
+    title: "报损量",
+    align: "center",
+    width: 100,
+  },
+  {
+    colKey: "destoryNum",
+    title: "核销量",
+    align: "center",
+    width: 100,
+  },
+  {
+    colKey: "grossBillRatio",
+    title: "总票据比例",
+    ellipsis: true,
+    align: "center",
+    width: 100,
+  },
+]);
+
+// 查询表单
+const scarchData = ref({});
+
+// 分页
+const pagination = ref({
+  defaultCurrent: 1,
+  defaultPageSize: 10,
+  total: 50,
+});
+
+// 获取票据列表
+const tableList = async () => {
+  loading.value = true;
+  const { data } = await reqDetailReportList();
+  tableData.value = data.list;
+  dataList.value = data.list;
+  pagination.value.total = tableData.value.length;
+  const timerId = setTimeout(() => {
+    loading.value = false;
+    clearInterval(timerId);
+  }, 300);
+};
+
+// 查询
+const headerQuery = () => {
+  tableData.value = dataList.value;
+  if (scarchData.value.branch === "") {
+    tableData.value = data.value;
+    pagination.value.total = tableData.value.length;
+  } else {
+    const list = tableData.value.filter((item) => {
+      let arrList;
+      if (scarchData.value.branch === item.branch) {
+        arrList = item;
+      }
+      return arrList;
+    });
+    tableData.value = list;
+    pagination.value.total = list.length;
+  }
+};
+// 查询表单重置
+const resetting = () => {
+  scarchData.value = {
+    branch: "",
+  };
+  tableData.value = dataList.value;
+  pagination.value.total = tableData.value.length;
+};
+// 刷新列表
+const refresh = () => {
+  tableList();
+};
+onMounted(() => {
+  tableList();
+});
+</script>
+
+<style scoped lang="less">
+.asideTree {
+  margin-right: 2rem;
+  display: flex;
+  justify-content: center;
+  padding: 1rem;
+}
+.scarch-box {
+  width: 100%;
+  background-color: @base-white-color;
+  margin-bottom: 2rem;
+  .scarch-from {
+    height: 60px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+}
+.table-box {
+  height: 41rem;
+  background-color: @base-white-color;
+  padding: 1rem;
+  padding-top: 0;
+  .table-header {
+    height: 3rem;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+}
+.layoutPage {
+  height: 100%;
+  background-color: #fff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  span {
+    font-size: 20px;
+    font-weight: 800;
+    color: #191919;
+  }
+}
+:deep(.t-tree--transition .t-tree__label) {
+  width: 10rem;
+}
+:deep(.t-form__controls-content) {
+  justify-content: space-between;
+}
+</style>
diff --git a/src/router/modules/financeBillManage.js b/src/router/modules/financeBillManage.js
index 9da78d7..642f93f 100644
--- a/src/router/modules/financeBillManage.js
+++ b/src/router/modules/financeBillManage.js
@@ -5,6 +5,7 @@ import BillReceiptURL from "@/pages/finance-bill-manage/billReceipt.vue";
 import BillQuitneckURL from "@/pages/finance-bill-manage/billQuitneck.vue";
 import BillBreakagekURL from "@/pages/finance-bill-manage/billBreakage.vue";
 import BillDestroyURL from "@/pages/finance-bill-manage/billDestroy.vue";
+import DetailReportURL from "@/pages/finance-bill-manage/detailReport.vue";
 
 const financeBillManage = [
   {
@@ -61,6 +62,14 @@ const financeBillManage = [
           title: "票据核销",
         },
       },
+      {
+        path: "DetailReport",
+        name: "detailReport",
+        component: DetailReportURL,
+        meta: {
+          title: "报表明细",
+        },
+      },
     ],
   },
 ];

From 13fd2c21fd9ad608d106f4eaaf23a2186595fa22 Mon Sep 17 00:00:00 2001
From: sundongyu <2811054731@qq.com>
Date: Tue, 9 Apr 2024 16:40:06 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E2=9C=A8=20feat:=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=BA=86=E5=87=8F=E5=85=8D=E8=B4=B9=E7=94=A8=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/LayoutAside.vue         |   3 +
 .../receivables-management/billCollected.vue  |  18 +-
 src/pages/receivables-management/daily.vue    |   7 +
 .../receivables-management/waiverForm.vue     | 257 ++++++++++++++++++
 src/router/modules/receivablesManagement.js   |  12 +
 5 files changed, 295 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/receivables-management/daily.vue
 create mode 100644 src/pages/receivables-management/waiverForm.vue

diff --git a/src/layout/components/LayoutAside.vue b/src/layout/components/LayoutAside.vue
index 133932b..faf4f0d 100644
--- a/src/layout/components/LayoutAside.vue
+++ b/src/layout/components/LayoutAside.vue
@@ -45,6 +45,9 @@
         <t-menu-item value="3-3" to="/student-loan">
           <span>助学贷款</span>
         </t-menu-item>
+        <t-menu-item value="3-4" to="/daily">
+          <span>收费日报</span>
+        </t-menu-item>
       </t-submenu>
       <t-submenu value="4" title="学生管理">
         <template #icon>
diff --git a/src/pages/receivables-management/billCollected.vue b/src/pages/receivables-management/billCollected.vue
index df23924..c02a631 100644
--- a/src/pages/receivables-management/billCollected.vue
+++ b/src/pages/receivables-management/billCollected.vue
@@ -14,6 +14,9 @@
           <t-button theme="default" variant="text" @click="handleEdit(row)"
             >填写电子票据</t-button
           >
+          <t-button theme="default" variant="text" @click="waivarForm(row)"
+            >申请为减免学生</t-button
+          >
         </template>
       </t-table>
     </div>
@@ -170,6 +173,7 @@ const editableCellState = cellParams => {
   return row.status !== 2
 }
 const tableRef = ref()
+//收费表格
 const columns = computed(() => [
   {
     title: '学生姓名',
@@ -289,12 +293,22 @@ const columns = computed(() => [
   },
   {
     title: '操作',
-    colKey: 'operation'
+    width: 300,
+    colKey: 'operation',
+    align: 'center'
   }
 ])
+// 发票
 const handleEdit = row => {
   router.push({
-    path: 'bill-bill',
+    path: '/bill-bill',
+    query: row
+  })
+}
+// 申请为减免学生
+const waivarForm = row => {
+  router.push({
+    path: '/waivar-form',
     query: row
   })
 }
diff --git a/src/pages/receivables-management/daily.vue b/src/pages/receivables-management/daily.vue
new file mode 100644
index 0000000..6ac5ab5
--- /dev/null
+++ b/src/pages/receivables-management/daily.vue
@@ -0,0 +1,7 @@
+<template>
+  <div>1</div>
+</template>
+
+<script setup></script>
+
+<style lang="less" scoped></style>
diff --git a/src/pages/receivables-management/waiverForm.vue b/src/pages/receivables-management/waiverForm.vue
new file mode 100644
index 0000000..374a172
--- /dev/null
+++ b/src/pages/receivables-management/waiverForm.vue
@@ -0,0 +1,257 @@
+<template>
+  <div class="back-color">
+    <div style="border: 2px solid; width: 640px">
+      <div class="proposer">
+        <div class="left">申请人情况</div>
+        <div class="right">
+          <div class="up">
+            <div class="up">
+              <div>
+                学号<span
+                  ><input v-model="data.studentId" class="span" type="text"
+                /></span>
+              </div>
+              <div>
+                姓名<span
+                  ><input v-model="data.studentName" class="span" type="text"
+                /></span>
+              </div>
+              <div>
+                性别<span
+                  ><input v-model="data.studentSex" class="span" type="text"
+                /></span>
+              </div>
+              <div>
+                出身年月<span
+                  ><input
+                    v-model="data.studentBirthday"
+                    class="span"
+                    type="text"
+                /></span>
+              </div>
+            </div>
+            <div class="down">
+              <div>
+                专业<span
+                  ><input v-model="data.studentMajor" class="span" type="text"
+                /></span>
+              </div>
+              <div>
+                班级<span
+                  ><input v-model="data.studentClass" class="span" type="text"
+                /></span>
+              </div>
+              <div>
+                证号<span
+                  ><input v-model="data.studentCard" class="span" type="text"
+                /></span>
+              </div>
+              <div>
+                身份证号<span
+                  ><input v-model="data.studentIdCard" class="span" type="text"
+                /></span>
+              </div>
+            </div>
+          </div>
+          <div class="below">
+            <div>
+              家庭住址
+              <span
+                ><input v-model="data.studentAddress" class="span1" type="text"
+              /></span>
+            </div>
+            <div>
+              邮政编码
+              <span
+                ><input v-model="data.studentZip" class="span1" type="text"
+              /></span>
+            </div>
+            <div>
+              联系电话
+              <span
+                ><input v-model="data.studentPhone" class="span1" type="text"
+              /></span>
+            </div>
+            <div>
+              年缴学费
+              <span
+                ><input v-model="data.studentFee" class="span1" type="text"
+              /></span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="family">
+        <div>
+          <div class="family" style="border: 0.5px solid">家庭情况</div>
+        </div>
+        <div>
+          <div style="border: 0.5px solid">1</div>
+        </div>
+      </div>
+      <div class="allowance">
+        <div>
+          <div class="allowance" style="border: 0.5px solid">减免申请</div>
+        </div>
+        <div>
+          <div>2</div>
+        </div>
+      </div>
+      <div class="counselor">
+        <div>
+          <div class="counselor" style="border: 0.5px solid">辅导员意见</div>
+        </div>
+        <div>
+          <div>3</div>
+        </div>
+      </div>
+      <div class="production">
+        <div>
+          <div class="production" style="border: 0.5px solid">学工部意见</div>
+        </div>
+        <div>
+          <div>1</div>
+        </div>
+      </div>
+      <div class="competent">
+        <div>
+          <div class="competent" style="border: 0.5px solid">
+            主管院长审批意见
+          </div>
+        </div>
+        <div>
+          <div>4</div>
+        </div>
+      </div>
+      <div class="standby">
+        <div style="border: 0.5px solid">备注</div>
+      </div>
+    </div>
+    <div style="display: flex; justify-content: flex-end; margin-top: 1rem">
+      <t-button theme="default" variant="text" @click="handleClick"
+        >填写完毕立刻生低档</t-button
+      >
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
+const Router = useRouter()
+const data = ref({
+  // 申请人学号
+  studentId: '',
+  // 申请人姓名
+  studentName: '',
+  // 申请人性别
+  studentSex: '',
+  // 申请人出身年月
+  studentBirthday: '',
+  // 申请人专业
+  studentMajor: '',
+  // 申请人班级
+  studentClass: '',
+  // 申请人证号
+  studentCard: '',
+  // 申请人身份证号
+  studentIdCard: '',
+  // 申请人家庭住址
+  studentAddress: '',
+  // 申请人邮政编码
+  studentZip: '',
+  // 申请人联系电话
+  studentPhone: '',
+  // 申请人年缴学费
+  studentFee: '',
+  // 判断标识
+  routers: '1'
+})
+const handleClick = () => {
+  Router.push({
+    path: '/billCollected'
+  })
+}
+</script>
+
+<style lang="less" scoped>
+.proposer {
+  display: flex;
+  height: 4.5rem;
+  width: 100%;
+  .left {
+    border: 0.5px solid;
+    width: 3rem;
+    height: 4.5rem;
+    padding-top: 1rem;
+  }
+  .right {
+    .up {
+      .up {
+        display: flex;
+        justify-content: space-between;
+      }
+      .down {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+    .below {
+      display: flex;
+      .jia {
+        width: 8rem;
+        height: 2rem;
+      }
+      .bian {
+        width: 3rem;
+        height: 1.5srem;
+      }
+      .hua {
+        width: 2rem;
+        height: 1.5rem;
+      }
+      .nian {
+        width: 2rem;
+        height: 1.5rem;
+      }
+    }
+  }
+}
+.family {
+  height: 10rem;
+  display: flex;
+  width: 3rem;
+}
+.allowance {
+  height: 10rem;
+  display: flex;
+  width: 3rem;
+}
+.counselor {
+  height: 10rem;
+  display: flex;
+  width: 3rem;
+}
+.production {
+  height: 10rem;
+  display: flex;
+  width: 3rem;
+}
+.competent {
+  height: 10rem;
+  display: flex;
+  width: 3rem;
+}
+.span {
+  width: 7rem;
+  height: 1.5rem;
+}
+.span1 {
+  width: 5rem;
+  height: 1.5rem;
+}
+input {
+  border-style: none;
+  background-color: #f5f7fb;
+}
+</style>
diff --git a/src/router/modules/receivablesManagement.js b/src/router/modules/receivablesManagement.js
index 1b84c36..2f199e8 100644
--- a/src/router/modules/receivablesManagement.js
+++ b/src/router/modules/receivablesManagement.js
@@ -31,6 +31,18 @@ const ReceivablesManagement = [
         name: "StudentLoan",
         component: () => import("@/pages/receivables-management/studentLoan.vue"),
         meta: { title: "助学贷款", },
+      },
+      {
+        path: "/waivar-form",
+        name: "WaivarForm",
+        component: () => import("@/pages/receivables-management/waiverForm.vue"),
+        meta: { title: "学生减免单", hidden: false },
+      },
+      {
+        path: "/daily",
+        name: "Daily",
+        component: () => import("@/pages/receivables-management/daily.vue"),
+        meta: { title: "收费日报", },
       }
     ],
   },

From abac43466f122f17d3954d794b5c5f120289adad Mon Sep 17 00:00:00 2001
From: ycy <2861518472@qq.com>
Date: Tue, 9 Apr 2024 16:40:21 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E2=9C=A8=20feat:=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=8C=E6=88=90=20=E5=B0=81=E8=A3=85echart?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/echarts/bar.vue           |  83 +++++++++++++++++
 src/components/echarts/line.vue          | 114 +++++++++++++++++++++++
 src/components/echarts/pie.vue           |  81 ++++++++++++++++
 src/pages/home/components/homeCenter.vue |  91 ++++++++++++++++++
 src/pages/home/components/homeFooter.vue |  40 ++++++++
 src/pages/home/components/homeHeader.vue |  90 ++++++++++++++++++
 src/pages/home/index.vue                 |  40 +++++++-
 7 files changed, 536 insertions(+), 3 deletions(-)
 create mode 100644 src/components/echarts/bar.vue
 create mode 100644 src/components/echarts/line.vue
 create mode 100644 src/components/echarts/pie.vue
 create mode 100644 src/pages/home/components/homeCenter.vue
 create mode 100644 src/pages/home/components/homeFooter.vue
 create mode 100644 src/pages/home/components/homeHeader.vue

diff --git a/src/components/echarts/bar.vue b/src/components/echarts/bar.vue
new file mode 100644
index 0000000..b4a916b
--- /dev/null
+++ b/src/components/echarts/bar.vue
@@ -0,0 +1,83 @@
+<template>
+  <div style="height: 100%">
+    <div ref="barChartRef" :style="{ width: width, height: height }"></div>
+  </div>
+</template>
+
+<script setup>
+import * as echarts from "echarts";
+import { onMounted, ref } from "vue";
+
+// 定义图表容器引用
+const barChartRef = ref(null);
+
+const { categories, seriesData, title, legendList } = defineProps({
+  categories: {
+    type: Array,
+    required: true,
+  },
+  seriesData: {
+    type: Array,
+    required: true,
+  },
+  title: {
+    type: String,
+    required: true,
+  },
+  legendList: {
+    type: Array,
+    required: true,
+  },
+  width: {
+    type: String,
+    default: "100%",
+  },
+  height: {
+    type: String,
+    default: "100%",
+  },
+});
+
+// 配置图表数据和选项
+const option = {
+  title: {
+    text: title,
+    left: "center",
+    top: "10",
+  },
+  tooltip: {
+    trigger: "axis",
+    axisPointer: {
+      type: "shadow",
+    },
+  },
+  legend: {
+    data: legendList, // 根据实际需求替换为对应系列名称
+    bottom: "10",
+  },
+  xAxis: {
+    type: "category",
+    data: categories,
+  },
+  yAxis: {
+    type: "value",
+  },
+  series: seriesData,
+};
+
+// 在组件挂载后初始化ECharts实例并设置选项
+onMounted(() => {
+  const barChartContainer = barChartRef.value;
+  if (barChartContainer) {
+    const myChart = echarts.init(barChartContainer);
+    myChart.setOption(option);
+
+    // 添加窗口resize事件监听，自动调整图表大小
+    window.addEventListener("resize", () => {
+      myChart.resize();
+    });
+  }
+});
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/components/echarts/line.vue b/src/components/echarts/line.vue
new file mode 100644
index 0000000..4875089
--- /dev/null
+++ b/src/components/echarts/line.vue
@@ -0,0 +1,114 @@
+<template>
+  <div style="height: 100%">
+    <div ref="lineChartRef" :style="{ width: width, height: height }">
+      111111
+    </div>
+  </div>
+</template>
+
+<script setup>
+import * as echarts from "echarts";
+import { onMounted, ref } from "vue";
+
+// 定义图表容器引用
+const lineChartRef = ref(null);
+
+const { categories, seriesData, titleP, legendList } = defineProps({
+  categories: {
+    type: Array,
+    required: true,
+  },
+  seriesData: {
+    type: Array,
+    required: true,
+  },
+  titleP: {
+    type: String,
+    default: "示例折线图",
+  },
+  legendList: {
+    type: Array,
+    required: true,
+  },
+  width: {
+    type: String,
+    default: "100%",
+  },
+  height: {
+    type: String,
+    default: "100%",
+  },
+});
+
+// 配置图表数据和选项
+const option = {
+  title: {
+    text: titleP,
+    left: "center",
+    top: "2",
+  },
+  tooltip: {
+    trigger: "axis",
+    axisPointer: {
+      type: "cross",
+      label: {
+        backgroundColor: "#6a7985",
+      },
+    },
+  },
+  legend: {
+    data: legendList,
+    bottom: 0,
+  },
+  grid: {
+    left: "3%",
+    right: "3%",
+    bottom: "9%",
+    containLabel: true,
+  },
+  xAxis: {
+    type: "category",
+    boundaryGap: false,
+    data: categories,
+    axisTick: {
+      alignWithLabel: true,
+    },
+  },
+  yAxis: {
+    type: "value",
+    splitLine: {
+      lineStyle: {
+        type: "dashed",
+      },
+    },
+  },
+  series: seriesData.map((serie, index) => ({
+    ...serie,
+    lineStyle: {
+      width: 2,
+    },
+    smooth: true,
+    itemStyle: {
+      color: `rgba(${Math.random() * 255}, ${Math.random() * 255}, ${
+        Math.random() * 255
+      }, 0.8)`,
+    },
+  })),
+};
+
+// 在组件挂载后初始化ECharts实例并设置选项
+onMounted(() => {
+  const lineChartContainer = lineChartRef.value;
+  if (lineChartContainer) {
+    const myChart = echarts.init(lineChartContainer);
+    myChart.setOption(option);
+
+    // 添加窗口resize事件监听，自动调整图表大小
+    window.addEventListener("resize", () => {
+      myChart.resize();
+    });
+  }
+});
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..a34ecbb
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,81 @@
+<template>
+  <div>
+    <div ref="pieChartRef" :style="{ width: width, height: height }"></div>
+  </div>
+</template>
+
+<script setup>
+import * as echarts from "echarts";
+import { onMounted, ref } from "vue";
+
+// 定义图表容器引用
+const pieChartRef = ref(null);
+
+const { titleP, dataP } = defineProps({
+  dataP: {
+    type: Array,
+    default: () => [],
+  },
+  titleP: {
+    type: String,
+    default: "",
+  },
+  width: {
+    type: String,
+    default: "100%",
+  },
+  height: {
+    type: String,
+    default: "100%",
+  },
+});
+
+// 配置图表数据和选项
+const option = {
+  title: {
+    text: titleP,
+    left: "center",
+  },
+  tooltip: {
+    trigger: "item",
+    formatter: "{a} <br/>{b}: {c} ({d}%)",
+  },
+  legend: {
+    orient: "vertical",
+    left: "0",
+    top: "50",
+  },
+  series: [
+    {
+      name: "访问来源",
+      type: "pie",
+      radius: "50%",
+      left: "50",
+      data: dataP,
+      emphasis: {
+        itemStyle: {
+          shadowBlur: 10,
+          shadowOffsetX: 0,
+          shadowColor: "rgba(0, 0, 0, 0.5)",
+        },
+      },
+    },
+  ],
+};
+
+// 在组件挂载后初始化ECharts实例并设置选项
+onMounted(() => {
+  const pieChartContainer = pieChartRef.value;
+  if (pieChartContainer) {
+    const myChart = echarts.init(pieChartContainer);
+    myChart.setOption(option);
+
+    // 添加窗口resize事件监听，自动调整图表大小
+    window.addEventListener("resize", () => {
+      myChart.resize();
+    });
+  }
+});
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/pages/home/components/homeCenter.vue b/src/pages/home/components/homeCenter.vue
new file mode 100644
index 0000000..71e32ab
--- /dev/null
+++ b/src/pages/home/components/homeCenter.vue
@@ -0,0 +1,91 @@
+<template>
+  <div class="centerC">
+    <div class="center-pie">
+      <pie :titleP="title" :dataP="data" :height="'15rem'" :width="'40rem'" />
+    </div>
+    <div class="center-bar">
+      <bar
+        :categories="categories"
+        :seriesData="seriesData"
+        :title="titlebar"
+        :legendList="legendList"
+        :height="'100%'"
+        :width="'52rem'"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import pie from "@/components/echarts/pie.vue";
+import bar from "@/components/echarts/bar.vue";
+
+const title = ref("一天的开心程度");
+const titlebar = ref("销售额");
+const data = ref([
+  { value: 50, name: "上午" },
+  { value: 50, name: "下午" },
+  { value: 100, name: "晚上" },
+  { value: 200, name: "睡觉" },
+]);
+
+const categories = ref([
+  "一月",
+  "二月",
+  "三月",
+  "四月",
+  "五月",
+  "六月",
+  "七月",
+  "八月",
+  "九月",
+  "十月",
+  "十一月",
+  "十二月",
+]);
+const legendList = ["类别A", "类别B", "类别C"];
+const seriesData = ref([
+  {
+    name: "类别A",
+    type: "bar",
+    data: [
+      1000, 1200, 1400, 1500, 1600, 1800, 1700, 1900, 2000, 2200, 2300, 2500,
+    ],
+  },
+  {
+    name: "类别B",
+    type: "bar",
+    data: [200, 400, 1000, 500, 700, 800, 1000, 1100, 1150, 1200, 1300, 1400],
+  },
+  {
+    name: "类别C",
+    type: "bar",
+    data: [
+      800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900,
+    ],
+  },
+]);
+</script>
+
+<style lang="less" scoped>
+.centerC {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+  .center-pie {
+    width: 49%;
+    height: 100%;
+    background-color: #fff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .center-bar {
+    width: 49%;
+    height: 100%;
+    background-color: #fff;
+  }
+}
+</style>
diff --git a/src/pages/home/components/homeFooter.vue b/src/pages/home/components/homeFooter.vue
new file mode 100644
index 0000000..7c05996
--- /dev/null
+++ b/src/pages/home/components/homeFooter.vue
@@ -0,0 +1,40 @@
+<template>
+  <div class="linebox">
+    <line-chart
+      :categories="categories"
+      :seriesData="seriesData"
+      :titleP="title"
+      :legendList="legendList"
+      :height="'100%'"
+      :width="'100rem'"
+    />
+  </div>
+</template>
+
+<script setup>
+import lineChart from "@/components/echarts/line.vue";
+import { ref } from "vue";
+
+const title = ref("折线图");
+const categories = ref(["Jan", "Feb", "Mar", "Apr", "May", "Jun"]);
+const legendList = ref(["series1", "series2"]);
+const seriesData = ref([
+  {
+    name: "series1",
+    data: [10, 20, 15, 20, 25, 30],
+    type: "line",
+  }, // 第一个系列的数据
+  {
+    name: "series2",
+    data: [15, 22, 18, 28, 25, 32],
+    type: "line",
+  }, // 第二个系列的数据
+]);
+</script>
+
+<style lang="less" scoped>
+.linebox {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/pages/home/components/homeHeader.vue b/src/pages/home/components/homeHeader.vue
new file mode 100644
index 0000000..acb7bf9
--- /dev/null
+++ b/src/pages/home/components/homeHeader.vue
@@ -0,0 +1,90 @@
+<template>
+  <div class="headerC">
+    <div class="header_box" v-for="(item, index) in homeTitle" :key="index">
+      <div class="header_box">
+        <div class="header_icon">
+          <t-icon :name="item.icon" class="icon" />
+        </div>
+        <div class="content">
+          <div class="title">{{ item.title }}</div>
+          <div class="num">{{ item.num }}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from "vue";
+const homeTitle = ref([
+  {
+    title: "今日发票数",
+    num: "23张",
+    icon: "face-retouching",
+  },
+  {
+    title: "今日学生投诉数",
+    num: "555555",
+    icon: "crooked-smile",
+  },
+  {
+    title: "今日教的学费",
+    num: "0",
+    icon: "despise",
+  },
+  {
+    title: "今日赔偿费",
+    num: "5000,0000,0000",
+    icon: "flip-smiling-face",
+  },
+  {
+    title: "今日彩票中奖数",
+    num: "0",
+    icon: "cat",
+  },
+]);
+</script>
+
+<style lang="less" scoped>
+.headerC {
+  height: 100%;
+  justify-content: space-between;
+  display: flex;
+}
+.header_box {
+  height: 100%;
+  width: 20rem;
+  background-color: #fff;
+  display: flex;
+}
+.header_icon {
+  width: 30%;
+  height: 100%;
+  display: flex;
+  margin-right: 1rem;
+  align-items: center;
+  justify-content: flex-end;
+  .icon {
+    width: 3rem;
+    height: 3rem;
+    color: #366ef4;
+  }
+}
+.content {
+  width: 70%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  .title {
+    font-size: 1.2rem;
+    color: #666;
+    margin-bottom: 0.5rem;
+    font-weight: 600;
+  }
+  .num {
+    color: #85d3ff;
+    font-weight: 600;
+  }
+}
+</style>
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 677f24b..af7b30f 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -1,7 +1,41 @@
 <template>
-  <div></div>
+  <div class="back-color">
+    <t-layout style="height: 100%; background-color: #f5f7fb">
+      <t-header class="header">
+        <home-header />
+      </t-header>
+      <t-content class="content">
+        <home-center />
+      </t-content>
+      <t-content class="footer">
+        <home-footer />
+      </t-content>
+    </t-layout>
+  </div>
 </template>
 
-<script setup></script>
+<script setup>
+import homeHeader from "./components/homeHeader.vue";
+import homeCenter from "./components/homeCenter.vue";
+import homeFooter from "./components/homeFooter.vue";
+</script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped>
+.header {
+  height: 15%;
+  width: 100%;
+  margin-bottom: 1rem;
+  background-color: #f5f7fb;
+}
+.content {
+  height: 15%;
+  width: 100%;
+  margin-bottom: 1rem;
+}
+.footer {
+  height: 15%;
+  width: 100%;
+  background-color: #fff;
+  margin-bottom: 1rem;
+}
+</style>

From 5381a970e6dcbecfb071efc36ec6f7080293b7e0 Mon Sep 17 00:00:00 2001
From: ycy <2861518472@qq.com>
Date: Tue, 9 Apr 2024 16:42:45 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=8C=88=20style:=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/echarts/bar.vue  | 6 ++++++
 src/components/echarts/line.vue | 3 +++
 src/components/echarts/pie.vue  | 1 +
 3 files changed, 10 insertions(+)

diff --git a/src/components/echarts/bar.vue b/src/components/echarts/bar.vue
index b4a916b..7d94e15 100644
--- a/src/components/echarts/bar.vue
+++ b/src/components/echarts/bar.vue
@@ -12,26 +12,32 @@ import { onMounted, ref } from "vue";
 const barChartRef = ref(null);
 
 const { categories, seriesData, title, legendList } = defineProps({
+  // 横坐标
   categories: {
     type: Array,
     required: true,
   },
+  // 纵坐标
   seriesData: {
     type: Array,
     required: true,
   },
+  // 标题
   title: {
     type: String,
     required: true,
   },
+  // 图例
   legendList: {
     type: Array,
     required: true,
   },
+  // 宽度
   width: {
     type: String,
     default: "100%",
   },
+  // 高度
   height: {
     type: String,
     default: "100%",
diff --git a/src/components/echarts/line.vue b/src/components/echarts/line.vue
index 4875089..3e21e69 100644
--- a/src/components/echarts/line.vue
+++ b/src/components/echarts/line.vue
@@ -14,10 +14,12 @@ import { onMounted, ref } from "vue";
 const lineChartRef = ref(null);
 
 const { categories, seriesData, titleP, legendList } = defineProps({
+  // 横坐标
   categories: {
     type: Array,
     required: true,
   },
+  // 纵坐标
   seriesData: {
     type: Array,
     required: true,
@@ -26,6 +28,7 @@ const { categories, seriesData, titleP, legendList } = defineProps({
     type: String,
     default: "示例折线图",
   },
+  // 图例
   legendList: {
     type: Array,
     required: true,
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
index a34ecbb..8343c39 100644
--- a/src/components/echarts/pie.vue
+++ b/src/components/echarts/pie.vue
@@ -12,6 +12,7 @@ import { onMounted, ref } from "vue";
 const pieChartRef = ref(null);
 
 const { titleP, dataP } = defineProps({
+  // 图表数据
   dataP: {
     type: Array,
     default: () => [],

From ae216140dcae830b4ad818903ac19c9cf09f9260 Mon Sep 17 00:00:00 2001
From: ycy <2861518472@qq.com>
Date: Tue, 9 Apr 2024 17:18:01 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E2=9C=A8=20feat:=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 ++
 .../finance-bill-manage/detailReport.vue      | 32 +++++++++++++++++++
 src/utils/excel.js                            | 24 ++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 src/utils/excel.js

diff --git a/package.json b/package.json
index a027f07..beb66d2 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,8 @@
     "axios": "^1.6.8",
     "dayjs": "^1.11.10",
     "echarts": "^5.5.0",
+    "exceljs": "^4.4.0",
+    "file-saver": "^2.0.5",
     "less": "^4.2.0",
     "mockjs": "^1.1.0",
     "pinia": "^2.1.7",
diff --git a/src/pages/finance-bill-manage/detailReport.vue b/src/pages/finance-bill-manage/detailReport.vue
index e25e79e..578b0b7 100644
--- a/src/pages/finance-bill-manage/detailReport.vue
+++ b/src/pages/finance-bill-manage/detailReport.vue
@@ -29,6 +29,9 @@
             <h4 style="font-size: 110%">报表明细</h4>
           </div>
           <div>
+            <t-button theme="primary" size="small" @click="exportExcel">
+              导出报表明细
+            </t-button>
             <t-button
               shape="circle"
               theme="primary"
@@ -63,6 +66,7 @@ import { ref, onMounted } from "vue";
 import { MessagePlugin } from "tdesign-vue-next";
 import { LoadIcon } from "tdesign-icons-vue-next";
 import { reqDetailReportList } from "@/api/finance-bill-manage/detailReportList";
+import { ExcelUtils } from "@/utils/excel";
 
 const tableData = ref([]);
 const dataList = ref([]);
@@ -171,6 +175,34 @@ const resetting = () => {
 const refresh = () => {
   tableList();
 };
+
+// 导出excel
+const exportExcel = () => {
+  const title = "报表明细excel";
+  const titleFile = "报表明细";
+  const columns = [
+    { header: "部门", key: "1", width: 20 },
+    { header: "入库量", key: "2", width: 20 },
+    { header: "退库量", key: "3", width: 20 },
+    { header: "领用量", key: "4", width: 20 },
+    { header: "报损量", key: "5", width: 20 },
+    { header: "核销量", key: "6", width: 20 },
+    { header: "总票据比例", key: "7", width: 20 },
+  ];
+  const addRow = [];
+  tableData.value.forEach((item) => {
+    addRow.push({
+      1: item.branch,
+      2: item.stockNum,
+      3: item.cancelNum,
+      4: item.receiveNum,
+      5: item.breakNum,
+      6: item.destoryNum,
+      7: item.grossBillRatio,
+    });
+  });
+  ExcelUtils(title, titleFile, columns, addRow);
+};
 onMounted(() => {
   tableList();
 });
diff --git a/src/utils/excel.js b/src/utils/excel.js
new file mode 100644
index 0000000..17e7935
--- /dev/null
+++ b/src/utils/excel.js
@@ -0,0 +1,24 @@
+import ExcelJS from "exceljs";
+import saveAs from "file-saver"; // 引入FileSaver.js以使用saveAs函数
+
+const ExcelUtils = (title, titleFile, columns, addRow) => {
+  // 创建一个新的工作簿
+  const workbook = new ExcelJS.Workbook();
+  // 添加一个新的工作表
+  const worksheet = workbook.addWorksheet(title);
+  // 添加表头
+  worksheet.columns = columns;
+  // 添加数据行
+  for (const row of addRow) {
+    worksheet.addRow(row);
+  }
+  // 写入文件并下载
+  workbook.xlsx.writeBuffer().then((buffer) => {
+    const blob = new Blob([buffer], {
+      type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    });
+    saveAs(blob, `${titleFile}.xlsx`);
+  });
+};
+
+export { ExcelUtils };