提测报告添加codeReview字段

src/views/Platform/presentation/PresentReport.vue

@@ -13,7 +13,7 @@
 
       <div class="backStyle">一. 提测详情</div>
 
-      <div class="double" style="white-space: nowrap;">
+      <div class="double" style="display: flex; justify-content: space-between; white-space: nowrap;">
         <el-form-item label="* 是否延期" style="text-align:right;">
           <el-button :type="lateStatusBtn" style="margin: 0 20px;" size="small" class="tag" @click="lateStatusChange(2)"> 是 </el-button>
           <el-button :type="lateStatusBtn1" class="tag" size="small" @click="lateStatusChange(1)"> 否 </el-button>
@@ -21,7 +21,7 @@
         <el-form-item v-if="showDelay" label="延期原因" prop="lateReason"><el-input v-model="dataChange.lateReason" size="small" style="width: 25vw;" /></el-form-item>
       </div>
 
-      <div class="double" style="white-space: nowrap;">
+      <div class="double" style="display: flex; justify-content: space-between; white-space: nowrap;">
         <el-form-item label="* 新增Apollo" style="text-align:right;">
           <el-button :type="configInBtn" style="margin: 0 6px" size="small" class="tag" @click="changeApollo(1)"> 是 </el-button>
           <el-button :type="configInBtn1" style="margin-left: 24px" size="small" class="tag" @click="changeApollo(2)"> 否 </el-button>
@@ -29,7 +29,7 @@
         <el-form-item v-if="showApollo" label="Apollo名称" prop="configInfo"><el-input v-model="dataChange.configInfo" size="small" style="width: 25vw;" /></el-form-item>
       </div>
 
-      <div class="double" style="white-space: nowrap;">
+      <div class="double" style="display: flex; justify-content: space-between; white-space: nowrap;">
         <el-form-item label="* 依赖组件" style="text-align:right;">
           <el-button :type="dependentBtn" style="margin: 0 20px;" size="small" class="tag" @click="changeRelyOn(1)"> 是 </el-button>
           <el-button :type="dependentBtn1" class="tag" size="small" @click="changeRelyOn(2)"> 否 </el-button>
@@ -37,6 +37,14 @@
         <el-form-item v-if="showRelyOn" label="组件名称" prop="dependentComponents"><el-input v-model="dataChange.dependentComponents" size="small" style="width: 25vw;" /></el-form-item>
       </div>
 
+      <div class="CodeReview" style="display: flex; justify-content: space-between; white-space: nowrap;">
+        <el-form-item label="* CodeReview">
+          <el-button :type="CodeReview" style="margin: 0 17px 0 8px;" size="small" class="tag" @click="changeCodeReview(1)"> 是 </el-button>
+          <el-button :type="CodeReview1" class="tag" size="small" @click="changeCodeReview(0)"> 否 </el-button>
+        </el-form-item>
+        <el-form-item v-if="showCodeReview" class="double" label="执行人" prop="crBy"><el-input v-model="dataChange.crBy" size="small" style="width: 25vw;" /></el-form-item>
+      </div>
+
       <div class="double">
         <el-form-item label="测试地址" prop="packageUrl"><el-input v-model="dataChange.packageUrl" size="small" style="width:15vw;" /></el-form-item>
         <el-form-item label="打包分支" prop="packageBranch"><el-input v-model="dataChange.packageBranch" size="small" style="width:25vw;" /></el-form-item>
@@ -127,7 +135,8 @@ export default {
         functionInfo: [{ required: true, message: '需求list不能为空', trigger: 'change' }],
         env: [{ required: true, message: '提测环境不能为空', trigger: 'change' }],
         configInfo: [{ required: true, message: 'Apollo名称不能为空', trigger: 'change' }],
-        dependentComponents: [{ required: true, message: '组件名称不能为空', trigger: 'change' }]
+        dependentComponents: [{ required: true, message: '组件名称不能为空', trigger: 'change' }],
+        crBy: [{ required: true, message: '执行人不能为空', trigger: 'change' }]
       },
       lateStatusBtn: 'info',
       lateStatusBtn1: 'info',
