From a7f4719d3df8bba0db95a6b63c2dce28754f633f Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 6 Jun 2024 23:02:25 +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/addCarModal/addCarModal.html     | 111 ++++++++++--------
 .../property/addCarModal/addCarModal.js       |  12 +-
 2 files changed, 69 insertions(+), 54 deletions(-)

diff --git a/public/components/property/addCarModal/addCarModal.html b/public/components/property/addCarModal/addCarModal.html
index 4442dbb8a..ab410de85 100644
--- a/public/components/property/addCarModal/addCarModal.html
+++ b/public/components/property/addCarModal/addCarModal.html
@@ -1,58 +1,73 @@
-<div id="addCarModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+<div id="addCarModal" class="modal fade" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b "><span><vc:i18n name="添加车辆" namespace="addCarModal"></vc:i18n></span></h3>
+                <h3 class="m-t-none m-b ">
+                    <vc:i18n name="添加车辆" namespace="addCarModal"></vc:i18n>
+                </h3>
                 <div class="ibox-content">
-                    <div>
-                        <div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="车牌号" namespace="addCarModal"></vc:i18n></span></label>
-                                <div class="col-sm-10">
-                                    <input v-model="addCarModelInfo.carNum" type="text" :placeholder="vc.i18n('必填，请填写车牌号','addCarModal')" class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="车品牌" namespace="addCarModal"></vc:i18n></span></label>
-                                <div class="col-sm-10">
-                                    <input v-model="addCarModelInfo.carBrand" type="text" :placeholder="vc.i18n('必填，请填写车品牌，如 宝马X6','addCarModal')" class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="车类型" namespace="addCarModal"></vc:i18n></span></label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addCarModelInfo.carType">
-                                        <option selected disabled value="">{{vc.i18n('必填，请选择类型','addCarModal')}}</option>
-                                        <option v-for="carType in carTypes" :key="carType.statusCd"
-                                                v-bind:value="carType.statusCd">{{carType.name}}
-                                        </option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="颜色" namespace="addCarModal"></vc:i18n></span></label>
-                                <div class="col-sm-10">
-                                    <input v-model="addCarModelInfo.carColor" type="text" :placeholder="vc.i18n('必填，请填写车颜色，如白色','addCarModal')" class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="备注" namespace="addCarModal"></vc:i18n></span></label>
-                                <div class="col-sm-10">
-                                    <textarea v-model="addCarModelInfo.remark" type="text" :placeholder="vc.i18n('请填写备注信息','addCarModal')" rows="3" class="form-control">
-                                    </textarea>
-                                </div>
-                            </div>
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveAddCarInfo()">
-                                    <i class="fa fa-check"></i>&nbsp;保存
-                                </button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">
-                                    <i class="fa fa-times"></i>&nbsp;取消
-                                </button>
-                            </div>
+
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="车牌号" namespace="addCarModal"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <input v-model="addCarModelInfo.carNum" type="text"
+                                :placeholder="vc.i18n('必填，请填写车牌号','addCarModal')" class="form-control">
                         </div>
                     </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="车品牌" namespace="addCarModal"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <input v-model="addCarModelInfo.carBrand" type="text"
+                                :placeholder="vc.i18n('必填，请填写车品牌，如 宝马X6','addCarModal')" class="form-control">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="车类型" namespace="addCarModal"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <select class="custom-select" v-model="addCarModelInfo.carType">
+                                <option selected disabled value="">{{vc.i18n('必填，请选择类型','addCarModal')}}</option>
+                                <option v-for="carType in carTypes" :key="carType.statusCd"
+                                    v-bind:value="carType.statusCd">{{carType.name}}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="颜色" namespace="addCarModal"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <input v-model="addCarModelInfo.carColor" type="text"
+                                :placeholder="vc.i18n('必填，请填写车颜色，如白色','addCarModal')" class="form-control">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="备注" namespace="addCarModal"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <textarea v-model="addCarModelInfo.remark" type="text"
+                                :placeholder="vc.i18n('请填写备注信息','addCarModal')" rows="3" class="form-control">
+                                    </textarea>
+                        </div>
+                    </div>
+                    <div class="ibox-content">
+                        <button class="btn btn-primary float-right" type="button" v-on:click="saveAddCarInfo()">
+                            <i class="fa fa-check"></i>&nbsp;保存
+                        </button>
+                        <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                            data-dismiss="modal">
+                            <i class="fa fa-times"></i>&nbsp;取消
+                        </button>
+                    </div>
                 </div>
+
             </div>
         </div>
     </div>
diff --git a/public/components/property/addCarModal/addCarModal.js b/public/components/property/addCarModal/addCarModal.js
index df62763ad..c5380e4d0 100644
--- a/public/components/property/addCarModal/addCarModal.js
+++ b/public/components/property/addCarModal/addCarModal.js
@@ -39,7 +39,7 @@
                 param,
                 function(json, res) {
                     var carTypes = JSON.parse(json);
-                    vc.component.carTypes = carTypes;
+                    $that.carTypes = carTypes;
                 },
                 function(errInfo, error) {
                     console.log('请求失败处理');
@@ -56,7 +56,7 @@
         methods: {
             addCarValidate: function() {
                 return vc.validate.validate({
-                    addCarModelInfo: vc.component.addCarModelInfo
+                    addCarModelInfo: $that.addCarModelInfo
                 }, {
                     'addCarModelInfo.carNum': [{
                             limit: "required",
@@ -100,13 +100,13 @@
             },
             saveAddCarInfo: function() {
                 let _carNumType = $that.addCarModelInfo.carNumType;
-                if (!vc.component.addCarValidate()) {
+                if (!$that.addCarValidate()) {
                     //侦听回传
                     vc.toast(vc.validate.errInfo);
                     return;
                 }
-                vc.component.addCarModelInfo.communityId = vc.getCurrentCommunity().communityId;
-                vc.http.apiPost('owner.saveOwnerCarMember', JSON.stringify(vc.component.addCarModelInfo), {
+                $that.addCarModelInfo.communityId = vc.getCurrentCommunity().communityId;
+                vc.http.apiPost('owner.saveOwnerCarMember', JSON.stringify($that.addCarModelInfo), {
                         emulateJSON: true
                     },
                     function(json, res) {
@@ -114,7 +114,7 @@
                         if (_json.code == 0) {
                             //关闭model
                             $('#addCarModal').modal('hide');
-                            vc.component.clearAddCarModalInfo();
+                            $that.clearAddCarModalInfo();
                             vc.emit('listOwnerCarMember', 'listOwnerCarData', {});
                             vc.emit('carDetailMember', 'notify',{});
                             vc.toast("添加成功");