完善功能

src/utils/cache.ts

@@ -1,5 +1,5 @@
 const cache = {
-    key: 'like_admin_',
+    key: 'like_admin_broker_',
     //设置缓存(expire为缓存时效)
     set(key: string, value: any, expire?: string) {
         key = this.getKey(key)

src/views/finance/broker_bank/edit.vue

@@ -2,9 +2,9 @@
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
             @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-                <el-form-item label="提现人名称" prop="name">
+                <el-form-item label="单位名称" prop="name">
-                    <el-input v-model="formData.name" clearable placeholder="提现人名称" />
+                    <el-input v-model="formData.name" clearable placeholder="单位名称" />
                 </el-form-item>
                 <el-form-item label="银行名称" prop="bank_name">
                     <el-input v-model="formData.bank_name" clearable placeholder="请输入银行名称" />
@@ -15,6 +15,12 @@
                 <el-form-item label="银行卡号" prop="bank_card">
                     <el-input v-model="formData.bank_card" clearable placeholder="请输入银行卡号" />
                 </el-form-item>
+                <el-form-item label="税务登记地址" prop="address">
+                    <el-input v-model="formData.address" clearable placeholder="请输入税务登记地址" />
+                </el-form-item>
+                <el-form-item label="纳税号" prop="ns">
+                    <el-input v-model="formData.ns" clearable placeholder="请输入纳税号" />
+                </el-form-item>
                 <el-form-item label="手机号码" prop="mobile">
                     <el-input v-model="formData.mobile" clearable placeholder="请输入银行卡绑定手机号码" />
                 </el-form-item>
@@ -53,13 +59,36 @@ const formData = reactive({
     bank_name: '',
     bank_card: '',
     bank_open_name: '',
+    address: '',
+    ns: '',
     mobile: '',
 })
 
 
 // 表单验证
 const formRules = reactive<any>({
-
+    name: [
+        { required: true, message: '请输入单位名称', trigger: 'blur' }
+    ],
+    bank_name: [
+        { required: true, message: '请输入银行名称', trigger: 'blur' }
+    ],
+    bank_open_name: [
+        { required: true, message: '请输入开户行名称', trigger: 'blur' }
+    ],
+    bank_card: [
+        { required: true, message: '请输入银行卡号', trigger: 'blur' }
+    ],
+    address: [
+        { required: true, message: '请输入税务登记地址', trigger: 'blur' }
+    ],
+    ns: [
+        { required: true, message: '请输入纳税号', trigger: 'blur' }
+    ],
+    mobile: [
+        { required: true, message: '请输入银行卡绑定手机号码', trigger: 'blur' },
+        { pattern: /^1\d{10}$/, message: '请输入正确的11位手机号码', trigger: 'blur' }
+    ]
 })
 
 
@@ -71,8 +100,6 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {

src/views/finance/broker_bank/index.vue

@@ -34,9 +34,12 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
+                    <el-table-column label="单位名称" prop="name" show-overflow-tooltip />
                     <el-table-column label="银行名称" prop="bank_name" show-overflow-tooltip />
                     <el-table-column label="银行卡号" prop="bank_card" show-overflow-tooltip />
                     <el-table-column label="开户行名称" prop="bank_open_name" show-overflow-tooltip />
+                    <el-table-column label="税务登记地址" prop="address" show-overflow-tooltip />
+                    <el-table-column label="纳税号" prop="ns" show-overflow-tooltip />
                     <el-table-column label="绑定手机号码" prop="mobile" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">

src/views/withdraw/broker_reflect/edit.vue

@@ -8,8 +8,14 @@
                         <el-option v-for="item in bankLists" :key="item.id" :label="item.bank_name" :value="item.id" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="体现金额" prop="amount">
+                <el-form-item label="提现类型" prop="tx_type">
-                    <el-input v-model="formData.amount" clearable placeholder="请输入体现金额" />
+                    <el-select v-model="formData.tx_type" clearable placeholder="请选择提现类型">
+                        <el-option label="本人提现" value="1" />
+                        <el-option label="茶艺师账户提现" value="2" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="提现金额" prop="amount">
+                    <el-input v-model="formData.amount" clearable placeholder="请输入提现金额" />
                 </el-form-item>
             </el-form>
         </popup>
@@ -52,6 +58,7 @@ const formData = reactive({
     id: '',
     bank_id: '',
     amount: '',
+    tx_type: ''
 })
 
 

src/views/withdraw/broker_reflect/index.vue

@@ -1,9 +1,25 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form-item label="账户余额" prop="order_sn">
+            <div class="flex items-center">
-                ￥{{ accountInfo.money }}
+                <div>
-            </el-form-item>
+                    <el-form-item label="个人账户余额">
+                        ￥{{ accountInfo.money }}
+                    </el-form-item>
+                    <el-form-item label="个人已提现账户余额">
+                        ￥{{ accountInfo.total_reflect_amount }}
+                    </el-form-item>
+                </div>
+                <div class="ml-20">
+                    <el-form-item label="茶艺师账户余额">
+                        ￥{{ accountInfo.teamaster_money }}
+                    </el-form-item>
+                    <el-form-item label="茶艺师账户已提现余额">
+                        ￥{{ accountInfo.total_teamaster_amount }}
+                    </el-form-item>
+                </div>
+            </div>
+
 
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="订单编号" prop="order_sn">
@@ -27,7 +43,7 @@
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
-                新增
+                提现
             </el-button>
             <el-button v-perms="['broker_reflect/delete']" :disabled="!selectData.length"
                 @click="handleDelete(selectData)">
@@ -49,6 +65,11 @@
                             ￥{{ row.amount }}
                         </template>
                     </el-table-column>
+                    <el-table-column label="提现类型" prop="tx_type">
+                        <template #default="{ row }">
+                            {{ row.tx_type == 1 ? '本人提现' : '茶艺师账户提现' }}
+                        </template>
+                    </el-table-column>
                     <el-table-column label="审核状态" prop="status" show-overflow-tooltip>
                         <template #default="{ row }">
                             <el-tag v-if="row.status == 0">待审核</el-tag>
@@ -56,6 +77,13 @@
                             <el-tag v-else-if="row.status == 2" type="danger">审核拒绝</el-tag>
                         </template>
                     </el-table-column>
+                    <el-table-column label="打款证明" prop="voucher">
+                        <template #default="{ row }">
+                            <el-image v-if="row.voucher" style="width: 100px; height: 100px" :src="row.voucher"
+                                :preview-src-list="[row.voucher]" preview-teleported></el-image>
+                            <div v-else>—</div>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="提现时间" prop="dtime" show-overflow-tooltip />
                     <!-- <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
@@ -150,7 +178,12 @@ const handleDelete = async (id: number | any[]) => {
 getLists()
 
 // 获取用户账户信息
-const accountInfo = ref({})
+const accountInfo = ref({
+    money: 0,
+    total_reflect_amount: 0,
+    teamaster_money: 0,
+    total_teamaster_amount: 0
+})
 const getAccountInfo = async () => {
     const data = await getUserAccountInfo()
     accountInfo.value = data.user

src/views/withdraw/store_user_reflect/edit.vue

@@ -1,138 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="订单编号" prop="order_sn">
-                    <el-input v-model="formData.order_sn" clearable disabled />
-                </el-form-item>
-                <el-form-item label="用户昵称" prop="nickname">
-                    <el-input v-model="formData.nickname" clearable disabled />
-                </el-form-item>
-                <el-form-item label="联系方式" prop="mobile">
-                    <el-input v-model="formData.mobile" clearable disabled />
-                </el-form-item>
-                <el-form-item label="银行卡" prop="bank_card">
-                    <el-input v-model="formData.bank_card" clearable disabled />
-                </el-form-item>
-                <el-form-item label="开户行" prop="bank_name">
-                    <el-input v-model="formData.bank_name" clearable disabled />
-                </el-form-item>
-                <el-form-item label="开户行-分行" prop="bank_open_name">
-                    <el-input v-model="formData.bank_open_name" clearable disabled />
-                </el-form-item>
-                <el-form-item label="店铺名称" prop="name">
-                    <el-input v-model="formData.name" clearable disabled />
-                </el-form-item>
-                <el-form-item label="提现金额" prop="amount">
-                    <el-input v-model="formData.amount" clearable disabled />
-                </el-form-item>
-                <el-form-item label="提现状态" prop="status">
-                    <el-select class="flex-1" v-model="formData.status" clearable placeholder="请选择">
-                        <el-option label="待审核" :value="0"></el-option>
-                        <el-option label="通过" :value="1"></el-option>
-                        <el-option label="拒绝" :value="2"></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="storeUserReflectEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiStoreUserReflectAdd, apiStoreUserReflectEdit, apiStoreUserReflectDetail } from '@/api/store_user_reflect'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == '提现审核'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    order_sn: '',
-    user_id: '',
-    bank_id: '',
-    store_id: '',
-    amount: '',
-    status: '',
-    nickname: '',
-    mobile: '',
-    bank_card: '',
-    bank_name: '',
-    bank_open_name: '',
-    name: ''
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-
-
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiStoreUserReflectDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData, }
-    mode.value == 'edit'
-        ? await apiStoreUserReflectEdit(data)
-        : await apiStoreUserReflectAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>

src/views/withdraw/store_user_reflect/index.vue

@@ -49,25 +49,25 @@
                             <span v-if="row.status == 2">已拒绝</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <!-- <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
+                        <template #default="{ row }"> -->
-                            <el-button v-perms="['store_user_reflect/edit']" type="primary" link
+                    <!-- <el-button v-perms="['store_user_reflect/edit']" type="primary" link
                                 @click="handleEdit(row)">
                                 编辑
-                            </el-button>
+                            </el-button> -->
-                            <!-- <el-button v-perms="['store_user_reflect/delete']" type="danger" link
+                    <!-- <el-button v-perms="['store_user_reflect/delete']" type="danger" link
                                 @click="handleDelete(row.id)">
                                 删除
                             </el-button> -->
-                        </template>
+                    <!-- </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table>
             </div>
             <div class="flex mt-4 justify-end">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <!-- <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> -->
     </div>
 </template>
 
@@ -77,11 +77,10 @@ import { useDictData } from '@/hooks/useDictOptions'
 import { apiStoreUserReflectLists, apiStoreUserReflectDelete } from '@/api/store_user_reflect'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
 
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
+// // 是否显示编辑框
-const showEdit = ref(false)
+// const showEdit = ref(false)
 
 
 // 查询条件
@@ -109,20 +108,20 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
-// 添加
+// // 添加
-const handleAdd = async () => {
+// const handleAdd = async () => {
-    showEdit.value = true
+//     showEdit.value = true
-    await nextTick()
+//     await nextTick()
-    editRef.value?.open('add')
+//     editRef.value?.open('add')
-}
+// }
 
-// 编辑
+// // 编辑
-const handleEdit = async (data: any) => {
+// const handleEdit = async (data: any) => {
-    showEdit.value = true
+//     showEdit.value = true
-    await nextTick()
+//     await nextTick()
-    editRef.value?.open('edit')
+//     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+//     editRef.value?.setFormData(data)
-}
+// }
 
 // 删除
 const handleDelete = async (id: number | any[]) => {

src/views/withdraw/teamaster_user_reflect/edit.vue

@@ -22,15 +22,19 @@
                     <el-input v-model="formData.bank_open_name" clearable disabled />
                 </el-form-item>
                 <el-form-item label="提现金额" prop="amount">
-                    <el-input v-model="formData.amount" clearable placeholder="请输入体现金额" disabled />
+                    <el-input v-model="formData.amount" clearable placeholder="请输入提现金额" disabled />
                 </el-form-item>
                 <el-form-item label="提现状态" prop="status">
-                    <el-select class="flex-1" v-model="formData.status" clearable placeholder="请选择">
+                    <el-select class="flex-1" v-model="formData.status" clearable placeholder="请选择"
+                        @change="handleStatusChange">
                         <el-option label="待审核" :value="0"></el-option>
                         <el-option label="通过" :value="1"></el-option>
                         <el-option label="拒绝" :value="2"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item v-if="Number(formData.status) === 1" label="打款证明" prop="voucher" required>
+                    <material-picker v-model="formData.voucher" :limit="1" />
+                </el-form-item>
             </el-form>
         </popup>
     </div>
@@ -56,7 +60,7 @@ const mode = ref('add')
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == '提现审核'
+    return mode.value == 'edit' ? '提现审核' : '新增提现'
 })
 
 // 表单数据
@@ -72,15 +76,39 @@ const formData = reactive({
     mobile: '',
     bank_card: '',
     bank_name: '',
-    bank_open_name: ''
+    bank_open_name: '',
+    voucher: ''
 })
 
 
 // 表单验证
 const formRules = reactive<any>({
+    voucher: [
+        {
+            validator: (_rule: any, value: string, callback: (error?: Error) => void) => {
+                if (Number(formData.status) === 1 && !value) {
+                    callback(new Error('请上传打款证明'))
+                    return
+                }
+                callback()
+            },
+            trigger: ['change', 'blur']
+        }
+    ]
 
 })
 
+const handleStatusChange = () => {
+    if (Number(formData.status) !== 1) {
+        formData.voucher = ''
+        formRef.value?.clearValidate(['voucher'])
+        return
+    }
+    nextTick(() => {
+        formRef.value?.validateField('voucher')
+    })
+}
+
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {

src/views/withdraw/teamaster_user_reflect/index.vue

@@ -45,12 +45,22 @@
                             <span v-if="row.status == 2">已拒绝</span>
                         </template>
                     </el-table-column>
+
+                    <el-table-column label="打款证明" prop="voucher">
+                        <template #default="{ row }">
+                            <el-image v-if="row.voucher" style="width: 100px; height: 100px" :src="row.voucher"
+                                :preview-src-list="[row.voucher]" preview-teleported></el-image>
+                            <div v-else>—</div>
+                        </template>
+                    </el-table-column>
+
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['teamaster_user_reflect/edit']" type="primary" link
-                                @click="handleEdit(row)">
+                                @click="handleEdit(row)" v-if="row.status == 0">
                                 编辑
                             </el-button>
+                            <div v-else>已操作</div>
                         </template>
                     </el-table-column>
                 </el-table>

src/views/workbench/index.vue

@@ -184,7 +184,7 @@ const workbenchData: any = reactive({
         },
         yAxis: {
             type: 'value',
-            name: '单位（万）'
+            name: '单位（元）'
         },
         tooltip: {
             trigger: 'axis'