li.shaoyi vor 1 Jahr
Ursprung
Commit
1407632a22

+ 2 - 2
oem/gstj/config/router.json

@@ -388,7 +388,7 @@
                 "sort": 2,
                 "title": "入金代扣签约",
                 "code": "account_holdsign",
-                "url": "address",
+                "url": "holdsign",
                 "urlType": 1,
                 "component": "views/account/holdsign/index.vue"
             },
@@ -397,7 +397,7 @@
                 "sort": 3,
                 "title": "入金代扣申请",
                 "code": "account_holddeposit",
-                "url": "address",
+                "url": "holddeposit",
                 "urlType": 1,
                 "component": "views/account/holddeposit/index.vue"
             },

+ 2 - 2
public/config/router.json

@@ -685,7 +685,7 @@
                 "sort": 2,
                 "title": "入金代扣签约",
                 "code": "account_holdsign",
-                "url": "address",
+                "url": "holdsign",
                 "urlType": 1,
                 "component": "views/account/holdsign/index.vue"
             },
@@ -694,7 +694,7 @@
                 "sort": 3,
                 "title": "入金代扣申请",
                 "code": "account_holddeposit",
-                "url": "address",
+                "url": "holddeposit",
                 "urlType": 1,
                 "component": "views/account/holddeposit/index.vue"
             },

+ 1 - 1
src/packages/gstj/views/holdbank/holddeposit/components/apply/Index.vue

@@ -27,7 +27,7 @@
                 </CellGroup>
                 <div class="tips_time">
                     <span class="tips">入金时间:交易日 {{ startTime }} - {{ endTime }}</span>
-                    <span class="tips"><br>节假日以通知、公告为准非交易日请勿操作!</span>
+                    <span class="tips"><br>节假日以通知、公告为准非交易日请勿操作!</span>
                 </div>
             </Form>
             <template #footer>

+ 1 - 1
src/packages/gstj/views/holdbank/holdsign/components/apply/Index.vue

@@ -21,7 +21,7 @@
                 <CellGroup inset>
                     <div class="tips_time">
                         <span class="tips">操作时间:交易日 {{ startTime }} - {{ endTime }}</span>
-                        <span class="tips"><br>节假日以通知、公告为准非交易日请勿操作!</span>
+                        <span class="tips"><br>节假日以通知、公告为准非交易日请勿操作!</span>
                     </div>
                 </CellGroup>
             </Form>

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

@@ -17,7 +17,7 @@
             </CellGroup>
             <div class="tips_time">
                 <span class="tips">入金时间:交易日 {{ startTime }} - {{ endTime }}</span>
-                <span class="tips"><br>节假日以通知、公告为准非交易日请勿操作!</span>
+                <span class="tips"><br>节假日以通知、公告为准非交易日请勿操作!</span>
             </div>
             <div class="tips_bank">
                 <div class="tips_bank_row" v-if="msg_320">

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

@@ -32,7 +32,7 @@
             </CellGroup>
             <div class="tips_time">
                 <span class="msg_tips">出金时间:交易日 {{ startTime }} - {{ endTime }}</span>
-                <span class="msg_tips"><br>节假日以通知、公告为准非交易日请勿操作!</span>
+                <span class="msg_tips"><br>节假日以通知、公告为准非交易日请勿操作!</span>
             </div>
             <CellGroup inset v-if="msg_317">
                 <Cell title="提示">

+ 42 - 24
src/packages/pc/views/account/holddeposit/components/deposit/index.vue

@@ -1,14 +1,13 @@
 <!-- 账户管理-入金代扣申请-入金代扣申请 -->
 <template>
     <app-drawer title="入金代扣申请" :width="500" v-model:show="show" :loading="loading">
-        <el-form ref="formRef" class="el-form--vertical" label-width="80px"
-            :model="formData" :rules="formRules">
+        <el-form ref="formRef" class="el-form--vertical" label-width="80px" :model="formData" :rules="formRules">
             <el-form-item label="扣费账号" prop="bankaccountno">
                 <el-input name="bankaccountno" readonly v-model="bankaccountno" />
             </el-form-item>
             <el-form-item prop="Amount" label="入金金额">
-                <el-input-number placeholder="请输入入金金额" :max="500000" :min="0.0" :precision="2" :step="0.01" v-model="billAmount"
-                    :rules="formRules.BillAmount" />
+                <el-input-number placeholder="请输入入金金额" :max="500000" :min="0.0" :precision="2" :step="0.01"
+                    v-model="billAmount" :rules="formRules.BillAmount" />
             </el-form-item>
             <!-- <el-form-item>
                 <span>{{ numberToChinese(formatDecimal(billAmount)) }}</span>
@@ -18,8 +17,9 @@
             </el-form-item>
         </el-form>
         <fieldset class="g-fieldset">
