行李视图修改

src/views/baggageManagement/components/baggage/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-06 09:43:16
+ * @LastEditTime: 2022-05-06 10:25:52
  * @LastEditors: your name
  * @Description: 行李视图
 -->
@@ -27,32 +27,32 @@
       <div class="part1_info">
         <el-row :gutter="12">
           <!-- 第一行 -->
-          <el-col :span="3"><span class="label">行李牌号：</span><span class="content">{{ baggageBasicInfo.BagSN }}</span></el-col>
-          <el-col :span="4"><span class="label">企业或团队名称：</span><span class="content">{{ baggageBasicInfo.TeamOrGroup }}</span></el-col>
-          <el-col :span="3"><span class="label">值机位置：</span><span class="content"></span></el-col>
-          <el-col :span="3"><span class="label">特殊行李类型：</span><span class="content">{{ baggageBasicInfo.SpecialType }}</span></el-col>
+          <el-col :span="3"><span class="label">行李牌号：</span><span class="content">{{ baggageBasicInfo.bagNo }}</span></el-col>
+          <el-col :span="4"><span class="label">企业或团队名称：</span><span class="content">{{ baggageBasicInfo.teamOrGroup }}</span></el-col>
+          <el-col :span="3"><span class="label">值机位置：</span><span class="content">{{ baggageBasicInfo.checkInLocation }}</span></el-col>
+          <el-col :span="3"><span class="label">特殊行李类型：</span><span class="content">{{ baggageBasicInfo.specialType }}</span></el-col>
           <el-col :span="4"><span class="label">PNR编号：</span><span class="content">{{ baggageBasicInfo.PNR }}</span></el-col>
-          <el-col :span="4"><span class="label">旅客姓名大写拼音：</span><span class="content">{{ baggageBasicInfo.PassengerNameUpcase }}</span></el-col>
-          <el-col :span="3"><span class="label">装载序列号：</span><span class="content"></span></el-col>
+          <el-col :span="4"><span class="label">旅客姓名大写拼音：</span><span class="content">{{ baggageBasicInfo.name }}</span></el-col>
+          <el-col :span="3"><span class="label">装载序列号：</span><span class="content">{{ baggageBasicInfo.loadSequenceIndex }}</span></el-col>
           <!-- 第二行 -->
-          <el-col :span="3"><span class="label">总件数：</span><span class="content"></span></el-col>
-          <el-col :span="4"><span class="label">总重量：</span><span class="content"></span></el-col>
-          <el-col :span="3"><span class="label">尺寸：</span><span class="content"></span></el-col>
-          <el-col :span="3"><span class="label">外部特征描述：</span><span class="content"></span></el-col>
-          <el-col :span="4"><span class="label">常旅客号：</span><span class="content"></span></el-col>
-          <el-col :span="4"><span class="label">常旅客级别：</span><span class="content"></span></el-col>
-          <el-col :span="3"><span class="label">是否取消值机：</span><span class="content"></span></el-col>
+          <el-col :span="3"><span class="label">总件数：</span><span class="content">{{ baggageBasicInfo.totalNumber }}</span></el-col>
+          <el-col :span="4"><span class="label">总重量：</span><span class="content">{{ baggageBasicInfo.totalWeight }}</span></el-col>
+          <el-col :span="3"><span class="label">尺寸：</span><span class="content">{{ baggageBasicInfo.size }}</span></el-col>
+          <el-col :span="3"><span class="label">外部特征描述：</span><span class="content">{{ baggageBasicInfo.externalCharacterization }}</span></el-col>
+          <el-col :span="4"><span class="label">常旅客号：</span><span class="content">{{ baggageBasicInfo.frequentFlyerNumber }}</span></el-col>
+          <el-col :span="4"><span class="label">常旅客级别：</span><span class="content">{{ baggageBasicInfo.frequentFlyerClass }}</span></el-col>
+          <el-col :span="3"><span class="label">是否取消值机：</span><span class="content">{{ baggageBasicInfo.whetherToCancelTheCheckIn }}</span></el-col>
           <!-- 第三行 -->
