From f472c36b2622d91b4ecb5974cec167c0d92f6906 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 20 Oct 2023 16:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/addFeeConfig/addFeeConfig.html   | 17 +++---
 .../property/editFeeConfig/editFeeConfig.html | 56 +++++++++----------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/public/components/property/addFeeConfig/addFeeConfig.html b/public/components/property/addFeeConfig/addFeeConfig.html
index ac08a1097..cdf8437a3 100644
--- a/public/components/property/addFeeConfig/addFeeConfig.html
+++ b/public/components/property/addFeeConfig/addFeeConfig.html
@@ -93,7 +93,7 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label class="col-sm-2 col-form-label text-right">
+                        <!-- <label class="col-sm-2 col-form-label text-right">
                             <vc:i18n name="催缴类型" namespace="addFeeConfig"></vc:i18n>
                         </label>
                         <div class="col-sm-4">
@@ -105,6 +105,13 @@
                                     :value="item.statusCd">{{item.name}}
                                 </option>
                             </select>
+                        </div> -->
+                        <label class="col-sm-2 col-form-label text-right">
+                            <vc:i18n name="单位" namespace="addFeeConfig"></vc:i18n>
+                        </label>
+                        <div class="col-sm-4">
+                            <input v-model="addFeeConfigInfo.units" type="text"
+                                :placeholder="vc.i18n('必填，请填写单位（如：元）','addFeeConfig')" class="form-control">
                         </div>
                         <label class="col-sm-2 col-form-label text-right">
                             <vc:i18n name="账户抵扣" namespace="addFeeConfig"></vc:i18n>
@@ -150,13 +157,7 @@
                                 <option value="4">{{vc.i18n('4位')}}</option>
                             </select>
                         </div>
-                        <label class="col-sm-2 col-form-label text-right">
-                            <vc:i18n name="单位" namespace="addFeeConfig"></vc:i18n>
-                        </label>
-                        <div class="col-sm-4">
-                            <input v-model="addFeeConfigInfo.units" type="text"
-                                :placeholder="vc.i18n('必填，请填写单位（如：元）','addFeeConfig')" class="form-control">
-                        </div>
+                        
                     </div>
                     <div class="form-group row">
                         <label class="col-sm-2 col-form-label text-right">
diff --git a/public/components/property/editFeeConfig/editFeeConfig.html b/public/components/property/editFeeConfig/editFeeConfig.html
index b12428222..afac6bf95 100644
--- a/public/components/property/editFeeConfig/editFeeConfig.html
+++ b/public/components/property/editFeeConfig/editFeeConfig.html
@@ -3,14 +3,14 @@
         <div class="modal-content">
             <div class="modal-body">
                 <h3 class="m-t-none m-b ">
-                    <span><vc:i18n name="修改" namespace="editFeeConfig"></vc:i18n></span>
+                    <vc:i18n name="修改" namespace="editFeeConfig"></vc:i18n>
                 </h3>
                 <div class="ibox-content">
                     <div>
                         <div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="费用类型" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="费用类型" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <select class="custom-select" v-bind:disabled="editFeeConfigInfo.isDefault=='T'"
@@ -24,7 +24,7 @@
                                     </select>
                                 </div>
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="收费项目" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="收费项目" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <input v-model="editFeeConfigInfo.feeName"
@@ -34,7 +34,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="费用标识" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="费用标识" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <select class="custom-select" v-bind:disabled="editFeeConfigInfo.isDefault=='T'"
@@ -48,7 +48,7 @@
                                     </select>
                                 </div>
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="付费类型" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="付费类型" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <select class="custom-select" v-model="editFeeConfigInfo.paymentCd">
@@ -64,7 +64,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label text-right"
                                        v-if="editFeeConfigInfo.feeFlag !='2006012'">
-                                    <span><vc:i18n name="缴费周期" namespace="editFeeConfig"></vc:i18n></span>(单位:月)
+                                    <vc:i18n name="缴费周期(单位:月)" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4" v-if="editFeeConfigInfo.feeFlag !='2006012'">
                                     <input v-model="editFeeConfigInfo.paymentCycle" type="text"
@@ -73,7 +73,7 @@
                                 </div>
                                 <label class="col-sm-2 col-form-label text-right"
                                        v-if="editFeeConfigInfo.paymentCd == '1200'">
