Merge branch 'v20' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL into v20

src/business/bank/index.ts

@@ -495,7 +495,11 @@ export function useDoYJFGetWithholdSignInSMSVCode() {
         AccountID: accountStore.currentAccountId,
         UserID: useStore.userInfo.userid,
         LoginID: loginStore.loginId,
-        ClientSerialNo: v4()
+        ClientSerialNo: v4(),
+        Yckfxe: '0.00',
+        Kkzqnkfxe: '0.00', 
+        Kkzqnxzbs: '0',
+        Kksjbc: '99'
     })
 
     /// 判断是否有签约信息

src/constants/bank.ts

@@ -1,6 +1,6 @@
 import { useEnumStore } from '@/stores'
 
-const { getEnumTypeList, getEnumTypeName } = useEnumStore()
+const { getEnumTypeList, getEnumTypeName, getBankMappedValue } = useEnumStore()
 
 /**
  * 签约状态
@@ -61,7 +61,7 @@ export function getGt_kksjdwList() {
  * 获取扣款单位类型名称
  * @returns 
  */
-export function getGt_kksjdwName(value: number) {
+export function getGt_kksjdwName(bankmappedvalue: string) {
     const enums = getGt_kksjdwList()
-    return getEnumTypeName(enums, value)
+    return getBankMappedValue(enums, bankmappedvalue)
 }

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

@@ -14,6 +14,11 @@
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
             <div class="g-order-list">
                 <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
+                    <div class="g-order-list__titlebar">
+                            <div class="left">
+                                <h5>{{ handleNoneValue(item.billingsnum) }}</h5>
+                            </div>
+                        </div>
                     <div class="g-order-list__content">
                         <ul>
                             <li>
@@ -21,24 +26,20 @@
                                 <span>{{ formatDecimal(item.billamount) }}</span>
                             </li>
                             <li>
-                                <span>扣费账号</span>
-                                <span>{{ item.dgjfhm }}</span>
-                            </li>
-                            <li>
-                                <span>流水号</span>
-                                <span>{{ handleNoneValue(item.billingsnum) }}</span>
+                                <span>申请时间</span>
+                                <span>{{ formatDate(item.updatetime, 'MM/DD HH:mm') }}</span>
                             </li>
                             <li>
-                                <span>申请时间</span>
-                                <span>{{ formatDate(item.trantime, 'MM/DD HH:mm:ss') }}</span>
+                                <span>状态</span>
+                                <span>{{ item.billresult }}</span>
                             </li>
                             <li>
                                 <span>备注</span>
                                 <span>{{ handleNoneValue(item.message) }}</span>
                             </li>
                             <li>
-                                <span>状态</span>
-                                <span>{{ item.billresult }}</span>
+                                <span>扣费账号</span>
+                                <span>{{ item.dgjfhm }}</span>
                             </li>
                         </ul>
                     </div>

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

@@ -7,13 +7,13 @@
             <CellGroup>
                 <Cell title="用户编号" :value="signinfo?.jfhm" />
                 <Cell title="账户签约状态" :value="getSignStatusName(signinfo?.accountsignstatus ?? 1)" />
-                <Cell title="一次扣费限额" :value="handleNoneValue(signinfo?.yckfxe)" />
+                <!-- <Cell title="一次扣费限额" :value="handleNoneValue(signinfo?.yckfxe)" /> -->
                 <Cell title="协议签署日期" :value="handleNoneValue(signinfo?.xyqsrq)" />
                 <Cell title="协议生效日期" :value="handleNoneValue(signinfo?.xysxrq)" />
-                <Cell title="扣款单位时间" :value="handleNoneValue(signinfo?.kksjdw)" />
+                <Cell title="扣款单位时间" :value="getGt_kksjdwName(signinfo?.kksjdw)" />
                 <Cell title="扣款时间步长" :value="handleNoneValue(signinfo?.kksjbc)" />
-                <Cell title="扣款周期内扣费限额" :value="handleNoneValue(signinfo?.kkzqnkfxe)" />
-                <Cell title="扣费周期内限制笔数" :value="handleNoneValue(signinfo?.kkzqnxzbs)" />
+                <!-- <Cell title="扣款周期内扣费限额" :value="handleNoneValue(signinfo?.kkzqnkfxe)" />
+                <Cell title="扣费周期内限制笔数" :value="handleNoneValue(signinfo?.kkzqnxzbs)" /> -->
             </CellGroup>
         </div>
         <div class="bank-sign__empty" v-else>
@@ -24,7 +24,7 @@
                 <Button type="warning" round block @click="onCancelSumit"
                     v-if="signStatus === SignStatus.Signed">解约</Button>
                 <Button type="danger" round block @click="openComponent('apply')"
-                    v-if="[SignStatus.Unsigned, SignStatus.Rescinded, SignStatus.Rescinding].includes(signStatus)">添加代扣签约账户</Button>
+                    v-if="[SignStatus.Unsigned, SignStatus.Rescinded].includes(signStatus)">添加代扣签约账户</Button>
             </div>
         </template>
         <component ref="componentRef" :is="componentMap.get(componentId)" @closed="closeComponent"
@@ -38,7 +38,7 @@ import { CellGroup, Cell, Button, Empty, showFailToast } from 'vant'
 import { useComponent } from '@/hooks/component'
 import { queryGetGtwithholdsigninfo } from '@/services/api/bank'
 import { useRequest } from '@/hooks/request'
-import { getSignStatusName, SignStatus } from '@/constants/bank'
+import { getSignStatusName, SignStatus, getGt_kksjdwName } from '@/constants/bank'
 import { fullloading, dialog } from '@/utils/vant'
 import { useNavigation } from '@mobile/router/navigation'
 import { useDoYJF_WithholdSignOut } from '@/business/bank'

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

@@ -7,12 +7,12 @@
             <Form ref="formRef" class="g-form__container" @submit="formSubmit">
                 <CellGroup inset>
                     <Field type="number" name="VCode" label="验证码" maxlength=" 6" v-model.trim="formData.VCode"
-                        placeholder="请输入银行卡账号" :rules="formRules.VCode" />
+                        placeholder="请输入短信验证码" :rules="formRules.VCode" />
                 </CellGroup>
             </Form>
             <template #footer>
                 <div class="g-form__footer inset">
-                    <Button type="danger" round block @click="formRef?.submit()">提交</Button>
+                    <Button type="danger" round block @click="formRef?.submit()">签约申请</Button>
                 </div>
             </template>
         </app-view>
@@ -24,7 +24,7 @@ import { shallowRef } from 'vue'
 import { CellGroup, Field, Button, showFailToast, FormInstance, Form, FieldRule } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { useDoYJF_WithholdSignInSMS } from '@/business/bank'
-
+import AppModal from '@/components/base/modal/index.vue'
 
 // 是否显示日期选择器
 const formRef = shallowRef<FormInstance>()

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

@@ -7,36 +7,44 @@
             <Form ref="formRef" class="g-form__container" @submit="formSubmit">
                 <CellGroup inset>
                     <Field readonly name="bankaccountno" label="扣费账号" v-model="bankaccountno" />
-                    <Field type="number" name="Yckfxe" label="一次扣费限额" maxlength="30" v-model.trim="Yckfxe"
-                        placeholder="请输入银行卡账号" :rules="formRules.Yckfxe" />
                     <Field name="Xysxrq" readonly label="协议生效期" maxlength="30" v-model.trim="formData.Xysxrq"
                         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="Yckfxe" label="一次扣费限额" placeholder="请输入一次扣费限额" :rules="formRules.Yckfxe" >
+                        <template #input>
+                            <Stepper v-model="Yckfxe" theme="round" button-size="22" :min="0.0" :step="0.01" />
+                        </template>
+                    </Field>
+                    <Field name="Kkzqnkfxe" label="扣费周期内扣款限额" placeholder="请输入扣费周期内扣款限额" :rules="formRules.Kkzqnkfxe" >
+                        <template #input>
+                            <Stepper v-model="Kkzqnkfxe" theme="round" button-size="22" :min="0.0" :step="0.01" />
+                        </template>
+                    </Field>
+                    <Field name="Kkzqnxzbs" placeholder="请输入扣费周期内限制笔数"  :rules="formRules.Kkzqnxzbs" label="扣费周期内限制笔数">
+                        <template #input>
+                            <Stepper v-model="Kkzqnxzbs" theme="round" button-size="22" :min="0" :max="99" :step="1" integer />
+                        </template>
+                    </Field> -->
                     <Field name="Kksjdw" label="扣款单位" maxlength="30" :rules="formRules.Kksjdw" is-link>
                         <template #input>
                             <app-select v-model="Kksjdw" placeholder="请选择扣款单位" :options="getGt_kksjdwList()" />
                         </template>
                     </Field>
-                    <Field type="number" name="Kkzqnkfxe" label="扣费周期内扣款限额" maxlength="30" v-model.trim="Kkzqnkfxe"
-                        placeholder="请输入扣费周期内扣款限额" :rules="formRules.Kkzqnkfxe" />
-                    <Field type="number" name="Kkzqnxzbs" label="扣费周期内限制笔数" maxlength="30" v-model.trim="formData.Kkzqnxzbs"
-                        placeholder="请输入扣费周期内限制笔数" :rules="formRules.Kkzqnxzbs" />
-                    <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="备注"/>
                 </CellGroup>
             </Form>
             <template #footer>
                 <div class="g-form__footer inset">
-                    <Button type="danger" round block @click="formRef?.submit()">提交</Button>
+                    <Button type="danger" round block @click="formRef?.submit()">发送验证码</Button>
                 </div>
             </template>
             <component ref="componentRef" :is="componentMap.get(componentId)"
                 @closed="closeComponent" v-if="componentId" />
-            <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" />
         </app-view>
     </app-modal>           
 </template>
@@ -51,7 +59,6 @@ import { validateRules } from '@/constants/regex'
 import { formatDate } from '@/filters'
 import { useComponent } from '@/hooks/component'
 import moment from 'moment'
-import { formatDecimal } from '@/filters'
 import AppModal from '@/components/base/modal/index.vue'
 import AppSelect from '@mobile/components/base/select/index.vue'
 
@@ -64,8 +71,9 @@ const { formData, onSubmit, bankaccountno } = useDoYJFGetWithholdSignInSMSVCode(
 // 日期范围
 const dateRange = ref<string[]>([]) 
 const Kksjdw = ref('')
-const Kkzqnkfxe = ref('0.00')
-const Yckfxe = ref('0.00')
+// const Kkzqnkfxe = ref(0.00)
+// const Yckfxe = ref(0.00)
+// const Kkzqnxzbs = ref(0)
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     closed(true)
@@ -77,12 +85,12 @@ const componentMap = new Map<string, unknown>([
 
 // 表单验证规则
 const formRules: { [key in keyof Proto.YJF_GetWithholdSignInSMSVCodeReq]?: FieldRule[] } = {
-    Yckfxe: [{
-        message: '请输入一次扣费限额',
-        validator: () => {
-            return !!Yckfxe.value
-        }
-    }],
+    // Yckfxe: [{
+    //     message: '请输入一次扣费限额',
+    //     validator: () => {
+    //         return !!Yckfxe.value
+    //     }
+    // }],
     Xysxrq: [{
         message: '请选择协议生效期',
         validator: () => {
@@ -101,18 +109,18 @@ const formRules: { [key in keyof Proto.YJF_GetWithholdSignInSMSVCodeReq]?: Field
             return !!Kksjdw.value
         }
     }],
-    Kkzqnkfxe: [{
-        message: '请输入扣费周期内扣款限额',
-        validator: () => {
-            return !!Kkzqnkfxe.value
-        }
-    }],
-    Kkzqnxzbs: [{
-        message: '请输入扣费周期内限制笔数',
-        validator: () => {
-            return !!formData.Kkzqnxzbs
-        }
-    }],
+    // Kkzqnkfxe: [{
+    //     message: '请输入扣费周期内扣款限额',
+    //     validator: () => {
+    //         return !!Kkzqnkfxe.value
+    //     }
+    // }],
+    // Kkzqnxzbs: [{
+    //     message: '请输入扣费周期内限制笔数',
+    //     validator: () => {
+    //         return !!Kkzqnxzbs.value
+    //     }
+    // }],
     Lxdh: [{
         required: true,
         message: '请输入手机号码',
@@ -128,7 +136,7 @@ const formRules: { [key in keyof Proto.YJF_GetWithholdSignInSMSVCodeReq]?: Field
 // 选择日期
 const onConfirm = ([start, end]: Date[]) => {
     showCalendar.value = false
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+    dateRange.value = [formatDate(start.toISOString(), 'YYYY-MM-DD'), formatDate(end.toISOString(), 'YYYY-MM-DD')]
     const [startDate, endDate] = dateRange.value
     formData.Xysxrq = startDate
     formData.Xydqrq = endDate
@@ -137,16 +145,15 @@ const onConfirm = ([start, end]: Date[]) => {
 // 获取验证码
 const formSubmit = () => {
     dialog({
-        message: '确认解约？',
+        message: '确认要申请代扣签约吗？',
         showCancelButton: true
     }).then(() => {
         formRef.value?.validate('Lxdh').then(() => {
             fullloading((hideLoading) => {
+
                 /// 数据单独处理
-                formData.Kksjbc = '99'
                 formData.Kksjdw = Kksjdw.value.toString()
-                formData.Yckfxe = formatDecimal(Yckfxe.value)
-                formData.Kkzqnkfxe = formatDecimal(Kkzqnkfxe.value)
+
                 onSubmit().then(() => {
                     hideLoading()
                     openComponent('SMSCode')

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

@@ -2,11 +2,6 @@
     <app-view class="g-form bank-wallet-deposit">
         <Form ref="formRef" class="g-form__container" @submit="doDepositWarning">
             <CellGroup inset v-if="cusBank.caninamount === 1">
-                <Field label="入金时间">
-                    <template #input>
-                        <span style="color: #999;">{{ start }} - {{ end }}</span>
-                    </template>
-                </Field>
                 <Field type="number" v-model="formData.Amount" label="入金金额" placeholder="请填写入金金额"
                     :rules="formRules.Amount" />
                 <Field label="凭证" :rules="formRules.filePath">
@@ -19,12 +14,42 @@
                         :name="item.fieldcode" :label="item.fieldname" v-model="item.value"
                         :placeholder="`请输入${item.fieldname}`" />
                 </template>
+                <Field label="入金时间">
+                    <template #input>
+                        <span style="color: #999;">{{ start }} - {{ end }}</span>
+                    </template>
+                </Field>
+                <Field>
+                    <template #input>
+                        <span style="color: #993333; font-size: 13px;">节假日以通知、公告为准；非交易日请勿操作</span>
+                    </template>
+                </Field>
             </CellGroup>
             <CellGroup inset>
-                <Cell title="提示" icon="info-o">
-                    <template #label>
-                        <p v-html="msg"></p>
+                <Field label="平台入金银行" v-if="msg_320">
+                    <template #input>
+                        <span class="msg_tips" :data-clipboard-text="msg_320" v-copy="onCopy">{{ msg_320 }}</span>
+                    </template>
+                </Field>
+                <Field label="平台入金账号" v-if="msg_321">
+                    <template #input>
+                        <span class="msg_tips" :data-clipboard-text="msg_321" v-copy="onCopy">{{ msg_321 }}</span>
                     </template>
+                </Field>
+                <Field label="平台入金账户" v-if="msg_322">
+                    <template #input>
+                        <span class="msg_tips" :data-clipboard-text="msg_322" v-copy="onCopy">{{ msg_322 }}</span>
+                    </template>
+                </Field>
+                <Field label="平台入金支行" v-if="msg_323">
+                    <template #input>
+                        <span class="msg_tips" :data-clipboard-text="msg_323" v-copy="onCopy">{{ msg_323 }}</span>
+                    </template>
+                </Field>
+            </CellGroup>
+            <CellGroup inset v-if="msg_324">
+                <Cell title="提示" icon="info-o">
+                    <template #label><p style="color: #993333;" v-html="msg_324" /></template>
                 </Cell>
             </CellGroup>
         </Form>
@@ -38,7 +63,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, ref } from 'vue'
-import { Form, Field, Cell, CellGroup, Button, FieldRule, FormInstance } from 'vant'
+import { Form, Field, Cell, CellGroup, Button, FieldRule, FormInstance, Icon, showToast, showFailToast } from 'vant'
 import { useDoDeposit, useDoCusBankExtendConfigs } from '@/business/bank'
 import { fullloading, dialog } from '@/utils/vant'
 import { useNavigation } from '@mobile/router/navigation'
@@ -50,13 +75,18 @@ const formRef = shallowRef<FormInstance>()
 const { formData, onSubmit } = useDoDeposit()
 const { router } = useNavigation()
 const { getSystemParamValue } = useUserStore()
-const start = getSystemParamValue('012') ?? ''
-const limitMsg = getSystemParamValue('1002')
-const msg = getSystemParamValue('302')
 const { configs, cusBank, end } = useDoCusBankExtendConfigs(2)
 const certificate_photo_url = ref('')
 const userStore = useUserStore()
 
+const start = getSystemParamValue('012') ?? ''
+const limitMsg = getSystemParamValue('1002')
+const msg_320 = getSystemParamValue('320')
+const msg_321 = getSystemParamValue('321')
+const msg_322 = getSystemParamValue('322')
+const msg_323 = getSystemParamValue('323')
+const msg_324 = getSystemParamValue('324')
+
 // 表单验证规则
 const formRules: { [key: string]: FieldRule[] } = {
     Amount: [{
@@ -80,8 +110,11 @@ const onUploadSuccess = (filePath: string) => {
 /// 提示信息
 const doDepositWarning = () => {
     if (cusBank.value.cusbankid === 'jdjs') {
-        const now = moment(new Date().toISOString()).format('HH:mm')
-        if (now > start && now < end.value) {
+        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')
+        if (n.isAfter(s) && n.isBefore(e)) {
             dialog({ message: '是否已在银行端进行入金转账？', showCancelButton: true, confirmButtonText: '确认', cancelButtonText: '取消', }).then(() => {
                 /// 提交
                 formSubmit()
@@ -102,6 +135,14 @@ const doDepositWarning = () => {
     }
 }
 
+const onCopy = (status: boolean) => {
+    if (status) {
+        showToast({ message: '已复制，快去粘贴吧~' })
+    } else {
+        showFailToast('复制失败')
+    }
+}
+
 const formSubmit = () => {
     fullloading((hideLoading) => {
         const obj: { [key: string]: unknown } = Object.create({})

src/packages/mobile/views/bank/wallet/components/deposit/index.less

@@ -27,4 +27,8 @@
             }
         }
     }
+
+    .msg_tips {
+        color: #0099FF;
+    }
 }

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

@@ -67,7 +67,7 @@ const { fund } = useAccountFundInfo()
 const { router } = useNavigation()
 const formRef = shallowRef<FormInstance>()
 const { getSystemParamValue } = useUserStore()
-const start = getSystemParamValue('012')
+const start = getSystemParamValue('012') ?? ''
 const msg = getSystemParamValue('302')
 const limitMsg = getSystemParamValue('1002')
 const msg_317 = getSystemParamValue('317')
@@ -93,8 +93,12 @@ const formRules: { [key: string]: FieldRule[] } = {
 /// 提示信息
 const doWithDrawWarning = () => {
     if (cusBank.value.cusbankid === 'jdjs') {
-        const now = moment(new Date().toISOString()).format('HH:mm')
-        if (now > start && now < end.value) {
+        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')
+        // 出金时间必须在开始和结束时间之间
+        if (n.isAfter(s) && n.isBefore(e)) {
             /// 提交
             formSubmit()
         } else {

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

@@ -10,6 +10,10 @@
                 </template>
             </app-filter>
         </template>
+         <!-- 状态 -->
+         <template #updatetime="{ value }">
+            {{ formatDate(value, 'YYYY/MM/DD HH:MM:SS') }}
+        </template>
     </app-table>
     <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
         v-if="componentId" />
@@ -26,6 +30,7 @@ import { queryGtwithholddepositapply, queryGetGtwithholdsigninfo } from '@/servi
 import { SignStatus } from '@/constants/bank'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
+import { formatDate } from '@/filters'
 
 const componentMap = new Map<string, unknown>([
     ['deposit', defineAsyncComponent(() => import('./components/deposit/index.vue'))],
@@ -78,12 +83,13 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { prop: 'billamount', label: '入金代扣金额' },
-    { prop: 'dgjfhm', label: '扣费账号' },
     { prop: 'billingsnum', label: '流水号' },
-    { prop: 'trantime', label: '申请时间' },
+    { prop: 'dgjfhm', label: '扣费账号' },
+    { prop: 'deductionbnum', label: '扣费批次号' },
+    { prop: 'billamount', label: '入金代扣金额' },
+    { prop: 'updatetime', label: '申请时间' },
+    { prop: 'billresult', label: '状态' },
     { prop: 'message', label: '备注' },
-    { prop: 'billresult', label: '状态' }
 ])
 
 const onSearch = (clear = false) => {

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

@@ -5,11 +5,9 @@
             <el-form-item label="扣费账号" prop="bankaccountno">
                 <el-input name="bankaccountno" readonly v-model="bankaccountno" />
             </el-form-item>
-            <el-form-item label="扣款单位" prop="Kksjdw">
-                <el-select effect="dark" v-model="Kksjdw" :rules="formRules.Kksjdw" >
-                    <el-option :label="item.label" :value="item.value" v-for="(item, index) in getGt_kksjdwList()" :key="index" />
-                </el-select>
-            </el-form-item>
+            <el-form-item label="手机号码" prop="Lxdh">
+                <el-input type="number" name="Lxdh" maxlength="50" placeholder="请输入手机号码" v-model="formData.Lxdh" :rules="formRules.Lxdh" />
+            </el-form-item> 
             <el-form-item label="协议生效期" prop="Xysxrq">
                 <el-date-picker effect="dark" v-model="formData.Xysxrq" type="date" placeholder="请选择协议生效期" 
                     :default-value="new Date()" value-format="YYYY-MM-DD" :editable="false" :clearable="false" 
@@ -20,7 +18,7 @@
                 :default-value="new Date()" value-format="YYYY-MM-DD" :editable="false" :clearable="false" 
                 @visible-change="visibleChange" @calendar-change="calendarChange" :rules="formRules.Xydqrq" />
             </el-form-item>
-            <el-form-item label="一次扣费限额" prop="Yckfxe">
+            <!-- <el-form-item label="一次扣费限额" prop="Yckfxe">
                 <el-input-number :precision="2" :step="0.01" name="Yckfxe" placeholder="请输入一次扣费限额" v-model="Yckfxe" :rules="formRules.Yckfxe" />
             </el-form-item>
             <el-form-item label="扣费周期内扣款限额" prop="Kkzqnkfxe">
@@ -28,10 +26,12 @@
             </el-form-item> 
             <el-form-item label="扣费周期内限制笔数" prop="Kkzqnxzbs">
                 <el-input-number :precision="0" :step="1" name="Kkzqnxzbs" placeholder="请输入扣费周期内限制笔数" v-model="Kkzqnxzbs" :rules="formRules.Kkzqnxzbs" />
-            </el-form-item> 
-            <el-form-item label="手机号码" prop="Lxdh">
-                <el-input type="number" name="Lxdh" maxlength="50" placeholder="请输入手机号码" v-model="formData.Lxdh" :rules="formRules.Lxdh" />
-            </el-form-item> 
+            </el-form-item>  -->
+            <el-form-item class="el-form-item--row" label="扣款单位" prop="Kksjdw">
+                <el-select effect="dark" v-model="Kksjdw" :rules="formRules.Kksjdw" >
+                    <el-option :label="item.label" :value="item.value" v-for="(item, index) in getGt_kksjdwList()" :key="index" />
+                </el-select>
+            </el-form-item>
             <el-form-item class="el-form-item--row" label="地址" prop="Addr">
                 <el-input name="Addr" v-model="formData.Addr" maxlength="128" placeholder="请输入联系地址" />
             </el-form-item>
@@ -54,7 +54,6 @@ import { useDoYJFGetWithholdSignInSMSVCode, useDoYJF_WithholdSignInSMS } from '@
 import { validateRules } from '@/constants/regex'
 import { useDateRange } from '@/hooks/date-picker'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
-import { formatDecimal } from '@/filters'
 
 const { formData, onSubmit, loading, bankaccountno } = useDoYJFGetWithholdSignInSMSVCode()
 const { formData: signFormData, onSubmit: onSignSubmit } = useDoYJF_WithholdSignInSMS()
@@ -64,17 +63,17 @@ const show = ref(true)
 const refresh = ref(false)
 const formRef = ref<FormInstance>()
 const Kksjdw = ref('')
-const Kkzqnkfxe = ref(0.00)
-const Yckfxe = ref(0.00)
-const Kkzqnxzbs = ref(0)
+// const Kkzqnkfxe = ref(0.00)
+// const Yckfxe = ref(0.00)
+// const Kkzqnxzbs = ref(0)
 
 const formRules: FormRules = {
-    Yckfxe: [{
-        message: '请输入一次扣费限额',
-        validator: () => {
-            return !!Yckfxe.value
-        }
-    }],
+    // Yckfxe: [{
+    //     message: '请输入一次扣费限额',
+    //     validator: () => {
+    //         return !!Yckfxe.value
+    //     }
+    // }],
     Xysxrq: [{
         message: '请选择协议生效期',
         validator: () => {
@@ -93,18 +92,18 @@ const formRules: FormRules = {
             return !!Kksjdw.value
         }
     }],
-    Kkzqnkfxe: [{
-        message: '请输入扣费周期内扣款限额',
-        validator: () => {
-            return !!Kkzqnkfxe.value
-        }
-    }],
-    Kkzqnxzbs: [{
-        message: '请输入扣费周期内限制笔数',
-        validator: () => {
-            return !!Kkzqnxzbs.value
-        }
-    }],
+    // Kkzqnkfxe: [{
+    //     message: '请输入扣费周期内扣款限额',
+    //     validator: () => {
+    //         return !!Kkzqnkfxe.value
+    //     }
+    // }],
+    // Kkzqnxzbs: [{
+    //     message: '请输入扣费周期内限制笔数',
+    //     validator: () => {
+    //         return !!Kkzqnxzbs.value
+    //     }
+    // }],
     Lxdh: [{
         message: '请输入手机号码',
         validator: (rule, value, callback) => {
@@ -139,11 +138,7 @@ const formSubmit = () => {
         if (formValid) {
 
             /// 数据单独处理
-            formData.Kksjbc = '99'
             formData.Kksjdw = Kksjdw.value.toString()
-            formData.Yckfxe = formatDecimal(Yckfxe.value)
-            formData.Kkzqnkfxe = formatDecimal(Kkzqnkfxe.value)
-            formData.Kkzqnxzbs = formatDecimal(Kkzqnxzbs.value, 0)
 
             onSubmit().then(() => {
                 ElMessageBox.prompt('请输入验证码', '验证码', {

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

@@ -11,6 +11,10 @@
         <template #accountsignstatus="{ value }">
             {{ getSignStatusName(value) }}
         </template>
+        <!-- 扣款时间单位 -->
+        <template #kksjdw="{ value }">
+            {{  getGt_kksjdwName(value) }}
+        </template>
         <!-- 展开行 -->
         <template #expand="{ row }">
             <div class="buttonbar">
@@ -29,7 +33,7 @@ import { useComponent } from '@/hooks/component'
 import { useComposeTable } from '@pc/components/base/table'
 import { useRequest } from '@/hooks/request'
 import { queryGetGtwithholdsigninfo, queryBankAccountSign } from '@/services/api/bank'
-import { getSignStatusName, SignStatus } from '@/constants/bank'
+import { getGt_kksjdwName, getSignStatusName, SignStatus } from '@/constants/bank'
 import { ElMessage } from 'element-plus'
 import AppTable from '@pc/components/base/table/index.vue'
 
@@ -77,14 +81,14 @@ const showComponent = ((componentName: string) => {
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'jfhm', label: ' 用户编号' },
     { prop: 'accountsignstatus', label: '账户签约状态' },
-    { prop: 'yckfxe', label: '一次扣费限额' },
+    // { prop: 'yckfxe', label: '一次扣费限额' },
     { prop: 'xyqsrq', label: '协议签署日期' },
     { prop: 'xysxrq', label: '协议生效日期' },
     { prop: 'xydqrq', label: '协议到期日期' },
     { prop: 'kksjdw', label: '扣款单位时间' },
     { prop: 'kksjbc', label: '扣款时间步长' },
-    { prop: 'kkzqnkfxe', label: '扣款周期内扣费限额' },
-    { prop: 'kkzqnxzbs', label: '扣费周期内限制笔数' },
+    // { prop: 'kkzqnkfxe', label: '扣款周期内扣费限额' },
+    // { prop: 'kkzqnxzbs', label: '扣费周期内限制笔数' },
 ])
 
 </script>

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

@@ -0,0 +1,8 @@
+.msg_tips {
+    color: #0099FF;
+}
+
+.el-form-tips {
+    color: #CC6666; 
+    font-size: 13px;
+}

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

@@ -16,15 +16,32 @@
                     <el-input :name="item.fieldcode" placeholder="请输入" v-model="item.value" />
                 </el-form-item>
             </template>
-            <el-form-item label="入金时间:">
+            <el-form-item label="入金时间">
                 <span>{{ start }} - {{ end }}</span>
+                <span class="el-form-tips">节假日以通知、公告为准；非交易日请勿操作</span>
             </el-form-item>
         </el-form>
-        <fieldset style="border: 1px solid #162534;padding: 20px;" v-if="cusBank.caninamount === 1">
+        <fieldset style="border: 1px solid #162534; padding: 20px;" v-if="msg_320">
+            <legend>入金平台</legend>
+            <el-form class="el-form--vertical" label-width="120px">
+                <el-form-item label="平台入金银行" v-if="msg_320">
+                    <span class="msg_tips" :data-clipboard-text="msg_320" v-copy="onCopy">{{ msg_320 }}</span>
+                </el-form-item>
+                <el-form-item label="平台入金账号" v-if="msg_321">
+                    <span class="msg_tips" :data-clipboard-text="msg_321" v-copy="onCopy">{{ msg_321 }}</span>
+                </el-form-item>
+                <el-form-item label="平台入金银行" v-if="msg_322">
+                    <span class="msg_tips" :data-clipboard-text="msg_323" v-copy="onCopy">{{ msg_322 }}</span>
+                </el-form-item>
+                <el-form-item label="平台入金银行" v-if="msg_323">
+                    <span class="msg_tips" :data-clipboard-text="msg_323" v-copy="onCopy">{{ msg_323 }}</span>
+                </el-form-item>
+            </el-form>
+        </fieldset>
+        <fieldset style="border: 1px solid #162534;padding: 20px;" v-if="msg_324">
             <legend>提示</legend>
-            <span style="color: #ccc; font-size: 13px;" v-html="msg" />
+            <span class="el-form-tips" v-html="msg_324" />
         </fieldset>
-        <span v-if="cusBank.caninamount === 0" v-html="msg" />
         <template #footer>
             <el-button type="info" @click="onCancel">取消</el-button>
             <el-button v-if="cusBank.caninamount === 1" type="primary" @click="doDepositWarning">提交</el-button>
@@ -55,9 +72,14 @@ const formRef = ref<FormInstance>()
 const userStore = useUserStore()
 const certificate_photo_url = ref('')
 const { getSystemParamValue } = useUserStore()
-const msg = getSystemParamValue('302')
-const start = getSystemParamValue('012')
+
+const start = getSystemParamValue('012') ?? ''
 const limitMsg = getSystemParamValue('1002')
+const msg_320 = getSystemParamValue('320')
+const msg_321 = getSystemParamValue('321')
+const msg_322 = getSystemParamValue('322')
+const msg_323 = getSystemParamValue('323')
+const msg_324 = getSystemParamValue('324')
 
 const formRules: FormRules = {
     Amount: [{ required: true, message: '请输入入金金额' }],
@@ -71,12 +93,23 @@ const onCancel = () => {
     show.value = false
 }
 
+const onCopy = (status: boolean) => {
+    if (status) {
+        ElMessage.success('已复制，快去粘贴吧~')
+    } else {
+        ElMessage.error('复制失败')
+    }
+}
+
 const doDepositWarning = () => {
     if (cusBank.value.cusbankid === 'jdjs') {
         formRef.value?.validate((valid) => {
             if (valid) {
-                const now = moment(new Date().toISOString()).format('HH:mm')
-                if (now > start && now < end.value) {
+                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')
+                if (n.isAfter(s) && n.isBefore(e)) {
                     ElMessageBox.confirm(
                     '是否已在银行端进行入金转账？',
                     '提示',
@@ -134,4 +167,8 @@ const formSubmit = () => {
         }
     })
 }
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

src/stores/modules/enum.ts

@@ -10,6 +10,7 @@ export interface EnumType {
     label: string;
     value: number;
     disabled?: boolean;
+    bankmappedvalue?: string
 }
 
 const enumKeys = ['confirmStatus', 'executetype', 'operatetypesearch', 'deliveryPayMode', 'applystatus', 'deliveryStatus', 'operateType', 'WRPresaleStatus', 'clientType', 'stepStatus', 'scoreConfigType', 'GZBSCPayStatus', 'gt_kksjdw', 'performanceStatus', 'handlestatus', 'performanceType', 'accountBusinessCode', 'certificatetype', 'signstatus', 'thjOrderStatus', 'THJDeliveryMode', 'goodsunit', 'WROutInApplyStatus2', 'THJTransferStatus', 'WRTradeOrderStatus', 'THJMarket', 'THJProfitRoleType', 'appointmentModelOut', 'orderstatus', 'Pricemode2', 'buildtype', 'listingselecttype', 'certypeperson', 'runstatus', 'transferapplystatus'] as const
@@ -72,6 +73,7 @@ export const useEnumStore = defineStore(() => {
                 return {
                     label: props?.length ? props.join('-') : e.enumdicname,
                     value: e.enumitemname,
+                    bankmappedvalue: e.bankmappedvalue
                 }
             })
         }
@@ -90,6 +92,12 @@ export const useEnumStore = defineStore(() => {
         return item?.value ?? label
     }
 
+    // 根据枚举名称获取对应的值
+    const getBankMappedValue = (enums: EnumType[], bankmappedvalue?: string) => {
+        const item = enums.find((e) => e.bankmappedvalue === bankmappedvalue)
+        return item?.label ?? bankmappedvalue
+    }
+
     return {
         loading,
         allEnums,
@@ -98,6 +106,7 @@ export const useEnumStore = defineStore(() => {
         getEnumTypeInfo,
         getEnumTypeList,
         getEnumTypeName,
-        getEnumTypeValue
+        getEnumTypeValue,
+        getBankMappedValue
     }
 })