Browse Source

空的时候不合并

luolei 4 years ago
parent
commit
a8d277909e
1 changed files with 7 additions and 7 deletions
  1. 7 7
      src/components/autoTest/AutoBillCommonTest.vue

+ 7 - 7
src/components/autoTest/AutoBillCommonTest.vue

@@ -259,21 +259,21 @@ export default {
         for(let i = 0;i < list.length;i++){
           for(let j = 0;j < params.length;j++){
             if(list[i].ruleBaseType == params[j].val){
-              if(params[j].name){
+              // if(params[j].name){
                 str += `<p style="padding:0 10px;border-bottom:${i == list.length-1?'0':'1px solid #EBEEF5'};overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" class="collTxt">
-                      ${params[j].name||' '}
+                      ${params[j].name||'-'}
                   </p>`
-              }
+              // }
             }
           }
         }
       }else{
         for(let i = 0;i < list.length;i++){
-          if(list[i][name]){
-            str += `<p style="padding:0 10px;border-bottom:${(i == list.length-1)||(list[i+1]&&!list[i+1][name])?'0':'1px solid #EBEEF5'};overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" class="collTxt">
-                  ${list[i][name]||' '}
+          // if(list[i][name]){
+            str += `<p style="padding:0 10px;border-bottom:${i == list.length-1?'0':'1px solid #EBEEF5'};overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" class="collTxt">
+                  ${list[i][name]||'-'}
               </p>`
-          }
+          // }
         }
       }
       //  str += `<p style="padding:0 10px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;border-bottom:${i == list.length-1?'0':'1px solid #EBEEF5'};" class="collTxt">