出入金修改 增加订单明细

src/business/bank/index.ts

@@ -16,8 +16,9 @@ import moment from "moment"
 const accountStore = useAccountStore()
 const loginStore = useLoginStore()
 const useStore = useUserStore()
+const { getSystemParamValue } = useUserStore()
 
-// 提现请求
+// 出金请求
 export function useDoWithdraw() {
     const loading = shallowRef(false)
     /// 获取当前是否已签约
@@ -299,11 +300,13 @@ export function useDoCusBankExtendConfigs(extendbiztype?: number) {
     const configs = ref<(Model.BankCusBankExtendConfigRsp &{value:string})[]>([])
     /// 托管银行信息
     const cusBank = shallowRef<Partial<Model.CusBankSignBankRsp>>({})
+    const end = shallowRef<string>('')
     /// 查询签约银行信息
     queryCusBankSignBank().then((res) => {
         if (res.data.length) {
             const data = res.data[0]
             cusBank.value = data
+            end.value = (data.cusbankid === 'jdjs' ? getSystemParamValue('1003') : getSystemParamValue('013')) ?? ''
             /// 查询配置信息
             queryBankCusBankExtendConfigs({
                 data: {
@@ -322,6 +325,7 @@ export function useDoCusBankExtendConfigs(extendbiztype?: number) {
     })
 
     return { configs,
+                end,
              cusBank }
 }
 

src/packages/gstj/views/mine/Index.vue

@@ -41,7 +41,7 @@
                 </div>
                 <div class="button">
                     <Button type="danger" size="small" round @click="doInOutMoney('0')">入金</Button>
-                    <Button size="small" round @click="doInOutMoney('1')">提现</Button>
+                    <Button size="small" round @click="doInOutMoney('1')">出金</Button>
                 </div>
             </div>
         </div>

src/packages/mobile/views/bank/sign/Index.vue

@@ -94,7 +94,7 @@ const showComponent = (isEdit: boolean) => {
 
 const beforeShowComponent = () => {
     if (bankInfo.value?.cusbankid === 'jdjs') {
-        dialog('请先发函到结算中心修改信息后再修改，否则将会影响充值、提现。').then(() => {
+        dialog('请先发函到结算中心修改信息后再修改，否则将会影响充值、出金。').then(() => {
             showComponent(true)
         })
     } else {

src/packages/mobile/views/bank/wallet/Index.vue

@@ -1,13 +1,13 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="入金提现" />
+            <app-navbar title="入金出金" />
         </template>
         <Tabs v-model:active="active">
             <Tab title="入金">
                 <app-deposit />
             </Tab>
-            <Tab title="提现">
+            <Tab title="出金">
                 <app-withdraw />
             </Tab>
         </Tabs>

src/packages/mobile/views/bank/wallet/components/deposit/Index.vue

@@ -85,9 +85,8 @@ const { router } = useNavigation()
 const { getSystemParamValue } = useUserStore()
 const start = getSystemParamValue('012') ?? ''
 const limitMsg = getSystemParamValue('1002')
-const end = getSystemParamValue('1003') ?? ''
 const msg = getSystemParamValue('302')
-const { configs, cusBank } = useDoCusBankExtendConfigs(2)
+const { configs, cusBank, end } = useDoCusBankExtendConfigs(2)
 const certificate_photo_url = ref('')
 const userStore = useUserStore()
 

src/packages/mobile/views/bank/wallet/components/withdraw/Index.vue

@@ -2,9 +2,9 @@
     <app-view class="g-form bank-wallet-withdraw">
         <Form ref="formRef" v-if="cusBank.canoutamount === 1" class="g-form__container" @submit="doWithDrawWarning">
             <CellGroup inset>
-                <Field class="form-field" type="number" label="提现金额" v-model="formData.Amount" :rules="formRules.Amount">
+                <Field class="form-field" type="number" label="出金金额" v-model="formData.Amount" :rules="formRules.Amount">
                     <template #input>
-                        <input v-model="formData.Amount" placeholder="请填写提现金额" />
+                        <input v-model="formData.Amount" placeholder="请填写出金金额" />
                         <span class="form-field__tips">可出金额：{{ fund.AvailableOutMoney }}</span>
                     </template>
                 </Field>
@@ -34,7 +34,7 @@
             <span>{{ msg }}</span>
         </div>
         <div class="g-form__time">
-            <label>提现时间：{{ start }} - {{ end }}</label>
+            <label>出金时间：{{ start }} - {{ end }}</label>
         </div>
         <template #footer>
             <div class="g-form__footer inset">
@@ -54,7 +54,7 @@ import { useUserStore } from '@/stores'
 import moment from 'moment'
 
 const { formData, onSubmit, sign } = useDoWithdraw()
-const { configs, cusBank } = useDoCusBankExtendConfigs(3)
+const { configs, cusBank, end } = useDoCusBankExtendConfigs(3)
 /// 资金账户信息
 const { fund } = useAccountFundInfo()
 const { router } = useNavigation()
@@ -63,7 +63,6 @@ const { getSystemParamValue } = useUserStore()
 const start = getSystemParamValue('012') ?? ''
 const msg = getSystemParamValue('302')
 const limitMsg = getSystemParamValue('1002')
-const end = getSystemParamValue('1003') ?? ''
 const userStore = useUserStore()
 
 // 表单验证规则

src/packages/mobile/views/mine/Index.vue

@@ -41,7 +41,7 @@
                 </div>
                 <div class="button">
                     <Button type="danger" size="small" round @click="doInOutMoney('0')">入金</Button>
-                    <Button size="small" round @click="doInOutMoney('1')">提现</Button>
+                    <Button size="small" round @click="doInOutMoney('1')">出金</Button>
                 </div>
             </div>
         </div>

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

@@ -96,7 +96,7 @@ const showComponent = ((componentName: string) => {
 
 const beforeShowComponent = (row: Model.BankAccountSignRsp) => {
     if (row.cusbankid === 'jdjs') {
-        ElMessageBox.alert('请先发函到结算中心修改信息后再修改，否则将会影响充值、提现。').finally(() => {
+        ElMessageBox.alert('请先发函到结算中心修改信息后再修改，否则将会影响充值、出金。').finally(() => {
             showComponent('sign')
         })
     } else {

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

@@ -45,7 +45,7 @@ const props = defineProps({
 })
 
 const { formData, onSubmit, loading } = useDoDeposit(props.selectedRow.userid)
-const { configs, cusBank } = useDoCusBankExtendConfigs(2)
+const { configs, cusBank, end } = useDoCusBankExtendConfigs(2)
 const show = ref(true)
 const formRef = ref<FormInstance>()
 const userStore = useUserStore()
@@ -54,7 +54,6 @@ const { getSystemParamValue } = useUserStore()
 const msg = getSystemParamValue('302')
 const start = getSystemParamValue('012') ?? ''
 const limitMsg = getSystemParamValue('1002')
-const end = getSystemParamValue('1003') ?? ''
 
 const formRules: FormRules = {
     Amount: [{ required: true, message: '请输入入金金额' }],
@@ -78,6 +77,7 @@ const doDepositWarning = () => {
                     { confirmButtonText: '确认', cancelButtonText: '取消', })
                     .then(() => {
                         const now = moment(new Date().toISOString()).format('HH:mm')
+                        console.log(now)
                         if (now > start && now < end) {
                             /// 提交
                             formSubmit()

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

@@ -18,7 +18,7 @@
         <template #expand>
             <div class="buttonbar">
                 <el-button type="danger" size="small" @click="doInOutMoney('deposit')">入金</el-button>
-                <el-button type="primary" size="small" @click="doInOutMoney('withdraw')">提现</el-button>
+                <el-button type="primary" size="small" @click="doInOutMoney('withdraw')">出金</el-button>
             </div>
         </template>
         <template #footer>
@@ -43,7 +43,7 @@ import { ElMessage } from 'element-plus'
 
 const componentMap = new Map<string, unknown>([
     ['deposit', defineAsyncComponent(() => import('./deposit/index.vue'))], // 入金
-    ['withdraw', defineAsyncComponent(() => import('./withdraw/index.vue'))], // 提现
+    ['withdraw', defineAsyncComponent(() => import('./withdraw/index.vue'))], // 出金
 ])
 
 const accountStore = useAccountStore()

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

@@ -1,6 +1,6 @@
 <!-- 资金信息-资金汇总-出金申请 -->
 <template>
-    <app-drawer title="提现申请" :width="500" v-model:show="show" :loading="loading">
+    <app-drawer title="出金申请" :width="500" v-model:show="show" :loading="loading">
         <el-form ref="formRef" v-if="cusBank.canoutamount === 1" class="el-form--vertical" label-width="120px"
             :model="formData" :rules="formRules">
             <el-form-item label="资金账号">
@@ -9,9 +9,9 @@
             <el-form-item label="可出资金">
                 <span>{{ fund.AvailableOutMoney?.toFixed(2) }}</span>
             </el-form-item>
-            <el-form-item label="提现金额" prop="Amount">
-                <el-input-number placeholder="请输入提现金额" :precision="2" v-model="formData.Amount" />
-                <el-button type="danger" @click="formData.Amount = fund.AvailableOutMoney">全部提现</el-button>
+            <el-form-item label="出金金额" prop="Amount">
+                <el-input-number placeholder="请输入出金金额" :precision="2" v-model="formData.Amount" />
+                <el-button type="danger" @click="formData.Amount = fund.AvailableOutMoney">全部出金</el-button>
             </el-form-item>
             <template v-for="(item, index) in configs" :key="index">
                 <el-form-item :label="item.fieldname" :prop="item.fieldcode"
@@ -22,7 +22,7 @@
             <el-form-item class="el-form-item--row" label="备注" prop="Remark">
                 <el-input type="textarea" :maxlength="50" :rows="3" v-model="formData.Remark" />
             </el-form-item>
-            <el-form-item label="提现时间:">
+            <el-form-item label="出金时间:">
                 <span>{{ start }} - {{ end }}</span>
             </el-form-item>
         </el-form>
@@ -47,14 +47,13 @@ const accountStore = useAccountStore()
 const formRef = ref<FormInstance>()
 const show = ref(true)
 const userStore = useUserStore()
-const { configs, cusBank } = useDoCusBankExtendConfigs(3)
+const { configs, cusBank, end } = useDoCusBankExtendConfigs(3)
 /// 资金账户信息
 const { fund } = useAccountFundInfo()
 const { getSystemParamValue } = useUserStore()
 const msg = getSystemParamValue('302')
 const start = getSystemParamValue('012') ?? ''
 const limitMsg = getSystemParamValue('1002')
-const end = getSystemParamValue('1003') ?? ''
 
 const formRules: FormRules = {
     Amount: [{
@@ -79,6 +78,7 @@ const doWithDrawWarning = () => {
         formRef.value?.validate((valid) => {
             if (valid) {
                 const now = moment(new Date().toISOString()).format('HH:mm')
+                console.log(now)
                 if (now > start && now < end) {
                     /// 提交
                     formSubmit()

src/packages/qxst/views/mine/Index.vue

@@ -41,7 +41,7 @@
                 </div>
                 <div class="button">
                     <Button type="danger" size="small" round @click="doInOutMoney('0')">入金</Button>
-                    <Button size="small" round @click="doInOutMoney('1')">提现</Button>
+                    <Button size="small" round @click="doInOutMoney('1')">出金</Button>
                 </div>
             </div>
         </div>

src/packages/sbyj/views/mine/index.vue

@@ -41,7 +41,7 @@
                 </div>
                 <div class="button">
                     <Button type="danger" size="small" round @click="doInOutMoney('0')">入金</Button>
-                    <Button size="small" round @click="doInOutMoney('1')">提现</Button>
+                    <Button size="small" round @click="doInOutMoney('1')">出金</Button>
                 </div>
             </div>
         </div>

src/packages/tc/views/mine/Index.vue

@@ -41,7 +41,7 @@
                 </div>
                 <div class="button">
                     <Button type="danger" size="small" round @click="doInOutMoney('0')">入金</Button>
-                    <Button size="small" round @click="doInOutMoney('1')">提现</Button>
+                    <Button size="small" round @click="doInOutMoney('1')">出金</Button>
                 </div>
             </div>
         </div>

src/packages/zrwyt/views/mine/Index.vue

@@ -41,7 +41,7 @@
                 </div>
                 <div class="button">
                     <Button type="danger" size="small" round @click="doInOutMoney('0')">入金</Button>
-                    <Button size="small" round @click="doInOutMoney('1')">提现</Button>
+                    <Button size="small" round @click="doInOutMoney('1')">出金</Button>
                 </div>
             </div>
         </div>

src/services/api/bank/index.ts

@@ -92,7 +92,7 @@ export function queryBankInfo(config: RequestConfig = {}) {
 }
 
 /**
- * 查询签约银行信息(提现账户管理)
+ * 查询签约银行信息(出金账户管理)
  */
 export function queryBankAccountSign(config: RequestConfig<Model.BankAccountSignReq> = {}) {
     return http.commonRequest<Model.BankAccountSignRsp[]>({
@@ -105,7 +105,7 @@ export function queryBankAccountSign(config: RequestConfig<Model.BankAccountSign
 }
 
 /**
- * 查询充值提现
+ * 查询充值出金
  */
 export function queryAccountInOutApply(config: RequestConfig<Model.AccountInOutApplyReq> = {}) {
     return http.commonRequest<Model.AccountOutInApplyRsp[]>({

src/types/model/bank.d.ts

@@ -46,12 +46,12 @@ declare namespace Model {
         status: number; // 状态 - 0:正常 1:注销
     }
 
-    /** 查询签约银行信息(提现账户管理) 请求 */
+    /** 查询签约银行信息(出金账户管理) 请求 */
     interface BankAccountSignReq {
         userid?: number;  // 用户ID
     }
 
-    /** 查询签约银行信息(提现账户管理) 响应 */
+    /** 查询签约银行信息(出金账户管理) 响应 */
     interface BankAccountSignRsp {
         accountcode: string;//资金账号
         accountname: string;//资金账号对应的账号名(UserName)
@@ -91,17 +91,17 @@ declare namespace Model {
         updatetime: string;//更新时间(签解约更新时间)
     }
 
-    /** 查询充值提现 请求 */
+    /** 查询充值出金 请求 */
     interface AccountInOutApplyReq {
         userid: number;  // 用户ID
         begindate?: string;  //   申请起始日期(格式yyyymmdd)
         enddate?: string;    //   申请截止日期(格式yyyymmdd)
         likename?: string;   //   模糊搜索名称
         applystatus?: number; // 状态 1-待审核 2-审核通过 3-审核拒绝
-        querytype?: number; // 查询类型 1-提现(出金) 2-充值(入金)
+        querytype?: number; // 查询类型 1-出金(出金) 2-充值(入金)
     }
 
-    /** 查询充值提现 响应 */
+    /** 查询充值出金 响应 */
     interface AccountOutInApplyRsp {
         accountcode: string;//资金账号
         accountname: string;//用户名称(名称)