Эх сурвалжийг харах

离港视图增加预计装载跳转高级查询

zhongxiaoyu 2 жил өмнө
parent
commit
d810410252

+ 4 - 2
public/config.js

@@ -15,6 +15,8 @@ PLATFROM_CONFIG.appId = 'q7kdjmmaf0kerwpf' //appid
 // PLATFROM_CONFIG.baseURLCA = "http://192.168.3.74:18064"; // 登录后的http请求地址
 PLATFROM_CONFIG.baseURLCA = 'http://10.211.67.177:8043' // 登录后的http请求地址
 
+PLATFROM_CONFIG.baggageMessageURL = '/openApi/luggage/search/source'
+
 const DATACONTENT_ID = {
   /***-----登录------***/
   loginId: 36, //登录-获取权限-id
@@ -81,12 +83,12 @@ const DATACONTENT_ID = {
   flightInfo: 1142,
   flightContainer: 1143,
   flightBaggage: 1144,
-  
+
   /***-----行李视图------***/
   baggageBasicInfo: 255,
   baggageTrack: 61,
   baggageDetails: 44,
-  baggageMessage: 75,
+  baggageMessage: 3065,
 
   /***-----基础数据------***/
   deployNodeId: 54, //基础数据-节点信息维护-获取二级节点(表格)-id

+ 5 - 6
src/api/flight.js

@@ -120,7 +120,8 @@ export function fulltrackinfoAndNodeInfoList (params) {
 // 行李信息原始报文查询
 export function BaggageMessageQuery (params) {
   return request({
-    url: '/openApi/luggage/search/source',
+    // url: '/openApi/luggage/search/source',
+    url: PLATFROM_CONFIG.baggageMessageURL,
     method: 'post',
     data: params
   })
@@ -197,7 +198,7 @@ export function ftpListall (params) {
   })
 }
 
-//高级查询
+// 高级查询
 export function advancedInquiry (params) {
   return request({
     url: '/baggageDC/openApi/baggage/search/advancedInquiry',
@@ -206,7 +207,7 @@ export function advancedInquiry (params) {
   })
 }
 
-//查询
+// 查询
 export function getQuery (params) {
   return request({
     url: '/openApi/query',
@@ -215,7 +216,7 @@ export function getQuery (params) {
   })
 }
 
-//节点信息维护-节点操作
+// 节点信息维护-节点操作
 export function generalDataReception (params) {
   return request({
     url: '/openApi/generalDataReception',
@@ -223,5 +224,3 @@ export function generalDataReception (params) {
     data: params
   })
 }
-
-

+ 2 - 2
src/views/advancedQuery/views/advancedHome.vue

@@ -154,7 +154,7 @@
         ref="dialog"
         class="rowDialog"
         :tabindex="0"
-        @keyup.enter="onCheckGj(true)"
+        @keyup.enter="onCheckGj(false)"
         @keyup.self.esc="gjFlag=false"
       >
         <div class="title">高级查询</div>
@@ -352,7 +352,7 @@
             size="medium"
             class="r24"
             type="primary"
-            @click="onCheckGj(true)"
+            @click="onCheckGj(false)"
           >确定</el-button>
           <el-button
             size="medium"

+ 3 - 0
src/views/baggageManagement/components/baggage/index.vue

@@ -707,6 +707,9 @@ export default {
         console.log('出错了', error.message || error)
       }
     },
+    // async queryMessage(dataContent) {
+    //   return myQuery(DATACONTENT_ID.baggageMessage, ...dataContent)
+    // },
     async queryBaggageAll(queryData = this.queryData) {
       const { flightNO, flightDate, bagSN } = queryData
       const dataContent = [flightNO, flightDate, bagSN]

+ 1 - 8
src/views/baggageManagement/components/flight/index.vue

@@ -137,11 +137,7 @@
                   :sm="8"
                   :xl="12"
                 >
-                  <span>{{
-                  flightInfo.flightStatus === null
-                    ? "正常"
-                    : flightInfo.flightStatus
-                }}</span>
+                  <span>{{ flightInfo.flightStatus === null ? "正常" : flightInfo.flightStatus }}</span>
                 </el-col>
               </el-row>
               <el-row>
@@ -497,9 +493,6 @@ export default {
   directives: {
     dragHeight: {
       inserted(el, binding, vnode) {
-        if (!el) {
-          return
-        }
         const that = vnode.context
         let mousedownY
         let dragY

+ 16 - 0
src/views/baggageManagement/mixins/terminal.js

@@ -208,6 +208,7 @@ export default {
           'unLoad',
           'checkInNumber',
           'unActive',
+          'preLoad',
           'midIn',
           'noCheckInNumber',
           'checkNumber',
@@ -249,6 +250,7 @@ export default {
           'unLoad',
           'checkInNumber',
           'unActive',
+          'preLoad',
           'midIn',
           'noCheckInNumber',
           'checkNumber',
@@ -388,6 +390,20 @@ export default {
             }
           })
           break
+        case 'preLoad':
+          this.$router.push({
+            path: '/advance',
+            query: {
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
+              departureStation: this.formData.currentAirport,
+              destination: row.targetAirport,
+              active: 1,
+              canceled: 0
+            }
+          })
+          break
         case 'midIn':
           this.$router.push({
             path: '/advance',