xxxx

src/packages/pc/views/account/address/index.vue

@@ -2,9 +2,7 @@
 <template>
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading" :row-key="rowKey" :expand-row-keys="expandKeys"  @row-click="rowClick">
         <template #header>
-            <div class="buttonbar">
-                <el-button type="danger" size="small" @click="showComponent('edit')">新增收货地址</el-button>
-            </div>
+            <el-button type="danger" size="small" @click="openComponent('edit')">新增收货地址</el-button>
         </template>
         <!-- 证件类型 -->
         <template #cardtypeid="{ value }">
@@ -19,11 +17,11 @@
             {{ value? '是': '否' }}
         </template>
         <!-- 操作 -->
-        <template #expand="{ row }">
+        <template #expand>
             <div class="buttonbar">
-                <el-button type="primary" size="small" @click="showComponent('edit', row)">编辑</el-button>
-                <el-button type="success" size="small" @click="showComponent('default', row)">设置默认</el-button>
-                <el-button type="danger" size="small" @click="showComponent('delete', row)">删除</el-button>
+                <el-button type="primary" size="small" @click="openComponent('edit')">编辑</el-button>
+                <el-button type="success" size="small" @click="openComponent('default')">设置默认</el-button>
+                <el-button type="danger" size="small" @click="openComponent('delete')">删除</el-button>
             </div>
         </template>
     </app-table>
@@ -33,8 +31,8 @@
 
 <script lang="ts" setup>
 import { shallowRef, defineAsyncComponent } from 'vue'
-import { ElMessage } from 'element-plus'
-import { useAddress } from '@/business/user/address'
+import { useRequest } from '@/hooks/request'
+import { queryUserReceiveInfo } from '@/services/api/user'
 import { getCertificateTypeName } from '@/constants/certificate'
 import { useComponent } from '@/hooks/component'
 import { useComposeTable } from '@pc/components/base/table'
@@ -46,17 +44,12 @@ const componentMap = new Map<string, unknown>([
     ['delete', defineAsyncComponent(() => import('./components/delete/index.vue'))],
 ])
 
-const { rowKey, expandKeys, rowClick } = useComposeTable<Model.UserReceiveInfoRsp>({ rowKey: 'autoid' })
-const selectedRow = shallowRef<Model.UserReceiveInfoRsp>()
-
-defineProps({
-    code: String
-})
+const { rowKey, expandKeys, selectedRow, rowClick } = useComposeTable<Model.UserReceiveInfoRsp>({ rowKey: 'autoid' })
 
-const { loading, dataList, getUserAddressList } = useAddress()
+const { loading, dataList, run } = useRequest(queryUserReceiveInfo, {})
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
-    getUserAddressList()
+    run()
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
@@ -68,11 +61,4 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'isdefault', label: '是否默认' },
 ])
 
-getUserAddressList().catch((err) => ElMessage.error(err))
-
-const showComponent = (componentName: string, row?: Model.UserReceiveInfoRsp) => {
-    selectedRow.value = row
-    openComponent(componentName)
-}
-
 </script>

src/packages/pc/views/account/receipt/index.vue

@@ -2,17 +2,17 @@
 <template>
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading" :row-key="rowKey" :expand-row-keys="expandKeys"  @row-click="rowClick">
         <template #header>
-            <el-button type="danger" size="small" @click="showComponent('edit')">新增收货地址</el-button>
+            <el-button type="danger" size="small" @click="openComponent('edit')">新增收货地址</el-button>
         </template>
         <!-- 发票类型 -->
         <template #receipttype="{ value }">
             {{ getReceiptTypeName(value) }}
         </template>
         <!-- 操作 -->
-        <template #expand="{ row }">
+        <template #expand>
             <div class="buttonbar">
-                <el-button type="primary" size="small" @click="showComponent('edit', row)">编辑</el-button>
-                <el-button type="danger" size="small" @click="showComponent('delete', row)">删除</el-button>
+                <el-button type="primary" size="small" @click="openComponent('edit')">编辑</el-button>
+                <el-button type="danger" size="small" @click="openComponent('delete')">删除</el-button>
             </div>
         </template>
     </app-table>
