功能添加

2025-12-26 15:21:31 +08:00
parent 7dfb6a5902
commit cb11d80d1f
26 changed files with 2208 additions and 841 deletions
--- a/Web/src/views/TransactionsRecord.vue
+++ b/Web/src/views/TransactionsRecord.vue
@@ -100,15 +100,6 @@
              placeholder="请选择或输入交易分类"
              @click="showAddClassifyPicker = true"
            />
-            <van-field
-              v-model="addForm.subClassify"
-              is-link
-              readonly
-              name="subClassify"
-              label="交易子分类"
-              placeholder="请选择或输入交易子分类"
-              @click="showAddSubClassifyPicker = true"
-            />
          </van-cell-group>

          <div style="margin: 16px;">
@@ -160,29 +151,21 @@
      </van-picker>
    </van-popup>

-    <!-- 新增交易 - 交易子分类选择器 -->
-    <van-popup v-model:show="showAddSubClassifyPicker" position="bottom" round>
-      <van-picker
-        ref="addSubClassifyPickerRef"
-        :columns="subClassifyColumns"
-        @confirm="onAddSubClassifyConfirm"
-        @cancel="showAddSubClassifyPicker = false"
-      >
-        <template #toolbar>
-          <div class="picker-toolbar">
-            <van-button class="toolbar-cancel" size="small" @click="clearAddSubClassify">清空</van-button>
-            <van-button class="toolbar-add" size="small" type="primary" @click="showAddSubClassify = true">新增</van-button>
-            <van-button class="toolbar-confirm" size="small" type="primary" @click="confirmAddSubClassify">确认</van-button>
-          </div>
-        </template>
-      </van-picker>
-    </van-popup>
+    <!-- 新增分类对话框 -->
+    <van-dialog 
+      v-model:show="showAddClassify" 
+      title="新增交易分类" 
+      show-cancel-button
+      @confirm="addNewClassify"
+    >
+      <van-field v-model="newClassify" placeholder="请输入新的交易分类" />
+    </van-dialog>

    <!-- 底部浮动搜索框 -->
    <div class="floating-search">
      <van-search
        v-model="searchKeyword"
-        placeholder="搜索交易摘要、来源、卡号、分类或子分类"
+        placeholder="搜索交易摘要、来源、卡号、分类"
        @update:model-value="onSearchChange"
        @clear="onSearchClear"
        shape="round"
@@ -200,7 +183,7 @@ import {
  createTransaction,
  deleteTransaction
 } from '@/api/transactionRecord'
-import { getCategoryTree } from '@/api/transactionCategory'
+import { getCategoryList, createCategory } from '@/api/transactionCategory'
 import TransactionList from '@/components/TransactionList.vue'
 import TransactionDetail from '@/components/TransactionDetail.vue'

@@ -225,9 +208,9 @@ const showDateTimePicker = ref(false)
 const dateTimeValue = ref([new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()])
 const showAddTypePicker = ref(false)
 const showAddClassifyPicker = ref(false)
-const showAddSubClassifyPicker = ref(false)
 const addClassifyPickerRef = ref(null)
