Skip to content

T
total-platform
提交 16794d8f authored 作者: 宋雄's avatar 宋雄
浏览文件
操作

修改二期bug

上级 f7f963ce
隐藏空白字符变更
内嵌 并排
正在显示 包含 339 行增加 和 300 行删除
.env.development
浏览文件 @ 16794d8f
NODE_ENV=development NODE_ENV=development
# VUE_APP_API_BASE_URL='http://220.203.25.212:9998' VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
VUE_APP_API_BASE_URL='http://192.168.0.100:9999' # VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
# VUE_APP_API_BASE_URL='http://220.203.25.212: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_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
......
src/views/benefits/settlement/SettlementDetails.vue
浏览文件 @ 16794d8f
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<script> <script>
import { getshareBalanceApi, auditshareBalanceApi } from '@/api/api' import { getshareBalanceApi, auditshareBalanceApi } from '@/api/api'
import { httpAction, getAction } from '@/api/manage' import { httpAction, getAction } from '@/api/manage'
import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS, BALANCE_STATUS } from '@/assets/static.js' import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS, BALANCE_STATUS, PAY_WAY } from '@/assets/static.js'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
const columns = [ const columns = [
...@@ -159,6 +159,9 @@ const columns = [ ...@@ -159,6 +159,9 @@ const columns = [
dataIndex: 'payWay', dataIndex: 'payWay',
key: 'payWay', key: 'payWay',
align: 'center', align: 'center',
customRender: function (text) {
return filterDictTextByStatic(PAY_WAY, text)
}
}, },
{ {
title: '订单来源', title: '订单来源',
......
src/views/benefitsAudit/reconciliation/modules/PropertyAdvForm.vue
浏览文件 @ 16794d8f
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
this.edit(this.modelDefault); this.edit(this.modelDefault);
}, },
edit (record) { edit (record) {
this.model = Object.assign({}, record, {totalMoneyName: `¥${record.totalMoney}`, remarks: ''}); this.model = Object.assign({}, record, {totalMoneyName: `¥${record.shareMoney}`, remarks: ''});
this.visible = true; this.visible = true;
}, },
submitForm () { submitForm () {
......
src/views/bulletin/board.vue
浏览文件 @ 16794d8f
<template> <template>
<a-card :bordered="false"> <a-spin :spinning="confirmLoading">
<!-- 查询区域 --> <a-card :bordered="false">
<div class="table-page-search-wrapper"> <!-- 查询区域 -->
<a-form layout="inline" @keyup.enter.native="searchQuery"> <div class="table-page-search-wrapper">
<a-row :gutter="24"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-col :md="6" :sm="6"> <a-row :gutter="24">
<a-month-picker style="width:100%" placeholder="选择日期" valueFormat="YYYYMM" v-model="time" />
</a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="6" :sm="6"> <a-col :md="6" :sm="6">
<a-button type="primary" @click="searchQuery">查询</a-button> <a-month-picker style="width:100%" placeholder="选择日期" valueFormat="YYYYMM" v-model="time" />
<a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
</a-col> </a-col>
</span> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
</a-row> <a-col :md="6" :sm="6">
</a-form> <a-button type="primary" @click="searchQuery">查询</a-button>
</div> <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
<a-row :gutter="12"> <a-row :gutter="12">
<!-- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }"> <!-- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics"> <div class="statistics">
<div class="icon" style="color:#1890ff;"><a-icon type="gold" /></div> <div class="icon" style="color:#1890ff;"><a-icon type="gold" /></div>
<div> <div>
<p style="color:#666;margin-bottom:5px;">绑定商铺数量</p> <p style="color:#666;margin-bottom:5px;">绑定商铺数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">23</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">23</p>
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }"> <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics"> <div class="statistics">
<div class="icon" style="color:#7262fd;"><a-icon type="home" /></div> <div class="icon" style="color:#7262fd;"><a-icon type="home" /></div>
<div> <div>
<p style="color:#666;margin-bottom:5px;">平台总小区数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p>
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics">
<div class="icon" style="color:#ffaa00;"><a-icon type="user" /></div>
<div>
<p style="color:#666;margin-bottom:5px;">平台总业主数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">45634</p>
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics">
<div class="icon" style="color:#52c41a;"><a-icon type="team" /></div>
<div>
<p style="color:#666;margin-bottom:5px;">合作伙伴分利</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">5656</p>
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics">
<div class="icon" style="color:#1890ff;"><a-icon type="line-chart" /></div>
<div>
<p style="color:#666;margin-bottom:5px;">新增订单数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">5656</p>
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics">
<div class="icon" style="color:#52c41a;"><a-icon type="dollar" /></div>
<div>
<p style="color:#666;margin-bottom:5px;">总营收</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">5656</p>
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics">
<div class="icon" style="color:#52c41a;"><a-icon type="dollar" /></div>
<div>
<p style="color:#666;margin-bottom:5px;">本月营收</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">5656</p>
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics">
<div class="icon" style="color:#52c41a;"><a-icon type="dollar" /></div>
<div>
<p style="color:#666;margin-bottom:5px;">本月营收</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">5656</p>
</div>
</div>
</a-col> -->
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">平台总合作伙伴数</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.partners || 0}}</p>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">平台总商铺数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.shop || 0}}</p>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">平台总小区数量</p> <p style="color:#666;margin-bottom:5px;">平台总小区数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">56</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.bindCommunity || 0}}</p>
</div> </div>
</div> </a-col>
</a-col> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }"> <div class="statistics">
<div class="statistics">
<div class="icon" style="color:#ffaa00;"><a-icon type="user" /></div>
<div>
<p style="color:#666;margin-bottom:5px;">平台总业主数量</p> <p style="color:#666;margin-bottom:5px;">平台总业主数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">45634</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.bindOwner || 0}}</p>
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics">
<div class="icon" style="color:#52c41a;"><a-icon type="team" /></div>
<div>
<p style="color:#666;margin-bottom:5px;">合作伙伴分利</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">5656</p>
</div> </div>
</div> </a-col>
</a-col> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics">
<div class="icon" style="color:#1890ff;"><a-icon type="line-chart" /></div>
<div>
<p style="color:#666;margin-bottom:5px;">新增订单数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">5656</p>
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<div class="statistics">
<div class="icon" style="color:#52c41a;"><a-icon type="dollar" /></div>
<div>
<p style="color:#666;margin-bottom:5px;">总营收</p> <p style="color:#666;margin-bottom:5px;">总营收</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">5656</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.totalMoney || 0}}</p>
</div> </div>
</div> </a-col>
</a-col> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }"> <div class="statistics">
<div class="statistics"> <p style="color:#666;margin-bottom:5px;">月营收</p>
<div class="icon" style="color:#52c41a;"><a-icon type="dollar" /></div> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.monthMoney || 0}}</p>
<div> </div>
<p style="color:#666;margin-bottom:5px;">本月营收</p> </a-col>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">5656</p> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
</div> <div class="statistics">
</div> <p style="color:#666;margin-bottom:5px;">日营收</p>
</a-col> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todayMoney || 0}}</p>
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }"> </div>
<div class="statistics"> </a-col>
<div class="icon" style="color:#52c41a;"><a-icon type="dollar" /></div> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div> <div class="statistics">
<p style="color:#666;margin-bottom:5px;">本月营收</p> <p style="color:#666;margin-bottom:5px;">新增合作伙伴数</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">5656</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newPartners || 0}}</p>
</div> </div>
</div> </a-col>
</a-col> --> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }"> <div class="statistics">
<div class="statistics"> <p style="color:#666;margin-bottom:5px;">推广商铺数量</p>
<p style="color:#666;margin-bottom:5px;">平台总合作伙伴数</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newShop || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.partners || 0}}</p> </div>
</div> </a-col>
</a-col> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }"> <div class="statistics">
<div class="statistics"> <p style="color:#666;margin-bottom:5px;">新增小区数量</p>
<p style="color:#666;margin-bottom:5px;">平台总商铺数量</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newBindCommunity || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.shop || 0}}</p> </div>
</div> </a-col>
</a-col> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }"> <div class="statistics">
<div class="statistics"> <p style="color:#666;margin-bottom:5px;">新增业主数量</p>
<p style="color:#666;margin-bottom:5px;">平台总小区数量</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newBindOwner || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.bindCommunity || 0}}</p> </div>
</div> </a-col>
</a-col> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }"> <div class="statistics">
<div class="statistics"> <p style="color:#666;margin-bottom:5px;">新增订单数量</p>
<p style="color:#666;margin-bottom:5px;">平台总业主数量</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newOrderAmount || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.bindOwner || 0}}</p> </div>
</div> </a-col>
</a-col> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }"> <div class="statistics">
<div class="statistics"> <p style="color:#666;margin-bottom:5px;">商铺平均人流</p>
<p style="color:#666;margin-bottom:5px;">总营收</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.personSvg || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.totalMoney || 0}}</p> </div>
</div> </a-col>
</a-col> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }"> <div class="statistics">
<div class="statistics"> <p style="color:#666;margin-bottom:5px;">总平台分利</p>
<p style="color:#666;margin-bottom:5px;">月营收</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todaySaasMoney || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.monthMoney || 0}}</p> </div>
</div> </a-col>
</a-col> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }"> <div class="statistics">
<div class="statistics"> <p style="color:#666;margin-bottom:5px;">合作伙伴分利</p>
<p style="color:#666;margin-bottom:5px;">日营收</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todayPartnerMoney || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todayMoney || 0}}</p> </div>
</div> </a-col>
</a-col> <a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }"> <div class="statistics">
<div class="statistics"> <p style="color:#666;margin-bottom:5px;">小区分利</p>
<p style="color:#666;margin-bottom:5px;">新增合作伙伴数</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todayCommunityMoney || 0}}</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newPartners || 0}}</p> </div>
</div> </a-col>
</a-col> </a-row>
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">推广商铺数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newShop || 0}}</p>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">新增小区数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newBindCommunity || 0}}</p>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">新增业主数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newBindOwner || 0}}</p>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">新增订单数量</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.newOrderAmount || 0}}</p>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">商铺平均人流</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.personSvg || 0}}</p>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">总平台分利</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todaySaasMoney || 0}}</p>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">合作伙伴分利</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todayPartnerMoney || 0}}</p>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="3" :style="{ marginBottom: '12px' }">
<div class="statistics">
<p style="color:#666;margin-bottom:5px;">小区分利</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{pageData.todayCommunityMoney || 0}}</p>
</div>
</a-col>
</a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '12px' }"> <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '12px' }">
<div class="statistics-box"> <div class="statistics-box">
<h3 class="title">今日成交订单</h3> <h3 class="title">今日成交订单</h3>
<div class="order"> <div class="order" v-if="pageData.shareOrder && pageData.shareOrder.length">
<div class="order-title"> <div class="order-title">
<span style="width: 30%;">订单编号</span> <span style="width: 30%;">订单编号</span>
<span>提交时间</span><span>买家名称</span> <span>提交时间</span><span>买家名称</span>
<span>订单金额</span> <span>订单金额</span>
</div>
<vue-seamless-scroll :data="pageData.shareOrder" class="seamless-warp" :class-option="defineScroll">
<div v-for="(item, index) in pageData.shareOrder" :key="index" class="item">
<span style="width: 30%;">{{ item.order_num }}</span>
<span>{{ item.create_time }}</span>
<span>{{ item.buyer_name }}</span>
<span>¥{{ item.total_money }}</span>
</div> </div>
</vue-seamless-scroll> <vue-seamless-scroll :data="pageData.shareOrder" class="seamless-warp" :class-option="defineScroll">
</div> <div v-for="(item, index) in pageData.shareOrder" :key="index" class="item">
</div> <span style="width: 30%;">{{ item.order_num }}</span>
</a-col> <span>{{ item.create_time }}</span>
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }"> <span>{{ item.buyer_name }}</span>
<div class="statistics-box"> <span>¥{{ item.total_money }}</span>
<h3 class="title">月成交金额</h3> </div>
<line-chart-multid :dataSource="dataList1" :fields="dayFields1" style="padding: 0;" /> </vue-seamless-scroll>
</div> </div>
</a-col> <div v-else style="margin-top:50px">
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }"> <a-empty />
<div class="statistics-box"> </div>
<h3 class="title">月成交订单数量</h3> </div>
<line-chart-multid :dataSource="dataList2" :fields="dayFields2" style="padding: 0;" /> </a-col>
</div> <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
</a-col> <div class="statistics-box">
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }"> <h3 class="title">月成交金额</h3>
<div class="statistics-box"> <line-chart-multid :dataSource="dataList1" :fields="dayFields1" style="padding: 0;" />
<h3 class="title">总平台、合作伙伴、商铺分利金额</h3> </div>
<line-chart-multid :dataSource="dividendAmount" :fields="dayFields3" style="padding: 0;" /> </a-col>
</div> <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
</a-col> <div class="statistics-box">
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }"> <h3 class="title">月成交订单数量</h3>
<div class="statistics-box"> <line-chart-multid :dataSource="dataList2" :fields="dayFields2" style="padding: 0;" />
<h3 class="title">合作伙伴新增数量</h3> </div>
<bar :dataSource="dataList3" style="padding:0;" /> </a-col>
</div> <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
</a-col> <div class="statistics-box">
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }"> <h3 class="title">总平台、合作伙伴、商铺分利金额</h3>
<div class="statistics-box"> <line-chart-multid :dataSource="dividendAmount" :fields="dayFields3" style="padding: 0;" />
<h3 class="title">入驻商铺新增数量</h3> </div>
<bar :dataSource="shopByMonthList" style="padding:0;" /> </a-col>
</div> <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
</a-col> <div class="statistics-box">
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }"> <h3 class="title">合作伙伴新增数量</h3>
<div class="statistics-box"> <bar :dataSource="dataList3" style="padding:0;" />
<h3 class="title">巡报订单数量</h3> </div>
<line-chart-multid :dataSource="dataList4" :fields="dayFields4" style="padding: 0;" /> </a-col>
</div> <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
</a-col> <div class="statistics-box">
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }"> <h3 class="title">入驻商铺新增数量</h3>
<div class="statistics-box"> <bar :dataSource="shopByMonthList" style="padding:0;" />
<h3 class="title">巡报订单金额</h3> </div>
<line-chart-multid :dataSource="dataList5" :fields="dayFields5" style="padding: 0;" /> </a-col>
</div> <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
</a-col> <div class="statistics-box">
</a-row> <h3 class="title">巡报订单数量</h3>
</a-card> <template v-if="dataList4.length">
<line-chart-multid :dataSource="dataList4" :fields="dayFields4" style="padding: 0;" />
</template>
<div v-else style="margin-top:50px">
<a-empty />
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
<div class="statistics-box">
<h3 class="title">巡报订单金额</h3>
<template v-if="dataList5.length">
<line-chart-multid :dataSource="dataList5" :fields="dayFields5" style="padding: 0;" />
</template>
<div v-else style="margin-top:50px">
<a-empty />
</div>
</div>
</a-col>
</a-row>
</a-card>
</a-spin>
</template> </template>
<script> <script>
...@@ -273,7 +288,7 @@ export default { ...@@ -273,7 +288,7 @@ export default {
data() { data() {
return { return {
// 表头 // 表头
loading: true, confirmLoading: false,
time: '', time: '',
pageData: {}, pageData: {},
dayFields1: ['月成交金额'], dayFields1: ['月成交金额'],
...@@ -311,6 +326,7 @@ export default { ...@@ -311,6 +326,7 @@ export default {
this.getDataStatistics() this.getDataStatistics()
}, },
async getDataStatistics() { async getDataStatistics() {
this.confirmLoading = true
let { result } = await shareBoardApi({ platformType: 'central', date: this.time }) let { result } = await shareBoardApi({ platformType: 'central', date: this.time })
if (result) { if (result) {
this.pageData = {...result} this.pageData = {...result}
...@@ -332,10 +348,12 @@ export default { ...@@ -332,10 +348,12 @@ export default {
y: item.partnerCount y: item.partnerCount
} }
}) || [] }) || []
this.dividendAmount = result.shareSaasByMonth.map(item=> { this.dividendAmount = result.shareSaasByMonth.map((item, index)=> {
return { return {
type: item.MONTH, type: item.MONTH,
月成交订单数量: item.shareMoney 总平台: item.shareMoney,
合作伙伴: result.sharePartnerByMonth[index].shareMoney,
商铺分利金额: result.shareCommunityByMonth[index].shareMoney
} }
}) })
this.shopByMonthList = result.shopByMonth.map((item) => { this.shopByMonthList = result.shopByMonth.map((item) => {
...@@ -357,6 +375,7 @@ export default { ...@@ -357,6 +375,7 @@ export default {
} }
}) || [] }) || []
} }
this.confirmLoading = false
} }
}, },
created() { created() {
......
src/views/dashboard/IndexChart.vue
浏览文件 @ 16794d8f
...@@ -308,16 +308,9 @@ export default { ...@@ -308,16 +308,9 @@ export default {
border: 1px solid #e0dfdf; border: 1px solid #e0dfdf;
display: flex; display: flex;
align-items: center; align-items: center;
padding-left: 20px; justify-content: center;
.icon { .icon {
width: 60px;
height: 60px;
border-radius: 60px;
margin-right: 12px; margin-right: 12px;
display: flex;
text-align: center;
align-items: center;
justify-content: center;
.anticon { .anticon {
font-size: 36px; font-size: 36px;
} }
......
src/views/integral/IntegralDetails.vue
浏览文件 @ 16794d8f
...@@ -69,7 +69,8 @@ ...@@ -69,7 +69,8 @@
@change="handleTableChange" @change="handleTableChange"
> >
<span slot="paymentNo" slot-scope="text, record"> <span slot="paymentNo" slot-scope="text, record">
<span style="color:blue;cursor:pointer" @click="onPayDetail(record.id)">{{record.paymentNo}}</span> <span v-if="record.type === 'payPropertyFee'">{{record.paymentNo}}</span>
<span v-else style="color:blue;cursor:pointer" @click="onPayDetail(record.orderId)">{{record.paymentNo}}</span>
</span> </span>
<span slot="type" slot-scope="text, record"> <span slot="type" slot-scope="text, record">
<span>{{record.type === 'scanQrCodePay' ? '扫码支付' : '抵扣物业费'}}</span> <span>{{record.type === 'scanQrCodePay' ? '扫码支付' : '抵扣物业费'}}</span>
......
src/views/rule/RuleDetails.vue
浏览文件 @ 16794d8f
...@@ -215,8 +215,11 @@ export default { ...@@ -215,8 +215,11 @@ export default {
}, },
validatorRules: { validatorRules: {
ruleName: [{ required: true, message: '请输入分利规则名称', trigger: 'blur' }], ruleName: [{ required: true, message: '请输入分利规则名称', trigger: 'blur' }],
payUsePoints: [{ required: true, message: '请输入积分', trigger: 'blur' }], partnerName: [{ required: true, message: '请选择合作伙伴', trigger: 'change' }],
payGetPoints: [{ required: true, message: '请输入积分', trigger: 'blur' }] shopNum: [{ required: true, message: '请输入商铺数量', trigger: 'change' }],
saasBenefits: [{ required: true, message: '请输入总平台分利', trigger: 'blur' }],
partnerBenefits: [{ required: true, message: '请输入合作伙伴分利', trigger: 'blur' }],
communityBenefits: [{ required: true, message: '请输入小区分利', trigger: 'blur' }]
}, },
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
...@@ -386,43 +389,53 @@ export default { ...@@ -386,43 +389,53 @@ export default {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
let isOk = true let isOk = true
for(let i = 0;i < this.villageDataSource.length;i++) { if(this.model.rangeType === 'all') {
if(this.villageDataSource[i].saasBenefits == null) { if((this.model.saasBenefits + this.model.partnerBenefits + this.model.communityBenefits) > 100) {
isOk = false isOk = false
this.$message.warning(`请输入${this.villageDataSource[i].communityName}小区的总平台分利`); this.$message.warning('分利比率不能大于100%');
break
} }
if(this.villageDataSource[i].partnerBenefits == null) { } else {
isOk = false for(let i = 0;i < this.villageDataSource.length;i++) {
this.$message.warning(`请输入${this.villageDataSource[i].communityName}小区的合作伙伴分利`); if(this.villageDataSource[i].saasBenefits == null) {
break isOk = false
} this.$message.warning(`请输入${this.villageDataSource[i].communityName}小区的总平台分利`);
if(this.villageDataSource[i].communityBenefits == null) { break
isOk = false }
this.$message.warning(`请输入${this.villageDataSource[i].communityName}小区的小区分利`); if(this.villageDataSource[i].partnerBenefits == null) {
break isOk = false
} this.$message.warning(`请输入${this.villageDataSource[i].communityName}小区的合作伙伴分利`);
if((this.villageDataSource[i].communityBenefits + this.villageDataSource[i].communityBenefits + this.villageDataSource[i].communityBenefits) > 100) { break
isOk = false }
this.$message.warning(`${this.villageDataSource[i].communityName}小区的分利比率不能大于100%`); if(this.villageDataSource[i].communityBenefits == null) {
break isOk = false
this.$message.warning(`请输入${this.villageDataSource[i].communityName}小区的小区分利`);
break
}
if((this.villageDataSource[i].saasBenefits + this.villageDataSource[i].partnerBenefits + this.villageDataSource[i].communityBenefits) > 100) {
isOk = false
this.$message.warning(`${this.villageDataSource[i].communityName}小区的分利比率不能大于100%`);
break
}
} }
} }
if(isOk) { if(isOk) {
this.confirmLoading = true this.confirmLoading = true
let shareRuleRefList = this.villageDataSource.map(item=> { let shareRuleRefList = []
return { if(this.model.rangeType === 'point') {
propertyCode: item.platformCode, shareRuleRefList = this.villageDataSource.map(item=> {
propertyName: item.platformName, return {
communityCode: item.communityCode, propertyCode: item.platformCode,
communityName: item.communityName, propertyName: item.platformName,
saasBenefits: item.saasBenefits, communityCode: item.communityCode,
partnerBenefits: item.partnerBenefits, communityName: item.communityName,
communityBenefits: item.communityBenefits, saasBenefits: item.saasBenefits,
shopNum: item.shopNum, partnerBenefits: item.partnerBenefits,
ownerNum: item.ownerNum communityBenefits: item.communityBenefits,
} shopNum: item.shopNum,
}) ownerNum: item.ownerNum
}
})
}
if(this.$route.query.type == '1') { if(this.$route.query.type == '1') {
addRuleDayDetailApi({...this.model, shareRuleRefList}).then(res=> { addRuleDayDetailApi({...this.model, shareRuleRefList}).then(res=> {
this.$message.success(res.message); this.$message.success(res.message);
......
src/views/rule/RuleList.vue
浏览文件 @ 16794d8f
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
> >
<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'">
<span v-if="record.shopNum">{{`总平台 ${record.saasBenefits}% 合作伙伴 ${record.partnerBenefits}% 小区 ${record.communityBenefits}%`}}</span> <span v-if="record.shopNum == null">{{`总平台 ${record.saasBenefits}% 小区 ${record.communityBenefits}%`}}</span>
<span v-else>{{`总平台 ${record.saasBenefits}% 小区 ${record.communityBenefits}%`}}</span> <span v-else>{{`总平台 ${record.saasBenefits}% 合作伙伴 ${record.partnerBenefits}% 小区 ${record.communityBenefits}%`}}</span>
</span> </span>
<span v-else> <span v-else>
<p v-for="item in record.shareRuleRefList" :key="item.id"> <p v-for="item in record.shareRuleRefList" :key="item.id">
...@@ -70,14 +70,17 @@ ...@@ -70,14 +70,17 @@
<span slot="rangNumber" slot-scope="text, record"> <span slot="rangNumber" slot-scope="text, record">
<span>{{record.rangeType === 'all' ? '' : record.shareRuleRefList.length}}</span> <span>{{record.rangeType === 'all' ? '' : record.shareRuleRefList.length}}</span>
</span> </span>
<span slot="shopCount" slot-scope="text, record">
<span>{{record.shopNum == null ? '' : ('>' + record.shopNum)}}</span>
</span>
<span slot="status" slot-scope="text, record"> <span slot="status" slot-scope="text, record">
<a-switch :disabled="record.rangeType === 'all'" checked-children="启用" un-checked-children="冻结" v-model="record.statusBoolean" @change="flag=>onStatusChange(flag, record)" /> <a-switch :disabled="record.shopNum == null" checked-children="启用" un-checked-children="冻结" v-model="record.statusBoolean" @change="flag=>onStatusChange(flag, record)" />
</span> </span>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a href="javascript:;" @click="propertyDetails(2, record)">编辑</a> <a href="javascript:;" @click="propertyDetails(2, record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a href="javascript:;" @click="propertyDetails(3, record)">查看</a> <a href="javascript:;" @click="propertyDetails(3, record)">查看</a>
<template v-if="!!record.shopNum"> <template v-if="record.shopNum !== null">
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
...@@ -136,6 +139,13 @@ const columns = [ ...@@ -136,6 +139,13 @@ const columns = [
align: 'center', align: 'center',
scopedSlots: { customRender: 'rangNumber' } scopedSlots: { customRender: 'rangNumber' }
}, },
{
title: '商铺数量',
dataIndex: 'shopCount',
key: 'shopCount',
align: 'center',
scopedSlots: { customRender: 'shopCount' }
},
{ {
title: '添加时间', title: '添加时间',
dataIndex: 'createTime', dataIndex: 'createTime',
...@@ -188,7 +198,7 @@ export default { ...@@ -188,7 +198,7 @@ export default {
}, },
methods: { methods: {
propertyDetails(type, row) { propertyDetails(type, row) {
if(row && !row.shopNum) { if(row && row.shopNum == null) {
if(type === 2) { if(type === 2) {
this.handleEdit(row) this.handleEdit(row)
} else { } else {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论