Browse Source

修改社区管理

11wqe1 2 months ago
parent
commit
b5468a617a
2 changed files with 86 additions and 23 deletions
  1. 44 13
      src/components/organList.vue
  2. 42 10
      src/components/schoolList.vue

+ 44 - 13
src/components/organList.vue

@@ -360,22 +360,24 @@
                         <label class="el-form-item__label" style="width: 100px;flex-shrink: 0;">自定义分类</label>
 						<div style="">
 							<el-button size="mini" type="primary" @click="addType()">添加分类</el-button>
-							<div v-if="editCyInfo.typeL && editCyInfo.typeL.length" style="margin-top: 10px;">
-								<div v-for="(item,index) in editCyInfo.typeL" :key="item.id">
+							<div v-if="editCyInfo.typeL && editCyInfo.typeL.length" class="alltype">
+								<div class="typeArea" v-for="(item,index) in editCyInfo.typeL" :key="item.id">
+                                    <div style="font-size: 12px;">分类名称</div>
 									<div style="display: flex;gap: 20px;">
-										<div style="display: flex;align-items: center;gap: 10px;">
+										<div class="bigtype">
 											<el-input 
 												v-if="item.eit == 0" 
 												v-model="editCyInfo.typeL[index].name" placeholder="请输入内容">
 											</el-input>
-											<span v-else>{{ item.name }}</span>
+											<span style="font-size: 16px;font-weight: 600;" v-else>{{ item.name }}</span>
 										</div>
 										<span class="btn" @click="Deltype(index)">删除</span>
 										<span class="btn" v-if="item.eit == 0" @click="editCyInfo.typeL[index].eit = 1">确定</span>
 										<span class="btn" v-else @click="editCyInfo.typeL[index].eit = 0">编辑</span>
 									</div>
+                                    <div style="font-size: 12px;margin-top: 10px;">分类标签</div>
 									<div class="tagL">
-										<template v-if="item.children.length">
+										<template v-if="item.children && item.children.length">
 											<span style="display: flex;gap: 10px;align-items: center;" v-for="(i,ind) in item.children" :key="i.id">
 												<el-input 
 													v-if="i.eit == 0" 
@@ -387,7 +389,7 @@
 												<span class="btn" v-else @click="editCyInfo.typeL[index].children[ind].eit = 0">编辑</span>
 											</span>
 										</template>
-										<span @click="Addtag(index)">添加</span>
+										<span style="cursor: pointer;background-color: #409EFF;color: #fff;" @click="Addtag(index)">添加</span>
 									</div>
 								</div>
 							</div>
@@ -517,7 +519,7 @@ export default {
             cyloading:false,
 
             // 社区添加与修改所存储的信息 
-            editCyInfo:{name:'',banner:'',evatime:''},
+            editCyInfo:{name:'',banner:'',evatime:'',typeL:[]},
             // 添加与修改社区共用一个弹框 0是添加信息 1 修改信息
             isedit:0,
             // 添加与修改社区弹框
@@ -1025,7 +1027,8 @@ export default {
 						if (e.evatime) {
 							e.evatime = JSON.parse(e.evatime)
 							e.evatime2 = e.evatime.map(dateStr => this.formatDateCy(dateStr)).join('——')
-						}
+                        }
+						e.typeL = e.typeL ? JSON.parse(e.typeL) : '';
 					});
                     this.cytableData = data
                     
