qinzhipeng_v 5 سال پیش
والد
کامیت
8d59cdd62c

+ 1 - 1
src/views/Platform/presentation/PresentReport.vue

@@ -224,7 +224,7 @@ export default {
           this.dependent = 2
           this.showRelyOn = false
         }
-        if (this.dataChange.crBy !== '') { // 执行人
+        if (this.dataChange.crBy !== '' && this.fromDev.crBy !== null) { // 执行人
           this.CodeReview = 'success'
           this.CodeReview1 = 'info'
           this.dataChange.cr = 1

+ 2 - 2
src/views/Platform/presentation/acceptTheReport.vue

@@ -129,7 +129,7 @@ export default {
       showData: false,
       joinTestOne: '',
       lateStatus: '',
-      CodeReview: '', // CodeReview
+      CodeReview: '', // CodeReview
       safeStatus: '',
       name: '',
       haha: '',
@@ -170,7 +170,7 @@ export default {
         this.lateStatus = '否'
         this.lateStatus1.color = 'green'
       }
-      if (this.fromCreateData.crBy !== '') { // CodeReview
+      if (this.fromCreateData.crBy !== '' && this.fromDev.crBy !== null) { // CodeReview
         this.showCodeReview = true
         this.CodeReview = '是'
         this.CodeReview1.color = 'green'

+ 2 - 1
src/views/Platform/presentation/presentationReport.vue

@@ -211,7 +211,8 @@ export default {
           this.showData = false
           this.$set(this.fromDev, 'safeInfo', '')
         }
-        if (this.fromDev.crBy !== '') { // CodeReview
+        if (this.fromDev.crBy !== '' && this.fromDev.crBy !== null) { // CodeReview
+          alert(this.fromDev.crBy !== null)
           this.CodeReview = 'success'
           this.CodeReview1 = 'info'
           this.fromDev.cr = 1