Skip to content

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

7.25

上级 cc8c2a5e
隐藏空白字符变更
内嵌 并排
正在显示 包含 403 行增加 和 326 行删除
src/views/benefiting/ReconciliationList.vue
浏览文件 @ e65d223b
......@@ -33,7 +33,7 @@
</div>
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="toReconciliation()" type="primary">批量对账</a-button>
<a-button @click="toReconciliation(1,'')" type="primary">批量对账</a-button>
</div>
<!-- table区域-begin -->
......@@ -43,47 +43,54 @@
@change="handleTableChange"
:rowSelection="{selectedRowKeys: selectedRowKeys,onSelect:onSelect,onChange: onSelectChange}">
<span slot="action" slot-scope="text, record">
<a type="primary" @click="toReconciliation(record)">申请对账</a>
<a type="primary" @click="toReconciliation(2,record)">申请对账</a>
</span>
</a-table>
</div>
<!-- table区域-end -->
<a-modal centered title="申请对账" :visible="visibleReconciliation" :confirm-loading="confirmLoading" @ok="handleOk"
@cancel="handleCancel">
<a-form >
@cancel="handleCancel" width="60%">
<a-form>
<a-row>
<a-col :span="24">
<a-form-model-item label="对账总金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName" style="width: 100%;">
<a-form-model-item label="对账总金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
style="width: 100%;">
<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%;">
<a-form-model-item label="对账日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
style="width: 100%;">
<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%;">
<a>查看明细</a>
<a-form-model-item label="对账明细" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="propertyName"
style="width: 100%;">
<a @click="checkDetails()">查看明细</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 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-modal centered title="对账明细" :visible="visibleReconciliationDetail" :confirm-loading="confirmLoading" :footer="null" width="60%" @cancel="handleCancelDetail">
<a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns1"
:dataSource="selectedList" :pagination="false" :loading="loading" class="j-table-force-nowrap">
</a-table>
</a-modal>
</a-card>
</template>
<script>
//import { getChargeListApi } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JThirdAppButton from '../../components/jeecgbiz/thirdApp/JThirdAppButton.vue'
const columns = [
{
......@@ -158,10 +165,75 @@ const columns = [
width: 150,
},
]
const columns1 = [
{
title: '订单编号',
dataIndex: 'id',
key: 'id',
align: 'center',
},
{
title: '提交时间',
dataIndex: 'reconciliationBeginDate',
key: 'reconciliationBeginDate',
align: 'center',
},
{
title: '用户账号',
dataIndex: 'creditCode',
key: 'creditCode',
align: 'center',
},
{
title: '分利金额',
dataIndex: 'propertyName',
key: 'propertyName',
align: 'center',
},
{
title: '支付方式',
dataIndex: 'reconciliationEndDate',
key: 'reconciliationEndDate',
align: 'center',
},
{
title: '订单来源',
dataIndex: 'reconciliationAmount',
key: 'reconciliationAmount',
align: 'center',
},
{
title: '订单状态',
dataIndex: 'updateTime',
key: 'updateTime',
align: 'center',
},
{
title: '备注',
dataIndex: 'empowerCommunityNum',
key: 'empowerCommunityNum',
align: 'center',
},
{
title: '所属平台',
dataIndex: 'auditStatus',
key: 'auditStatus',
align: 'center',
},
{
title: '所属小区',
dataIndex: 'companyAuditStatus',
key: 'companyAuditStatus',
// customRender: function (text) {
// return filterDictTextByCache('companyAuditStatus', text)
// },
}
]
export default {
components: { JThirdAppButton },
name: 'PermissionListAsync',
components: { },
name: 'ReconciliationList',
mixins: [JeecgListMixin],
data() {
return {
......@@ -176,122 +248,66 @@ export default {
},
chargeList: [],
columns: columns,
columns1: columns1,
loading: false,
url: {
list: '/property-central/property/communityReconciliation/list',
},
dataSource: [
{
id: 'JD239423',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
id: 'JD2394231',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '2023-02-03',
reconciliationAmount: '345.23',
updateTime: '2023-04-05',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '待审核',
},
{
id: 'JD453454',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
reconciliationBeginDate: '2023-04-06',
reconciliationEndDate: '2023-06-03',
reconciliationAmount: '1345.45',
updateTime: '2023-05-05',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '审核通过',
},
{
id: 'JD567454',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
reconciliationBeginDate: '2023-02-05',
reconciliationEndDate: '2023-02-23',
reconciliationAmount: '34234',
updateTime: '2023-02-06',
empowerCommunityNum: 'admin',
auditStatus: '待审核',
companyAuditStatus: '待审核',
},
{
id: 'KF343455',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
reconciliationBeginDate: '2022-11-01',
reconciliationEndDate: '2023-01-03',
reconciliationAmount: '34',
updateTime: '2023-06-07',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '审核通过',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
{
id: 'KD435345',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
reconciliationBeginDate: '2022-01-21',
reconciliationEndDate: '2022-10-03',
reconciliationAmount: '654',
updateTime: '2023-05-06',
empowerCommunityNum: 'admin',
auditStatus: '待审核',
companyAuditStatus: '待审核',
},
{
id: 'LG345352',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
reconciliationBeginDate: '2022-01-10',
reconciliationEndDate: '2022-02-03',
reconciliationAmount: '897.98',
updateTime: '2023-05-08',
empowerCommunityNum: 'admin',
auditStatus: '待审核',
companyAuditStatus: '待审核',
},
{
id: 'MG345354',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
reconciliationBeginDate: '2023-01-04',
reconciliationEndDate: '2023-06-03',
reconciliationAmount: '234',
updateTime: '2023-05-05',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '待审核',
id: 'JD2394232',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
{
id: 'LB345353',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
reconciliationBeginDate: '2023-02-01',
reconciliationEndDate: '2023-05-03',
reconciliationAmount: '1000',
updateTime: '2023-04-04',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '待审核',
id: 'JD2394233',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
{
id: 'LC234234',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
reconciliationBeginDate: '2023-01-23',
reconciliationEndDate: '2023-02-03',
reconciliationAmount: '3443',
updateTime: '2023-01-02',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '审核通过',
id: 'JD2394234',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
],
visibleReconciliation: false,
confirmLoading: false,
selectedList: [],
selectedRowKeys: [],
visibleReconciliationDetail:false
}
},
created() {
......@@ -302,8 +318,6 @@ export default {
// let { result } = await getChargeListApi()
// this.chargeList = result
// },
batchReconciliation() {},
onChangeData(date, dateString) {
if (dateString.length > 0) {
this.queryParam.createTime_begin = dateString[0]
......@@ -314,8 +328,22 @@ export default {
}
},
//申请对账
toReconciliation(record) {
this.visibleReconciliation = true
toReconciliation(type, record) {
this.selectedList = [];
if (type == 1) {
if (this.selectionRows.length > 0) {
this.visibleReconciliation = true
this.selectedList = this.selectionRows
console.log(this.selectedList)
console.log(333)
} else {
this.$message.warning('请选择订单')
}
} else if (type == 2) {
this.visibleReconciliation = true
this.selectedList.push(record);
this.selectedRowKeys = [];
}
},
handleOk(e) {
this.ModalText = 'The modal will be closed after two seconds'
......@@ -326,7 +354,6 @@ export default {
}, 2000)
},
handleCancel(e) {
console.log('Clicked cancel button')
this.visibleReconciliation = false
},
......@@ -339,9 +366,12 @@ export default {
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectedRows
},
loadData() {
console.log('不请求')
checkDetails(){
this.visibleReconciliationDetail = true
},
handleCancelDetail(){
this.visibleReconciliationDetail = false
}
},
}
</script>
......
src/views/benefiting/SettlementDetails.vue
浏览文件 @ e65d223b
......@@ -49,12 +49,12 @@
</a-form-model>
</j-form-container>
<a-card title="对账信息" style="margin-top: 10px;">
<div>
<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">
</a-table>
</div>
<div>
<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">
</a-table>
</div>
</a-card>
</a-spin>
</template>
......@@ -67,68 +67,72 @@ import { httpAction, getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
const columns = [
{
title: '订单编号',
dataIndex: 'propertyName',
key: 'propertyName',
dataIndex: 'id',
key: 'id',
align: 'center',
},
{
title: '提交时间',
dataIndex: 'creditCode',
key: 'creditCode',
align: 'center',
},
{
title: '用户账号',
dataIndex: 'reconciliationBeginDate',
key: 'reconciliationBeginDate',
align: 'center',
},
{
title: '订单金额',
dataIndex: 'reaship',
key: 'reaship',
title: '用户账号',
dataIndex: 'creditCode',
key: 'creditCode',
align: 'center',
},
{
title: '支付方式',
dataIndex: 'reconcilname',
key: 'reconcilname',
title: '分利金额',
dataIndex: 'propertyName',
key: 'propertyName',
align: 'center',
},
{
title: '订单来源',
title: '支付方式',
dataIndex: 'reconciliationEndDate',
key: 'reconciliationEndDate',
align: 'center',
},
{
title: '订单状态',
title: '订单来源',
dataIndex: 'reconciliationAmount',
key: 'reconciliationAmount',
align: 'center',
},
{
title: '备注',
title: '订单状态',
dataIndex: 'updateTime',
key: 'updateTime',
align: 'center',
},
{
title: '所属平台',
title: '备注',
dataIndex: 'empowerCommunityNum',
key: 'empowerCommunityNum',
align: 'center',
},
{
title: '所属小区',
title: '所属平台',
dataIndex: 'auditStatus',
key: 'auditStatus',
align: 'center',
},
{
title: '所属小区',
dataIndex: 'companyAuditStatus',
key: 'companyAuditStatus',
// customRender: function (text) {
// return filterDictTextByCache('companyAuditStatus', text)
// },
},
]
export default {
name: 'PropertySettledForm',
name: 'SettlementDetails',
inject: ['closeCurrent'],
mixins: [JeecgListMixin],
data() {
......@@ -165,64 +169,52 @@ export default {
loading: false,
dataSource: [
{
propertyName: '汉江之星小区',
creditCode: '物业费',
reconciliationBeginDate: '张飒，15198765634',
reaship: '租户',
reconcilname: '李白，15165245634',
reconciliationEndDate: '2栋2单元101',
reconciliationAmount: '345.23',
updateTime: '2023-04-05',
empowerCommunityNum: 'LD23423843223',
auditStatus: '2023-05-06',
},
{
propertyName: '汉江之星小区',
creditCode: '水费',
reconciliationBeginDate: '李生，1515235634',
reaship: '本人',
reconcilname: '李生，1515235634',
reconciliationEndDate: '1栋2单元301',
reconciliationAmount: '1345.45',
updateTime: '2023-05-05',
empowerCommunityNum: 'DFG2342342323',
auditStatus: '2023-05-16',
id: 'JD2394231',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
{
propertyName: '汉江之星小区',
creditCode: '电费',
reconciliationBeginDate: '李丽，19812348976',
reaship: '租户',
reconcilname: '张飒，15198765634',
reconciliationEndDate: '9栋1单元401',
reconciliationAmount: '34234',
updateTime: '2023-02-06',
empowerCommunityNum: 'JTR323422',
auditStatus: '2023-03-06',
id: 'JD2394232',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
{
propertyName: '汉江之星小区',
creditCode: '水费',
reconciliationBeginDate: '张盛，1890987567',
reaship: '本人',
reconcilname: '张盛，1890987567',
reconciliationEndDate: '4栋2单元403',
reconciliationAmount: '34',
updateTime: '2023-06-07',
empowerCommunityNum: 'DFGD32423423',
auditStatus: '2023-04-23',
id: 'JD2394233',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
{
propertyName: '汉江之星小区',
creditCode: '燃气费',
reconciliationBeginDate: '李婷婷，18809875634',
reaship: '租户',
reconcilname: '话梅，15198765634',
reconciliationEndDate: '9栋2单元1201',
reconciliationAmount: '654',
updateTime: '2023-05-06',
empowerCommunityNum: 'FDBEWRW2342342',
auditStatus: '2023-06-26',
id: 'JD2394234',
creditCode: '18000000000',
propertyName: 20000,
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '微信',
reconciliationAmount: '小程序',
updateTime: '未对账',
empowerCommunityNum: '备注',
auditStatus: 'XXX物业集团',
companyAuditStatus: '花园小区',
},
],
}
......
src/views/benefiting/SettlementList.vue
浏览文件 @ e65d223b
......@@ -87,9 +87,8 @@
</template>
<script>
import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
//import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JThirdAppButton from '../../components/jeecgbiz/thirdApp/JThirdAppButton.vue'
const columns = [
{
......@@ -152,8 +151,8 @@ const columns = [
]
export default {
components: { JThirdAppButton },
name: 'PermissionListAsync',
components: { },
name: 'SettlementList',
mixins: [JeecgListMixin],
data() {
return {
......@@ -174,111 +173,111 @@ export default {
dataSource: [
{
id: 'JD239423',
creditCode: '汉江之星小区',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '5',
reconciliationAmount: '345.23',
updateTime: '2023-04-05',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '待审核',
auditStatus: '已结算',
companyAuditStatus: '微信',
},
{
id: 'JD453454',
creditCode: '汉江之星小区',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-04-06',
reconciliationEndDate: '2023-06-03',
reconciliationEndDate: '10',
reconciliationAmount: '1345.45',
updateTime: '2023-05-05',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '审核通过',
auditStatus: '已结算',
companyAuditStatus: '微信',
},
{
id: 'JD567454',
creditCode: '汉江之星小区',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-02-05',
reconciliationEndDate: '2023-02-23',
reconciliationEndDate: '2',
reconciliationAmount: '34234',
updateTime: '2023-02-06',
empowerCommunityNum: 'admin',
auditStatus: '待审核',
companyAuditStatus: '待审核',
auditStatus: '未结算',
companyAuditStatus: '微信',
},
{
id: 'KF343455',
creditCode: '汉江之星小区',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2022-11-01',
reconciliationEndDate: '2023-01-03',
reconciliationEndDate: '3',
reconciliationAmount: '34',
updateTime: '2023-06-07',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '审核通过',
auditStatus: '已结算',
companyAuditStatus: '微信',
},
{
id: 'KD435345',
creditCode: '汉江之星小区',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2022-01-21',
reconciliationEndDate: '2022-10-03',
reconciliationEndDate: '3',
reconciliationAmount: '654',
updateTime: '2023-05-06',
empowerCommunityNum: 'admin',
auditStatus: '待审核',
companyAuditStatus: '待审核',
auditStatus: '未结算',
companyAuditStatus: '微信',
},
{
id: 'LG345352',
creditCode: '汉江之星小区',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2022-01-10',
reconciliationEndDate: '2022-02-03',
reconciliationEndDate: '20',
reconciliationAmount: '897.98',
updateTime: '2023-05-08',
empowerCommunityNum: 'admin',
auditStatus: '待审核',
companyAuditStatus: '待审核',
auditStatus: '未结算',
companyAuditStatus: '微信',
},
{
id: 'MG345354',
creditCode: '汉江之星小区',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-01-04',
reconciliationEndDate: '2023-06-03',
reconciliationEndDate: '20',
reconciliationAmount: '234',
updateTime: '2023-05-05',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '待审核',
auditStatus: '未结算',
companyAuditStatus: '微信',
},
{
id: 'LB345353',
creditCode: '汉江之星小区',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-02-01',
reconciliationEndDate: '2023-05-03',
reconciliationEndDate: '2',
reconciliationAmount: '1000',
updateTime: '2023-04-04',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '待审核',
auditStatus: '未结算',
companyAuditStatus: '微信',
},
{
id: 'LC234234',
creditCode: '汉江之星小区',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-01-23',
reconciliationEndDate: '5',
reconciliationAmount: '3443',
updateTime: '2023-01-02',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '审核通过',
auditStatus: '未结算',
companyAuditStatus: '转账',
},
],
visibleReconciliation: false,
......
src/views/community/CommunityLlist.vue
浏览文件 @ e65d223b
......@@ -22,9 +22,11 @@
<!-- table区域-begin -->
<div>
<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">
<span slot="action" slot-scope="text, record">
<a type="primary" @click="onStatus(record)">解绑/绑定</a>
</span>
</a-table>
</div>
</a-card>
......@@ -34,72 +36,98 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'PropertyAdvList',
name: 'CommunityLlist',
mixins: [JeecgListMixin, mixinDevice],
data() {
return {
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
key: 'rowIndex',
width: 60,
align: 'center',
customRender: function (t, r, index) {
return parseInt(index) + 1
},
},
{
title: '小区名称',
align: 'center',
dataIndex: 'advName',
dataIndex: 'name',
},
{
title: '所属区域',
align: 'center',
dataIndex: 'advPosition',
dataIndex: 'domain',
},
{
title: '占地面积（m2）',
align: 'center',
dataIndex: 'id',
dataIndex: 'area',
},
{
title: '总栋数',
align: 'center',
dataIndex: 'advStartDate',
dataIndex: 'num1',
},
{
title: '房屋数量',
align: 'center',
dataIndex: 'advUrl',
dataIndex: 'num2',
},
{
title: '商铺数量',
align: 'center',
dataIndex: 'createTime',
dataIndex: 'num3',
},
{
title: '联系人',
align: 'center',
dataIndex: 'createBy',
dataIndex: 'name1',
},
{
title: '详细地址',
dataIndex: 'onshelfStatus',
dataIndex: 'add',
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: {
list: '/property-central/property/propertyAdv/list',
},
dictOptions: []
dictOptions: [],
}
},
created() {
},
created() {},
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>
......
src/views/dashboard/IndexChart.vue
浏览文件 @ e65d223b
......@@ -7,7 +7,7 @@
<div>
<p style="color:#666;margin-bottom:5px;">绑定商铺数量</p>
<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>
</p>
</div>
......@@ -37,8 +37,6 @@
<div>
<p style="color:#666;margin-bottom:5px;">待结算金额</p>
<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>
</div>
</div>
......
src/views/shops/ShopsDetails.vue
浏览文件 @ e65d223b
......@@ -167,7 +167,7 @@ import SelectCommunityModal from './modules/SelectCommunityModal'
import SelectShopsModal from './modules/SelectShopsModal'
export default {
name: 'PropertySettledForm',
name: 'ShopsDetails',
inject: ['closeCurrent'],
components: {
SelectCommunityModal,
......
src/views/shops/ShopsList.vue
浏览文件 @ e65d223b
......@@ -66,9 +66,8 @@
</template>
<script>
import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
//import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { filterDictTextByCache } from '@/components/dict/JDictSelectUtil'
const columns = [
......@@ -98,8 +97,8 @@ const columns = [
},
{
title: '分利',
dataIndex: 'empowerEndDate',
scopedSlots: { customRender: 'empowerEndDate' },
dataIndex: 'registCapital',
key: 'registCapital',
align: 'center',
},
{
......@@ -134,7 +133,7 @@ const columns = [
]
export default {
name: 'PermissionListAsync',
name: 'ShopsList',
mixins: [JeecgListMixin],
components: {},
data() {
......
src/views/statistical/IndexChart.vue
浏览文件 @ e65d223b
......@@ -46,10 +46,12 @@
<div class="t-box">
<h3 class="box-title">最新成交订单</h3>
<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">
<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>
</vue-seamless-scroll>
</div>
......@@ -78,6 +80,22 @@
</div>
</a-col>
</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>
</template>
......@@ -87,7 +105,7 @@ import LineChartMultid from '@/components/chart/LineChartMultid'
import vueSeamlessScroll from 'vue-seamless-scroll'
import { getDataStatisticsApi, getLoginfo, getVisitInfo, auditPropertyApi } from '@/api/api'
export default {
name: 'IndexChart',
name: 'statistical',
components: {
Bar,
LineChartMultid,
......@@ -163,6 +181,20 @@ export default {
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() {
......
src/views/withdrawal/WithdrawalList.vue
浏览文件 @ e65d223b
......@@ -27,7 +27,7 @@
<!-- table区域-begin -->
<div>
<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">
</a-table>
......@@ -39,7 +39,6 @@
<script>
import { auditPropertyApi, freezeOrPropertyApi } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JThirdAppButton from '../../components/jeecgbiz/thirdApp/JThirdAppButton.vue'
const columns = [
{
......@@ -69,14 +68,14 @@ const columns = [
{
title: '结算方式',
dataIndex: 'reconciliationEndDate',
key: 'reconciliationEndDate',
dataIndex: 'companyAuditStatus',
key: 'companyAuditStatus',
align: 'center',
},
{
title: '结算状态',
dataIndex: 'reconciliationAmount',
key: 'reconciliationAmount',
dataIndex: 'auditStatus',
key: 'auditStatus',
align: 'center',
},
{
......@@ -88,8 +87,8 @@ const columns = [
]
export default {
components: { JThirdAppButton },
name: 'PermissionListAsync',
components: { },
name: 'WithdrawalList',
mixins: [JeecgListMixin],
data() {
return {
......@@ -97,116 +96,116 @@ export default {
columns: columns,
loading: false,
url: {
list: '/property-central/property/communityReconciliation/list',
list: '/property-central/property/propertyAdv/list',
},
dataSource: [
{
dataSource1: [
{
id: 'JD239423',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-01-01',
reconciliationEndDate: '2023-02-03',
reconciliationEndDate: '5',
reconciliationAmount: '345.23',
updateTime: '2023-04-05',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '待审核',
auditStatus: '已结算',
companyAuditStatus: '微信',
},
{
id: 'JD453454',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-04-06',
reconciliationEndDate: '2023-06-03',
reconciliationEndDate: '10',
reconciliationAmount: '1345.45',
updateTime: '2023-05-05',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '审核通过',
auditStatus: '已结算',
companyAuditStatus: '微信',
},
{
id: 'JD567454',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-02-05',
reconciliationEndDate: '2023-02-23',
reconciliationEndDate: '2',
reconciliationAmount: '34234',
updateTime: '2023-02-06',
empowerCommunityNum: 'admin',
auditStatus: '待审核',
companyAuditStatus: '待审核',
auditStatus: '未结算',
companyAuditStatus: '微信',
},
{
id: 'KF343455',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2022-11-01',
reconciliationEndDate: '2023-01-03',
reconciliationEndDate: '3',
reconciliationAmount: '34',
updateTime: '2023-06-07',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '审核通过',
auditStatus: '已结算',
companyAuditStatus: '微信',
},
{
id: 'KD435345',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2022-01-21',
reconciliationEndDate: '2022-10-03',
reconciliationEndDate: '3',
reconciliationAmount: '654',
updateTime: '2023-05-06',
empowerCommunityNum: 'admin',
auditStatus: '待审核',
companyAuditStatus: '待审核',
auditStatus: '未结算',
companyAuditStatus: '微信',
},
{
id: 'LG345352',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2022-01-10',
reconciliationEndDate: '2022-02-03',
reconciliationEndDate: '20',
reconciliationAmount: '897.98',
updateTime: '2023-05-08',
empowerCommunityNum: 'admin',
auditStatus: '待审核',
companyAuditStatus: '待审核',
auditStatus: '未结算',
companyAuditStatus: '微信',
},
{
id: 'MG345354',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-01-04',
reconciliationEndDate: '2023-06-03',
reconciliationEndDate: '20',
reconciliationAmount: '234',
updateTime: '2023-05-05',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '待审核',
auditStatus: '未结算',
companyAuditStatus: '微信',
},
{
id: 'LB345353',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-02-01',
reconciliationEndDate: '2023-05-03',
reconciliationEndDate: '2',
reconciliationAmount: '1000',
updateTime: '2023-04-04',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '待审核',
auditStatus: '未结算',
companyAuditStatus: '微信',
},
{
id: 'LC234234',
creditCode: '汉江之星小区',
propertyName: '汉江之星物业集团',
creditCode: '张三',
propertyName: '2000',
reconciliationBeginDate: '2023-01-23',
reconciliationEndDate: '2023-02-03',
reconciliationEndDate: '5',
reconciliationAmount: '3443',
updateTime: '2023-01-02',
empowerCommunityNum: 'admin',
auditStatus: '审核通过',
companyAuditStatus: '审核通过',
auditStatus: '未结算',
companyAuditStatus: '转账',
},
],
visibleReconciliation: false,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论