去掉换行提醒

src/styles/variables.scss

@@ -136,3 +136,6 @@ p {
 .el-button--text{
   padding: 0;
 }
+.el-table__body tr.current-row>td {
+    background-color: #D9ECFF !important;
+}

src/views/boxManagement/boxTrack/index.vue

@@ -18,6 +18,9 @@
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 241)"
         :page.sync="page"
       >
+        <template slot="menuLeft">
+          <el-button type="warning" size="small" @click="outExport">导 出 </el-button>
+        </template>
         <template slot-scope="{ type, size, row, $index }" slot="menu">
           <!--          <el-button icon="el-icon-view" :size="size" :type="type" @click="$refs.crud.rowUpdate(row,$index)">编辑</el-button>-->
           <el-button size="small" v-if="row.trajectoryStatus == 0" type="text" @click="rowDel(row, index, 1)" style="color:#F56C6C;">删除 </el-button>
@@ -36,7 +39,7 @@
 <script>
 import { getList, remove, update, updateTrajectoryStatus, getRecordlist } from "@/api/boxManagement/boxTrack/index.js";
 import detailsPage from "./detailsPage";
-
+import { getToken } from "@/util/auth";
 export default {
   name: "箱轨迹",
   components: {
@@ -281,88 +284,88 @@ export default {
             width: 100,
             overHidden: true
           },
-          {
-            label: "POL堆场",
-            prop: "polCyCname",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "POL免箱使天数",
-            prop: "polFreeBoxUseDays",
-            width: 110,
-            overHidden: true
-          },
-          {
-            label: "POL提箱进场时间",
-            prop: "polPreAppearanceDate",
-            width: 140,
-            // searchLabelWidth: 110,
-            // search: true,
-            // searchProp: "entryDateList",
-            type: "date",
-            // searchRange: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd HH:mm:ss",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            overHidden: true
-          },
-          {
-            label: "POL场站空箱出场日期",
-            prop: "polStationEmptyContainerExitDate",
-            width: 140,
-            // searchLabelWidth: 140,
-            // search: true,
-            // searchProp: "appearDateList",
-            type: "date",
-            // searchRange: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd HH:mm:ss",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            overHidden: true
-          },
-          {
-            label: "POL返空日期",
-            prop: "polReturnDate",
-            width: 140,
-            overHidden: true
-          },
-          {
-            label: "POL超期箱使天数",
-            prop: "polOverdueBoxUseDays",
-            width: 120,
-            overHidden: true
-          },
-          {
-            label: "ETA",
-            prop: "eta",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "POD空箱还箱日期",
-            prop: "podEmptyContainerReturnDate",
-            width: 120,
-            overHidden: true
-          },
-          {
-            label: "POD场站",
-            prop: "podStationCname",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "POD免箱使天数",
-            prop: "podFreeBoxUseDays",
-            width: 110,
-            overHidden: true
-          },
-          {
-            label: "POD箱使天数",
-            prop: "podBoxUseDays",
-            width: 100,
-            overHidden: true
-          },
+          // {
+          //   label: "POL堆场",
+          //   prop: "polCyCname",
+          //   width: 100,
+          //   overHidden: true
+          // },
+          // {
+          //   label: "POL免箱使天数",
+          //   prop: "polFreeBoxUseDays",
+          //   width: 110,
+          //   overHidden: true
+          // },
+          // {
+          //   label: "POL提箱进场时间",
+          //   prop: "polPreAppearanceDate",
+          //   width: 140,
+          //   searchLabelWidth: 110,
+          //   search: true,
+          //   searchProp: "entryDateList",
+          //   type: "date",
+          //   searchRange: true,
+          //   searchDefaultTime: ["00:00:00", "23:59:59"],
+          //   format: "yyyy-MM-dd HH:mm:ss",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss",
+          //   overHidden: true
+          // },
+          // {
+          //   label: "POL场站空箱出场日期",
+          //   prop: "polStationEmptyContainerExitDate",
+          //   width: 140,
+          //   searchLabelWidth: 140,
+          //   search: true,
+          //   searchProp: "appearDateList",
+          //   type: "date",
+          //   searchRange: true,
+          //   searchDefaultTime: ["00:00:00", "23:59:59"],
+          //   format: "yyyy-MM-dd HH:mm:ss",
+          //   valueFormat: "yyyy-MM-dd HH:mm:ss",
+          //   overHidden: true
+          // },
+          // {
+          //   label: "POL返空日期",
+          //   prop: "polReturnDate",
+          //   width: 140,
+          //   overHidden: true
+          // },
+          // {
+          //   label: "POL超期箱使天数",
+          //   prop: "polOverdueBoxUseDays",
+          //   width: 120,
+          //   overHidden: true
+          // },
+          // {
+          //   label: "ETA",
+          //   prop: "eta",
+          //   width: 100,
+          //   overHidden: true
+          // },
+          // {
+          //   label: "POD空箱还箱日期",
+          //   prop: "podEmptyContainerReturnDate",
+          //   width: 120,
+          //   overHidden: true
+          // },
+          // {
+          //   label: "POD场站",
+          //   prop: "podStationCname",
+          //   width: 100,
+          //   overHidden: true
+          // },
+          // {
+          //   label: "POD免箱使天数",
+          //   prop: "podFreeBoxUseDays",
+          //   width: 110,
+          //   overHidden: true
+          // },
+          // {
+          //   label: "POD箱使天数",
+          //   prop: "podBoxUseDays",
+          //   width: 100,
+          //   overHidden: true
+          // },
           {
             label: "状态",
             prop: "trajectoryStatus",
@@ -448,7 +451,7 @@ export default {
     },
     searchChange(params, done) {
       done();
-      this.firstPage=true
+      this.firstPage = true;
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
     },
@@ -478,6 +481,30 @@ export default {
       }
     },
 
+    outExport() {
+      let config = { params: { ...this.search } };
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof value !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + "[" + key + "]";
+                config.params[params] = value[key];
+              }
+              delete config.params[propName];
+            }
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: "/api/blade-los/archivestrajectory/exportArchivesTrajectory", //跳转目标窗口的地址
+        query: {
+          ...config.params, //括号内是要传递给新窗口的参数
+        }
+      });
+      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
+    },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {
       /**

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -289,8 +289,14 @@
           <template slot="menuLeft">
             <!-- <el-button type="info" plain size="small" :disabled="editDisabled || searchStatus" @click="allClick('一键保存')">一键保存</el-button>
             <el-button type="info" plain size="small" :disabled="editDisabled || searchStatus" @click="allClick('一键编辑')">一键编辑</el-button> -->
-            <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0||form.whetherManuallyCreate==1" @click="allClick('批量删除')"
-              >批量删除</el-button>
+            <el-button
+              type="danger"
+              plain
+              size="small"
+              :disabled="editDisabled || selectionList.length == 0 || form.whetherManuallyCreate == 1"
+              @click="allClick('批量删除')"
+              >批量删除</el-button
+            >
             <el-button type="success" size="small" :disabled="!form.id" @click="allClick('导出')">导出</el-button>
             <el-button size="small" :disabled="!form.id" @click="allClick('POD数')">POD数</el-button>
             <el-button
@@ -446,7 +452,7 @@
               key="id"
               label="cnName"
               res="records"
-               url="/blade-los/bcorps/selectList?current=1&size=10&corpTypeName=场站&status=0"
+              url="/blade-los/bcorps/selectList?current=1&size=10&corpTypeName=场站&status=0"
               :filterable="true"
               :remote="true"
               dataName="cnName"
@@ -464,7 +470,7 @@
               key="id"
               label="cnName"
               res="records"
-              url="/blade-los/bports/list?status=0"
+               url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0"
               :filterable="true"
               :remote="true"
               dataName="cnName"
@@ -1050,7 +1056,7 @@ export default {
             // cell: true,
             // slot: true,
             // formslot: true,
-            overHidden: true,
+            overHidden: true
             // rules: [
             //   {
             //     required: true,
@@ -1066,7 +1072,7 @@ export default {
             // cell: true,
             // slot: true,
             // formslot: true,
-            overHidden: true,
+            overHidden: true
             // rules: [
             //   {
             //     required: true,
@@ -1328,6 +1334,12 @@ export default {
             width: 130
           },
           {
+            label: "POD",
+            prop: "podCname",
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "POD场站",
             prop: "podStationCname",
             cell: true,
@@ -1992,12 +2004,12 @@ export default {
         }
       }
       if (name == "批量删除") {
-        for(let item of this.selectionList){
-          if(item.boxClass!='自有箱'){
-             return this.$message.error("请选择自有箱的数据");
-          } 
-          if(item.status=='使用中'){
-             return this.$message.error("箱状态为使用中的数据,不允许删除");
+        for (let item of this.selectionList) {
+          if (item.boxClass != "自有箱") {
+            return this.$message.error("请选择自有箱的数据");
+          }
+          if (item.status == "使用中") {
+            return this.$message.error("箱状态为使用中的数据,不允许删除");
           }
         }
         let multiList = [];
@@ -2048,7 +2060,7 @@ export default {
         //     return this.$message.error("请选择待使用箱状态的数据");
         //   }
         // }
-        this.$refs.changeCn.openDialog(this.form,this.selectionList)
+        this.$refs.changeCn.openDialog(this.form, this.selectionList);
         // this.$DialogForm.show({
         //   title: "更改放箱号",
         //   width: "30%",
@@ -2105,8 +2117,8 @@ export default {
         //   }
         // });
       }
-      if(name=='POD数'){
-        this.$refs.podBoxCount.openDialog(this.form)
+      if (name == "POD数") {
+        this.$refs.podBoxCount.openDialog(this.form);
       }
     },
     submit(type) {

src/views/boxManagement/containerNumber/index.vue

@@ -32,8 +32,7 @@
             <el-tab-pane label="全部" name="0"></el-tab-pane>
           </el-tabs>
           <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增 </el-button>
-          <!-- <el-button type="warning" size="small" @click="outExport">导 出
-                    </el-button> -->
+          <el-button type="warning" size="small" @click="outExport">导 出 </el-button>
           <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据 </el-button>
           <el-button type="success" size="small" :disabled="selectionList.length == 0" @click="fixPod">批量修改POD </el-button>
         </template>
@@ -744,10 +743,9 @@ export default {
         }
       }
       const routeData = this.$router.resolve({
-        path: "/api/blade-los/routecost/exportRouteCost", //跳转目标窗口的地址
+        path: "/api/blade-los/putbox/exportPutBox", //跳转目标窗口的地址
         query: {
           ...config.params, //括号内是要传递给新窗口的参数
-          identification: this.url
         }
       });
       window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);

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

@@ -985,11 +985,11 @@ export default {
     this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content;
     this.isHq = JSON.parse(localStorage.getItem("user-Information")).isHq;
     this.roleName = localStorage.getItem("roleName").split(",");
-    isProcurement({ param: "line.length" }).then(res => {
-      if (res.data.data) {
-        this.lineLength = res.data.data;
-      }
-    });
+    // isProcurement({ param: "line.length" }).then(res => {
+    //   if (res.data.data) {
+    //     this.lineLength = res.data.data;
+    //   }
+    // });
     if (this.detailData.billType) {
       this.form.billType = this.detailData.billType;
     }
@@ -1623,15 +1623,15 @@ export default {
       //   });
       //   return;
       // }
-      if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
-        return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
-      }
-      if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
-        return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
-      }
-      if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
-        return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
-      }
+      // if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+      //   return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
+      // }
+      // if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+      //   return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
+      // }
+      // if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+      //   return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
+      // }
       // if (!verifyEnglish(this.form.detail.hshipperDetails)) {
       //   msgsList.push("发货人");
       // }
@@ -2586,15 +2586,15 @@ export default {
           //     return;
           //   }
           // }
-          if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
-            return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
-          }
-          if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
-            return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
-          }
-          if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
-            return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
-          }
+          // if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+          //   return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
+          // }
+          // if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+          //   return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
+          // }
+          // if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+          //   return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
+          // }
           // console.log(this.form.detail);
           // if (!verifyEnglish(this.form.detail.hshipperDetails)) {
           //   msgsList.push("发货人");

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

@@ -1169,11 +1169,11 @@ export default {
         this.textareaNumber = res.data.data;
       }
     });
-    isProcurement({ param: "line.length" }).then(res => {
-      if (res.data.data) {
-        this.lineLength = res.data.data;
-      }
-    });
+    // isProcurement({ param: "line.length" }).then(res => {
+    //   if (res.data.data) {
+    //     this.lineLength = res.data.data;
+    //   }
+    // });
     if (this.detailData.billType) {
       this.form.billType = this.detailData.billType;
     }
@@ -1748,15 +1748,15 @@ export default {
       //   });
       //   return;
       // }
-      if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
-        return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
-      }
-      if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
-        return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
-      }
-      if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
-        return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
-      }
+      // if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+      //   return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
+      // }
+      // if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+      //   return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
+      // }
+      // if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+      //   return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
+      // }
       // if (!verifyEnglish(this.form.detail.hshipperDetails)) {
       //   msgsList.push("发货人");
       // }
@@ -2731,9 +2731,9 @@ export default {
           //     return;
           //   }
           // }
-          if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
-            return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
-          }
+          // if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+          //   return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
+          // }
           // if (this.form.detail.hshipperDetails) {
           //   let msg = tabVerify(this.form.detail.hshipperDetails);
           //   if (msg.length > 0) {
@@ -2746,9 +2746,9 @@ export default {
           //     return;
           //   }
           // }
-          if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
-            return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
-          }
+          // if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+          //   return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
+          // }
           // if (this.form.detail.hconsigneeDetails) {
           //   let msg = tabVerify(this.form.detail.hconsigneeDetails);
           //   if (msg.length > 0) {
@@ -2761,9 +2761,9 @@ export default {
           //     return;
           //   }
           // }
-          if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
-            return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
-          }
+          // if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+          //   return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
+          // }
           // if (this.form.detail.hnotifyDetails) {
           //   let msg = tabVerify(this.form.detail.hnotifyDetails);
           //   if (msg.length > 0) {

src/views/iosBasicData/billModify/detailsPage.vue

@@ -1059,11 +1059,11 @@ export default {
   },
   async created() {
     this.roleName = localStorage.getItem("roleName").split(",");
-    isProcurement({ param: "line.length" }).then(res => {
-      if (res.data.data) {
-        this.lineLength = res.data.data;
-      }
-    });
+    // isProcurement({ param: "line.length" }).then(res => {
+    //   if (res.data.data) {
+    //     this.lineLength = res.data.data;
+    //   }
+    // });
     if (this.detailData && this.detailData.generateId) {
       this.generateDeadline(this.detailData.generateId);
     }
@@ -1332,15 +1332,15 @@ export default {
     submit(type) {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (lineQuantityVerification(this.form.deadlineShipperDetails, this.lineLength)) {
-            return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
-          }
-          if (lineQuantityVerification(this.form.deadlineConsigneeDetails, this.lineLength)) {
-            return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
-          }
-          if (lineQuantityVerification(this.form.deadlineNotifyDetails, this.lineLength)) {
-            return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
-          }
+          // if (lineQuantityVerification(this.form.deadlineShipperDetails, this.lineLength)) {
+          //   return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
+          // }
+          // if (lineQuantityVerification(this.form.deadlineConsigneeDetails, this.lineLength)) {
+          //   return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
+          // }
+          // if (lineQuantityVerification(this.form.deadlineNotifyDetails, this.lineLength)) {
+          //   return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
+          // }
           this.form.billNoFormat = "TDXG";
           this.form.businessTypeCode = "TDXG";
           const loading = this.$loading({

src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue

@@ -1875,11 +1875,11 @@ export default {
     isProcurement({ param: "import.template" }).then(res => {
       this.importTemplate = res.data.data;
     });
-    isProcurement({ param: "line.length" }).then(res => {
-      if (res.data.data) {
-        this.lineLength = res.data.data;
-      }
-    });
+    // isProcurement({ param: "line.length" }).then(res => {
+    //   if (res.data.data) {
+    //     this.lineLength = res.data.data;
+    //   }
+    // });
     isProcurement({ param: "is.cutOffDate" }).then(res => {
       if (res.data.data == 1) {
         this.isCutOffDate = true;
@@ -2721,15 +2721,15 @@ export default {
       if (name == "提交订舱") {
         this.$refs["form"].validate(valid => {
           if (valid) {
-            if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
-              return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
-            }
-            if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
-              return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
-            }
-            if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
-              return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
-            }
+            // if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+            //   return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
+            // }
+            // if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+            //   return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
+            // }
+            // if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+            //   return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
+            // }
             if (!this.form.preContainersList.length) {
               return this.$message.error("集装箱明细不能为空");
             }
@@ -3151,15 +3151,15 @@ export default {
           //   });
           //   return;
           // }
-          if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
-            return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
-          }
-          if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
-            return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
-          }
-          if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
-            return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
-          }
+          // if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+          //   return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
+          // }
+          // if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+          //   return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
+          // }
+          // if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+          //   return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
+          // }
 
           for (let row of this.form.preContainersList) {
             if (!row.cntrTypeCode || !row.quantity) {

src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -1687,11 +1687,11 @@ export default {
     isProcurement({ param: "import.template" }).then(res => {
       this.importTemplate = res.data.data;
     });
-    isProcurement({ param: "line.length" }).then(res => {
-      if (res.data.data) {
-        this.lineLength = res.data.data;
-      }
-    });
+    // isProcurement({ param: "line.length" }).then(res => {
+    //   if (res.data.data) {
+    //     this.lineLength = res.data.data;
+    //   }
+    // });
     if (this.detailData && this.detailData.id) {
       this.getDetails(this.detailData.id);
     }
@@ -2609,15 +2609,15 @@ export default {
           //   });
           //   return;
           // }
-          if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
-            return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
-          }
-          if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
-            return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
-          }
-          if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
-            return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
-          }
+          // if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+          //   return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
+          // }
+          // if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+          //   return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
+          // }
+          // if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+          //   return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
+          // }
 
           for (let row of this.form.preContainersList) {
             if (!row.cntrTypeCode || !row.quantity) {
@@ -2722,15 +2722,15 @@ export default {
       //   });
       //   return;
       // }
-      if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
-        return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
-      }
-      if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
-        return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
-      }
-      if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
-        return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
-      }
+      // if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+      //   return this.$message.error(`发货人详情超长，请手动断行，否则影响打印`);
+      // }
+      // if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+      //   return this.$message.error(`收货人详情超长，请手动断行，否则影响打印`);
+      // }
+      // if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+      //   return this.$message.error(`通知人详情超长，请手动断行，否则影响打印`);
+      // }
 
       if (!this.form.preContainersList.length) {
         return this.$message.error("集装箱明细不能为空");

src/views/ow/owPut/detailsPage.vue

@@ -312,7 +312,7 @@
                 <el-tag type="success" style="margin-right: 8px;">
                   空箱出场:
                   {{
-                    form.tradingBoxItemsList.filter(item => item.status == "使用中" || item.status == "已还箱" || item.status == "退租").length || 0
+                    form.tradingBoxItemsList.filter(item => item.status == "使用中"|| item.status == "退租").length || 0
                   }}
                 </el-tag>
                 <el-tag type="info" style="margin-right: 8px;">
@@ -2637,6 +2637,16 @@ export default {
             ]
           },
           {
+            label: "财务日期",
+            prop: "billDate",
+            width: 100,
+            overHidden: true,
+            cell: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd"
+          },
+          {
             label: "类别",
             prop: "billType",
             width: "100",
@@ -2922,6 +2932,16 @@ export default {
             ]
           },
           {
+            label: "财务日期",
+            prop: "billDate",
+            width: 100,
+            overHidden: true,
+            cell: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd"
+          },
+          {
             label: "类别",
             prop: "billType",
             width: "100",
@@ -4597,6 +4617,9 @@ export default {
           if (row.stlPid && row.auditStatus != 0) {
             return this.$message.error("已申请费用，不允许重复申请");
           }
+          if (!row.billDate) {
+            return this.$message.error("请选择财务日期");
+          }
         }
         if (
           this.form.id &&
@@ -4694,6 +4717,9 @@ export default {
           if (row.stlPid && row.auditStatus != 0) {
             return this.$message.error("已申请费用，不允许重复申请");
           }
+          if (!row.billDate) {
+            return this.$message.error("请选择财务日期");
+          }
         }
         if (
           this.form.id &&

src/views/ow/owTask/detailsPage.vue

@@ -369,7 +369,7 @@
                 <el-tag type="success" style="margin-right: 8px;">
                   空箱出场:
                   {{
-                    form.tradingBoxItemsList.filter(item => item.status == "使用中" || item.status == "已还箱" || item.status == "退租").length || 0
+                    form.tradingBoxItemsList.filter(item => item.status == "使用中" || item.status == "退租").length || 0
                   }}
                 </el-tag>
                 <el-tag type="info" style="margin-right: 8px;">
@@ -2740,6 +2740,16 @@ export default {
             ]
           },
           {
+            label: "财务日期",
+            prop: "billDate",
+            width: 100,
+            overHidden: true,
+            cell: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd"
+          },
+          {
             label: "类别",
             prop: "billType",
             width: "100",
@@ -3244,6 +3254,16 @@ export default {
             ]
           },
           {
+            label: "财务日期",
+            prop: "billDate",
+            width: 100,
+            overHidden: true,
+            cell: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd"
+          },
+          {
             label: "类别",
             prop: "billType",
             width: "100",
@@ -5184,6 +5204,9 @@ export default {
           if (row.stlPid && row.auditStatus != 0) {
             return this.$message.error("已申请费用，不允许重复申请");
           }
+          if (!row.billDate) {
+            return this.$message.error("请选择财务日期");
+          }
         }
         if (this.isFeedDisabled) {
           return this.$message.error("不允许申请他人费用");
@@ -5275,6 +5298,9 @@ export default {
           if (row.stlPid && row.auditStatus != 0) {
             return this.$message.error("已申请费用，不允许重复申请");
           }
+          if (!row.billDate) {
+            return this.$message.error("请选择财务日期");
+          }
         }
         if (this.isFeecDisabled) {
           return this.$message.error("不允许申请他人费用");