feat:增加数字键盘组件

src/components/Bill/BillQuery.vue

@@ -14,15 +14,6 @@
       <el-option v-for="(item, index) in dateTypeOptions" :key="index"
                  :label="item.label" :value="item.value"/>
     </el-select>
-
-    <el-switch
-        v-model="billStore.billType"
-        inline-prompt
-        active-value="income" inactive-value="expensive"
-        active-text="收入" inactive-text="支出"
-        @change="billStore.refreshInfo(isStats)"
-        style="--el-switch-on-color: #6FBB69; --el-switch-off-color: #CA6C65;"
-    />
   </div>
 </template>
 

src/components/NumberInput.vue

@@ -0,0 +1,116 @@
+<template>
+  <div class="keyboard">
+    <div class="display">
+      {{ model || '0' }}
+    </div>
+
+    <div class="keys">
+      <el-button v-for="key in keys" :key="String(key)" class="key" @click="press(key)">
+        {{ key }}
+      </el-button>
+
+      <el-button class="key delete" @click="removeLast">
+        <i class="fa-solid fa-delete-left"></i>
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineModel } from 'vue'
+
+const model = defineModel<string>({
+  default: ''
+})
+
+const keys = [1, 2, 3, 4, 5, 6, 7, 8, 9, '.', 0] as const
+
+const press = (key: number | '.') => {
+  const pressValue = model.value
+
+  // 小数点
+  if (key === '.') {
+    if (pressValue.includes('.')) return
+    if (pressValue === '') {
+      model.value = '0.'
+    } else {
+      model.value += '.'
+    }
+    return
+  }
+
+  const next = pressValue + key
+
+  // 限制小数点后两位
+  if (next.includes('.')) {
+    const [, decimal] = next.split('.')
+    if (decimal.length > 2) return
+  }
+
+  if (next.length > 1 && next.startsWith('0') && !next.startsWith('0.')) {
+    model.value = next.slice(1)
+  } else {
+    model.value = next
+  }
+}
+
+const removeLast = () => {
+  model.value = model.value.slice(0, -1)
+}
+</script>
+
+<style lang="scss" scoped>
+.keyboard {
+  min-height: 320px;
+  width: 100%;
+  background: #f7f8fa;
+  border-radius: 16px;
+  padding: 16px;
+  box-sizing: border-box;
+  user-select: none;
+
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+
+  .display {
+    height: 48px;
+    line-height: 48px;
+    padding: 0 14px;
+    margin-bottom: 12px;
+    border-radius: 12px;
+    background: #fff;
+    font-size: 22px;
+    text-align: right;
+    color: #333;
+    box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.08);
+  }
+
+  .keys {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 10px;
+
+    .key {
+      margin-left: 0;
+      height: 48px;
+      font-size: 20px;
+      border-radius: 12px;
+      border: none;
+      box-shadow:
+          0 1px 2px rgba(0, 0, 0, 0.08),
+          inset 0 -1px 0 rgba(0, 0, 0, 0.05);
+      cursor: pointer;
+      transition: all 0.15s ease;
+    }
+
+    .delete {
+      color: #ff3b30;
+
+      .fa-delete-left {
+        font-size: 28px;
+      }
+    }
+  }
+}
+</style>

src/store/bill.ts

@@ -10,7 +10,7 @@ import {
   queryBillRecordApi,
   queryBillStatsApi, queryBillSummaryApi, searchBillSummaryApi, updateBillRecordApi
 } from '@/apis/bill'
-import { getCurrentMonth, getCurrentYear, getStartEndDate } from 'vue3-common/utils/dateUtil'
+import { formatDate, getCurrentMonth, getCurrentYear, getStartEndDate } from 'vue3-common/utils/dateUtil'
 import { IDateType, ImagePathEnum } from '@/types'
 import { IDialog, IStatsChart, IHandleApi } from 'vue3-common/types'
 import { ElMessage } from 'element-plus'