-            <legend class="g-fieldset__legend">交易日</legend>
-            <span class="tips">操作时间:交易日</span>
+            <legend class="g-fieldset__legend">提示</legend>
+            <span class="tips" style="display: block;color: #b8c3cd;">入金时间:交易日 {{ startTime }} - {{ endTime }}</span>
+            <span class="tips" style="color: #b8c3cd;">节假日以通知、公告为准,非交易日请勿操作!</span>
         </fieldset>
         <template #footer>
             <el-button type="info" @click="onCancel">取消</el-button>
@@ -30,9 +30,11 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue'
-import { ElMessage, FormInstance, FormRules } from 'element-plus'
-import { useDoYJF_WithholdInApply } from '@/business/bank'
-import { formatDecimal } from '@/filters';
+import { ElMessage, ElMessageBox, FormInstance, FormRules } from 'element-plus'
+import { formatDecimal } from '@/filters'
+import { useDoYJF_WithholdInApply, useDoCusBankExtendConfigs } from '@/business/bank'
+import { getServerTime } from '@/services/api/common'
+import moment from 'moment'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
 const { formData, onSubmit, loading, bankaccountno } = useDoYJF_WithholdInApply()
@@ -40,19 +42,21 @@ const show = ref(true)
 const formRef = ref<FormInstance>()
 const billAmount = ref(0.0)
 
