From b9aef3a9490ad1f750243b70903428afd3e28aa9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Jan 2024 11:53:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/propertySupervision/houseHoldSupervision.vue | 14 +++---
src/views/article/components/discussionManageChild.vue | 71 +++++++++++++++++------------------
src/views/article/components/deitDiscussion.vue | 25 +++++++++---
src/views/property/propertyCompany.vue | 4 +-
4 files changed, 62 insertions(+), 52 deletions(-)
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index e7ea244..3f399a0 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -115,11 +115,17 @@
prop: 'discussContent',
type: 'input',
row: true,
+ rules: [{
+ required: true,
+ message: '请输入议题',
+ trigger: 'blur'
+ }],
},
{
label: '选项范围',
prop: 'optionRange',
type: 'radio',
+ value: 0,
button: true,
row: true,
dicData: [{
@@ -128,14 +134,19 @@
}, {
label: '单选',
value: 0
- }]
+ }],
+ rules: [{
+ required: true,
+ message: '请选项范围',
+ trigger: 'blur'
+ }],
},
- {
- label: '排序',
- prop: 'sort',
- controlsPosition: '',
- type: 'number'
- },
+ // {
+ // label: '排序',
+ // prop: 'sort',
+ // controlsPosition: '',
+ // type: 'number'
+ // },
{
label: '选项内容',
prop: 'children',
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index 70d3329..e79288a 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="60%" :before-close="handleClose">
+ <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
<avue-form ref="DisCussFrom" :option="option" v-model="disCussFrom" @submit="handleSubmit"></avue-form>
</el-dialog>
</div>
@@ -86,26 +86,14 @@
addBtn: false,
searchMenuSpan: 3,
menuWidth: 500,
- column: [
- // {
- // label: '标题',
- // prop: 'title',
- // searchSpan: 4,
- // span: 6,
- // },
- {
- label: '参与人数',
- prop: 'topsCount',
- searchSpan: 4,
- display: false,
- span: 6,
- },
- {
+ column: [{
label: '开启投票',
prop: 'openFlag',
type: 'radio',
button: true,
+ row: true,
span: 6,
+ offset: 8,
value: 0,
dicData: [{
label: '开启',
@@ -124,7 +112,9 @@
prop: 'voteRestrictions',
type: 'radio',
button: true,
- span: 6,
+ row: true,
+ span: 12,
+ offset: 8,
dicData: [{
label: '一人一票',
value: 0
@@ -143,7 +133,9 @@
prop: 'signatureFlag',
type: 'radio',
button: true,
+ row: true,
span: 6,
+ offset: 8,
dicData: [{
label: '不需要',
value: 0
@@ -157,26 +149,29 @@
trigger: "blur",
}, ],
value: 0
- }, {
- label: '指定用户',
- prop: 'appointUser',
- type: 'radio',
- button: true,
- span: 6,
- dicData: [{
- label: '不限制',
- value: 0
- }, {
- label: '指定用户',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选择是否指定用户",
- trigger: "blur",
- }, ],
- value: 0
},
+ // {
+ // label: '指定用户',
+ // prop: 'appointUser',
+ // type: 'radio',
+ // button: true,
+ // row: true,
+ // span: 12,
+ // offset: 8,
+ // dicData: [{
+ // label: '不限制',
+ // value: 0
+ // }, {
+ // label: '指定用户',
+ // value: 1
+ // }],
+ // rules: [{
+ // required: true,
+ // message: "请选择是否指定用户",
+ // trigger: "blur",
+ // }, ],
+ // value: 0
+ // },
{
display: false,
@@ -184,8 +179,10 @@
prop: "userIds",
type: 'select',
span: 6,
+ offset: 8,
remote: true,
hide: true,
+ row: true,
dicUrl: "",
props: {
label: 'name',
@@ -202,6 +199,8 @@
{
label: "截止时间",
span: 6,
+ offset: 8,
+ row: true,
prop: "endTime",
type: "datetime",
format: "yyyy-MM-dd hh:mm:ss",
diff --git a/src/views/property/propertyCompany.vue b/src/views/property/propertyCompany.vue
index 4a3c0bb..d8c5ac5 100644
--- a/src/views/property/propertyCompany.vue
+++ b/src/views/property/propertyCompany.vue
@@ -18,8 +18,8 @@
@click="openPayConfig(row)">商户配置
</el-button>
- <el-button :size="size" icon="el-icon-circle-plus-outline" type="text" @click="addProperty()">物业评定
- </el-button>
+ <!-- <el-button :size="size" icon="el-icon-circle-plus-outline" type="text" @click="addProperty()">物业评定
+ </el-button> -->
</template>
</avue-crud>
diff --git a/src/views/propertySupervision/houseHoldSupervision.vue b/src/views/propertySupervision/houseHoldSupervision.vue
index 2682abc..4ad035d 100644
--- a/src/views/propertySupervision/houseHoldSupervision.vue
+++ b/src/views/propertySupervision/houseHoldSupervision.vue
@@ -225,13 +225,13 @@
hide: true,
display: false
},
- {
- width: 156,
- overHidden: true,
- label: "地址",
- prop: "address",
- display: false,
- },
+ // {
+ // width: 156,
+ // overHidden: true,
+ // label: "地址",
+ // prop: "address",
+ // display: false,
+ // },
{
// hide: true,
width: 220,
--
Gitblit v1.9.3