diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue index 2aa31abb..9a428449 100644 --- a/src/apps/AppMonitoringObject/Detail.vue +++ b/src/apps/AppMonitoringObject/Detail.vue @@ -2,7 +2,7 @@
基本信息 - 帮扶日志 + 走访日志
@@ -165,7 +165,7 @@
-

帮扶措施

+

帮扶情况

({{ isPoorStatus ? '已填写' : '未填写' }})
编辑 @@ -179,6 +179,14 @@ {{ $dict.getLabel('fpHealthAssistance', info.healthAssistance) || '-' }}
+
+
+
+

帮扶措施

+
+ 查看 +
+
@@ -206,7 +214,7 @@
-
+
@@ -342,7 +350,7 @@ export default { success: res => { if (res.tapIndex === 0) { uni.navigateTo({ - url: `./MonitorAddLog?pid=${this.info.id}&id=${id}` + url: `./MonitorAddLog?pid=${this.info.id}&id=${id}&type=0` }) } else if (res.tapIndex === 1) { this.$confirm('确定删除该数据?').then(() => { @@ -371,7 +379,13 @@ export default { toAddLog() { uni.navigateTo({ - url: './MonitorAddLog?pid=' + this.info.id + url: `./MonitorAddLog?pid=${this.info.id}&type=0` + }) + }, + + toLogList() { + uni.navigateTo({ + url: `./LogList?id=${this.info.id}` }) }, @@ -402,7 +416,7 @@ export default { this.pageShow = true } }) - this.$http.post(`/app/apppreventionreturntopovertylog/list?pid=${this.id}&size=1000¤t=1`).then(res => { + this.$http.post(`/app/apppreventionreturntopovertylog/list?pid=${this.id}&size=1000¤t=1&type=0`).then(res => { if (res.code === 0) { this.list = res.data.records || [] } diff --git a/src/apps/AppMonitoringObject/LogList.vue b/src/apps/AppMonitoringObject/LogList.vue new file mode 100644 index 00000000..ca7a9c2d --- /dev/null +++ b/src/apps/AppMonitoringObject/LogList.vue @@ -0,0 +1,371 @@ + + + + + diff --git a/src/apps/AppMonitoringObject/MonitorAddLog.vue b/src/apps/AppMonitoringObject/MonitorAddLog.vue index 6e5b50b8..30a85df1 100644 --- a/src/apps/AppMonitoringObject/MonitorAddLog.vue +++ b/src/apps/AppMonitoringObject/MonitorAddLog.vue @@ -3,9 +3,9 @@
* -

帮扶内容

+

{{type == 1 ? '帮扶内容' : '走访内容'}}

- +
{{ detail.length }}/500
@@ -29,11 +29,13 @@ export default { detail: '', pid: '', files: [], - id: '' + id: '', + type: '' } }, onLoad(query) { this.pid = query.pid + this.type = query.type if(query.id) { this.id = query.id this.getInfo() @@ -59,7 +61,8 @@ export default { detail: this.detail, files: this.files, pid: this.pid, - id: this.id + id: this.id, + type: this.type }).then(res => { if (res.code === 0) { this.$u.toast('提交成功')