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

src/layout/components/LayoutAside.vue

@@ -48,6 +48,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>

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

src/pages/receivables-management/daily.vue

@@ -0,0 +1,7 @@
+<template>
+  <div>1</div>
+</template>
+
+<script setup></script>
+
+<style lang="less" scoped></style>

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>

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: "收费日报", },
       }
     ],
   },