+const { startTime, endTime } = useDoCusBankExtendConfigs(2)
+
 /// 备注
 const Remark = ref('')
 const formRules: FormRules = {
-    BillAmount: [{ 
-        required: true, 
+    BillAmount: [{
+        required: true,
         message: '请输入代扣金额',
-            validator: (rule, value, callback) => {
-                if (value > 500000) {
-                    callback(new Error('代扣金额不能超过50万'))
-                } else {
-                    callback()
-                }
-            } 
+        validator: (rule, value, callback) => {
+            if (value > 500000) {
+                callback(new Error('代扣金额不能超过50万'))
+            } else {
+                callback()
+            }
+        }
     }],
 }
 
@@ -63,12 +67,26 @@ const onCancel = () => {
 const formSubmit = () => {
     formRef.value?.validate((valid) => {
         if (valid) {
-            formData.BillAmount = formatDecimal(billAmount.value)
-            onSubmit().then(() => {
-                ElMessage.success('提交成功,请稍后确认结果')
-                onCancel()
-            }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+            loading.value = true
+            getServerTime().then((res) => {
+                const n = moment(res.data)
+                const s = moment(startTime.value, 'HH:mm')
+                const e = moment(endTime.value, 'HH:mm')
+                if (n.isSameOrAfter(s) && n.isBefore(e)) {
+                    formData.BillAmount = formatDecimal(billAmount.value)
+                    onSubmit().then(() => {
+                        ElMessage.success('提交成功,请稍后确认结果')
+                        onCancel()
+                    }).catch((err) => {
+                        ElMessage.error('提交失败:' + err)
+                    })
+                } else {
+                    ElMessageBox.confirm('入金不在时间范围内', '提示', { confirmButtonText: '我知道了', showCancelButton: false })
+                }
+            }).catch(() => {
+                ElMessage.error('获取服务器时间失败')
+            }).finally(() => {
+                loading.value = false
             })
         }
     })

+ 6 - 6
src/packages/pc/views/footer/capital/summary/deposit/index.less

@@ -1,18 +1,18 @@
-
 .msg_row {
-    height: 30px;
-
     .msg_tips {
         color: #0099FF;
+        cursor: pointer;
         padding-left: 14px;
     }
-    
+
     .msg_label {
-        color: #999;
+        color: #b8c3cd;
     }
 }
 
 .el-form-tips {
-    color: #CC6666; 
+    display: block;
+    line-height: 1.7;
+    color: #b8c3cd;
     font-size: 13px;
 }

+ 23 - 25
src/packages/pc/views/footer/capital/summary/deposit/index.vue

@@ -1,6 +1,6 @@
 <!-- 资金信息-资金汇总-入金 -->
 <template>
-    <app-drawer title="入金" :width="550" v-model:show="show" :loading="loading">
+    <app-drawer title="入金" :width="600" v-model:show="show" :loading="loading">
         <el-form ref="formRef" v-if="cusBank?.caninamount === 1" class="el-form--vertical" label-width="120px"
             :model="formData" :rules="formRules">
             <el-form-item prop="Amount" label="入金金额">
@@ -17,34 +17,32 @@
                 </el-form-item>
             </template>
         </el-form>
-        <fieldset style="border: 1px solid #162534; padding: 15px;">
-            <legend>入金时间</legend>
+        <fieldset class="g-fieldset">
+            <legend class="g-fieldset__legend">入金时间</legend>
             <span class="el-form-tips">入金时间:交易日 {{ startTime }} - {{ endTime }}</span>
-            <span class="el-form-tips" style="margin-bottom: 10px;"><br>节假日以通知、公告为准;非交易日请勿操作!</span>
+            <span class="el-form-tips">节假日以通知、公告为准,非交易日请勿操作!</span>
         </fieldset>
-        <fieldset style="border: 1px solid #162534; padding: 15px;" v-if="msg_320">
-            <legend>入金平台</legend>
-            <div>
-                <div class="msg_row" v-if="msg_320">
-                    <span class="msg_label">平台入金银行</span>
-                    <span class="msg_tips" :data-clipboard-text="msg_320" v-copy="onCopy">{{ msg_320 }}</span>
-                </div>
-                <div class="msg_row" v-if="msg_321">
-                    <span class="msg_label">平台入金账号</span>
-                    <span class="msg_tips" :data-clipboard-text="msg_321" v-copy="onCopy">{{ msg_321 }}</span>
-                </div>
-                <div class="msg_row" v-if="msg_322">
-                    <span class="msg_label">平台入金账户</span>
-                    <span class="msg_tips" :data-clipboard-text="msg_322" v-copy="onCopy">{{ msg_322 }}</span>
-                </div>
-                <div class="msg_row" v-if="msg_323">
-                    <span class="msg_label">平台入金支行</span>
-                    <span class="msg_tips" :data-clipboard-text="msg_323" v-copy="onCopy">{{ msg_323 }}</span>
-                </div>
+        <fieldset class="g-fieldset" v-if="msg_320">
+            <legend class="g-fieldset__legend">入金平台</legend>
+            <div class="msg_row" v-if="msg_320">
+                <span class="msg_label">平台入金银行</span>
+                <span class="msg_tips" :data-clipboard-text="msg_320" v-copy="onCopy">{{ msg_320 }}</span>
+            </div>
+            <div class="msg_row" v-if="msg_321">
+                <span class="msg_label">平台入金账号</span>
+                <span class="msg_tips" :data-clipboard-text="msg_321" v-copy="onCopy">{{ msg_321 }}</span>
+            </div>
+            <div class="msg_row" v-if="msg_322">
+                <span class="msg_label">平台入金账户</span>
+                <span class="msg_tips" :data-clipboard-text="msg_322" v-copy="onCopy">{{ msg_322 }}</span>
+            </div>
+            <div class="msg_row" v-if="msg_323">
+                <span class="msg_label">平台入金支行</span>
+                <span class="msg_tips" :data-clipboard-text="msg_323" v-copy="onCopy">{{ msg_323 }}</span>
             </div>
         </fieldset>
-        <fieldset style="border: 1px solid #162534;padding: 15px;" v-if="msg_324">
-            <legend>提示</legend>
+        <fieldset class="g-fieldset" v-if="msg_324">
+            <legend class="g-fieldset__legend">提示</legend>
             <span class="el-form-tips" v-html="msg_324" />
         </fieldset>
         <template #footer>

+ 3 - 1
src/packages/pc/views/footer/capital/summary/withdraw/index.less

@@ -1,4 +1,6 @@
 .el-form-tips {
-    color: #CC6666; 
+    display: block;
+    line-height: 1.7;
+    color: #b8c3cd;
     font-size: 13px;
 }

+ 12 - 10
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="600" v-model:show="show" :loading="loading">
         <el-form ref="formRef" v-if="cusBank?.canoutamount === 1" class="el-form--vertical" label-width="140px"
             :model="formData" :rules="formRules">
             <el-form-item label="资金账号">
@@ -10,8 +10,10 @@
                 <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>
+                <div class="el-form-item--col">
+                    <el-input-number placeholder="请输入出金金额" :precision="2" v-model="formData.Amount" />
+                    <el-button type="danger" @click="formData.Amount = fund.AvailableOutMoney">全部出金</el-button>
+                </div>
             </el-form-item>
             <template v-for="(item, index) in configs" :key="index">
                 <el-form-item :label="item.fieldname" :prop="item.fieldcode"
@@ -22,18 +24,18 @@
             <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>
-            <fieldset style="border: 1px solid #162534; padding: 15px;">
-                <legend>出金时间</legend>
+            <fieldset class="g-fieldset">
+                <legend class="g-fieldset__legend">出金时间</legend>
                 <span class="el-form-tips">出金时间:交易日 {{ startTime }} - {{ endTime }}</span>
-                <span class="el-form-tips" style="margin-bottom: 10px;"><br>节假日以通知、公告为准;非交易日请勿操作!</span>
+                <span class="el-form-tips">节假日以通知、公告为准,非交易日请勿操作!</span>
             </fieldset>
-            <fieldset style="border: 1px solid #162534;padding: 15px;" v-if="msg_317">
-                <legend>提示</legend>
+            <fieldset class="g-fieldset" v-if="msg_317">
+                <legend class="g-fieldset__legend">提示</legend>
                 <span class="el-form-tips" v-html="msg_317" />
             </fieldset>
         </el-form>
-        <fieldset style="border: 1px solid #162534;padding: 15px;" v-if="cusBank?.canoutamount === 0">
-            <legend>提示</legend>
+        <fieldset class="g-fieldset" v-if="cusBank?.canoutamount === 0">
+            <legend class="g-fieldset__legend">提示</legend>
             <span class="el-form-tips" v-html="msg" />
         </fieldset>
         <template #footer>