Skip to content

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

修复bug

上级 e66b79dd
隐藏空白字符变更
内嵌 并排
正在显示 包含 128 行增加 和 123 行删除
src/views/base/housing/modules/UserRoleModal.vue
浏览文件 @ 01639df4
......@@ -72,7 +72,7 @@
expandedKeysss:[],
allTreeKeys:[],
autoExpandParent: true,
checkStrictly: true,
checkStrictly: false,
title:"物业权限配置",
visible: false,
loading: false,
......
src/views/dashboard/Analysis.vue
浏览文件 @ 01639df4
......@@ -85,7 +85,7 @@
<pie :dataSource="repairData" />
<div class="number">
<p>全部报修 {{pageForm.repairTotal}}</p>
<p v-for="(item, index) in repairData" :key="index">{{ item.item }} {{ item.count }}</p>
<p v-for="(item, index) in repairData1" :key="index">{{ item.item }} {{ item.count }}</p>
</div>
</div>
</a-col>
......@@ -162,12 +162,19 @@ export default {
y: item.totalMoney,
}
})
this.repairData = [
this.repairData1 = [
// { item: '全部报修', count: result.repairTotal || 0 },
{ item: '待派单', count: result.waitDispatch || 0 },
{ item: '维修中', count: result.inRepair || 0 },
{ item: '已完成', count: result.repairOver || 0 },
]
this.repairData = [
// { item: '全部报修', count: result.repairTotal || 0 },
// { item: '待派单', count: result.waitDispatch || 0 },
// { item: '维修中', count: result.inRepair || 0 },
{ item: '未完成', count: result.repairTotal - result.repairOver || 0 },
{ item: '已完成', count: result.repairOver || 0 },
]
this.complaintsData = [
// { item: '全部投诉', count: result.complaintTotal || 0 },
{ item: '待处理', count: result.waitHandle || 0 },
......
src/views/property/NoticeList.vue
浏览文件 @ 01639df4
......@@ -26,7 +26,7 @@
<!-- <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 +40,25 @@
<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="noticeTitle" slot-scope="text, record"
style=" width: 200px;display: block;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
<a-tooltip placement="topLeft" :title="record.noticeTitle">{{record.noticeTitle}}</a-tooltip>
</span>
<span slot="employeeStatus" slot-scope="text, record">
<span :style="{'color': record.employeeStatus === '1' ? 'green' : 'red'}">{{record.employeeStatus === '1' ? '在职' : '离职'}}</span>
<span
:style="{'color': record.employeeStatus === '1' ? 'green' : 'red'}">{{record.employeeStatus === '1' ? '在职' : '离职'}}</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,101 +83,103 @@
</template>
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import NoticeModal from './modules/NoticeModal'
import {queryNoticeCommunityApi} from '@/api/api'
import {URGENT_DEGREE, SCHEDULED_RELEASE, NOTICE_STATUS, filterDictTextByStatic} from '@/assets/static.js'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import NoticeModal from './modules/NoticeModal'
import { queryNoticeCommunityApi } from '@/api/api'
import { URGENT_DEGREE, SCHEDULED_RELEASE, NOTICE_STATUS, filterDictTextByStatic } from '@/assets/static.js'
const columns = [
{
title: '公告标题',
dataIndex: 'noticeTitle',
key: 'noticeTitle',
align: 'center'
},
{
title: '紧急程度',
dataIndex: 'urgentDegree',
key: 'urgentDegree',
align: 'center',
customRender: function(text) {
return filterDictTextByStatic(URGENT_DEGREE, text);
}
},
{
title: '是否定时发布',
dataIndex: 'isScheduledRelease',
key: 'isScheduledRelease',
align: 'center',
customRender: function(text) {
return filterDictTextByStatic(SCHEDULED_RELEASE, text);
}
},
{
title: '发布人',
dataIndex: 'createBy',
key: 'createBy',
align: 'center'
const columns = [
{
title: '公告标题',
dataIndex: 'noticeTitle',
scopedSlots: { customRender: 'noticeTitle' },
width: 100,
ellipsis: true,
key: 'noticeTitle',
},
{
title: '紧急程度',
dataIndex: 'urgentDegree',
key: 'urgentDegree',
align: 'center',
customRender: function (text) {
return filterDictTextByStatic(URGENT_DEGREE, text)
},
{
title: '发布时间',
dataIndex: 'releaseTime',
key: 'releaseTime',
align: 'center'
},
{
title: '是否定时发布',
dataIndex: 'isScheduledRelease',
key: 'isScheduledRelease',
align: 'center',
customRender: function (text) {
return filterDictTextByStatic(SCHEDULED_RELEASE, text)
},
{
title: '公告状态',
dataIndex: 'noticeStatus',
key: 'noticeStatus',
align: 'center',
customRender: function(text) {
return filterDictTextByStatic(NOTICE_STATUS, text);
}
},
{
title: '发布人',
dataIndex: 'createBy',
key: 'createBy',
align: 'center',
},
{
title: '发布时间',
dataIndex: 'releaseTime',
key: 'releaseTime',
align: 'center',
},
{
title: '公告状态',
dataIndex: 'noticeStatus',
key: 'noticeStatus',
align: 'center',
customRender: function (text) {
return filterDictTextByStatic(NOTICE_STATUS, text)
},
{
title: '操作',
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: 'center',
width: 150
}
]
},
{
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/notice/companyNotice/list",
delete: '/property-company/notice/companyNotice/delete',
deleteBatch: '/property-company/notice/companyNotice/deleteBatch'
}
export default {
name: 'PermissionListAsync',
mixins: [JeecgListMixin],
components: { NoticeModal },
data() {
return {
// 表头
columns: columns,
url: {
list: '/property-company/notice/companyNotice/list',
delete: '/property-company/notice/companyNotice/delete',
deleteBatch: '/property-company/notice/companyNotice/deleteBatch',
},
}
},
methods: {
async onHandle(record, flag) {
if (record.noticeRange === 'POINT') {
let { result } = await queryNoticeCommunityApi({ id: record.id })
record['communityCodes'] = result.map((item) => {
return {
key: item.communityCode,
label: item.communityName,
}
})
}
},
methods: {
async onHandle(record, flag) {
if(record.noticeRange === 'POINT') {
let {result} = await queryNoticeCommunityApi({id: record.id})
record['communityCodes'] = result.map(item=> {
return {
key: item.communityCode,
label: item.communityName
}
})
}
if(flag === 'edit') {
this.handleEdit(record)
} else {
this.handleDetail(record)
}
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/property/modules/NoticeForm.vue
浏览文件 @ 01639df4
......@@ -5,7 +5,7 @@
<a-row>
<a-col :span="24">
<a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noticeTitle">
<a-input v-model="model.noticeTitle" placeholder="请输入标题" style="width:70%"></a-input>
<a-input v-model="model.noticeTitle" placeholder="请输入标题" style="width:90%" :maxLength="100"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
......
src/views/system/RoleUserList.vue
浏览文件 @ 01639df4
......@@ -116,7 +116,7 @@
</div>
<!-- 操作按钮区域 -->
<div class="table-operator" :md="24" :sm="24">
<a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">新增用户</a-button>
<!-- <a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">新增用户</a-button> -->
<!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
<a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">已有用户</a-button>
......
src/views/system/modules/SelectUserModal.vue
浏览文件 @ 01639df4
......@@ -108,7 +108,7 @@
title: '部门',
align: "center",
width: 150,
dataIndex: 'orgCode'
dataIndex: 'orgCodeTxt'
}
],
columns2: [
......
src/views/system/modules/UserModal.vue
浏览文件 @ 01639df4
......@@ -23,7 +23,7 @@
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
<a-input placeholder="请输入用户账号" v-model="model.username" :readOnly="!!model.id"/>
<a-input placeholder="请输入用户账号" v-model="model.username" :readOnly="!!model.id" :disabled="disableSubmit"/>
</a-form-model-item>
<template v-if="!model.id">
......@@ -37,7 +37,7 @@
</template>
<a-form-model-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="realname">
<a-input placeholder="请输入用户姓名" v-model="model.realname" />
<a-input placeholder="请输入用户姓名" v-model="model.realname" :disabled="disableSubmit"/>
</a-form-model-item>
<!-- <a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workNo">
......@@ -45,7 +45,7 @@
</a-form-model-item> -->
<a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
<a-input placeholder="请输入手机号码" v-model="model.phone" />
<a-input placeholder="请输入手机号码" v-model="model.phone" :disabled="disableSubmit" />
</a-form-model-item>
<!-- <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
......@@ -63,7 +63,7 @@
<!--部门分配-->
<a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
<j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true" :disabled="disableSubmit">></j-select-depart>
</a-form-model-item>
<!--租户分配-->
......@@ -92,7 +92,7 @@
</a-form-model-item>
<a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
<j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" :disabled="disableSubmit"></j-image-upload>
</a-form-model-item>
<a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
......@@ -101,22 +101,22 @@
placeholder="请选择生日"
v-model="model.birthday"
:format="dateFormat"
:getCalendarContainer="node => node.parentNode"/>
:getCalendarContainer="node => node.parentNode" :disabled="disableSubmit"/>
</a-form-model-item>
<a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select v-model="model.sex" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
<a-select v-model="model.sex" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode" :disabled="disableSubmit">
<a-select-option :value="1">男</a-select-option>
<a-select-option :value="2">女</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
<a-input placeholder="请输入邮箱" v-model="model.email" />
<a-input placeholder="请输入邮箱" v-model="model.email" :disabled="disableSubmit"/>
</a-form-model-item>
<a-form-model-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
<a-input placeholder="请输入座机" v-model="model.telephone" />
<a-input placeholder="请输入座机" v-model="model.telephone" :disabled="disableSubmit"/>
</a-form-model-item>
<!-- <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
......@@ -173,7 +173,7 @@
roles:{},
// workNo:[ { required: true, message: '请输入工号' },
// { validator: this.validateWorkNo }],
telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' },]
//telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' },]
},
departIdShow:false,
title:"操作",
......@@ -232,7 +232,7 @@
this.departIdShow=false;
}
if(record.hasOwnProperty("id")){
if(record.id){
that.getUserRoles(record.id);
that.getUserDeparts(record.id);
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论