Ver Fonte

bug修复

zhonghuizhen há 7 meses atrás
pai
commit
317acab9fd
1 ficheiros alterados com 11 adições e 5 exclusões
  1. 11 5
      src/views/component/reagent/personnelComparison.vue

+ 11 - 5
src/views/component/reagent/personnelComparison.vue

@@ -50,9 +50,9 @@
             :span-method="spanMethod"
             :span-method="spanMethod"
             @selection-change="handleSelectionChange"
             @selection-change="handleSelectionChange"
           >
           >
-            <el-table-column :type="isEditable ? 'selection' : ''" width="55" />
-            <el-table-column label="比对人员" prop="renYuan" width="110" >
-              <template slot-scope="{ row }">
+            <el-table-column  v-if="isEditable"  type="selection" width="55" />
+            <el-table-column label="比对人员" prop="renYuan" width="110" align="center">
+              <template slot-scope="{ row }" >
                 <span>{{ getUserName(row.renYuan) }}</span>
                 <span>{{ getUserName(row.renYuan) }}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
@@ -271,7 +271,9 @@ export default {
       this.multipleSelection = val
       this.multipleSelection = val
     },
     },
     spanMethod({ row, column, rowIndex, columnIndex }) {
     spanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 1) {
+       const renyuancolumnIndex =   this.isEditable ? 1 : 0
+       const xiangmucolumnIndex =   this.isEditable ? 2 : 1
+      if (columnIndex === renyuancolumnIndex) {
         const currentValue = row.renYuan
         const currentValue = row.renYuan
         const preRow = this.comparisonData[rowIndex - 1]
         const preRow = this.comparisonData[rowIndex - 1]
         const preValue = preRow ? preRow.renYuan : null
         const preValue = preRow ? preRow.renYuan : null
@@ -290,7 +292,7 @@ export default {
           return { rowspan, colspan: 1 }
           return { rowspan, colspan: 1 }
         }
         }
       }
       }
-      if (columnIndex === 2) {
+      if (columnIndex === xiangmucolumnIndex) {
         const currentValue = row.jieGuo3
         const currentValue = row.jieGuo3
         const preRow = this.comparisonData[rowIndex - 1]
         const preRow = this.comparisonData[rowIndex - 1]
         const preValue = preRow ? preRow.jieGuo3 : null
         const preValue = preRow ? preRow.jieGuo3 : null
@@ -336,4 +338,8 @@ export default {
     }
     }
   }
   }
 }
 }
+</style>
+.center-text {
+  text-align: center;
+}
 </style>
 </style>