From eed5166e953dc68a5528897d1e8ba26fd43327be Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 13 Oct 2023 15:39:23 +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

---
 .../wirteInvoiceEvent/wirteInvoiceEvent.html  |  43 +++
 .../wirteInvoiceEvent/wirteInvoiceEvent.js    |  60 ++++
 .../editAccessControlWhite.html               | 302 ++++++------------
 .../property/addOwner/addOwner.html           |  14 +-
 .../tempImportRoomFee/tempImportRoomFee.html  |  82 +++--
 .../tempImportRoomFee/tempImportRoomFee.js    |  20 +-
 .../pages/fee/invoiceApply/invoiceApply.html  |   6 +
 public/pages/fee/invoiceApply/invoiceApply.js |   3 +
 8 files changed, 285 insertions(+), 245 deletions(-)
 create mode 100644 public/components/fee/wirteInvoiceEvent/wirteInvoiceEvent.html
 create mode 100644 public/components/fee/wirteInvoiceEvent/wirteInvoiceEvent.js

diff --git a/public/components/fee/wirteInvoiceEvent/wirteInvoiceEvent.html b/public/components/fee/wirteInvoiceEvent/wirteInvoiceEvent.html
new file mode 100644
index 000000000..3bea596aa
--- /dev/null
+++ b/public/components/fee/wirteInvoiceEvent/wirteInvoiceEvent.html
@@ -0,0 +1,43 @@
+<div id="wirteInvoiceEventModel" 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 ">
+                    <vc:i18n name="登记核销" namespace="wirteInvoiceEvent"></vc:i18n>
+                </h3>
+                <div class="ibox-content">
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="类型" namespace="wirteInvoiceEvent"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <select class="custom-select" v-model="wirteInvoiceEventInfo.eventType" >
+                                <option selected disabled value="">{{vc.i18n('必填，请选择类型','wirteInvoiceEvent')}}</option>
+                                <option value="4004">领用</option>
+                                <option value="5005">登记</option>   
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-sm-2 col-form-label">
+                            <vc:i18n name="说明" namespace="wirteInvoiceEvent"></vc:i18n>
+                        </label>
+                        <div class="col-sm-10">
+                            <textarea v-model.trim="wirteInvoiceEventInfo.remark"  :placeholder="vc.i18n('必填，请填写说明','wirteInvoiceEvent')" class="form-control"></textarea>
+                        </div>
+                    </div>
+                    
+                    <div class="ibox-content">
+                        <button class="btn btn-primary float-right" type="button" v-on:click="_wirteEvent()">
+                            <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="wirteInvoiceEvent"></vc:i18n>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/components/fee/wirteInvoiceEvent/wirteInvoiceEvent.js b/public/components/fee/wirteInvoiceEvent/wirteInvoiceEvent.js
new file mode 100644
index 000000000..b7eb5faf6
--- /dev/null
+++ b/public/components/fee/wirteInvoiceEvent/wirteInvoiceEvent.js
@@ -0,0 +1,60 @@
+(function (vc) {
+    vc.extends({
+        data: {
+            wirteInvoiceEventInfo: {
+                applyId: '',
+                eventType:'',
+                remark: '',
+            }
+        },
+        _initMethod: function () {
+            
+        },
+        _initEvent: function () {
+           
+            vc.on('wirteInvoiceEvent', 'openWirteInvoiceModal', function(_param) {
+                vc.copyObject(_param,$that.wirteInvoiceEventInfo);
+                $('#wirteInvoiceEventModel').modal('show');
+            });
+        },
+        methods: {
+            _wirteEvent: function () {
+                let _eventType = $that.wirteInvoiceEventInfo.eventType;
+                if (!_eventType) {
+                    vc.toast("请选择类型");
+                    return;
+                }
+                $that.wirteInvoiceEventInfo.communityId = vc.getCurrentCommunity().communityId;
+                vc.http.apiPost(
+                    '/invoice.writeInvoiceApply',
+                    JSON.stringify($that.wirteInvoiceEventInfo), {
+                        emulateJSON: true
+                    },
+                    function (json, res) {
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        let _json = JSON.parse(json)
+                        if (_json.code == '0') {
+                            //关闭model
+                            $('#wirteInvoiceEventModel').modal('hide');
+                            $that.clearWirteInvoiceEventInfo();
+                            vc.emit('invoiceApply', 'listInvoiceApply', {});
+                            vc.toast("上传成功");
+                            return;
+                        } else {
+                            vc.toast(_json.msg);
+                        }
+                    },
+                    function (errInfo, error) {
+                        vc.toast(errInfo);
+                    });
+            },
+            clearWirteInvoiceEventInfo: function () {
+                $that.wirteInvoiceEventInfo = {
+                    applyId: '',
+                    eventType:'',
+                    remark: '',
+                };
+            },
+        }
+    });
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/machine/editAccessControlWhite/editAccessControlWhite.html b/public/components/machine/editAccessControlWhite/editAccessControlWhite.html
index 3ced94961..d7be1d2eb 100644
--- a/public/components/machine/editAccessControlWhite/editAccessControlWhite.html
+++ b/public/components/machine/editAccessControlWhite/editAccessControlWhite.html
@@ -1,209 +1,103 @@
 <div id="editAccessControlWhiteModel" 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="editAccessControlWhite"></vc:i18n></span>
-                </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='editAccessControlWhite'></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="editAccessControlWhiteInfo.personType">
-                                        <option selected value="">请选择人员类型</option>
-                                        <option :value="item.statusCd"
-                                                v-for="(item,index) in editAccessControlWhiteInfo.personTypes">
-                                            {{item.name}}
-                                        </option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name='用户名称' namespace='editAccessControlWhite'></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="editAccessControlWhiteInfo.personName" type="text"
-                                           :placeholder="vc.i18n('必填，请填写用户名称','editAccessControlWhite')"
-                                           class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name='手机号' namespace='editAccessControlWhite'></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="editAccessControlWhiteInfo.tel" type="text"
-                                           :placeholder="vc.i18n('必填，请填写手机号','editAccessControlWhite')"
-                                           class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name='身份证号' namespace='editAccessControlWhite'></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="editAccessControlWhiteInfo.idCard" type="text"
-                                           :placeholder="vc.i18n('选填，请填写身份证号','editAccessControlWhite')"
-                                           class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name='授权设备' namespace='editAccessControlWhite'></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="editAccessControlWhiteInfo.machineId">
-                                        <option selected value="">请选择授权设备</option>
-                                        <option :value="item.machineId"
-                                                v-for="(item,index) in editAccessControlWhiteInfo.machines">
-                                            {{item.machineName}}({{item.machineCode}})
-                                        </option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name='门禁卡号' namespace='editAccessControlWhite'></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="editAccessControlWhiteInfo.accessControlKey" type="text"
-                                           :placeholder="vc.i18n('选填，请填写门禁卡号','editAccessControlWhite')"
-                                           class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name='门禁人脸' namespace='editAccessControlWhite'></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <vc:create path="frame/uploadImageUrl" callBackListener="editAccessControlWhite"
-                                               callBackFunction="notifyUploadImage" imageCount="1"
-                                               namespace="editAccessControlWhite">
-                                    </vc:create>
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name='开始时间' namespace='editAccessControlWhite'></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="editAccessControlWhiteInfo.startTime" type="text"
-                                           :placeholder="vc.i18n('必填，请填写开始时间','editAccessControlWhite')"
-                                           class="form-control editAccessControlWhiteStartTime">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name='结束时间' namespace='editAccessControlWhite'></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="editAccessControlWhiteInfo.endTime" type="text"
-                                           :placeholder="vc.i18n('必填，请填写结束时间','editAccessControlWhite')"
-                                           class="form-control editAccessControlWhiteEndTime">
-                                </div>
-                            </div>
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button"
-                                        v-on:click="editAccessControlWhite()">
-                                    <i class="fa fa-check"></i>&nbsp;
-                                    <span><vc:i18n name="保存"></vc:i18n></span>
-                                </button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                        data-dismiss="modal">
-                                    <span><vc:i18n name="取消"></vc:i18n></span>
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span>
-                    <vc:i18n name='用户名称' namespace='editAccessControlWhite'></vc:i18n>
-                  </span></label>
-                <div class="col-sm-10">
-                  <input v-model="editAccessControlWhiteInfo.personName" type="text"
-                    :placeholder="vc.i18n('必填，请填写用户名称','editAccessControlWhite')" class="form-control">
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span>
-                    <vc:i18n name='手机号' namespace='editAccessControlWhite'></vc:i18n>
-                  </span></label>
-                <div class="col-sm-10">
-                  <input v-model="editAccessControlWhiteInfo.tel" type="text"
-                    :placeholder="vc.i18n('必填，请填写手机号','editAccessControlWhite')" class="form-control">
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span>
-                    <vc:i18n name='身份证号' namespace='editAccessControlWhite'></vc:i18n>
-                  </span></label>
-                <div class="col-sm-10">
-                  <input v-model="editAccessControlWhiteInfo.idCard" type="text"
-                    :placeholder="vc.i18n('选填，请填写身份证号','editAccessControlWhite')" class="form-control">
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span>
-                    <vc:i18n name='门禁卡号' namespace='editAccessControlWhite'></vc:i18n>
-                  </span></label>
-                <div class="col-sm-10">
-                  <input v-model="editAccessControlWhiteInfo.accessControlKey" type="text"
-                    :placeholder="vc.i18n('选填，请填写门禁卡号','editAccessControlWhite')" class="form-control">
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span>
-                    <vc:i18n name='门禁人脸' namespace='editAccessControlWhite'></vc:i18n>
-                  </span></label>
-                <div class="col-sm-10">
-                  <vc:create path="frame/uploadImageUrl" callBackListener="editAccessControlWhite"
-                    callBackFunction="notifyUploadImage" imageCount="1" namespace="editAccessControlWhite">
-                  </vc:create>
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span>
-                    <vc:i18n name='开始时间' namespace='editAccessControlWhite'></vc:i18n>
-                  </span></label>
-                <div class="col-sm-10">
-                  <input v-model="editAccessControlWhiteInfo.startTime" type="text"
-                    :placeholder="vc.i18n('必填，请填写开始时间','editAccessControlWhite')"
-                    class="form-control editAccessControlWhiteStartTime">
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-2 col-form-label"><span>
-                    <vc:i18n name='结束时间' namespace='editAccessControlWhite'></vc:i18n>
-                  </span></label>
-                <div class="col-sm-10">
-                  <input v-model="editAccessControlWhiteInfo.endTime" type="text"
-                    :placeholder="vc.i18n('必填，请填写结束时间','editAccessControlWhite')"
-                    class="form-control editAccessControlWhiteEndTime">
-                </div>
-              </div>
-              <div class="ibox-content">
-                <button class="btn btn-primary float-right" type="button" v-on:click="editAccessControlWhite()"><i
-                    class="fa fa-check"></i>&nbsp;
-                  <span>
-                    <vc:i18n name="保存"></vc:i18n>
-                  </span>
-                </button>
-                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                  data-dismiss="modal">
-                  <span>
-                    <vc:i18n name="取消"></vc:i18n>
-                  </span>
-                </button>
-              </div>
+  aria-hidden="true">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-body">
+        <h3 class="m-t-none m-b ">
+          <vc:i18n name="修改" namespace="editAccessControlWhite"></vc:i18n>
+        </h3>
+        <div class="ibox-content">
+
+          <div class="form-group row">
+            <label class="col-sm-2 col-form-label">
+              <vc:i18n name='人员类别' namespace='editAccessControlWhite'></vc:i18n>
+            </label>
+            <div class="col-sm-10">
+              <select class="custom-select" v-model="editAccessControlWhiteInfo.personType">
+                <option selected value="">请选择人员类型</option>
+                <option :value="item.statusCd" v-for="(item,index) in editAccessControlWhiteInfo.personTypes">
+                  {{item.name}}
+                </option>
+              </select>
             </div>
+          </div>
+          <div class="form-group row">
+            <label class="col-sm-2 col-form-label">
+              <vc:i18n name='用户名称' namespace='editAccessControlWhite'></vc:i18n>
+            </label>
+            <div class="col-sm-10">
+              <input v-model="editAccessControlWhiteInfo.personName" type="text"
+                :placeholder="vc.i18n('必填，请填写用户名称','editAccessControlWhite')" class="form-control">
+            </div>
+          </div>
+          <div class="form-group row">
+            <label class="col-sm-2 col-form-label">
+              <vc:i18n name='手机号' namespace='editAccessControlWhite'></vc:i18n>
+            </label>
+            <div class="col-sm-10">
+              <input v-model="editAccessControlWhiteInfo.tel" type="text"
+                :placeholder="vc.i18n('必填，请填写手机号','editAccessControlWhite')" class="form-control">
+            </div>
+          </div>
+          <div class="form-group row">
+            <label class="col-sm-2 col-form-label">
+              <vc:i18n name='身份证号' namespace='editAccessControlWhite'></vc:i18n>
+            </label>
+            <div class="col-sm-10">
+              <input v-model="editAccessControlWhiteInfo.idCard" type="text"
+                :placeholder="vc.i18n('选填，请填写身份证号','editAccessControlWhite')" class="form-control">
+            </div>
+          </div>
+          <div class="form-group row">
+            <label class="col-sm-2 col-form-label">
+              <vc:i18n name='门禁卡号' namespace='editAccessControlWhite'></vc:i18n>
+            </label>
+            <div class="col-sm-10">
+              <input v-model="editAccessControlWhiteInfo.accessControlKey" type="text"
+                :placeholder="vc.i18n('选填，请填写门禁卡号','editAccessControlWhite')" class="form-control">
+            </div>
+          </div>
+          <div class="form-group row">
+            <label class="col-sm-2 col-form-label">
+              <vc:i18n name='门禁人脸' namespace='editAccessControlWhite'></vc:i18n>
+            </label>
+            <div class="col-sm-10">
+              <vc:create path="frame/uploadImageUrl" callBackListener="editAccessControlWhite"
+                callBackFunction="notifyUploadImage" imageCount="1" namespace="editAccessControlWhite">
+              </vc:create>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label class="col-sm-2 col-form-label">
+              <vc:i18n name='开始时间' namespace='editAccessControlWhite'></vc:i18n>
+            </label>
+            <div class="col-sm-10">
+              <input v-model="editAccessControlWhiteInfo.startTime" type="text"
+                :placeholder="vc.i18n('必填，请填写开始时间','editAccessControlWhite')"
+                class="form-control editAccessControlWhiteStartTime">
+            </div>
+          </div>
+          <div class="form-group row">
+            <label class="col-sm-2 col-form-label">
+              <vc:i18n name='结束时间' namespace='editAccessControlWhite'></vc:i18n>
+            </label>
+            <div class="col-sm-10">
+              <input v-model="editAccessControlWhiteInfo.endTime" type="text"
+                :placeholder="vc.i18n('必填，请填写结束时间','editAccessControlWhite')"
+                class="form-control editAccessControlWhiteEndTime">
+            </div>
+          </div>
+          <div class="ibox-content">
+            <button class="btn btn-primary float-right" type="button" v-on:click="editAccessControlWhite()">
+              <vc:i18n name="保存"></vc:i18n>
+            </button>
+            <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">
+              <vc:i18n name="取消"></vc:i18n>
+            </button>
+          </div>
         </div>
+
+      </div>
     </div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/public/components/property/addOwner/addOwner.html b/public/components/property/addOwner/addOwner.html
index a86ff6e4a..de44e4d2d 100644
--- a/public/components/property/addOwner/addOwner.html
+++ b/public/components/property/addOwner/addOwner.html
@@ -4,7 +4,7 @@
             <div class="modal-body">
                 <h3 class="m-t-none m-b ">
                     <span>
-                        <span><vc:i18n name="添加" namespace="addOwner"></vc:i18n></span>
+                        <vc:i18n name="添加" namespace="addOwner"></vc:i18n>
                     </span>{{addOwnerInfo.componentTitle}}
                 </h3>
                 <div class="ibox-content">
@@ -12,7 +12,7 @@
                         <div class="col-sm-6">
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="姓名" namespace="addOwner"></vc:i18n></span>
+                                    <vc:i18n name="姓名" namespace="addOwner"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model.trim="addOwnerInfo.name" type="text" :placeholder="vc.i18n('必填，请填写姓名','addOwner')" class="form-control" oninput="this.value=this.value.replace(/\s+/g, '')">
@@ -20,7 +20,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="手机" namespace="addOwner"></vc:i18n></span>
+                                    <vc:i18n name="手机" namespace="addOwner"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model.trim="addOwnerInfo.link" type="number" :placeholder="vc.i18n('必填，请填写联系方式','addOwner')" class="form-control">
@@ -28,7 +28,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="身份证" namespace="addOwner"></vc:i18n></span>
+                                    <vc:i18n name="身份证" namespace="addOwner"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <!--@change="addOwnerIDCardChange()"-->
@@ -37,7 +37,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="性别" namespace="addOwner"></vc:i18n></span>
+                                    <vc:i18n name="性别" namespace="addOwner"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addOwnerInfo.sex">
@@ -57,7 +57,7 @@
                             </div> -->
                             <div class="form-group row" v-if="addOwnerInfo.componentTitle == '成员'">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="类型" namespace="addOwner"></vc:i18n></span>
+                                    <vc:i18n name="类型" namespace="addOwner"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addOwnerInfo.ownerTypeCd">
@@ -106,7 +106,7 @@
                         <div class="col-sm-6">
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="家庭住址" namespace="addOwner"></vc:i18n></span>
+                                    <vc:i18n name="家庭住址" namespace="addOwner"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model.trim="addOwnerInfo.address" type="text" :placeholder="vc.i18n('可填，请填写家庭住址','addOwner')" class="form-control">
diff --git a/public/components/property/tempImportRoomFee/tempImportRoomFee.html b/public/components/property/tempImportRoomFee/tempImportRoomFee.html
index e8fa4184b..0bf7bf887 100644
--- a/public/components/property/tempImportRoomFee/tempImportRoomFee.html
+++ b/public/components/property/tempImportRoomFee/tempImportRoomFee.html
@@ -1,37 +1,52 @@
-<div id="tempImportRoomFeeModel" class="modal fade" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+<div id="tempImportRoomFeeModel" 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="tempImportRoomFee"></vc:i18n></span></h3>
+                <h3 class="m-t-none m-b ">
+                    <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>
+                                <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>
+                                    <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" >
+                                            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>
+                                <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 ">
+                                    <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"><span><vc:i18n name="费用名称" namespace="tempImportRoomFee"></vc:i18n></span></label>
+                                <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  disabled value="" v-if="!tempImportRoomFeeInfo.feeConfigs || tempImportRoomFeeInfo.feeConfigs.length <1">{{vc.i18n('请添加公式为动态费用的费用项','tempImportRoomFee')}}</option> 
+                                        <option selected disabled value="">{{vc.i18n('必填，请选择收费项目','tempImportRoomFee')}}
+                                        </option>
+                                        <option disabled value=""
+                                            v-if="!tempImportRoomFeeInfo.feeConfigs || tempImportRoomFeeInfo.feeConfigs.length <1">
+                                            {{vc.i18n('请添加公式为动态费用的费用项','tempImportRoomFee')}}</option>
                                         <option v-for="(item,index) in tempImportRoomFeeInfo.feeConfigs" :key="index"
-                                                v-bind:value="item.feeName" v-else>{{item.feeName}}
+                                            v-bind:value="item.feeName" v-else>{{item.feeName}}
                                         </option>
                                     </select>
                                 </div>
@@ -40,37 +55,56 @@
                                 </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>
+                                <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 ">
+                                    <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>
+                                    <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>
+                                <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 ">
+                                    <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>
+                                <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">
+                                    <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>
+                                <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">
+                                    <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 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 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>
diff --git a/public/components/property/tempImportRoomFee/tempImportRoomFee.js b/public/components/property/tempImportRoomFee/tempImportRoomFee.js
index 3c6289c9b..892a17302 100644
--- a/public/components/property/tempImportRoomFee/tempImportRoomFee.js
+++ b/public/components/property/tempImportRoomFee/tempImportRoomFee.js
@@ -19,7 +19,7 @@
         },
         _initMethod: function() {
             vc.getDict('pay_fee_config', "fee_type_cd", function(_data) {
-                vc.component.tempImportRoomFeeInfo.feeTypeCds = _data;
+                $that.tempImportRoomFeeInfo.feeTypeCds = _data;
             });
             vc.initDate('tempImportFeeStartTime', function(_startTime) {
                 $that.tempImportRoomFeeInfo.startTime = _startTime;
@@ -49,7 +49,7 @@
 
             tempImportRoomFeeValidate() {
                 return vc.validate.validate({
-                    tempImportRoomFeeInfo: vc.component.tempImportRoomFeeInfo
+                    tempImportRoomFeeInfo: $that.tempImportRoomFeeInfo
                 }, {
                     'tempImportRoomFeeInfo.communityId': [{
                         limit: "required",
@@ -108,8 +108,8 @@
                 });
             },
             clearTempImportRoomFeeInfo: function() {
-                var _feeTypeCds = vc.component.tempImportRoomFeeInfo.feeTypeCds;
-                vc.component.tempImportRoomFeeInfo = {
+                let _feeTypeCds = $that.tempImportRoomFeeInfo.feeTypeCds;
+                $that.tempImportRoomFeeInfo = {
                     communityId: vc.getCurrentCommunity().communityId,
                     feeTypeCd: '',
                     feeTypeCds: _feeTypeCds,
@@ -126,15 +126,15 @@
                 };
             },
             _saveTempImportFeeInfo: function() {
-                if (!vc.component.tempImportRoomFeeValidate()) {
+                if (!$that.tempImportRoomFeeValidate()) {
                     vc.toast(vc.validate.errInfo);
                     return;
                 }
-                vc.component.tempImportRoomFeeInfo.communityId = vc.getCurrentCommunity().communityId;
+                $that.tempImportRoomFeeInfo.communityId = vc.getCurrentCommunity().communityId;
 
                 vc.http.post(
                     'importRoomFee', 'importTempData',
-                    JSON.stringify(vc.component.tempImportRoomFeeInfo), {
+                    JSON.stringify($that.tempImportRoomFeeInfo), {
                         emulateJSON: true
                     },
                     function(json, res) {
@@ -177,11 +177,11 @@
                     });
             },
             _inputFeeName: function() {
-                let _feeNameFlag = vc.component.tempImportRoomFeeInfo.feeNameFlag;
+                let _feeNameFlag = $that.tempImportRoomFeeInfo.feeNameFlag;
                 if (_feeNameFlag != 'S') {
-                    vc.component.tempImportRoomFeeInfo.feeNameFlag = 'S';
+                    $that.tempImportRoomFeeInfo.feeNameFlag = 'S';
                 } else {
-                    vc.component.tempImportRoomFeeInfo.feeNameFlag = 'I';
+                    $that.tempImportRoomFeeInfo.feeNameFlag = 'I';
                 }
             }
         }
diff --git a/public/pages/fee/invoiceApply/invoiceApply.html b/public/pages/fee/invoiceApply/invoiceApply.html
index 6fb4cebfd..aa59d8333 100644
--- a/public/pages/fee/invoiceApply/invoiceApply.html
+++ b/public/pages/fee/invoiceApply/invoiceApply.html
@@ -146,6 +146,11 @@
                                                     {{invoiceApply.state == 'U'?'上传发票':'重新上传'}}
                                                 </button>
                                             </div>
+                                            <div class="btn-group" v-if="invoiceApply.state == 'U' || invoiceApply.state == 'G' || invoiceApply.state == 'C'">
+                                                <button class="btn-white btn btn-xs"  v-on:click="_openUserGetInvoice(invoiceApply)">
+                                                    {{invoiceApply.state == 'G'?'核销':'登记'}}
+                                                </button>
+                                            </div>
                                             <div class="btn-group">
                                                 <button class="btn-white btn btn-xs" v-on:click="_openDeleteInvoiceApplyModel(invoiceApply)">
                                                     <vc:i18n name='删除'></vc:i18n>
@@ -178,6 +183,7 @@
     </div>
     <vc:create path="fee/deleteInvoiceApply"></vc:create>
     <vc:create path="fee/uploadInvoicePhoto"></vc:create>
+    <vc:create path="fee/wirteInvoiceEvent"></vc:create>
 
     <vc:create path="common/audit" callBackListener="invoiceApply" callBackFunction="notifyAuditInfo"></vc:create>
 
diff --git a/public/pages/fee/invoiceApply/invoiceApply.js b/public/pages/fee/invoiceApply/invoiceApply.js
index c54953653..9c313875e 100644
--- a/public/pages/fee/invoiceApply/invoiceApply.js
+++ b/public/pages/fee/invoiceApply/invoiceApply.js
@@ -133,6 +133,9 @@
             },
             _openUploadInvoicePhoto:function(_apply){
                 vc.emit('uploadInvoicePhoto', 'openInvoicePhotoModal',_apply);
+            },
+            _openUserGetInvoice:function(_apply){
+                vc.emit('wirteInvoiceEvent', 'openWirteInvoiceModal',_apply);
             }