@@ -154,7 +154,7 @@ export const useBillStore = defineStore('bill', {
         bookName: '',
         category: '',
         content: '',
-        date: '',
+        date: formatDate(new Date()),
         location: '',
         payAccount: '',
         remark: '',

src/views/bill/detail[id].vue

@@ -1,51 +1,79 @@
 <template>
-  <div class="common-mobile-view">
+  <div class="common-mobile-view bill-detail">
     <el-form ref="formRef" :model="billStore.currentBillRecord"
              :rules="rules" label-position="top" label-width="80px"
-             class="form-item">
+             class="form-item bill-form">
-      <el-form-item label="账本类型" prop="bookName">
+      <div style="display: flex;gap: 5px;">
-        <el-radio-group v-model="billStore.currentBillRecord.bookName"
+        <el-select v-model="billStore.currentBillRecord.bookName"
-                        @change="changeBillBookNameEvent">
+                   @change="changeBillBookNameEvent" style="width: 100px">
-          <el-radio v-for="(item, index) in billStore.billBookList"
+          <el-option
-                    :value="item.name" :key="index">
+              v-for="item in billStore.billBookList"
-            <template #default>
+              :key="item.id" :label="item.name" :value="item.name"
-              <i :class="item.icon" :style="{color: item.color}"/>
+          />
-              <span style="margin-left: 5px;">{{ item.name }}</span>
+        </el-select>
-            </template>
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
 
-      <el-form-item label="账单类别" prop="type">
+        <el-select v-model="billStore.currentBillRecord.type"
-        <el-radio-group v-model="billStore.currentBillRecord.type"
+                   @change="changeBillCategoryEvent" style="width: 100px">
-                        @change="changeBillCategoryEvent">
+          <el-option
-          <el-radio v-for="(item, index) in billInfo.billTypeList"
+              v-for="(item, index) in billInfo.billTypeList"
-                    :value="item" :key="index">
+              :key="index" :label="getBillTypeName(item)" :value="item"
-            {{ getBillTypeName(item) }}
+          />
-          </el-radio>
+        </el-select>
-        </el-radio-group>
-      </el-form-item>
 
-      <el-form-item label="账单分类" prop="category">
+        <el-select v-model="billStore.currentBillRecord.payAccount"
-        <el-radio-group v-model="billStore.currentBillRecord.category">
+                   @change="changeBillCategoryEvent" style="width: 100px">
-          <el-radio v-for="(item, index) in billInfo.billCategoryList"
+          <el-option
-                    :value="item.name" :key="index">
+              v-for="item in billStore.billPayList"
-            <template #default>
+              :key="item.id" :label="item.name" :value="item.name"
-              <i :class="item.icon" :style="{color: item.color}"/>
+          />
-              <span style="margin-left: 5px;">{{ item.name }}</span>
+        </el-select>
-            </template>
+      </div>
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
 
-      <el-form-item label="账单时间" prop="date">
+<!--      <el-form-item label="账单分类" prop="category">-->
+<!--        -->
+<!--      </el-form-item>-->
+
+      <el-radio-group v-model="billStore.currentBillRecord.category">
+        <el-radio v-for="(item, index) in billInfo.billCategoryList"
+                  :value="item.name" :key="index">
+          <template #default>
+            <i :class="item.icon" :style="{color: item.color}"/>
+            <span style="margin-left: 5px;">{{ item.name }}</span>
+          </template>
+        </el-radio>
+      </el-radio-group>
+
+      <div class="bill-gap"></div>
+
+<!--      <el-form-item label="账本类型" prop="bookName">-->
+<!--        <el-radio-group v-model="billStore.currentBillRecord.bookName"-->
+<!--                        @change="changeBillBookNameEvent">-->
+<!--          <el-radio v-for="(item, index) in billStore.billBookList"-->
+<!--                    :value="item.name" :key="index">-->
+<!--            <template #default>-->
+<!--              <i :class="item.icon" :style="{color: item.color}"/>-->
+<!--              <span style="margin-left: 5px;">{{ item.name }}</span>-->
+<!--            </template>-->
+<!--          </el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
+
+<!--      <el-form-item label="账单类别" prop="type">-->
+<!--        <el-radio-group v-model="billStore.currentBillRecord.type"-->
+<!--                        @change="changeBillCategoryEvent">-->
+<!--          <el-radio v-for="(item, index) in billInfo.billTypeList"-->
+<!--                    :value="item" :key="index">-->
+<!--            {{ getBillTypeName(item) }}-->
+<!--          </el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
+
+      <div style="display: flex;gap: 5px;">
         <el-date-picker
             v-model="billStore.currentBillRecord.date"
             type="date" :editable="false" placeholder="请选择账单时间"
             value-format="YYYY-MM-DD"/>
-      </el-form-item>
 
-      <el-form-item label="账单地点" prop="location">
         <el-input v-model="billStore.currentBillRecord.location" autocomplete="off"
                   placeholder="请输入账单地点"  clearable
                   show-word-limit maxlength="10">
@@ -53,62 +81,68 @@
             <el-icon class="el-input__icon"><location/></el-icon>
           </template>
         </el-input>
-      </el-form-item>
+      </div>
 
-      <el-form-item label="账单账户" prop="payAccount">
+<!--      <el-form-item label="账单时间" prop="date">-->
-        <el-radio-group v-model="billStore.currentBillRecord.payAccount">
+<!--        <el-date-picker-->
-          <el-radio v-for="(item, index) in billStore.billPayList"
+<!--            v-model="billStore.currentBillRecord.date"-->
-                    :value="item.name" :key="index">
+<!--            type="date" :editable="false" placeholder="请选择账单时间"-->
-            <template #default>
+<!--            value-format="YYYY-MM-DD"/>-->
-              <i :class="item.icon" :style="{color: item.color}"/>
+<!--      </el-form-item>-->
-              <span style="margin-left: 5px;">{{ item.name }}</span>
-            </template>
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
 
-      <el-form-item label="账单金额" prop="amount">
+<!--      <el-form-item label="账单地点" prop="location">-->
-        <amount-input v-model="billStore.currentBillRecord.amount"/>
+<!--        <el-input v-model="billStore.currentBillRecord.location" autocomplete="off"-->
-      </el-form-item>
+<!--                  placeholder="请输入账单地点"  clearable-->
+<!--                  show-word-limit maxlength="10">-->
+<!--          <template #prefix>-->
+<!--            <el-icon class="el-input__icon"><location/></el-icon>-->
+<!--          </template>-->
+<!--        </el-input>-->
+<!--      </el-form-item>-->
 
-      <el-form-item label="账单内容" prop="content">
+<!--      <el-form-item label="账单账户" prop="payAccount">-->
-        <el-input v-model="billStore.currentBillRecord.content" autocomplete="off"
+<!--        <el-radio-group v-model="billStore.currentBillRecord.payAccount">-->
-                  placeholder="请输入账单内容"  clearable
+<!--          <el-radio v-for="(item, index) in billStore.billPayList"-->
-                  show-word-limit maxlength="10">
+<!--                    :value="item.name" :key="index">-->
-          <template #prefix>
+<!--            <template #default>-->
-            <el-icon class="el-input__icon"><document/></el-icon>
+<!--              <i :class="item.icon" :style="{color: item.color}"/>-->
-          </template>
+<!--              <span style="margin-left: 5px;">{{ item.name }}</span>-->
-        </el-input>
+<!--            </template>-->
-      </el-form-item>
+<!--          </el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
 
-      <el-form-item label="账单备注">
+<!--      <el-form-item label="账单内容" prop="content">-->
-        <el-input v-model="billStore.currentBillRecord.remark" type="textarea"
+<!--        <el-input v-model="billStore.currentBillRecord.content" autocomplete="off"-->
-                  placeholder="请输入账单备注" clearable
+<!--                  placeholder="请输入账单内容"  clearable-->
-                  :rows="5" show-word-limit maxlength="200">
+<!--                  show-word-limit maxlength="10">-->
-        </el-input>
+<!--          <template #prefix>-->
-      </el-form-item>
+<!--            <el-icon class="el-input__icon"><document/></el-icon>-->
+<!--          </template>-->
+<!--        </el-input>-->
+<!--      </el-form-item>-->
 
-      <el-form-item label="账单图片">
+      <el-input v-model="billStore.currentBillRecord.content" autocomplete="off"
-        <el-upload
+                placeholder="请输入账单内容"  clearable
-            v-model:file-list="imageFileList"
+                show-word-limit maxlength="10">
-            list-type="picture-card"
+        <template #prefix>
-            :accept="acceptImageTypes"
+          <el-icon class="el-input__icon"><document/></el-icon>
-            :limit="3"
+        </template>
-            :before-upload="beforeUpload"
+      </el-input>
-            :http-request="httpRequest"
+
-            :on-success="handleSuccess"
+      <el-input v-model="billStore.currentBillRecord.remark" type="textarea"
-            :on-exceed="handleExceed"
+                placeholder="请输入账单备注" clearable
-            :before-remove="beforeRemove"
+                :rows="3" show-word-limit maxlength="50">
-            :on-remove="handleRemove"
+      </el-input>
-        >
+
-          <el-icon><Plus /></el-icon>
+<!--      <el-form-item label="账单备注">-->
-          <template #tip>
+<!--        <el-input v-model="billStore.currentBillRecord.remark" type="textarea"-->
-            <div class="el-upload__tip">
+<!--                  placeholder="请输入账单备注" clearable-->
-              请上传小于10M的图片
+<!--                  :rows="5" show-word-limit maxlength="200">-->
-            </div>
+<!--        </el-input>-->
-          </template>
+<!--      </el-form-item>-->
-        </el-upload>
+
-      </el-form-item>
+      <number-input :model-value="amountStr" class="amount-input" />
     </el-form>
 
     <div class="form-button">
@@ -124,22 +158,13 @@
 import { AmountInput } from 'vue3-common'
 import { useBillStore } from '@/store/bill.ts'
 import { useAppStore } from '@/store/app.ts'
-import { Location, Document, Plus } from '@element-plus/icons-vue'
+import { Location, Document } from '@element-plus/icons-vue'
-import {
+import { FormRules, UploadUserFile } from 'element-plus'
-  ElMessage,
-  ElMessageBox,
-  FormRules,
-  UploadProps,
-  UploadRawFile,
-  UploadRequestOptions,
-  UploadUserFile
-} from 'element-plus'
 import { billRecordRules } from '@/utils/element/elRules.ts'
-import { nextTick, onMounted, reactive, ref } from 'vue'
+import { computed, nextTick, onMounted, reactive, ref } from 'vue'
 import { IBillCategory } from '@/types/bill.ts'
 import { commonElMessageBox } from 'vue3-common/utils/elUtil'
-import { acceptImageTypes } from '@/utils/file.ts'
+import NumberInput from '@/components/NumberInput.vue'
-import { beforeUploadImage, httpRequestFile } from '@/utils/element/elUpload.ts'
 
 const formRef = ref()
 const rules = reactive<FormRules>(billRecordRules)
@@ -193,30 +218,7 @@ const initImageFileList = () => {
   })
 }
 
