提交 2abf71a5 authored 作者: 宋雄's avatar 宋雄

优化

上级 d2589d48
...@@ -133,6 +133,7 @@ const getAccountListByIdApi = (params)=>getAction("/property-community/property/ ...@@ -133,6 +133,7 @@ const getAccountListByIdApi = (params)=>getAction("/property-community/property/
const companyAuditAccountPageApi = (params)=>postAction("/property-community/property/communityReconciliation/centralAudit",params); const companyAuditAccountPageApi = (params)=>postAction("/property-community/property/communityReconciliation/centralAudit",params);
const getCommunityRecordListApi = (params)=>getAction("/property-central/property/auditRecord/getRecordList",params); const getCommunityRecordListApi = (params)=>getAction("/property-central/property/auditRecord/getRecordList",params);
const appropriationApi = (params)=>getAction("/property-community/property/communityReconciliation/appropriation",params); const appropriationApi = (params)=>getAction("/property-community/property/communityReconciliation/appropriation",params);
const centralSubAuditApi = (params)=>getAction("/property-community/property/communityReconciliation/centralSubAudit",params);
// 分利规则管理 // 分利规则管理
const getRuleDayDetailApi = (params)=>getAction("/property-central/sharerule/settlementSet/queryById",params); const getRuleDayDetailApi = (params)=>getAction("/property-central/sharerule/settlementSet/queryById",params);
...@@ -242,6 +243,7 @@ export { ...@@ -242,6 +243,7 @@ export {
companyAuditAccountPageApi, companyAuditAccountPageApi,
getCommunityRecordListApi, getCommunityRecordListApi,
appropriationApi, appropriationApi,
centralSubAuditApi,
getRuleDayDetailApi, getRuleDayDetailApi,
editRuleDayDetailApi, editRuleDayDetailApi,
addRuleDayDetailApi, addRuleDayDetailApi,
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
:loading="loading" :loading="loading"
class="j-table-force-nowrap" class="j-table-force-nowrap"
@change="handleTableChange" @change="handleTableChange"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps: onCheckboxProps}"
> >
<span slot="reconciliationAmount" slot-scope="text, record"> <span slot="reconciliationAmount" slot-scope="text, record">
<span v-if="record.rangeType === 'all'"> <span v-if="record.rangeType === 'all'">
...@@ -197,6 +197,12 @@ export default { ...@@ -197,6 +197,12 @@ export default {
} }
}, },
methods: { methods: {
onCheckboxProps: record=> ({
props: {
disabled: record.shopNum === null,
name: record.id
}
}),
propertyDetails(type, row) { propertyDetails(type, row) {
if(row && row.shopNum == null) { if(row && row.shopNum == null) {
if(type === 2) { if(type === 2) {
......
...@@ -42,18 +42,18 @@ ...@@ -42,18 +42,18 @@
</div> </div>
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<!-- <div class="table-operator"> <div class="table-operator">
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item> <a-menu-item key="1" @click="onVerify"><a-icon type="audit" />批量审核</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown> </a-dropdown>
</div> --> </div>
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns" <a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps: onCheckboxProps}"
:dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" @change="handleTableChange"> :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" @change="handleTableChange">
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a href="javascript:;" @click="propertyDetails(1, record.id)">详情</a> <a href="javascript:;" @click="propertyDetails(1, record.id)">详情</a>
...@@ -67,10 +67,21 @@ ...@@ -67,10 +67,21 @@
</template> </template>
</span> </span>
</a-table> </a-table>
</div> </div>
<!-- table区域-end -->
<a-modal v-model="visibleAudit" :width="400">
<template slot="footer">
<a-button key="back" @click="visibleAudit = false">取消</a-button>
<a-button key="reject" type="danger" @click="handleAudit('refuse')">驳回</a-button>
<a-button key="submit" type="primary" @click="handleAudit('auditPass')">通过</a-button>
</template>
<div class="ant-modal-confirm-body">
<a-icon type="question-circle" style="color:#faad14;margin-right: 16px;font-size:22px;" />
<span class="ant-modal-confirm-title">确认要申请当前对账吗?</span>
</div>
</a-modal>
<!-- table区域-end -->
<property-settled-modal ref="modalForm" @ok="modalFormOk"></property-settled-modal> <property-settled-modal ref="modalForm" @ok="modalFormOk"></property-settled-modal>
<!-- 右侧的角色权限配置 --> <!-- 右侧的角色权限配置 -->
...@@ -79,7 +90,7 @@ ...@@ -79,7 +90,7 @@
</template> </template>
<script> <script>
import { appropriationApi } from '@/api/api' import { appropriationApi, centralSubAuditApi } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import PropertySettledModal from './modules/PropertySettledModal' import PropertySettledModal from './modules/PropertySettledModal'
import UserRoleModal from './modules/UserRoleModal' import UserRoleModal from './modules/UserRoleModal'
...@@ -183,15 +194,36 @@ export default { ...@@ -183,15 +194,36 @@ export default {
list: '/property-community/property/communityReconciliation/centralAuditList', list: '/property-community/property/communityReconciliation/centralAuditList',
delete: '/property-central/property/communityReconciliation/delete', delete: '/property-central/property/communityReconciliation/delete',
deleteBatch: '/property-central/property/communityReconciliation/deleteBatch', deleteBatch: '/property-central/property/communityReconciliation/deleteBatch',
} },
visibleAudit: false
} }
}, },
methods: { methods: {
onCheckboxProps: record=> ({
props: {
disabled: record.centralAuditStatus !== 'centralWaitAudit',
name: record.id
}
}),
propertyDetails(type, id) { propertyDetails(type, id) {
this.$router.push({ this.$router.push({
path: '/settled/RecordDetails?id=' + id +'&type=' + type, path: '/settled/RecordDetails?id=' + id +'&type=' + type,
}) })
}, },
onVerify() {
this.visibleAudit = true
},
handleAudit(type) {
let ids = this.selectedRowKeys.join(',')
centralSubAuditApi({
ids,
auditStatus: type
}).then(res=> {
this.visibleAudit = false
this.$message.success(`${type === 'auditPass' ? '审核' : '驳回'}成功!`)
this.searchQuery()
})
},
onReconciliation(id) { onReconciliation(id) {
let that = this let that = this
this.$confirm({ this.$confirm({
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论