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

src/pages/receivables-management/Arrearage.vue

@@ -32,17 +32,14 @@
         </t-row>
         <t-row style="margin-top: 0.5rem">
           <t-col :push="10" :span="2" style="margin-top: 0.2rem">
-            <div
+            <t-row :gutter="75">
-              style="
+              <t-col :offset="3" :span="3">
-                display: flex;
+                <t-button type="submit">搜索</t-button>
-                justify-content: space-between;
+              </t-col>
-                width: 8vw;
+              <t-col :span="3">
-                margin-left: 4.5vw;
+                <t-button type="reset">重置</t-button>
-              "
+              </t-col>
-            >
+            </t-row>
-              <t-button type="submit">搜索</t-button>
-              <t-button type="reset">重置</t-button>
-            </div>
           </t-col>
         </t-row>
       </t-form>

src/pages/receivables-management/accountReceivable.vue

@@ -51,18 +51,16 @@
             </t-form-item>
           </t-col>
 
-          <t-col :push="4" :span="2" style="margin-top: 0.2rem">
+          <t-col :span="6" style="margin-top: 0.2rem">
-            <div
+            <t-row>
-              style="
+              <t-col :offset="9" :span="1">
-                display: flex;
+                <t-button type="submit">搜索</t-button>
-                justify-content: space-between;
+              </t-col>
-                width: 8vw;
+              <t-col :span="1"> </t-col>
-                margin-left: 5vw;
+              <t-col :span="1">
-              "
+                <t-button type="reset">重置</t-button>
-            >
+              </t-col>
-              <t-button type="submit" class="button">搜索</t-button>
+            </t-row>
-              <t-button type="reset">重置</t-button>
-            </div>
           </t-col>
         </t-row>
       </t-form>
@@ -83,12 +81,6 @@
         @page-change="onPageChange"
         :loading="loading"
       >
-        <template #tuition="{ row }">
-          <t-tag v-if="row.tuition === '未缴学费'" theme="danger">{{
-            row.tuition
-          }}</t-tag>
-          <t-tag v-else theme="success">{{ row.tuition }}</t-tag>
-        </template>
         <template #action="{ row }">
           <t-button
             v-if="row.tuition === '未缴学费'"
@@ -107,7 +99,7 @@
     </div>
   </div>
 </template>
-<script setup>
+<script setup lang="jsx">
 import { ref, reactive, onMounted } from 'vue'
 import {
   APIReceivablesList,
@@ -215,8 +207,26 @@ const columns = ref([
   { colKey: 'department', title: '部门' },
   { colKey: 'major', title: '专业' },
   { colKey: 'grade', title: '班级' },
-  { colKey: 'tuition', title: '是否缴费' },
+  {
-  { colKey: 'action', title: '操作', align: 'center' }
+    colKey: 'tuition',
+    title: '是否缴费',
+    cell: (h, { row }) => {
+      return (
+        <div>
+          {row.tuition === '未缴学费' ? (
+            <t-tag theme='danger'>{row.tuition}</t-tag>
+          ) : (
+            <t-tag theme='success'>{row.tuition}</t-tag>
+          )}
+        </div>
+      )
+    }
+  },
+  {
+    colKey: 'action',
+    title: '操作',
+    align: 'center'
+  }
 ])
 // 表格分页数据
 let pagination = {
@@ -304,6 +314,7 @@ const handleExport = () => {
       6: item.tuition
     })
   })
+  // 导出excel表格
   ExcelUtils(title, titleFile, columns, addRow)
 }
 onMounted(() => {

src/pages/receivables-management/chargeSchedule.vue

@@ -63,9 +63,6 @@
         @page-change="onPageChange"
         :loading="loading"
       >
-        <template #condition="{ row }">
-          <t-tag theme="danger">{{ row.condition }}</t-tag>
-        </template>
         <template #operation="{ row }">
           <t-button size="small" @click="onClick(row)">联系该学生导员</t-button>
         </template>
@@ -99,7 +96,7 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="jsx">
 import { ref, reactive, onMounted } from 'vue'
 import {
   APIParagraphList,
@@ -122,7 +119,17 @@ const columns = [
   { colKey: 'counselor', title: '学生导员' },
   { colKey: 'cellPhone', title: '导员手机号' },
   { colKey: 'money', title: '催款金额' },
-  { colKey: 'condition', title: '还款情况' },
+  {
+    colKey: 'condition',
+    title: '还款情况',
+    cell: (h, { row }) => {
+      return (
+        <div>
+          <t-tag theme='success'>{row.condition}</t-tag>
+        </div>
+      )
+    }
+  },
   { colKey: 'operation', title: '操作', align: 'center' }
 ]
 //分页