Skip to content

H
housing-estate
提交 06bb6295 authored 作者: 何忠建's avatar 何忠建
浏览文件
操作

修复bug

上级 94cd6ba0
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 145 行增加 和 116 行删除
src/components/custom/modal/JPopupOnlReport.vue
浏览文件 @ 06bb6295
......@@ -131,7 +131,11 @@
loadColumnsInfo(){
httpGroupRequest(() => getAction(this.url)).then(res => {
if(res.success){
this.table.dataSource = res.result
if(res.result.length > 0){
this.table.dataSource = res.result
}else if(res.result.records.length > 0){
this.table.dataSource = res.result.records
}
} else {
this.$error({
title: '出错了',
......
src/views/information/capital/capital.vue
浏览文件 @ 06bb6295
......@@ -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="设备名称">
<j-input placeholder="请输入设备名称" v-model="queryParam.assetName"></j-input>
</a-form-item>
</a-col>
......@@ -144,6 +144,12 @@
key: 'assetPosition',
align: 'center'
},
{
title: '所属小区',
dataIndex: 'platformName',
key: 'platformName',
align: 'center'
},
{
title: '操作',
dataIndex: 'action',
......
src/views/information/owner/owner.vue
浏览文件 @ 06bb6295
......@@ -11,15 +11,15 @@
</a-col>
<a-col :md="6" :sm="8">
<a-form-model-item label="房屋用途">
<a-select style="width: 100%" v-model="queryParam.chargeType" placeholder="请选择房屋用途">
<a-select style="width: 100%" v-model="queryParam.useTo" placeholder="请选择房屋用途">
<a-select-option v-for="item in useOptions" :key="item.value"
:value="item.value">{{item.label}}</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-model-item label="认证状态">
<a-select style="width: 100%" v-model="queryParam.chargeType" placeholder="请选择认证状态">
<a-form-model-item label="审核状态">
<a-select style="width: 100%" v-model="queryParam.auditStatus" placeholder="请选择审核状态">
<a-select-option v-for="item in certificationOptions" :key="item.value"
:value="item.value">{{item.label}}</a-select-option>
</a-select>
......@@ -86,7 +86,7 @@
<a @click="onRoutetAdd(record.id)">审核</a>
</template>
<template v-else-if="record.auditStatus === 'refuse'">
<a @click="handleEdit(record)">详情</a>
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" placement="topLeft">
<a>删除</a>
......
src/views/information/worker/modules/NoticeForm.vue
浏览文件 @ 06bb6295
......@@ -28,6 +28,14 @@
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
<a-select style="width: 100%" v-model="model.sex" placeholder="请选择性别">
<a-select-option :value="1">男</a-select-option>
<a-select-option :value="2">女</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
......@@ -75,6 +83,7 @@
employeePhone: '',
employeeDuties: '',
employeeStatus: '1',
sex: '',
employeeAvatar: ''
},
labelCol: {
......@@ -92,7 +101,8 @@
{ required: true, message: '请输入联系电话', trigger: 'blur' },
{ validator: validateToNextPhone }
],
employeeDuties: [{ required: true, message: '请选择员工职务', trigger: 'change' }]
employeeDuties: [{ required: true, message: '请选择员工职务', trigger: 'change' }],
sex: [{ required: true, message: '请选择员工性别', trigger: 'change' }]
},
url: {
add: "/property-company/employee/companyEmployee/add",
......
src/views/information/worker/worker.vue
浏览文件 @ 06bb6295
......@@ -54,9 +54,13 @@
class="j-table-force-nowrap"
@change="handleTableChange"
>
<span slot="sex" slot-scope="text, record">
<span>{{record.sex === 1 ? '男' :record.sex === 2 ? '女' : ''}}</span>
</span>
<span slot="employeeStatus" slot-scope="text, record">
<span :style="{'color': record.employeeStatus === '1' ? 'green' : 'red'}">{{record.employeeStatus === '1' ? '在职' : '离职'}}</span>
</span>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
......@@ -105,6 +109,13 @@
key: 'employeePhone',
align: 'center'
},
{
title: '性别',
dataIndex: 'sex',
scopedSlots: { customRender: 'sex' },
key: 'sex',
align: 'center'
},
{
title: '职务',
dataIndex: 'employeeDuties',
......
src/views/property/advertisement/advertisement.vue
浏览文件 @ 06bb6295
......@@ -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>
......@@ -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="handleEdit(record)">编辑</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,83 +83,85 @@
</template>
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import NoticeModal from './modules/NoticeModal'
import {URGENT_DEGREE, SCHEDULED_RELEASE, NOTICE_STATUS, filterDictTextByStatic} from '@/assets/static.js'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import NoticeModal from './modules/NoticeModal'
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'
}
}
},
methods: {}
}
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: {},
}
</script>
<style scoped>
@import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>
\ No newline at end of file
src/views/property/advertisement/modules/NoticeForm.vue
浏览文件 @ 06bb6295
......@@ -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:100%" :maxLength="200"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
......@@ -17,7 +17,7 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noticeContent">
<j-editor placeholder="请输入内容" v-model="model.noticeContent"/>
<j-editor placeholder="请输入内容" v-model="model.noticeContent" maxLength=""/>
</a-form-model-item>
</a-col>
<a-col :span="24">
......
src/views/property/living/living.vue
浏览文件 @ 06bb6295
......@@ -73,7 +73,7 @@
<a-divider type="vertical" />
<a @click="onCallPay(record.id)">催缴</a>
<a-divider type="vertical" />
<a @click="handleDelete(record)">删除</a>
<a @click="handleDelete(record.id)">删除</a>
</template>
</span>
</a-table>
......
src/views/property/receipt/receipt.vue
浏览文件 @ 06bb6295
......@@ -37,7 +37,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/system/RoleUserList.vue
浏览文件 @ 06bb6295
......@@ -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
浏览文件 @ 06bb6295
......@@ -108,7 +108,7 @@
title: '部门',
align: "center",
width: 150,
dataIndex: 'orgCode'
dataIndex: 'orgCodeTxt'
}
],
columns2: [
......
src/views/system/modules/UserModal.vue
浏览文件 @ 06bb6295
......@@ -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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论