From 6ad190c21991fb5f40f88992ef65aa1f5ef93270 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 8 Sep 2023 13:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=9A=E4=B8=BB=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E8=B4=B9=E7=94=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fee/addPayFeeQrcode/addPayFeeQrcode.html         | 12 ++++++++++++
 .../fee/addPayFeeQrcode/addPayFeeQrcode.js           |  3 ++-
 .../fee/editPayFeeQrcode/editPayFeeQrcode.html       | 12 ++++++++++++
 .../fee/editPayFeeQrcode/editPayFeeQrcode.js         |  4 +++-
 public/pages/fee/payFeeQrcode/payFeeQrcode.html      |  4 ++++
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.html b/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.html
index f8aba0ae5..e35e6307e 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.state">
+                    <option selected disabled value="">{{vc.i18n('必填，请选择状态','addPayFeeQrcode')}}</option>
+                    <option value="ON">{{vc.i18n('启用','addPayFeeQrcode')}}</option>
+                    <option value="OFF">{{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 3541c2c0f..6bbb8689e 100644
--- a/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.js
+++ b/public/components/fee/addPayFeeQrcode/addPayFeeQrcode.js
@@ -14,7 +14,7 @@
                 customFee: '',
                 preFee: 'OFF',
                 content: '',
-
+                state:'ON'
             }
         },
         _initMethod: function () {
@@ -143,6 +143,7 @@
                     customFee: '',
                     preFee: 'OFF',
                     content: '',
+                    state:'ON'
 
                 };
             }
diff --git a/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.html b/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.html
index c62dbad0e..932cb9dd6 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.state">
+                    <option selected disabled value="">{{vc.i18n('必填，请选择状态','editPayFeeQrcode')}}</option>
+                    <option value="ON">{{vc.i18n('启用','editPayFeeQrcode')}}</option>
+                    <option value="OFF">{{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 97f632726..5e5df8be5 100644
--- a/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.js
+++ b/public/components/fee/editPayFeeQrcode/editPayFeeQrcode.js
@@ -11,6 +11,7 @@
                 preFee: 'OFF',
                 content: '',
                 qrCodeUrl:'',
+                state:'ON'
             }
         },
         _initMethod: function () {
@@ -148,7 +149,8 @@
                     customFee: '',
                     preFee: 'OFF',
                     content: '',
-                    qrCodeUrl:''
+                    qrCodeUrl:'',
+                    state:'ON'
                 }
             }
         }
diff --git a/public/pages/fee/payFeeQrcode/payFeeQrcode.html b/public/pages/fee/payFeeQrcode/payFeeQrcode.html
index 57eea63e4..470cb3ede 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> -->
@@ -81,6 +84,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.state == 'ON'?'启用':'停用'}}</td>
                                 <!-- <td class="text-center">{{payFeeQrcode.preFee == 'ON'?'是':'否'}}</td> -->
                                 <td class="text-center">{{payFeeQrcode.createStaffName}}</td>
                                 <td class="text-center">{{payFeeQrcode.createTime}}</td>