ver1.5.0,增肌运单日志，样式修正

 let tableHeaders = {
 let tableHeaders = {
+    "index": [
+        {
+            columnChineseName: "航班号",
+            columnName: "fltNo",
+            columnWidth: "",
+            status: 1
+        },
+        {
+            columnChineseName: "航班日期",
+            columnName: "fltDate",
+            columnWidth: "",
+            status: 1
+        },
+        {
+            columnChineseName: "总重量（KG）",
+            columnName: "totalWeight",
+            columnWidth: "",
+            status: 1
+        },
+        {
+            columnChineseName: "已配重量（KG）",
+            columnName: "allocationWeight",
+            columnWidth: "",
+            status: 1
+        },
+        {
+            columnChineseName: "总体积（cm³）",
+            columnName: "totalVolumn",
+            columnWidth: "",
+            status: 1
+        },
+        {
+            columnChineseName: "已配体积（cm³）",
+            columnName: "allocationVolumn",
+            columnWidth: "",
+            status: 1
+        },
+        {
+            columnChineseName: "配舱进度",
+            columnName: "percentage",
+            columnWidth: "830",
+            ext1: 'slot',
+            align: 'left',
+            status: 1
+        },
+    ],
     //货物查询
     //货物查询
     "cargo": [
     "cargo": [
         {
         {
@@ -315,6 +361,94 @@ let tableHeaders = {
             status: 1
             status: 1
         },
         },
     ],
     ],
+    //货物日志
+    "cargoLog": [
+        {
+            columnChineseName: "口岸代码",
+            columnName: "port",
+            columnWidth: "80",
+            status: 1
+        },
+        {
+            columnChineseName: "操作人",
+            columnName: "operatorUserName",
+            columnWidth: "80",
+            status: 1
+        },
+        {
+            columnChineseName: "操作时间",
+            columnName: "createTime",
+            columnWidth: "150",
+            status: 1
+        },
+        {
+            columnChineseName: "操作来源",
+            columnName: "operatorSource",
+            columnWidth: "200",
+            status: 1
+        },
+        {
+            columnChineseName: "ACCS Pool",
+            columnName: "accsPool",
+            columnWidth: "100",
+            status: 1
+        },
+        {
+            columnChineseName: "当前配载航班日期",
+            columnName: "flightDate",
+            columnWidth: "140",
+            status: 1
+        },
+        {
+            columnChineseName: "当前配载航班号",
+            columnName: "flightNo",
+            columnWidth: "140",
+            status: 1
+        },
+        {
+            columnChineseName: "ACCS原航班日期",
+            columnName: "accsFlightDate",
+            columnWidth: "140",
+            status: 1
+        },
+        {
+            columnChineseName: "ACCS原航班号",
+            columnName: "accsFlightNo",
+            columnWidth: "140",
+            status: 1
+        },
+        {
+            columnChineseName: "货物状态",
+            columnName: "cargoStatus",
+            columnWidth: "80",
+            status: 1
+        },
+        {
+            columnChineseName: "推送状态",
+            columnName: "pushStatus",
+            columnWidth: "80",
+            status: 1
+        },
+        {
+            columnChineseName: "预审状态",
+            columnName: "preQualificationStatus",
+            columnWidth: "120",
+            status: 1
+        },
+        {
+            columnChineseName: "ENTCode",
+            columnName: "entCode",
+            columnWidth: "80",
+            status: 1
+        },
+        {
+            columnChineseName: "操作备注",
+            columnName: "remark",
+            columnWidth: "300",
+            align: 'left',
+            status: 1
+        },
+    ],
     //航班信息维护
     //航班信息维护
     "FlightInformation": [
     "FlightInformation": [
         {
         {
@@ -789,7 +923,7 @@ let tableHeaders = {
         {
         {
             columnChineseName: "原航班",
             columnChineseName: "原航班",
             columnName: "sourceFlightNo",
             columnName: "sourceFlightNo",
-            columnWidth: "",
+            columnWidth: "100",
             status: 1
             status: 1
         },
         },
         {
         {
@@ -801,37 +935,37 @@ let tableHeaders = {
         {
         {
             columnChineseName: "周期",
             columnChineseName: "周期",
             columnName: "dayOfWeek",
             columnName: "dayOfWeek",
-            columnWidth: "",
+            columnWidth: "150",
             status: 1
             status: 1
         },
         },
         {
         {
             columnChineseName: "状态",
             columnChineseName: "状态",
             columnName: "status",
             columnName: "status",
-            columnWidth: "",
+            columnWidth: "70",
             status: 1
             status: 1
         },
         },
         {
         {
             columnChineseName: "开始时间",
             columnChineseName: "开始时间",
             columnName: "startDate",
             columnName: "startDate",
-            columnWidth: "",
+            columnWidth: "100",
             status: 1
             status: 1
         },
         },
         {
         {
             columnChineseName: "结束时间",
             columnChineseName: "结束时间",
             columnName: "endDate",
             columnName: "endDate",
-            columnWidth: "",
+            columnWidth: "100",
             status: 1
             status: 1
         },
         },
         {
         {
             columnChineseName: "最后修改人",
             columnChineseName: "最后修改人",
             columnName: "updateUserName",
             columnName: "updateUserName",
-            columnWidth: "",
+            columnWidth: "100",
             status: 1
             status: 1
         },
         },
         {
         {
             columnChineseName: "最后修改时间",
             columnChineseName: "最后修改时间",
             columnName: "updateTime",
             columnName: "updateTime",
-            columnWidth: "",
+            columnWidth: "100",
             status: 1
             status: 1
         },
         },
     ],
     ],

@@ -58,5 +58,5 @@ module.exports = {
   /**
   /**
    * 版本号
    * 版本号
    */
    */
-  version: 'version：1.4.0'
+  version: 'version：1.5.0'
 }
 }

+<template>
+    <div>
+        <el-dialog title="查看日志" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
+            :show-close="false" :append-to-body="true" top="2vh">
+            <el-form class="form-header" label-position="right" label-width="auto" size="small">
+                <el-row>
+                    <el-col :span="4">
+                        <el-form-item label="运单号">
+                            <span>{{ data.waybillNo }}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                        <el-form-item label="ACCSID">
+                            <span>{{ data.accsId }}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <Tables ref="cargoLog" ductName="cargoLog" :order="false" :data="data.tableData" :headerData="tableHeader"
+                tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :page="selectData.page"
+                :limitSize="selectData.size" :pageSizes="[100]" :pagination="false" :loading="loading"
+                @currentChange="currentChange">
+            </Tables>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="close">关 闭</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { findCargoDataChangeLog } from "@/api/system/logConfig.js";
+
+export default {
+    name: "Log",
+    props: {
+        dialogVisible: {
+            type: Boolean,
+            default: false
+        },
+        cargoData: {
+            type: Object,
+            default: null
+        }
+    },
+    data() {
+        return {
+            data: {
+                tableData: []
+            },
+            selectData: {
+                page: 1,
+                size: 100
+            },
+            tableHeader: this.tableHeaders['cargoLog'],
+            tableHeight: 600,
+            loading: false
+        }
+    },
+    watch: {
+        dialogVisible(val) {
+            if (val) {
+                this.data.waybillNo = this.cargoData.waybillNo
+                this.data.accsId = this.cargoData.accsId
+                this.getLog(this.cargoData.accsId)
+            }
+        }
+    },
+    methods: {
+        //通过accsid获取运单日志
+        getLog(val) {
+            this.loading = true
+            findCargoDataChangeLog(val).then(res => {
+                this.loading = false
+                if (res.code === 200) {
+                    this.data.tableData = res.data.list
+                } else {
+                    this.msgWarning(res.msg)
+                }
+            }).catch(err => {
+                this.loading = false
+                console.log(err)
+            })
+        },
+        //关闭
+        close() {
+            this.$emit('close')
+        },
+        currentChange(val) { },
+    }
+
+}
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file

@@ -166,7 +166,14 @@
     <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :selection="true" :order="true"
     <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :selection="true" :order="true"
       :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" :limitStart="limitStart" :page="page"
       :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" :limitStart="limitStart" :page="page"
       :shiftKey="shiftKey" :pageSizes="[100]" :height="tableHeight" @sizeChange="sizeChange" @tableSelect="tableSelect"
       :shiftKey="shiftKey" :pageSizes="[100]" :height="tableHeight" @sizeChange="sizeChange" @tableSelect="tableSelect"
-      @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange"></Tables>
+      @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange">
+      <template v-slot:waybillNo="scope">
+        <el-link type="primary" @click="logView(scope.row)">
+          {{
+              scope.row.waybillNo
+          }}<i class="el-icon-link"></i> </el-link>
+      </template>
+    </Tables>
     <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
     <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
       :show-close="false" :append-to-body="true">
       :show-close="false" :append-to-body="true">
       <el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
       <el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
@@ -180,15 +187,20 @@
         <el-button type="primary" @click="close">确 定</el-button>
         <el-button type="primary" @click="close">确 定</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
+    <Dialog :dialogVisible="openView" :cargoData="cargoLog" @close="viewClose" />
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
 import { findConditionData, findCargoData, releaseCargo } from "@/api/cargoSelect";
 import { findConditionData, findCargoData, releaseCargo } from "@/api/cargoSelect";
 import { downLoadXlsx } from "@/utils/zipdownload";
 import { downLoadXlsx } from "@/utils/zipdownload";
+import Dialog from "./dialog.vue";
 
 
 export default {
 export default {
   name: "QueryCargo",
   name: "QueryCargo",
+  components: {
+    Dialog
+  },
   data() {
   data() {
     return {
     return {
       formData: {
       formData: {
@@ -273,6 +285,7 @@ export default {
       ],
       ],
       findConditionData: {}, //货物查询条件
       findConditionData: {}, //货物查询条件
       tableData: [], //表格数据
       tableData: [], //表格数据
+      cargoLog: {},
       allWeight: 0,
       allWeight: 0,
       allQty: 0,
       allQty: 0,
       shiftKey: false,
       shiftKey: false,
@@ -294,6 +307,7 @@ export default {
       progress: 0,
       progress: 0,
       tableHeight: null,
       tableHeight: null,
       dialogVisible: false,
       dialogVisible: false,
+      openView: false,
       formShow: true, //菜单隐藏
       formShow: true, //菜单隐藏
     };
     };
   },
   },
@@ -307,13 +321,54 @@ export default {
   },
   },
 
 
   activated() {
   activated() {
-    if (this.$store.state.tagsView.cachedViews.length > 0) {
-      this.$store.state.tagsView.cachedViews.forEach(item => {
-        if (item === 'QueryCargo') {
-          this.findCondition()
-          this.totalCount > 0 ? this.select() : ''
-        }
-      })
+    this.selectTable = []
+    this.cargoTotal()
+    if (this.$route.params.fltNo) {
+      //判断进入页面是否带参，确定是否是index跳转
+      this.formData = {
+        fltDateStart: "",
+        fltDateEnd: "",
+        prematchFltDateStart: "",
+        prematchFltDateEnd: "",
+        createTimeStart: null,
+        createTimeEnd: null,
+        pickUpDate: null,
+        hasFlight: null,
+        waybillNo: "",
+        siteName: "",
+        fltNo: "",
+        mawbCode: "",
+        ursa: "",
+        typeId: null,
+        statusId: null,
+        serviceTypeId: null,
+        allocationTypeId: null,
+        kindToAllocFlightId: null,
+        historyAllocaCargoTypeId: null,
+        dataSources: "",
+        customsReceiptStatusId: null,
+        big: null,
+        cargoPlaneNo: null,
+        cargoPlaneStart: null,
+        cargoPlaneEnd: null,
+        limitStart: 1,
+        limitSize: 100,
+      }
+      this.cargoPlaneTime = [this.$route.params.fltDate, this.$route.params.fltDate]
+      this.formData.cargoPlaneStart = this.$route.params.fltDate
+      this.formData.cargoPlaneEnd = this.$route.params.fltDate
+      this.formData.cargoPlaneNo = this.$route.params.fltNo
+      this.select(0)
+    } else {
+      //否则请求原页面缓存状态
+      if (this.$store.state.tagsView.cachedViews.length > 0) {
+        this.$store.state.tagsView.cachedViews.forEach(item => {
+          if (item === 'QueryCargo') {
+            this.findCondition()
+            this.totalCount > 0 ? this.select() : ''
+          }
+        })
+      }
     }
     }
   },
   },
 
 
@@ -335,9 +390,49 @@ export default {
     this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
     this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
   },
   },
   watch: {
   watch: {
+    $route: {
+      handler(to, from) {
+        if (to.name === '首页') {
+          this.formData = {
+            fltDateStart: "",
+            fltDateEnd: "",
+            prematchFltDateStart: "",
+            prematchFltDateEnd: "",
+            createTimeStart: null,
+            createTimeEnd: null,
+            pickUpDate: null,
+            hasFlight: null,
+            waybillNo: "",
+            siteName: "",
+            fltNo: "",
+            mawbCode: "",
+            ursa: "",
+            typeId: null,
+            statusId: null,
+            serviceTypeId: null,
+            allocationTypeId: null,
+            kindToAllocFlightId: null,
+            historyAllocaCargoTypeId: null,
+            dataSources: "",
+            customsReceiptStatusId: null,
+            big: null,
+            cargoPlaneNo: null,
+            cargoPlaneStart: null,
+            cargoPlaneEnd: null,
+            limitStart: 1,
+            limitSize: 100,
+          }
+          this.cargoPlaneTime = [from.params.fltDate, from.params.fltDate]
+          this.formData.cargoPlaneStart = from.params.fltDate
+          this.formData.cargoPlaneEnd = from.params.fltDate
+          this.formData.cargoPlaneNo = from.params.fltNo
+          this.select(0)
+        }
+      }
+    },
     formShow(val, oldVal) {
     formShow(val, oldVal) {
       this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
       this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
-    }
+    },
   },
   },
   methods: {
   methods: {
     clear() {
     clear() {
@@ -398,6 +493,7 @@ export default {
       releaseCargo(idList).then(res => {
       releaseCargo(idList).then(res => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.msgSuccess(res.msg)
           this.msgSuccess(res.msg)
+          this.select()
         } else if (res.code === 201) {
         } else if (res.code === 201) {
           this.selectTable.map(item => {
           this.selectTable.map(item => {
             res.data['success'].map(val => {
             res.data['success'].map(val => {
@@ -576,6 +672,15 @@ export default {
         }
         }
       }
       }
     },
     },
+    //查看日志
+    logView(val) {
+      this.cargoLog = val
+      this.openView = true
+    },
+    //关闭日志
+    viewClose() {
+      this.openView = false
+    },
     //设置关闭
     //设置关闭
     headerSetClose(val) {
     headerSetClose(val) {
       if (val == 1) {
       if (val == 1) {