-                                    <span><vc:i18n name="预付期" namespace="editFeeConfig"></vc:i18n></span>(单位:天)
+                                    <vc:i18n name="预付期(单位:天)" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4" v-if="editFeeConfigInfo.paymentCd == '1200'">
                                     <input v-model="editFeeConfigInfo.prepaymentPeriod" type="text"
@@ -83,7 +83,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="开始时间" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="开始时间" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <input v-model="editFeeConfigInfo.startTime" type="text"
@@ -91,7 +91,7 @@
                                            class="form-control editFeeConfigStartTime">
                                 </div>
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="结束时间" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="结束时间" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <input v-model="editFeeConfigInfo.endTime" type="text"
@@ -100,8 +100,8 @@
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="催缴类型" namespace="editFeeConfig"></vc:i18n></span>
+                                <!-- <label class="col-sm-2 col-form-label text-right">
+                                    <vc:i18n name="催缴类型" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <select class="custom-select" v-model="editFeeConfigInfo.billType">
@@ -112,9 +112,16 @@
                                                 :value="item.statusCd">{{item.name}}
                                         </option>
                                     </select>
+                                </div> -->
+                                <label class="col-sm-2 col-form-label text-right">
+                                    <vc:i18n name="单位" namespace="editFeeConfig"></vc:i18n>
+                                </label>
+                                <div class="col-sm-4">
+                                    <input v-model="editFeeConfigInfo.units" type="text"
+                                           :placeholder="vc.i18n('必填，请填写单位（如：元）','editFeeConfig')" class="form-control">
                                 </div>
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="是否抵扣" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="是否抵扣" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <select class="custom-select" v-model="editFeeConfigInfo.deductFrom">
@@ -128,7 +135,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="手机缴费" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="手机缴费" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <select class="custom-select" v-model="editFeeConfigInfo.payOnline">
@@ -137,7 +144,7 @@
                                     </select>
                                 </div>
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="进位方式" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="进位方式" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <select class="custom-select" v-model="editFeeConfigInfo.scale">
@@ -149,7 +156,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="保留小数位" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="保留小数位" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-4">
                                     <select class="custom-select" v-model="editFeeConfigInfo.decimalPlace">
@@ -160,17 +167,11 @@
                                         <option value="4">{{vc.i18n('4位')}}</option>
                                     </select>
                                 </div>
-                                <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="单位" namespace="editFeeConfig"></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-4">
-                                    <input v-model="editFeeConfigInfo.units" type="text"
-                                           :placeholder="vc.i18n('必填，请填写单位（如：元）','editFeeConfig')" class="form-control">
-                                </div>
+                               
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="计算公式" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="计算公式" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-bind:disabled="editFeeConfigInfo.isDefault=='T'"
@@ -193,7 +194,7 @@
                                  && editFeeConfigInfo.computingFormula != '4004'
                                  && editFeeConfigInfo.computingFormula != '9009'">
                                 <label class="col-sm-2 col-form-label text-right">
-                                    <span><vc:i18n name="计费单价" namespace="editFeeConfig"></vc:i18n></span>
+                                    <vc:i18n name="计费单价" namespace="editFeeConfig"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="editFeeConfigInfo.squarePrice" type="text"
@@ -217,7 +218,7 @@
                             <div v-show="editFeeConfigInfo.computingFormula == '7007'">
                                 <div class="form-group row">
                                     <label class="col-sm-2 col-form-label text-right">
-                                        <span><vc:i18n name="公式" namespace="editFeeConfig"></vc:i18n></span>
+                                        <vc:i18n name="公式" namespace="editFeeConfig"></vc:i18n>
                                     </label>
                                     <div class="col-sm-10">
                                         <textarea v-model="editFeeConfigInfo.computingFormulaText"
@@ -238,12 +239,11 @@
                                         <div>X 代表房屋收费系数（房屋管理中配置）</div>
                                         <div>L 代表房屋层数</div>
                                         <div>
-                                            <span><vc:i18n name="举例" namespace="editFeeConfig"></vc:i18n></span>：电梯使用费
+                                            举例：电梯使用费
                                             (层数-5)*每层单价+基础费用
                                         </div>
                                         <div>
-                                            <span><vc:i18n name="公式" namespace="editFeeConfig"></vc:i18n></span>：(L-5)*5
-                                            + 10
+                                            公式：(L-5)*5 + 10
                                         </div>
                                     </div>
                                 </div>