From 7e32f7c20a6342eec277a67946bb90b1c307611f Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 30 Jun 2023 14:27:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../closeLoopDispose/components/backlogDetailRecords.vue | 4 ++-- .../closeLoopDispose/components/completeDetailRecords.vue | 4 ++-- src/views/closeLoopDispose/components/copyDetailRecords.vue | 4 ++-- src/views/closeLoopDispose/components/myCourseDetailForm.vue | 1 + .../closeLoopDispose/components/myCourseDetailRecords.vue | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/views/closeLoopDispose/components/backlogDetailRecords.vue b/src/views/closeLoopDispose/components/backlogDetailRecords.vue index 77f0e6f..33779aa 100644 --- a/src/views/closeLoopDispose/components/backlogDetailRecords.vue +++ b/src/views/closeLoopDispose/components/backlogDetailRecords.vue @@ -139,7 +139,7 @@ export default { methods: { // 根据返回码值判断流程状态 use_change(val) { - if (val != null ) { + if (val) { return "已操作者" } else { return "未操作者" @@ -148,7 +148,7 @@ export default { styleChange(val) { switch (val) { case "未操作者": - return "#3eba75"; + return "#e55b5b"; // case "yellow": // return "#FDA722"; case "已操作者": diff --git a/src/views/closeLoopDispose/components/completeDetailRecords.vue b/src/views/closeLoopDispose/components/completeDetailRecords.vue index ee31deb..ffab068 100644 --- a/src/views/closeLoopDispose/components/completeDetailRecords.vue +++ b/src/views/closeLoopDispose/components/completeDetailRecords.vue @@ -106,7 +106,7 @@ export default { methods: { // 根据返回码值判断流程状态 use_change(val) { - if (val != null ) { + if (val) { return "已操作者" } else { return "未操作者" @@ -115,7 +115,7 @@ export default { styleChange(val) { switch (val) { case "未操作者": - return "#3eba75"; + return "#e55b5b"; // case "yellow": // return "#FDA722"; case "已操作者": diff --git a/src/views/closeLoopDispose/components/copyDetailRecords.vue b/src/views/closeLoopDispose/components/copyDetailRecords.vue index 278c6f5..31a3867 100644 --- a/src/views/closeLoopDispose/components/copyDetailRecords.vue +++ b/src/views/closeLoopDispose/components/copyDetailRecords.vue @@ -139,7 +139,7 @@ export default { methods: { // 根据返回码值判断流程状态 use_change(val) { - if (val != null ) { + if (val) { return "已操作者" } else { return "未操作者" @@ -148,7 +148,7 @@ export default { styleChange(val) { switch (val) { case "未操作者": - return "#3eba75"; + return "#e55b5b"; // case "yellow": // return "#FDA722"; case "已操作者": diff --git a/src/views/closeLoopDispose/components/myCourseDetailForm.vue b/src/views/closeLoopDispose/components/myCourseDetailForm.vue index 2c0292c..43c878d 100644 --- a/src/views/closeLoopDispose/components/myCourseDetailForm.vue +++ b/src/views/closeLoopDispose/components/myCourseDetailForm.vue @@ -441,6 +441,7 @@ export default { .course_idea_person_text { width: 75vw; margin-left: 1vw; + padding-top: 1vh; // border: 0.1px solid #3f5564; .dispose_idea, .attachment, diff --git a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue index b15f5df..c102e1c 100644 --- a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue +++ b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue @@ -135,7 +135,7 @@ export default { methods: { // 根据返回码值判断流程状态 use_change(val) { - if (val != null) { + if (val) { return "已操作者"; } else { return "未操作者"; @@ -144,7 +144,7 @@ export default { styleChange(val) { switch (val) { case "未操作者": - return "#3eba75"; + return "#e55b5b"; // case "yellow": // return "#FDA722"; case "已操作者": From 7fc831c925ea192f82bc5e7567461aeee566c58b Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 30 Jun 2023 14:34:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../closeLoopDispose/components/backlogDetailForm.vue | 2 ++ .../closeLoopDispose/components/backlogDetailRecords.vue | 8 ++++---- .../closeLoopDispose/components/completeDetailForm.vue | 2 ++ .../closeLoopDispose/components/completeDetailRecords.vue | 8 ++++---- src/views/closeLoopDispose/components/copyDetailForm.vue | 2 ++ .../closeLoopDispose/components/copyDetailRecords.vue | 8 ++++---- .../closeLoopDispose/components/myCourseDetailForm.vue | 1 + .../closeLoopDispose/components/myCourseDetailRecords.vue | 8 ++++---- 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue index c218081..40a135e 100644 --- a/src/views/closeLoopDispose/components/backlogDetailForm.vue +++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue @@ -496,6 +496,7 @@ export default { width: 15vw; height: 7vh; margin-left: 1.5vw; + padding-top: 1vh; // border: 0.1px solid #3f5564; display: flex; .el-image { @@ -529,6 +530,7 @@ export default { .backlog_idea_person_text { width: 75vw; margin-left: 1vw; + padding-top: 1vh; // border: 0.1px solid #3f5564; .dispose_idea, .attachment, diff --git a/src/views/closeLoopDispose/components/backlogDetailRecords.vue b/src/views/closeLoopDispose/components/backlogDetailRecords.vue index 33779aa..b7c2418 100644 --- a/src/views/closeLoopDispose/components/backlogDetailRecords.vue +++ b/src/views/closeLoopDispose/components/backlogDetailRecords.vue @@ -140,18 +140,18 @@ export default { // 根据返回码值判断流程状态 use_change(val) { if (val) { - return "已操作者" + return "已操作" } else { - return "未操作者" + return "未操作" } }, styleChange(val) { switch (val) { - case "未操作者": + case "未操作": return "#e55b5b"; // case "yellow": // return "#FDA722"; - case "已操作者": + case "已操作": return "#fff"; } }, diff --git a/src/views/closeLoopDispose/components/completeDetailForm.vue b/src/views/closeLoopDispose/components/completeDetailForm.vue index eaa99e3..8073449 100644 --- a/src/views/closeLoopDispose/components/completeDetailForm.vue +++ b/src/views/closeLoopDispose/components/completeDetailForm.vue @@ -368,6 +368,7 @@ export default { width: 15vw; height: 7vh; margin-left: 1.5vw; + padding-top: 1vh; // border: 0.1px solid #3f5564; display: flex; .el-image { @@ -401,6 +402,7 @@ export default { .complete_idea_person_text { width: 75vw; margin-left: 1vw; + padding-top: 1vh; // border: 0.1px solid #3f5564; .dispose_idea, .attachment, diff --git a/src/views/closeLoopDispose/components/completeDetailRecords.vue b/src/views/closeLoopDispose/components/completeDetailRecords.vue index ffab068..03d8de8 100644 --- a/src/views/closeLoopDispose/components/completeDetailRecords.vue +++ b/src/views/closeLoopDispose/components/completeDetailRecords.vue @@ -107,18 +107,18 @@ export default { // 根据返回码值判断流程状态 use_change(val) { if (val) { - return "已操作者" + return "已操作" } else { - return "未操作者" + return "未操作" } }, styleChange(val) { switch (val) { - case "未操作者": + case "未操作": return "#e55b5b"; // case "yellow": // return "#FDA722"; - case "已操作者": + case "已操作": return "#fff"; } }, diff --git a/src/views/closeLoopDispose/components/copyDetailForm.vue b/src/views/closeLoopDispose/components/copyDetailForm.vue index 1e3b8ea..c9e21a2 100644 --- a/src/views/closeLoopDispose/components/copyDetailForm.vue +++ b/src/views/closeLoopDispose/components/copyDetailForm.vue @@ -367,6 +367,7 @@ export default { width: 15vw; height: 7vh; margin-left: 1.5vw; + padding-top: 1vh; // border: 0.1px solid #3f5564; display: flex; .el-image { @@ -400,6 +401,7 @@ export default { .course_idea_person_text { width: 75vw; margin-left: 1vw; + padding-top: 1vh; // border: 0.1px solid #3f5564; .dispose_idea, .attachment, diff --git a/src/views/closeLoopDispose/components/copyDetailRecords.vue b/src/views/closeLoopDispose/components/copyDetailRecords.vue index 31a3867..7507344 100644 --- a/src/views/closeLoopDispose/components/copyDetailRecords.vue +++ b/src/views/closeLoopDispose/components/copyDetailRecords.vue @@ -140,18 +140,18 @@ export default { // 根据返回码值判断流程状态 use_change(val) { if (val) { - return "已操作者" + return "已操作" } else { - return "未操作者" + return "未操作" } }, styleChange(val) { switch (val) { - case "未操作者": + case "未操作": return "#e55b5b"; // case "yellow": // return "#FDA722"; - case "已操作者": + case "已操作": return "#fff"; } }, diff --git a/src/views/closeLoopDispose/components/myCourseDetailForm.vue b/src/views/closeLoopDispose/components/myCourseDetailForm.vue index 43c878d..c034f1f 100644 --- a/src/views/closeLoopDispose/components/myCourseDetailForm.vue +++ b/src/views/closeLoopDispose/components/myCourseDetailForm.vue @@ -408,6 +408,7 @@ export default { width: 15vw; height: 7vh; margin-left: 1.5vw; + padding-top: 1vh; // border: 0.1px solid #3f5564; display: flex; .el-image { diff --git a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue index c102e1c..0b2f27f 100644 --- a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue +++ b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue @@ -136,18 +136,18 @@ export default { // 根据返回码值判断流程状态 use_change(val) { if (val) { - return "已操作者"; + return "已操作"; } else { - return "未操作者"; + return "未操作"; } }, styleChange(val) { switch (val) { - case "未操作者": + case "未操作": return "#e55b5b"; // case "yellow": // return "#FDA722"; - case "已操作者": + case "已操作": return "#fff"; } }, From dea09f3dc0d32e262b1a8b066ccff3149bffe269 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 30 Jun 2023 14:37:44 +0800 Subject: [PATCH 3/4] =?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/backlogDetailForm.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue index 40a135e..0c1a661 100644 --- a/src/views/closeLoopDispose/components/backlogDetailForm.vue +++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue @@ -531,7 +531,6 @@ export default { width: 75vw; margin-left: 1vw; padding-top: 1vh; - // border: 0.1px solid #3f5564; .dispose_idea, .attachment, .send_person, From 5820047a697559f787e326fd49b2ee7a6ca60fb7 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Fri, 30 Jun 2023 15:15:26 +0800 Subject: [PATCH 4/4] =?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/myCourseDetailRecords.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue index 0b2f27f..8be5a5b 100644 --- a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue +++ b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue @@ -104,6 +104,7 @@ export default { }; }, created() { + console.log("send_detail2", this.send_detail); console.log("send_detail2", this.send_detail); let param = { definitionId: this.send_detail.procDefId,