优化

src/views/quality/components/drawerAll.vue

@@ -367,15 +367,16 @@ export default {
   color: #333333;
   font-weight: 600;
 }
-.qz-message { color: #444; font-size: 14px;}
 .qz-drawer-grade {
-  @extend .qz-message;
+  color: #444;
+  font-size: 14px;
   position: absolute;
   top: 28px;
   left: 185px;
 }
 .qz-drawer-grade-tow {
-  @extend .qz-message;
+  color: #444;
+  font-size: 14px;
   position: absolute;
   top: 28px;
   left: 150px;

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -28,7 +28,7 @@
       <el-form-item v-if="!releaseType" label="报告名称" prop="reportName" :rules="[{ required: true, message: '报告名称不能为空', trigger: 'change'}]"><br>
         <el-input v-model="from.reportName" size="small" type="text" maxlength="50" style="width:100%;" placeholder="请输入报告名称名称" />
       </el-form-item>
-      <div class="backStyle">{{ !releaseType? "报告内容" : '模版内容' }}</div>
+      <div class="backStyle">{{ !releaseType? "报告内容" : '模版内容' }} <el-button type="text" @click="customDialong">{{ !releaseType? "" : '自定义字段' }}</el-button></div>
 
       <el-row class="from-margin">
         <el-col :span="12" class="Layout_space_between">
@@ -124,11 +124,42 @@
     </el-table>
 
     <normal-area
-      id="report-template-2"
+      id="report-template-newtesting"
       :value.sync="fromCreateData.content"
       :height="500"
       :full-position-style="{ top:'20px',left:'15%', right: '15%' }"
     />
+
+    <ele-dialog :show-dialog="showCustom" :title="'自定义字段'" :width="'75%'" :submit-button="'确认'" :top="'5vh'" @confirm="confirmUpload()" @cancel="showCustom=false">
+      <div v-for="(item, index) in addCustomContent" :key="index">
+        <div class="Layout_space_between">
+          <span style="width: 10%">{{ index + 1 }}</span>
+          <el-input v-model="text" type="text" placeholder="请输入字段名称" maxlength="10" show-word-limit />
+          <el-select v-model="value" placeholder="请选择">
+            <el-option v-for="i in isRequiredOptions" :key="i.value" :label="i.label" :value="i.value" />
+          </el-select>
+          <el-select v-model="value" placeholder="请选择">
+            <el-option v-for="i in conditionOptions" :key="i.value" :label="i.label" :value="i.value" />
+          </el-select>
+          <span class="el-icon-minus icon-design" />
+        </div>
+        <div class="Layout_space_between">
+          <span>
+            <span>字段类型</span>
+            <el-select v-model="value" placeholder="请选择">
+              <el-option v-for="i in conditionOptions" :key="i.value" :label="i.label" :value="i.value" />
+            </el-select>
+          </span>
+          <el-input v-model="text" type="text" placeholder="请输入字段名称" show-word-limit />
+          <i class="el-icon-check" />
+          <i class="el-icon-close" />
+        </div>
+        <div class="Layout_space_between">
+          <span>选择项</span>
+        </div>
+      </div>
+      <el-button type="text" @click="setAddCustomContent"><span class="el-icon-plus icon-design" /> 新增字段 </el-button>
+    </ele-dialog>
   </div>
 </template>
 
@@ -140,13 +171,15 @@ import normalArea from '@/components/input/normalArea' // 富文本
 import 'tinymce/plugins/table'// 插入表格插件
 import { taskList } from '@/api/taskIndex'
 import { configShowTaskEnum } from '@/api/taskIndex'
+import eleDialog from '@/components/dialog/normalDialog'
 import { settingAddReportModule, settingUpdateReportModule, settingGetReportModuleById, reportdelivertestInitReportRelease, reportdelivertestCreate, reportdelivertestGetRequiresByTaskIds, reportdelivertestUpdate, reportdelivertestGetReportById } from '@/api/reportTemplate' // 模版添删改查
 import { getContainImgHTMLNode } from '@/utils/handleTinymce' // 富文本本图片转换
 
 export default {
   components: {
     normalArea,
-    searchPeople
+    searchPeople,
+    eleDialog
   },
   props: {
     taskIds: { type: Array, default: null },
@@ -154,6 +187,14 @@ export default {
   },
   data() {
     return {
+      addCustomContent: [],
+      showCustom: false,
+      isRequiredOptions: [{ value: false, label: '否' }, { value: true, label: '是' }],
+      conditionOptions: [
+        { value: 0, label: '默认展示' },
+        { value: 1, label: '是否跟版 - 是' },
+        { value: 2, label: '是否跟版 - 否' }
+      ],
       tableData: [],
       tpltId: '', // 模版id
       taskId: [], // 创建提测的任务
@@ -314,6 +355,9 @@ export default {
       const bizId_id = EncryptId(`${this.bizId}_${id}`)
       this.$router.push({ name: '需求详情', query: { bizId_id: bizId_id }})
     },
+    customDialong() {
+      this.showCustom = true
+    },
 
     // 创建提测报告
     reportreleaseCreate(val) {
@@ -429,12 +473,18 @@ export default {
           }
         }
       })
+    },
+
+    // 自定义字段
+    setAddCustomContent() {
+      this.addCustomContent = [...this.addCustomContent, { name: '' }]
     }
   }
 }
 </script>
 
 <style lang="less" scoped>
+  @import '@/styles/PublicStyle/index.less';
   .backStyle {
     font-size:14px;
     font-family:MicrosoftYaHei;
@@ -443,6 +493,10 @@ export default {
     color: #333;
     font-weight:700;
   }
+  .icon-design {
+    border: 1px solid;
+    font-size: 14px;
+  }
 
 .report-container {
     display: inline-block;

src/views/reportManagement/testPresentation.vue

@@ -87,6 +87,7 @@
             <div class="belong-task">
               <div class="task-id">{{ item.taskId }}</div>
               <div class="modules-name">
+                <span class="name">{{ `【${item.bizId}】` }}</span>
                 <span class="name">{{ item.name }}</span>
                 <span v-if="item.moduleInfoName" class="modules">{{ item.moduleInfoName }}</span>
               </div>