diff --git a/src/apps/AppPageBasic/AppPageBasic.vue b/src/apps/AppPageBasic/AppPageBasic.vue
index 328fd565..a98d1746 100644
--- a/src/apps/AppPageBasic/AppPageBasic.vue
+++ b/src/apps/AppPageBasic/AppPageBasic.vue
@@ -21,6 +21,11 @@ export default {
name: '三务公开',
icon: require('./img/shgk.png'),
url: '../AppServicePublic/AppServicePublic?moduleId=b03d1ea68c8449ecb00685644e3f0192&listName=三务公开'
+ },
+ {
+ name: '问卷表单',
+ icon: require('./img/wjbd.png'),
+ url: '../AppAskForm/AppAskForm'
}
],
headerBg: require('./img/header-bg.png'),
diff --git a/src/apps/AppPageInteraction/img/wjbd.png b/src/apps/AppPageBasic/img/wjbd.png
similarity index 100%
rename from src/apps/AppPageInteraction/img/wjbd.png
rename to src/apps/AppPageBasic/img/wjbd.png
diff --git a/src/apps/AppPageInteraction/AppPageInteraction.vue b/src/apps/AppPageInteraction/AppPageInteraction.vue
index 4263d72a..0e4f4625 100644
--- a/src/apps/AppPageInteraction/AppPageInteraction.vue
+++ b/src/apps/AppPageInteraction/AppPageInteraction.vue
@@ -21,11 +21,6 @@ export default {
name: '小程序公告',
icon: require('./img/xcxgg.png'),
url: '../AppUniMsg/AppUniMsg'
- },
- {
- name: '问卷表单',
- icon: require('./img/wjbd.png'),
- url: '../AppAskForm/AppAskForm'
}
],
headerBg: require('./img/header-bg.png'),
diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 9b2c106a..85c884fb 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -9,11 +9,11 @@
-
-
+
+
{{ areaName }}
请选择
-
+
@@ -25,8 +25,8 @@
走访对象:{{ item.name }}
- {{ item.menuLevel3Name }}
- {{ $dict.getLabel('realityStatus', item.reality) }}
+ {{ item.menuLevel3Name }}
+ {{ $dict.getLabel('realityStatus', item.reality) }}
{{ item.title }}
diff --git a/src/apps/AppWalkask/add.vue b/src/apps/AppWalkask/add.vue
index 3a48b124..8e443618 100644
--- a/src/apps/AppWalkask/add.vue
+++ b/src/apps/AppWalkask/add.vue
@@ -75,6 +75,7 @@ export default {
reality: '',
realityValue: '',
menuLevel3Name: '',
+ applicationId: '',
title: '',
description: '',
images: [],
@@ -106,6 +107,7 @@ export default {
uni.$on('goBack', (data) => {
console.log(data)
this.forms.menuLevel3Name = data.applicationName
+ this.forms.applicationId = data.applicationId
this.forms.name = data.selectUser.name
this.forms.optionId = data.selectUser.id
})
@@ -165,7 +167,8 @@ export default {
applicationId: this.forms.applicationId,
name: this.forms.name,
optionId: this.forms.optionId,
- menuLevel3Name: this.forms.menuLevel3Name,
+ // menuLevel3Name: this.forms.menuLevel3Name,
+ applicationId: this.forms.applicationId,
reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality,
title: this.forms.title,
diff --git a/src/apps/AppWalkask/selectType.vue b/src/apps/AppWalkask/selectType.vue
index 0539617b..bb58c2fa 100644
--- a/src/apps/AppWalkask/selectType.vue
+++ b/src/apps/AppWalkask/selectType.vue
@@ -71,6 +71,7 @@ export default {
current: 1,
showType: true,
applicationName: '',
+ applicationId: '',
selectUser: {},
}
},
@@ -105,6 +106,7 @@ export default {
},
getUser(data) {
+ this.applicationId = data.id
this.$http.post(`/app/appapplicationinfo/list?appId=${data.id}¤t=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
if (res.code == 0) {
res.data.records.map((item) => {
@@ -116,7 +118,7 @@ export default {
},
submit() {
- uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName })
+ uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
uni.navigateBack()
// uni.navigateTo({ url: `./add` })
},