From 3c98c29d9dde4edb5876d6344cedb897accf84ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Fri, 30 May 2025 16:05:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=89=E8=BD=A6=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bst/credit/components/CreditEditDialog.vue   |  4 ++--
 src/views/bst/credit/index.vue                   |  6 +++---
 src/views/bst/creditPay/index.vue                | 16 ++++++++--------
 .../components/CreditUserEditDialog.vue          |  4 ++--
 src/views/bst/creditUser/index.vue               |  6 +++---
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/bst/credit/components/CreditEditDialog.vue b/src/views/bst/credit/components/CreditEditDialog.vue
index 9726c5d..bef5d70 100644
--- a/src/views/bst/credit/components/CreditEditDialog.vue
+++ b/src/views/bst/credit/components/CreditEditDialog.vue
@@ -27,9 +27,9 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </form-col>
-        <form-col :span="span" label="额度限制" prop="limitAmount">
+        <!-- <form-col :span="span" label="额度限制" prop="limitAmount">
           <el-input-number v-model="form.limitAmount" placeholder="请输入额度限制" style="width: calc(100% - 2em)" controls-position="right" /> 元
-        </form-col>
+        </form-col> -->
         <form-col :span="span" label="管理员" prop="adminMobile">
           <el-input v-model="form.adminMobile" placeholder="请输入管理员手机号" />
         </form-col>
diff --git a/src/views/bst/credit/index.vue b/src/views/bst/credit/index.vue
index f751485..df2446b 100644
--- a/src/views/bst/credit/index.vue
+++ b/src/views/bst/credit/index.vue
@@ -109,8 +109,8 @@
             <template v-else-if="column.key === 'createName'">
               <user-link :id="d.row.createId" :text="d.row.createName" />
             </template>
-            <template v-else-if="column.key === 'limitAmount'">
-              {{d.row.usedAmount | fix2 | dv}} 元 / {{d.row.limitAmount | fix2 | dv}} 元
+            <template v-else-if="column.key === 'usedAmount'">
+              {{d.row.usedAmount | fix2 | dv}} 元 
             </template>
             <template v-else>
               {{d.row[column.key]}}
@@ -184,7 +184,7 @@ export default {
         {key: 'name', visible: true, label: '名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'areaName', visible: true, label: '运营区', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'limitAmount', visible: true, label: '额度限制', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'usedAmount', visible: true, label: '已用金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'adminName', visible: true, label: '管理员', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'createName', visible: true, label: '创建人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
diff --git a/src/views/bst/creditPay/index.vue b/src/views/bst/creditPay/index.vue
index c435b2c..dad695d 100644
--- a/src/views/bst/creditPay/index.vue
+++ b/src/views/bst/creditPay/index.vue
@@ -23,9 +23,9 @@
       <el-form-item label="挂账方" prop="creditId">
         <credit-remote-select v-model="queryParams.creditId" clearable @change="handleQuery"/>
       </el-form-item>
-      <el-form-item label="用户名称" prop="userName">
+      <el-form-item label="用户名称" prop="creditUserName">
         <el-input
-          v-model="queryParams.userName"
+          v-model="queryParams.creditUserName"
           placeholder="请输入用户名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -208,16 +208,16 @@ export default {
       // 字段列表
       columns: [
         {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
-        {key: 'description', visible: true, label: '描述', minWidth: null, sortable: true, overflow: false, align: 'left', width: "300"},
-        {key: 'no', visible: true, label: '编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'outTradeNo', visible: true, label: '外部单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'description', visible: true, label: '描述', minWidth: null, sortable: true, overflow: false, align: 'left', width: "380"},
         {key: 'areaName', visible: true, label: '运营区', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'creditName', visible: true, label: '挂账方', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'creditUserName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'amount', visible: true, label: '总金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'refundAmount', visible: true, label: '退款金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'paymentAmount', visible: true, label: '回款金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        // {key: 'refundAmount', visible: true, label: '退款金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        // {key: 'paymentAmount', visible: true, label: '回款金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'no', visible: true, label: '编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'outTradeNo', visible: true, label: '支付单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
diff --git a/src/views/bst/creditUser/components/CreditUserEditDialog.vue b/src/views/bst/creditUser/components/CreditUserEditDialog.vue
index 6518105..2d9a955 100644
--- a/src/views/bst/creditUser/components/CreditUserEditDialog.vue
+++ b/src/views/bst/creditUser/components/CreditUserEditDialog.vue
@@ -15,9 +15,9 @@
         <form-col :span="span" label="用户手机" prop="userMobile">
           <el-input v-model="form.userMobile" placeholder="请输入用户手机号" />
         </form-col>
-        <form-col :span="span" label="每月限额" prop="limitAmount">
+        <!-- <form-col :span="span" label="每月限额" prop="limitAmount">
           <el-input-number v-model="form.limitAmount" placeholder="请输入每月限额" style="width: calc(100% - 2em)" controls-position="right" /> 元
-        </form-col>
+        </form-col> -->
         <form-col :span="span" label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" maxlength="64" show-word-limit/>
         </form-col>
diff --git a/src/views/bst/creditUser/index.vue b/src/views/bst/creditUser/index.vue
index 90e7bf1..0bd5aeb 100644
--- a/src/views/bst/creditUser/index.vue
+++ b/src/views/bst/creditUser/index.vue
@@ -87,8 +87,8 @@
             <template v-if="column.key === 'id'">
               {{d.row[column.key]}}
             </template>
-            <template v-else-if="column.key === 'limitAmount'">
-              {{ d.row.usedAmount | fix2 | dv }} 元 / {{ d.row.limitAmount | fix2 | dv }} 元
+            <template v-else-if="column.key === 'usedAmount'">
+              {{ d.row.usedAmount | fix2 | dv }} 元
             </template>
             <template v-else-if="column.key === 'areaName'">
               <area-link :id="d.row.areaId" :text="d.row.areaName" />
@@ -166,7 +166,7 @@ export default {
         {key: 'areaName', visible: true, label: '运营区', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'creditName', visible: true, label: '挂账方', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'limitAmount', visible: true, label: '每月限额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'usedAmount', visible: true, label: '已用金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
       ],