From f21f74475c5c140ca449c9a3a9971dc46143bd87 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 30 Mar 2023 18:16:20 +0800
Subject: [PATCH] optimize owner member

---
 .../common/addNoticeView/addNoticeView.html   |  40 ++---
 .../simplifyOwnerMember.html                  | 155 +++++++++---------
 .../batchPayFeeOrder/batchPayFeeOrder.js      |   2 +-
 3 files changed, 90 insertions(+), 107 deletions(-)

diff --git a/public/components/common/addNoticeView/addNoticeView.html b/public/components/common/addNoticeView/addNoticeView.html
index d61ce0e3d..de56c1aac 100755
--- a/public/components/common/addNoticeView/addNoticeView.html
+++ b/public/components/common/addNoticeView/addNoticeView.html
@@ -13,9 +13,7 @@
                         <span><vc:i18n name="标题" namespace="addNoticeView"></vc:i18n></span>
                     </label>
                     <div class="col-sm-10">
-                        <input v-model="addNoticeViewInfo.title" type="text"
-                               :placeholder="vc.i18n('必填，请填写标题','addNoticeView')"
-                               class="form-control">
+                        <input v-model="addNoticeViewInfo.title" type="text" :placeholder="vc.i18n('必填，请填写标题','addNoticeView')" class="form-control">
                     </div>
                 </div>
                 <div class="form-group row">
@@ -24,7 +22,7 @@
                     </label>
                     <div class="col-sm-10">
                         <select class="custom-select" v-model="addNoticeViewInfo.noticeTypeCd">
-                            <option selected disabled value="">{{vc.i18n('必填','addNoticeView')}}，请选择公告类型</option>
+                            <option selected disabled value="">{{vc.i18n('必填，请选择公告类型','addNoticeView')}}</option>
                             <option value="1000">{{vc.i18n('业主通知','addNoticeView')}}</option>
                             <option value="1001">{{vc.i18n('员工通知','addNoticeView')}}</option>
                             <option value="1002">{{vc.i18n('小区通知','addNoticeView')}}</option>
@@ -47,8 +45,7 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-group row"
-                     v-if="addNoticeViewInfo.objType != '002' && addNoticeViewInfo.objType != '003' && addNoticeViewInfo.objType != '004'">
+                <div class="form-group row" v-if="addNoticeViewInfo.objType != '002' && addNoticeViewInfo.objType != '003' && addNoticeViewInfo.objType != '004'">
                     <label class="col-sm-2 col-form-label">
                         <span><vc:i18n name="全小区公告" namespace="addNoticeView"></vc:i18n></span>
                     </label>
@@ -60,36 +57,30 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-group row"
-                     v-show="addNoticeViewInfo.objType == '002' || addNoticeViewInfo.objType == '003' || addNoticeViewInfo.objType == '004' ">
+                <div class="form-group row" v-show="addNoticeViewInfo.objType == '002' || addNoticeViewInfo.objType == '003' || addNoticeViewInfo.objType == '004' ">
                     <label class="col-sm-2 col-form-label">
                         <span><vc:i18n name="归属楼栋" namespace="addNoticeView"></vc:i18n></span>
                     </label>
                     <div class="col-sm-10">
-                        <vc:create path="property/floorSelect2" parentModal="addNoticeView"
-                                   callBackListener="addNoticeView" callBackFunction="notify" namespace="addNoticeView">
+                        <vc:create path="property/floorSelect2" parentModal="addNoticeView" callBackListener="addNoticeView" callBackFunction="notify" namespace="addNoticeView">
                         </vc:create>
                     </div>
                 </div>
-                <div class="form-group row"
-                     v-show="addNoticeViewInfo.objType == '003' || addNoticeViewInfo.objType == '004'  ">
+                <div class="form-group row" v-show="addNoticeViewInfo.objType == '003' || addNoticeViewInfo.objType == '004'  ">
                     <label class="col-sm-2 col-form-label">
                         <span><vc:i18n name="归属单元" namespace="addNoticeView"></vc:i18n></span>
                     </label>
                     <div class="col-sm-10">
-                        <vc:create path="property/unitSelect2" parentModal="addNoticeView"
-                                   callBackListener="addNoticeView" callBackFunction="notify" namespace="addNoticeView">
+                        <vc:create path="property/unitSelect2" parentModal="addNoticeView" callBackListener="addNoticeView" callBackFunction="notify" namespace="addNoticeView">
                         </vc:create>
                     </div>
                 </div>
-                <div class="form-group row"
-                     v-show="addNoticeViewInfo.objType == '004'  ">
+                <div class="form-group row" v-show="addNoticeViewInfo.objType == '004'  ">
                     <label class="col-sm-2 col-form-label">
                         <span><vc:i18n name="归属房屋" namespace="addNoticeView"></vc:i18n></span>
                     </label>
                     <div class="col-sm-10">
