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

mock/modules/sdy.js

@@ -2,7 +2,7 @@ import Mock from "mockjs"
 const data = Mock.mock({
   "list|200": [
     {
-      "id|+1": 1,
+      "id|+1": '1',
       "name": "@cname",
       "studentnumber": "@integer(1000000000,9999999999)",
       "department": `@pick(['机电工程系', '护理分院','建筑系','材料科学与工程系','环境科学与工程系'])`,
@@ -22,5 +22,40 @@ export default [
         data: data
       }
     }
+  },
+  {
+    url: '/post-sdy-managment-find',
+    method: 'post',
+    response: (req) => {
+      if (req.body.name !== '') {
+        return data.list.filter(item => item.name.includes(req.body.name))
+      }
+      else if (req.body.studentnumber !== '') {
+        const studentnumber = Number(req.body.studentnumber)
+        if (!isNaN(studentnumber)) {
+          return data.list.filter(item => item.studentnumber === studentnumber)
+        } else {
+          return {
+            code: 400,
+            message: 'Invalid student number format'
+          }
+        }
+      }
+      else if (req.body.department !== '') {
+        return data.list.filter(item => item.department.includes(req.body.department))
+      }
+      else if (req.body.major !== '') {
+        return data.list.filter(item => item.major.includes(req.body.major))
+      }
+      else if (req.body.grade !== '') {
+        return data.list.filter(item => item.grade.includes(req.body.grade))
+      }
+      else if (req.body.tuition !== '') {
+        return data.list.filter(item => item.tuition.includes(req.body.tuition))
+      }
+      return {
+        code: 200,
+      }
+    }
   }
 ]

src/api/receivables-management/management.js

@@ -3,3 +3,6 @@ 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)
+}

src/pages/finance-bill-manage/billStock.vue

@@ -222,13 +222,14 @@ import { MessagePlugin } from "tdesign-vue-next";
 import { AddIcon, LoadIcon } from "tdesign-icons-vue-next";
 import { reqStockList } from "@/api/stockList";
 import { useStock } from "@/stores/billStock";
-import { number } from "echarts";
 
+// 数据
 const loading = ref(false);
 const visiblePost = ref(false);
 const stockList = useStock();
 const tableData = ref();
 const data = ref();
+// 表格表头
 const columns = ref([
   {
     colKey: "serial-number",
@@ -286,6 +287,7 @@ const columns = ref([
   },
 ]);
 
+// 票据类型
 const billType = ref([
   { label: "票据类型1", value: 0 },
   { label: "票据类型2", value: 1 },
@@ -294,33 +296,48 @@ const billType = ref([
   { label: "票据类型5", value: 4 },
 ]);
 
+// 获取票据列表
 const tableList = async () => {
+  loading.value = true;
   tableData.value = await stockList.getStockList();
   data.value = await stockList.getStockList();
   pagination.value.total = tableData.value.length;
+  const timerId = setTimeout(() => {
+    loading.value = false;
+    clearInterval(timerId);
+  }, 300);
 };
+
+// 刷新列表
 const refresh = () => {
   tableList();
 };
 
+// 弹出框表单
 const dialogData = ref({
   billserial: "",
-  stockNum: number,
+  stockNum: Number,
   unit: "",
   operator: "",
   remark: "",
   stockDate: "",
 });
+
+// 查询表单
 const formData = ref({
   billserial: "",
   billType: "",
   stockDate: "",
 });
+
+// 分页
 const pagination = ref({
   defaultCurrent: 1,
   defaultPageSize: 10,
   total: 50,
 });
+
+// 查询表单重置
 const resetting = () => {
   formData.value = {
     billserial: "",
@@ -330,6 +347,7 @@ const resetting = () => {
   tableList();
 };
 
+// 查询
 const headerQuery = () => {
   tableData.value = data.value;
   if (
@@ -424,8 +442,10 @@ const stockDelete = async (itme) => {
   getNewTable();
 };
 
+// 弹出框表单重置
 const onReset = () => {};
 
+// 判断menuManagement里面是否存在数据
 const getNewTable = () => {
   let arr = JSON.parse(localStorage.getItem("menuManagement"));
   if (arr) {

src/pages/receivables-management/accountReceivable.vue

@@ -69,6 +69,7 @@
         cell-empty-content="-"
         lazy-load
         @row-click="handleRowClick"
+        @page-change="onPageChange"
         :loading="loading"
       >
         <template #tuition="{ row }">
@@ -84,11 +85,9 @@
 <script setup>
 import { ref, reactive, onMounted } from 'vue'
 import {
-  ErrorCircleFilledIcon,
+  APIReceivablesList,
-  CheckCircleFilledIcon,
+  APIReceivablesAdd
-  CloseCircleFilledIcon
+} from '@/api/receivables-management/management'
-} from 'tdesign-icons-vue-next'
-import { APIReceivablesList } from '@/api/receivables-management/management'
 //表单数据
 const formData = reactive({
   name: '',
@@ -178,18 +177,21 @@ const CONDITION = [
     value: '未缴学费'
   }
 ]
-//表单提交
-const onSubmit = () => {
-  console.log(formData)
-}
-//表单重置
-const onReset = () => {
-  console.log('重置成功')
-}
 // 表格数据
 const tableData = ref([])
+//表单提交
+const onSubmit = async () => {
+  const res = await APIReceivablesAdd(formData)
+  console.log(res)
+  tableData.value = res
+  pagination.total = res.length
+}
 // 表格加载状态
 const loading = ref(false)
+//表单重置
+const onReset = () => {
+ ReceivablesList()
+}
 // 表格点击事件
 const handleRowClick = e => {
   console.log(e)
@@ -206,17 +208,26 @@ const columns = ref([
 ])
 
 // 表格分页数据
-const pagination = {
+let pagination = {
   defaultCurrent: 1,
   defaultPageSize: 5,
   total: 50
 }
 //获取表格数据
 const ReceivablesList = async () => {
+  loading.value = true
   const res = await APIReceivablesList()
   tableData.value = res.data.list
-  console.log(res.data.list)
+  pagination.total = res.data.list.length
-  console.log(tableData)
+  loading.value = false
+}
+// 监听分页变化事件
+const onPageChange = (Newpage, PreviousPagePrev) => {
+  loading.value = true
+  const timerId = setTimeout(() => {
+    loading.value = false
+    clearInterval(timerId)
+  }, 300)
 }
 onMounted(() => {
   ReceivablesList()

src/router/modules/receivables-management.js

@@ -10,7 +10,7 @@ const ReceivablesManagement = [
       {
         path: "/accounts",
         name: "Accounts",
-        component: () => import("@/pages/receivables-management/account-receivable.vue"),
+        component: () => import("@/pages/receivables-management/accountReceivable.vue"),
         meta: {
           title: "应收款管理",
         },