Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_test

src/components/select/searchTeam.vue

@@ -8,7 +8,7 @@
     :remote-method="remoteMethod"
     :loading="loading"
     :size="size"
-    placeholder="请输入姓名或邮箱前缀 (支持搜索邮箱组)"
+    :placeholder="placeholder"
     :disabled="disabled"
     @change="changeSelect"
   >
@@ -35,6 +35,11 @@ export default {
       default: '',
       required: false
     },
+    placeholder: {
+      type: String,
+      default: '请输入姓名或邮箱前缀 (支持搜索邮箱组)',
+      required: false
+    },
     size: {
       type: String,
       default: 'small',

src/views/ToConfigure/configure.vue

@@ -217,7 +217,7 @@
                     { min: 1, max: 20, message: '模块名称过长', trigger: 'blur' }
                   ]"
                 >
-                  <el-col :span="11">
+                  <el-col :span="20">
                     <el-input v-model="moduleForm.moduleNames[index]" autocomplete="off" placeholder="不超过20个字符" />
                   </el-col>
                   <el-col v-show="index === moduleForm.moduleNames.length-1" :span="2" :offset="1">
@@ -230,7 +230,7 @@
                   <el-col :span="11">{{ curcentParent }}</el-col>
                 </el-form-item>
                 <el-form-item label="模块名称:" :label-width="formLabelWidth">
-                  <el-col :span="11">
+                  <el-col :span="20">
                     <el-input v-model="moduleForm.moduleNames[0]" autocomplete="off" placeholder="不超过20个字符" />
                   </el-col>
                 </el-form-item>

src/views/projectManage/bugList/file/createdBug.vue

@@ -363,8 +363,10 @@ export default {
       if (e === 2) {
         this.titleName = '复制缺陷'
         if (ele !== undefined) {
+          console.log(ele, this.userInformation, 'cddcs')
           this.formInline = ele
           this.show2 = true
+          this.formInline.creatorList = this.userNames
           this.$set(this.formInline, 'bugName', '')
           this.$set(this.formInline, 'accessory', '')
           this.options = []

src/views/projectManage/components/demand.vue

@@ -145,6 +145,7 @@ export default {
           }
         }
       },
+      deep: true,
       immediate: true
     }
   },
