From 737f97bfa60566d971069dc7602b6f95066a6584 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 14 Apr 2025 13:05:48 +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/pages/work/base/posmachine/addEdit.vue | 4 ++--
 src/pages/work/base/posmachine/details.vue | 4 ++--
 src/pages/work/base/posmachine/list.vue    | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/work/base/posmachine/addEdit.vue b/src/pages/work/base/posmachine/addEdit.vue
index 7984e55..8004fd0 100644
--- a/src/pages/work/base/posmachine/addEdit.vue
+++ b/src/pages/work/base/posmachine/addEdit.vue
@@ -57,8 +57,8 @@
                 inputAlign="right" border="none"></u--input>
               <u-icon slot="right" name="arrow-down"></u-icon>
             </u-form-item>
-            <u-form-item label="厂商"  prop="manufacture" >
-              <u--input v-model="form.manufacture"  placeholder="请填写厂商"
+            <u-form-item label="供货商"  prop="manufacture" >
+              <u--input v-model="form.manufacture"  placeholder="请填写供货商"
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
             <u-form-item label="支付公司" prop="payCompany" >
diff --git a/src/pages/work/base/posmachine/details.vue b/src/pages/work/base/posmachine/details.vue
index 350aecf..afe35b5 100644
--- a/src/pages/work/base/posmachine/details.vue
+++ b/src/pages/work/base/posmachine/details.vue
@@ -3,7 +3,7 @@
       <u-navbar
 			leftIconSize="40rpx"
 			leftIconColor="#333333"
-			title="信用卡详情"
+			title="POS机详情"
 		>
 		</u-navbar>
       <view class="section">
@@ -19,7 +19,7 @@
         <u-cell title="结算卡:" titleStyle="font-weight:bolder" :value="detailInfo.bankNameCode"></u-cell>
         <u-cell title="商户类型:" titleStyle="font-weight:bolder" :value="detailInfo.merchantType"></u-cell>
         <u-cell title="商户码:" titleStyle="font-weight:bolder" :value="detailInfo.merchantCode"></u-cell>
-        <u-cell title="厂商:" titleStyle="font-weight:bolder" :value="detailInfo.manufacture"></u-cell>
+        <u-cell title="供货商:" titleStyle="font-weight:bolder" :value="detailInfo.manufacture"></u-cell>
         <u-cell title="编号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
         <u-cell title="启用日期:" titleStyle="font-weight:bolder" :value="detailInfo.activationDate"></u-cell>
         <u-cell title="备注:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
diff --git a/src/pages/work/base/posmachine/list.vue b/src/pages/work/base/posmachine/list.vue
index c2467dc..c1c940f 100644
--- a/src/pages/work/base/posmachine/list.vue
+++ b/src/pages/work/base/posmachine/list.vue
@@ -21,6 +21,7 @@
             <text class="row-label">支付公司：</text>
             <text class="row-value">{{ item.payCompany }}</text>
           </view>
+       
           <view class="item-row">
             <text class="row-label">类型：</text>
             <text class="row-value">{{ dictStr(item.type, posTypeList) }}</text>
@@ -41,6 +42,10 @@
             <text class="row-label">商户类型：</text>
             <text class="row-value">{{ dictStr(item.merchantType, merchantTypeList) }}</text>
           </view>
+          <view class="item-row">
+            <text class="row-label">供货商：</text>
+            <text class="row-value">{{ item.manufacture }}</text>
+          </view>
           <view class="operate" >
             <!-- <view class="btn filling" @click="enterDetails(item)">查看</view > -->
                <view class="btn filling" @click="handleEdit(item)">修改</view>