qinzhipeng_v@didiglobal.com 4 år sedan
förälder
incheckning
cc7b5258f9

+ 1 - 1
src/views/reportManagement/ReleaseReport/components/releaseDetails.vue

@@ -78,7 +78,7 @@
           </el-col>
         </el-row>
 
-        <el-row class="task-bot">
+        <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
             <span class="from-name">
               <span class="test-details">开发人员:</span>

+ 2 - 2
src/views/reportManagement/ReleaseReport/releaePreview.vue

@@ -62,7 +62,7 @@
         </el-col>
       </el-row>
 
-      <el-row class="Above">
+      <el-row>
         <el-col :span="12" class="Layout_space_between">
           <div class="parent-style">开发人员:
             <span v-for="(item, index) in fromCreateData.devObject" :key="index">
@@ -171,7 +171,7 @@ export default {
   font-family: Microsoft Sans Serif;
   font-weight: 400;
   line-height: 22px;
-  margin: 10px 0;
+  margin: 0 0 10px;
   color: #666666;
   opacity: 1;
   .from-value {

+ 19 - 2
src/views/reportManagement/components/template/customTemplate.vue

@@ -89,10 +89,27 @@ export default {
       const keys = []
       this.customs.map(item => {
         if (e.type < 4) {
-          item.conditions === `${e.fieldKey}_${e.content}` ? item.bool = true : ''
+          if (item.conditions === `${e.fieldKey}_${e.content}`) {
+            item.bool = true
+            item.bools = true
+          } else {
+            if (item.conditions.split('_')[0] === e.fieldKey) {
+              item.bool = false
+              delete item.bools
+            }
+          }
         } else if (e.type === 4) {
           e.contents.map(i => {
-            item.conditions === `${e.fieldKey}_${i}` ? item.bool = true : ''
+            if (item.conditions === `${e.fieldKey}_${i}`) {
+              item.bool = true
+              item.bools = true
+            } else {
+              if (item.conditions.split('_')[0] === e.fieldKey) {
+                item.bool = false
+                delete item.bools
+              }
+            }
+            // item.conditions === `${e.fieldKey}_${i}` ? item.bool = true : ''
           })
         }
       })

+ 1 - 1
src/views/reportManagement/components/template/nodule.vue

@@ -69,7 +69,7 @@ export default {
     margin-bottom: 10px;
     .parent-fieldName {
       display: inline-block;
-      min-width: 100px;
+      // min-width: 100px;
     }
 }
 </style>