zhaoke 1 år sedan
förälder
incheckning
436befd41d

+ 2 - 2
src/views/newBagDetails/components/baggageMessage.vue

@@ -9,7 +9,7 @@
                 <div class="message-date">{{ message.readTime }}</div>
                 <div class="message-content">
                   <el-scrollbar style="height: 100%">
-                    <div>{{ message.sourceData.replaceAll(/[\r\n]{2,}/g, '\n').replaceAll('\\', '') }}</div>
+                    <div>{{ message.sourceData.replaceAll(/[\\r\\n]{2,}/g, '\n').replaceAll('\\', '') }}</div>
                   </el-scrollbar>
                 </div>
               </div>
@@ -89,7 +89,7 @@ export default {
       xlsxDatas.push(
         ...this.messageList.map(message => [
           message.flightDate,
-          message.sourceData.replaceAll(/[\r\n]{2,}/g, '\n').replaceAll('\\', '')
+          message.sourceData.replaceAll(/[\\r\\n]{2,}/g, '\n').replaceAll('\\', '')
         ])
       )
       const columnWidths = []

+ 3 - 3
src/views/newBagDetails/index.vue

@@ -185,7 +185,7 @@ export default {
         }
         const { code, returnData } = await this.getQueryList(SERVICE_ID.bagTableId, parmObj)
         if (code == 0 && returnData && returnData.length) {
-          this.detailsArr = _.uniq([...returnData])
+          this.detailsArr = _.uniqBy([...returnData], 'luggageNum')
         }
       } catch (error) {
         console.log(error)
@@ -266,8 +266,8 @@ export default {
       }
       .tags-view-wrapper {
         width: calc(100%);
-        ::v-deep .el-scrollbar__wrap {
-          // margin-top: 8.5px;
+        ::v-deep .is-vertical {
+          display: none;
         }
         .tags-view-item {
           display: inline-block;