Merge branch 'dev' of https://gitea.dykj.co/sundongyu/dykj-college-back-office-management-system into dev

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,
+      };
+    },
+  },
 ];

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);

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>

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>

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>

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>

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

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: "入库日期",

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>

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>

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>

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>

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>

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: "报表明细",
+        },
+      },
     ],
   },
 ];