diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue index ecdb446f9..ace582367 100644 --- a/src/views/modules/volunteer/LifeCircleManagement/add.vue +++ b/src/views/modules/volunteer/LifeCircleManagement/add.vue @@ -336,13 +336,6 @@ "label": "文化体育" }, { - // "children": [ - // { - // "pv":"5", - // "value": "51", - // "label": "其他" - // }, - // ], "value": "5", "label": "其它" } diff --git a/src/views/modules/volunteer/LifeCircleManagement/index.vue b/src/views/modules/volunteer/LifeCircleManagement/index.vue index 5ecb48202..60120ce53 100644 --- a/src/views/modules/volunteer/LifeCircleManagement/index.vue +++ b/src/views/modules/volunteer/LifeCircleManagement/index.vue @@ -444,33 +444,31 @@ export default { pageNo:this.pageNo, pageSize: this.pageSize } - const { data, code, msg } = await requestGet(url,params); - if (code === 0) { - console.log("列表请求成功!!!!!!!!!!!!!!"); - this.total = data.total || 0; - this.tableData = data.list - this.tableData.forEach(item=>{ - this.options.forEach(item1=>{ - console.log(item1,"item1.children.value"); - console.log(item1.children,"item1.children.value"); - console.log(item1.children.value,"item1.children.value"); + const { data, code, msg } = await requestGet(url, params); +if (code === 0) { + console.log("列表请求成功!!!!!!!!!!!!!!"); + this.total = data.total || 0; + this.tableData = data.list; - item1.children.forEach(item2=>{ - if (item2.value==item.type) { - item.typeName=item2.label - }else{ - item.typeName="其他" - } - }) - - - } - ) - }) - console.log(this.tableData,"this.tableDatadsfdsf"); - - } else { - } + this.tableData.forEach(item => { + this.options.forEach(item1 => { + console.log(item1, "item1"); + console.log(item1.children, "item1.children"); + if (Array.isArray(item1.children)) { + item1.children.forEach(item2 => { + if (item2.value.toString() == item.type) { + item.typeName = item2.label; + } + }); + } else { + } + }); + }); + + console.log(this.tableData, "this.tableData"); +} else { + // 错误处理逻辑 +} }, //模板 async uploadHttpRequest(file) { diff --git a/src/views/modules/volunteer/LifeCircleManagement/info.vue b/src/views/modules/volunteer/LifeCircleManagement/info.vue index cb5bdb49a..6a5460c9e 100644 --- a/src/views/modules/volunteer/LifeCircleManagement/info.vue +++ b/src/views/modules/volunteer/LifeCircleManagement/info.vue @@ -17,7 +17,7 @@
{{ formData.typeName }}
--> -
{{ formData.positionName }}
+
{{ formData.typeName }}
- - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - - - - +
+ +
+ 新增 + 下载模板 + + + 导入 + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + +
+
- - - \ No newline at end of file + } + .div_btn { + display: flex; + justify-content: space-between; + } + .el-row { + /* margin-bottom: 20px; */ + display: flex; + flex-wrap: wrap; + margin-top: 10px; + margin-right: 50px; + } + + + + \ No newline at end of file