行李详情修改

src/components/SimpleQuery/index.vue

@@ -4,7 +4,7 @@
       <el-form-item v-for="(item, index) in formItemArr" :key=" index" :rules="fromDataReq(item)" :prop="item.pagecode">
         <template v-if="fromDataType(item.datatype) == 'SELECT' || fromDataType(item.datatype) == 'SELECTS'">
           <el-select class="input-shadow" size="small" :style="{'width':item.displaywidth ? item.displaywidth+'px':''}" :disabled="item.disabled ? item.disabled : false" :multiple="fromDataType(item.datatype) == 'SELECTS'?true:false" filterable default-first-option style="width: 100%" v-model="tableForm[item.pagecode]" @change="changeSelect(item.pagecode, tableForm[item.pagecode])" :placeholder="item.pagename" clearable @clear="tableForm[item.pagecode] = ''">
-            <el-option v-for="(itemParams,sindex) in tableOptions[item.pagecode]" :key="itemParams[item['dropdownlistid']]+sindex" :label="itemParams[item['dropdownlistlabel']]" :value="itemParams[item['dropdownlistid']]">
+            <el-option v-for="(itemParams,sindex) in tableOptions[item.pagecode]" :key="itemParams[item['dropdownlistid']]+sindex || Math.random() + sindex" :label="itemParams[item['dropdownlistlabel']]" :value="itemParams[item['dropdownlistid']]">
             </el-option>
           </el-select>
         </template>
