货物日志增加，文本修正，样式修正

@@ -28,3 +28,14 @@ export function getDmFlowInformation(data) {
     method: 'post',
   })
 }
+
+//运单日志查询
+/**
+ * @param accsId accsid *
+ */
+export function findCargoDataChangeLog(data) {
+  return request({
+    url: '/cargo/findCargoDataChangeLog?accsId=' + data,
+    method: 'post',
+  })
+}
\ No newline at end of file

@@ -8,6 +8,20 @@ let ductLabels = {
             "1": "正在释放"
         },
     },
+    "cargoLog": {//运单日志
+        "operatorSource": {
+            "1": "数据入库",
+            "2": "自动配舱",
+            "3": "手动配舱",
+            "4": "预审不通过释放舱位",
+            "5": "cutoff释放舱位",
+            "6": "手动释放舱位",
+            "7": "预审导出",
+            "8": "预审导入",
+            "9": "航班不推送修改为待推送",
+            "10": "回推ACCS"
+        }
+    },
     "menu": {//菜单设置
         "menuType": {
             "M": "菜单",
@@ -82,6 +96,14 @@ let ductLabels = {
             // "5": "处理失败(系统异常)",
             "9": "处理中",
         },
+        "status": {
+            "0": "未处理",
+            "1": "处理成功",
+            "2": "无需处理",
+            "3": "处理失败",
+            "4": "校验不通过",
+            "9": "处理中"
+        },
         "weatherGenerateWater": {
             "1": "是",
             "0": "否"
@@ -91,14 +113,6 @@ let ductLabels = {
             "1": "推送成功",
             "2": "推送失败"
         },
-        "status": {
-            "0": "未处理",
-            "1": "已处理",
-            "2": "无需处理",
-            "3": "处理失败",
-            "4": "校验不通过",
-            "9": "处理中"
-        }
     },
     "weatherTable": {
         "highLowPriceFlg": {

 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": [
         {
@@ -315,6 +361,94 @@ let tableHeaders = {
             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": [
         {
@@ -789,7 +923,7 @@ let tableHeaders = {
         {
             columnChineseName: "原航班",
             columnName: "sourceFlightNo",
-            columnWidth: "",
+            columnWidth: "100",
             status: 1
         },
         {
@@ -801,37 +935,37 @@ let tableHeaders = {
         {
             columnChineseName: "周期",
             columnName: "dayOfWeek",
-            columnWidth: "",
+            columnWidth: "150",
             status: 1
         },
         {
             columnChineseName: "状态",
             columnName: "status",
-            columnWidth: "",
+            columnWidth: "70",
             status: 1
         },
         {
             columnChineseName: "开始时间",
             columnName: "startDate",
-            columnWidth: "",
+            columnWidth: "100",
             status: 1
         },
         {
             columnChineseName: "结束时间",
             columnName: "endDate",
-            columnWidth: "",
+            columnWidth: "100",
             status: 1
         },
         {
             columnChineseName: "最后修改人",
             columnName: "updateUserName",
-            columnWidth: "",
+            columnWidth: "100",
             status: 1
         },
         {
             columnChineseName: "最后修改时间",
             columnName: "updateTime",
-            columnWidth: "",
+            columnWidth: "100",
             status: 1
         },
     ],

@@ -10,7 +10,7 @@
 
  .wid95 {
  	width: 95% !important;
-}
+ }
 
  .wid90 {
  	width: 90% !important;
@@ -84,9 +84,9 @@
  	margin-left: 20px;
  }
 
-//  .el-dialog:not(.is-fullscreen) {
-//  	margin-top: 6vh !important;
-//  }
+ //  .el-dialog:not(.is-fullscreen) {
+ //  	margin-top: 6vh !important;
+ //  }
 
  .el-table {
 
@@ -115,7 +115,6 @@
  	// border-bottom: 1px solid #ddd;
  	margin: 8px 10px 15px 10px;
  	padding-top: 15px;
- 	padding-bottom: 5px;
 
  	.formItem {
  		width: 95%;
@@ -281,3 +280,13 @@
  .dialogColumn .el-tooltip {
  	white-space: pre-line !important;
  }
+
+ .el-progress-bar {
+ 	padding-right: 70px;
+ }
+
+ .el-progress__text {
+ 	font-size: 12px !important;
+ 	margin-left: 0px;
+ 	font-weight: 700 !important;
+ }
\ No newline at end of file

+<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"
       :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" :limitStart="limitStart" :page="page"
       :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"
       :show-close="false" :append-to-body="true">
       <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>
       </div>
     </el-dialog>
+    <Dialog :dialogVisible="openView" :cargoData="cargoLog" @close="viewClose" />
   </div>
 </template>
 
 <script>
 import { findConditionData, findCargoData, releaseCargo } from "@/api/cargoSelect";
 import { downLoadXlsx } from "@/utils/zipdownload";
+import Dialog from "./dialog.vue";
 
 export default {
   name: "QueryCargo",
+  components: {
+    Dialog
+  },
   data() {
     return {
       formData: {
@@ -273,6 +285,7 @@ export default {
       ],
       findConditionData: {}, //货物查询条件
       tableData: [], //表格数据
+      cargoLog: {},
       allWeight: 0,
       allQty: 0,
       shiftKey: false,
@@ -294,6 +307,7 @@ export default {
       progress: 0,
       tableHeight: null,
       dialogVisible: false,
+      openView: false,
       formShow: true, //菜单隐藏
     };
   },
@@ -307,6 +321,9 @@ export default {
   },
 
   activated() {
+    this.selectTable = []
+    this.cargoTotal()
+    //否则请求原页面缓存状态
     if (this.$store.state.tagsView.cachedViews.length > 0) {
       this.$store.state.tagsView.cachedViews.forEach(item => {
         if (item === 'QueryCargo') {
@@ -337,7 +354,7 @@ export default {
   watch: {
     formShow(val, oldVal) {
       this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
-    }
+    },
   },
   methods: {
     clear() {
@@ -398,6 +415,7 @@ export default {
       releaseCargo(idList).then(res => {
         if (res.code === 200) {
           this.msgSuccess(res.msg)
+          this.select()
         } else if (res.code === 201) {
           this.selectTable.map(item => {
             res.data['success'].map(val => {
@@ -576,6 +594,15 @@ export default {
         }
       }
     },
+    //查看日志
+    logView(val) {
+      this.cargoLog = val
+      this.openView = true
+    },
+    //关闭日志
+    viewClose() {
+      this.openView = false
+    },
     //设置关闭
     headerSetClose(val) {
       if (val == 1) {

@@ -2,7 +2,6 @@
   <div></div>
 </template>
 <script>
-import { delUser } from "@/api/system/user";
 
 export default {
   props: {
@@ -12,16 +11,10 @@ export default {
   },
   data() {
     return {
-      // 表单校验
     };
   },
   methods: {
-    submit() {
-      this.msgSuccess("修改成功");
-      delUser("112").then((response) => {
-        this.msgSuccess("修改成功");
-      });
-    },
+    
   },
 };
 </script>

@@ -5,7 +5,7 @@ export default {
     const { path } = params
     this.$router.replace({ path: '/' + path, query })
   },
-  render: function(h) {
+  render: function (h) {
     return h() // avoid warning message
   }
 }

@@ -116,18 +116,20 @@
                 <template slot="optionColumn">
                     <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                         <template slot-scope="scope">
+                            <div v-hasPermi="['system:dictionary:add']">
                                 <el-button class="mr5" v-if="scope.row.serviceCodeMapperList" size="mini" type="text"
                                     icon="el-icon-plus"
-                                @click="addDic({ status: 'childrenAdd', data: scope.row.chineseName })"
-                                v-hasPermi="['system:dictionary:add']">新增子集
+                                    @click="addDic({ status: 'childrenAdd', data: scope.row.chineseName })">新增子集
                                 </el-button>
+                            </div>
                             <!-- <el-button class="mr5" size="mini" type="text" icon="el-icon-edit"
                                 @click="upDate({ status: 'update', data: scope.row })">修改
                             </el-button> -->
+                            <div v-hasPermi="['system:dictionary:delete']">
                                 <el-button v-if="!scope.row.serviceCodeMapperList" size="mini" type="text"
-                                style="color:#ff4949" icon="el-icon-delete" @click="delDict(scope.row)"
-                                v-hasPermi="['system:dictionary:delete']">删除
+                                    style="color:#ff4949" icon="el-icon-delete" @click="delDict(scope.row)">删除
                                 </el-button>
+                            </div>
                         </template>
                     </el-table-column>
                 </template>

@@ -22,7 +22,7 @@
           <el-col :span="24">
             <el-form-item label="角色权限:" prop="menuIdList">
               <el-tree ref="tree" :data="treeData" node-key="id" :props="defaultProps" :show-checkbox="true"
-                :default-checked-keys="roleData.menuIds" accordion>
+                :default-checked-keys="roleData.menuIds" accordion v-loading="treeLoading">
               </el-tree>
             </el-form-item>
           </el-col>
@@ -65,6 +65,7 @@ export default {
       },
       treeData: [],
       loading: false,
+      treeLoading: false,
       defaultProps: {
         children: "children",
         label: "title",
@@ -96,8 +97,10 @@ export default {
   methods: {
     //权限列表
     allAuth() {
+      this.treeLoading = true
       getAllAuth()
         .then((res) => {
+          this.treeLoading = false
           if (res.code === 200) {
             this.treeData = this.treeDataInfo(res.data);
           } else {
@@ -105,6 +108,7 @@ export default {
           }
         })
         .catch((err) => {
+          this.treeLoading = false
           console.log(err);
         });
     },

 <template>
   <div>
-    <el-form ref="dmLogForm" class="form-header" :model="selectForm" label-width="auto" size="small">
+    <el-form ref="dmLogForm" class="form-header" :model="selectForm" label-width="auto" size="small"
+      @submit.native.prevent>
       <el-row type="flex" style="flex-wrap: wrap !important">
         <el-col :span="6">
           <el-form-item label="ACCS原航班号">
@@ -24,8 +25,9 @@
             <el-select v-model="selectForm.status" class="formItem" placeholder="不限" clearable>
               <el-option label="未处理" value="0"></el-option>
               <el-option label="处理成功" value="1"></el-option>
-              <el-option label="已处理" value="2"></el-option>
+              <el-option label="无需处理" value="2"></el-option>
               <el-option label="处理失败" value="3"></el-option>
+              <el-option label="校验不通过" value="4"></el-option>
               <el-option label="处理中" value="9"></el-option>
             </el-select>
           </el-form-item>
@@ -37,14 +39,6 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="6">
-          <el-form-item label="口岸代码">
-            <el-select v-model="selectForm.portName" class="formItem" placeholder="不限" clearable>
-              <el-option v-for="item in portList" :label="item.englishName" :value="item.englishName" :key="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col> -->
         <el-col :span="6">
           <el-form-item label="回推ACCS结果">
             <el-select v-model="selectForm.sendLogSendResult" class="formItem" placeholder="不限" clearable>
@@ -66,7 +60,7 @@
     <Tables ref="dmLogTables" ductName="logDmData" :order="true" :data="data" :headerData="tableHeader"
       tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :page="selectForm.page"
       :limitSize="selectForm.size" :pageSizes="[100]" :totalCount="total" :loading="loading"
-      @currentChange="currentChange" @sortChange="sortChange">
+      @currentChange="currentChange">
       <template v-slot:awbNbr="scope">
         <el-link type="primary" @click="gotoWeatherTable(scope.row)">
           {{
@@ -86,8 +80,6 @@
 </template>
 
 <script>
-import dictLabels from "../../../assets/languages/dictLabels.js";
-import { portNameList } from "@/api/system/user.js";
 import { getDmDataList, getDmFlowInformation } from "@/api/system/logConfig.js";
 
 export default {
@@ -123,7 +115,6 @@ export default {
   },
   created() {
     this.selectForm.createTime = this.nowDate();
-    this.getPort()
   },
   activated() {
     this.selectDMData();
@@ -136,19 +127,6 @@ export default {
       window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
   },
   methods: {
-    //获取口岸
-    async getPort() {
-      portNameList().then((res) => {
-        if (res.code === 200) {
-          this.portList = res.data;
-        } else {
-          this.msgWarning('查询条件' + res.msg)
-        }
-      });
-      if (this.$store.state.tagsView.cachedViews.length == 0) {
-        this.selectDMData();
-      }
-    },
     //数据查询
     async selectDMData(val) {
       this.data = [];
@@ -191,14 +169,6 @@ export default {
       this.selectForm.page = val.page;
       this.selectDMData();
     },
-    //数据处理
-    statusData(val) {
-      if (dictLabels["logDmData"]["status"][val]) {
-        return dictLabels["logDmData"]["status"][val];
-      } else {
-        return val;
-      }
-    },
     //排序
     sortChange(val) {
       let data = [];