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

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

@@ -14,33 +14,28 @@
             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="g-order-list__titlebar">
                         <div class="left">
-                            <h5>{{ handleNoneValue(item.billingsnum) }}</h5>
+                            <h5>{{ formatDecimal(item.billamount) }}</h5>
                         </div>
-                    </div> -->
+                        <div class="right">
+                            <span>{{ item.billresult === '0' ? '扣费成功' : '扣费失败' }}</span>
+                        </div>
+                    </div>
                     <div class="g-order-list__content">
                         <ul>
                             <li>
-                                <span>代扣金额</span>
-                                <span>{{ formatDecimal(item.billamount) }}</span>
-                            </li>
-                            <li>
                                 <span>申请时间</span>
                                 <span>{{ formatDate(item.updatetime, 'YYYYMMDD HH:mm') }}</span>
                             </li>
                             <li>
-                                <span>扣费账号</span>
-                                <span>{{ handleNoneValue(item.dgjfhm) }}</span>
-                            </li>
-                            <li>
-                                <span>状态</span>
-                                <span>{{ item.billresult === '0' ? '扣费成功' : '扣费失败' }}</span>
-                            </li>
-                            <li>
                                 <span>备注</span>
                                 <span>{{ handleNoneValue(item.billresultremark) }}</span>
                             </li>
+                            <li>
+                                <span>扣费账号</span>
+                                <span>{{ handleNoneValue(item.dgjfhm) }}</span>
+                            </li>
                         </ul>
                     </div>
                 </div>

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

@@ -16,12 +16,12 @@
                             <Stepper v-model="billAmount" theme="round" :min="0.00" :decimal-length="2" :auto-fixed="false" button-size="22" />
                         </template>
                     </Field>
-
+<!-- 
                     <Field readonly label="金额大写">
                         <template #input>
                             <span>{{ numberToChinese(formatDecimal(billAmount)) }}</span>
                         </template>
-                    </Field>
+                    </Field> -->
                     <Field v-model="Remark" label="备注" placeholder="请输入备注" />
                 </CellGroup>
             </Form>
@@ -38,7 +38,7 @@
 import { shallowRef, ref } from 'vue'
 import { Form, Field, CellGroup, Button, FieldRule, FormInstance } from 'vant'
 import { useDoYJF_WithholdInApply } from '@/business/bank'
-import { numberToChinese, formatDecimal } from '@/filters'
+import { formatDecimal } from '@/filters'
 import { fullloading, dialog } from '@/utils/vant'
 import AppModal from '@/components/base/modal/index.vue'
 

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

@@ -10,9 +10,9 @@
                 <el-input-number placeholder="请输入入金金额" :precision="2" :step="0.01" :max="9999999999" v-model="billAmount"
                     :rules="formRules.BillAmount" />
             </el-form-item>
-            <el-form-item>
+            <!-- <el-form-item>
                 <span>{{ numberToChinese(formatDecimal(billAmount)) }}</span>
-            </el-form-item>
+            </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" />
             </el-form-item>
@@ -28,7 +28,7 @@
 import { ref } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { useDoYJF_WithholdInApply } from '@/business/bank'
-import { numberToChinese, formatDecimal } from '@/filters';
+import { formatDecimal } from '@/filters';
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
 const { formData, onSubmit, loading, bankaccountno } = useDoYJF_WithholdInApply()