-                        <vc:create path="property/roomSelect2" parentModal="addNoticeView"
-                                   callBackListener="addNoticeView" callBackFunction="notify" namespace="addNoticeView">
+                        <vc:create path="property/roomSelect2" parentModal="addNoticeView" callBackListener="addNoticeView" callBackFunction="notify" namespace="addNoticeView">
                         </vc:create>
                     </div>
                 </div>
@@ -98,9 +89,7 @@
                         <span><vc:i18n name="开始时间" namespace="addNoticeView"></vc:i18n></span>
                     </label>
                     <div class="col-sm-10">
-                        <input v-model="addNoticeViewInfo.startTime" readonly type="text"
-                               :placeholder="vc.i18n('必填，请填写开始时间','addNoticeView')"
-                               class="form-control addNoticeStartTime">
+                        <input v-model="addNoticeViewInfo.startTime" readonly type="text" :placeholder="vc.i18n('必填，请填写开始时间','addNoticeView')" class="form-control addNoticeStartTime">
                     </div>
                 </div>
                 <div class="form-group row">
@@ -108,9 +97,7 @@
                         <span><vc:i18n name="结束时间" namespace="addNoticeView"></vc:i18n></span>
                     </label>
                     <div class="col-sm-10">
-                        <input v-model="addNoticeViewInfo.endTime" readonly type="text"
-                               :placeholder="vc.i18n('必填，请填写结束时间','addNoticeView')"
-                               class="form-control addNoticeEndTime">
+                        <input v-model="addNoticeViewInfo.endTime" readonly type="text" :placeholder="vc.i18n('必填，请填写结束时间','addNoticeView')" class="form-control addNoticeEndTime">
                     </div>
                 </div>
                 <div class="form-group row">
@@ -130,12 +117,11 @@
                     <button class="btn btn-primary float-right" type="button" v-on:click="saveNoticeInfo()">
                         <i class="fa fa-check"></i>&nbsp;提交
                     </button>
-                    <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                            v-on:click="closeNoticeInfo()">
+                    <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" v-on:click="closeNoticeInfo()">
                         <i class="fa fa-close"></i>&nbsp;取消
                     </button>
                 </div>
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/property/simplifyOwnerMember/simplifyOwnerMember.html b/public/components/property/simplifyOwnerMember/simplifyOwnerMember.html
index 7ae9cb810..64db4e770 100755
--- a/public/components/property/simplifyOwnerMember/simplifyOwnerMember.html
+++ b/public/components/property/simplifyOwnerMember/simplifyOwnerMember.html
@@ -2,8 +2,7 @@
     <div class="row margin-top">
         <div class="col-lg-10 text-right"></div>
         <div class="col-lg-2 text-right" v-if="simplifyOwnerMemberInfo.ownerId">
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                    v-on:click="openAddMemberModel()">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="openAddMemberModel()">
                 <i class="fa fa-plus"></i>添加成员
             </button>
         </div>
@@ -11,85 +10,85 @@
     <div>
         <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
             <thead>
-            <tr>
-                <th class="text-center">
-                    <span><vc:i18n name="成员" namespace="simplifyOwnerMember"></vc:i18n></span>ID
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="名称" namespace="simplifyOwnerMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="性别" namespace="simplifyOwnerMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
+                <tr>
+                    <th class="text-center">
+                        <span><vc:i18n name="成员" namespace="simplifyOwnerMember"></vc:i18n></span>ID
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="名称" namespace="simplifyOwnerMember"></vc:i18n></span>
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="性别" namespace="simplifyOwnerMember"></vc:i18n></span>
+                    </th>
+                    <!-- <th data-hide="phone" class="text-center">
                     <span><vc:i18n name="年龄" namespace="simplifyOwnerMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="类型" namespace="simplifyOwnerMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="身份证" namespace="simplifyOwnerMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="联系方式" namespace="simplifyOwnerMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="创建员工" namespace="simplifyOwnerMember"></vc:i18n></span>
-                </th>
-                <th data-hide="phone" class="text-center">
-                    <span><vc:i18n name="备注" namespace="simplifyOwnerMember"></vc:i18n></span>
-                </th>
-                <th v-for="(item,index) in simplifyOwnerMemberInfo.listColumns" class="text-center">{{item}}</th>
-                <th class="text-center">
-                    <span><vc:i18n name="操作" namespace="simplifyOwnerMember"></vc:i18n></span>
-                </th>
-            </tr>
+                </th> -->
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="类型" namespace="simplifyOwnerMember"></vc:i18n></span>
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="身份证" namespace="simplifyOwnerMember"></vc:i18n></span>
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="联系方式" namespace="simplifyOwnerMember"></vc:i18n></span>
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="创建员工" namespace="simplifyOwnerMember"></vc:i18n></span>
+                    </th>
+                    <th data-hide="phone" class="text-center">
+                        <span><vc:i18n name="备注" namespace="simplifyOwnerMember"></vc:i18n></span>
+                    </th>
+                    <th v-for="(item,index) in simplifyOwnerMemberInfo.listColumns" class="text-center">{{item}}</th>
+                    <th class="text-center">
+                        <span><vc:i18n name="操作" namespace="simplifyOwnerMember"></vc:i18n></span>
+                    </th>
+                </tr>
             </thead>
             <tbody>
