Skip to content

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

修改二期bug

上级 708998e0
隐藏空白字符变更
内嵌 并排
正在显示 包含 150 行增加 和 42 行删除
.env.development
浏览文件 @ 687549aa
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.106:9999' # VUE_APP_API_BASE_URL='http://192.168.0.106: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/reconciliation/ReconciliationList.vue
浏览文件 @ 687549aa
...@@ -69,6 +69,15 @@ ...@@ -69,6 +69,15 @@
@change="handleTableChange" @change="handleTableChange"
> >
<span slot="orderSource">小程序</span> <span slot="orderSource">小程序</span>
<span slot="communityName" slot-scope="text, record">
<span>{{record.platformType === 'company' ? record.communityName : ''}}</span>
</span>
<span slot="partnersName" slot-scope="text, record">
<span>{{record.platformType === 'partner' ? record.partnersName : ''}}</span>
</span>
<span slot="shopName" slot-scope="text, record">
<span>{{record.platformType === 'shop' ? record.shopName : ''}}</span>
</span>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a href="javascript:;" @click="propertyDetails(1, record.id)">详情</a> <a href="javascript:;" @click="propertyDetails(1, record.id)">详情</a>
...@@ -135,7 +144,7 @@ const columns = [ ...@@ -135,7 +144,7 @@ const columns = [
dataIndex: 'orderSource', dataIndex: 'orderSource',
key: 'orderSource', key: 'orderSource',
align: 'center', align: 'center',
scopedSlots: { customRender: 'orderSource' }, scopedSlots: { customRender: 'orderSource' }
}, },
{ {
title: '订单状态', title: '订单状态',
...@@ -163,18 +172,21 @@ const columns = [ ...@@ -163,18 +172,21 @@ const columns = [
dataIndex: 'communityName', dataIndex: 'communityName',
key: 'communityName', key: 'communityName',
align: 'center', align: 'center',
scopedSlots: { customRender: 'communityName' }
}, },
{ {
title: '合作伙伴', title: '合作伙伴',
dataIndex: 'partnersName', dataIndex: 'partnersName',
key: 'partnersName', key: 'partnersName',
align: 'center', align: 'center',
scopedSlots: { customRender: 'partnersName' }
}, },
{ {
title: '商铺', title: '商铺',
dataIndex: 'shopName', dataIndex: 'shopName',
key: 'shopName', key: 'shopName',
align: 'center', align: 'center',
scopedSlots: { customRender: 'shopName' }
}, },
{ {
title: '操作', title: '操作',
......
src/views/benefits/settlement/SettlementList.vue
浏览文件 @ 687549aa
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :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.balanceStatus" placeholder="请选择状态">
<a-select-option v-for="item in auditList" :key="item.value" :value="item.value">{{item.label}}</a-select-option> <a-select-option v-for="item in auditList" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
......
src/views/benefitsAudit/reconciliation/ReconciliationDetails.vue
浏览文件 @ 687549aa
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<a-input v-model="model.propertyName" placeholder="请输入所属平台"></a-input> <a-input v-model="model.propertyName" 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="communityName"> <a-form-model-item label="所属小区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="communityName">
<a-input v-model="model.communityName" placeholder="请输入所属小区"></a-input> <a-input v-model="model.communityName" placeholder="请输入所属小区"></a-input>
</a-form-model-item> </a-form-model-item>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<a-form-model-item label="合作伙伴" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partnersName"> <a-form-model-item label="合作伙伴" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partnersName">
<a-input v-model="model.partnersName" placeholder="请输入所属小区"></a-input> <a-input v-model="model.partnersName" 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="{ xs: { span: 24 }, sm: { span: 3 } }" :wrapperCol="wrapperCol" prop="remarks"> <a-form-model-item label="备注" :labelCol="{ xs: { span: 24 }, sm: { span: 3 } }" :wrapperCol="wrapperCol" prop="remarks">
<a-input v-model="model.remarks" placeholder="请输入备注"></a-input> <a-input v-model="model.remarks" placeholder="请输入备注"></a-input>
......
src/views/benefitsAudit/reconciliation/ReconciliationList.vue
浏览文件 @ 687549aa
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :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.balanceStatus" placeholder="请选择状态">
<a-select-option v-for="item in auditList" :key="item.value" :value="item.value">{{item.label}}</a-select-option> <a-select-option v-for="item in auditList" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
...@@ -110,6 +110,12 @@ const columns = [ ...@@ -110,6 +110,12 @@ const columns = [
key: 'totalMoney', key: 'totalMoney',
align: 'center', align: 'center',
}, },
{
title: '分利金额',
dataIndex: 'shareMoney',
key: 'shareMoney',
align: 'center',
},
{ {
title: '支付方式', title: '支付方式',
dataIndex: 'payWay', dataIndex: 'payWay',
...@@ -147,24 +153,6 @@ const columns = [ ...@@ -147,24 +153,6 @@ const columns = [
key: 'propertyName', key: 'propertyName',
align: 'center', align: 'center',
}, },
{
title: '所属小区',
dataIndex: 'communityName',
key: 'communityName',
align: 'center',
},
{
title: '合作伙伴',
dataIndex: 'partnersName',
key: 'partnersName',
align: 'center',
},
{
title: '商铺',
dataIndex: 'shopName',
key: 'shopName',
align: 'center',
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
......
src/views/benefitsAudit/settlement/SettlementDetails.vue
浏览文件 @ 687549aa
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<script> <script>
import { getshareBalanceApi } from '@/api/api' import { getshareBalanceApi } from '@/api/api'
import { httpAction, getAction } from '@/api/manage' import { httpAction, getAction } from '@/api/manage'
import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS } from '@/assets/static.js' import { filterDictTextByStatic, FENLICENTRAL_AUDIT_STATUS, PAY_WAY } from '@/assets/static.js'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import PropertyAdvModal from './modules/PropertyAdvModal' import PropertyAdvModal from './modules/PropertyAdvModal'
...@@ -145,11 +145,20 @@ const columns = [ ...@@ -145,11 +145,20 @@ const columns = [
key: 'totalMoney', key: 'totalMoney',
align: 'center', align: 'center',
}, },
{
title: '分利金额',
dataIndex: 'shareMoney',
key: 'shareMoney',
align: 'center',
},
{ {
title: '支付方式', title: '支付方式',
dataIndex: 'payWay', dataIndex: 'payWay',
key: 'payWay', key: 'payWay',
align: 'center', align: 'center',
customRender: function (text) {
return filterDictTextByStatic(PAY_WAY, text)
}
}, },
{ {
title: '订单来源', title: '订单来源',
...@@ -257,7 +266,7 @@ export default { ...@@ -257,7 +266,7 @@ export default {
computed: { computed: {
totalMoney() { totalMoney() {
return this.selectionRows.reduce((prev,cur,index,arr)=> { return this.selectionRows.reduce((prev,cur,index,arr)=> {
return parseFloat((prev + cur.totalMoney).toFixed(2)) return parseFloat((prev + cur.shareMoney).toFixed(2))
}, 0) }, 0)
} }
}, },
......
src/views/benefitsAudit/settlement/SettlementList.vue
浏览文件 @ 687549aa
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :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.balanceStatus" placeholder="请选择状态">
<a-select-option v-for="item in auditList" :key="item.value" :value="item.value">{{item.label}}</a-select-option> <a-select-option v-for="item in auditList" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
......
src/views/bulletin/board.vue
浏览文件 @ 687549aa
...@@ -4,10 +4,8 @@ ...@@ -4,10 +4,8 @@
<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="8" :sm="8"> <a-col :md="6" :sm="6">
<a-form-item label="日期"> <a-month-picker style="width:100%" placeholder="选择日期" valueFormat="YYYYMM" v-model="time" />
<a-range-picker format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model="dataRangeList" />
</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">
<a-col :md="6" :sm="6"> <a-col :md="6" :sm="6">
...@@ -19,8 +17,8 @@ ...@@ -19,8 +17,8 @@
</a-form> </a-form>
</div> </div>
<a-row :gutter="24"> <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>
...@@ -92,11 +90,107 @@ ...@@ -92,11 +90,107 @@
<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;">5656</p>
</div> </div>
</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</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;">56</p>
</div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }"> <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>
...@@ -178,7 +272,6 @@ export default { ...@@ -178,7 +272,6 @@ export default {
}, },
data() { data() {
return { return {
dataRangeList: ['2023-01-01', '2023-08-01'],
// 表头 // 表头
loading: true, loading: true,
time: '', time: '',
...@@ -207,11 +300,15 @@ export default { ...@@ -207,11 +300,15 @@ export default {
} }
}, },
methods: { methods: {
searchQuery() {}, searchQuery() {
searchReset() {}, this.getDataStatistics()
},
searchReset() {
this.time = ''
this.getDataStatistics()
},
async getDataStatistics() { async getDataStatistics() {
let { result } = await shareBoardApi({ platformType: 'community', date: this.time }) let { result } = await shareBoardApi({ platformType: 'central', date: this.time })
if (result) { if (result) {
this.data = result this.data = result
this.dataList1 = this.dataList1 =
...@@ -268,8 +365,10 @@ export default { ...@@ -268,8 +365,10 @@ export default {
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #e0dfdf; border: 1px solid #e0dfdf;
display: flex; display: flex;
flex-direction: column;
align-items: center; align-items: center;
padding-left: 20px; justify-content: center;
// padding-left: 20px;
.icon { .icon {
width: 60px; width: 60px;
height: 60px; height: 60px;
......
src/views/rule/RuleDetails.vue
浏览文件 @ 687549aa
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<!-- <a-input style="width: 50%" placeholder="商铺数量" v-model="model.shopNum" /> --> <!-- <a-input style="width: 50%" placeholder="商铺数量" v-model="model.shopNum" /> -->
<a-input-number <a-input-number
v-model="model.shopNum" v-model="model.shopNum"
:min="1" :min="0"
placeholder="商铺数量" placeholder="商铺数量"
style="width:150px" style="width:150px"
/> />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论