@@ -294,7 +295,7 @@ export default {
   display: inline-block;
   // width: 100px;
   margin: 10px 0;
-  font-size:12px;
+  font-size:14px;
   line-height:14px;
   color:rgba(102,102,102,1);
   opacity:1;

src/views/projectManage/taskList/components/reportList.vue

@@ -214,7 +214,7 @@
     </section>
     <!-- 弹框 -->
     <Test-report v-if="dialogTest" ref="TestReport" />
-    <Daily-report v-if="dialogDaily" ref="DailyReport" />
+    <Daily-report v-if="dialogDaily" ref="DailyReport" @getList="dailyReportGetByTaskIdV2" />
     <ReleaseReport v-if="dialogClient" ref="ClientReport" />
 
     <el-dialog :title="title" :visible.sync="reportDaily" class="public_task" width="70%" :close-on-click-modal="false">
@@ -336,6 +336,7 @@ export default {
     },
 
     async dailyReportGetByTaskIdV2(e) {
+      alert()
       e ? this.dailyDataStatus = false : ''
       const indexPage = { taskId: this.taskId, bizId: localStorage.getItem('bizId'), curIndex: this.dailyPages.curIndex, pageSize: this.dailyPages.pageSize }
       const res = await dailyReportGetByTaskIdV2(indexPage)

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -66,11 +66,11 @@
       <el-row class="from-margin">
         <el-col :span="12" class="Layout_space_between">
           <span class="from-name">开发人员： </span>
-          <searchTeam :value.sync="from.developer" :clearable="true" :multiple="true" :disabled="releaseType" :size="'small'" style="width: 100%;" />
+          <searchTeam :value.sync="from.developer" :clearable="true" :multiple="true" :disabled="releaseType" :placeholder="'请输入姓名或邮箱前缀'" :size="'small'" style="width: 100%;" />
         </el-col>
         <el-col :span="12" class="Layout_space_between">
           <span class="from-namer"> 测试人员：</span>
-          <searchTeam :value.sync="from.tester" :clearable="true" :multiple="true" :disabled="releaseType" :size="'small'" style="width: 100%;" />
+          <searchTeam :value.sync="from.tester" :clearable="true" :multiple="true" :disabled="releaseType" :placeholder="'请输入姓名或邮箱前缀'" :size="'small'" style="width: 100%;" />
         </el-col>
       </el-row>
       <normal-area id="report-template" :value.sync="fromData.content" :height="500" />
@@ -365,6 +365,12 @@ export default {
     opacity:1;
     >>> .el-form-item__label {
     color: #333;
+}
+>>> .el-date-editor .el-range-separator {
+    padding: 0 5px;
+    line-height: 26px;
+    width: auto;
+    color: #303133;
 }
     .from-name {
       width: 140px !important;

src/views/reportManagement/Testing/TestingPreview.vue

@@ -26,7 +26,7 @@
         </el-col>
       </el-row>
 
-      <el-row v-show="fromCreateData.isDelay === 1">
+      <el-row v-if="fromCreateData.deliverTestPlanTime < fromCreateData.deliverTestActualTime ">
         <el-col :span="24" class="Layout_space_between">
           <span class="parent-style">提测延期原因 : {{ fromCreateData.delayReason }}</span>
         </el-col>

src/views/reportManagement/Testing/components/deliverDetails.vue

@@ -29,7 +29,7 @@
           </el-col>
         </el-row>
 
-        <el-row v-show="details.isDelay === 1">
+        <el-row v-if="details.deliverTestPlanTime < details.deliverTestActualTime ">
           <el-col :span="24" class="Layout_space_between task-bot">
             <span class="from-namea"><span class="test-details">提测延期原因：</span>{{ details.delayReason }}</span>
           </el-col>

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -77,7 +77,7 @@
         </el-col>
         <el-col v-if="from.isCodeReview === 1" :span="12" class="Layout_space_between">
           <span class="from-namer"><span style="color: red;">*</span>执行人：</span>
-          <searchTeam :value.sync="from.codeReviewExecutor" :clearable="true" :multiple="true" :size="'small'" :disabled="releaseType" style="width: 100%;" />
+          <searchTeam :value.sync="from.codeReviewExecutor" :clearable="true" :multiple="true" :size="'small'" :placeholder="'请输入姓名或邮箱前缀'" :disabled="releaseType" style="width: 100%;" />
         </el-col>
       </el-row>
     </el-form>
@@ -165,7 +165,7 @@ export default {
     },
     taskIds: {
       handler(newV) {
-        if (newV) {
+        if (newV[0]) {
           this.taskId = newV
           this.reportdelivertestInitReportRelease(newV)
         }
@@ -209,6 +209,7 @@ export default {
       if (from.devActualTimeStart) {
         this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发时间
       }
+      this.$set(this.from, 'delayReason', from.delayReason) // 延期原因
       this.from.deliverTestActualTime = from.deliverTestActualTime // 实际提测时间
       this.$set(this.from, 'followVersion', from.followVersion) // 是否跟版1 跟版 2 不跟版
       this.$set(this.from, 'isCodeReview', from.isCodeReview) // 是否code review 0：否 1：是
@@ -256,6 +257,7 @@ export default {
             data.taskIds = this.taskId
             data.bizId = localStorage.getItem('bizId')
             data.moduleId = this.tpltId
+            data.delayReason = this.from.delayReason
             data.deliverTestPlanTime = this.from.deliverTestPlanTime // 计划提测时间
             data.deliverTestActualTime = this.from.deliverTestActualTime // 实际提测时间
             if (this.from.devPlanTimeStart) {
@@ -284,6 +286,7 @@ export default {
             data.taskIds = this.taskId
             data.bizId = localStorage.getItem('bizId')
             data.moduleId = this.tpltId
+            data.delayReason = this.from.delayReason
             data.deliverTestPlanTime = this.from.deliverTestPlanTime // 计划提测时间
             data.deliverTestActualTime = this.from.deliverTestActualTime // 实际提测时间
             if (this.from.devPlanTimeStart) {
@@ -363,6 +366,12 @@ export default {
     opacity:1;
     >>> .el-form-item__label {
     color: #333;
+}
+>>> .el-date-editor .el-range-separator {
+    padding: 0 5px;
+    line-height: 26px;
+    width: auto;
+    color: #303133;
 }
     .from-name {
       width: 150px !important;