From a5b110aa5f932903f7e87188df3ae29c138ee2eb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 6 Apr 2024 22:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E9=97=AF=E5=B0=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payFeeUserAccount/payFeeUserAccount.js    |   2 +-
 .../tempImportRoomFee/tempImportRoomFee.html  | 189 +++++++++---------
 .../tempImportRoomFee/tempImportRoomFee.js    |   3 +
 3 files changed, 95 insertions(+), 99 deletions(-)

diff --git a/public/components/property/payFeeUserAccount/payFeeUserAccount.js b/public/components/property/payFeeUserAccount/payFeeUserAccount.js
index f8a8c37f3..467a6a453 100644
--- a/public/components/property/payFeeUserAccount/payFeeUserAccount.js
+++ b/public/components/property/payFeeUserAccount/payFeeUserAccount.js
@@ -68,7 +68,7 @@
                     function (json, res) {
                         let _json = JSON.parse(json);
                         if (_json.data.length < 1) {
-                            vc.toast('当前没有可用账户');
+                            //vc.toast('当前没有可用账户');
                             return;
                         }
                         //账户余额
diff --git a/public/components/property/tempImportRoomFee/tempImportRoomFee.html b/public/components/property/tempImportRoomFee/tempImportRoomFee.html
index e13ed7aa9..1f24f8f30 100644
--- a/public/components/property/tempImportRoomFee/tempImportRoomFee.html
+++ b/public/components/property/tempImportRoomFee/tempImportRoomFee.html
@@ -7,106 +7,99 @@
                     <vc:i18n name="临时收费" namespace="tempImportRoomFee"></vc:i18n>
                 </h3>
                 <div class="ibox-content">
-                    <div>
-                        <div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <vc:i18n name="费用类型" namespace="tempImportRoomFee"></vc:i18n>
-                                </label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="tempImportRoomFeeInfo.feeTypeCd"
-                                        @change="_changeFeeTypeCd(tempImportRoomFeeInfo.feeTypeCd)">
-                                        <option selected disabled value="">{{vc.i18n('必填，请选择费用类型','tempImportRoomFee')}}
-                                        </option>
-                                        <option v-for="(item,index) in tempImportRoomFeeInfo.feeTypeCds" :key="index"
-                                            v-bind:value="item.statusCd">
-                                            {{item.name}}
-                                        </option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <vc:i18n name="费用对象" namespace="tempImportRoomFee"></vc:i18n>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="tempImportRoomFeeInfo.objName" type="text" disabled="disabled"
-                                        :placeholder="vc.i18n('必填，请填写费用对象','tempImportRoomFee')" class="form-control ">
-                                </div>
-                            </div>
-                            <div class="form-group row" v-if="tempImportRoomFeeInfo.feeNameFlag == 'S'">
-                                <label class="col-sm-2 col-form-label">
-                                    <vc:i18n name="费用名称" namespace="tempImportRoomFee"></vc:i18n>
-                                </label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="tempImportRoomFeeInfo.configId">
-                                        <option selected disabled value="">{{vc.i18n('必填，请选择收费项目','tempImportRoomFee')}}
-                                        </option>
-                                        <option v-for="(item,index) in tempImportRoomFeeInfo.feeConfigs" :key="index"
-                                            v-bind:value="item.feeName" >{{item.feeName}}
-                                        </option>
-                                    </select>
-                                    <span>说明：显示公式为动态费用的费用项</span>
-                                </div>
-                                <!-- <div class="col-sm-2">
-                                    <button type="button" class="btn btn-white" @click="_inputFeeName()"><vc:i18n name="输入" namespace="tempImportRoomFee"></vc:i18n></button>
-                                </div> -->
-                            </div>
-                            <div class="form-group row" v-else>
-                                <label class="col-sm-2 col-form-label">
-                                    <vc:i18n name="费用名称" namespace="tempImportRoomFee"></vc:i18n>
-                                </label>
-                                <div class="col-sm-8">
-                                    <input v-model="tempImportRoomFeeInfo.feeName" type="text"
-                                        :placeholder="vc.i18n('必填，请填写费用名称','tempImportRoomFee')" class="form-control ">
-                                </div>
-                                <div class="col-sm-2">
-                                    <button type="button" class="btn btn-white" @click="_inputFeeName()">
-                                        <vc:i18n name="选择" namespace="tempImportRoomFee"></vc:i18n>
-                                    </button>
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <vc:i18n name="收费金额" namespace="tempImportRoomFee"></vc:i18n>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="tempImportRoomFeeInfo.amount" type="text"
-                                        :placeholder="vc.i18n('必填，请填写收费金额','tempImportRoomFee')" class="form-control ">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <vc:i18n name="开始时间" namespace="tempImportRoomFee"></vc:i18n>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="tempImportRoomFeeInfo.startTime" type="text"
-                                        :placeholder="vc.i18n('必填，请填写开始时间','tempImportRoomFee')"
-                                        class="form-control tempImportFeeStartTime">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <vc:i18n name="结束时间" namespace="tempImportRoomFee"></vc:i18n>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="tempImportRoomFeeInfo.endTime" type="text"
-                                        :placeholder="vc.i18n('必填，请填写结束时间','tempImportRoomFee')"
-                                        class="form-control tempImportFeeEndTime">
-                                </div>
-                            </div>
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button"
-                                    v-on:click="_saveTempImportFeeInfo()"><i class="fa fa-check"></i>&nbsp;提交
-                                </button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                    data-dismiss="modal"><span>
-                                        <vc:i18n name="取消" namespace="tempImportRoomFee"></vc:i18n>
-                                    </span>
-                                </button>
-                            </div>
+
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="费用类型" namespace="tempImportRoomFee"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <select class="custom-select" v-model="tempImportRoomFeeInfo.feeTypeCd"
+                                @change="_changeFeeTypeCd(tempImportRoomFeeInfo.feeTypeCd)">
+                                <option selected disabled value="">{{vc.i18n('必填，请选择费用类型','tempImportRoomFee')}}
+                                </option>
+                                <option v-for="(item,index) in tempImportRoomFeeInfo.feeTypeCds" :key="index"
+                                    v-bind:value="item.statusCd">
+                                    {{item.name}}
+                                </option>
+                            </select>
                         </div>
                     </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="费用对象" namespace="tempImportRoomFee"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <input v-model="tempImportRoomFeeInfo.objName" type="text" disabled="disabled"
+                                :placeholder="vc.i18n('必填，请填写费用对象','tempImportRoomFee')" class="form-control ">
+                        </div>
+                    </div>
+                    <div class="form-group row" v-if="tempImportRoomFeeInfo.feeNameFlag == 'S'">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="费用名称" namespace="tempImportRoomFee"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <select class="custom-select" v-model="tempImportRoomFeeInfo.configId">
+                                <option selected disabled value="">{{vc.i18n('必填，请选择收费项目','tempImportRoomFee')}}
+                                </option>
+                                <option v-for="(item,index) in tempImportRoomFeeInfo.feeConfigs" :key="index"
+                                    v-bind:value="item.configId">{{item.feeName}}
+                                </option>
+                            </select>
+                            <span>说明：显示公式为动态费用的费用项</span>
+                        </div>
+                    </div>
+                    <div class="form-group row" v-else>
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="费用名称" namespace="tempImportRoomFee"></vc:i18n>
+                        </label>
+                        <div class="col-sm-8">
+                            <input v-model="tempImportRoomFeeInfo.feeName" type="text"
+                                :placeholder="vc.i18n('必填，请填写费用名称','tempImportRoomFee')" class="form-control ">
+                        </div>
+                        <div class="col-sm-2">
+                            <button type="button" class="btn btn-white" @click="_inputFeeName()">
+                                <vc:i18n name="选择" namespace="tempImportRoomFee"></vc:i18n>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="收费金额" namespace="tempImportRoomFee"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <input v-model="tempImportRoomFeeInfo.amount" type="text"
+                                :placeholder="vc.i18n('必填，请填写收费金额','tempImportRoomFee')" class="form-control ">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="开始时间" namespace="tempImportRoomFee"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <input v-model="tempImportRoomFeeInfo.startTime" type="text"
+                                :placeholder="vc.i18n('必填，请填写开始时间','tempImportRoomFee')"
+                                class="form-control tempImportFeeStartTime">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="结束时间" namespace="tempImportRoomFee"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <input v-model="tempImportRoomFeeInfo.endTime" type="text"
+                                :placeholder="vc.i18n('必填，请填写结束时间','tempImportRoomFee')"
+                                class="form-control tempImportFeeEndTime">
+                        </div>
+                    </div>
+                    <div class="ibox-content">
+                        <button class="btn btn-primary float-right" type="button"
+                            v-on:click="_saveTempImportFeeInfo()"><i class="fa fa-check"></i>&nbsp;提交
+                        </button>
+                        <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                            data-dismiss="modal">
+                                <vc:i18n name="取消" namespace="tempImportRoomFee"></vc:i18n>
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/public/components/property/tempImportRoomFee/tempImportRoomFee.js b/public/components/property/tempImportRoomFee/tempImportRoomFee.js
index 63c24651e..9b836ffce 100644
--- a/public/components/property/tempImportRoomFee/tempImportRoomFee.js
+++ b/public/components/property/tempImportRoomFee/tempImportRoomFee.js
@@ -146,6 +146,9 @@
                             vc.emit('roomCreateFee', 'notify', {});
                             vc.emit('simplifyRoomFee', 'notify', {});
                             vc.emit('listContractFee', 'notify', {});
+                            vc.toast('创建成功');
+                            return;
+
                         }
                         vc.toast(_json.msg);
                     },