xxxxx

oem/zrwyt/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "中融文遗通",
   "version": "1.0.21",
   "versionCode": "100021",
-  "apiUrl": "http://192.168.31.134:8080/cfg?key=test_134",
+  "apiUrl": "http://192.168.31.205:8080/cfg?key=test_205",
   "tradeChannel": "ws",
   "modules": [
     "register",

src/business/bank/index.ts

@@ -425,7 +425,7 @@ export function useDoYJF_WithholdInApply() {
         UserID: useStore.userInfo.userid,
         LoginID: loginStore.loginId,
         ClientSerialNo: v4(),
-        BillAmount: "0"
+        BillAmount: "0.0"
     })
 
     /// 判断是否有签约信息

src/filters/index.ts

@@ -388,7 +388,14 @@ export function numberToChinese(num: undefined | string) {
       amountStr = parts[0]
       decimalPart = '.' + parts[1].padEnd(2, '0') // 假设最多两位小数
     }
-  
+
+    // 转换小数部分
+    let decimalPartR = ''
+    for (let i = 1; i < decimalPart.length; i++) {
+        decimalPartR += chineseNums[parseInt(decimalPart[i])] + (i === 1 ? '角' : '分')
+    }
+    decimalPart = decimalPartR
+
     // 遍历整数部分进行转换
     let result = '';
     for (let i = amountStr.length - 1; i >= 0; i--) {
@@ -402,7 +409,7 @@ export function numberToChinese(num: undefined | string) {
     // 去除末尾的零
     result = result.replace(/零+$/, '零')
     // 添加分隔符“元”和小数部分的大写
-    result = result.replace(/亿万/, '亿零') + '元' + decimalPart.replace(/\./, '点').replace(/零/g, '零').replace(/零+元/g, '元').replace(/零+角/g, '角').replace(/零+分/g, '分')
-  
+    result = result.replace(/亿万/, '亿零') + '元' + decimalPart
+
     return result.trim()
   }

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

@@ -11,11 +11,11 @@
                             <span>{{ bankaccountno }}</span>
                         </template>
                     </Field>
-                    <Field type="number" v-model="formData.BillAmount" label="入金金额" placeholder="请填写入金金额"
+                    <Field type="number" v-model="billAmount" label="入金金额" placeholder="请填写入金金额"
                     :rules="formRules.BillAmount" />
                     <Field readonly label="金额大写">
                         <template #input>
-                            <span>{{ numberToChinese(formData.BillAmount) }}</span>
+                            <span>{{ numberToChinese(formatDecimal(billAmount)) }}</span>
                         </template>
                     </Field>
                     <Field v-model="Remark" label="备注" placeholder="请输入备注" />
@@ -34,7 +34,7 @@
 import { shallowRef, ref } from 'vue'
 import { Form, Field, CellGroup, Button, FieldRule, FormInstance } from 'vant'
 import { useDoYJF_WithholdInApply } from '@/business/bank'
-import { numberToChinese } from '@/filters'
+import { numberToChinese, formatDecimal } from '@/filters'
 import { fullloading, dialog } from '@/utils/vant'
 import AppModal from '@/components/base/modal/index.vue'
 
@@ -45,6 +45,8 @@ const refresh = shallowRef(false)
 const formRef = shallowRef<FormInstance>()
 /// 备注
 const Remark = ref('')
+/// 金额
+const billAmount = ref(0.0)
 
 // 关闭弹窗
 const closed = (isRefresh = false) => {
@@ -67,6 +69,7 @@ const formRules: { [key: string]: FieldRule[] } = {
 
 const formSubmit = () => {
     fullloading((hideLoading) => {
+        formData.BillAmount = formatDecimal(billAmount.value)
         onSubmit().then(() => {
             hideLoading()
             dialog('提交成功，请稍后确认结果。').then(() => {

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

@@ -7,11 +7,11 @@
                 <el-input name="bankaccountno" readonly v-model="bankaccountno" />
             </el-form-item>
             <el-form-item prop="Amount" label="入金金额">
-                <el-input-number placeholder="请输入入金金额" :precision="2" :step="0.01" :max="9999999999" v-model="formData.BillAmount"
+                <el-input-number placeholder="请输入入金金额" :precision="2" :step="0.01" :max="9999999999" v-model="billAmount"
                     :rules="formRules.BillAmount" />
             </el-form-item>
             <el-form-item>
-                <span>{{ numberToChinese(formData.BillAmount) }}</span>
+                <span>{{ numberToChinese(formatDecimal(billAmount)) }}</span>
             </el-form-item>
             <el-form-item class="el-form-item--row" label="备注" prop="Remark">
                 <el-input name="Remark" type="textarea" placeholder="请输入备注" :rows="3" v-model="Remark" />
@@ -28,12 +28,13 @@
 import { ref } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { useDoYJF_WithholdInApply } from '@/business/bank'
-import { numberToChinese } from '@/filters';
+import { numberToChinese, formatDecimal } from '@/filters';
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
 const { formData, onSubmit, loading, bankaccountno } = useDoYJF_WithholdInApply()
 const show = ref(true)
 const formRef = ref<FormInstance>()
+const billAmount = ref(0.0)
 
 /// 备注
 const Remark = ref('')
@@ -48,6 +49,7 @@ const onCancel = () => {
 const formSubmit = () => {
     formRef.value?.validate((valid) => {
         if (valid) {
+            formData.BillAmount = formatDecimal(billAmount.value)
             onSubmit().then(() => {
                 ElMessage.success('提交成功，请稍后确认结果')
                 onCancel()

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

@@ -55,10 +55,10 @@ const { configs, cusBank, end } = useDoCusBankExtendConfigs(3)
 /// 资金账户信息
 const { fund } = useAccountFundInfo()
 const { getSystemParamValue } = useUserStore()
-const msg = getSystemParamValue('302') ?? '系统错误'
-const msg_317 = getSystemParamValue('317') ?? '系统错误'
+const msg = getSystemParamValue('302') ?? ''
+const msg_317 = getSystemParamValue('317') ?? ''
 const start = getSystemParamValue('012') ?? ''
-const limitMsg = getSystemParamValue('1002') ?? '系统错误'
+const limitMsg = getSystemParamValue('1002') ?? ''
 
 const formRules: FormRules = {
     Amount: [{

src/packages/pc/views/query/performance/sell/all/index.vue

@@ -3,7 +3,7 @@
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
         <template #headerLeft>
             <app-filter :options="filterOptons">
-                <template #after>
+                <template #before>
                     <el-date-picker type="daterange" effect="dark" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYYMMDD"
                         v-model="filterDate" />
                 </template>

src/packages/zrwyt/views/account/certification/Index.vue

@@ -7,7 +7,6 @@
             <!-- 个人 -->
             <CellGroup v-if="getUserInfoType() === 1" inset>
                 <Field v-model="person.realName" :readonly="isReadonly && realName != ''" name="realName" label="姓名" placeholder="请输入用户姓名" :rules="PFormRules.realName" />
-                <Field v-model="person.mobile" name="mobile" readonly label="预留手机号" :rules="PFormRules.mobile"/>
                 <Field name="bankId" label="开户银行" :rules="PFormRules.bankId" is-link>
                     <template #input>
                         <app-select v-model="person.bankId" placeholder="请选择开户银行" :readonly="isReadonly && bankaccount != ''" :options="banklist"
@@ -16,6 +15,7 @@
                 </Field>
                 <Field label="银行卡号" v-model="person.bankCard" :readonly="isReadonly && bankaccount != ''" name="bankCard" placeholder="请输入银行卡号" :rules="PFormRules.bankCard" />
                 <span style="font-size: 12px; padding-left: 15px; color: #FF162F;">此银行卡作为后续签约银行卡，请谨慎填写</span>
+                <Field v-model="person.mobile" name="mobile" readonly label="银行预留手机号" :rules="PFormRules.mobile"/>
                 <Field v-model="person.idCardNo" :readonly="isReadonly && cardnum != ''" name="idCardNo" label="证件号码" placeholder="请输入证件号码" :rules="PFormRules.idCardNo" />
                 <Field name="idCardPhoto" label="证件正面照片" :rules="PFormRules.idCardPhoto">
                     <template #input>

src/packages/zrwyt/views/account/protocol/Index.vue

@@ -14,15 +14,10 @@
             </CellGroup>
             <CellGroup inset>
                 <template v-for="(item, index) in dataList" :key="index">
-                    <Cell :title="item.templatename" :icon="iconName(item.recordstatus)" @click="signer(item)" is-link />
+                    <Cell title-class="cell__title" :title="item.templatename" value="去签署" :icon="iconName(item.recordstatus)" @click="signer(item)" is-link />
                 </template>
             </CellGroup>
         </div>
-        <!-- <template #footer>
-            <div class="g-form__footer inset">
-                <Button type="danger" @click="onClose()" round block>完成合同签署</Button>
-            </div>
-        </template> -->
     </app-view>
 </template>
 
@@ -127,4 +122,8 @@ const documentVisibilityStateNotify = eventBus.$on('DocumentVisibilityStateNotif
 onMounted(() => {
     documentVisibilityStateNotify.cancel()
 })
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

src/packages/zrwyt/views/account/protocol/index.css

@@ -0,0 +1,3 @@
+.g-form__container .cell__title {
+  color: #CC0000;
+}

src/packages/zrwyt/views/account/protocol/index.less

@@ -0,0 +1,7 @@
+.g-form {
+    &__container {
+        .cell__title {
+            color: #CC0000;
+        }
+    }
+}

src/packages/zrwyt/views/mine/index.less

@@ -105,8 +105,8 @@
                 li {
                     display: flex;
                     flex-direction: column;
-                    padding-bottom: 5px
-
+                    padding-bottom: 5px;
+                    
                     span {
                         line-height: 20px;
 
@@ -120,6 +120,7 @@
                             font-weight: bold;
                         }
                     }
+                    
                 }
             }
         }