Skip to content

P
partners
提交 57e191af authored 作者: 何忠建's avatar 何忠建
浏览文件
操作

对账联调

上级 f03a22f3
显示空白字符变更
内嵌 并排
正在显示 包含 422 行增加 和 817 行删除
src/api/api.js
浏览文件 @ 57e191af
...@@ -7,6 +7,11 @@ const partnersShopByDepId = (params)=>getAction("/property-central/partners/part ...@@ -7,6 +7,11 @@ const partnersShopByDepId = (params)=>getAction("/property-central/partners/part
const partnersShopAudit = (params)=>postAction("/property-central/partners/partnersShop/audit",params); const partnersShopAudit = (params)=>postAction("/property-central/partners/partnersShop/audit",params);
const partnersShopOperateApi = (params)=>getAction(`/property-central/partners/partnersShop/operate/${params.id}/${params.status}`,{}); const partnersShopOperateApi = (params)=>getAction(`/property-central/partners/partnersShop/operate/${params.id}/${params.status}`,{});
//对账
const shareBenefitShopByDepId = (params)=>getAction("/property-central/partners/shareBenefit/queryById",params);
const shareBenefitList = (params)=>getAction("/property-central/partners/shareBenefit/list",params);
const shareBalanceByDepId = (params)=>getAction("/property-central/partners/shareBalance/queryById",params);
// 首页统计数据 // 首页统计数据
const getDataStatisticsApi = (params)=>getAction("/property-central/partners/partnersInfo/statistics",params); const getDataStatisticsApi = (params)=>getAction("/property-central/partners/partnersInfo/statistics",params);
...@@ -113,6 +118,9 @@ export { ...@@ -113,6 +118,9 @@ export {
partnersShopAudit, partnersShopAudit,
partnersShopOperateApi, partnersShopOperateApi,
getDataStatisticsApi, getDataStatisticsApi,
shareBenefitShopByDepId,
shareBenefitList,
shareBalanceByDepId,
addRole, addRole,
editRole, editRole,
checkRoleCode, checkRoleCode,
......
src/mixins/JeecgListMixin.js
浏览文件 @ 57e191af
...@@ -54,6 +54,7 @@ export const JeecgListMixin = { ...@@ -54,6 +54,7 @@ export const JeecgListMixin = {
created() { created() {
if(!this.disableMixinCreated){ if(!this.disableMixinCreated){
console.log(' -- mixin created -- ') console.log(' -- mixin created -- ')
this.initPageParams(this.queryParam);
this.loadData(); this.loadData();
} }
}, },
...@@ -69,6 +70,9 @@ export const JeecgListMixin = { ...@@ -69,6 +70,9 @@ export const JeecgListMixin = {
} }
}, },
methods:{ methods:{
initPageParams() {
console.log("--预先加载参数!")
},
loadData(arg) { loadData(arg) {
if(!this.url.list){ if(!this.url.list){
this.$message.error("请设置url.list属性!") this.$message.error("请设置url.list属性!")
...@@ -152,6 +156,7 @@ export const JeecgListMixin = { ...@@ -152,6 +156,7 @@ export const JeecgListMixin = {
}, },
searchReset() { searchReset() {
this.queryParam = {} this.queryParam = {}
this.initPageParams(this.queryParam);
this.loadData(1); this.loadData(1);
}, },
batchDel: function () { batchDel: function () {
......
src/views/benefiting/ReconciliationDetails.vue
浏览文件 @ 57e191af
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
<h3>{{title}}</h3> <h3>{{title}}</h3>
<div class="button"> <div class="button">
<a-button @click="toReturn">返回</a-button> <a-button @click="toReturn">返回</a-button>
<a-button type="danger" @click="onExamine(2)" v-if="pageType == '2'">审核驳回</a-button>
<a-button type="primary" @click="onExamine(1)" v-if="pageType == '2'">审核通过</a-button>
<a-button type="primary" @click="onExamine(3)" v-if="pageType == '3'">确认</a-button>
</div> </div>
</div> </div>
...@@ -15,139 +12,96 @@ ...@@ -15,139 +12,96 @@
<a-card title="基本信息"> <a-card title="基本信息">
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="订单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"> <a-form-model-item label="订单编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.propertyName" placeholder="订单编号"></a-input> <a-input v-model="model.orderNum" placeholder="订单编号"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="creditCode"> <a-form-model-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.creditCode" placeholder="提交时间"></a-input> <a-input v-model="model.createTime" placeholder="提交时间"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="提交人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="registCapital"> <a-form-model-item label="买家名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-model="model.registCapital" :min="1" placeholder="提交人" style="width: 100%" /> <a-input v-model="model.buyerName" placeholder="买家名称" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="结算金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="registCapital"> <a-form-model-item label="分利金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-model="model.registCapital" :min="1" placeholder="结算金额" style="width: 100%" /> <a-input v-model="model.shareMoney" placeholder="分利金额" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="结算方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="registCapital"> <a-form-model-item label="订单金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-model="model.registCapital" :min="1" placeholder="结算方式" style="width: 100%" /> <a-input v-model="model.totalMoney" placeholder="订单金额" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contactName"> <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.contactName" placeholder="备注"></a-input> <a-input v-model="model.payWay" placeholder="支付方式" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="订单来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.orderSourceName" placeholder="订单来源" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.reconciliationStatusName" placeholder="订单状态" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="所属平台" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.propertyName" placeholder="所属平台" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="所属小区" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.communityName" placeholder="所属小区" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="商铺名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.shopName" placeholder="商铺名称" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="合作伙伴名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.partnersName" placeholder="合作伙伴名称" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
</a-card> </a-card>
</a-form-model> </a-form-model>
</j-form-container> </j-form-container>
<a-card title="对账信息" style="margin-top: 10px;"> <a-card title="操作信息" v-if="recordList.length > 0">
<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"
:dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" :dataSource="recordList" :pagination="false" :loading="loading" class="j-table-force-nowrap">
@change="handleTableChange"> <span slot="payStatus" slot-scope="text, record">
<template v-if="record"></template>已付款
</span>
<span slot="reconciliationStatus" slot-scope="text, record">
<a-tag v-if="record.reconciliationStatus === 1">未对账</a-tag>
<a-tag v-else-if="record.reconciliationStatus === 2">对账待审核</a-tag>
<a-tag v-else-if="record.reconciliationStatus === 3">已对账</a-tag>
<a-tag v-else-if="record.reconciliationStatus === 4">对账驳回</a-tag>
</span>
</a-table> </a-table>
</div>
</a-card> </a-card>
</a-spin> </a-spin>
</template> </template>
<script> <script>
const mapZoom = [5, 8, 10, 12] import { shareBenefitShopByDepId } from '@/api/api'
let timer = null
import { auditPropertyApi } from '@/api/api'
import { httpAction, getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
const columns = [
{
title: '订单编号',
dataIndex: 'id',
key: 'id',
align: 'center',
},
{
title: '提交时间',
dataIndex: 'reconciliationBeginDate',
key: 'reconciliationBeginDate',
align: 'center',
},
{
title: '用户账号',
dataIndex: 'creditCode',
key: 'creditCode',
align: 'center',
},
{
title: '分利金额',
dataIndex: 'propertyName',
key: 'propertyName',
align: 'center',
},
{
title: '支付方式',
dataIndex: 'reconciliationEndDate',
key: 'reconciliationEndDate',
align: 'center',
},
{
title: '订单来源',
dataIndex: 'reconciliationAmount',
key: 'reconciliationAmount',
align: 'center',
},
{
title: '订单状态',
dataIndex: 'updateTime',
key: 'updateTime',
align: 'center',
},
{
title: '备注',
dataIndex: 'empowerCommunityNum',
key: 'empowerCommunityNum',
align: 'center',
},
{
title: '所属平台',
dataIndex: 'auditStatus',
key: 'auditStatus',
align: 'center',
},
{
title: '所属小区',
dataIndex: 'companyAuditStatus',
key: 'companyAuditStatus',
// customRender: function (text) {
// return filterDictTextByCache('companyAuditStatus', text)
// },
},
]
export default { export default {
name: 'SettlementDetails', name: 'ReconciliationDetails',
inject: [], inject: ['closeCurrent'],
mixins: [JeecgListMixin],
data() { data() {
return { return {
title: '详情', title: '详情',
pageType: '', model: {},
pcaa: this.$Jpcaa,
model: {
propertyName: '234234234',
creditCode: '2023-03-22',
legalName: '2023-06-22',
registCapital: 'ADMIN',
contactName: '2023-06-23',
image: '',
},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 6 }, sm: { span: 6 },
...@@ -157,258 +111,74 @@ export default { ...@@ -157,258 +111,74 @@ export default {
sm: { span: 16 }, sm: { span: 16 },
}, },
confirmLoading: false, confirmLoading: false,
url: { url: {
queryById: '/property-central/property/propertySettled/queryById', queryById: '/property-central/property/propertySettled/queryById',
list: '/property-central/property/communityReconciliation/communityAccountPage',
}, },
costList: [],
mapRef: null,
columns: columns,
loading: false, loading: false,
dataSource: [ recordList: [],
columns: [
{ {
id: 'JD2394231', title: '操作人',
creditCode: '18000000000', dataIndex: 'createBy',
propertyName: 20000, key: 'createBy',
reconciliationBeginDate: '2023-01-01', align: 'center',
reconciliationEndDate: '微信', },
reconciliationAmount: '小程序', {
updateTime: '未对账', title: '操作时间',
empowerCommunityNum: '备注', dataIndex: 'createTime',
auditStatus: 'XXX物业集团', key: 'createTime',
companyAuditStatus: '花园小区', align: 'center',
}, },
{ {
id: 'JD2394232', title: '订单状态',
creditCode: '18000000000', dataIndex: 'reconciliationStatus',
propertyName: 20000, scopedSlots: { customRender: 'reconciliationStatus' },
reconciliationBeginDate: '2023-01-01', key: 'reconciliationStatus',
reconciliationEndDate: '微信', align: 'center',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
}, },
{ {
id: 'JD2394233', title: '付款状态',
creditCode: '18000000000', dataIndex: 'payStatus',
propertyName: 20000, scopedSlots: { customRender: 'payStatus' },
reconciliationBeginDate: '2023-01-01', key: 'payStatus',
reconciliationEndDate: '微信', align: 'center',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
}, },
{ {
id: 'JD2394234', title: '备注',
creditCode: '18000000000', dataIndex: 'remarks',
propertyName: 20000, key: 'remarks',
reconciliationBeginDate: '2023-01-01', align: 'center',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
}, },
], ],
} }
}, },
methods: { methods: {
async onLoadCostList() {
//let data = await getPropertyChargruleListApi()
this.costList = data.result
},
async getPageDetail() { async getPageDetail() {
//let { result } = await getPropertyDetailApi({ id: this.$route.query.id }) let { result } = await shareBenefitShopByDepId({ id: this.$route.query.id })
this.edit(result) this.recordList = result.list
if (result.provinceName) { this.model = result.shareBenefit
this.getLongitude( if (this.model.orderSource == 'miniapp') {
result.provinceName, this.model.orderSourceName = '小程序'
result.provinceName + result.cityName + result.countyName + result.addressInfo, }
mapZoom[3] if (this.model.reconciliationStatus == 1) {
) this.model.reconciliationStatusName = '未对账'
} else if (this.model.reconciliationStatus == 2) {
this.model.reconciliationStatusName = '对账待审核'
} else if (this.model.reconciliationStatus == 3) {
this.model.reconciliationStatusName = '已对账'
} else if (this.model.reconciliationStatus == 4) {
this.model.reconciliationStatusName = '对账驳回'
} }
}, },
toReturn() { toReturn() {
this.closeCurrent()
this.$router.go(-1) this.$router.go(-1)
}, },
contactPhoneChange(e) {
if (!this.model.adminLoginName) {
this.model.adminLoginName = e.target.value
}
},
edit(record) {
this.model = Object.assign({}, record)
this.model.registAdress = [record.provinceCode, record.cityCode, record.countyCode]
this.visible = true
},
onExamine(type) {
// const that = this
// if (type == 1) {
// return auditPropertyApi({
// id: this.$route.query.id,
// auditStatus: 'auditPass',
// }).then((res) => {
// that.$message.success('审核通过成功')
// that.$emit('ok')
// this.toReturn()
// })
// } else if (type == 2) {
// return auditPropertyApi({
// id: this.$route.query.id,
// auditStatus: 'refuse',
// }).then((res) => {
// that.$message.success('审核驳回成功')
// this.toReturn()
// })
// }
},
addressChange(val) {
const province = Object.keys(val[0])[0]
const city = Object.keys(val[1])[0]
const county = Object.keys(val[2])[0]
this.model.provinceName = val[0][province]
this.model.provinceCode = province
this.model.cityName = val[1][city]
this.model.cityCode = city
this.model.countyName = val[2][county]
this.model.countyCode = county
if (this.model.addressInfo) {
this.getLongitude(
this.model.provinceName,
this.model.provinceName + this.model.cityName + this.model.countyName + this.model.addressInfo,
mapZoom[3]
)
}
},
addressBlur(val) {
if (this.model.provinceName) {
this.getLongitude(
this.model.provinceName,
this.model.provinceName + this.model.cityName + this.model.countyName + val.target.value,
mapZoom[3]
)
}
},
getAddress(e) {
let _this = this
// 创建地理编码实例
var myGeo = new BMapGL.Geocoder()
// 根据坐标得到地址描述
myGeo.getLocation(new BMapGL.Point(e.latlng.lng, e.latlng.lat), function (result) {
if (result) {
_this.mapRef.clearOverlays()
_this.model.registAdress = [
result.addressComponents.province,
result.addressComponents.city,
result.addressComponents.district,
]
_this.model.addressInfo = result.addressComponents.street + result.addressComponents.streetNumber
_this.model.longitude = result.point.lng
_this.model.latitude = result.point.lat
_this.positionMap(e.latlng.lng, e.latlng.lat, mapZoom[3], result.address)
console.log(result)
}
})
},
positionMap(mapCenterLng, mapCenterLat, mapzoom, address) {
var point = new BMapGL.Point(mapCenterLng, mapCenterLat) // 创建点坐标
this.mapRef.centerAndZoom(point, mapzoom)
var marker = new BMapGL.Marker(point, { title: address }) // 创建标注
this.mapRef.addOverlay(marker) // 将标注添加到地图中
let _this = this
// marker.addEventListener("click", function(){
var label = new BMapGL.Label(address, {
// 创建文本标注
position: point, // 设置标注的地理位置
offset: new BMapGL.Size(0, -55), // 设置标注的偏移量
})
_this.mapRef.addOverlay(label) // 将标注添加到地图中
label.setStyle({
// 设置label的样式
color: '#333',
fontSize: '14px',
padding: '4px 10px',
border: '1px solid #1E90FF',
borderRadius: '4px',
transform: 'translateX(-40%)',
})
// });
},
getLongitude(city, address, zoom) {
let _this = this
var myGeo = new BMapGL.Geocoder()
myGeo.getPoint(
address,
function (point) {
if (point) {
_this.mapRef.clearOverlays()
_this.model.longitude = point.lng
_this.model.latitude = point.lat
_this.positionMap(point.lng, point.lat, zoom, address)
} else {
console.log('您选择的地址没有解析到结果！')
}
},
city
)
},
submitForm() {
const that = this
// 触发表单验证
this.$refs.form.validate((valid) => {
if (valid) {
that.confirmLoading = true
let httpurl = ''
let method = ''
if (!this.model.id) {
httpurl += this.url.add
method = 'post'
} else {
httpurl += this.url.edit
method = 'put'
}
//this.model.registAdress = undefined
httpAction(httpurl, this.model, method)
.then((res) => {
if (res.success) {
that.$message.success(res.message)
that.$emit('ok')
this.toReturn()
} else {
that.$message.warning(res.message)
}
})
.finally(() => {
that.confirmLoading = false
})
}
})
},
}, },
mounted() { mounted() {
//备份model原始值 if (this.$route.query.id) {
//this.modelDefault = JSON.parse(JSON.stringify(this.model)) this.getPageDetail()
// this.onLoadCostList()
this.pageType = this.$route.query.type
if (this.$route.query.type == '1') {
this.title = '详情'
} else if (this.$route.query.type == '2') {
this.title = '审核'
} else if (this.$route.query.type == '3') {
this.title = '拨款'
} }
console.log(this.title)
console.log(this.pageType)
// if (this.$route.query.id) {
// this.getPageDetail()
// }
}, },
} }
</script> </script>
......
src/views/benefiting/ReconciliationList.vue
浏览文件 @ 57e191af
...@@ -4,22 +4,28 @@ ...@@ -4,22 +4,28 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="5" :sm="8" style="display: none;">
<a-form-item label="">
<j-input placeholder="" v-model="queryParam.platformType"></j-input>
</a-form-item>
</a-col>
<a-col :md="5" :sm="8"> <a-col :md="5" :sm="8">
<a-form-item label="订单编号"> <a-form-item label="订单编号">
<j-input placeholder="请输入订单编号" v-model="queryParam.propertyName"></j-input> <j-input placeholder="请输入订单编号" v-model="queryParam.orderNum"></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="5" :sm="8"> <a-col :md="5" :sm="8">
<a-form-item label="状态"> <a-form-item label="状态">
<a-select style="width: 100%" v-model="queryParam.chargeTypeId" placeholder="请选择状态"> <a-select style="width: 100%" v-model="queryParam.reconciliationStatus" placeholder="请选择状态">
<a-select-option v-for="item in chargeList" :key="item.id" <a-select-option v-for="item in chargeList" :key="item.type"
:value="item.id">{{item.typeName}}</a-select-option> :value="item.type">{{item.name}}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="7" :sm="10"> <a-col :md="7" :sm="10">
<a-form-item label="订单时间"> <a-form-item label="订单时间">
<a-range-picker @change="onChangeData" /> <a-date-picker placeholder="订单时间" format="YYYY-MM-DD HH:mm:ss"
v-model="queryParam.createTime" :show-time="{ format: 'HH:mm:ss' }" @change="onChange" ></a-date-picker>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
...@@ -31,19 +37,24 @@ ...@@ -31,19 +37,24 @@
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="toReconciliation(1,'')" type="primary">批量对账</a-button>
</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"
:dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
@change="handleTableChange" @change="handleTableChange">
:rowSelection="{selectedRowKeys: selectedRowKeys,onSelect:onSelect,onChange: onSelectChange}"> <span slot="orderSource" slot-scope="text, record">
<template v-if="record.orderSource === 'miniapp'">小程序</template>
</span>
<span slot="reconciliationStatus" slot-scope="text, record">
<a-tag color="orange" v-if="record.reconciliationStatus === 1">未对账</a-tag>
<a-tag color="blue" v-else-if="record.reconciliationStatus === 2">对账待审核</a-tag>
<a-tag color="green" v-else-if="record.reconciliationStatus === 3">已对账</a-tag>
<a-tag color="red" v-else-if="record.reconciliationStatus === 4">对账驳回</a-tag>
</span>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a type="primary" @click="toReconciliation(2,record)">申请对账</a> <a type="primary" @click="toDetails(record.id)">详情</a>
<a type="primary" @click="toReconciliation(record)" v-if="record.reconciliationStatus === 1"
style="margin-left: 15px;">申请对账</a>
</span> </span>
</a-table> </a-table>
...@@ -54,106 +65,93 @@ ...@@ -54,106 +65,93 @@
<a-form> <a-form>
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="对账总金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name1" <a-form-model-item label="对账总金额" :labelCol="labelCol" :wrapperCol="wrapperCol" style="width: 100%;">
style="width: 100%;"> <a-input v-model="info.amount" placeholder="对账总金额" disabled></a-input>
<a-input v-model="model.name1" placeholder="对账总金额"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="对账日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name2" <a-form-model-item label="对账日期" :labelCol="labelCol" :wrapperCol="wrapperCol" style="width: 100%;">
style="width: 100%;"> <a-input v-model="info.data" placeholder="对账日期" disabled></a-input>
<a-input v-model="model.name2" placeholder="对账日期"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="对账明细" :labelCol="labelCol" :wrapperCol="wrapperCol" style="width: 100%;">
<a @click="checkDetails()">查看明细</a>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" style="width: 100%;"> <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" style="width: 100%;">
<a-textarea v-model="model.name3" :auto-size="{ minRows: 4, maxRows: 6 }" /> <a-textarea v-model="model.remarks" :auto-size="{ minRows: 4, maxRows: 6 }" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</a-modal> </a-modal>
<a-modal centered title="对账明细" :visible="visibleReconciliationDetail" :confirm-loading="confirmLoading"
:footer="null" width="60%" @cancel="handleCancelDetail">
<a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns1"
:dataSource="selectedList" :pagination="false" :loading="loading" class="j-table-force-nowrap">
</a-table>
</a-modal>
</a-card> </a-card>
</template> </template>
<script> <script>
//import { getChargeListApi } from '@/api/api' import { httpAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
const columns = [ const columns = [
{ {
title: '订单编号', title: '订单编号',
dataIndex: 'id', dataIndex: 'orderNum',
key: 'id', key: 'orderNum',
align: 'center', align: 'center',
}, },
{ {
title: '提交时间', title: '提交时间',
dataIndex: 'reconciliationBeginDate', dataIndex: 'createTime',
key: 'reconciliationBeginDate', key: 'createTime',
align: 'center', align: 'center',
}, },
{ {
title: '用户账号', title: '买家名称',
dataIndex: 'creditCode', dataIndex: 'buyerName',
key: 'creditCode', key: 'buyerName',
align: 'center', align: 'center',
}, },
{ {
title: '分利金额', title: '分利金额',
dataIndex: 'propertyName', dataIndex: 'shareMoney',
key: 'propertyName', key: 'shareMoney',
align: 'center', align: 'center',
}, },
{ {
title: '支付方式', title: '订单金额',
dataIndex: 'reconciliationEndDate', dataIndex: 'totalMoney',
key: 'reconciliationEndDate', key: 'totalMoney',
align: 'center', align: 'center',
}, },
{ {
title: '订单来源', title: '支付方式',
dataIndex: 'reconciliationAmount', dataIndex: 'payWay',
key: 'reconciliationAmount', key: 'payWay',
align: 'center', align: 'center',
}, },
{ {
title: '订单状态', title: '订单来源',
dataIndex: 'updateTime', dataIndex: 'orderSource',
key: 'updateTime', scopedSlots: { customRender: 'orderSource' },
key: 'orderSource',
align: 'center', align: 'center',
}, },
{ {
title: '备注', title: '订单状态',
dataIndex: 'empowerCommunityNum', dataIndex: 'reconciliationStatus',
key: 'empowerCommunityNum', scopedSlots: { customRender: 'reconciliationStatus' },
key: 'reconciliationStatus',
align: 'center', align: 'center',
}, },
{ {
title: '所属平台', title: '所属平台',
dataIndex: 'auditStatus', dataIndex: 'propertyName',
key: 'auditStatus', key: 'propertyName',
align: 'center', align: 'center',
}, },
{ {
title: '所属小区', title: '所属小区',
dataIndex: 'companyAuditStatus', dataIndex: 'communityName',
key: 'companyAuditStatus', key: 'communityName',
// customRender: function (text) { align: 'center',
// return filterDictTextByCache('companyAuditStatus', text)
// },
}, },
{ {
title: '操作', title: '操作',
...@@ -164,71 +162,6 @@ const columns = [ ...@@ -164,71 +162,6 @@ const columns = [
width: 150, width: 150,
}, },
] ]
const columns1 = [
{
title: '订单编号',
dataIndex: 'id',
key: 'id',
align: 'center',
},
{
title: '提交时间',
dataIndex: 'reconciliationBeginDate',
key: 'reconciliationBeginDate',
align: 'center',
},
{
title: '用户账号',
dataIndex: 'creditCode',
key: 'creditCode',
align: 'center',
},
{
title: '分利金额',
dataIndex: 'propertyName',
key: 'propertyName',
align: 'center',
},
{
title: '支付方式',
dataIndex: 'reconciliationEndDate',
key: 'reconciliationEndDate',
align: 'center',
},
{
title: '订单来源',
dataIndex: 'reconciliationAmount',
key: 'reconciliationAmount',
align: 'center',
},
{
title: '订单状态',
dataIndex: 'updateTime',
key: 'updateTime',
align: 'center',
},
{
title: '备注',
dataIndex: 'empowerCommunityNum',
key: 'empowerCommunityNum',
align: 'center',
},
{
title: '所属平台',
dataIndex: 'auditStatus',
key: 'auditStatus',
align: 'center',
},
{
title: '所属小区',
dataIndex: 'companyAuditStatus',
key: 'companyAuditStatus',
// customRender: function (text) {
// return filterDictTextByCache('companyAuditStatus', text)
// },
},
]
export default { export default {
components: {}, components: {},
...@@ -236,6 +169,10 @@ export default { ...@@ -236,6 +169,10 @@ export default {
mixins: [JeecgListMixin], mixins: [JeecgListMixin],
data() { data() {
return { return {
queryParam:{
platformType:'partner'
},
info: {},
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
...@@ -245,141 +182,69 @@ export default { ...@@ -245,141 +182,69 @@ export default {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 16 }, sm: { span: 16 },
}, },
chargeList: [], chargeList: [
{ type: 1, name: '未对账' },
{ type: 2, name: '对账待审核' },
{ type: 3, name: '已对账' },
{ type: 4, name: '对账驳回' },
],
columns: columns, columns: columns,
columns1: columns1,
loading: false, loading: false,
url: { url: {
list: '/property-central/property/communityReconciliation/list', list: '/property-central/partners/shareBenefit/list',
}, reconciliation: '/property-central/partners/shareBenefit/reconciliation',
dataSource: [
{
id: 'JD2394231',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
{
id: 'JD2394232',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
{
id: 'JD2394233',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
}, },
{ dataSource: [],
id: 'JD2394234',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
],
visibleReconciliation: false, visibleReconciliation: false,
confirmLoading: false, confirmLoading: false,
selectedList: [],
selectedRowKeys: [],
visibleReconciliationDetail: false,
} }
}, },
created() { created() {
//this.getChargeList() //let data = new Date().toLocaleString()
let data = new Date().toLocaleString();
console.log(data)
}, },
methods: { methods: {
// async getChargeList() { onChange(date, dateString) {
// let { result } = await getChargeListApi() this.queryParam.createTime = dateString
// this.chargeList = result },
// }, initPageParams(params) {
onChangeData(date, dateString) { params['platformType'] = 'partner'
if (dateString.length > 0) { },
this.queryParam.createTime_begin = dateString[0] toDetails(id) {
this.queryParam.createTime_end = dateString[1] this.$router.push({
} else { path: '/benefiting/ReconciliationDetails?type=detail&id=' + id,
this.queryParam.createTime_begin = '' })
this.queryParam.createTime_end = ''
}
}, },
//申请对账 //申请对账
toReconciliation(type, record) { toReconciliation(record) {
this.selectedList = []
this.model.name1 = 0;
if (type == 1) {
if (this.selectionRows.length > 0) {
this.visibleReconciliation = true this.visibleReconciliation = true
this.selectedList = this.selectionRows this.info.amount = record.totalMoney
let list = this.selectedList this.info.data = record.createTime
let sum = 0 this.model.id = record.id
for (var i = 0; i < list.length; i++) {
sum += list[i].propertyName
}
this.model.name1 = sum
console.log(this.selectedList)
console.log(333)
} else {
this.$message.warning('请选择订单')
}
} else if (type == 2) {
this.visibleReconciliation = true
this.selectedList.push(record)
this.selectedRowKeys = []
this.model.name1 = record.propertyName;
}
}, },
handleOk(e) { handleOk(e) {
const that = this
this.confirmLoading = true this.confirmLoading = true
setTimeout(() => { let method = 'post'
httpAction(this.url.reconciliation, this.model, method)
.then((res) => {
if (res.success) {
that.$message.success(res.message)
that.$emit('ok')
} else {
that.$message.warning(res.message)
}
that.searchQuery()
this.visibleReconciliation = false this.visibleReconciliation = false
this.confirmLoading = false this.confirmLoading = false
}, 2000) this.model = {}
})
.finally(() => {
that.confirmLoading = false
})
}, },
handleCancel(e) { handleCancel(e) {
this.visibleReconciliation = false this.visibleReconciliation = false
}, },
onSelect(record, selected) {
if (selected === true) {
this.selectedCurrently = record
}
},
onSelectChange(selectedRowKeys, selectedRows) {
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectedRows
},
checkDetails() {
this.visibleReconciliationDetail = true
},
handleCancelDetail() {
this.visibleReconciliationDetail = false
},
}, },
} }
</script> </script>
......
src/views/benefiting/SettlementDetails.vue
浏览文件 @ 57e191af
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<h3>{{title}}</h3> <h3>{{title}}</h3>
<div class="button"> <div class="button">
<a-button @click="toReturn">返回</a-button> <a-button @click="toReturn">返回</a-button>
<a-button type="primary" @click="toReconciliation()" v-if="pageType == 'add'">确认结算</a-button> <a-button type="primary" @click="toReconciliation()" v-if="pageType == 'add'">申请结算</a-button>
</div> </div>
</div> </div>
...@@ -13,53 +13,94 @@ ...@@ -13,53 +13,94 @@
<a-card title="基本信息"> <a-card title="基本信息">
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="订单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"> <a-form-model-item label="结算单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.propertyName" placeholder="订单编号"></a-input> <a-input v-model="detailInfo.balanceNum" placeholder="结算单号"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="creditCode"> <a-form-model-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.creditCode" placeholder="提交时间"></a-input> <a-input v-model="detailInfo.createTime" placeholder="提交时间"></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="提交人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="registCapital"> <a-form-model-item label="提交人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-model="model.registCapital" :min="1" placeholder="提交人" style="width: 100%" /> <a-input v-model="detailInfo.createBy" placeholder="提交人" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="结算金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="registCapital"> <a-form-model-item label="结算总金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-model="model.registCapital" :min="1" placeholder="结算金额" style="width: 100%" /> <a-input v-model="detailInfo.balanceMoney" placeholder="结算总金额" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="结算方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="registCapital"> <a-form-model-item label="账单数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-model="model.registCapital" :min="1" placeholder="结算方式" style="width: 100%" /> <a-input v-model="detailInfo.balanceCount" placeholder="账单数量" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contactName"> <a-form-model-item label="结算方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.contactName" placeholder="备注"></a-input> <a-input v-model="detailInfo.balanceWay" placeholder="结算方式" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="银行卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="detailInfo.bankCard" placeholder="银行卡" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="结算日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="detailInfo.balanceDate" placeholder="结算日期" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
</a-card> </a-card>
</a-form-model> </a-form-model>
</j-form-container> </j-form-container>
<a-card title="对账信息" style="margin-top: 10px;"> <a-card title="对账信息" style="margin: 10px 0;">
<a-button slot="extra" type="primary" @click="onStatements()" v-if="pageType == 'add'">选择对账单</a-button> <a-button slot="extra" type="primary" @click="onStatements()" v-if="pageType == 'add'">选择对账单</a-button>
<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"
:dataSource="selectedList" :pagination="false" :loading="loading" class="j-table-force-nowrap"> :dataSource="shareBenefitsList" :pagination="false" :loading="loading" class="j-table-force-nowrap">
<span slot="orderSource" slot-scope="text, record">
<template v-if="record.orderSource === 'miniapp'">小程序</template>
</span>
<span slot="reconciliationStatus" slot-scope="text, record">
<a-tag color="orange" v-if="record.reconciliationStatus === 1">未对账</a-tag>
<a-tag color="blue" v-else-if="record.reconciliationStatus === 2">对账待审核</a-tag>
<a-tag color="green" v-else-if="record.reconciliationStatus === 3">已对账</a-tag>
<a-tag color="red" v-else-if="record.reconciliationStatus === 4">对账驳回</a-tag>
</span>
</a-table> </a-table>
</div> </div>
</a-card> </a-card>
<a-card title="操作信息" v-if="recordList.length > 0">
<a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="recordColumns"
:dataSource="recordList" :pagination="false" :loading="loading" class="j-table-force-nowrap">
<span slot="payStatus" slot-scope="text, record">
<template v-if="record"></template>已付款
</span>
<span slot="reconciliationStatus" slot-scope="text, record">
<a-tag v-if="record.reconciliationStatus === 2">结算待审核</a-tag>
<a-tag v-else-if="record.reconciliationStatus === 3">已结算</a-tag>
<a-tag v-else-if="record.reconciliationStatus === 4">结算驳回</a-tag>
</span>
</a-table>
</a-card>
<a-modal centered title="选择对账单" :visible="visibleStatements" @ok="statementsOk" @cancel="statementsCancel" <a-modal centered title="选择对账单" :visible="visibleStatements" @ok="statementsOk" @cancel="statementsCancel"
width="60%"> width="60%">
<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"
:dataSource="dataStatements" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
@change="handleTableChange" @change="handleTableChange"
:rowSelection="{selectedRowKeys: selectedRowKeys,onSelect:onSelect,onChange: onSelectChange}"> :rowSelection="{selectedRowKeys: selectedRowKeys,onSelect:onSelect,onChange: onSelectChange}">
<span slot="orderSource" slot-scope="text, record">
<template v-if="record.orderSource === 'miniapp'">小程序</template>
</span>
<span slot="reconciliationStatus" slot-scope="text, record">
<a-tag color="orange" v-if="record.reconciliationStatus === 1">未对账</a-tag>
<a-tag color="blue" v-else-if="record.reconciliationStatus === 2">对账待审核</a-tag>
<a-tag color="green" v-else-if="record.reconciliationStatus === 3">已对账</a-tag>
<a-tag color="red" v-else-if="record.reconciliationStatus === 4">对账驳回</a-tag>
</span>
</a-table> </a-table>
</a-modal> </a-modal>
<a-modal centered title="申请结算" :visible="visibleReconciliation" :confirm-loading="confirmLoading" @ok="handleOk" <a-modal centered title="申请结算" :visible="visibleReconciliation" :confirm-loading="confirmLoading" @ok="handleOk"
...@@ -67,32 +108,31 @@ ...@@ -67,32 +108,31 @@
<a-form> <a-form>
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="结算总金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName" <a-form-model-item label="结算总金额" :labelCol="labelCol" :wrapperCol="wrapperCol"
style="width: 100%;margin-bottom: 10px;"> style="width: 100%;margin-bottom: 10px;">
<a-input v-model="model.name1" placeholder="结算总金额"></a-input> <a-input v-model="info.balanceMoney" placeholder="结算总金额" disabled></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="结算日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName" <a-form-model-item label="结算方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="balanceWay"
style="width: 100%;margin-bottom: 10px;"> style="width: 100%;margin-bottom: 10px;">
<a-input v-model="model.propertyName" placeholder="结算日期"></a-input> <a-input v-model="model.balanceWay" placeholder="结算方式" disabled></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col> <a-col :span="24">
<a-col :span="24"> <a-form-model-item label="选择银行卡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankCard"
<a-form-model-item label="结算方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
style="width: 100%;margin-bottom: 10px;"> style="width: 100%;margin-bottom: 10px;">
<a-input v-model="model.propertyName" placeholder="结算方式"></a-input> <a-input v-model="model.bankCard" placeholder="银行卡" disabled></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> <a-col :span="24"> </a-col>
<a-form-model-item label="选择银行卡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName" <a-col :span="24">
<a-form-model-item label="结算日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="balanceDate"
style="width: 100%;margin-bottom: 10px;"> style="width: 100%;margin-bottom: 10px;">
<a-input v-model="model.propertyName" placeholder="选择银行卡"></a-input> <a-date-picker placeholder="选择日期" format="YYYY-MM-DD HH:mm:ss" :show-time="{ format: 'HH:mm:ss' }" @change="onChangeTime" v-model="model.balanceDate"></a-date-picker>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName" <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" style="width: 100%;">
style="width: 100%;"> <a-textarea v-model="model.remarks" :auto-size="{ minRows: 4, maxRows: 6 }" />
<a-textarea v-model="model.propertyName" :auto-size="{ minRows: 4, maxRows: 6 }" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
...@@ -104,90 +144,86 @@ ...@@ -104,90 +144,86 @@
<script> <script>
const mapZoom = [5, 8, 10, 12] const mapZoom = [5, 8, 10, 12]
let timer = null let timer = null
import { auditPropertyApi } from '@/api/api' import { shareBalanceByDepId } from '@/api/api'
import { httpAction, getAction } from '@/api/manage' import { httpAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
const columns = [ const columns = [
{ {
title: '订单编号', title: '订单编号',
dataIndex: 'id', dataIndex: 'orderNum',
key: 'id', key: 'orderNum',
align: 'center', align: 'center',
}, },
{ {
title: '提交时间', title: '提交时间',
dataIndex: 'reconciliationBeginDate', dataIndex: 'createTime',
key: 'reconciliationBeginDate', key: 'createTime',
align: 'center', align: 'center',
}, },
{ {
title: '用户账号', title: '买家名称',
dataIndex: 'creditCode', dataIndex: 'buyerName',
key: 'creditCode', key: 'buyerName',
align: 'center', align: 'center',
}, },
{ {
title: '分利金额', title: '分利金额',
dataIndex: 'propertyName', dataIndex: 'shareMoney',
key: 'propertyName', key: 'shareMoney',
align: 'center', align: 'center',
}, },
{ {
title: '支付方式', title: '订单金额',
dataIndex: 'reconciliationEndDate', dataIndex: 'totalMoney',
key: 'reconciliationEndDate', key: 'totalMoney',
align: 'center', align: 'center',
}, },
// {
// title: '支付方式',
// dataIndex: 'payWay',
// key: 'payWay',
// align: 'center',
// },
{ {
title: '订单来源', title: '订单来源',
dataIndex: 'reconciliationAmount', dataIndex: 'orderSource',
key: 'reconciliationAmount', scopedSlots: { customRender: 'orderSource' },
key: 'orderSource',
align: 'center', align: 'center',
}, },
{ {
title: '订单状态', title: '订单状态',
dataIndex: 'updateTime', dataIndex: 'reconciliationStatus',
key: 'updateTime', scopedSlots: { customRender: 'reconciliationStatus' },
align: 'center', key: 'reconciliationStatus',
},
{
title: '备注',
dataIndex: 'empowerCommunityNum',
key: 'empowerCommunityNum',
align: 'center', align: 'center',
}, },
{ {
title: '所属平台', title: '所属平台',
dataIndex: 'auditStatus', dataIndex: 'propertyName',
key: 'auditStatus', key: 'propertyName',
align: 'center', align: 'center',
}, },
{ {
title: '所属小区', title: '所属小区',
dataIndex: 'companyAuditStatus', dataIndex: 'communityName',
key: 'companyAuditStatus', key: 'communityName',
align: 'center', align: 'center',
}, },
] ]
export default { export default {
name: 'SettlementDetails', name: 'SettlementDetails',
inject: [], inject: ['closeCurrent'],
mixins: [JeecgListMixin], mixins: [JeecgListMixin],
data() { data() {
return { return {
title: '详情', title: '详情',
pageType: '', pageType: '',
pcaa: this.$Jpcaa, pcaa: this.$Jpcaa,
model: { model: {},
propertyName: '234234234', info: {},
creditCode: '2023-03-22', detailInfo: {},
legalName: '2023-06-22',
registCapital: 'ADMIN',
contactName: '2023-06-23',
image: '',
},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 6 }, sm: { span: 6 },
...@@ -198,65 +234,50 @@ export default { ...@@ -198,65 +234,50 @@ export default {
}, },
visibleStatements: false, visibleStatements: false,
confirmLoading: false, confirmLoading: false,
selectedList: [], shareBenefitsList: [],
selectionRows: [], selectionRows: [],
selectedRowKeys: [], selectedRowKeys: [],
visibleReconciliation: false, visibleReconciliation: false,
url: { url: {
queryById: '/property-central/property/propertySettled/queryById', queryById: '/property-central/partners/shareBalance/queryById',
list: '/property-central/property/communityReconciliation/communityAccountPage', add: '/property-central/partners/shareBalance/add',
list: '/property-central/partners/shareBenefit/listBalance',
}, },
costList: [],
columns: columns, columns: columns,
dataStatements: [ dataStatements: [],
recordList:[],
recordColumns: [
{ {
id: 'JD2394231', title: '操作人',
creditCode: '18000000000', dataIndex: 'createBy',
propertyName: 20000, key: 'createBy',
reconciliationBeginDate: '2023-01-01', align: 'center',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
}, },
{ {
id: 'JD2394232', title: '操作时间',
creditCode: '18000000000', dataIndex: 'createTime',
propertyName: 20000, key: 'createTime',
reconciliationBeginDate: '2023-01-01', align: 'center',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
}, },
{ {
id: 'JD2394233', title: '订单状态',
creditCode: '18000000000', dataIndex: 'reconciliationStatus',
propertyName: 20000, scopedSlots: { customRender: 'reconciliationStatus' },
reconciliationBeginDate: '2023-01-01', key: 'reconciliationStatus',
reconciliationEndDate: '微信', align: 'center',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
}, },
{ {
id: 'JD2394234', title: '付款状态',
creditCode: '18000000000', dataIndex: 'payStatus',
propertyName: 20000, scopedSlots: { customRender: 'payStatus' },
reconciliationBeginDate: '2023-01-01', key: 'payStatus',
reconciliationEndDate: '微信', align: 'center',
reconciliationAmount: '小程序', },
updateTime: '未对账', {
empowerCommunityNum: '备注', title: '备注',
auditStatus: 'XXX物业集团', dataIndex: 'remarks',
companyAuditStatus: '花园小区', key: 'remarks',
align: 'center',
}, },
], ],
} }
...@@ -273,22 +294,17 @@ export default { ...@@ -273,22 +294,17 @@ export default {
} }
}, },
methods: { methods: {
async onLoadCostList() { initPageParams(params) {
//let data = await getPropertyChargruleListApi() params['platformType'] = 'partner'
this.costList = data.result
}, },
async getPageDetail() { async getPageDetail() {
//let { result } = await getPropertyDetailApi({ id: this.$route.query.id }) let { result } = await shareBalanceByDepId({ id: this.$route.query.id })
this.edit(result) this.recordList = result.list
if (result.provinceName) { this.detailInfo = result.shareBalance
this.getLongitude( this.shareBenefitsList = result.shareBenefitsList
result.provinceName,
result.provinceName + result.cityName + result.countyName + result.addressInfo,
mapZoom[3]
)
}
}, },
toReturn() { toReturn() {
this.closeCurrent()
this.$router.go(-1) this.$router.go(-1)
}, },
//选择对账单 //选择对账单
...@@ -305,7 +321,7 @@ export default { ...@@ -305,7 +321,7 @@ export default {
this.selectionRows = selectedRows this.selectionRows = selectedRows
}, },
statementsOk() { statementsOk() {
this.selectedList = this.selectionRows this.shareBenefitsList = this.selectionRows
this.visibleStatements = false this.visibleStatements = false
this.confirmLoading = false this.confirmLoading = false
}, },
...@@ -316,44 +332,33 @@ export default { ...@@ -316,44 +332,33 @@ export default {
toReconciliation(record) { toReconciliation(record) {
if (this.selectionRows.length > 0) { if (this.selectionRows.length > 0) {
this.visibleReconciliation = true this.visibleReconciliation = true
let list = this.selectedList let list = this.shareBenefitsList
let sum = 0 let sum = 0
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
sum += list[i].propertyName sum += list[i].shareMoney
} }
this.model.name1 = sum this.info.balanceMoney = sum
this.model.balanceWay = '转账'
this.model.bankCard = '123456789'
} else { } else {
this.$message.warning('选择对账单') this.$message.warning('选择对账单')
} }
}, },
onChangeTime(date, dateString) {
this.model.balanceDate = dateString
},
handleOk(e) { handleOk(e) {
const that = this
this.confirmLoading = true this.confirmLoading = true
setTimeout(() => { let method = 'post'
this.visibleReconciliation = false if (!this.model.balanceDate) {
this.$message.warning('请选择结算日期')
this.confirmLoading = false this.confirmLoading = false
}, 2000) return false
},
handleCancel(e) {
this.visibleReconciliation = false
},
submitForm() {
const that = this
// 触发表单验证
this.$refs.form.validate((valid) => {
if (valid) {
that.confirmLoading = true
let httpurl = ''
let method = ''
if (!this.model.id) {
httpurl += this.url.add
method = 'post'
} else {
httpurl += this.url.edit
method = 'put'
} }
//this.model.registAdress = undefined
httpAction(httpurl, this.model, method) this.model.shareBenefitIds = this.selectedRowKeys.toString()
httpAction(this.url.add, this.model, method)
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
that.$message.success(res.message) that.$message.success(res.message)
...@@ -362,12 +367,16 @@ export default { ...@@ -362,12 +367,16 @@ export default {
} else { } else {
that.$message.warning(res.message) that.$message.warning(res.message)
} }
this.visibleReconciliation = false
this.confirmLoading = false
this.model = {}
}) })
.finally(() => { .finally(() => {
that.confirmLoading = false that.confirmLoading = false
}) })
} },
}) handleCancel(e) {
this.visibleReconciliation = false
}, },
}, },
mounted() {}, mounted() {},
......
src/views/benefiting/SettlementList.vue
浏览文件 @ 57e191af
...@@ -6,17 +6,21 @@ ...@@ -6,17 +6,21 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="5" :sm="8"> <a-col :md="5" :sm="8">
<a-form-item label="订单编号"> <a-form-item label="订单编号">
<j-input placeholder="请输入订单编号" v-model="queryParam.propertyName"></j-input> <j-input placeholder="请输入订单编号" v-model="queryParam.balanceNum"></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="5" :sm="8"> <a-col :md="5" :sm="8">
<a-form-item label="状态"> <a-form-item label="状态">
<j-input placeholder="请选择状态" v-model="queryParam.propertyName"></j-input> <a-select style="width: 100%" v-model="queryParam.balanceStatus" placeholder="请选择状态">
<a-select-option v-for="item in chargeList" :key="item.type"
:value="item.type">{{item.name}}</a-select-option>
</a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="7" :sm="10"> <a-col :md="7" :sm="10">
<a-form-item label="订单时间"> <a-form-item label="订单时间">
<a-range-picker @change="onChangeData" /> <a-date-picker placeholder="订单时间" format="YYYY-MM-DD HH:mm:ss"
v-model="queryParam.createTime" :show-time="{ format: 'HH:mm:ss' }" @change="onChange" ></a-date-picker>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
...@@ -37,55 +41,17 @@ ...@@ -37,55 +41,17 @@
<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"
:dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
@change="handleTableChange"> @change="handleTableChange">
<span slot="balanceStatus" slot-scope="text, record">
<a-tag color="blue" v-if="record.balanceStatus === 2">结算待审核</a-tag>
<a-tag color="green" v-else-if="record.balanceStatus === 3">已结算</a-tag>
<a-tag color="red" v-else-if="record.balanceStatus === 4">结算驳回</a-tag>
</span>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a type="primary" @click="propertyDetails(2,record)">详情</a> <a type="primary" @click="propertyDetails(2,record.id)">详情</a>
</span> </span>
</a-table> </a-table>
</div> </div>
<!-- table区域-end -->
<a-modal centered title="申请结算" :visible="visibleReconciliation" :confirm-loading="confirmLoading" @ok="handleOk"
@cancel="handleCancel">
<a-form>
<a-row>
<a-col :span="24">
<a-form-model-item label="结算总金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
style="width: 100%;margin-bottom: 10px;">
<a-input v-model="model.propertyName" placeholder="结算总金额"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="结算日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
style="width: 100%;margin-bottom: 10px;">
<a-input v-model="model.propertyName" placeholder="结算日期"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="结算方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
style="width: 100%;margin-bottom: 10px;">
<a-input v-model="model.propertyName" placeholder="结算方式"></a-input>
</a-form-model-item>
</a-col> <a-col :span="24">
<a-form-model-item label="选择银行卡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
style="width: 100%;margin-bottom: 10px;">
<a-input v-model="model.propertyName" placeholder="选择银行卡"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="结算明细" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
style="width: 100%;margin-bottom: 10px;">
<a>查看明细</a>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
style="width: 100%;">
<a-textarea v-model="model.propertyName" :auto-size="{ minRows: 4, maxRows: 6 }" />
</a-form-model-item>
</a-col>
</a-row>
</a-form>
</a-modal>
</a-card> </a-card>
</template> </template>
...@@ -96,51 +62,45 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' ...@@ -96,51 +62,45 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
const columns = [ const columns = [
{ {
title: '结算单号', title: '结算单号',
dataIndex: 'id', dataIndex: 'balanceNum',
key: 'id', key: 'balanceNum',
align: 'center', align: 'center',
}, },
{ {
title: '提交时间', title: '提交时间',
dataIndex: 'reconciliationBeginDate', dataIndex: 'createTime',
key: 'reconciliationBeginDate', key: 'createTime',
align: 'center', align: 'center',
}, },
{ {
title: '提交人', title: '提交人',
dataIndex: 'creditCode', dataIndex: 'createBy',
key: 'creditCode', key: 'createBy',
align: 'center', align: 'center',
}, },
{ {
title: '结算总金额', title: '结算总金额',
dataIndex: 'reconciliationAmount', dataIndex: 'balanceMoney',
key: 'reconciliationAmount', key: 'balanceMoney',
align: 'center', align: 'center',
}, },
{ {
title: '账单数量', title: '账单数量',
dataIndex: 'reconciliationEndDate', dataIndex: 'balanceCount',
key: 'reconciliationEndDate', key: 'balanceCount',
align: 'center', align: 'center',
}, },
{ {
title: '结算方式', title: '结算方式',
dataIndex: 'companyAuditStatus', dataIndex: 'balanceWay',
key: 'companyAuditStatus', key: 'balanceWay',
align: 'center', align: 'center',
}, },
{ {
title: '结算状态', title: '结算状态',
dataIndex: 'auditStatus', dataIndex: 'balanceStatus',
key: 'auditStatus', scopedSlots: { customRender: 'balanceStatus' },
align: 'center', key: 'balanceStatus',
},
{
title: '备注',
dataIndex: 'empowerCommunityNum',
key: 'empowerCommunityNum',
align: 'center', align: 'center',
}, },
{ {
...@@ -171,7 +131,7 @@ export default { ...@@ -171,7 +131,7 @@ export default {
columns: columns, columns: columns,
loading: false, loading: false,
url: { url: {
list: '/property-central/property/communityReconciliation/list', list: '/property-central/partners/shareBalance/list',
}, },
dataSource: [ dataSource: [
{ {
...@@ -283,11 +243,21 @@ export default { ...@@ -283,11 +243,21 @@ export default {
companyAuditStatus: '转账', companyAuditStatus: '转账',
}, },
], ],
visibleReconciliation: false,
confirmLoading: false, confirmLoading: false,
chargeList: [
{ type: 2, name: '结算待审核' },
{ type: 3, name: '已结算' },
{ type: 4, name: '结算驳回' },
],
} }
}, },
methods: { methods: {
onChange(date, dateString) {
this.queryParam.createTime = dateString
},
initPageParams(params) {
params['platformType'] = 'partner'
},
propertyDetails(type, id) { propertyDetails(type, id) {
if (type == 1) { if (type == 1) {
this.$router.push({ this.$router.push({
...@@ -300,29 +270,7 @@ export default { ...@@ -300,29 +270,7 @@ export default {
} }
}, },
onChangeData(date, dateString) {
if (dateString.length > 0) {
this.queryParam.createTime_begin = dateString[0]
this.queryParam.createTime_end = dateString[1]
} else {
this.queryParam.createTime_begin = ''
this.queryParam.createTime_end = ''
}
},
//申请对账
toReconciliation(record) {
this.visibleReconciliation = true
},
handleOk(e) {
this.confirmLoading = true
setTimeout(() => {
this.visibleReconciliation = false
this.confirmLoading = false
}, 2000)
},
handleCancel(e) {
this.visibleReconciliation = false
},
}, },
} }
</script> </script>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论