From ca788e3a4122fbeb46947be76ec21625306fa0a7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 10:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/gzll/owners.vue | 77 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/src/views/gzll/owners.vue b/src/views/gzll/owners.vue
index 1ddf494..35b7f53 100644
--- a/src/views/gzll/owners.vue
+++ b/src/views/gzll/owners.vue
@@ -10,6 +10,11 @@
@click="manageMember(scope.row)">业委会成员
</el-button>
</template>
+
+ <template slot-scope="{ row, size }" slot="status">
+ <el-tag :size="size" :type="showStatus(row.status).type" v-text="showStatus(row.status).text">
+ </el-tag>
+ </template>
</avue-crud>
<el-drawer title="业委会成员" size="40%" append-to-body :visible.sync="memberFlag" :direction="'rtl'">
@@ -51,6 +56,12 @@
selectionList: [],
memberFlag: false,
option: {
+ labelWidth: 120,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 300,
+
// menu: false,
// addBtn: false,
border: true,
@@ -60,8 +71,6 @@
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
//stripe:true,
viewBtn: true,
excelBtn: true,
@@ -80,8 +89,6 @@
},
defaultExpandedKeys: ["361102003"],
cascader: ['principalId'],
- span: 10,
- labelWidth: 120,
overHidden: true,
rules: [{
required: true,
@@ -91,13 +98,12 @@
},
{
- span: 10,
- labelWidth: 120,
- offset: 2,
+ overHidden: true,
+ width: 120,
label: "业委会名称",
prop: "name",
search: true,
- searchLabelWidth: 136,
+ searchLabelWidth: 124,
rules: [{
required: true,
message: "请输入业委会名称",
@@ -106,8 +112,8 @@
},
{
- width: 220,
overHidden: true,
+ width: 220,
label: '小区名称',
addDisplay: false,
editDisplay: false,
@@ -121,8 +127,6 @@
display: false,
},
{
- span: 10,
- labelWidth: 120,
label: "业委会负责人",
prop: "principalId",
type: "tree",
@@ -141,10 +145,8 @@
},],
},
{
- span: 10,
- labelWidth: 120,
+ width: 120,
label: "负责人名称",
- offset: 2,
prop: "principalName",
rules: [{
required: true,
@@ -153,8 +155,7 @@
},],
},
{
- span: 10,
- labelWidth: 120,
+ width: 120,
label: "负责人手机号",
prop: "mobile",
rules: [{
@@ -165,10 +166,8 @@
},
{
- span: 10,
- labelWidth: 120,
+ width: 120,
label: "业委会届别",
- offset: 2,
prop: "session",
type: "number",
rules: [{
@@ -179,8 +178,7 @@
},
{
- span: 10,
- labelWidth: 120,
+ width: 100,
label: "成立时间",
prop: "establishTime",
type: "date",
@@ -190,14 +188,12 @@
{
span: 20,
- labelWidth: 120,
label: "所在地址",
prop: "location",
},
{
- span: 10,
- labelWidth: 120,
+ width: 124,
label: "任期开始时间",
prop: "startTime",
type: "date",
@@ -211,10 +207,8 @@
},
{
- span: 10,
- labelWidth: 120,
+ width: 124,
label: "任期结束时间",
- offset: 2,
prop: "endTime",
type: "date",
format: "yyyy-MM-dd",
@@ -231,7 +225,6 @@
label: "图片",
prop: "imageUrl",
type: "upload",
- labelWidth: 120,
listType: "picture-img",
action: "/api/blade-resource/oss/endpoint/put-file",
propsHttp: {
@@ -240,12 +233,11 @@
url: "link",
},
viewDisplay: false,
- span: 20,
+ span: 24,
},
{
- span: 10,
- labelWidth: 120,
+ span: 12,
label: "排序",
prop: "sort",
type: 'number',
@@ -257,10 +249,10 @@
},
{
- span: 10,
- labelWidth: 120,
+ width: 100,
+ span: 12,
label: "状态",
- offset: 2,
+ slot: true,
prop: "status",
type: 'switch',
activeColor: "#13ce66",
@@ -284,7 +276,6 @@
{
span: 20,
- labelWidth: 120,
label: "简介",
prop: "profile",
component: "AvueUeditor",
@@ -302,7 +293,6 @@
// {
// label: "简介",
// prop: "profile",
- // // labelWidth: 140,
// viewDisplay: false,
// type: "textarea"
// },
@@ -330,6 +320,21 @@
})
return ids.join(",")
},
+ showStatus () {
+ return (data) => {
+ if (data == 0) {
+ return {
+ text: '正常',
+ type: 'success'
+ }
+ } else {
+ return {
+ text: '关闭',
+ type: 'info'
+ }
+ }
+ }
+ }
},
methods: {
manageMember (row) {
--
Gitblit v1.9.3