修改bug

.env.development

 NODE_ENV=development
-# VUE_APP_API_BASE_URL='http://192.168.0.113:9999'
-# VUE_APP_API_BASE_URL='http://192.168.0.101:9999'
-VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
+VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
+# VUE_APP_API_BASE_URL='http://192.168.0.104:9999'
+# VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

src/components/menu/SideMenu.vue

@@ -5,7 +5,7 @@
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">
-    <logo :showTitle="false" />
+    <logo :showTitle="true" />
     <s-menu
       :collapsed="collapsed"
       :menu="menus"

src/components/tools/Logo.vue

@@ -18,7 +18,7 @@
     props: {
       title: {
         type: String,
-        default: '汉星科技',
+        default: '小区管理后台',
         required: false
       },
       showTitle: {

src/mixins/JeecgListMixin.js

@@ -248,9 +248,9 @@ export const JeecgListMixin = {
     },
     modalFormOk() {
       // 新增/修改 成功时，重载列表
-      // this.loadData();
+      this.loadData();
       //清空列表选中
-      // this.onClearSelected()
+      this.onClearSelected()
     },
     handleDetail:function(record){
       this.$refs.modalForm.edit(record);

src/views/information/building/building.vue

@@ -83,7 +83,7 @@
     </div>
     <!-- table区域-end -->
 
-    <notice-modal ref="modalForm" @ok="searchQuery"></notice-modal>
+    <notice-modal ref="modalForm" @ok="modalFormOk"></notice-modal>
   </a-card>
 </template>
 

src/views/information/house/house.vue

@@ -96,7 +96,7 @@
     </div>
     <!-- table区域-end -->
 
-    <notice-modal ref="modalForm" @ok="searchQuery"></notice-modal>
+    <notice-modal ref="modalForm" @ok="modalFormOk"></notice-modal>
   </a-card>
 </template>
 

src/views/information/owner/owner-setting.vue

@@ -283,6 +283,7 @@
         if(this.labelType === '3') {
           let formParamas = {
             accessAddress: result.communityVo.accessAddress,
+            logoUrl: result.committee.logoUrl,
             labelCode: result.committeeInfo ? result.committeeInfo.labelCode : null,
             committeeName: result.committee.committeeName,
             adminLoginName: result.communityOwner.residentPhone,

src/views/information/owner/owner.vue

@@ -139,7 +139,7 @@
       </div>
     </div>
 
-    <notice-modal ref="modalForm" @ok="searchQuery"></notice-modal>
+    <notice-modal ref="modalForm" @ok="modalFormOk"></notice-modal>
     <!-- 右侧的角色权限配置 -->
     <user-role-modal ref="modalUserRole"></user-role-modal>
   </a-card>

src/views/property/advertisement/advertisement.vue

@@ -78,7 +78,7 @@
     </div>
     <!-- table区域-end -->
 
-    <notice-modal ref="modalForm" @ok="searchQuery"></notice-modal>
+    <notice-modal ref="modalForm" @ok="modalFormOk"></notice-modal>
   </a-card>
 </template>
 

src/views/property/living/living-detail.vue

@@ -105,7 +105,7 @@
         <p style="padding-right:50px;color:#EC808D">总缴费金额: {{totalAmount}}</p>
       </div>
       <div>
-        <a-table ref="table" size="middle" :scroll="{ x: 1500, y: 300 }" bordered rowKey="id" :columns="columns"
+        <a-table ref="table" size="middle" :scroll="{ x: true }" bordered rowKey="id" :columns="columns"
           :dataSource="dataSource" :pagination="pagination" :loading="loading" class="j-table-force-nowrap">
           <span slot="roomId" slot-scope="text, record">
             <span>{{record.buildingName}}{{record.unitName}}{{record.roomName}}</span>
@@ -129,14 +129,12 @@ const columns = [
     title: '收费类型',
     dataIndex: 'chargeTypeName',
     key: 'chargeTypeName',
-    width: 120,
     align: 'center',
   },
   {
     title: '收费项目',
     dataIndex: 'chargeItem',
     key: 'chargeItem',
-    width: 120,
     align: 'center',
   },
   {
@@ -144,42 +142,36 @@ const columns = [
     dataIndex: 'roomId',
     scopedSlots: { customRender: 'roomId' },
     key: 'roomId',
-    width: 140,
     align: 'center',
   },
   {
     title: '用量',
     dataIndex: 'useAmount',
     key: 'useAmount',
-    width: 120,
     align: 'center',
   },
   {
     title: '金额（元）',
     dataIndex: 'totalAmount',
     key: 'totalAmount',
-    width: 120,
     align: 'center',
   },
   {
     title: '缴费单号',
     dataIndex: 'paymentNum',
     key: 'paymentNum',
-    width: 120,
     align: 'center',
   },
   {
     title: '缴费日期',
     dataIndex: 'paymentTime',
     key: 'paymentTime',
-    width: 120,
     align: 'center',
   },
   {
     title: '创建日期',
     dataIndex: 'createTime',
     key: 'createTime',
-    width: 120,
     align: 'center',
   },
 ]

src/views/property/living/living.vue

@@ -84,7 +84,7 @@
       </div>
     </div>
 
-    <notice-modal ref="modalForm" @ok="searchQuery"></notice-modal>
+    <notice-modal ref="modalForm" @ok="modalFormOk"></notice-modal>
   </a-card>
 </template>
 

src/views/property/living/modules/NoticeForm.vue

@@ -144,6 +144,7 @@
           roomName: '',
           floorSpace: '',
           residentName: '',
+          ownerPhone: '',
           residentPhone: '',
           relationShip: '',
 
@@ -265,6 +266,7 @@
           if(!ownerRow) ownerRow = {...res.result[0]}
           this.model.residentName = ownerRow.residentName
           this.model.residentPhone = ownerRow.residentPhone
+          this.model.ownerPhone = res.result.map(item=>item.residentPhone).join(',')
           this.model.relationShip = ownerRow.relationShip
           this.model.ownerId = ownerRow.id
           if(this.model.designFormulas === 3 && this.model.chargeTypeId) {

src/views/property/propertyfee/modules/NoticeForm.vue

@@ -153,6 +153,7 @@
           roomName: '',
           floorSpace: '',
           residentName: '',
+          ownerPhone: '',
           residentPhone: '',
           relationShip: '',
 
@@ -286,6 +287,7 @@
           if(!ownerRow) ownerRow = {...res.result[0]}
           this.model.residentName = ownerRow.residentName
           this.model.residentPhone = ownerRow.residentPhone
+          this.model.ownerPhone = res.result.map(item=>item.residentPhone).join(',')
           this.model.relationShip = ownerRow.relationShip
           this.model.ownerId = ownerRow.id
           if(this.model.designFormulas === 3 && this.model.chargeTypeId) {

src/views/property/propertyfee/propertyfee.vue

@@ -56,7 +56,7 @@
             <a style="margin-left: 24px" v-if="selectedRowKeys.length > 0" @click="onClearSelected">清空</a>
           </div>
 
-          <a-table ref="table" size="middle" :scroll="{ x: 1500}" bordered rowKey="id" :columns="columns"
+          <a-table ref="table" size="middle" :scroll="{ x: true}" bordered rowKey="id" :columns="columns"
             :dataSource="dataSource" :pagination="ipagination" :loading="loading" :rowSelection="{
               selectedRowKeys: selectedRowKeys,
               onChange: onSelectChange,
@@ -84,7 +84,7 @@
       </div>
     </div>
 
-    <notice-modal ref="modalForm" @ok="searchQuery"></notice-modal>
+    <notice-modal ref="modalForm" @ok="modalFormOk"></notice-modal>
   </a-card>
 </template>
 
@@ -100,21 +100,18 @@ const columns = [
     title: '收费类型',
     dataIndex: 'chargeTypeName',
     key: 'chargeTypeName',
-    width: 120,
     align: 'center',
   },
   {
     title: '收费项目',
     dataIndex: 'chargeItem',
     key: 'chargeItem',
-    width: 220,
     align: 'center',
   },
   {
     title: '与业主关系',
     dataIndex: 'relationShip',
     key: 'relationShip',
-    width: 120,
     align: 'center',
     customRender: function (text) {
       return filterDictTextByStatic(RELATION_SHIP, text)
@@ -124,7 +121,6 @@ const columns = [
     title: '住户',
     dataIndex: 'residentPhone',
     key: 'residentPhone',
-    width: 160,
     scopedSlots: { customRender: 'residentPhone' },
     align: 'center',
   },
@@ -133,28 +129,24 @@ const columns = [
     dataIndex: 'roomId',
     scopedSlots: { customRender: 'roomId' },
     key: 'roomId',
-    width: 140,
     align: 'center',
   },
   {
     title: '金额（元）',
     dataIndex: 'totalAmount',
     key: 'totalAmount',
-    width: 120,
     align: 'center',
   },
   {
     title: '本期读表时间',
     dataIndex: 'meterReadingTime',
     key: 'meterReadingTime',
-    width: 150,
     align: 'center',
   },
   {
     title: '缴费状态',
     dataIndex: 'paymentStatus',
     key: 'paymentStatus',
-    width: 120,
     align: 'center',
     customRender: function (text) {
       return filterDictTextByStatic(PAYMENT_STATUS, text)
@@ -164,21 +156,18 @@ const columns = [
     title: '缴费单号',
     dataIndex: 'paymentNum',
     key: 'paymentNum',
-    width: 120,
     align: 'center',
   },
   {
     title: '缴费日期',
     dataIndex: 'paymentTime',
     key: 'paymentTime',
-    width: 150,
     align: 'center',
   },
   {
     title: '创建日期',
     dataIndex: 'createTime',
     key: 'createTime',
-    width: 150,
     align: 'center',
   },
   {

src/views/property/record/RecordList.vue

@@ -6,24 +6,26 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
             <a-form-item label="对账单号">
-              <j-input placeholder="请输入对账单号" v-model="queryParam.propertyName"></j-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="小区名称">
-              <j-input placeholder="请输入小区名称" v-model="queryParam.propertyName"></j-input>
+              <j-input placeholder="请输入对账单号" v-model="queryParam.id"></j-input>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
             <a-form-item label="缴费开始时间">
-              <a-date-picker placeholder="缴费开始时间" valueFormat="YYYY-MM-DD" v-model="queryParam.reconciliationBeginDate"></a-date-picker>
+              <a-date-picker placeholder="缴费开始时间" valueFormat="YYYY-MM-DD 00:00:00" v-model="queryParam.reconciliationBeginDate"></a-date-picker>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
             <a-form-item label="缴费结束时间">
-              <a-date-picker placeholder="缴费结束时间" valueFormat="YYYY-MM-DD" v-model="queryParam.reconciliationEndDate"></a-date-picker>
+              <a-date-picker placeholder="缴费结束时间" valueFormat="YYYY-MM-DD 00:00:00" v-model="queryParam.reconciliationEndDate"></a-date-picker>
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-model-item label="对账状态">
+              <a-select style="width: 100%" v-model="queryParam.communityAuditStatus" placeholder="请选择对账状态">
+                <a-select-option v-for="item in audioStatusList" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
           <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="searchQuery">查询</a-button>
@@ -40,7 +42,7 @@
       <!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" @click="onReconciliation()"><a-icon type="audit" />申请对账</a-menu-item>
+          <a-menu-item key="1" @click="onReconciliation()"><a-icon type="audit" />批量审核</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
@@ -156,6 +158,7 @@ export default {
   data() {
     return {
       // 表头
+      audioStatusList: RECONCILIATION_STATUS,
       columns: columns,
       url: {
         // list: '/property-community/property/communityReconciliation/communityAccountPage',
@@ -183,7 +186,7 @@ export default {
       let ids = id || this.selectedRowKeys.join(',')
       let that = this
       this.$confirm({
-        title: '确认要申请当前对账吗？',
+        title: id ? '确认要审核当前对账吗？' : '确认要批量审核当前对账吗？',
         closable: true,
         okText: '确认',
         onOk() {