提单编辑保存进行换行

免箱使天数新加字段

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

@@ -690,7 +690,48 @@ export default {
       this.documentForm.attachedGoodsdesc = 0;
       this.documentForm.attached = 0;
       this.documentForm.attachedCntr = 0;
+      //收发通换行
+      if (this.documentForm.hshipperDetails) {
+        let arrDeteil = [];
+        arrDeteil = this.documentForm.hshipperDetails.split("\n");
+        if (arrDeteil.length > this.textareaNumber) {
+          this.documentForm.hshipperDetails = arrDeteil.slice(0, this.textareaNumber).join("\n") + "*";
+          this.documentForm.commodityDescr += "\n*" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join("\n");
+        } else {
+          this.documentForm.hshipperDetails = this.documentForm.hshipperDetails;
+        }
+      }
+      if (this.documentForm.hconsigneeDetails) {
+          let arrDeteil = []
+          arrDeteil = this.documentForm.hconsigneeDetails.split('\n')
+          if (arrDeteil.length > this.textareaNumber) {
+              this.documentForm.hconsigneeDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '**'
+              this.documentForm.commodityDescr += "\n**" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
+          } else {
+              this.documentForm.hconsigneeDetails = this.documentForm.hconsigneeDetails
+          }
+      }
 
+      if (this.documentForm.hnotifyDetails) {
+          let arrDeteil = []
+          arrDeteil = this.documentForm.hnotifyDetails.split('\n')
+          if (arrDeteil.length > this.textareaNumber) {
+              this.documentForm.hnotifyDetails = arrDeteil.slice(0, this.textareaNumber).join('\n') + '***'
+              this.documentForm.commodityDescr += "\n***" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
+          } else {
+              this.documentForm.hnotifyDetails = this.documentForm.hnotifyDetails
+          }
+      }
+      if (this.documentForm.forwarding) {
+          let arrDeteil = []
+          arrDeteil = this.documentForm.forwarding.split('\n')
+          if (arrDeteil.length > this.textareaNumber) {
+              this.documentForm.forwarding = arrDeteil.slice(0, this.textareaNumber).join('\n') + '****'
+              this.documentForm.commodityDescr += "\n****" + arrDeteil.slice(this.textareaNumber, arrDeteil.length).join('\n')
+          } else {
+              this.documentForm.forwarding = this.documentForm.forwarding
+          }
+      }
       if (this.documentForm.cntryString) {
         if (this.documentForm.cntryString.split("\n").length > this.mttachedCntry) {
           this.documentForm.attachedCntr = 1;
@@ -722,6 +763,7 @@ export default {
         obj.groupCode = this.businesstypeData.groupCode;
         obj.reportsType = this.businesstypeData.reportsType;
       }
+      console.log(this.documentForm);
       obj.printContent = JSON.stringify({
         data: {
           ...this.documentForm,

src/views/iosBasicData/SeafreightExportF/bills/assembly/components/podCheckseafeeday.vue

@@ -15,7 +15,7 @@
             v-model="form.curCode"
             placeholder="币别"
             label="code"
-            :url="'/blade-los/bcurrency/obtainRate?deptId=' + deptId + '&date=' + form.etd+ '&type=1'"
+            :url="'/blade-los/bcurrency/obtainRate?deptId=' + deptId + '&date=' + form.etd + '&type=1'"
             :filterable="true"
             @selectChange="dicChange('curCode', $event)"
           ></dic-select>
@@ -49,12 +49,27 @@ export default {
         labelWidth: 100,
         column: [
           {
-            label: "申请天数",
+            label: "POL申请天数",
             span: 24,
-            prop: "applyDays",
-            type:'number',
-            precision:0,
-            controls:false,
+            prop: "polApplyDays",
+            type: "number",
+            precision: 0,
+            controls: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入申请天数",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "POD申请天数",
+            span: 24,
+            prop: "podApplyDays",
+            type: "number",
+            precision: 0,
+            controls: false,
             rules: [
               {
                 required: true,
@@ -67,9 +82,9 @@ export default {
             label: "申请金额",
             span: 24,
             prop: "applyAmount",
-            type:'number',
-            precision:0,
-            controls:false,
+            type: "number",
+            precision: 0,
+            controls: false,
             rules: [
               {
                 required: true,
@@ -94,9 +109,9 @@ export default {
             label: "汇率",
             span: 24,
             prop: "exrate",
-            type:'number',
-            precision:5,
-            controls:false,
+            type: "number",
+            precision: 5,
+            controls: false,
             rules: [
               {
                 required: true,
@@ -118,12 +133,13 @@ export default {
         url: "/iosBasicData/SeafreightExportF/bills/index",
         pageStatus: "this.$store.getters.approvalDetails",
         pageLabel: "海运出口(F)",
-        applyDays: 1,
+        polApplyDays: val.polFreeBoxUseDays,
+        podApplyDays: val.podFreeBoxUseDays,
         applyAmount: 0,
         curCode: "USD",
         exrate: this.getExchangeRate("USD", "D", 1),
         type: "pod",
-        etd: val.etd+' 00:00:00'
+        etd: val.etd + " 00:00:00"
       };
     },
     dicChange(name, row) {
@@ -140,7 +156,7 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          console.log(this.form)
+          console.log(this.form);
           const loading = this.$loading({
             lock: true,
             text: "加载中",

src/views/iosBasicData/SeafreightExportF/bills/assembly/components/podViewseafeeday.vue

@@ -57,21 +57,45 @@ export default {
             disabled:true
           },
           {
-            label: "ETD",
+            label: "船名",
             span: 8,
-            prop: "etd",
-            type:'date',
-            format: "yyyy-MM-dd",
+            prop: "vesselCnName",
+            disabled:true
+          },
+          {
+            label: "航次",
+            span: 8,
+            prop: "voyageNo",
+            disabled:true
+          },
+          {
+            label: "装货港",
+            span: 8,
+            prop: "polCnName",
             disabled:true
           },
           {
-            label: "ETA",
+            label: "卸货港",
             span: 8,
-            prop: "eta",
+            prop: "podCnName",
+            disabled:true
+          },
+          {
+            label: "ETD",
+            span: 8,
+            prop: "etd",
             type:'date',
             format: "yyyy-MM-dd",
             disabled:true
           },
+          // {
+          //   label: "ETA",
+          //   span: 8,
+          //   prop: "eta",
+          //   type:'date',
+          //   format: "yyyy-MM-dd",
+          //   disabled:true
+          // },
           {
             label: "ATD",
             span: 8,
@@ -88,16 +112,22 @@ export default {
             format: "yyyy-MM-dd",
             disabled:true
           },
+          // {
+          //   label: "免箱使天数",
+          //   span: 8,
+          //   prop: "freeBoxUseDays",
+          //   disabled:true
+          // },
           {
-            label: "免箱使天数",
+            label: "POL申请天数",
             span: 8,
-            prop: "freeBoxUseDays",
+            prop: "polApplyDays",
             disabled:true
           },
           {
-            label: "申请天数",
+            label: "POD申请天数",
             span: 8,
-            prop: "applyDays",
+            prop: "podApplyDays",
             disabled:true
           },
           {