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

src/views/realTime/hooks/useTable.ts

@@ -335,12 +335,14 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '运单件数',
-      columnName: 'messageCargos_in',
+      // columnName: 'messageCargos_in',
+      columnName: 'luggageCount',
       needCount: 1,
     },
     {
       columnLabel: '理货件数',
-      columnName: 'acCargos_in',
+      // columnName: 'acCargos_in',
+      columnName: 'luggageCount',
       needCount: 1,
     },
     {
@@ -788,12 +790,14 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '运单件数',
-      columnName: 'messageCargos_in',
+      // columnName: 'messageCargos_in',
+      columnName: 'luggageCount',
       needCount: 1,
     },
     {
       columnLabel: '理货件数',
-      columnName: 'acCargos_in',
+      // columnName: 'acCargos_in',
+      columnName: 'luggageCount',
       needCount: 1,
     },
     {

src/views/statisticalanalysis/components/echart/tableforms.vue

@@ -1174,6 +1174,7 @@
           >
           </el-table-column>
           <el-table-column
+            @row-click="user"
             prop="stockCode"
             label="运单号"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"