Selaa lähdekoodia

Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

chenrui  3 vuotta sitten
vanhempi
commit
7881acec2e

+ 5 - 1
src/views/advancedQuery/views/advancedHome.vue

@@ -76,7 +76,11 @@
           :filters="tableDataFilters[item.prop]"
           :filter-method="tableDataFilters[item.prop] && filterHandler"
           filter-placement="top"
-        />
+        >
+        <template slot-scope="scope">
+          <a href="javascript:void(0);">{{scope.row[item.prop]}}</a>
+        </template>
+        </el-table-column>
       </el-table>
     </div>
     <!--列设置-->

+ 3 - 6
src/views/baggageManagement/components/flight/index.vue

@@ -398,7 +398,7 @@ const departureBaggageTableColumn = [
   },
   { name: '装载序号', prop: 'LoadSN', align: 'center' },
   { name: '值机', prop: 'checkIn', align: 'center' },
-  { name: '状态', prop: 'status', align: 'center' },
+  { name: '状态', prop: 'latestStatus', align: 'center' },
   { name: '安检', prop: 'security', align: 'center' },
   { name: '分拣', prop: 'sorting', align: 'center' },
   { name: '装车', prop: 'loading', align: 'center' },
@@ -454,10 +454,7 @@ export default {
       transferOutBaggageTableData: [], // 中转出
       flightBaggageTableData: [], // 行李列表
       flightBaggageTableFilters: {
-        PassengerNameUpcase: [],
-        BagSN: [],
-        SpecialType: [],
-        U_Device_ID: []
+        latestStatus:[]
       }
     }
   },
@@ -624,7 +621,7 @@ export default {
         })
         this.flightBaggageTableData = flightBaggageTableData.map((item, index) => {
           item['checkIn'] = `${item['checkIn'] ?? ''} ${item['checkInTime'] ? item['checkInTime'].split('T')[1] : ''}`
-          item['status'] = item['Status'] === 'DEL' ? '删除' : ''
+          item['latestStatus'] = item['Status'] === 'DEL' ? '删除' : item['latestStatus']
           item['security'] = `${item['DealInfo'] ?? ''} ${item['DealTime'] ? item['DealTime'].split('T')[1] : ''}`
           item['sorting'] = `${item['sortLocationMark'] ?? ''} ${
             item['sortDealTime'] ? item['sortDealTime'].split('T')[1] : ''