From 9c485111d4371bbe6b29fd3acb03ad082d080646 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: Wed, 30 Jun 2021 11:25:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=9D=E8=AF=81=E9=87=91?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/addAccountBond/addAccountBond.js   |   2 +-
 .../accountBondObjDetailManage.html           |  99 +++++++++++++++++
 .../accountBondObjDetailManage.js             | 100 ++++++++++++++++++
 .../accountBondObjManage.html                 |  86 ---------------
 .../accountBondObjManage.js                   |  82 --------------
 5 files changed, 200 insertions(+), 169 deletions(-)
 create mode 100644 public/pages/admin/accountBondObjDetailManage/accountBondObjDetailManage.html
 create mode 100644 public/pages/admin/accountBondObjDetailManage/accountBondObjDetailManage.js
 delete mode 100644 public/pages/admin/accountBondObjManage/accountBondObjManage.html
 delete mode 100644 public/pages/admin/accountBondObjManage/accountBondObjManage.js

diff --git a/public/components/common/addAccountBond/addAccountBond.js b/public/components/common/addAccountBond/addAccountBond.js
index 873cdbcda..260f9068d 100644
--- a/public/components/common/addAccountBond/addAccountBond.js
+++ b/public/components/common/addAccountBond/addAccountBond.js
@@ -9,7 +9,7 @@
             addAccountBondInfo: {
                 bondId: '',
                 bondName: '',
-                amount: '',
+                amount: '0',
                 bondMonth: '',
                 objId: '',
                 bondType: '6006',
diff --git a/public/pages/admin/accountBondObjDetailManage/accountBondObjDetailManage.html b/public/pages/admin/accountBondObjDetailManage/accountBondObjDetailManage.html
new file mode 100644
index 000000000..427617f5a
--- /dev/null
+++ b/public/pages/admin/accountBondObjDetailManage/accountBondObjDetailManage.html
@@ -0,0 +1,99 @@
+<div>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox ">
+                <div class="ibox-title">
+                    <h5>查询条件</h5>
+                    <div class="ibox-tools" style="top:10px;">
+
+                    </div>
+                </div>
+                <div class="ibox-content">
+
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <select class="custom-select" v-model="accountBondObjDetailManageInfo.conditions.objID">
+                                    <option selected disabled value="">请选择商铺</option>
+                                    <option :value="item.shopId" v-for="(item,index) in accountBondObjDetailManageInfo.shops">
+                                        {{item.shopName}}
+                                    </option>
+                                  </select>
+                            </div>
+                        </div>
+
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <select class="custom-select" v-model="accountBondObjDetailManageInfo.conditions.state">
+                                    <option selected disabled value="">请选择状态</option>
+                                    <option :value="3308">交保证金</option>
+                                    <option :value="3309">退保证金</option>
+                                  </select>
+                            </div>
+                        </div>
+
+
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryAccountBondObjDetailMethod()">
+                                <i class="glyphicon glyphicon-search"></i> 查询
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>保证金明细</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddAccountBondObjModal()">
+                            <i class="glyphicon glyphicon-plus"></i>
+                            保证金明细
+                        </button>
+                    </div>
+                </div>
+                <div class="ibox-content">
+
+                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                        <thead>
+                            <tr>
+                                <th class="text-center">保证金ID</th>
+                                <th class="text-center">保证金对象</th>
+                                <th class="text-center">应收金额</th>
+                                <th class="text-center">实收金额</th>
+                                <th class="text-center">状态</th>
+                                <th class="text-center">开始时间</th>
+                                <th class="text-center">结束时间</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr v-for="accountBondObjDetail in accountBondObjDetailManageInfo.accountBondObjDetails">
+                                <td class="text-center">{{accountBondObjDetail.bobjId}}</td>
+                                <td class="text-center">{{accountBondObjDetail.objName}}</td>
+                                <td class="text-center">{{accountBondObjDetail.receivableAmount}}</td>
+                                <td class="text-center">{{accountBondObjDetail.receivedAmount}}</td>
+                                <td class="text-center">{{accountBondObjDetail.state == 3308?'交保证金':'退保证金'}}</td>
+                                <td class="text-center">{{accountBondObjDetail.startTime}}</td>
+                                <td class="text-center">{{accountBondObjDetail.endTime}}</td>
+                                
+                            </tr>
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
+                        </tfoot>
+                    </table>
+                    <!-- 分页 -->
+                    <vc:create path="frame/pagination"></vc:create>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/public/pages/admin/accountBondObjDetailManage/accountBondObjDetailManage.js b/public/pages/admin/accountBondObjDetailManage/accountBondObjDetailManage.js
new file mode 100644
index 000000000..556d5f2b1
--- /dev/null
+++ b/public/pages/admin/accountBondObjDetailManage/accountBondObjDetailManage.js
@@ -0,0 +1,100 @@
+/**
+    入驻小区
+**/
+(function (vc) {
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data: {
+            accountBondObjDetailManageInfo: {
+                accountBondObjDetails: [],
+                shops:[],
+                total: 0,
+                records: 1,
+                moreCondition: false,
+                bobjId: '',
+                conditions: {
+                    state: '',
+                    objId: ''
+                }
+            }
+        },
+        _initMethod: function () {
+            vc.component._listAccountBondObjsDetail(DEFAULT_PAGE, DEFAULT_ROWS);
+            vc.component._listBondShops(1, 50);
+        },
+        _initEvent: function () {
+
+            vc.on('accountBondObjManage', 'listAccountBondObj', function (_param) {
+                vc.component._listAccountBondObjsDetail(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listAccountBondObjsDetail(_currentPage, DEFAULT_ROWS);
+            });
+        },
+        methods: {
+            _listAccountBondObjsDetail: function (_page, _rows) {
+
+                vc.component.accountBondObjDetailManageInfo.conditions.page = _page;
+                vc.component.accountBondObjDetailManageInfo.conditions.row = _rows;
+                var param = {
+                    params: vc.component.accountBondObjDetailManageInfo.conditions
+                };
+
+                //发送get请求
+                vc.http.apiGet('/accountBondObjDetail/queryAccountBondObjDetail',
+                    param,
+                    function (json, res) {
+                        var _accountBondObjDetailManageInfo = JSON.parse(json);
+                        vc.component.accountBondObjDetailManageInfo.total = _accountBondObjDetailManageInfo.total;
+                        vc.component.accountBondObjDetailManageInfo.records = _accountBondObjDetailManageInfo.records;
+                        vc.component.accountBondObjDetailManageInfo.accountBondObjDetails = _accountBondObjDetailManageInfo.data;
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.accountBondObjDetailManageInfo.records,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _listBondShops:function(_page, _rows){
+                var param = {
+                    params: {
+                        page: _page,
+                        row: _rows,
+                    }
+                };
+
+               //发送get请求
+               vc.http.apiGet('/shop/queryShop',
+                             param,
+                             function(json,res){
+                                var _shopManageInfo=JSON.parse(json);
+                                vc.component.accountBondObjDetailManageInfo.total = _shopManageInfo.total;
+                                vc.component.accountBondObjDetailManageInfo.records = _shopManageInfo.records;
+                                vc.component.accountBondObjDetailManageInfo.shops = _shopManageInfo.data;
+                             },function(errInfo,error){
+                                console.log('请求失败处理');
+                             }
+                           );
+            },
+            _openDeleteAccountBondObjModel: function (_accountBondObj) {
+                vc.emit('deleteAccountBondObj', 'openDeleteAccountBondObjModal', _accountBondObj);
+            },
+            _queryAccountBondObjDetailMethod: function () {
+                vc.component._listAccountBondObjsDetail(DEFAULT_PAGE, DEFAULT_ROWS);
+
+            },
+            _moreCondition: function () {
+                if (vc.component.accountBondObjDetailManageInfo.moreCondition) {
+                    vc.component.accountBondObjDetailManageInfo.moreCondition = false;
+                } else {
+                    vc.component.accountBondObjDetailManageInfo.moreCondition = true;
+                }
+            }
+
+
+        }
+    });
+})(window.vc);
diff --git a/public/pages/admin/accountBondObjManage/accountBondObjManage.html b/public/pages/admin/accountBondObjManage/accountBondObjManage.html
deleted file mode 100644
index 254610f95..000000000
--- a/public/pages/admin/accountBondObjManage/accountBondObjManage.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>查询条件</h5>
-                    <div class="ibox-tools" style="top:10px;">
-
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>保证金对象信息</h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddAccountBondObjModal()">
-                            <i class="glyphicon glyphicon-plus"></i>
-                            添加保证金对象
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-
-                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
-                        <thead>
-                            <tr>
-                                <th class="text-center">保证金对象ID</th>
-                                <th class="text-center">保证金</th>
-                                <th class="text-center">保证金对象ID</th>
-                                <th class="text-center">应收金额</th>
-                                <th class="text-center">实收金额</th>
-                                <th class="text-center">操作</th>
-
-
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr v-for="accountBondObj in accountBondObjManageInfo.accountBondObjs">
-                                <td class="text-center">{{accountBondObj.bobjId}}</td>
-                                <td class="text-center">{{accountBondObj.bondId}}</td>
-                                <td class="text-center">{{accountBondObj.objId}}</td>
-                                <td class="text-center">{{accountBondObj.receivableAmount}}</td>
-                                <td class="text-center">{{accountBondObj.receivedAmount}}</td>
-                                <td class="text-center">
-                                    <div class="btn-group">
-                                        <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditAccountBondObjModel(accountBondObj)">修改</button>
-                                    </div>
-                                    <div class="btn-group">
-                                        <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeleteAccountBondObjModel(accountBondObj)">删除</button>
-                                    </div>
-                                </td>
-
-                            </tr>
-                        </tbody>
-                        <tfoot>
-                            <tr>
-                                <td colspan="7">
-                                    <ul class="pagination float-right"></ul>
-                                </td>
-                            </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create path="frame/pagination"></vc:create>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-
-    <vc:create path="goods/addAccountBondObj" callBackListener="" callBackFunction=""></vc:create>
-    <vc:create path="goods/editAccountBondObj"></vc:create>
-    <vc:create path="goods/deleteAccountBondObj"></vc:create>
-
-</div>
\ No newline at end of file
diff --git a/public/pages/admin/accountBondObjManage/accountBondObjManage.js b/public/pages/admin/accountBondObjManage/accountBondObjManage.js
deleted file mode 100644
index 3a0d12a9b..000000000
--- a/public/pages/admin/accountBondObjManage/accountBondObjManage.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
-    入驻小区
-**/
-(function (vc) {
-    var DEFAULT_PAGE = 1;
-    var DEFAULT_ROWS = 10;
-    vc.extends({
-        data: {
-            accountBondObjManageInfo: {
-                accountBondObjs: [],
-                total: 0,
-                records: 1,
-                moreCondition: false,
-                bobjId: '',
-                conditions: {
-
-                }
-            }
-        },
-        _initMethod: function () {
-            vc.component._listAccountBondObjs(DEFAULT_PAGE, DEFAULT_ROWS);
-        },
-        _initEvent: function () {
-
-            vc.on('accountBondObjManage', 'listAccountBondObj', function (_param) {
-                vc.component._listAccountBondObjs(DEFAULT_PAGE, DEFAULT_ROWS);
-            });
-            vc.on('pagination', 'page_event', function (_currentPage) {
-                vc.component._listAccountBondObjs(_currentPage, DEFAULT_ROWS);
-            });
-        },
-        methods: {
-            _listAccountBondObjs: function (_page, _rows) {
-
-                vc.component.accountBondObjManageInfo.conditions.page = _page;
-                vc.component.accountBondObjManageInfo.conditions.row = _rows;
-                var param = {
-                    params: vc.component.accountBondObjManageInfo.conditions
-                };
-
-                //发送get请求
-                vc.http.apiGet('/accountBondObj/queryAccountBondObj',
-                    param,
-                    function (json, res) {
-                        var _accountBondObjManageInfo = JSON.parse(json);
-                        vc.component.accountBondObjManageInfo.total = _accountBondObjManageInfo.total;
-                        vc.component.accountBondObjManageInfo.records = _accountBondObjManageInfo.records;
-                        vc.component.accountBondObjManageInfo.accountBondObjs = _accountBondObjManageInfo.data;
-                        vc.emit('pagination', 'init', {
-                            total: vc.component.accountBondObjManageInfo.records,
-                            currentPage: _page
-                        });
-                    }, function (errInfo, error) {
-                        console.log('请求失败处理');
-                    }
-                );
-            },
-            _openAddAccountBondObjModal: function () {
-                vc.emit('addAccountBondObj', 'openAddAccountBondObjModal', {});
-            },
-            _openEditAccountBondObjModel: function (_accountBondObj) {
-                vc.emit('editAccountBondObj', 'openEditAccountBondObjModal', _accountBondObj);
-            },
-            _openDeleteAccountBondObjModel: function (_accountBondObj) {
-                vc.emit('deleteAccountBondObj', 'openDeleteAccountBondObjModal', _accountBondObj);
-            },
-            _queryAccountBondObjMethod: function () {
-                vc.component._listAccountBondObjs(DEFAULT_PAGE, DEFAULT_ROWS);
-
-            },
-            _moreCondition: function () {
-                if (vc.component.accountBondObjManageInfo.moreCondition) {
-                    vc.component.accountBondObjManageInfo.moreCondition = false;
-                } else {
-                    vc.component.accountBondObjManageInfo.moreCondition = true;
-                }
-            }
-
-
-        }
-    });
-})(window.vc);