From fcfacc83b3905fcef555b5ab3d5fa817e67c6da7 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 22 Feb 2024 17:05:41 +0800
Subject: [PATCH] update
---
src/views/property/propertyCapitalApply.vue | 135 +++++++++++++++++++++++++++++++++
src/views/article/components/discussionManageChild.vue | 60 +++++++-------
src/views/article/rotation.vue | 5 +
src/views/property/convenienceHotline.vue | 9 +
4 files changed, 175 insertions(+), 34 deletions(-)
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index e79288a..5e893b5 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -92,7 +92,7 @@
type: 'radio',
button: true,
row: true,
- span: 6,
+ span: 12,
offset: 8,
value: 0,
dicData: [{
@@ -134,7 +134,7 @@
type: 'radio',
button: true,
row: true,
- span: 6,
+ span: 12,
offset: 8,
dicData: [{
label: '不需要',
@@ -150,40 +150,39 @@
}, ],
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
- // },
-
+ {
+ 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,
label: "选择用户",
prop: "userIds",
type: 'select',
- span: 6,
+ span: 12,
offset: 8,
remote: true,
hide: true,
row: true,
- dicUrl: "",
+ dicUrl: `/api/blade-system/user/getUserlnfoByDistrictlds?districtlds=`,
props: {
label: 'name',
value: 'id',
@@ -198,13 +197,13 @@
{
label: "截止时间",
- span: 6,
+ span: 12,
offset: 8,
row: true,
prop: "endTime",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
// format: "yyyy-MM-dd hh:mm:ss",
// valueFormat: "yyyy-MM-dd hh:mm:ss",
rules: [{
@@ -278,6 +277,7 @@
)
},
init(data) {
+ console.log("====>",data);
this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
this.dialogVisibles = true
this.disCussFrom = {}
diff --git a/src/views/article/rotation.vue b/src/views/article/rotation.vue
index b38f2bc..5093bba 100644
--- a/src/views/article/rotation.vue
+++ b/src/views/article/rotation.vue
@@ -59,9 +59,11 @@
searchSpan: 4,
search: true,
searchLabelWidth: 46,
+ labelWidth:100,
},
{
width: 110,
+ labelWidth:100,
label: "类型",
prop: "type",
span: 12,
@@ -81,6 +83,7 @@
},
{
width: 156,
+ labelWidth:100,
overHidden: true,
label: "所属社区",
parent: false,
@@ -107,9 +110,11 @@
label: "跳转地址",
prop: "junpUrl",
span: 12,
+ labelWidth:100,
},
{
width: 110,
+ labelWidth:100,
label: "图片",
prop: "url",
type: "upload",
diff --git a/src/views/property/convenienceHotline.vue b/src/views/property/convenienceHotline.vue
index 6399ed1..50e19d9 100644
--- a/src/views/property/convenienceHotline.vue
+++ b/src/views/property/convenienceHotline.vue
@@ -73,6 +73,7 @@
search: true,
searchLabelWidth: 46,
width: 260,
+ labelWidth:120,
rules: [{
required: true,
message: "请输入名称",
@@ -80,7 +81,8 @@
}, ],
},
{
- width: 120,
+ width: 140,
+ labelWidth:120,
label: "联系方式",
prop: "telephone",
span: 24,
@@ -90,7 +92,7 @@
trigger: "blur",
},
{
- validator: validatorPhone,
+ // validator: validatorPhone,
trigger: 'blur'
}
],
@@ -99,8 +101,9 @@
label: "备注",
prop: "remark",
span: 24,
+ labelWidth:120,
rules: [{
- required: true,
+ required: false,
message: "请输入备注",
trigger: "blur",
}, ],
diff --git a/src/views/property/propertyCapitalApply.vue b/src/views/property/propertyCapitalApply.vue
index ffa9d7f..07cc7f5 100644
--- a/src/views/property/propertyCapitalApply.vue
+++ b/src/views/property/propertyCapitalApply.vue
@@ -29,6 +29,35 @@
</el-button>
</template>
</avue-crud>
+
+
+ <el-dialog title="详情" append-to-body :visible.sync="showDialog" width="80%">
+ <avue-crud :option="optionList" ref="crud2" :data="optionData" :span-method="spanMethod">
+ </avue-crud>
+ </el-dialog>
+
+ <!-- <el-dialog title="详情" :visible.sync="showDialog" width="80%" z-index="55555" :before-close="showDialog = false">
+ <span>
+ 1111
+ </span>
+ <avue-crud :option="optionList" ref="crud2">
+ <template slot="menuLeft" v-if="!editFlag">
+ <el-button type="primary" size="small" plain icon="el-icon-circle-plus-outline" @click="add()">添加
+ </el-button>
+ </template>
+ <template #icon="scope">
+ <i :class="scope.row.icon" style="font-size:14px"></i>
+ </template>
+ <template #menu="{ row, size }">
+ <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
+ <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
+ <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">
+ 选择此项人数：{{ row.number }} 详情</el-button>
+ </template>
+ </avue-crud>
+ </el-dialog> -->
+
+
</basic-container>
</template>
@@ -48,6 +77,7 @@
export default {
data() {
return {
+ showDialog:false,
form: {
// constructionSchemeUrls:[]
},
@@ -284,6 +314,35 @@
value: '0.00'
},
{
+ hide: true,
+ parent: false,
+ label: "议事标题",
+ prop: "districtId",
+ search: false,
+ type: 'select',
+ dicUrl: `/api/blade-district/district/getDistrictTree?filterFlag=1`,
+ props: {
+ label: "name",
+ value: "id"
+ },
+ defaultExpandedKeys: ["361102003"],
+ span: 12,
+ width: 260,
+ rules: [{
+ required: true,
+ message: "请选择议事",
+ trigger: "blur",
+ }, ],
+ change:(val)=>{
+ console.log ("val===>", val)
+ if(val.value){
+ this.showDialog = true;
+ }
+
+ }
+ },
+
+ {
label: "项目摘要",
span: 24,
hide: true,
@@ -321,9 +380,66 @@
],
},
data: [],
+
+ optionList: {
+ hander:false,
+ menu: false,
+ headerAlign: 'center',
+ align: 'center',
+ border: true,
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ defaultExpandAll: true,
+ rowKey: 'id',
+ rowParentKey: 'parentId',
+ column: [{
+ label: '标题',
+ prop: 'title',
+ },
+ {
+ label: '选项内容',
+ prop: 'content',
+ },
+ {
+ label: '人数',
+ prop: 'count',
+ }
+ ]
+ },
+ optionData:[
+ {
+ title:"测试",
+ content:"选项1",
+ count:1
+ },
+ {
+ title:"测试",
+ content:"选项2",
+ count:2
+ },
+ {
+ title:"测试",
+ content:"选项",
+ count:2
+ },
+
+ ]
}
},
- watch: {},
+ watch: {
+ // 'form.districtId':{
+ // handler(newVal,oldVal){
+ // console.log("val===>", newVal)
+ // if(newVal){
+ // this.showDialog = true;
+ // }
+ // },
+ // deep: true,
+ // immediate: true
+
+ // }
+ },
computed: {
...mapGetters(["permission", "userInfo"]),
permissionList() {
@@ -451,6 +567,7 @@
done()
},
selectionChange(list) {
+ console.log(111);
this.selectionList = list
},
selectionClear() {
@@ -541,8 +658,24 @@
this.loading = false
this.selectionClear()
})
+ },
+ spanMethod({ row, column, rowIndex, columnIndex }) {
+ if (columnIndex === 0) {
+ if (rowIndex % 2 === 0) {
+ return {
+ rowspan: 2,
+ colspan: 1
+ }
+ } else {
+ return {
+ rowspan: 0,
+ colspan: 0
+ }
+ }
+ }
}
}
+
}
</script>
--
Gitblit v1.9.3