-            <tr v-for="owner in simplifyOwnerMemberInfo.members">
-                <td class="text-center">
-                    {{owner.memberId}}
-                </td>
-                <td class="text-center">
-                    {{owner.name}}
-                </td>
-                <td class="text-center">
-                    {{owner.sex == 0 ? '男' : '女'}}
-                </td>
-                <td class="text-center">
-                    {{owner.age}}
-                </td>
-                <td class="text-center">
-                    {{owner.ownerTypeName}}
-                </td>
-                <td class="text-center">
-                    {{owner.idCard}}
-                </td>
-                <td class="text-center">
-                    {{owner.link}}
-                </td>
-                <td class="text-center">
-                    {{owner.userName}}
-                </td>
-                <td class="text-center">
-                    {{owner.remark}}
-                </td>
-                <td v-for="item in owner.listValues" class="text-center">
-                    {{item}}
-                </td>
-                <td class="text-center">
-                    <div class="btn-group">
-                        <button class="btn-white btn btn-xs" v-on:click="_openEditOwnerModel(owner)">
+                <tr v-for="owner in simplifyOwnerMemberInfo.members">
+                    <td class="text-center">
+                        {{owner.memberId}}
+                    </td>
+                    <td class="text-center">
+                        {{owner.name}}
+                    </td>
+                    <td class="text-center">
+                        {{owner.sex == 0 ? '男' : '女'}}
+                    </td>
+                    <!-- <td class="text-center">
+                        {{owner.age}}
+                    </td> -->
+                    <td class="text-center">
+                        {{owner.ownerTypeName}}
+                    </td>
+                    <td class="text-center">
+                        {{owner.idCard}}
+                    </td>
+                    <td class="text-center">
+                        {{owner.link}}
+                    </td>
+                    <td class="text-center">
+                        {{owner.userName}}
+                    </td>
+                    <td class="text-center">
+                        {{owner.remark}}
+                    </td>
+                    <td v-for="item in owner.listValues" class="text-center">
+                        {{item}}
+                    </td>
+                    <td class="text-center">
+                        <div class="btn-group">
+                            <button class="btn-white btn btn-xs" v-on:click="_openEditOwnerModel(owner)">
                             <span><vc:i18n name="修改" namespace="simplifyOwnerMember"></vc:i18n></span>
                         </button>
-                    </div>
-                    <div class="btn-group">
-                        <button class="btn-white btn btn-xs" v-on:click="_openDeleteOwnerModel(owner)">
+                        </div>
+                        <div class="btn-group">
+                            <button class="btn-white btn btn-xs" v-on:click="_openDeleteOwnerModel(owner)">
                             <span><vc:i18n name="删除" namespace="simplifyOwnerMember"></vc:i18n></span>
                         </button>
-                    </div>
-                </td>
-            </tr>
+                        </div>
+                    </td>
+                </tr>
             </tbody>
             <tr>
                 <td colspan="20">
@@ -98,9 +97,7 @@
             </tr>
         </table>
     </div>
-    <vc:create path="property/addOwner" notifyLoadDataComponentName="simplifyOwnerMember"
-               componentTitle="成员"></vc:create>
-    <vc:create path="property/editOwner" notifyLoadDataComponentName="simplifyOwnerMember"
-               componentTitle="成员"></vc:create>
+    <vc:create path="property/addOwner" notifyLoadDataComponentName="simplifyOwnerMember" componentTitle="成员"></vc:create>
+    <vc:create path="property/editOwner" notifyLoadDataComponentName="simplifyOwnerMember" componentTitle="成员"></vc:create>
     <vc:create path="property/deleteOwner" notifyLoadDataComponentName="simplifyOwnerMember"></vc:create>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.js b/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.js
index 38c4cc900..8c08f99a7 100644
--- a/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.js
+++ b/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.js
@@ -516,7 +516,7 @@ var saveAs = saveAs || (function(view) {
             },
             _doDealPayResult: function(_json) {
                 $that._closeDoBatchPayFeeModal();
-                let _data = JSON.parse(_json).data;
+                let _data = _json.data;
                 let detailIds = '';
                 _data.forEach(item => {
                     detailIds += (item + ',');