-          <el-col :span="3"><span class="label">是否可装载：</span><span class="content"></span></el-col>
-          <el-col :span="4"><span class="label">是否可运输：</span><span class="content"></span></el-col>
-          <el-col :span="3"><span class="label">行李激活状态：</span><span class="content"></span></el-col>
-          <el-col :span="3"><span class="label">无BSM状态：</span><span class="content"></span></el-col>
-          <el-col :span="4"><span class="label">中转标记：</span><span class="content"></span></el-col>
-          <el-col :span="4"><span class="label">速运标记：</span><span class="content"></span></el-col>
-          <el-col :span="3"><span class="label">破损标记：</span><span class="content"></span></el-col>
+          <el-col :span="3"><span class="label">是否可装载：</span><span class="content">{{ baggageBasicInfo.isItLoadable }}</span></el-col>
+          <el-col :span="4"><span class="label">是否可运输：</span><span class="content">{{ baggageBasicInfo.isItTransportable }}</span></el-col>
+          <el-col :span="3"><span class="label">行李激活状态：</span><span class="content">{{ baggageBasicInfo.activeState }}</span></el-col>
+          <el-col :span="3"><span class="label">无BSM状态：</span><span class="content">{{ baggageBasicInfo.noBSM }}</span></el-col>
+          <el-col :span="4"><span class="label">中转标记：</span><span class="content">{{ baggageBasicInfo.transitSign }}</span></el-col>
+          <el-col :span="4"><span class="label">速运标记：</span><span class="content">{{ baggageBasicInfo.expressSign }}</span></el-col>
+          <el-col :span="3"><span class="label">破损标记：</span><span class="content">{{ baggageBasicInfo.brokenSign }}</span></el-col>
           <!-- 第四行 -->
-          <el-col :span="3"><span class="label">投诉标记：</span><span class="content"></span></el-col>
-          <el-col :span="4"><span class="label">赔偿标记：</span><span class="content"></span></el-col>
+          <el-col :span="3"><span class="label">投诉标记：</span><span class="content">{{ baggageBasicInfo.complaintSign }}</span></el-col>
+          <el-col :span="4"><span class="label">赔偿标记：</span><span class="content">{{ baggageBasicInfo.compensationSign }}</span></el-col>
         </el-row>
       </div>
     </div>
