Skip to content

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

对账联调

上级 f03a22f3
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 54 行增加 和 93 行删除
src/api/api.js
浏览文件 @ 57e191af
......@@ -7,6 +7,11 @@ const partnersShopByDepId = (params)=>getAction("/property-central/partners/part
const partnersShopAudit = (params)=>postAction("/property-central/partners/partnersShop/audit",params);
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);
......@@ -113,6 +118,9 @@ export {
partnersShopAudit,
partnersShopOperateApi,
getDataStatisticsApi,
shareBenefitShopByDepId,
shareBenefitList,
shareBalanceByDepId,
addRole,
editRole,
checkRoleCode,
......
src/mixins/JeecgListMixin.js
浏览文件 @ 57e191af
......@@ -54,6 +54,7 @@ export const JeecgListMixin = {
created() {
if(!this.disableMixinCreated){
console.log(' -- mixin created -- ')
this.initPageParams(this.queryParam);
this.loadData();
}
},
......@@ -69,6 +70,9 @@ export const JeecgListMixin = {
}
},
methods:{
initPageParams() {
console.log("--预先加载参数!")
},
loadData(arg) {
if(!this.url.list){
this.$message.error("请设置url.list属性!")
......@@ -152,6 +156,7 @@ export const JeecgListMixin = {
},
searchReset() {
this.queryParam = {}
this.initPageParams(this.queryParam);
this.loadData(1);
},
batchDel: function () {
......
src/views/benefiting/SettlementList.vue
浏览文件 @ 57e191af
......@@ -6,17 +6,21 @@
<a-row :gutter="24">
<a-col :md="5" :sm="8">
<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-col>
<a-col :md="5" :sm="8">
<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-col>
<a-col :md="7" :sm="10">
<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-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
......@@ -37,55 +41,17 @@
<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"
@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">
<a type="primary" @click="propertyDetails(2,record)">详情</a>
<a type="primary" @click="propertyDetails(2,record.id)">详情</a>
</span>
</a-table>
</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>
</template>
......@@ -96,51 +62,45 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
const columns = [
{
title: '结算单号',
dataIndex: 'id',
key: 'id',
dataIndex: 'balanceNum',
key: 'balanceNum',
align: 'center',
},
{
title: '提交时间',
dataIndex: 'reconciliationBeginDate',
key: 'reconciliationBeginDate',
dataIndex: 'createTime',
key: 'createTime',
align: 'center',
},
{
title: '提交人',
dataIndex: 'creditCode',
key: 'creditCode',
dataIndex: 'createBy',
key: 'createBy',
align: 'center',
},
{
title: '结算总金额',
dataIndex: 'reconciliationAmount',
key: 'reconciliationAmount',
dataIndex: 'balanceMoney',
key: 'balanceMoney',
align: 'center',
},
{
title: '账单数量',
dataIndex: 'reconciliationEndDate',
key: 'reconciliationEndDate',
dataIndex: 'balanceCount',
key: 'balanceCount',
align: 'center',
},
{
title: '结算方式',
dataIndex: 'companyAuditStatus',
key: 'companyAuditStatus',
dataIndex: 'balanceWay',
key: 'balanceWay',
align: 'center',
},
{
title: '结算状态',
dataIndex: 'auditStatus',
key: 'auditStatus',
align: 'center',
},
{
title: '备注',
dataIndex: 'empowerCommunityNum',
key: 'empowerCommunityNum',
dataIndex: 'balanceStatus',
scopedSlots: { customRender: 'balanceStatus' },
key: 'balanceStatus',
align: 'center',
},
{
......@@ -171,7 +131,7 @@ export default {
columns: columns,
loading: false,
url: {
list: '/property-central/property/communityReconciliation/list',
list: '/property-central/partners/shareBalance/list',
},
dataSource: [
{
......@@ -283,11 +243,21 @@ export default {
companyAuditStatus: '转账',
},
],
visibleReconciliation: false,
confirmLoading: false,
chargeList: [
{ type: 2, name: '结算待审核' },
{ type: 3, name: '已结算' },
{ type: 4, name: '结算驳回' },
],
}
},
methods: {
onChange(date, dateString) {
this.queryParam.createTime = dateString
},
initPageParams(params) {
params['platformType'] = 'partner'
},
propertyDetails(type, id) {
if (type == 1) {
this.$router.push({
......@@ -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>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论