Skip to content

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

修改二期bug

上级 f7f963ce
显示空白字符变更
内嵌 并排
正在显示 包含 65 行增加 和 26 行删除
.env.development
浏览文件 @ 16794d8f
NODE_ENV=development
# 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://220.203.25.212:9998'
# VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
# VUE_APP_API_BASE_URL='http://220.203.25.212:9999'
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
......
src/views/benefits/settlement/SettlementDetails.vue
浏览文件 @ 16794d8f
......@@ -126,7 +126,7 @@
<script>
import { getshareBalanceApi, auditshareBalanceApi } from '@/api/api'
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'
const columns = [
......@@ -159,6 +159,9 @@ const columns = [
dataIndex: 'payWay',
key: 'payWay',
align: 'center',
customRender: function (text) {
return filterDictTextByStatic(PAY_WAY, text)
}
},
{
title: '订单来源',
......
src/views/benefitsAudit/reconciliation/modules/PropertyAdvForm.vue
浏览文件 @ 16794d8f
......@@ -79,7 +79,7 @@
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record, {totalMoneyName: `¥${record.totalMoney}`, remarks: ''});
this.model = Object.assign({}, record, {totalMoneyName: `¥${record.shareMoney}`, remarks: ''});
this.visible = true;
},
submitForm () {
......
src/views/bulletin/board.vue
浏览文件 @ 16794d8f
<template>
<a-spin :spinning="confirmLoading">
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
......@@ -194,7 +195,7 @@
<div class="statistics-box">
<h3 class="title">今日成交订单</h3>
<div class="order">
<div class="order" v-if="pageData.shareOrder && pageData.shareOrder.length">
<div class="order-title">
<span style="width: 30%;">订单编号</span>
<span>提交时间</span><span>买家名称</span>
......@@ -209,6 +210,9 @@
</div>
</vue-seamless-scroll>
</div>
<div v-else style="margin-top:50px">
<a-empty />
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
......@@ -244,17 +248,28 @@
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
<div class="statistics-box">
<h3 class="title">巡报订单数量</h3>
<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>
<script>
......@@ -273,7 +288,7 @@ export default {
data() {
return {
// 表头
loading: true,
confirmLoading: false,
time: '',
pageData: {},
dayFields1: ['月成交金额'],
......@@ -311,6 +326,7 @@ export default {
this.getDataStatistics()
},
async getDataStatistics() {
this.confirmLoading = true
let { result } = await shareBoardApi({ platformType: 'central', date: this.time })
if (result) {
this.pageData = {...result}
......@@ -332,10 +348,12 @@ export default {
y: item.partnerCount
}
}) || []
this.dividendAmount = result.shareSaasByMonth.map(item=> {
this.dividendAmount = result.shareSaasByMonth.map((item, index)=> {
return {
type: item.MONTH,
月成交订单数量: item.shareMoney
总平台: item.shareMoney,
合作伙伴: result.sharePartnerByMonth[index].shareMoney,
商铺分利金额: result.shareCommunityByMonth[index].shareMoney
}
})
this.shopByMonthList = result.shopByMonth.map((item) => {
......@@ -357,6 +375,7 @@ export default {
}
}) || []
}
this.confirmLoading = false
}
},
created() {
......
src/views/dashboard/IndexChart.vue
浏览文件 @ 16794d8f
......@@ -308,16 +308,9 @@ export default {
border: 1px solid #e0dfdf;
display: flex;
align-items: center;
padding-left: 20px;
justify-content: center;
.icon {
width: 60px;
height: 60px;
border-radius: 60px;
margin-right: 12px;
display: flex;
text-align: center;
align-items: center;
justify-content: center;
.anticon {
font-size: 36px;
}
......
src/views/integral/IntegralDetails.vue
浏览文件 @ 16794d8f
......@@ -69,7 +69,8 @@
@change="handleTableChange"
>
<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 slot="type" slot-scope="text, record">
<span>{{record.type === 'scanQrCodePay' ? '扫码支付' : '抵扣物业费'}}</span>
......
src/views/rule/RuleDetails.vue
浏览文件 @ 16794d8f
......@@ -215,8 +215,11 @@ export default {
},
validatorRules: {
ruleName: [{ required: true, message: '请输入分利规则名称', trigger: 'blur' }],
payUsePoints: [{ required: true, message: '请输入积分', trigger: 'blur' }],
payGetPoints: [{ required: true, message: '请输入积分', trigger: 'blur' }]
partnerName: [{ required: true, message: '请选择合作伙伴', trigger: 'change' }],
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: {
xs: { span: 24 },
......@@ -386,6 +389,12 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
let isOk = true
if(this.model.rangeType === 'all') {
if((this.model.saasBenefits + this.model.partnerBenefits + this.model.communityBenefits) > 100) {
isOk = false
this.$message.warning('分利比率不能大于100%');
}
} else {
for(let i = 0;i < this.villageDataSource.length;i++) {
if(this.villageDataSource[i].saasBenefits == null) {
isOk = false
......@@ -402,15 +411,18 @@ export default {
this.$message.warning(`请输入${this.villageDataSource[i].communityName}小区的小区分利`);
break
}
if((this.villageDataSource[i].communityBenefits + this.villageDataSource[i].communityBenefits + this.villageDataSource[i].communityBenefits) > 100) {
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) {
this.confirmLoading = true
let shareRuleRefList = this.villageDataSource.map(item=> {
let shareRuleRefList = []
if(this.model.rangeType === 'point') {
shareRuleRefList = this.villageDataSource.map(item=> {
return {
propertyCode: item.platformCode,
propertyName: item.platformName,
......@@ -423,6 +435,7 @@ export default {
ownerNum: item.ownerNum
}
})
}
if(this.$route.query.type == '1') {
addRuleDayDetailApi({...this.model, shareRuleRefList}).then(res=> {
this.$message.success(res.message);
......
src/views/rule/RuleList.vue
浏览文件 @ 16794d8f
......@@ -54,8 +54,8 @@
>
<span slot="reconciliationAmount" slot-scope="text, record">
<span v-if="record.rangeType === 'all'">
<span v-if="record.shopNum">{{`总平台 ${record.saasBenefits}% 合作伙伴 ${record.partnerBenefits}% 小区 ${record.communityBenefits}%`}}</span>
<span v-else>{{`总平台 ${record.saasBenefits}% 小区 ${record.communityBenefits}%`}}</span>
<span v-if="record.shopNum == null">{{`总平台 ${record.saasBenefits}% 小区 ${record.communityBenefits}%`}}</span>
<span v-else>{{`总平台 ${record.saasBenefits}% 合作伙伴 ${record.partnerBenefits}% 小区 ${record.communityBenefits}%`}}</span>
</span>
<span v-else>
<p v-for="item in record.shareRuleRefList" :key="item.id">
......@@ -70,14 +70,17 @@
<span slot="rangNumber" slot-scope="text, record">
<span>{{record.rangeType === 'all' ? '' : record.shareRuleRefList.length}}</span>
</span>
<span slot="shopCount" slot-scope="text, record">
<span>{{record.shopNum == null ? '' : ('>' + record.shopNum)}}</span>
</span>
<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 slot="action" slot-scope="text, record">
<a href="javascript:;" @click="propertyDetails(2, record)">编辑</a>
<a-divider type="vertical" />
<a href="javascript:;" @click="propertyDetails(3, record)">查看</a>
<template v-if="!!record.shopNum">
<template v-if="record.shopNum !== null">
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
......@@ -136,6 +139,13 @@ const columns = [
align: 'center',
scopedSlots: { customRender: 'rangNumber' }
},
{
title: '商铺数量',
dataIndex: 'shopCount',
key: 'shopCount',
align: 'center',
scopedSlots: { customRender: 'shopCount' }
},
{
title: '添加时间',
dataIndex: 'createTime',
......@@ -188,7 +198,7 @@ export default {
},
methods: {
propertyDetails(type, row) {
if(row && !row.shopNum) {
if(row && row.shopNum == null) {
if(type === 2) {
this.handleEdit(row)
} else {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论