update

public/config/appconfig.json

@@ -4,7 +4,7 @@
   "appTitle": "多元世纪交易中心",
   "version": "1.0.8",
   "versionCode": "10008",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://192.168.31.205:8080/cfg?key=test_205",
   "tradeChannel": "ws",
   "modules": [
     "register",

src/business/bank/index.ts

@@ -286,41 +286,41 @@ export function useAccountFundInfo() {
 }
 
 /// 查询托管银行扩展配置信息
-export function useDoCusBankExtendConfigs(extendbiztype?: number) {
+export function useDoCusBankExtendConfigs(extendbiztype: number) {
     /// 托管银行拓展信息
     const configs = ref<(Model.BankCusBankExtendConfigRsp & { value: string })[]>([])
     /// 托管银行信息
-    const cusBank = shallowRef<Partial<Model.CusBankSignBankRsp>>({})
-    const end = shallowRef<string>('')
+    const cusBank = shallowRef<Model.CusBankSignBankRsp>()
+
+    const startTime = shallowRef(getSystemParamValue('012') ?? '')
+    const endTime = shallowRef(getSystemParamValue('013') ?? '')
+
     /// 查询签约银行信息
     queryCusBankSignBank().then((res) => {
-        if (res.data.length) {
-            const data = res.data[0]
-            cusBank.value = data
+        const firstData = res.data[0]
+        if (firstData) {
+            cusBank.value = firstData
             /// 不为空 入金取 318 出金取 319
-            const msg = getSystemParamValue(extendbiztype === 2 ? '318' : '319') ?? ''
-            const msg_013 = getSystemParamValue('013') ?? ''
-            end.value = msg != '' ? msg : msg_013
+            endTime.value = getSystemParamValue(extendbiztype === 2 ? '318' : '319') ?? endTime.value
             /// 查询配置信息
             queryBankCusBankExtendConfigs({
                 data: {
-                    cusbankid: data?.cusbankid,
+                    cusbankid: firstData.cusbankid,
                     extendbiztype: extendbiztype
                 },
             }).then((res) => {
-                if (res.data.length != 0) {
-                    configs.value = res.data.map(obj => ({
-                        ...obj,
-                        value: obj.fieldcode === 'legal_name' ? (useStore.userInfo?.legalpersonname ?? '') : ''
-                    }))
-                }
+                configs.value = res.data.map(obj => ({
+                    ...obj,
+                    value: obj.fieldcode === 'legal_name' ? (useStore.userInfo?.legalpersonname ?? '') : ''
+                }))
             })
         }
     })
 
     return {
         configs,
-        end,
+        startTime,
+        endTime,
         cusBank
     }
 }
@@ -500,7 +500,7 @@ export function useDoYJFGetWithholdSignInSMSVCode() {
         LoginID: loginStore.loginId,
         ClientSerialNo: v4(),
         Yckfxe: '500000.00',
-        Kkzqnkfxe: '0.00', 
+        Kkzqnkfxe: '0.00',
         Kkzqnxzbs: '0',
         Kksjbc: '99',
         Kksjdw: '1'

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

@@ -2,7 +2,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title='入金代扣申请' @back="closed" />
+                <app-navbar title="入金代扣申请" @back="closed" />
             </template>
             <Form ref="formRef" class="g-form__container" @submit="formSubmit">
                 <CellGroup inset>
@@ -26,7 +26,7 @@
                     <Field v-model="Remark" label="备注" placeholder="请输入备注" />
                 </CellGroup>
                 <div class="tips_time">
-                    <span class="tips">操作时间：交易日 {{ start }} - {{ end }}</span>
+                    <span class="tips">操作时间：交易日 {{ startTime }} - {{ endTime }}</span>
                 </div>
             </Form>
             <template #footer>
@@ -45,7 +45,6 @@ import { fullloading, dialog } from '@/utils/vant'
 import { formatDecimal } from '@/filters'
 import { useDoYJF_WithholdInApply, useDoCusBankExtendConfigs } from '@/business/bank'
 import { getServerTime } from '@/services/api/common'
-import { useUserStore } from '@/stores'
 import AppModal from '@/components/base/modal/index.vue'
 import moment from 'moment'
 
@@ -60,9 +59,7 @@ const Remark = ref('')
 const billAmount = ref(0.0)
 
 /// 时间限制
-const { getSystemParamValue } = useUserStore()
-const start = getSystemParamValue('012') ?? ''
-const { end } = useDoCusBankExtendConfigs(2)
+const { startTime, endTime } = useDoCusBankExtendConfigs(2)
 
 // 关闭弹窗
 const closed = (isRefresh = false) => {
@@ -93,8 +90,8 @@ const formSubmit = () => {
     fullloading((hideLoading) => {
         getServerTime().then((res) => {
             const n = moment(res.data)
-            const s = moment(start, 'HH:mm')
-            const e = moment(end.value, 'HH:mm')
+            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(() => {

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

@@ -8,17 +8,19 @@
                 <CellGroup inset>
                     <Field readonly name="bankaccountno" label="扣费账号" v-model="bankaccountno" />
                     <Field name="Xysxrq" readonly label="协议生效期" maxlength="30" v-model.trim="formData.Xysxrq"
-                        placeholder="请选择协议生效期" :rules="formRules.Xysxrq" is-link @click="showCalendar = true"/>
+                        placeholder="请选择协议生效期" :rules="formRules.Xysxrq" is-link @click="showCalendar = true" />
                     <Field name="Xydqrq" readonly label="协议到期日" maxlength="30" v-model.trim="formData.Xydqrq"
                         placeholder="请选择协议到期日" :rules="formRules.Xydqrq" is-link @click="showCalendar = true" />
                     <Field type="number" name="Lxdh" label="手机号码" maxlength="30" v-model.trim="formData.Lxdh"
                         placeholder="请输入手机号码" :rules="formRules.Lxdh" />
-                    <Field name="Addr" label="联系地址" type="textarea" autosize maxlength="128" v-model.trim="formData.Addr" placeholder="请输入联系地址"/>
-                    <Field name="Remark" type="textarea" autosize label="备注" maxlength="128" v-model.trim="formData.Remark" placeholder="备注"/>
+                    <Field name="Addr" label="联系地址" type="textarea" autosize maxlength="128"
+                        v-model.trim="formData.Addr" placeholder="请输入联系地址" />
+                    <Field name="Remark" type="textarea" autosize label="备注" maxlength="128"
+                        v-model.trim="formData.Remark" placeholder="备注" />
                 </CellGroup>
                 <CellGroup inset>
                     <div class="tips_time">
-                        <span class="tips">操作时间：交易日 {{ start }} - {{ end }}</span>
+                        <span class="tips">操作时间：交易日 {{ startTime }} - {{ endTime }}</span>
                     </div>
                 </CellGroup>
             </Form>
@@ -26,11 +28,13 @@
                 <div class="g-form__footer inset">
                     <Button type="danger" round block @click="formRef?.submit()">发送验证码</Button>
                 </div>
-                <Calendar v-model:show="showCalendar" type="range" :max-date="moment().add(5, 'years').toDate()" :min-date="new Date()" @confirm="onConfirm" />
+                <Calendar v-model:show="showCalendar" type="range" :max-date="moment().add(5, 'years').toDate()"
+                    :min-date="new Date()" @confirm="onConfirm" />
             </template>
-            <component ref="componentRef" :is="componentMap.get(componentId)" @closed="closeComponent" v-if="componentId" />
+            <component ref="componentRef" :is="componentMap.get(componentId)" @closed="closeComponent"
+                v-if="componentId" />
         </app-view>
-    </app-modal>           
+    </app-modal>
 </template>
 
 <script lang="ts" setup>
@@ -41,24 +45,20 @@ import { useDoYJFGetWithholdSignInSMSVCode, useDoCusBankExtendConfigs } from '@/
 import { validateRules } from '@/constants/regex'
 import { formatDate } from '@/filters'
 import { useComponent } from '@/hooks/component'
-import { useUserStore } from '@/stores'
 import moment from 'moment'
 import AppModal from '@/components/base/modal/index.vue'
 
 // 是否显示日期选择器
-const showCalendar = shallowRef(false) 
+const showCalendar = shallowRef(false)
 const formRef = shallowRef<FormInstance>()
 const showModal = shallowRef(true)
 const refresh = shallowRef(false) // 是否刷新父组件数据
 const { formData, onSubmit, bankaccountno } = useDoYJFGetWithholdSignInSMSVCode()
 // 日期范围
-const dateRange = ref<string[]>([]) 
+const dateRange = ref<string[]>([])
 
-const { getSystemParamValue } = useUserStore()
-/// 入金时间范围
-const start = getSystemParamValue('012') ?? ''
 /// 不为空 入金取 318 出金取 319
-const { end } = useDoCusBankExtendConfigs(2)
+const { startTime, endTime } = useDoCusBankExtendConfigs(2)
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     closed(true)
@@ -107,8 +107,8 @@ const onConfirm = ([start, end]: Date[]) => {
 const formSubmit = () => {
     const now = moment().format('HH:mm')
     const n = moment(now, 'HH:mm')
-    const s = moment(start, 'HH:mm')
-    const e = moment(end.value, 'HH:mm')
+    const s = moment(startTime.value, 'HH:mm')
+    const e = moment(endTime.value, 'HH:mm')
     if (n.isAfter(s) && n.isBefore(e)) {
         dialog({
             message: '确认要申请代扣签约吗？',

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

@@ -1,7 +1,7 @@
 <template>
     <app-view class="g-form bank-wallet-deposit">
         <Form ref="formRef" class="g-form__container" @submit="doDepositWarning">
-            <CellGroup inset v-if="cusBank.caninamount === 1">
+            <CellGroup inset v-if="cusBank?.caninamount === 1">
                 <Field type="number" v-model="formData.Amount" label="入金金额" placeholder="请填写入金金额"
                     :rules="formRules.Amount" />
                 <Field label="凭证" :rules="formRules.filePath">
@@ -16,7 +16,7 @@
                 </template>
             </CellGroup>
             <div class="tips_time">
-                <span class="tips">入金时间：交易日 {{ start }} - {{ end }}</span>
+                <span class="tips">入金时间：交易日 {{ startTime }} - {{ endTime }}</span>
                 <span class="tips"><br>节假日以通知、公告为准；非交易日请勿操作！</span>
             </div>
             <div class="tips_bank">
@@ -45,7 +45,7 @@
                 </Cell>
             </CellGroup>
         </Form>
-        <template #footer v-if="cusBank.caninamount === 1">
+        <template #footer v-if="cusBank?.caninamount === 1">
             <div class="g-form__footer inset">
                 <Button round block type="danger" @click="formRef?.submit()">确定</Button>
             </div>
@@ -68,11 +68,10 @@ const formRef = shallowRef<FormInstance>()
 const { formData, onSubmit } = useDoDeposit()
 const { router } = useNavigation()
 const { getSystemParamValue } = useUserStore()
-const { configs, cusBank, end } = useDoCusBankExtendConfigs(2)
+const { configs, cusBank, startTime, endTime } = useDoCusBankExtendConfigs(2)
 const certificate_photo_url = ref('')
 const userStore = useUserStore()
 
-const start = getSystemParamValue('012') ?? ''
 const msg_320 = getSystemParamValue('320')
 const msg_321 = getSystemParamValue('321')
 const msg_322 = getSystemParamValue('322')
@@ -104,8 +103,8 @@ const doDepositWarning = () => {
     fullloading((hideLoading) => {
         getServerTime().then((res) => {
             const n = moment(res.data)
-            const s = moment(start, 'HH:mm')
-            const e = moment(end.value, 'HH:mm')
+            const s = moment(startTime.value, 'HH:mm')
+            const e = moment(endTime.value, 'HH:mm')
             if (n.isSameOrAfter(s) && n.isBefore(e)) {
                 dialog({ message: '是否已在银行端进行入金转账？', showCancelButton: true, confirmButtonText: '确认', cancelButtonText: '取消', }).then(() => {
                     /// 提交

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

@@ -1,7 +1,7 @@
 <template>
     <app-view class="g-form bank-wallet-withdraw">
         <Form ref="formRef" class="g-form__container" @submit="doWithDrawWarning">
-            <CellGroup inset v-if="cusBank.canoutamount === 1">
+            <CellGroup inset v-if="cusBank?.canoutamount === 1">
                 <Field class="form-field" type="number" label="出金金额" v-model="formData.Amount"
                     :rules="formRules.Amount">
                     <template #input>
@@ -31,7 +31,7 @@
                 </template>
             </CellGroup>
             <div class="tips_time">
-                <span class="msg_tips">出金时间：交易日 {{ start }} - {{ end }}</span>
+                <span class="msg_tips">出金时间：交易日 {{ startTime }} - {{ endTime }}</span>
                 <span class="msg_tips"><br>节假日以通知、公告为准；非交易日请勿操作！</span>
             </div>
             <CellGroup inset v-if="msg_317">
@@ -41,7 +41,7 @@
                     </template>
                 </Cell>
             </CellGroup>
-            <CellGroup inset v-if="cusBank.canoutamount === 0">
+            <CellGroup inset v-if="cusBank?.canoutamount === 0">
                 <Cell>
                     <template #label>
                         <p v-html="msg"></p>
@@ -49,7 +49,7 @@
                 </Cell>
             </CellGroup>
         </Form>
-        <template #footer v-if="cusBank.canoutamount === 1">
+        <template #footer v-if="cusBank?.canoutamount === 1">
             <div class="g-form__footer inset">
                 <Button round block type="danger" @click="formRef?.submit()">确定</Button>
             </div>
@@ -68,13 +68,12 @@ import { useUserStore } from '@/stores'
 import moment from 'moment'
 
 const { formData, onSubmit, sign } = useDoWithdraw()
-const { configs, cusBank, end } = useDoCusBankExtendConfigs(3)
+const { configs, cusBank, startTime, endTime } = useDoCusBankExtendConfigs(3)
 /// 资金账户信息
 const { fund } = useAccountFundInfo()
 const { router } = useNavigation()
 const formRef = shallowRef<FormInstance>()
 const { getSystemParamValue } = useUserStore()
-const start = getSystemParamValue('012') ?? ''
 const msg = getSystemParamValue('302')
 const msg_317 = getSystemParamValue('317')
 const userStore = useUserStore()
@@ -101,8 +100,8 @@ const doWithDrawWarning = () => {
     fullloading((hideLoading) => {
         getServerTime().then((res) => {
             const n = moment(res.data)
-            const s = moment(start, 'HH:mm')
-            const e = moment(end.value, 'HH:mm')
+            const s = moment(startTime.value, 'HH:mm')
+            const e = moment(endTime.value, 'HH:mm')
             // 出金时间必须在开始和结束时间之间
             if (n.isSameOrAfter(s) && n.isBefore(e)) {
                 /// 提交

src/packages/pc/views/account/holddeposit/components/deposit/index.vue

@@ -1,7 +1,7 @@
 <!-- 账户管理-入金代扣申请-入金代扣申请 -->
 <template>
-    <app-drawer title="入金代扣申请" :width="550" v-model:show="show" :loading="loading">
-        <el-form ref="formRef" class="el-form--vertical" label-width="120px"
+    <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-item label="扣费账号" prop="bankaccountno">
                 <el-input name="bankaccountno" readonly v-model="bankaccountno" />
@@ -17,6 +17,10 @@
                 <el-input name="Remark" type="textarea" placeholder="请输入备注" :rows="3" v-model="Remark" />
             </el-form-item>
         </el-form>
+        <fieldset class="g-fieldset">
+            <legend class="g-fieldset__legend">交易日</legend>
+            <span class="tips">操作时间：交易日</span>
+        </fieldset>
         <template #footer>
             <el-button type="info" @click="onCancel">取消</el-button>
             <el-button type="primary" @click="formSubmit">提交</el-button>

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

@@ -1,7 +1,7 @@
 <!-- 资金信息-资金汇总-入金 -->
 <template>
     <app-drawer title="入金" :width="550" v-model:show="show" :loading="loading">
-        <el-form ref="formRef" v-if="cusBank.caninamount === 1" class="el-form--vertical" label-width="120px"
+        <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="入金金额">
                 <el-input-number placeholder="请输入" :max="9999999999" :precision="2" v-model="formData.Amount"
@@ -19,7 +19,7 @@
         </el-form>
         <fieldset style="border: 1px solid #162534; padding: 15px;">
             <legend>入金时间</legend>
-            <span class="el-form-tips">入金时间：交易日 {{ start }} - {{ end }}</span>
+            <span class="el-form-tips">入金时间：交易日 {{ startTime }} - {{ endTime }}</span>
             <span class="el-form-tips" style="margin-bottom: 10px;"><br>节假日以通知、公告为准；非交易日请勿操作！</span>
         </fieldset>
         <fieldset style="border: 1px solid #162534; padding: 15px;" v-if="msg_320">
@@ -49,7 +49,7 @@
         </fieldset>
         <template #footer>
             <el-button type="info" @click="onCancel">取消</el-button>
-            <el-button v-if="cusBank.caninamount === 1" type="primary" @click="doDepositWarning">提交</el-button>
+            <el-button v-if="cusBank?.caninamount === 1" type="primary" @click="doDepositWarning">提交</el-button>
         </template>
     </app-drawer>
 </template>
@@ -72,14 +72,13 @@ const props = defineProps({
 })
 
 const { formData, onSubmit, loading } = useDoDeposit(props.selectedRow.userid)
-const { configs, cusBank, end } = useDoCusBankExtendConfigs(2)
+const { configs, cusBank, startTime, endTime } = useDoCusBankExtendConfigs(2)
 const show = ref(true)
 const formRef = ref<FormInstance>()
 const userStore = useUserStore()
 const certificate_photo_url = ref('')
 const { getSystemParamValue } = useUserStore()
 
-const start = getSystemParamValue('012') ?? ''
 const msg_320 = getSystemParamValue('320')
 const msg_321 = getSystemParamValue('321')
 const msg_322 = getSystemParamValue('322')
@@ -112,8 +111,8 @@ const doDepositWarning = () => {
             loading.value = true
             getServerTime().then((res) => {
                 const n = moment(res.data)
-                const s = moment(start, 'HH:mm')
-                const e = moment(end.value, 'HH:mm')
+                const s = moment(startTime.value, 'HH:mm')
+                const e = moment(endTime.value, 'HH:mm')
                 if (n.isSameOrAfter(s) && n.isBefore(e)) {
                     ElMessageBox.confirm(
                         '是否已在银行端进行入金转账？',

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

@@ -1,7 +1,7 @@
 <!-- 资金信息-资金汇总-出金申请 -->
 <template>
     <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="140px"
+        <el-form ref="formRef" v-if="cusBank?.canoutamount === 1" class="el-form--vertical" label-width="140px"
             :model="formData" :rules="formRules">
             <el-form-item label="资金账号">
                 <span>{{ accountStore.currentAccountId }}</span>
@@ -24,7 +24,7 @@
             </el-form-item>
             <fieldset style="border: 1px solid #162534; padding: 15px;">
                 <legend>出金时间</legend>
-                <span class="el-form-tips">出金时间：交易日 {{ start }} - {{ end }}</span>
+                <span class="el-form-tips">出金时间：交易日 {{ startTime }} - {{ endTime }}</span>
                 <span class="el-form-tips" style="margin-bottom: 10px;"><br>节假日以通知、公告为准；非交易日请勿操作！</span>
             </fieldset>
             <fieldset style="border: 1px solid #162534;padding: 15px;" v-if="msg_317">
@@ -32,13 +32,13 @@
                 <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">
+        <fieldset style="border: 1px solid #162534;padding: 15px;" v-if="cusBank?.canoutamount === 0">
             <legend>提示</legend>
             <span class="el-form-tips" v-html="msg" />
         </fieldset>
         <template #footer>
             <el-button type="info" @click="onCancel">取消</el-button>
-            <el-button v-if="cusBank.canoutamount === 1" type="primary" @click="doWithDrawWarning">提交</el-button>
+            <el-button v-if="cusBank?.canoutamount === 1" type="primary" @click="doWithDrawWarning">提交</el-button>
         </template>
     </app-drawer>
 </template>
@@ -57,13 +57,12 @@ const accountStore = useAccountStore()
 const formRef = ref<FormInstance>()
 const show = ref(true)
 const userStore = useUserStore()
-const { configs, cusBank, end } = useDoCusBankExtendConfigs(3)
+const { configs, cusBank, startTime, endTime } = useDoCusBankExtendConfigs(3)
 /// 资金账户信息
 const { fund } = useAccountFundInfo()
 const { getSystemParamValue } = useUserStore()
 const msg = getSystemParamValue('302')
 const msg_317 = getSystemParamValue('317')
-const start = getSystemParamValue('012')
 
 const formRules: FormRules = {
     Amount: [{
@@ -91,8 +90,8 @@ const doWithDrawWarning = () => {
             loading.value = true
             getServerTime().then((res) => {
                 const n = moment(res.data)
-                const s = moment(start, 'HH:mm')
-                const e = moment(end.value, 'HH:mm')
+                const s = moment(startTime.value, 'HH:mm')
+                const e = moment(endTime.value, 'HH:mm')
                 // 出金时间必须在开始和结束时间之间
                 if (n.isSameOrAfter(s) && n.isBefore(e)) {
                     /// 提交