From bb921c7419e340ff64e3a8edfe72662ae332644e Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Fri, 22 Jan 2021 10:51:58 +0800
Subject: [PATCH] 业主信息
---
src/views/suser/suser.vue | 99 +++++++++++++++++++++++++++++++++++--------------
src/api/desk/notice.js | 2
src/page/login/userlogin.vue | 18 ++++----
3 files changed, 81 insertions(+), 38 deletions(-)
diff --git a/src/api/desk/notice.js b/src/api/desk/notice.js
index e1507d7..2ee1007 100644
--- a/src/api/desk/notice.js
+++ b/src/api/desk/notice.js
@@ -2,7 +2,7 @@
export const getList = (current, size, params) => {
return request({
- url: '/api/blade-desk/notice/list',
+ url: '/api/blade-desk/notice/page',
method: 'get',
params: {
...params,
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index ed70813..9f369f9 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -5,15 +5,15 @@
ref="loginForm"
:model="loginForm"
label-width="0">
-<!-- <el-form-item v-if="tenantMode" prop="tenantId">-->
-<!-- <el-input size="small"-->
-<!-- @keyup.enter.native="handleLogin"-->
-<!-- v-model="loginForm.tenantId"-->
-<!-- auto-complete="off"-->
-<!-- :placeholder="$t('login.tenantId')">-->
-<!-- <i slot="prefix" class="icon-quanxian"/>-->
-<!-- </el-input>-->
-<!-- </el-form-item>-->
+ <el-form-item v-if="tenantMode" prop="tenantId">
+ <el-input size="small"
+ @keyup.enter.native="handleLogin"
+ v-model="loginForm.tenantId"
+ auto-complete="off"
+ :placeholder="$t('login.tenantId')">
+ <i slot="prefix" class="icon-quanxian"/>
+ </el-input>
+ </el-form-item>
<el-form-item prop="username">
<el-input size="small"
@keyup.enter.native="handleLogin"
diff --git a/src/views/suser/suser.vue b/src/views/suser/suser.vue
index 3523c79..52c0b6f 100644
--- a/src/views/suser/suser.vue
+++ b/src/views/suser/suser.vue
@@ -51,12 +51,13 @@
calcHeight: 30,
tip: false,
searchShow: true,
- searchMenuSpan: 6,
border: true,
index: true,
viewBtn: true,
selection: true,
dialogClickModal: false,
+ labelWidth:130,
+ searchMenuSpan: 4,
maxHeight:'auto',
headerAlign: 'center',
align: 'center',
@@ -80,7 +81,7 @@
},
{
label: "业主名称",
- searchSpan: 5,
+ searchSpan: 4,
width:130,
search: true,
prop: "yname",
@@ -122,32 +123,19 @@
trigger: "blur"
}]
},
- {
- label: "行政区",
- width:80,
- prop: "addvcd",
- searchSpan: 4,
- search: true,
- type: "select",
- dicUrl: "/api/blade-jfpts/district/district/selectd",
- props: {
- label: "addvnm",
- value: "addvcds"
- },
- },
- {
- label: "类型",
- searchSpan: 4,
- search: true,
- width:70,
- prop: "type",
- type: "select",
- dicUrl: "/api/blade-jfpts/lx/lx/seleclx",
- props: {
- label: "types",
- value: "tnumber"
- },
- },
+ // {
+ // label: "行政区",
+ // width:80,
+ // prop: "addvcd",
+ // searchSpan: 4,
+ // search: true,
+ // type: "select",
+ // dicUrl: "/api/blade-jfpts/district/district/selectd",
+ // props: {
+ // label: "addvnm",
+ // value: "addvcds"
+ // },
+ // },
{
label: "等级",
searchSpan: 4,
@@ -176,6 +164,61 @@
prop: "createtime",
display: false,
},
+ {
+ label: '省份',
+ prop: 'province',
+ search: true,
+ searchSpan: 4,
+ type: 'select',
+ props: {
+ label: 'name',
+ value: 'code'
+ },
+ cascaderItem: ['city', 'district'],
+ dicUrl: '/api/blade-system/region/select',
+ span: 8,
+ },
+ {
+ label: '地市',
+ prop: 'city',
+ type: 'select',
+ searchSpan: 4,
+ search: true,
+ props: {
+ label: 'name',
+ value: 'code'
+ },
+ dicFlag: false,
+ dicUrl: '/api/blade-system/region/select?code={{key}}',
+ span: 8,
+ },
+ {
+ label: '区县',
+ searchSpan: 4,
+ search: true,
+ prop: 'district',
+ type: 'select',
+ props: {
+ label: 'name',
+ value: 'code'
+ },
+ dicFlag: false,
+ dicUrl: '/api/blade-system/region/select?code={{key}}',
+ span: 8,
+ },
+ {
+ label: "类型",
+ searchSpan: 4,
+ search: true,
+ width:70,
+ prop: "type",
+ type: "select",
+ dicUrl: "/api/blade-jfpts/lx/lx/seleclx",
+ props: {
+ label: "types",
+ value: "tnumber"
+ },
+ },
/* {
label: "空间坐标",
display: false,
--
Gitblit v1.9.3