report

src/views/customerReport/combinationDetails.vue

@@ -91,13 +91,22 @@
             :cell-style="tableRowClassNames"
             :header-cell-class-name="addClass" 
           >
-            <el-table-column prop="patientName" label="姓名"></el-table-column>
-            <el-table-column prop="sexName" label="性别"></el-table-column>
-            <el-table-column prop="age" label="年龄"></el-table-column>
-            <el-table-column
-              prop="medicalTimes"
-              label="体检次数"
-            ></el-table-column>
+            <el-table-column prop="patientName" label="姓名" width="80" align="center"/>
+            <el-table-column prop="sexName" label="性别" width="50" align="center"/>
+            <el-table-column prop="age" label="年龄" width="50" align="center"/>
+            
+            <el-table-column prop="customerOrgName" label="单位" />
+            <el-table-column prop="departmentName" label="部门" >
+              <template slot-scope="scope">
+                {{scope.row.customerOrgName == scope.row.departmentName ? '':scope.row.departmentName}}
+              </template>
+            </el-table-column>
+            <el-table-column prop="patientRegisterNo" label="条码号" width="100" align="center"/>
+            <el-table-column prop="patientNo" label="档案号" width="80" align="center"/>
+            <el-table-column prop="mobileTelephone" label="手机号" width="120" align="center"/>
+            <el-table-column prop="personnelTypeName" label="人员类别" width="120" align="center"/>
+            <el-table-column prop="medicalStartDate" label="体检日期" width="90" align="center"/>
+            <el-table-column prop="medicalTimes" label="体检次数" width="70" align="center"/>
             <el-table-column
               v-for="(item, index) in columnData"
               :key="index"