kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
yanran200730
2022-08-18 18:25:09 +08:00
parent 49bd61c376 5dac5a8829
commit 238a6807ac
6 changed files with 295 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/publicity/AppVillageIntroduction/AppVillageIntroduction.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="doc-circulation ailist-wrapper"> <div class="doc-circulation ailist-wrapper">
<keep-alive :include="['List']"> <keep-alive :include="['List']">
<component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component> <component ref="component" :is="component" @change="onChange" :params="params" v-bind="$props"/>
</keep-alive> </keep-alive>
</div> </div>
</template> </template>
@@ -14,12 +14,11 @@
export default { export default {
name: 'AppVillageIntroduction', name: 'AppVillageIntroduction',
label: '本村简介', label: '本村简介',
props: { props: {
instance: Function, instance: Function,
dict: Object dict: Object,
menuName: {default: "本村简介"}
}, },
data() { data() {
return { return {
component: 'List', component: 'List',
@@ -27,7 +26,6 @@
include: [] include: []
} }
}, },
components: { components: {
Add, Add,
List, List,

10
packages/publicity/AppVillageIntroduction/components/Add.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<ai-detail> <ai-detail>
<template slot="title"> <template slot="title">
<ai-title :title="params.id ? '编辑本村简介' : '添加本村简介'" isShowBack isShowBottomBorder @onBackClick="cancel(false)"> <ai-title :title="pageTitle" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
</ai-title> </ai-title>
</template> </template>
<template slot="content"> <template slot="content">
@@ -44,13 +44,15 @@
<script> <script>
import {mapState} from 'vuex' import {mapState} from 'vuex'
export default { export default {
name: 'Add', name: 'Add',
props: { props: {
instance: Function, instance: Function,
dict: Object, dict: Object,
params: Object params: Object,
menuName: String
}, },
data() { data() {
@@ -74,9 +76,9 @@
}, },
computed: { computed: {
...mapState(['user']) ...mapState(['user']),
pageTitle: v => `${!!v.params.id ? '编辑' : '添加'}${v.menuName}`
}, },
created() { created() {
this.form.areaId = this.user.info.areaId this.form.areaId = this.user.info.areaId
this.disabledLevel = this.user.info.areaList.length this.disabledLevel = this.user.info.areaList.length

6
packages/publicity/AppVillageIntroduction/components/List.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<ai-list class="notice"> <ai-list class="notice">
<template slot="title"> <template slot="title">
<ai-title title="本村简介" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title> <ai-title :title="menuName" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
</template> </template>
<template slot="content"> <template slot="content">
<ai-search-bar class="search-bar"> <ai-search-bar class="search-bar">
@@ -57,9 +57,9 @@
props: { props: {
instance: Function, instance: Function,
dict: Object dict: Object,
menuName:String
}, },
data() { data() {
return { return {
search: { search: {

5
packages/publicity/AppVillageRegulations/AppVillageRegulations.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="doc-circulation ailist-wrapper"> <div class="doc-circulation ailist-wrapper">
<keep-alive :include="['List']"> <keep-alive :include="['List']">
<component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component> <component ref="component" :is="component" @change="onChange" :params="params" v-bind="$props"/>
</keep-alive> </keep-alive>
</div> </div>
</template> </template>
@@ -17,7 +17,8 @@
props: { props: {
instance: Function, instance: Function,
dict: Object dict: Object,
menuName: {default: "村规民约"}
}, },
data() { data() {

8
packages/publicity/AppVillageRegulations/components/Add.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<ai-detail> <ai-detail>
<template slot="title"> <template slot="title">
<ai-title :title="params.id ? '编辑村规民约' : '添加村规民约'" isShowBack isShowBottomBorder @onBackClick="cancel(false)"> <ai-title :title="pageTitle" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
</ai-title> </ai-title>
</template> </template>
<template slot="content"> <template slot="content">
@@ -50,7 +50,8 @@
props: { props: {
instance: Function, instance: Function,
dict: Object, dict: Object,
params: Object params: Object,
menuName: String
}, },
data () { data () {
@@ -74,7 +75,8 @@
}, },
computed: { computed: {
...mapState(['user']) ...mapState(['user']),
pageTitle: v => `${!!v.params.id ? '编辑' : '添加'}${v.menuName}`
}, },
created () { created () {

6
packages/publicity/AppVillageRegulations/components/List.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<ai-list class="notice"> <ai-list class="notice">
<template slot="title"> <template slot="title">
<ai-title title="村规民约" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title> <ai-title :title="menuName" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
</template> </template>
<template slot="content"> <template slot="content">
<ai-search-bar class="search-bar"> <ai-search-bar class="search-bar">
@@ -52,12 +52,14 @@
<script> <script>
import {mapState} from 'vuex' import {mapState} from 'vuex'
export default { export default {
name: 'List', name: 'List',
props: { props: {
instance: Function, instance: Function,
dict: Object dict: Object,
menuName: String
}, },
data() { data() {