zhaoke 1 year ago
parent
commit
cf7393e419

+ 9 - 5
src/views/newBagDetails/components/baggageMessage.vue

@@ -77,11 +77,15 @@ export default {
           const messageDatas = [...returnData]
           messageDatas.map(item => {
             const { dataObjectId } = item
-            const len = dataObjectId.length
-            const popNums = [206, 207, 208, 209, 210, 211, 212, 213, 214].map(item => item.toString())
-            const target = dataObjectId.substring(len - 3, len)
-            const place = popNums.includes(target) ? '(广州)' : '(国航)'
-            item.readTime = item.readTime.replace('T', ' ') + place
+            if (dataObjectId?.length) {
+              const len = dataObjectId.length
+              const popNums = [100, 101, 102].map(item => item.toString())
+              const target = dataObjectId.substring(len - 3, len)
+              const place = popNums.includes(target) ? '(国航)' : '(广州)'
+              item.readTime = item.readTime.replace('T', ' ') + place
+            } else {
+              item.readTime = item.readTime.replace('T', ' ') + '(广州)'
+            }
           })
           this.messageList = messageDatas
           // this.messageList = returnData.map(message => ({

+ 2 - 2
src/views/newTable/index.vue

@@ -15,10 +15,10 @@
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column fixed="right" label="操作" :width="fixedWidth">
+            <el-table-column label="操作" :width="fixedWidth">
               <template slot-scope="scope">
                 <div class="hd-td">
-                  <el-button type="text" size="small" class="rmScs">测试</el-button>
+                  <!-- <el-button type="text" size="small" class="rmScs">测试</el-button> -->
                   <el-button type="text" @click="handleEdit(scope.row)" size="small" class="rmScs">编辑</el-button>
                   <el-button class="rmSc" type="text" @click="handleRemove(scope.row)" size="small">删除</el-button>
                 </div>

+ 9 - 0
src/views/table/css/index.scss

@@ -51,6 +51,15 @@
         }
       }
     }
+    // .el-table__fixed-right{
+    //   .el-table__header{
+    //     th{
+    //       &:last-child{
+    //         border-bottom: none;
+    //       }
+    //     }
+    //   }
+    // }
     .el-table__body-wrapper {
       tr.bgl-hui {
         background: #d2d6df;

+ 2 - 2
src/views/table/index.vue

@@ -18,7 +18,7 @@
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column v-if="authBtns.length" fixed="right" label="操作" :width="fixedWidth">
+            <el-table-column v-if="authBtns.length" label="操作" :width="fixedWidth">
               <template slot-scope="scope">
                 <div class="hd-td">
                   <el-scrollbar style="height: 100%">
@@ -166,7 +166,7 @@ export default {
     //操作列宽度
     fixedWidth: {
       type: String,
-      default: "180px",
+      default: "280px",
     },
   },
   components: { Dialog, NoData, AdvanceQuery, AuthButton, TableHeaderCell },