进出口记录 修改英文

还箱提醒和久置柜新加字段
海运出口 修改锁定规则
全局修改样式

src/styles/variables.scss

@@ -132,4 +132,7 @@ p {
 .el-table .cell {
   padding-left: 2px;
   padding-right: 2px;
+}
+.el-button--text{
+  padding: 0 5px;
 }

src/views/boxManagement/LSCabinet/index.vue

@@ -35,7 +35,6 @@
 import { getList } from "@/api/boxManagement/LSCabinet/index.js";
 import dicSelect from "@/components/dicSelect/main";
 import { getToken } from "@/util/auth";
-import { getBcorpsattnList } from "@/api/iosBasicData/bcorpsattn";
 export default {
   name: "久置柜",
   data() {
@@ -111,6 +110,15 @@ export default {
             overHidden: true
           },
           {
+            label: "动态日期",
+            prop: "newDate",
+            overHidden: true,
+            width: 100,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd"
+          },
+          {
             label: "港口",
             prop: "addressId",
             hide: true,

src/views/boxManagement/enterRecord/detailsPage.vue

@@ -196,7 +196,7 @@ export default {
         // menu: false,
         column: [
           {
-            label: "是否同步",
+            label: "updated",
             prop: "whetherSynchronous",
             width: 80,
             sortable: true,
@@ -214,7 +214,7 @@ export default {
             overHidden: true
           },
           {
-            label: "放箱号",
+            label: "ReleaseRef",
             prop: "containerNumber",
             cell: true,
             width: 150,
@@ -222,42 +222,42 @@ export default {
             overHidden: true
           },
           {
-            label: "箱号",
+            label: "ContainerNO",
             prop: "boxCode",
-            width: 100,
+            width: 120,
             sortable: true,
             overHidden: true
           },
           {
-            label: "箱型",
+            label: "ContainerType",
             prop: "boxType",
-            width: 80,
+            width: 120,
             sortable: true,
             overHidden: true
           },
           {
-            label: "港口",
+            label: "port",
             prop: "portCname",
             width: 150,
             sortable: true,
             overHidden: true
           },
           {
-            label: "场站",
+            label: "depot",
             prop: "stationCname",
             width: 100,
             sortable: true,
             overHidden: true
           },
           {
-            label: "提单号",
+            label: "HBLNO",
             prop: "hblno",
             cell: true,
             width: 120,
             overHidden: true
           },
           {
-            label: "进场日期",
+            label: "OUTDATE",
             prop: "approachExitDate",
             width: 140,
             overHidden: true,
@@ -267,7 +267,7 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: "进场目的",
+            label: "ACTION",
             prop: "objective",
             width: 120,
             cell: true,
@@ -280,7 +280,7 @@ export default {
             overHidden: true
           },
           {
-            label: "箱好坏",
+            label: "STATUS",
             prop: "boxStatus",
             width: 80,
             cell: true,
@@ -293,7 +293,7 @@ export default {
             }
           },
           {
-            label: "备注",
+            label: "Remarks",
             prop: "remarks",
             cell: true,
             overHidden: true

src/views/boxManagement/enterRecord/index.vue

@@ -23,9 +23,9 @@
         @on-load="onLoad"
       >
         <template slot="menuLeft">
-          <el-button type="primary" size="small" icon="el-icon-upload" @click="allClick('excel导入')">excel导入 </el-button>
-          <el-button type="success" size="small" icon="el-icon-upload" @click="allClick('edi导入')">edi导入 </el-button>
-          <el-button type="success" size="small" icon="el-icon-upload" @click="allClick('ftp导入')">ftp导入 </el-button>
+          <el-button type="primary" size="small" icon="el-icon-upload" @click="allClick('excel导入')">excelImport </el-button>
+          <el-button type="success" size="small" icon="el-icon-upload" @click="allClick('edi导入')">ediImport </el-button>
+          <el-button type="success" size="small" icon="el-icon-upload" @click="allClick('ftp导入')">ftpImport </el-button>
           <!-- <el-button type="warning" size="small"  disabled @click="outExport">导 出
           </el-button> -->
         </template>
@@ -164,23 +164,25 @@ export default {
         searchIndex: 3,
         column: [
           {
-            label: "文件类型",
+            label: "fileType",
             prop: "fileType",
             overHidden: true
           },
           {
-            label: "导入时间",
+            label: "importDate",
             prop: "importDate",
+            width:100,
             overHidden: true
           },
           {
-            label: "箱号",
+            label: "ContainerNO",
             prop: "boxCode",
+            width:100,
             search: true,
             overHidden: true
           },
           {
-            label: "场站",
+            label: "port",
             prop: "stationCname",
             overHidden: true,
             search: true,
@@ -196,20 +198,21 @@ export default {
             }
           },
           {
-            label: "放箱号",
+            label: "ReleaseRef",
             prop: "containerNumber",
+            width:100,
             search: true,
             overHidden: true
           },
           {
-            label: "提单号",
+            label: "MBLNO",
             prop: "billNo",
             search: true,
             hide: true,
             overHidden: true
           },
           {
-            label: "港口",
+            label: "port",
             prop: "portCname",
             overHidden: true,
             search: true,
@@ -225,13 +228,13 @@ export default {
             }
           },
           {
-            label: "状态",
+            label: "STATUS",
             prop: "boxDynamics",
             // search: true,
             overHidden: true
           },
           {
-            label: "接口状态",
+            label: "ApiStatus",
             prop: "description",
             search: true,
             overHidden: true,
@@ -249,8 +252,9 @@ export default {
             ]
           },
           {
-            label: "同步状态",
+            label: "syncStatus",
             prop: "synchronizationStatus",
+            width:120,
             search: true,
             overHidden: true,
             cell: true,
@@ -275,17 +279,18 @@ export default {
             ]
           },
           {
-            label: "请求内容",
+            label: "requestContent",
             prop: "requestContent",
+            width:120,
             overHidden: true
           },
           {
-            label: "失败原因",
+            label: "reason",
             prop: "reason",
             overHidden: true
           },
           {
-            label: "备注",
+            label: "Remarks",
             prop: "remarks",
             cell: true,
             overHidden: true

src/views/boxManagement/exitRecord/detailsPage.vue

@@ -199,7 +199,7 @@ export default {
         // menu: false,
         column: [
           {
-            label: "是否同步",
+            label: "updated",
             prop: "whetherSynchronous",
             width: 80,
             sortable: true,
@@ -217,7 +217,7 @@ export default {
             overHidden: true
           },
           {
-            label: "放箱号",
+            label: "ReleaseRef",
             prop: "containerNumber",
             cell: true,
             width: 150,
@@ -225,42 +225,42 @@ export default {
             overHidden: true
           },
           {
-            label: "箱号",
+            label: "ContainerNO",
             prop: "boxCode",
-            width: 100,
+            width: 120,
             sortable: true,
             overHidden: true
           },
           {
-            label: "箱型",
+            label: "ContainerType",
             prop: "boxType",
-            width: 80,
+            width: 120,
             sortable: true,
             overHidden: true
           },
           {
-            label: "港口",
+            label: "port",
             prop: "portCname",
             width: 150,
             sortable: true,
             overHidden: true
           },
           {
-            label: "场站",
+            label: "depot",
             prop: "stationCname",
             width: 100,
             sortable: true,
             overHidden: true
           },
           {
-            label: "提单号",
+            label: "HBLNO",
             prop: "hblno",
             cell: true,
             width: 120,
             overHidden: true
           },
           {
-            label: "出场日期",
+            label: "OUTDATE",
             prop: "approachExitDate",
             width: 140,
             overHidden: true,
@@ -270,7 +270,7 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: "出场目的",
+            label: "ACTION",
             prop: "objective",
             width: 120,
             cell: true,
@@ -283,7 +283,7 @@ export default {
             overHidden: true
           },
           {
-            label: "箱好坏",
+            label: "STATUS",
             prop: "boxStatus",
             width: 80,
             cell: true,
@@ -296,7 +296,7 @@ export default {
             }
           },
           {
-            label: "备注",
+            label: "Remarks",
             prop: "remarks",
             cell: true,
             overHidden: true

src/views/boxManagement/exitRecord/index.vue

@@ -23,9 +23,9 @@
         @on-load="onLoad"
       >
         <template slot="menuLeft">
-          <el-button type="primary" size="small" icon="el-icon-upload" @click="allClick('excel导入')">excel导入 </el-button>
-          <el-button type="success" size="small" icon="el-icon-upload" @click="allClick('edi导入')">edi导入 </el-button>
-          <el-button type="success" size="small" icon="el-icon-upload" @click="allClick('ftp导入')">ftp导入 </el-button>
+          <el-button type="primary" size="small" icon="el-icon-upload" @click="allClick('excel导入')">excelImport </el-button>
+          <el-button type="success" size="small" icon="el-icon-upload" @click="allClick('edi导入')">ediImport </el-button>
+          <el-button type="success" size="small" icon="el-icon-upload" @click="allClick('ftp导入')">ftpImport </el-button>
           <!-- <el-button type="warning" size="small"  disabled @click="outExport">导 出
           </el-button> -->
         </template>
@@ -175,23 +175,25 @@ export default {
         searchIndex: 3,
         column: [
           {
-            label: "文件类型",
+            label: "fileType",
             prop: "fileType",
             overHidden: true
           },
           {
-            label: "导入时间",
+            label: "importDate",
             prop: "importDate",
+            width:100,
             overHidden: true
           },
           {
-            label: "箱号",
+            label: "ContainerNO",
             prop: "boxCode",
             search: true,
+            width:100,
             overHidden: true
           },
           {
-            label: "场站",
+            label: "depot",
             prop: "stationCname",
             overHidden: true,
             search: true,
@@ -207,20 +209,21 @@ export default {
             }
           },
           {
-            label: "放箱号",
+            label: "ReleaseRef",
             prop: "containerNumber",
+            width:100,
             search: true,
             overHidden: true
           },
           {
-            label: "提单号",
+            label: "MBLNO",
             prop: "billNo",
             search: true,
             hide: true,
             overHidden: true
           },
           {
-            label: "港口",
+            label: "port",
             prop: "portCname",
             overHidden: true,
             search: true,
@@ -236,13 +239,13 @@ export default {
             }
           },
           {
-            label: "状态",
+            label: "STATUS",
             prop: "boxDynamics",
             // search: true,
             overHidden: true
           },
           {
-            label: "接口状态",
+            label: "ApiStatus",
             prop: "description",
             search: true,
             overHidden: true,
@@ -260,8 +263,9 @@ export default {
             ]
           },
           {
-            label: "同步状态",
+            label: "syncStatus",
             prop: "synchronizationStatus",
+            width:100,
             search: true,
             overHidden: true,
             cell: true,
@@ -286,17 +290,18 @@ export default {
             ]
           },
           {
-            label: "请求内容",
+            label: "requestContent",
             prop: "requestContent",
+            width:120,
             overHidden: true
           },
           {
-            label: "失败原因",
+            label: "reason",
             prop: "reason",
             overHidden: true
           },
           {
-            label: "备注",
+            label: "Remarks",
             prop: "remarks",
             cell: true,
             overHidden: true

src/views/iosBasicData/OceanFreightImport/bills/index.vue

@@ -549,6 +549,7 @@ export default {
         editBtn: false,
         menuWidth: "auto",
         align: "center",
+        // stripe: true,
         showSummary: true,
         column: [
           {
@@ -1647,7 +1648,7 @@ export default {
               "quantityV48"
             ].includes(prop)
           ) {
-            let values = this.data.filter(item => item.billType == "MH"||item.billType == "DD").map(item => Number(item[prop] || 0));
+            let values = this.data.filter(item => item.billType == "MH" || item.billType == "DD").map(item => Number(item[prop] || 0));
             let all =
               values.length !== 0
                 ? (sums[index] = values.reduce((a, b) => {
@@ -1870,22 +1871,9 @@ export default {
       });
     },
     rowStyle({ row, column, rowIndex, columnIndex }) {
-      if (row.status == 2) {
-        return {
-          // color: '#fff',
-          backgroundColor: "#fbd26a"
-        };
-      }
-      if (row.status == 3) {
-        return {
-          // color: '#fff',
-          backgroundColor: "#ced094"
-        };
-      }
-      if (row.status == 4) {
+      if (rowIndex % 2 != 0) {
         return {
-          // color: '#fff',
-          backgroundColor: "#fbc4c4"
+          backgroundColor: "#ecf5ff"
         };
       }
     },

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -259,7 +259,7 @@
                         v-model="assemblyForm.foreignAgencyDetails"
                         size="small"
                         autocomplete="off"
-                        :disabled="detailData.seeDisabled || overTime"
+                        :disabled="detailData.seeDisabled"
                         :rows="textareaNumber"
                         clearable
                         placeholder="请输入国外代理提单描述"
@@ -281,7 +281,7 @@
                       :remote="true"
                       :addIf="true"
                       :tableIf="false"
-                      :disabled="detailData.seeDisabled || overTime"
+                      :disabled="detailData.seeDisabled"
                       :joinData="true"
                       :forParameter="{ key: 'id', short: 'code', label: 'cnName', value: 'cnName' }"
                       placeholder="请选择国外代理"
@@ -299,7 +299,7 @@
                       v-model="assemblyForm.foreignCntyName"
                       size="small"
                       autocomplete="off"
-                      :disabled="detailData.seeDisabled || overTime"
+                      :disabled="detailData.seeDisabled"
                       clearable
                       placeholder="国外代理国家代码"
                     ></el-input>
@@ -314,7 +314,7 @@
                     v-model="assemblyForm.foreignAgencyDetails"
                     size="small"
                     autocomplete="off"
-                    :disabled="detailData.seeDisabled || overTime"
+                    :disabled="detailData.seeDisabled"
                     :rows="textareaNumber"
                     clearable
                     placeholder="请输入国外代理提单描述"

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -4888,17 +4888,17 @@ export default {
 ::v-deep#out-table .back-one {
   background: #ecf5ff !important;
   text-align: center;
-  padding: 4px 0;
+  // padding: 4px 0;
 }
 
 ::v-deep#out-table .back-two {
   background: #ecf5ff !important;
   text-align: center;
-  padding: 4px 0;
-}
-::v-deep .el-table .cell {
-  padding: 0 2px !important;
+  // padding: 4px 0;
 }
+// ::v-deep .el-table .cell {
+//   padding: 0 2px !important;
+// }
 ::v-deep .el-input__inner {
   padding-left: 5px !important;
 }

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -3227,7 +3227,7 @@ export default {
       if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
         this.detailData.seeDisabled = true;
       } else {
-        if (this.isCutOffDate && this.form.cyTrailerTime) {
+        if (this.isCutOffDate && this.form.cyTrailerTime&&this.form.boxBelongsTo=='SOC') {
           const cutOffDate = new Date(this.form.cyTrailerTime);
           const newDate = new Date(dateFormat(new Date(), "yyyy-MM-dd"));
           if (newDate > cutOffDate) {

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -764,6 +764,7 @@ export default {
         viewBtn: false,
         delBtn: false,
         editBtn: false,
+        // stripe: true,
         menuWidth: "auto",
         align: "center",
         showSummary: true,
@@ -941,7 +942,7 @@ export default {
               label: "realName",
               value: "id"
             },
-            hide:true,
+            hide: true,
             search: true,
             span: 6,
             searchOrder: 7
@@ -950,7 +951,7 @@ export default {
             label: "OP",
             prop: "operatorName",
             width: 120,
-            overHidden: true,
+            overHidden: true
           },
           {
             label: this.$t("sea118n.etd"),
@@ -1721,7 +1722,7 @@ export default {
               "quantityV48"
             ].includes(prop)
           ) {
-            let values = this.data.filter(item => item.billType == "MH"||item.billType == "DD").map(item => Number(item[prop] || 0));
+            let values = this.data.filter(item => item.billType == "MH" || item.billType == "DD").map(item => Number(item[prop] || 0));
             let all =
               values.length !== 0
                 ? (sums[index] = values.reduce((a, b) => {
@@ -1995,22 +1996,9 @@ export default {
       });
     },
     rowStyle({ row, column, rowIndex, columnIndex }) {
-      if (row.status == 2) {
-        return {
-          // color: '#fff',
-          backgroundColor: "#fbd26a"
-        };
-      }
-      if (row.status == 3) {
-        return {
-          // color: '#fff',
-          backgroundColor: "#ced094"
-        };
-      }
-      if (row.status == 4) {
+      if (rowIndex % 2 != 0) {
         return {
-          // color: '#fff',
-          backgroundColor: "#fbc4c4"
+          backgroundColor: "#ecf5ff"
         };
       }
     },

src/views/iosBasicData/containerReminder/index.vue

@@ -153,6 +153,15 @@ export default {
             overHidden: true
           },
           {
+            label: "ATA",
+            prop: "actualEta",
+            overHidden: true,
+            width: 100,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd"
+          },
+          {
             label: "port",
             prop: "podCnName",
             overHidden: true

src/views/iosBasicData/financialManagement/fininvoicesOutput/index.vue

@@ -202,6 +202,7 @@ export default {
         viewBtn: false,
         delBtn: false,
         editBtn: false,
+        stripe: true,
         column: [
           {
             label: "所属公司",
@@ -1525,11 +1526,23 @@ export default {
       }
     },
     rowStyle({ row, column, rowIndex }) {
-      //已结算金额
       if (row.billStatus == 1) {
-        return {
-          color: "#0000FF"
-        };
+        if (rowIndex % 2 != 0) {
+          return {
+            backgroundColor: "#ecf5ff",
+            color: "#0000FF"
+          };
+        } else {
+          return {
+            color: "#0000FF"
+          };
+        }
+      } else {
+        if (rowIndex % 2 != 0) {
+          return {
+            backgroundColor: "#ecf5ff"
+          };
+        }
       }
     },
     // 更改表格颜色