Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/views/customerReport/positiveResultsList.vue

@@ -114,7 +114,7 @@
               :summary-method="getSummaries"
             >
               <el-table-column label="阳性结果人员清单">
-                <el-table-column :label="`开始时间： ${summary.startDate || ''} 结束时间：${summary.endDate || ''} 男性： ${summary.maleCount} 女性： ${summary.femaleCount}`" align="left">
+                <el-table-column :label="`开始时间： ${summary.startDate || ''} 结束时间：${summary.endDate || ''} 男性： ${summary.maleCount}人 女性： ${summary.femaleCount}人`" align="left">
                                     <template slot-scope="scope">
                     <el-table
                       :data="scope.row.patientRegisters"
@@ -185,12 +185,12 @@
                   label="诊断名称"
                 ></el-table-column>
                 <el-table-column
-                  prop="PatientNameDetail"
+                  prop="patientNameDetail"
                   label="人员清单"
                 >
                 <template slot-scope="scope">
-                  <div>
-                    <span v-for="(item, index) in scope.row.PatientNameDetail" :key="index">{{item}}</span>
+                  <div style="display: flex;flex-direction: row;flex-wrap: wrap;">
+                    <span v-for="(item, index) in scope.row.patientNameDetail" :key="index" style="width:20%;text-align: center;">{{item}}{{index+1==scope.row.patientNameDetail.length?'':','}}</span>
                   </div>
                 </template>
                 </el-table-column>