Merge branch 'master' of http://120.26.64.82:10880/BFFE/SZYGM1.0

public/extraConfig.js

@@ -86,18 +86,17 @@ var NODE_CODE = {
     { nodeName: '卸机', nodeCode: 'FFM' },
     { nodeName: '机下交接', nodeCode: 'CARGOS_HANDOVER_STATUS_01' },
     { nodeName: '货站交接', nodeCode: 'CARGOS_HANDOVER_STATUS_99' },
-    { nodeName: '理货', nodeCode: 'RCF报' },
-    // { nodeName: '快件运抵', nodeCode: '' },
+    { nodeName: '理货', nodeCode: 'RCF' },
     { nodeName: '海关放行', nodeCode: 'MTREL_in' },
-    { nodeName: '出库', nodeCode: 'DLV报' },
+    { nodeName: '出库', nodeCode: 'DLV' },
   ],
   internationalDepartureTransfer: [
-    { nodeName: '入园', nodeCode: 'EPORTREL' },
-    { nodeName: '海关', nodeCode: 'MTREL_out' },
+    { nodeName: '入园', nodeCode: 'MTEXDEC' },
+    { nodeName: '海关', nodeCode: 'MTREL' },
     { nodeName: '运抵', nodeCode: 'FOH' },
     { nodeName: '安检', nodeCode: 'REH' },
     { nodeName: '收运核单', nodeCode: 'RCS' },
-    { nodeName: '理货', nodeCode: 'ACC_BUP' },
+    { nodeName: '理货', nodeCode: 'CARTON_LIST' },
     { nodeName: '实配', nodeCode: 'LS_CARGO' },
   ],
 }

src/views/dashboard/arrival.vue

@@ -416,19 +416,7 @@ const flightNums = ref(0)
 const stockNums = ref(0)
 const weightNums = ref<number | string>(0)
 const specialGoods = ref('全部')
-const specialGoodsDatas = ref([
-  '活',
-  '鲜',
-  '药',
-  '危',
-  '冷',
-  '锂',
-  '快',
-  '动',
-  '贵',
-  '邮',
-  '全部',
-])
+const specialGoodsDatas = ref(['动', '贵', '邮', '鲜', '锂', '全部'])
 const weightType = ref('进港')
 const today = parseTime(Date.now(), '{y}-{m}-{d}')
 const sevenDaysAgo = parseTime(
@@ -582,10 +570,13 @@ const waybillTrendFunc = async () => {
   if (listValues && isValue(listValues)) {
     const dealedList = listValues.reduce((preList, currentValue) => {
       if (typeof currentValue.jobTime === 'string') {
-        return [...preList, {
-          ...currentValue,
-          jobTime: parseDate(currentValue.jobTime)
-        }]
+        return [
+          ...preList,
+          {
+            ...currentValue,
+            jobTime: parseDate(currentValue.jobTime),
+          },
+        ]
       }
       return preList
     }, [])

src/views/dashboard/departure.vue

@@ -402,19 +402,7 @@ const pickingObj = ref<any>({})
 const flightNums = ref(0)
 const stockNums = ref(0)
 const specialGoods = ref('全部')
-const specialGoodsDatas = ref([
-  '活',
-  '鲜',
-  '药',
-  '危',
-  '冷',
-  '锂',
-  '快',
-  '动',
-  '贵',
-  '邮',
-  '全部',
-])
+const specialGoodsDatas = ref(['动', '贵', '邮', '鲜', '锂', '全部'])
 const weightNums = ref<number | string>(0)
 const today = parseTime(Date.now(), '{y}-{m}-{d}')
 const sevenDaysAgo = parseTime(

src/views/dashboard/internationalArrival.vue

@@ -426,9 +426,6 @@ const specialGoodsDatas = ref([
   '冷',
   '锂',
   '快',
-  '动',
-  '贵',
-  '邮',
   '全部',
 ])
 const weightType = ref('进港')

src/views/dashboard/internationalDeparture.vue

@@ -412,9 +412,6 @@ const specialGoodsDatas = ref([
   '冷',
   '锂',
   '快',
-  '动',
-  '贵',
-  '邮',
   '全部',
 ])
 const weightNums = ref<number | string>(0)

src/views/dataQuery/components/DataQueryView/index.vue

@@ -74,6 +74,7 @@
               :disabled="formData.inOrOut === 'out'"
               size="default"
               placeholder="始发站"
+              filterable
               clearable
             >
               <el-option
@@ -90,6 +91,7 @@
               :disabled="formData.inOrOut === 'in'"
               size="default"
               placeholder="目的站"
+              filterable
               clearable
             >
               <el-option

src/views/realTime/hooks/useTableCellClick.ts

@@ -27,18 +27,24 @@ export function useTableCellClick(tableName?: string) {
 
     if (tableName?.includes('FlightWaybill')) {
       switch (column.property) {
-        case 'stockCode':
+        case 'stockCode': {
+          let path
+          if (route.path.includes('dataQuery')) {
+            path = route.path
+              .replace('flightQuery', 'waybillQuery')
+              .replace('Flight', 'Waybill')
+          } else {
+            path = `${route.path.split('/').slice(0, -1).join('/')}/waybill`
+          }
           router.push({
-            path: `${route.path.split('/').slice(0, -1).join('/')}/waybill`,
+            path,
             query: {
               flightDate: route.query.flightDate,
               waybillNO: row.stockCode,
             },
           })
           break
-        // case 'stowageNum':
-        //   ElMessage.info('开发中')
-        //   break
+        }
         default:
           break
       }