From 81f3ca9903e1480ba28273e3512386a0275ce51d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 30 Jun 2022 01:32:01 +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

---
 public/components/property/addFeeConfig/addFeeConfig.js     | 1 +
 public/components/property/editFeeConfig/editFeeConfig.js   | 1 +
 .../property/roomCreateFeeAdd/roomCreateFeeAdd.html         | 6 +++---
 .../property/roomCreateFeeAdd/roomCreateFeeAdd.js           | 5 +++--
 public/vcCore/vcFramework.js                                | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/public/components/property/addFeeConfig/addFeeConfig.js b/public/components/property/addFeeConfig/addFeeConfig.js
index ff0f76e70..d68b18bab 100755
--- a/public/components/property/addFeeConfig/addFeeConfig.js
+++ b/public/components/property/addFeeConfig/addFeeConfig.js
@@ -216,6 +216,7 @@
                 if (vc.component.addFeeConfigInfo.computingFormula == '7007' ||
                     vc.component.addFeeConfigInfo.computingFormula == '4004' ||
                     vc.component.addFeeConfigInfo.computingFormula == '1101' ||
+                    vc.component.addFeeConfigInfo.computingFormula == '1102' ||
                     vc.component.addFeeConfigInfo.computingFormula == '9009') {
                     vc.component.addFeeConfigInfo.squarePrice = "0.00";
                     vc.component.addFeeConfigInfo.additionalAmount = "0.00";
diff --git a/public/components/property/editFeeConfig/editFeeConfig.js b/public/components/property/editFeeConfig/editFeeConfig.js
index fdc7cdabc..9a5aacaa1 100755
--- a/public/components/property/editFeeConfig/editFeeConfig.js
+++ b/public/components/property/editFeeConfig/editFeeConfig.js
@@ -218,6 +218,7 @@
                 if (vc.component.editFeeConfigInfo.computingFormula == '7007' ||
                     vc.component.editFeeConfigInfo.computingFormula == '4004' ||
                     vc.component.editFeeConfigInfo.computingFormula == '1101' ||
+                    vc.component.editFeeConfigInfo.computingFormula == '1102' ||
                     vc.component.editFeeConfigInfo.computingFormula == '9009') {
                     vc.component.editFeeConfigInfo.squarePrice = "0.00";
                     vc.component.editFeeConfigInfo.additionalAmount = "0.00";
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
index 1169ae003..94c06ff34 100755
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
@@ -155,19 +155,19 @@
                             <div class="form-group row" v-show="roomCreateFeeAddInfo.computingFormula == '1102'">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="递增周期" namespace="roomCreateFeeAdd"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <input v-model="roomCreateFeeAddInfo.rateCycle" type="text" :placeholder="vc.i18n('必填，请填写递增周期,请填写月份','roomCreateFeeAdd')" class="form-control roomCreateFeeEndTime">
+                                    <input v-model="roomCreateFeeAddInfo.rateCycle" type="text" :placeholder="vc.i18n('必填，请填写递增周期,请填写月份','roomCreateFeeAdd')" class="form-control ">
                                 </div>
                             </div>
                             <div class="form-group row" v-show="roomCreateFeeAddInfo.computingFormula == '1102'">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="计费递增率" namespace="roomCreateFeeAdd"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <input v-model="roomCreateFeeAddInfo.rate" type="text" :placeholder="vc.i18n('必填，请填写递增率','roomCreateFeeAdd')" class="form-control roomCreateFeeEndTime">
+                                    <input v-model="roomCreateFeeAddInfo.rate" type="text" :placeholder="vc.i18n('必填，请填写递增率','roomCreateFeeAdd')" class="form-control ">
                                 </div>
                             </div>
                             <div class="form-group row" v-show="roomCreateFeeAddInfo.computingFormula == '1102'">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="递增开始时间" namespace="roomCreateFeeAdd"></vc:i18n></span></label>
                                 <div class="col-sm-10">
-                                    <input v-model="roomCreateFeeAddInfo.rateStartTime" type="text" :placeholder="vc.i18n('必填，请填写递增开始时间','roomCreateFeeAdd')" class="form-control roomRateStartTime">
+                                    <input v-model="roomCreateFeeAddInfo.rateStartTime" type="text" :placeholder="vc.i18n('必填，请填写递增开始时间','roomCreateFeeAdd')" class="form-control addRoomRateStartTime">
                                 </div>
                             </div>
                             <div class="ibox-content">
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
index 346d2fe0c..406a34d65 100755
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
@@ -97,8 +97,9 @@
                     }
                 });
 
-                vc.initDate('rateStartTime', function(_endTime) {
-                    $that.roomCreateFeeAddInfo.rateStartTime = _endTime;
+                vc.initDate('addRoomRateStartTime', function(_rateStartTime) {
+                    console.log(_rateStartTime)
+                    $that.roomCreateFeeAddInfo.rateStartTime = _rateStartTime;
                     let start = Date.parse(new Date($that.roomCreateFeeAddInfo.startTime))
                     let end = Date.parse(new Date($that.roomCreateFeeAddInfo.rateStartTime))
                     if (start - end >= 0) {
diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js
index c0fba934f..9a4432c9d 100755
--- a/public/vcCore/vcFramework.js
+++ b/public/vcCore/vcFramework.js
@@ -1761,7 +1761,7 @@
         });
         $('.' + _dateStr).datetimepicker()
             .on('changeDate', function(ev) {
-                var value = $('.' + _dateStr).val();
+                let value = $('.' + _dateStr).val();
                 //vc.component.addFeeConfigInfo.startTime = value;
                 _callBack(value);
             });