@@ -221,8 +221,8 @@ export default {
       const formItemCopy = _.cloneDeep(formItem)
       const results = []
       const resultsKey = []
-      formItemCopy.map(({ dropdownlist, pagecode, defaultparameters }) => {
-        if (((dropdownlist || dropdownlist == 0) && dropdownlist != "")) {
+      formItemCopy.map(({ dropdownlist, datatype, pagecode, defaultparameters }) => {
+        if (((datatype == 'select' || datatype == 'SELECT') && (dropdownlist || dropdownlist == 0) && dropdownlist != "")) {
           const datacontent = defaultparameters ? { filter: this.formatDefault(defaultparameters) } : { filter: { 1: 1 } }
           results.push(Query({ serviceid: dropdownlist, datacontent, event: '0', page: 1, size: 9999 }))
           resultsKey.push(pagecode)

src/utils/validate.js

@@ -474,4 +474,12 @@ export function formatChange (data, event, key) {
     datas.push(obj)
   }
   return datas
+}
+
+export function formatBagParmas (param = {}) {
+  if (typeof param != 'object') param = {}
+  const nParam = _.cloneDeep(param)
+  const nPobj = {}
+  const nPobjs = ['PNRNO', 'luggageNum', 'carrierFlights', 'carrierFlightsDate'].map(item => nPobj[item] = null)
+  return _.assign(nPobj, nParam)
 }

src/views/bagDetailsPage/components/baggageList.vue

@@ -32,10 +32,12 @@ export default {
           this.getViewData(true)
         }
       },
-      deep: true
+      deep: true,
+      immediate: true
     }
   },
   mounted () {
+    console.log('d')
     this.getViewData()
   },
   methods: {

src/views/bagDetailsPage/components/baggageMessage.vue

@@ -32,6 +32,7 @@ import * as XLSX from 'xlsx'
 import XLSX_STYLE from 'xlsx-style'
 import FileSaver from 'file-saver'
 import { Query } from '@/api/webApi'
+import { formatBagParmas } from '@/utils/validate'
 export default {
   name: 'BaggageMessage',
   props: ['queryItem'],
@@ -61,37 +62,21 @@ export default {
         this.loading = true
         const bagQueryParams = JSON.parse(sessionStorage.getItem('bagQueryParams')) || ''
         if (!bagQueryParams) return
-        const { PNRNO, luggageNum, carrierFlights, carrierFlightsDate } = bagQueryParams
-        let queryHttp = null
-        if (PNRNO) {
-          const parmas = {
-            page: 1,
-            serviceid: 121,
-            datacontent: {
-              filter: {
-                PNRNO,
-                carrierFlightsDate,
-                luggageNum
-              }
-            },
-            event: '0'
-          }
-          queryHttp = await Query(parmas)
-        } else {
-          const parmas = {
-            page: 1,
-            serviceid: 120,
-            datacontent: {
-              filter: {
-                carrierFlights,
-                carrierFlightsDate,
-                luggageNum
-              }
-            },
-            event: '0'
-          }
-          queryHttp = await Query(parmas)
+        const { PNRNO = null, luggageNum = null, carrierFlights = null, carrierFlightsDate = null } = bagQueryParams
+        const parmas = {
+          page: 1,
+          serviceid: 120,
+          datacontent: {
+            filter: formatBagParmas({
+              carrierFlights,
+              carrierFlightsDate,
+              luggageNum,
+              PNRNO
+            })
+          },
+          event: '0'
         }
+        const queryHttp = await Query(parmas)
         const { code, returnData } = queryHttp
         if (code == 0 && returnData && returnData.length) {
           // this.messageList = [...returnData]

src/views/bagDetailsPage/components/baggageView.vue

@@ -37,6 +37,7 @@
 
 <script>
 import { Query } from '@/api/webApi'
+import { formatBagParmas } from '@/utils/validate'
 export default {
   name: 'BaggageView',
   props: ['queryItem'],
@@ -46,11 +47,11 @@ export default {
         {
           nodeCode: 'CHECKIN',
           nodeName: '值机',
-          timeProp: 'checkInDate',
+          timeProp: 'checkindate',
           timeValue: '',
-          loclProp: 'checkInLocation',
+          loclProp: 'checkinlocation',
           loclValue: '',
-          stateProp: 'checkState',
+          stateProp: 'checkstate',
           stateValue: '',
         },
         {
@@ -60,7 +61,7 @@ export default {
           timeValue: '',
           loclProp: 'security_location',
           loclValue: '',
-          stateProp: 'securityInspectionResults',
+          stateProp: 'securityinspectionresults',
           stateValue: '',
         },
         {
@@ -70,7 +71,7 @@ export default {
           timeValue: '',
           loclProp: 'sorting_location',
           loclValue: '',
-          stateProp: 'sortState',
+          stateProp: 'sortstate',
           stateValue: '',
         },
         {
@@ -78,9 +79,9 @@ export default {
           nodeName: '装车',
           timeProp: 'loading_time',
           timeValue: '',
-          loclProp: 'installationAddress',
+          loclProp: 'installationaddress',
           loclValue: '',
-          stateProp: 'loadState',
+          stateProp: 'loadstate',
           stateValue: '',
         },
         {
@@ -108,7 +109,7 @@ export default {
           nodeName: '到达',
           timeProp: 'arrivedtime',
           timeValue: '',
-          loclProp: 'arrviedLocation',
+          loclProp: 'arrviedlocation',
           loclValue: '',
           stateProp: 'normal',
           stateValue: '',
@@ -166,7 +167,7 @@ export default {
       }
     },
     //获取行李信息
-    async getLuggageList (serviceid = 116, datacontent = { filter: this.dataContent }, page = ++this.page, size = this.pageSize) {
+    async getLuggageList (serviceid = 116, datacontent = { filter: formatBagParmas(this.dataContent) }, page = ++this.page, size = this.pageSize) {
       try {
         this.loading = true
         const parmas = {
@@ -189,17 +190,7 @@ export default {
           this.tableDataCopy.push(...returnData)
           this.tableDataCopy = _.uniqBy(this.tableDataCopy, 'carrierFlights')
           this.tableDataCopy = this.tableDataCopy.sort((a, b) => Date.parse(a.carrierFlightsDate) - Date.parse(b.carrierFlightsDate))
-          this.tableDataCopy.forEach(item => {
-            item.bagStatus.map(p => {
-              const { timeProp, loclProp, stateProp } = p
-              if (item.hasOwnProperty(timeProp) || item.hasOwnProperty(loclProp) || item.hasOwnProperty(stateProp)) {
-                p.timeValue = item[timeProp]
-                p.loclValue = item[loclProp]
-                p.stateValue = item[stateProp]
-              }
-            })
-          })
-          this.getBagTime(this.tableDataCopy)
+          this.setBagTime(this.tableDataCopy)
           this.loading = false
         } else {
           this.page--;
@@ -223,21 +214,35 @@ export default {
       }
       this.getLuggageList()
     },
+    setBagTime (arr) {
+      const bagTimes = [...arr]
+      if (!bagTimes.length) return
+      bagTimes.map(item => {
+        const newObj = {}
+        const { actualTakeOffTime, estimateTakeOffTime, scheduleTakeOffTime, actualLandInTime, estimateLandInTime, scheduleLandInTime } = item
+        newObj.newTakeoff_time = actualTakeOffTime ? actualTakeOffTime : estimateTakeOffTime ? estimateTakeOffTime : scheduleTakeOffTime
+        newObj.newLand_time = actualLandInTime ? actualLandInTime : estimateLandInTime ? estimateLandInTime : scheduleLandInTime
+        newObj.takeTime = newObj.newTakeoff_time ? newObj.newTakeoff_time.split('T').at(-1) : newObj.newTakeoff_time
+        newObj.landTime = newObj.newLand_time ? newObj.newLand_time.split('T').at(-1) : newObj.newLand_time
+        item = _.assign(item, newObj)
+      })
+      this.getBagTime(bagTimes)
+    },
     async getBagTime (arr) {
       const newArr = [...arr]
       const reqUrls = []
       newArr.forEach(item => {
-        const { carrierFlights, carrierFlightsDate, outAirport, landAirport } = item
+        const { carrierFlights = null, carrierFlightsDate = null, luggageNum = null, PNRNO = null } = item
         const parmas = {
           page: 1,
           serviceid: 117,
           datacontent: {
-            filter: {
+            filter: formatBagParmas({
               carrierFlights,
               carrierFlightsDate,
-              outAirport,
-              landAirport
-            }
+              luggageNum,
+              PNRNO
+            })
           },
           size: 9999,
           event: '0'
@@ -253,13 +258,15 @@ export default {
           const newArray = [...returnData]
           if (newArray?.length) {
             const itemObj = newArray[0]
-            const newObj = {}
-            const { actualTakeOffTime, estimateTakeOffTime, scheduleTakeOffTime, actualLandInTime, estimateLandInTime, scheduleLandInTime } = itemObj
-            newObj.newTakeoff_time = actualTakeOffTime ? actualTakeOffTime : estimateTakeOffTime ? estimateTakeOffTime : scheduleTakeOffTime
-            newObj.newLand_time = actualLandInTime ? actualLandInTime : estimateLandInTime ? estimateLandInTime : scheduleLandInTime
-            newObj.takeTime = newObj.newTakeoff_time ? newObj.newTakeoff_time.split('T').at(-1) : newObj.newTakeoff_time
-            newObj.landTime = newObj.newLand_time ? newObj.newLand_time.split('T').at(-1) : newObj.newLand_time
-            newArr[index] = Object.assign(newArr[index], newObj)
+            const { bagStatus } = newArr[index]
+            bagStatus.map(p => {
+              const { timeProp, loclProp, stateProp } = p
+              if (itemObj.hasOwnProperty(timeProp) || itemObj.hasOwnProperty(loclProp) || itemObj.hasOwnProperty(stateProp)) {
+                p.timeValue = itemObj[timeProp]
+                p.loclValue = itemObj[loclProp]
+                p.stateValue = itemObj[stateProp]
+              }
+            })
           }
         }
       })

src/views/bagDetailsPage/index.vue

@@ -78,8 +78,7 @@ import baggageView from './components/baggageView.vue'
 import baggageList from './components/baggageList.vue'
 import baggageMessage from './components/baggageMessage.vue'
 import Dialog from '@/layout/components/Dialog/index.vue'
-import { getAuthData, formatOrder, listToTree } from '@/utils/validate'
-import { getToken } from '@/utils/auth'
+import { formatBagParmas } from '@/utils/validate'
 import { Query } from '@/api/webApi'
 import { mapGetters } from 'vuex'
 export default {
@@ -141,7 +140,7 @@ export default {
     if (!pageAuthtables.length) return
     //获取行李信息表
     const bagInfoTable = pageAuthtables.filter(item => item.serviceid == 115)
-    this.tableDatas = pageAuthtables.filter(item => item.serviceid == 116)
+    this.tableDatas = pageAuthtables.filter(item => item.serviceid == 119)
     this.query = { ...query }
     this.getPageTableSetting(bagInfoTable)
   },
@@ -178,7 +177,7 @@ export default {
     async queryTableData (serviceid, dataParmas) {
       this.loading = true
       try {
-        const datacontent = { filter: dataParmas }
+        const datacontent = { filter: formatBagParmas(dataParmas) }
         const parmas = {
           page: 1,
           serviceid,
@@ -191,17 +190,10 @@ export default {
           if (returnData?.length) {
             const ndata = []
             const bagInfo = [...returnData][0]
-            const { luggageNum, PNRNO } = bagInfo
             this.passengerName = bagInfo['passengerName'] || ''
             this.PNRNO = bagInfo['PNRNO'] || ''
-            if (PNRNO) {
-              this.queryObj = {
-                luggageNum,
-                PNRNO
-              }
-            } else {
-              this.queryObj = { ...this.query }
-            }
+            this.queryObj = { ...this.query }
+            this.queryObj['PNRNO'] = bagInfo['PNRNO'] || ''
             const bagInfoArr = Object.entries(bagInfo)
             this.tableCols.map(({ pagecode, pagename }) => {
               bagInfoArr.map(item => {
@@ -264,18 +256,11 @@ export default {
     },
     tagClick (item, index) {
       const { luggageNum, carrierFlights, carrierFlightsDate, PNRNO, passengerName } = item
-      if (PNRNO) {
-        this.tagObj = {
-          PNRNO,
-          passengerName,
-          luggageNum
-        }
-      } else {
-        this.tagObj = {
-          luggageNum,
-          carrierFlights,
-          carrierFlightsDate
-        }
+      this.tagObj = {
+        PNRNO,
+        luggageNum,
+        carrierFlights,
+        carrierFlightsDate
       }
       this.activeIndex = index
       this.setTableLocalData('bagQueryParams', this.tagObj)
@@ -283,25 +268,8 @@ export default {
       this.queryTableData(115, this.tagObj)
     },
     tabClick (item, index) {
-      if (item.key == 'baggageList' || item.key == 'baggageMessage') {
-        let parmObj = null
-        const { luggageNum } = this.query
-        if (this.PNRNO) {
-          parmObj = {
-            PNRNO: this.PNRNO,
-            passengerName: this.passengerName,
-            luggageNum
-          }
-        } else {
-          parmObj = { ...this.query }
-        }
-        this.tagObj = parmObj
-      }
-      this.setTableLocalData('bagQueryParams', this.tagObj)
-      setTimeout(() => {
-        this.tabIndex = index
-        this.componentName = item.key
-      }, 10);
+      this.tabIndex = index
+      this.componentName = item.key
     },
     async getImg (item) {
       const { luggageNum, carrierFlightsDate } = item