From 4e122793873828899b8e5659c8fc028400ab7fb5 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Fri, 30 Jun 2023 12:02:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/closeLoopDispose/components/myCourseDetailForm.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/closeLoopDispose/components/myCourseDetailForm.vue b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
index 39d5ec9..72f60c1 100644
--- a/src/views/closeLoopDispose/components/myCourseDetailForm.vue
+++ b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
@@ -179,6 +179,7 @@ export default {
taskId: this.send_detail.taskId,
};
get_my_course_record(param).then((res) => {
+ console.log('bbbb',res);
this.basic_message = res.data;
this.process_status = this.status_list.find(
(item) => item.value == this.basic_message.alarmStatus
From f1d5dfacf9fd8bfca88821993b195a073c96ae8b Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Fri, 30 Jun 2023 12:12:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/backlogDetailForm.vue | 49 ++++++++++---------
.../components/completeDetailForm.vue | 18 ++++---
.../components/copyDetailForm.vue | 4 +-
.../components/myCourseDetailForm.vue | 6 ++-
4 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue
index aa9726b..d1a56d8 100644
--- a/src/views/closeLoopDispose/components/backlogDetailForm.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue
@@ -88,7 +88,9 @@
处置完成
- 处置失败
+ 处置失败
@@ -109,7 +111,9 @@
@@ -117,13 +121,15 @@
处理意见:
-
{{ item.comment.comment }}
+
+ {{ item.comment.comment == null ? "" : item.comment.comment }}
+
-
-
+
@@ -165,8 +171,7 @@ export default {
suggest: "",
section: "",
},
- backlog_list: [
- ],
+ backlog_list: [],
status_list: [
{ label: "待审核", value: "1" },
{ label: "通过", value: "2" },
@@ -210,14 +215,14 @@ export default {
let param = {
procInsId: this.backlog_detail.procInsId,
taskId: this.backlog_detail.taskId,
- comment:this.form.suggest,
- approveType:'2',
- copyDeptIds: this.tags.map(item =>item.id)
+ comment: this.form.suggest,
+ approveType: "2",
+ copyDeptIds: this.tags.map((item) => item.id),
};
- get_backlog_approve(param).then(res=>{
- console.log('res_approve',res);
- this.$message.success('处置通过')
- this.$emit('back_home_page') // 回归首页
+ get_backlog_approve(param).then((res) => {
+ console.log("res_approve", res);
+ this.$message.success("处置通过");
+ this.$emit("back_home_page"); // 回归首页
});
},
// 处置失败
@@ -225,16 +230,16 @@ export default {
let param = {
procInsId: this.backlog_detail.procInsId,
taskId: this.backlog_detail.taskId,
- comment:this.form.suggest,
- approveType:'3',
- copyDeptIds: this.tags.map(item =>item.id)
+ comment: this.form.suggest,
+ approveType: "3",
+ copyDeptIds: this.tags.map((item) => item.id),
};
- get_backlog_approve(param).then(res=>{
- console.log('res_approve',res);
- this.$message.warning('处置失败')
- this.$emit('back_home_page') // 回归首页
+ get_backlog_approve(param).then((res) => {
+ console.log("res_approve", res);
+ this.$message.warning("处置失败");
+ this.$emit("back_home_page"); // 回归首页
});
- }
+ },
},
};
diff --git a/src/views/closeLoopDispose/components/completeDetailForm.vue b/src/views/closeLoopDispose/components/completeDetailForm.vue
index b2a2496..4dc3f10 100644
--- a/src/views/closeLoopDispose/components/completeDetailForm.vue
+++ b/src/views/closeLoopDispose/components/completeDetailForm.vue
@@ -77,7 +77,9 @@
@@ -85,13 +87,15 @@
处理意见:
-
{{ item.comment.comment }}
+
+ {{ item.comment.comment == null ? "" : item.comment.comment }}
+
-
-
-
+
+
+
@@ -139,7 +143,9 @@ export default {
};
get_my_course_record(param).then((res) => {
this.basic_message = res.data;
- this.process_status = this.status_list.find(item=>item.value == this.basic_message.alarmStatus).label
+ this.process_status = this.status_list.find(
+ (item) => item.value == this.basic_message.alarmStatus
+ ).label;
this.opinion_list = res.data.doneTaskVoList; // 流转意见
});
},
diff --git a/src/views/closeLoopDispose/components/copyDetailForm.vue b/src/views/closeLoopDispose/components/copyDetailForm.vue
index c5d8ed2..ad91a8c 100644
--- a/src/views/closeLoopDispose/components/copyDetailForm.vue
+++ b/src/views/closeLoopDispose/components/copyDetailForm.vue
@@ -85,7 +85,9 @@
处理意见:
-
{{ item.comment.comment }}
+
+ {{ item.comment.comment == null ? "" : item.comment.comment }}
+
diff --git a/src/views/closeLoopDispose/components/myCourseDetailForm.vue b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
index 72f60c1..2baa39b 100644
--- a/src/views/closeLoopDispose/components/myCourseDetailForm.vue
+++ b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
@@ -85,7 +85,9 @@
处理意见:
-
{{ item.comment.comment }}
+
+ {{ item.comment.comment == null ? "" : item.comment.comment }}
+
@@ -179,7 +181,7 @@ export default {
taskId: this.send_detail.taskId,
};
get_my_course_record(param).then((res) => {
- console.log('bbbb',res);
+ console.log("bbbb", res);
this.basic_message = res.data;
this.process_status = this.status_list.find(
(item) => item.value == this.basic_message.alarmStatus