@@ -135,9 +144,12 @@ export default {
       configInBtn1: 'info',
       dependentBtn: 'info',
       dependentBtn1: 'info',
+      CodeReview: 'info',
+      CodeReview1: 'danger',
       showDelay: false,
       showApollo: false,
       showRelyOn: false,
+      showCodeReview: false, // 执行人
       userData: '',
       objData: '',
       userInformation: localStorage.getItem('username'),
@@ -154,7 +166,8 @@ export default {
       ids: [],
       configIn: '',
       dependent: '',
-      clien: ''
+      clien: '',
+      cr: ''
     }
   },
   created() {
@@ -211,6 +224,18 @@ export default {
           this.dependent = 2
           this.showRelyOn = false
         }
+        if (this.dataChange.crBy !== '') { // 执行人
+          this.CodeReview = 'success'
+          this.CodeReview1 = 'info'
+          this.dataChange.cr = 1
+          this.showCodeReview = true
+        } else {
+          this.CodeReview = 'info'
+          this.CodeReview1 = 'danger'
+          this.dataChange.cr = 0
+          this.dataChange.crBy = ''
+          this.showCodeReview = false
+        }
         this.$nextTick(() => {
           this.DetailsOfProposal.txt.html(this.dataChange.joinTest)
         })
@@ -321,12 +346,29 @@ export default {
         this.dependent = 2
         this.showRelyOn = false
       }
+    },
+
+    // CodeReview
+    changeCodeReview(e) {
+      if (e === 1) {
+        this.CodeReview = 'success'
+        this.CodeReview1 = 'info'
+        this.dataChange.cr = 1
+        this.showCodeReview = true
+      } else {
+        this.$set(this.dataChange, 'dependentComponents', '')
+        this.CodeReview = 'info'
+        this.CodeReview1 = 'danger'
+        this.dataChange.cr = 0
+        this.dataChange.crBy = ''
+        this.showCodeReview = false
+      }
     }
   }
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
   .eleStyle {
     width: 100%;
     height:100%;
@@ -352,6 +394,11 @@ export default {
     border: 1px solid #DEE2E7;
     height: auto;
   }
+  .CodeReview {
+    /deep/ .el-form-item__label {
+      width: 106px;
+    }
+  }
 
 </style>
 <style lang="stylus" scoped>

src/views/Platform/presentation/acceptTheReport.vue

@@ -19,6 +19,11 @@
             <div v-show="showData" style="flex:1" class="marage">完成结果 : {{ fromCreateData.safeInfo }}</div><br>
           </div>
 
+          <div style="display: flex;">
+            <el-form-item style="flex:1;margin: 0 0 1%;" label="CodeReview : "><span :style="CodeReview1">{{ CodeReview }}</span></el-form-item>
+            <el-form-item v-show="showCodeReview" style="flex:1" label="执行人 : ">{{ fromCreateData.crBy }}</el-form-item>
+          </div>
+
           <div style="display: flex;">
             <div style="flex:1">
               <div class="marage">SDL链接 : <a href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" style="color:blue;">普惠SDL准入标准</a></div><br>
@@ -69,6 +74,11 @@
             <el-form-item v-show="showDelay" style="flex:1" label="延期原因 : ">{{ fromCreateData.lateReason }}</el-form-item>
           </div>
 
+          <div style="display: flex;">
+            <el-form-item style="flex:1;margin: 0 0 1%;" label="CodeReview : "><span :style="CodeReview1">{{ CodeReview }}</span></el-form-item>
+            <el-form-item v-show="showCodeReview" style="flex:1" label="执行人 : ">{{ fromCreateData.crBy }}</el-form-item>
+          </div>
+
           <el-form-item label="PM & UI : ">{{ fromCreateData.pmUi }}</el-form-item><br>
           <div class="noWrap">
             <el-form-item label="测试建议 :">{{ fromCreateData.testSuggest }}</el-form-item><br>
@@ -105,6 +115,7 @@ export default {
       configInfo1: { color: 'green' },
       dependentComponents1: { color: 'green' },
       lateStatus1: { color: 'red' },
+      CodeReview1: { color: 'red' },
       safeStatus1: { color: 'green' },
       form: {},
       dependentCom: '',
@@ -112,11 +123,13 @@ export default {
       showDelay: false,
       showDelay1: false,
       showDelay2: false,
+      showCodeReview: false,
       towShow: false,
       oneShow: false,
       showData: false,
       joinTestOne: '',
       lateStatus: '',
+      CodeReview: '', // CodeReview
       safeStatus: '',
       name: '',
       haha: '',
@@ -157,6 +170,14 @@ export default {
         this.lateStatus = '否'
         this.lateStatus1.color = 'green'
       }
+      if (this.fromCreateData.crBy !== '') { // CodeReview
+        this.showCodeReview = true
+        this.CodeReview = '是'
+        this.CodeReview1.color = 'green'
+      } else {
+        this.showCodeReview = false
+        this.CodeReview = '否'
+      }
       if (this.fromCreateData.configInfo !== '') {
         this.showDelay1 = true
         this.config = '是'

src/views/Platform/presentation/presentationReport.vue

@@ -29,6 +29,14 @@
         <el-form-item v-if="showData" label="完成结果" prop="safeInfo"><el-input v-model="fromDev.safeInfo" size="small" style="width: 25vw;" /></el-form-item>
       </div>
 
+      <div class="CodeReview" style="display: flex; justify-content: space-between; white-space: nowrap;">
+        <el-form-item label="* CodeReview">
+          <el-button :type="CodeReview" style="margin: 0 9px 0 12px;" size="small" class="tag" @click="showCodeReviews(1)"> 是 </el-button>
+          <el-button :type="CodeReview1" class="tag" size="small" @click="showCodeReviews(0)"> 否 </el-button>
+        </el-form-item>
+        <el-form-item v-if="showCodeReview" class="double" label="执行人" prop="crBy"><el-input v-model="fromDev.crBy" size="small" style="width: 25vw;" /></el-form-item>
+      </div>
+
       <el-form-item label="SDL链接 : "><el-link href="http://wiki.intra.xiaojukeji.com/pages/viewpage.action?pageId=237016271" type="primary" target="_blank"> 普惠SDL准入标准</el-link></el-form-item>
 
       <div class="double">
@@ -129,13 +137,16 @@ export default {
         testSuggest: [{ required: true, message: '测试建议不能为空', trigger: 'change' }],
         isEdition: [{ required: true, message: '是否跟版不能为空', trigger: 'change' }],
         getInfo: [{ required: true, message: '涉及安全项不能为空', trigger: 'change' }],
-        safeInfo: [{ required: true, message: '完成结果不能为空', trigger: 'change' }]
+        safeInfo: [{ required: true, message: '完成结果不能为空', trigger: 'change' }],
+        crBy: [{ required: true, message: '执行人不能为空', trigger: 'change' }]
       },
       objData: '',
       lateStatusBtn: 'info',
       lateStatusBtn1: 'info',
       getInfoBtn: 'info',
       getInfoBtn1: 'info',
+      CodeReview: 'info',
+      CodeReview1: 'danger',
       userData: '',
       showDelay: false,
       labelWidth: '60px',
@@ -145,6 +156,7 @@ export default {
       ids: [],
       editorContent: '',
       showData: false,
+      showCodeReview: false,
       DetailsOfProposal: '',
       projectIdCode: ''
     }
@@ -199,6 +211,18 @@ export default {
           this.showData = false
           this.$set(this.fromDev, 'safeInfo', '')
         }
+        if (this.fromDev.crBy !== '') { // CodeReview
+          this.CodeReview = 'success'
+          this.CodeReview1 = 'info'
+          this.fromDev.cr = 1
+          this.showCodeReview = true
+        } else {
+          this.CodeReview = 'info'
+          this.CodeReview1 = 'danger'
+          this.fromDev.cr = 0
+          this.showCodeReview = false
+          this.$set(this.fromDev, 'crBy', '')
+        }
         this.$nextTick(() => {
           this.fromDev.joinTest !== null ? this.editorContent.txt.html(this.fromDev.joinTest) : ''
           this.fromDev.moduleInfo !== null ? this.DetailsOfProposal.txt.html(this.fromDev.moduleInfo) : ''
@@ -286,12 +310,28 @@ export default {
         this.getInfoBtn = 'danger'
         this.showData = true
       }
+    },
+
+    showCodeReviews(e) { // CodeReview
+      if (e === 1) {
+        this.CodeReview = 'success'
+        this.CodeReview1 = 'info'
+        this.fromDev.cr = 1
+        this.showCodeReview = true
+      }
+      if (e === 0) {
+        this.CodeReview1 = 'danger'
+        this.CodeReview = 'info'
+        this.fromDev.cr = 0
+        this.showCodeReview = false
+      }
+      this.$set(this.fromDev, 'crBy', '')
     }
   }
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .eleStyle {
     width: 100%;
     height:100%;
@@ -317,6 +357,11 @@ export default {
    border: 2px solid #DEE2E7;
    height: auto;
   }
+  .CodeReview {
+    /deep/ .el-form-item__label {
+      width: 106px;
+    }
+  }
 </style>
 <style lang="stylus" scoped>
   .double