-const addSubClassifyPickerRef = ref(null)
+const showAddClassify = ref(false)
+const newClassify = ref('')

 // 交易类型
 const typeColumns = [
@@ -238,7 +221,6 @@ const typeColumns = [

 // 分类相关
 const classifyColumns = ref([])
-const subClassifyColumns = ref([])

 // 新增表单
 const addForm = reactive({
@@ -247,21 +229,18 @@ const addForm = reactive({
  amount: '',
  type: 0,
  typeText: '',
-  classify: '',
-  subClassify: ''
+  classify: ''
 })

-// 加载分类列表（从分类树中提取）
+// 加载分类列表
 const loadClassifyList = async (type = null) => {
  try {
-    const response = await getCategoryTree(type)
+    const response = await getCategoryList(type)
    if (response.success) {
-      // 从树形结构中提取分类名称（Level 2）
      classifyColumns.value = (response.data || []).map(item => ({
        text: item.name,
        value: item.name,
-        id: item.id,
-        children: item.children || []
+        id: item.id
      }))
    }
  } catch (error) {
@@ -269,25 +248,6 @@ const loadClassifyList = async (type = null) => {
  }
 }

-// 加载子分类列表（根据选中的分类）
-const loadSubClassifyList = async (classifyName) => {
-  try {
-    // 从已加载的分类树中查找对应的子分类
-    const classifyItem = classifyColumns.value.find(item => item.value === classifyName)
-    if (classifyItem && classifyItem.children) {
-      subClassifyColumns.value = classifyItem.children.map(child => ({
-        text: child.name,
-        value: child.name,
-        id: child.id
-      }))
-    } else {
-      subClassifyColumns.value = []
-    }
-  } catch (error) {
-    console.error('加载子分类列表出错:', error)
-  }
-}
-
 // 加载数据
 const loadData = async (isRefresh = false) => {
  if (isRefresh) {
@@ -441,7 +401,6 @@ const openAddDialog = () => {
  addForm.type = 0
  addForm.typeText = ''
  addForm.classify = ''
-  addForm.subClassify = ''
  
  // 设置默认日期时间为当前时间
  const now = new Date()
@@ -477,23 +436,13 @@ const onAddTypeConfirm = ({ selectedValues, selectedOptions }) => {
 }

 // 新增交易 - 交易分类选择确认
-const onAddClassifyConfirm = async ({ selectedOptions }) => {
+const onAddClassifyConfirm = ({ selectedOptions }) => {
  if (selectedOptions && selectedOptions[0]) {
    addForm.classify = selectedOptions[0].text
-    // 加载对应的子分类
-    await loadSubClassifyList(selectedOptions[0].value)
  }
  showAddClassifyPicker.value = false
 }

-// 新增交易 - 交易子分类选择确认
-const onAddSubClassifyConfirm = ({ selectedOptions }) => {
-  if (selectedOptions && selectedOptions[0]) {
-    addForm.subClassify = selectedOptions[0].text
-  }
-  showAddSubClassifyPicker.value = false
-}
-
 // 新增交易 - 清空分类
 const clearAddClassify = () => {
  addForm.classify = ''
@@ -501,13 +450,6 @@ const clearAddClassify = () => {
  showToast('已清空分类')
 }

-// 新增交易 - 清空子分类
-const clearAddSubClassify = () => {
-  addForm.subClassify = ''
-  showAddSubClassifyPicker.value = false
-  showToast('已清空子分类')
-}
-
 // 新增交易 - 确认分类（从 picker 中获取选中值）
 const confirmAddClassify = () => {
  if (addClassifyPickerRef.value) {
@@ -519,15 +461,33 @@ const confirmAddClassify = () => {
  showAddClassifyPicker.value = false
 }

-// 新增交易 - 确认子分类（从 picker 中获取选中值）
-const confirmAddSubClassify = () => {
-  if (addSubClassifyPickerRef.value) {
-    const selectedValues = addSubClassifyPickerRef.value.getSelectedOptions()
-    if (selectedValues && selectedValues[0]) {
-      addForm.subClassify = selectedValues[0].text
-    }
+// 新增分类
+const addNewClassify = async () => {
+  if (!newClassify.value.trim()) {
+    showToast('请输入分类名称')
+    return
+  }
+  
+  try {
+    const response = await createCategory({
+      name: newClassify.value.trim(),
+      type: addForm.type
+    })
+    
+    if (response.success) {
+      showToast('新增分类成功')
+      newClassify.value = ''
+      // 重新加载分类列表
+      await loadClassifyList(addForm.type)
+      // 设置为新增的分类
+      addForm.classify = response.data.name
+    } else {
+      showToast(response.message || '新增分类失败')
+    }
+  } catch (error) {
+    console.error('新增分类失败:', error)
+    showToast('新增分类失败')
  }
-  showAddSubClassifyPicker.value = false
 }

 // 提交新增交易
@@ -540,8 +500,7 @@ const onAddSubmit = async () => {
      reason: addForm.reason,
      amount: parseFloat(addForm.amount),
      type: addForm.type,
-      classify: addForm.classify || null,
-      subClassify: addForm.subClassify || null
+      classify: addForm.classify || null
    }
    
    const response = await createTransaction(data)