Merge pull request 'lukeyan' (#112) from lukeyan into master

Reviewed-on: #112

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,7 +530,7 @@ export default {
   .backlog_idea_person_text {
     width: 75vw;
     margin-left: 1vw;
-    // border: 0.1px solid #3f5564;
+    padding-top: 1vh;
     .dispose_idea,
     .attachment,
     .send_person,

src/views/closeLoopDispose/components/backlogDetailRecords.vue

@@ -139,19 +139,19 @@ export default {
   methods: {
     // 根据返回码值判断流程状态
     use_change(val) {
-      if (val != null ) {
+      if (val) {
-        return "已操作者"
+        return "已操作"
       } else {
-        return "未操作者"
+        return "未操作"
       }
     },
     styleChange(val) {
       switch (val) {
-        case "未操作者":
+        case "未操作":
-          return "#3eba75";
+          return "#e55b5b";
         // case "yellow":
         //   return "#FDA722";
-        case "已操作者":
+        case "已操作":
           return "#fff";
       }
     },

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,

src/views/closeLoopDispose/components/completeDetailRecords.vue

@@ -106,19 +106,19 @@ export default {
   methods: {
     // 根据返回码值判断流程状态
     use_change(val) {
-      if (val != null ) {
+      if (val) {
-        return "已操作者"
+        return "已操作"
       } else {
-        return "未操作者"
+        return "未操作"
       }
     },
     styleChange(val) {
       switch (val) {
-        case "未操作者":
+        case "未操作":
-          return "#3eba75";
+          return "#e55b5b";
         // case "yellow":
         //   return "#FDA722";
-        case "已操作者":
+        case "已操作":
           return "#fff";
       }
     },

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,

src/views/closeLoopDispose/components/copyDetailRecords.vue

@@ -139,19 +139,19 @@ export default {
   methods: {
     // 根据返回码值判断流程状态
     use_change(val) {
-      if (val != null ) {
+      if (val) {
-        return "已操作者"
+        return "已操作"
       } else {
-        return "未操作者"
+        return "未操作"
       }
     },
     styleChange(val) {
       switch (val) {
-        case "未操作者":
+        case "未操作":
-          return "#3eba75";
+          return "#e55b5b";
         // case "yellow":
         //   return "#FDA722";
-        case "已操作者":
+        case "已操作":
           return "#fff";
       }
     },

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 {
@@ -441,6 +442,7 @@ export default {
   .course_idea_person_text {
     width: 75vw;
     margin-left: 1vw;
+    padding-top: 1vh;
     // border: 0.1px solid #3f5564;
     .dispose_idea,
     .attachment,

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,
@@ -135,19 +136,19 @@ export default {
   methods: {
     // 根据返回码值判断流程状态
     use_change(val) {
-      if (val != null) {
+      if (val) {
-        return "已操作者";
+        return "已操作";
       } else {
-        return "未操作者";
+        return "未操作";
       }
     },
     styleChange(val) {
       switch (val) {
-        case "未操作者":
+        case "未操作":
-          return "#3eba75";
+          return "#e55b5b";
         // case "yellow":
         //   return "#FDA722";
-        case "已操作者":
+        case "已操作":
           return "#fff";
       }
     },