Skip to content

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

7.25

上级 cc8c2a5e
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 253 行增加 和 206 行删除
src/views/benefiting/SettlementDetails.vue
浏览文件 @ e65d223b
...@@ -49,12 +49,12 @@ ...@@ -49,12 +49,12 @@
</a-form-model> </a-form-model>
</j-form-container> </j-form-container>
<a-card title="对账信息" style="margin-top: 10px;"> <a-card title="对账信息" style="margin-top: 10px;">
<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">
</a-table> </a-table>
</div> </div>
</a-card> </a-card>
</a-spin> </a-spin>
</template> </template>
...@@ -67,68 +67,72 @@ import { httpAction, getAction } from '@/api/manage' ...@@ -67,68 +67,72 @@ import { httpAction, getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
const columns = [ const columns = [
{ {
title: '订单编号', title: '订单编号',
dataIndex: 'propertyName', dataIndex: 'id',
key: 'propertyName', key: 'id',
align: 'center', align: 'center',
}, },
{ {
title: '提交时间', title: '提交时间',
dataIndex: 'creditCode',
key: 'creditCode',
align: 'center',
},
{
title: '用户账号',
dataIndex: 'reconciliationBeginDate', dataIndex: 'reconciliationBeginDate',
key: 'reconciliationBeginDate', key: 'reconciliationBeginDate',
align: 'center', align: 'center',
}, },
{ {
title: '订单金额', title: '用户账号',
dataIndex: 'reaship', dataIndex: 'creditCode',
key: 'reaship', key: 'creditCode',
align: 'center', align: 'center',
}, },
{ {
title: '支付方式', title: '分利金额',
dataIndex: 'reconcilname', dataIndex: 'propertyName',
key: 'reconcilname', key: 'propertyName',
align: 'center', align: 'center',
}, },
{ {
title: '订单来源', title: '支付方式',
dataIndex: 'reconciliationEndDate', dataIndex: 'reconciliationEndDate',
key: 'reconciliationEndDate', key: 'reconciliationEndDate',
align: 'center', align: 'center',
}, },
{ {
title: '订单状态', title: '订单来源',
dataIndex: 'reconciliationAmount', dataIndex: 'reconciliationAmount',
key: 'reconciliationAmount', key: 'reconciliationAmount',
align: 'center', align: 'center',
}, },
{ {
title: '备注', title: '订单状态',
dataIndex: 'updateTime', dataIndex: 'updateTime',
key: 'updateTime', key: 'updateTime',
align: 'center', align: 'center',
}, },
{ {
title: '所属平台', title: '备注',
dataIndex: 'empowerCommunityNum', dataIndex: 'empowerCommunityNum',
key: 'empowerCommunityNum', key: 'empowerCommunityNum',
align: 'center',
}, },
{ {
title: '所属小区', title: '所属平台',
dataIndex: 'auditStatus', dataIndex: 'auditStatus',
key: 'auditStatus', key: 'auditStatus',
align: 'center',
},
{
title: '所属小区',
dataIndex: 'companyAuditStatus',
key: 'companyAuditStatus',
// customRender: function (text) {
// return filterDictTextByCache('companyAuditStatus', text)
// },
}, },
] ]
export default { export default {
name: 'PropertySettledForm', name: 'SettlementDetails',
inject: ['closeCurrent'], inject: ['closeCurrent'],
mixins: [JeecgListMixin], mixins: [JeecgListMixin],
data() { data() {
...@@ -165,64 +169,52 @@ export default { ...@@ -165,64 +169,52 @@ export default {
loading: false, loading: false,
dataSource: [ dataSource: [
{ {
propertyName: '汉江之星小区', id: 'JD2394231',
creditCode: '物业费', creditCode: '18000000000',
reconciliationBeginDate: '张飒，15198765634', propertyName: 20000,
reaship: '租户', reconciliationBeginDate: '2023-01-01',
reconcilname: '李白，15165245634', reconciliationEndDate: '微信',
reconciliationEndDate: '2栋2单元101', reconciliationAmount: '小程序',
reconciliationAmount: '345.23', updateTime: '未对账',
updateTime: '2023-04-05', empowerCommunityNum: '备注',
empowerCommunityNum: 'LD23423843223', auditStatus: 'XXX物业集团',
auditStatus: '2023-05-06', companyAuditStatus: '花园小区',
},
{
propertyName: '汉江之星小区',
creditCode: '水费',
reconciliationBeginDate: '李生，1515235634',
reaship: '本人',
reconcilname: '李生，1515235634',
reconciliationEndDate: '1栋2单元301',
reconciliationAmount: '1345.45',
updateTime: '2023-05-05',
empowerCommunityNum: 'DFG2342342323',
auditStatus: '2023-05-16',
}, },
{ {
propertyName: '汉江之星小区', id: 'JD2394232',
creditCode: '电费', creditCode: '18000000000',
reconciliationBeginDate: '李丽，19812348976', propertyName: 20000,
reaship: '租户', reconciliationBeginDate: '2023-01-01',
reconcilname: '张飒，15198765634', reconciliationEndDate: '微信',
reconciliationEndDate: '9栋1单元401', reconciliationAmount: '小程序',
reconciliationAmount: '34234', updateTime: '未对账',
updateTime: '2023-02-06', empowerCommunityNum: '备注',
empowerCommunityNum: 'JTR323422', auditStatus: 'XXX物业集团',
auditStatus: '2023-03-06', companyAuditStatus: '花园小区',
}, },
{ {
propertyName: '汉江之星小区', id: 'JD2394233',
creditCode: '水费', creditCode: '18000000000',
reconciliationBeginDate: '张盛，1890987567', propertyName: 20000,
reaship: '本人', reconciliationBeginDate: '2023-01-01',
reconcilname: '张盛，1890987567', reconciliationEndDate: '微信',
reconciliationEndDate: '4栋2单元403', reconciliationAmount: '小程序',
reconciliationAmount: '34', updateTime: '未对账',
updateTime: '2023-06-07', empowerCommunityNum: '备注',
empowerCommunityNum: 'DFGD32423423', auditStatus: 'XXX物业集团',
auditStatus: '2023-04-23', companyAuditStatus: '花园小区',
}, },
{ {
propertyName: '汉江之星小区', id: 'JD2394234',
creditCode: '燃气费', creditCode: '18000000000',
reconciliationBeginDate: '李婷婷，18809875634', propertyName: 20000,
reaship: '租户', reconciliationBeginDate: '2023-01-01',
reconcilname: '话梅，15198765634', reconciliationEndDate: '微信',
reconciliationEndDate: '9栋2单元1201', reconciliationAmount: '小程序',
reconciliationAmount: '654', updateTime: '未对账',
updateTime: '2023-05-06', empowerCommunityNum: '备注',
empowerCommunityNum: 'FDBEWRW2342342', auditStatus: 'XXX物业集团',
auditStatus: '2023-06-26', companyAuditStatus: '花园小区',
}, },
], ],
} }
......
src/views/benefiting/SettlementList.vue
浏览文件 @ e65d223b
...@@ -87,9 +87,8 @@ ...@@ -87,9 +87,8 @@
</template> </template>
<script> <script>
import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api' //import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JThirdAppButton from '../../components/jeecgbiz/thirdApp/JThirdAppButton.vue'
const columns = [ const columns = [
{ {
...@@ -152,8 +151,8 @@ const columns = [ ...@@ -152,8 +151,8 @@ const columns = [
] ]
export default { export default {
components: { JThirdAppButton }, components: { },
name: 'PermissionListAsync', name: 'SettlementList',
mixins: [JeecgListMixin], mixins: [JeecgListMixin],
data() { data() {
return { return {
...@@ -174,111 +173,111 @@ export default { ...@@ -174,111 +173,111 @@ export default {
dataSource: [ dataSource: [
{ {
id: 'JD239423', id: 'JD239423',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '2000', propertyName: '2000',
reconciliationBeginDate: '2023-01-01', reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '5', reconciliationEndDate: '5',
reconciliationAmount: '345.23', reconciliationAmount: '345.23',
updateTime: '2023-04-05', updateTime: '2023-04-05',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '已结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'JD453454', id: 'JD453454',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '2000', propertyName: '2000',
reconciliationBeginDate: '2023-04-06', reconciliationBeginDate: '2023-04-06',
reconciliationEndDate: '2023-06-03', reconciliationEndDate: '10',
reconciliationAmount: '1345.45', reconciliationAmount: '1345.45',
updateTime: '2023-05-05', updateTime: '2023-05-05',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '已结算',
companyAuditStatus: '审核通过', companyAuditStatus: '微信',
}, },
{ {
id: 'JD567454', id: 'JD567454',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '2000', propertyName: '2000',
reconciliationBeginDate: '2023-02-05', reconciliationBeginDate: '2023-02-05',
reconciliationEndDate: '2023-02-23', reconciliationEndDate: '2',
reconciliationAmount: '34234', reconciliationAmount: '34234',
updateTime: '2023-02-06', updateTime: '2023-02-06',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '待审核', auditStatus: '未结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'KF343455', id: 'KF343455',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '2000', propertyName: '2000',
reconciliationBeginDate: '2022-11-01', reconciliationBeginDate: '2022-11-01',
reconciliationEndDate: '2023-01-03', reconciliationEndDate: '3',
reconciliationAmount: '34', reconciliationAmount: '34',
updateTime: '2023-06-07', updateTime: '2023-06-07',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '已结算',
companyAuditStatus: '审核通过', companyAuditStatus: '微信',
}, },
{ {
id: 'KD435345', id: 'KD435345',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '2000', propertyName: '2000',
reconciliationBeginDate: '2022-01-21', reconciliationBeginDate: '2022-01-21',
reconciliationEndDate: '2022-10-03', reconciliationEndDate: '3',
reconciliationAmount: '654', reconciliationAmount: '654',
updateTime: '2023-05-06', updateTime: '2023-05-06',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '待审核', auditStatus: '未结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'LG345352', id: 'LG345352',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '2000', propertyName: '2000',
reconciliationBeginDate: '2022-01-10', reconciliationBeginDate: '2022-01-10',
reconciliationEndDate: '2022-02-03', reconciliationEndDate: '20',
reconciliationAmount: '897.98', reconciliationAmount: '897.98',
updateTime: '2023-05-08', updateTime: '2023-05-08',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '待审核', auditStatus: '未结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'MG345354', id: 'MG345354',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '2000', propertyName: '2000',
reconciliationBeginDate: '2023-01-04', reconciliationBeginDate: '2023-01-04',
reconciliationEndDate: '2023-06-03', reconciliationEndDate: '20',
reconciliationAmount: '234', reconciliationAmount: '234',
updateTime: '2023-05-05', updateTime: '2023-05-05',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '未结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'LB345353', id: 'LB345353',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '2000', propertyName: '2000',
reconciliationBeginDate: '2023-02-01', reconciliationBeginDate: '2023-02-01',
reconciliationEndDate: '2023-05-03', reconciliationEndDate: '2',
reconciliationAmount: '1000', reconciliationAmount: '1000',
updateTime: '2023-04-04', updateTime: '2023-04-04',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '未结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'LC234234', id: 'LC234234',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '2000', propertyName: '2000',
reconciliationBeginDate: '2023-01-23', reconciliationBeginDate: '2023-01-23',
reconciliationEndDate: '5', reconciliationEndDate: '5',
reconciliationAmount: '3443', reconciliationAmount: '3443',
updateTime: '2023-01-02', updateTime: '2023-01-02',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '未结算',
companyAuditStatus: '审核通过', companyAuditStatus: '转账',
}, },
], ],
visibleReconciliation: false, visibleReconciliation: false,
......
src/views/community/CommunityLlist.vue
浏览文件 @ e65d223b
...@@ -22,9 +22,11 @@ ...@@ -22,9 +22,11 @@
<!-- 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" :dataSource="dataSource1" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
class="j-table-force-nowrap"
@change="handleTableChange"> @change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a type="primary" @click="onStatus(record)">解绑/绑定</a>
</span>
</a-table> </a-table>
</div> </div>
</a-card> </a-card>
...@@ -34,72 +36,98 @@ ...@@ -34,72 +36,98 @@
import { mixinDevice } from '@/utils/mixin' import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default { export default {
name: 'PropertyAdvList', name: 'CommunityLlist',
mixins: [JeecgListMixin, mixinDevice], mixins: [JeecgListMixin, mixinDevice],
data() { data() {
return { return {
columns: [ columns: [
{ {
title: '#', title: '#',
dataIndex: '', dataIndex: '',
key:'rowIndex', key: 'rowIndex',
width:60, width: 60,
align:"center", align: 'center',
customRender:function (t,r,index) { customRender: function (t, r, index) {
return parseInt(index)+1; return parseInt(index) + 1
} },
}, },
{ {
title: '小区名称', title: '小区名称',
align: 'center', align: 'center',
dataIndex: 'advName', dataIndex: 'name',
}, },
{ {
title: '所属区域', title: '所属区域',
align: 'center', align: 'center',
dataIndex: 'advPosition', dataIndex: 'domain',
}, },
{ {
title: '占地面积（m2）', title: '占地面积（m2）',
align: 'center', align: 'center',
dataIndex: 'id', dataIndex: 'area',
}, },
{ {
title: '总栋数', title: '总栋数',
align: 'center', align: 'center',
dataIndex: 'advStartDate', dataIndex: 'num1',
}, },
{ {
title: '房屋数量', title: '房屋数量',
align: 'center', align: 'center',
dataIndex: 'advUrl', dataIndex: 'num2',
}, },
{ {
title: '商铺数量', title: '商铺数量',
align: 'center', align: 'center',
dataIndex: 'createTime', dataIndex: 'num3',
}, },
{ {
title: '联系人', title: '联系人',
align: 'center', align: 'center',
dataIndex: 'createBy', dataIndex: 'name1',
}, },
{ {
title: '详细地址', title: '详细地址',
dataIndex: 'onshelfStatus', dataIndex: 'add',
align: 'center', align: 'center',
}, },
{
title: '操作',
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: 'center',
fixed: 'right',
width: 150,
},
],
dataSource1:[
{name:'汉江之星小区',domain:'汉江',area:3000,num1:10,num2:20,num3:30,name1:'李四',add:'武汉市'}
], ],
url: { url: {
list: '/property-central/property/propertyAdv/list', list: '/property-central/property/propertyAdv/list',
}, },
dictOptions: [] dictOptions: [],
} }
}, },
created() { created() {},
},
methods: { methods: {
onStatus(record) {
let that = this
this.$confirm({
title: `确认${record.propertyStatus === 'normal' ? '绑定' : '解绑'}此小区?`,
closable: true,
okText: `${record.propertyStatus === 'normal' ? '绑定' : '解绑'}`,
onOk() {
// return freezeOrPropertyApi({
// id: record.id,
// status: `${record.propertyStatus === 'normal' ? 'freeze' : 'normal'}`,
// }).then((res) => {
// that.searchQuery()
// })
},
onCancel() {},
})
},
}, },
} }
</script> </script>
......
src/views/dashboard/IndexChart.vue
浏览文件 @ e65d223b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<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;">{{statistical.settledNum}} <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{statistical.settledNum}}
<span v-if="statistical.monthSettledNum > 0"><a-icon type="arrow-up" <span><a-icon type="arrow-up"
color="#1890ff" />{{ statistical.monthSettledNum }}</span> color="#1890ff" />{{ statistical.monthSettledNum }}</span>
</p> </p>
</div> </div>
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
<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;">{{statistical.ownerNum}} <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">{{statistical.ownerNum}}
<span v-if="statistical.monthOwnerNum > 0"><a-icon type="arrow-up"
color="#1890ff" />{{ statistical.monthOwnerNum }}</span>
</p> </p>
</div> </div>
</div> </div>
......
src/views/shops/ShopsDetails.vue
浏览文件 @ e65d223b
...@@ -167,7 +167,7 @@ import SelectCommunityModal from './modules/SelectCommunityModal' ...@@ -167,7 +167,7 @@ import SelectCommunityModal from './modules/SelectCommunityModal'
import SelectShopsModal from './modules/SelectShopsModal' import SelectShopsModal from './modules/SelectShopsModal'
export default { export default {
name: 'PropertySettledForm', name: 'ShopsDetails',
inject: ['closeCurrent'], inject: ['closeCurrent'],
components: { components: {
SelectCommunityModal, SelectCommunityModal,
......
src/views/shops/ShopsList.vue
浏览文件 @ e65d223b
...@@ -66,9 +66,8 @@ ...@@ -66,9 +66,8 @@
</template> </template>
<script> <script>
import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api' //import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { filterDictTextByCache } from '@/components/dict/JDictSelectUtil' import { filterDictTextByCache } from '@/components/dict/JDictSelectUtil'
const columns = [ const columns = [
...@@ -98,8 +97,8 @@ const columns = [ ...@@ -98,8 +97,8 @@ const columns = [
}, },
{ {
title: '分利', title: '分利',
dataIndex: 'empowerEndDate', dataIndex: 'registCapital',
scopedSlots: { customRender: 'empowerEndDate' }, key: 'registCapital',
align: 'center', align: 'center',
}, },
{ {
...@@ -134,7 +133,7 @@ const columns = [ ...@@ -134,7 +133,7 @@ const columns = [
] ]
export default { export default {
name: 'PermissionListAsync', name: 'ShopsList',
mixins: [JeecgListMixin], mixins: [JeecgListMixin],
components: {}, components: {},
data() { data() {
......
src/views/statistical/IndexChart.vue
浏览文件 @ e65d223b
...@@ -46,10 +46,12 @@ ...@@ -46,10 +46,12 @@
<div class="t-box"> <div class="t-box">
<h3 class="box-title">最新成交订单</h3> <h3 class="box-title">最新成交订单</h3>
<div class="order"> <div class="order">
<div class="order-title"><span style="width: 30%;">订单编号</span><span>提交时间</span><span>用户账号</span><span>订单金额</span></div> <div class="order-title"><span
style="width: 30%;">订单编号</span><span>提交时间</span><span>用户账号</span><span>订单金额</span></div>
<vue-seamless-scroll :data="listData" class="seamless-warp" :class-option="defineScroll"> <vue-seamless-scroll :data="listData" class="seamless-warp" :class-option="defineScroll">
<div v-for="(item, index) in listData" :key="index" class="item"> <div v-for="(item, index) in listData" :key="index" class="item">
<span style="width: 30%;">{{ item.num }}</span><span>{{ item.date }}</span><span>{{ item.account }}</span><span>{{ item.amount }}</span> <span
style="width: 30%;">{{ item.num }}</span><span>{{ item.date }}</span><span>{{ item.account }}</span><span>{{ item.amount }}</span>
</div> </div>
</vue-seamless-scroll> </vue-seamless-scroll>
</div> </div>
...@@ -78,6 +80,22 @@ ...@@ -78,6 +80,22 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24">
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '20px' }">
<div class="t-box">
<h3 class="box-title">巡报订单数量</h3>
<div>
<line-chart-multid :dataSource="dayData1" :fields="dayFields1" style="padding: 0;" />
</div>
</div>
</a-col>
<a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '20px' }">
<div class="t-box">
<h3 class="box-title">巡报订单金额</h3>
<line-chart-multid :dataSource="dayData1" :fields="dayFields1" style="padding: 0;" />
</div>
</a-col>
</a-row>
</div> </div>
</template> </template>
...@@ -87,7 +105,7 @@ import LineChartMultid from '@/components/chart/LineChartMultid' ...@@ -87,7 +105,7 @@ import LineChartMultid from '@/components/chart/LineChartMultid'
import vueSeamlessScroll from 'vue-seamless-scroll' import vueSeamlessScroll from 'vue-seamless-scroll'
import { getDataStatisticsApi, getLoginfo, getVisitInfo, auditPropertyApi } from '@/api/api' import { getDataStatisticsApi, getLoginfo, getVisitInfo, auditPropertyApi } from '@/api/api'
export default { export default {
name: 'IndexChart', name: 'statistical',
components: { components: {
Bar, Bar,
LineChartMultid, LineChartMultid,
...@@ -163,6 +181,20 @@ export default { ...@@ -163,6 +181,20 @@ export default {
amount: '¥200.00', amount: '¥200.00',
}, },
], ],
dayFields1: ['巡报订单数量'],
dayFields2: ['巡报订单金额'],
dayData1: [
{ type: '7月1日', 巡报订单数量: 171 },
{ type: '7月10日', 巡报订单数量: 161.9 },
{ type: '7月20日', 巡报订单数量: 119.5 },
{ type: '7月30日', 巡报订单数量: 141.5 },
{ type: '8月10日', 巡报订单数量: 118.4 },
{ type: '8月20日', 巡报订单数量: 211.5 },
{ type: '8月30日', 巡报订单数量: 251.2 },
{ type: '9月10日', 巡报订单数量: 216.5 },
{ type: '9月20日', 巡报订单数量: 213.3 },
{ type: '9月30日', 巡报订单数量: 81.3 },
],
} }
}, },
created() { created() {
......
src/views/withdrawal/WithdrawalList.vue
浏览文件 @ e65d223b
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<!-- 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="dataSource1" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
@change="handleTableChange"> @change="handleTableChange">
</a-table> </a-table>
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<script> <script>
import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api' import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JThirdAppButton from '../../components/jeecgbiz/thirdApp/JThirdAppButton.vue'
const columns = [ const columns = [
{ {
...@@ -69,14 +68,14 @@ const columns = [ ...@@ -69,14 +68,14 @@ const columns = [
{ {
title: '结算方式', title: '结算方式',
dataIndex: 'reconciliationEndDate', dataIndex: 'companyAuditStatus',
key: 'reconciliationEndDate', key: 'companyAuditStatus',
align: 'center', align: 'center',
}, },
{ {
title: '结算状态', title: '结算状态',
dataIndex: 'reconciliationAmount', dataIndex: 'auditStatus',
key: 'reconciliationAmount', key: 'auditStatus',
align: 'center', align: 'center',
}, },
{ {
...@@ -88,8 +87,8 @@ const columns = [ ...@@ -88,8 +87,8 @@ const columns = [
] ]
export default { export default {
components: { JThirdAppButton }, components: { },
name: 'PermissionListAsync', name: 'WithdrawalList',
mixins: [JeecgListMixin], mixins: [JeecgListMixin],
data() { data() {
return { return {
...@@ -97,116 +96,116 @@ export default { ...@@ -97,116 +96,116 @@ export default {
columns: columns, columns: columns,
loading: false, loading: false,
url: { url: {
list: '/property-central/property/communityReconciliation/list', list: '/property-central/property/propertyAdv/list',
}, },
dataSource: [ dataSource1: [
{ {
id: 'JD239423', id: 'JD239423',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '汉江之星物业集团', propertyName: '2000',
reconciliationBeginDate: '2023-01-01', reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '2023-02-03', reconciliationEndDate: '5',
reconciliationAmount: '345.23', reconciliationAmount: '345.23',
updateTime: '2023-04-05', updateTime: '2023-04-05',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '已结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'JD453454', id: 'JD453454',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '汉江之星物业集团', propertyName: '2000',
reconciliationBeginDate: '2023-04-06', reconciliationBeginDate: '2023-04-06',
reconciliationEndDate: '2023-06-03', reconciliationEndDate: '10',
reconciliationAmount: '1345.45', reconciliationAmount: '1345.45',
updateTime: '2023-05-05', updateTime: '2023-05-05',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '已结算',
companyAuditStatus: '审核通过', companyAuditStatus: '微信',
}, },
{ {
id: 'JD567454', id: 'JD567454',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '汉江之星物业集团', propertyName: '2000',
reconciliationBeginDate: '2023-02-05', reconciliationBeginDate: '2023-02-05',
reconciliationEndDate: '2023-02-23', reconciliationEndDate: '2',
reconciliationAmount: '34234', reconciliationAmount: '34234',
updateTime: '2023-02-06', updateTime: '2023-02-06',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '待审核', auditStatus: '未结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'KF343455', id: 'KF343455',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '汉江之星物业集团', propertyName: '2000',
reconciliationBeginDate: '2022-11-01', reconciliationBeginDate: '2022-11-01',
reconciliationEndDate: '2023-01-03', reconciliationEndDate: '3',
reconciliationAmount: '34', reconciliationAmount: '34',
updateTime: '2023-06-07', updateTime: '2023-06-07',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '已结算',
companyAuditStatus: '审核通过', companyAuditStatus: '微信',
}, },
{ {
id: 'KD435345', id: 'KD435345',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '汉江之星物业集团', propertyName: '2000',
reconciliationBeginDate: '2022-01-21', reconciliationBeginDate: '2022-01-21',
reconciliationEndDate: '2022-10-03', reconciliationEndDate: '3',
reconciliationAmount: '654', reconciliationAmount: '654',
updateTime: '2023-05-06', updateTime: '2023-05-06',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '待审核', auditStatus: '未结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'LG345352', id: 'LG345352',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '汉江之星物业集团', propertyName: '2000',
reconciliationBeginDate: '2022-01-10', reconciliationBeginDate: '2022-01-10',
reconciliationEndDate: '2022-02-03', reconciliationEndDate: '20',
reconciliationAmount: '897.98', reconciliationAmount: '897.98',
updateTime: '2023-05-08', updateTime: '2023-05-08',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '待审核', auditStatus: '未结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'MG345354', id: 'MG345354',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '汉江之星物业集团', propertyName: '2000',
reconciliationBeginDate: '2023-01-04', reconciliationBeginDate: '2023-01-04',
reconciliationEndDate: '2023-06-03', reconciliationEndDate: '20',
reconciliationAmount: '234', reconciliationAmount: '234',
updateTime: '2023-05-05', updateTime: '2023-05-05',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '未结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'LB345353', id: 'LB345353',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '汉江之星物业集团', propertyName: '2000',
reconciliationBeginDate: '2023-02-01', reconciliationBeginDate: '2023-02-01',
reconciliationEndDate: '2023-05-03', reconciliationEndDate: '2',
reconciliationAmount: '1000', reconciliationAmount: '1000',
updateTime: '2023-04-04', updateTime: '2023-04-04',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '未结算',
companyAuditStatus: '待审核', companyAuditStatus: '微信',
}, },
{ {
id: 'LC234234', id: 'LC234234',
creditCode: '汉江之星小区', creditCode: '张三',
propertyName: '汉江之星物业集团', propertyName: '2000',
reconciliationBeginDate: '2023-01-23', reconciliationBeginDate: '2023-01-23',
reconciliationEndDate: '2023-02-03', reconciliationEndDate: '5',
reconciliationAmount: '3443', reconciliationAmount: '3443',
updateTime: '2023-01-02', updateTime: '2023-01-02',
empowerCommunityNum: 'admin', empowerCommunityNum: 'admin',
auditStatus: '审核通过', auditStatus: '未结算',
companyAuditStatus: '审核通过', companyAuditStatus: '转账',
}, },
], ],
visibleReconciliation: false, visibleReconciliation: false,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论