@@ -1059,13 +1062,16 @@ export default {
         // 点击添加社区 0 是添加社区 1是修改社区信息
         editCy(val,row){
             console.log('row',row);
-            
             this.isedit = val
 
-            this.dialogcyADD = true
             if (val == 1) {
-                this.editCyInfo = row
+				let kol = JSON.parse(JSON.stringify(row))
+				if (kol && !kol.typeL) {
+					kol.typeL = []
+				}
+                this.editCyInfo = kol
             }
+            this.dialogcyADD = true
         },
         // 添加组织社区 
         AddCy(){
@@ -1545,9 +1551,13 @@ export default {
 	display: flex;
 	align-items: center;
 	flex-wrap: wrap;
-	gap: 5px;
-	margin-top: 10px;
+	gap: 2px;
   }
+  .tagL >>> .el-input__inner{
+    height: 30px;
+    line-height: 30px;
+    width: 120px;
+}
   .tagL span{
 	background: aqua;
     padding: 5px 3px;
@@ -1556,5 +1566,26 @@ export default {
   }
   .btn{
 	cursor: pointer;
+    display: flex;
+    align-items: center;
   }
+  .bigtype{
+    display: flex;
+    align-items: center;
+    gap: 10px;
+  }
+.bigtype >>> .el-input__inner{
+    height: 30px;
+    line-height: 30px;
+    width: 120px;
+}
+.typeArea{
+    border: 1px #ccc solid;padding: 5px;border-radius: 10px;
+}
+.alltype{
+    margin-top: 10px;
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+}
 </style>

+ 42 - 10
src/components/schoolList.vue

@@ -436,21 +436,23 @@
 						<div style="">
 							<el-button size="mini" type="primary" @click="addType()">添加分类</el-button>
 							<div v-if="editCyInfo.typeL && editCyInfo.typeL.length" style="margin-top: 10px;">
-								<div v-for="(item,index) in editCyInfo.typeL" :key="item.id">
-									<div style="display: flex;gap: 20px;">
-										<div style="display: flex;align-items: center;gap: 10px;">
+								<div class="typeArea" v-for="(item,index) in editCyInfo.typeL" :key="item.id">
+                                    <div style="font-size: 12px;">分类名称</div>
+									<div style="display: flex;gap: 20px;margin-top: 2px;">
+										<div class="bigtype">
 											<el-input 
 												v-if="item.eit == 0" 
 												v-model="editCyInfo.typeL[index].name" placeholder="请输入内容">
 											</el-input>
-											<span v-else>{{ item.name }}</span>
+											<span style="font-size: 16px;font-weight: 600;" v-else>{{ item.name }}</span>
 										</div>
 										<span class="btn" @click="Deltype(index)">删除</span>
 										<span class="btn" v-if="item.eit == 0" @click="editCyInfo.typeL[index].eit = 1">确定</span>
 										<span class="btn" v-else @click="editCyInfo.typeL[index].eit = 0">编辑</span>
 									</div>
+                                    <div style="font-size: 12px;margin-top: 10px;">分类标签</div>
 									<div class="tagL">
-										<template v-if="item.children.length">
+										<template v-if="item.children && item.children.length">
 											<span style="display: flex;gap: 10px;align-items: center;" v-for="(i,ind) in item.children" :key="i.id">
 												<el-input 
 													v-if="i.eit == 0" 
@@ -462,7 +464,7 @@
 												<span class="btn" v-else @click="editCyInfo.typeL[index].children[ind].eit = 0">编辑</span>
 											</span>
 										</template>
-										<span @click="Addtag(index)">添加</span>
+										<span style="cursor: pointer;background-color: #409EFF;color: #fff;" @click="Addtag(index)">添加</span>
 									</div>
 								</div>
 							</div>
@@ -1190,10 +1192,15 @@ export default {
             
             this.isedit = val
 
-            this.dialogcyADD = true
             if (val == 1) {
-                this.editCyInfo = row
+				let kol = JSON.parse(JSON.stringify(row))
+				if (kol && !kol.typeL) {
+					kol.typeL = []
+				}
+                this.editCyInfo = kol
             }
+            this.dialogcyADD = true
+
         },
         // 添加组织社区 
         AddCy(){
@@ -1679,9 +1686,13 @@ export default {
 	display: flex;
 	align-items: center;
 	flex-wrap: wrap;
-	gap: 5px;
-	margin-top: 10px;
+	gap: 2px;
   }
+    .tagL >>> .el-input__inner{
+    height: 30px;
+    line-height: 30px;
+    width: 120px;
+}
   .tagL span{
 	background: aqua;
     padding: 5px 3px;
@@ -1690,5 +1701,26 @@ export default {
   }
   .btn{
 	cursor: pointer;
+    display: flex;
+    align-items: center;
   }
+  .bigtype{
+    display: flex;
+    align-items: center;
+    gap: 10px;
+  }
+.bigtype >>> .el-input__inner{
+    height: 30px;
+    line-height: 30px;
+    width: 120px;
+}
+.typeArea{
+    border: 1px #ccc solid;padding: 5px;border-radius: 10px;
+}
+.alltype{
+    margin-top: 10px;
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+}
 </style>