From 9d6e88bd7ab6e4319913ae3dcba8f91230a24eef Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 13 Sep 2023 18:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fee/addPayFeeQrcode/addPayFeeQrcode.html         | 12 ++++++++++++
 .../fee/addPayFeeQrcode/addPayFeeQrcode.js           |  7 ++++---
 .../fee/editPayFeeQrcode/editPayFeeQrcode.html       | 12 ++++++++++++
 .../fee/editPayFeeQrcode/editPayFeeQrcode.js         |  6 ++++--
 public/pages/fee/payFeeQrcode/payFeeQrcode.html      |  4 ++++
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.html b/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.html
index e35e6307e..da059bc05 100644
--- a/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.html
+++ b/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.html
@@ -54,6 +54,18 @@
                   </select>
                 </div>
               </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">
+                    <vc:i18n name='展示费用' namespace='addPayFeeQrcode'></vc:i18n>
+                </label>
+                <div class="col-sm-10">
+                  <select class="custom-select" v-model="addPayFeeQrcodeInfo.feeType">
+                    <option selected disabled value="">{{vc.i18n('必填，请选择展示费用','addPayFeeQrcode')}}</option>
+                    <option value="OWNER">{{vc.i18n('业主费用','addPayFeeQrcode')}}</option>
+                    <option value="ROOM">{{vc.i18n('房屋费用','addPayFeeQrcode')}}</option>
+                  </select>
+                </div>
+              </div>
               <div class="form-group row">
                 <label class="col-sm-2 col-form-label">
                     <vc:i18n name='状态' namespace='addPayFeeQrcode'></vc:i18n>
diff --git a/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.js b/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.js
index 6bbb8689e..8716f13a2 100644
--- a/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.js
+++ b/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.js
@@ -14,7 +14,8 @@
                 customFee: '',
                 preFee: 'OFF',
                 content: '',
-                state:'ON'
+                state:'ON',
+                feeType:'OWNER'
             }
         },
         _initMethod: function () {
@@ -143,8 +144,8 @@
                     customFee: '',
                     preFee: 'OFF',
                     content: '',
-                    state:'ON'
-
+                    state:'ON',
+                    feeType:'OWNER'
                 };
             }
         }
diff --git a/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.html b/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.html
index 932cb9dd6..c2fe94b02 100644
--- a/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.html
+++ b/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.html
@@ -54,6 +54,18 @@
                   </select>
                 </div>
               </div>
+              <div class="form-group row">
+                <label class="col-sm-2 col-form-label">
+                    <vc:i18n name='展示费用' namespace='editPayFeeQrcode'></vc:i18n>
+                </label>
+                <div class="col-sm-10">
+                  <select class="custom-select" v-model="editPayFeeQrcodeInfo.feeType">
+                    <option selected disabled value="">{{vc.i18n('必填，请选择展示费用','editPayFeeQrcode')}}</option>
+                    <option value="OWNER">{{vc.i18n('业主费用','editPayFeeQrcode')}}</option>
+                    <option value="ROOM">{{vc.i18n('房屋费用','editPayFeeQrcode')}}</option>
+                  </select>
+                </div>
+              </div>
               <div class="form-group row">
                 <label class="col-sm-2 col-form-label">
                     <vc:i18n name='状态' namespace='editPayFeeQrcode'></vc:i18n>
diff --git a/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.js b/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.js
index 5e5df8be5..e3d7a5868 100644
--- a/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.js
+++ b/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.js
@@ -11,7 +11,8 @@
                 preFee: 'OFF',
                 content: '',
                 qrCodeUrl:'',
-                state:'ON'
+                state:'ON',
+                feeType:''
             }
         },
         _initMethod: function () {
@@ -150,7 +151,8 @@
                     preFee: 'OFF',
                     content: '',
                     qrCodeUrl:'',
-                    state:'ON'
+                    state:'ON',
+                    feeType:''
                 }
             }
         }
diff --git a/public/pages/fee/payFeeQrcode/payFeeQrcode.html b/public/pages/fee/payFeeQrcode/payFeeQrcode.html
index 470cb3ede..9d2ffe0ac 100644
--- a/public/pages/fee/payFeeQrcode/payFeeQrcode.html
+++ b/public/pages/fee/payFeeQrcode/payFeeQrcode.html
@@ -59,6 +59,9 @@
                                 <th class="text-center">
                                     <vc:i18n name='自定义缴费' namespace='payFeeQrcode'></vc:i18n>
                                 </th>
+                                <th class="text-center">
+                                    <vc:i18n name='展示费用' namespace='payFeeQrcode'></vc:i18n>
+                                </th>
                                 <th class="text-center">
                                     <vc:i18n name='状态' namespace='payFeeQrcode'></vc:i18n>
                                 </th>
@@ -84,6 +87,7 @@
                                 <td class="text-center" v-else>按房屋或者业主手机号</td>
                                 <td class="text-center">{{payFeeQrcode.smsValidate == 'ON'?'短信验证码验证':'否'}}</td>
                                 <td class="text-center">{{payFeeQrcode.customFee == 'ON'?'是':'否'}}</td>
+                                <td class="text-center">{{payFeeQrcode.feeType == 'OWNER'?'业主费用':'房屋费用'}}</td>
                                 <td class="text-center">{{payFeeQrcode.state == 'ON'?'启用':'停用'}}</td>
                                 <!-- <td class="text-center">{{payFeeQrcode.preFee == 'ON'?'是':'否'}}</td> -->
                                 <td class="text-center">{{payFeeQrcode.createStaffName}}</td>