Skip to content

P
property-company
提交 e66b79dd authored 作者: 何忠建's avatar 何忠建
浏览文件
操作

修复bug

上级 8750deff
隐藏空白字符变更
内嵌 并排
正在显示 包含 130 行增加 和 120 行删除
src/views/base/capital/capital.vue
浏览文件 @ e66b79dd
......@@ -5,8 +5,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-form-item label="姓名">
<a-input placeholder="请输入姓名" v-model="queryParam.assetName"></a-input>
<a-form-item label="设备名称">
<a-input placeholder="请输入设备名称" v-model="queryParam.assetName"></a-input>
</a-form-item>
</a-col>
......@@ -23,7 +23,7 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
<a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
......
src/views/base/capital/modules/NoticeForm.vue
浏览文件 @ e66b79dd
......@@ -51,8 +51,8 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="所属小区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="communityCode">
<a-input v-model="model.communityCode" placeholder="请输入所属小区"></a-input>
<a-form-model-item label="所属小区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="platformName">
<a-input v-model="model.platformName" placeholder="请输入所属小区"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
......
src/views/base/housing/housing.vue
浏览文件 @ e66b79dd
......@@ -23,7 +23,7 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
......
src/views/base/worker/worker.vue
浏览文件 @ e66b79dd
......@@ -23,7 +23,7 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
......
src/views/charge/standardSettings/standard.vue
浏览文件 @ e66b79dd
......@@ -6,7 +6,10 @@
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-form-item label="收费类型">
<a-input placeholder="请输入收费类型" v-model="queryParam.ruleCode"></a-input>
<a-select style="width: 100%" v-model="queryParam.chargeTypeId" placeholder="请选择收费类型">
<a-select-option v-for="item in chargeList" :key="item.id"
:value="item.id">{{item.typeName}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
......@@ -23,10 +26,10 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
<a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
......@@ -40,30 +43,26 @@
<a style="margin-left: 24px" v-if="selectedRowKeys.length > 0" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange"
>
<a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns"
:dataSource="dataSource" :pagination="ipagination" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap"
@change="handleTableChange">
<span slot="chargeItem" slot-scope="text, record">
<span :style="{'color': record.chargeItem === '1' ? 'green' : 'red'}">{{record.chargeItem === '1' ? '在职' : '离职'}}</span>
<span
:style="{'color': record.chargeItem === '1' ? 'green' : 'red'}">{{record.chargeItem === '1' ? '在职' : '离职'}}</span>
</span>
<span slot="designFormulas" slot-scope="text, record">
<span v-if="record.designFormulas === 1">固定金额</span>
<span v-if="record.designFormulas === 2">建筑面积 × 单价</span>
<span v-if="record.designFormulas === 3">（本期度数 - 上期度数） × 单价</span>
</span>
<span slot="action" slot-scope="text, record">
<a @click="onHandle(record, 'edit')">编辑</a>
<a-divider type="vertical"/>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">
更多 <a-icon type="down"/>
更多 <a-icon type="down" />
</a>
<a-menu slot="overlay">
<a-menu-item>
......@@ -88,98 +87,108 @@
</template>
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import NoticeModal from './modules/NoticeModal'
import {filterDictTextByCache} from '@/components/dict/JDictSelectUtil'
import { getChargeListApi } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import NoticeModal from './modules/NoticeModal'
import { filterDictTextByCache } from '@/components/dict/JDictSelectUtil'
const columns = [
{
title: '收费项目编码',
dataIndex: 'ruleCode',
key: 'ruleCode',
align: 'center'
},
{
title: '所属小区',
dataIndex: 'communityNames',
key: 'communityNames',
align: 'center'
},
{
title: '收费类型',
dataIndex: 'chargeTypeName',
key: 'chargeTypeName',
align: 'center'
const columns = [
{
title: '收费项目编码',
dataIndex: 'ruleCode',
key: 'ruleCode',
align: 'center',
},
{
title: '所属小区',
dataIndex: 'communityNames',
key: 'communityNames',
align: 'center',
},
{
title: '收费类型',
dataIndex: 'chargeTypeName',
key: 'chargeTypeName',
align: 'center',
},
{
title: '收费项目',
dataIndex: 'chargeItem',
key: 'chargeItem',
align: 'center',
},
{
title: '付费周期 (月)',
dataIndex: 'chargeCycle',
key: 'chargeCycle',
align: 'center',
customRender: function (text) {
return filterDictTextByCache('chargingCycle', text)
},
{
title: '收费项目',
dataIndex: 'chargeItem',
key: 'chargeItem',
align: 'center'
},
{
title: '计费方式',
dataIndex: 'designFormulas',
scopedSlots: { customRender: 'designFormulas' },
key: 'designFormulas',
align: 'center',
},
{
title: '单价（元）',
dataIndex: 'amount',
key: 'amount',
align: 'center',
},
{
title: '操作',
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: 'center',
width: 150,
},
]
export default {
name: 'PermissionListAsync',
mixins: [JeecgListMixin],
components: { NoticeModal },
data() {
return {
// 表头
columns: columns,
url: {
list: '/property-company/system/companyChargerule/list',
delete: '/property-company/system/companyChargerule/delete',
deleteBatch: '/property-company/system/companyChargerule/deleteBatch',
},
chargeList: [],
}
},
created() {
this.getChargeList()
},
methods: {
async getChargeList() {
let { result } = await getChargeListApi()
this.chargeList = result
},
{
title: '付费周期 (月)',
dataIndex: 'chargeCycle',
key: 'chargeCycle',
align: 'center',
customRender: function(text) {
return filterDictTextByCache('chargingCycle', text);
onHandle(record, flag) {
if (record.communityCodes === 'ALL') {
record['type'] = 'ALL'
record['communityList'] = []
} else {
record['type'] = 'POINT'
record['communityList'] = record.communityCodes.split(',')
}
},
{
title: '计费方式',
dataIndex: 'designFormulas',
key: 'designFormulas',
align: 'center'
},
{
title: '单价（元）',
dataIndex: 'amount',
key: 'amount',
align: 'center'
},
{
title: '操作',
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: 'center',
width: 150
}
]
export default {
name: 'PermissionListAsync',
mixins: [JeecgListMixin],
components: {NoticeModal},
data() {
return {
// 表头
columns: columns,
url: {
list: "/property-company/system/companyChargerule/list",
delete: '/property-company/system/companyChargerule/delete',
deleteBatch: '/property-company/system/companyChargerule/deleteBatch'
}
if (flag === 'edit') {
this.handleEdit(record)
} else {
this.handleDetail(record)
}
},
methods: {
onHandle(record, flag) {
if(record.communityCodes === 'ALL') {
record['type'] = 'ALL'
record['communityList'] = []
} else {
record['type'] = 'POINT'
record['communityList'] = record.communityCodes.split(',')
}
if(flag === 'edit') {
this.handleEdit(record)
} else {
this.handleDetail(record)
}
}
}
}
},
}
</script>
<style scoped>
@import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>
\ No newline at end of file
src/views/charge/templateSettings/template.vue
浏览文件 @ e66b79dd
......@@ -23,7 +23,7 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="onHandleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
......
src/views/charge/typeSettings/type.vue
浏览文件 @ e66b79dd
......@@ -5,8 +5,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-form-item label="姓名">
<a-input placeholder="请输入姓名" v-model="queryParam.typeCode"></a-input>
<a-form-item label="收费类型名称">
<a-input placeholder="请输入收费类型名称" v-model="queryParam.typeName"></a-input>
</a-form-item>
</a-col>
......@@ -23,7 +23,7 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
......
src/views/property/NoticeList.vue
浏览文件 @ e66b79dd
......@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-form-item label="公告标题">
<a-input placeholder="请输入公告标题" v-model="queryParam.employeeName"></a-input>
<j-input placeholder="请输入公告标题" v-model="queryParam.noticeTitle"></j-input>
</a-form-item>
</a-col>
......@@ -22,8 +22,8 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button>
<a-button @click="handleAdd" type="primary" icon="plus">发布</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('t_property_settled')">导出</a-button> -->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论