From 145d378f2d2395f7f3e54160e89bbaf304f0a67e Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 14 Apr 2025 12:50:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=99=BA=E8=81=AA=E8=AE=B0=E8=B4=A6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8Cpos=E6=9C=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invest/posmachine/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/invest/posmachine/index.vue b/src/views/invest/posmachine/index.vue
index 973d39c..5f80416 100644
--- a/src/views/invest/posmachine/index.vue
+++ b/src/views/invest/posmachine/index.vue
@@ -50,14 +50,16 @@
             </template>
           </el-table-column>
           <el-table-column label="商户名称" align="center" prop="merchantName" />
-          <el-table-column label="刷卡费率" align="center" width="150" prop="rateName" />
+          <el-table-column label="刷卡费率" align="center" width="100" 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">
+          <el-table-column label="商户类型" align="center" width="150" prop="merchantType">
             <template #default="scope">
               <dict-tag :options="merchant_type" :value="scope.row.merchantType" />
             </template>
           </el-table-column>
+          <el-table-column label="供货商" align="center" width="100" prop="manufacture" />
+          <!--
           <el-table-column label="商户码" align="center" prop="merchantCode" /> -->
           <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
             <template v-slot="scope">
@@ -112,8 +114,8 @@
             <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 label="供货商" prop="manufacture">
+          <el-input v-model="form.manufacture" placeholder="请输入供货商" />
         </el-form-item>
         <el-form-item label="支付公司" prop="payCompany">
           <el-input v-model="form.payCompany" placeholder="请输入支付公司" />