-const beforeUpload: UploadProps['beforeUpload'] = (rawFile: UploadRawFile) => {
+const amountStr = computed<string>(() => billStore.currentBillRecord.amount.toString())
-  return beforeUploadImage(rawFile)
-}
-
-const httpRequest: UploadProps['httpRequest'] = async (options: UploadRequestOptions): Promise<any> => {
-  return await httpRequestFile(billStore.billImagePath, options)
-}
-
-const handleSuccess = (response: string) => {
-  billStore.currentBillRecord.imageList.push(response)
-}
-
-const handleExceed: UploadProps['onExceed'] = () => {
-  ElMessage.warning('最多上传3张图片')
-}
-
-const handleRemove: UploadProps['onRemove'] = (uploadFile) => {
-  const index = imageFileList.value.findIndex((item) => item.uid === uploadFile.uid)
-  billStore.currentBillRecord.imageList.splice(index, 1)
-}
-
-const beforeRemove: UploadProps['beforeRemove'] = () => {
-  return ElMessageBox.confirm('确认删除该文件?').then(() => true, () => false)
-}
 
 /**
  * 获取账单类型名称
@@ -293,3 +295,19 @@ const deleteClick = () => {
   })
 }
 </script>
+
+<style lang="scss">
+.bill-detail {
+  .bill-form {
+    flex-grow: 1;
+
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+
+    .bill-gap {
+      flex-grow: 1;
+    }
+  }
+}
+</style>