@@ -284,40 +284,40 @@ export default {
       tableCols: [
         {
           name: '航班号',
-          prop: 'FlightNO',
+          prop: 'flightNo',
           align: 'center'
         },
-        { name: '航班日期', prop: 'FlightDate', align: 'center', width: 103 },
+        { name: '航班日期', prop: 'flightDate', align: 'center', width: 103 },
         {
           name: '起飞航站\n预计起飞时间',
-          prop: 'PlanDepartureTime',
+          prop: 'departureAirport',
           align: 'center',
           width: 111
         },
         {
           name: '目的航站\n预计降落时间',
-          prop: 'PlanLandingTime',
+          prop: 'landingAirport',
           align: 'center',
           sortable: 'custom',
           width: 111
         },
-        { name: '旅客仓位', prop: 'Canbin', align: 'center' },
-        { name: '旅客座位号', prop: 'SeatNO', align: 'center', width: 101 },
-        { name: '值机序号', prop: 'CheckInNO', align: 'center' },
-        { name: '节点标识', prop: 'NodeCode', align: 'center' },
-        { name: '节点名称', prop: 'NodeName', align: 'center' },
-        { name: '位置标识', prop: 'LocationID', align: 'center' },
-        { name: '位置码', prop: 'LocationMark', align: 'center' },
-        { name: '位置描述', prop: 'RemarkCN', align: 'center' },
-        { name: '读取时间', prop: 'DealTime', align: 'center' },
-        { name: '结果', prop: 'DealResult', align: 'center' },
-        { name: '次级代码', prop: 'SecondCode', align: 'center' },
-        { name: '操作人', prop: 'creator', align: 'center' },
+        { name: '旅客仓位', prop: 'passengerCompartment', align: 'center' },
+        { name: '旅客座位号', prop: 'passengerSeatNumber', align: 'center', width: 101 },
+        { name: '值机序号', prop: 'passengerCheckInNumber', align: 'center' },
+        { name: '节点标识', prop: 'nodeCode', align: 'center', width: 102 },
+        { name: '节点名称', prop: 'nodeName', align: 'center' },
+        { name: '位置标识', prop: 'locationCode', align: 'center' },
+        // { name: '位置码', prop: '', align: 'center' },
+        { name: '位置描述', prop: 'locationRemark', align: 'center' },
+        { name: '读取时间', prop: 'dealTime', align: 'center' },
+        { name: '结果', prop: 'status', align: 'center' },
+        { name: '次级代码', prop: 'secondaryCode', align: 'center' },
+        { name: '操作人', prop: 'AgentCode', align: 'center' },
         { name: '设备ID', prop: 'DeviceCode', align: 'center' },
-        { name: '发往位置', prop: 'ToPlaceCode', align: 'center' },
-        { name: '发往位置描述', prop: 'ToPlaceMark', align: 'center', width: 113 },
+        { name: '发往位置', prop: 'toLocation', align: 'center' },
+        { name: '发往位置描述', prop: 'toLocationMark', align: 'center', width: 113 },
         { name: '装载序号', prop: 'LoadSN', align: 'center' },
-        { name: '容器编号', prop: 'containerNumber', align: 'center' }
+        { name: '容器编号', prop: 'U_Device_ID', align: 'center' }
       ],
       baggageTableData: [],
       spanArr: [],
@@ -377,11 +377,13 @@ export default {
           this.queryBaggageDetails(new Array(6).fill(dataContent).flat())
         ])
         baggageBasicInfo.length && (this.baggageBasicInfo = baggageBasicInfo[0])
-        baggageTrack.forEach((item, index) => {
+        this._.sortBy(baggageTrack, item => item.DealTime).forEach((item, index) => {
           item.NodeNameEN && this.stepData.splice(index, 1, item)
         })
         this.baggageTableData = baggageDetails.map(item => {
-          item['DealTime'] = item['DealTime'].split('T')[1]
+          item['dealTime'] = item['dealTime'].split('T')[1]
+          item['departureAirport'] = `${item['departureAirport']}\n${item['departureTime'].split('T')[1]}`
+          item['landingAirport'] = `${item['landingAirport']}\n${item['landingTime'].split('T')[1]}`
           return item
         })
       } catch (error) {

src/views/baggageManagement/components/flight/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-06 09:29:59
+ * @LastEditTime: 2022-05-06 09:53:10
  * @LastEditors: your name
  * @Description: 航班视图
 -->
@@ -44,10 +44,16 @@
 
             <el-row>
               <el-col :span="12">
-                <!-- <span>日期：{{ infoData.PlanDepartureTime.split("T")[0] }}</span> -->
+                <span>
+                  日期：
+                  <!-- {{ infoData.PlanDepartureTime.split("T")[0] }} -->
+                </span>
               </el-col>
               <el-col :span="12">
-                <!-- <span>时间：{{ infoData.PlanDepartureTime.split("T")[1] }}</span> -->
+                <span>
+                  时间：
+                  <!-- {{ infoData.PlanDepartureTime.split("T")[1] }} -->
+                </span>
               </el-col>
             </el-row>
 
@@ -136,10 +142,16 @@
 
             <el-row>
               <el-col :span="12">
-                <!-- <span>日期：{{ infoData.PlanLandingTime.split("T")[0] }}</span> -->
+                <span>
+                  日期：
+                  <!-- {{ infoData.PlanLandingTime.split("T")[0] }} -->
+                </span>
               </el-col>
               <el-col :span="12">
-                <!-- <span>时间：{{ infoData.PlanLandingTime.split("T")[1] }}</span> -->
+                <span>
+                  时间：
+                  <!-- {{ infoData.PlanLandingTime.split("T")[1] }} -->
+                </span>
               </el-col>
             </el-row>