@@ -22,11 +22,11 @@
 
 <script lang="ts" setup>
 import { shallowRef, defineAsyncComponent } from 'vue'
-import { ElMessage } from 'element-plus'
-import { useInvoice } from '@/business/user/invoice'
 import { getReceiptTypeName } from '@/constants/receipt'
 import { useComponent } from '@/hooks/component'
 import { useComposeTable } from '@pc/components/base/table'
+import { useRequest } from '@/hooks/request'
+import { queryWrUserReceiptInfo } from '@/services/api/user'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -34,17 +34,16 @@ const componentMap = new Map<string, unknown>([
     ['delete', defineAsyncComponent(() => import('./components/delete/index.vue'))],
 ])
 
-const { rowKey, expandKeys, rowClick } = useComposeTable<Model.WrUserReceiptInfoRsp>({ rowKey: 'autoid' })
-const selectedRow = shallowRef<Model.WrUserReceiptInfoRsp>()
+const { rowKey, expandKeys, rowClick, selectedRow } = useComposeTable<Model.WrUserReceiptInfoRsp>({ rowKey: 'autoid' })
 
 defineProps({
     code: String
 })
 
-const { loading, dataList, getUserInvoiceList } = useInvoice()
+const { loading, dataList, run } = useRequest(queryWrUserReceiptInfo, {})
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
-    getUserInvoiceList()
+    run()
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
@@ -55,10 +54,4 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'information', label: '企业信息' },
 ])
 
-getUserInvoiceList().catch((err) => ElMessage.error(err))
-
-const showComponent = (componentName: string, row?: Model.WrUserReceiptInfoRsp) => {
-    selectedRow.value = row
-    openComponent(componentName)
-}
 </script>

src/packages/pc/views/footer/capital/summary/withdraw/index.vue

@@ -0,0 +1,62 @@
+<!-- 资金信息-资金汇总-出金申请 -->
+<template>
+    <app-drawer title="提现申请" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--horizontal" label-width="100px" :model="formData" :rules="formRules">
+            <el-form-item label="资金账号">
+                <span>{{ accountInfo?.accountid }}</span>
+            </el-form-item>
+            <el-form-item label="账户余额">
+                <span>{{ accountInfo?.currentbalance.toFixed(2) }}</span>
+            </el-form-item>
+            <el-form-item label="出金金额" prop="Amount">
+                <el-input type="number" placeholder="请输入" v-model="formData.Amount" />
+            </el-form-item>
+            <!-- <el-form-item label="金额大写">
+                <span>壹万元</span>
+            </el-form-item> -->
+            <el-form-item class="el-form-item--row" label="备注" prop="Remark">
+                <el-input type="textarea" :rows="3" v-model="formData.Remark" />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <el-button @click="onCancel(false)" plain>取消</el-button>
+            <el-button type="primary" @click="onSubmit">提交</el-button>
+        </template>
+    </app-drawer>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { useDoWithdraw } from '@/business/bank'
+import AppDrawer from '@pc/components/base/drawer/index.vue'
+
+const { loading, accountInfo, formData, formSubmit } = useDoWithdraw()
+const formRef = ref<FormInstance>()
+const show = ref(true)
+const refresh = ref(false)
+
+const formRules: FormRules = {
+    Amount: [{ required: true, message: '请输入金额', trigger: 'blur' }],
+}
+
+const onCancel = (isRefresh = false) => {
+    show.value = false
+    refresh.value = isRefresh
+}
+
+const onSubmit = () => {
+    formRef.value?.validate((valid) => {
+        if (valid) {
+            formSubmit().then(() => {
+                ElMessage.success('提交成功')
+            }).catch((err) => {
+                ElMessage.warning(err)
+            }).finally(() => {
+                onCancel(true)
+            })
+        }
+    })
+}
+</script>