海运出口 新加必填项

src/util/date.js

@@ -135,6 +135,12 @@ export function defaultDate4() {
   const date = new Date();
   return dateFormat(date, "yyyy");
 }
+export function nextYearDate() {
+  const date = new Date();
+  const nextYearDate = new Date();
+  nextYearDate.setFullYear(date.getFullYear() + 1);
+  return dateFormat(nextYearDate, "yyyy");
+}
 /**
  * 获取本年上个月
  */
@@ -360,7 +366,7 @@ export function lineQuantityVerification(text, line) {
     console.log(lines)
     for (let [index, item] of lines.entries()) {
       if (item.length > line) {
-        console.log(item.length,line)
+        console.log(item.length, line)
         return true
       }
 

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

@@ -1569,7 +1569,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="舱位类型" prop="cabinType">
+              <el-form-item label="舱位类型" prop="cabinType" :rules="[{ required: true, message: '', trigger: 'blur' }]">
                 <span slot="label">
                   <span style="color: #1e9fff">舱位类型</span>
                 </span>

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

@@ -83,7 +83,12 @@
           :loading="pageLoading"
           >{{ $t("btn118n.transferApply") }}
         </el-button>
-        <el-button v-if="form.id && form.transferOrderStatus == '已转单'" size="small" type="danger" @click.stop="allClick('撤销转单')" :loading="pageLoading"
+        <el-button
+          v-if="form.id && form.transferOrderStatus == '已转单'"
+          size="small"
+          type="danger"
+          @click.stop="allClick('撤销转单')"
+          :loading="pageLoading"
           >{{ $t("btn118n.untransferApply") }}
         </el-button>
         <el-button size="small" type="warning" :disabled="!form.id || showLock" v-if="form.billType == 'MM'" @click.stop="allClick('同步主单到分单')"
@@ -789,6 +794,7 @@ export default {
         polFreeBoxUseDays: "7",
         podFreeBoxUseDays: "14",
         boxBelongsTo: "SOC",
+        cabinType: "DF自营",
         bookingDate: dateFormat(new Date(), "yyyy-MM-dd"),
         filesList: [], // 文件中心
         feeCenterListD: [], // 收
@@ -986,11 +992,11 @@ export default {
         {
           name: "承运人",
           value: "carrierCnName"
+        },
+        {
+          name: "舱位类型",
+          value: "cabinType"
         }
-        // {
-        //     name: '场站',
-        //     value: 'cyCnName',
-        // },
       ],
       imporiData: [
         // { id: 0, name: '导入 ONE 模板' },
@@ -1426,16 +1432,18 @@ export default {
           type: "warning"
         }).then(() => {
           this.pageLoading = true;
-          revokeTransferOrder(this.form).then(res => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
+          revokeTransferOrder(this.form)
+            .then(res => {
+              this.$message({
+                type: "success",
+                message: "操作成功!"
+              });
+              this.logisticsDialog = false;
+              this.billsDetailfun(this.form.id);
+            })
+            .catch(() => {
+              this.pageLoading = false;
             });
-            this.logisticsDialog = false;
-            this.billsDetailfun(this.form.id);
-          }).catch(()=>{
-            this.pageLoading = false;
-          })
         });
       }
       if (name == "同步主单到分单") {
@@ -2493,7 +2501,9 @@ export default {
           if (!this.form.srcType || !this.form.srcCnName) {
             msgs.push("业务来源");
           }
-
+          if (!this.form.cabinType) {
+            msgs.push("舱位类型");
+          }
           if (this.form.billType != "MM") {
             if (!this.form.operatorName) {
               msgs.push("OP");

src/views/iosBasicData/rateManagement/index.vue

@@ -85,7 +85,7 @@
 import detailPage from "./detailsPage";
 import { getRateList, deleteDetails, dataDetail, typeSave, copy } from "@/api/iosBasicData/rateManagement";
 
-import { defaultDate4 } from "@/util/date";
+import { defaultDate4, nextYearDate } from "@/util/date";
 export default {
   name: "index",
   components: {
@@ -254,19 +254,36 @@ export default {
       if (this.selectionList.length != 1) {
         return this.$message.error("请选择一条数据");
       }
-
       this.$DialogForm.show({
         title: "复制汇率",
         width: "30%",
         menuPosition: "right",
-        data: { exrateYear: defaultDate4() },
+        data: {
+          exrateYearOld: defaultDate4(),
+          exrateYear: nextYearDate()
+        },
         option: {
           submitText: "确定",
           emptyText: "取消",
           // labelWidth: 130,
           column: [
             {
-              label: "年",
+              label: "原汇率",
+              span: 24,
+              prop: "exrateYearOld",
+              type: "year",
+              format: "yyyy",
+              valueFormat: "yyyy",
+              rules: [
+                {
+                  required: true,
+                  message: "请选择年",
+                  trigger: "blur"
+                }
+              ]
+            },
+            {
+              label: "新汇率",
               span: 24,
               prop: "exrateYear",
               type: "year",
@@ -289,6 +306,7 @@ export default {
           res.done();
           let obj = {
             id: this.selectionList[0].id,
+            exrateYearOld: res.data.exrateYearOld,
             exrateYear: res.data.exrateYear
           };
           copy(obj).then(() => {