From cfc616147c35dc26fc40942bf91ddf91dead2c62 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Sat, 20 Jul 2024 13:55:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20pos=E6=9C=BA=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invest/posmachine/index.vue | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/invest/posmachine/index.vue b/src/views/invest/posmachine/index.vue
index a5d83ba..3122513 100644
--- a/src/views/invest/posmachine/index.vue
+++ b/src/views/invest/posmachine/index.vue
@@ -39,20 +39,20 @@
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="pos机名称" align="center" prop="name" />
           <el-table-column label="支付公司" align="center" prop="payCompany" />
-          <el-table-column label="类型" align="center" width="80" prop="type">
+          <el-table-column label="类型" align="center" width="100" prop="type">
             <template #default="scope">
               <dict-tag :options="pos_type" :value="scope.row.type" />
             </template>
           </el-table-column>
-          <el-table-column label="账户状态" align="center" prop="status">
+          <el-table-column label="账户状态" width="100" align="center" prop="status">
             <template #default="scope">
               <dict-tag :options="account_status" :value="scope.row.status" />
             </template>
           </el-table-column>
           <el-table-column label="商户名称" align="center" prop="merchantName" />
-          <el-table-column label="刷卡费率" align="center" width="120" prop="rate" />
-          <el-table-column label="费率+" align="center" width="80" prop="ratePlus" />
-          <el-table-column label="结算卡" align="center" width="150" prop="bankNameCode" />
+          <el-table-column label="刷卡费率" align="center" width="150" prop="rateName" />
+          <el-table-column label="费率+" align="center" width="100" prop="ratePlus" />
+          <el-table-column label="结算卡" align="center" prop="bankNameCode" />
           <!-- <el-table-column label="商户类型" align="center" width="150" prop="merchantType">
             <template #default="scope">
               <dict-tag :options="merchant_type" :value="scope.row.merchantType" />
@@ -100,11 +100,18 @@
           </el-select>
         </el-form-item>
         <el-form-item label="刷卡费率" prop="rate">
-          <el-input v-model="form.rate" placeholder="请输入刷卡费率" />
+          <el-input v-model="form.rate" placeholder="请输入刷卡费率">
+            <template #suffix>%</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="费率+" prop="ratePlus">
           <el-input v-model="form.ratePlus" placeholder="请输入费率+" />
         </el-form-item>
+        <el-form-item label="舍入模式" prop="roundingMode">
+          <el-select v-model="form.roundingMode" placeholder="请选择舍入模式">
+            <el-option v-for="dict in rounding_mode" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="厂商" prop="manufacture">
           <el-input v-model="form.manufacture" placeholder="请输入厂商" />
         </el-form-item>
@@ -142,7 +149,7 @@ import { listBankcardLend } from '@/api/invest/bankcardlend'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
-const { merchant_type, pos_type, account_status } = proxy.useDict('merchant_type', 'pos_type', 'account_status')
+const { merchant_type, pos_type, account_status, rounding_mode } = proxy.useDict('merchant_type', 'pos_type', 'account_status', 'rounding_mode')
 
 const posmachineList = ref([])
 const open = ref(false)
@@ -184,6 +191,7 @@ const data = reactive({
     merchantName: [{ required: true, message: '商户名称不能为空', trigger: 'blur' }],
     rate: [{ required: true, message: '刷卡费率不能为空', trigger: 'blur' }],
     ratePlus: [{ required: true, message: '费率+不能为空', trigger: 'blur' }],
+    roudingMode: [{ required: true, message: '舍入模式不能为空', trigger: 'blur' }],
     debitCard: [{ required: true, message: '结算卡不能为空', trigger: 'blur' }]
     // merchantType: [{ required: true, message: '商户类型不能为空', trigger: 'change' }]
   }
@@ -252,7 +260,8 @@ function reset() {
     merchantCode: null,
     ratePlus: 0,
     activationDate: null,
-    status: null
+    status: null,
+    roudingMode: '1'
   }
   proxy.resetForm('posmachineRef')
 }