Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1377,7 +1377,9 @@ export default {
                 billId: this.assemblyForm.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'KYCK'
             }).then(res => {

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

@@ -1377,7 +1377,9 @@ export default {
                 billId: this.assemblyForm.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'KYJK'
             }).then(res => {

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

@@ -1604,7 +1604,9 @@ export default {
                 billId: this.assemblyForm.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'HYJK'
             }).then(res => {

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

@@ -4,7 +4,7 @@
             <el-col :span="5">
                 <el-scrollbar>
                     <basic-container>
-                        <avue-tree :option="treeOption" :data="feesTypeData" @node-click="nodeClick">
+                        <avue-tree :option="treeOption" :data="reportTypeData" @node-click="nodeClick">
                         </avue-tree>
                     </basic-container>
                 </el-scrollbar>
@@ -39,7 +39,7 @@
 
 
         <!--添加编辑弹窗-->
-        <el-dialog :title="businesstypeData.cnName" :close-on-click-modal="false" :visible.sync="documentVisible"
+        <el-dialog :title="businesstypeData.label" :close-on-click-modal="false" :visible.sync="documentVisible"
             append-to-body width="60%" :before-close="corpTypeClose">
             <Dispatch-Notice v-if="businesstypeData.reportsType == 'PCTZD'"
                 :documentForm="documentForm"></Dispatch-Notice>
@@ -49,8 +49,13 @@
                 v-else-if="businesstypeData.reportsType == 'TDXQ' || businesstypeData.reportsType == 'DCWTS'"
                 :documentForm="documentForm"></BillofLadingDetails>
             <BillofLadingDetailsM v-else-if="businesstypeData.reportsType == 'MBL BOOKING SHEET'"
-                :documentForm="documentForm">
-            </BillofLadingDetailsM>
+                :documentForm="documentForm"></BillofLadingDetailsM>
+            <BillofLadingDetailsJMS v-else-if="businesstypeData.reportsType == 'JMS-BILL'"
+                                  :documentForm="documentForm"></BillofLadingDetailsJMS>
+            <BillofLadingDetailsCTO v-else-if="businesstypeData.reportsType == 'CTO'"
+                                    :documentForm="documentForm"></BillofLadingDetailsCTO>
+            <FreightNote v-else-if="businesstypeData.reportsType == 'FREIGHT NOTE'"
+                                    :documentForm="documentForm"></FreightNote>
             <span slot="footer" class="dialog-footer">
                 <!--<el-button type="success" @click="documentSubmit(true)" >保存并打印</el-button>-->
                 <el-button v-if="addShow" type="success" :disabled="!documentForm.id"
@@ -103,6 +108,12 @@ import BillofLadingDetails
     from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/BillofLadingDetails.vue";
 import BillofLadingDetailsM
     from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/BillofLadingDetailsM.vue";
+import BillofLadingDetailsJMS
+    from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/BillofLadingDetailsJMS.vue";
+import BillofLadingDetailsCTO
+    from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/BillofLadingDetailsCTO.vue";
+import FreightNote
+    from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/FreightNote.vue";
 import businessReports from "@/views/iosBasicData/SeafreightExportF/bills/assembly/businessReports.vue";
 import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
 import { dateFormat } from "@/util/date";
@@ -110,7 +121,16 @@ import { isProcurement } from "@/api/basicData/configuration";
 export default {
     components: {
         businessReports,
-        BillofLadingDetails, BillofLadingDetailsM, reportContainer, reportformsList, bbusinesstype, DispatchNotice, PurchaseNotice
+        DispatchNotice,
+        PurchaseNotice,
+        BillofLadingDetails,
+        BillofLadingDetailsM,
+        BillofLadingDetailsJMS,
+        BillofLadingDetailsCTO,
+        FreightNote,
+        reportContainer,
+        reportformsList,
+        bbusinesstype,
     },
     data() {
         return {
@@ -201,47 +221,103 @@ export default {
                 size: "small",
                 props: {
                     labelText: "标题",
-                    label: "cnName",
+                    label: "label",
                     value: "value",
                     children: "children"
                 }
             },
-            feesTypeData: [
+            reportTypeData: [
                 {
+                    label: '入货通知',
                     cnName: '入货通知',
                     classifyCode: '单证',
                     groupCode: '入货通知',
                     reportsType: 'RHTZ',
-                    businessType: 'HYCK'
+                    businessType: 'HYCK',
+                    params: "",
                 },
                 {
+                    label: '派车通知单',
                     cnName: '派车通知单',
                     classifyCode: '单证',
                     groupCode: '派车通知单',
                     reportsType: 'PCTZD',
-                    businessType: 'HYCK'
+                    businessType: 'HYCK',
+                    params: "",
                 },
                 {
+                    label: 'HBL BOOKING SHEET',
                     cnName: '提单详情(H)',
                     classifyCode: '单证',
                     groupCode: '提单详情(H)',
                     reportsType: 'TDXQ',
-                    businessType: 'HYCK'
+                    businessType: 'HYCK',
+                    params: "",
                 },
                 {
+                    label: 'MBL BOOKING SHEET',
                     cnName: '提单详情(M)',
                     classifyCode: '单证',
                     groupCode: '提单详情(M)',
                     reportsType: 'MBL BOOKING SHEET',
-                    businessType: 'HYCK'
+                    businessType: 'HYCK',
+                    params: "",
                 },
                 {
+                    label: 'JMS 提单',
+                    cnName: 'JMS 提单',
+                    classifyCode: '单证',
+                    groupCode: 'JMS提单',
+                    reportsType: 'JMS-BILL',
+                    businessType: 'HYCK',
+                    params: {
+                        // 件重尺是否添加箱型箱量
+                        NumOfContainersOrPackagesAddPreCntrQty: true,
+                        // 货描首行添加字符
+                        commodityDescrFirstLine: "SHIPPER'S LOAD,COUNT AND SEAL",
+                        // 唛头是否添加箱封号
+                        marksAddCntrNoSealNoList: true,
+                        // 唛头是否添加箱号件重尺
+                        marksAddCntrPGVList: true,
+                    },
+                },
+                {
+                    label: 'CTO',
+                    cnName: 'CTO',
+                    classifyCode: '单证',
+                    groupCode: 'CTO',
+                    reportsType: 'CTO',
+                    businessType: 'HYCK',
+                    params: {
+                        // 件重尺是否添加箱型箱量
+                        NumOfContainersOrPackagesAddPreCntrQty: true,
+                        // 货描首行添加字符
+                        commodityDescrFirstLine: "SHIPPER'S LOAD,COUNT AND SEAL",
+                        // 唛头是否添加箱封号
+                        marksAddCntrNoSealNoList: true,
+                        // 唛头是否添加箱号件重尺
+                        marksAddCntrPGVList: true,
+                    },
+                },
+                {
+                    label: '订舱委托书',
                     cnName: '订舱委托书',
                     classifyCode: '单证',
                     groupCode: '提单详情',
                     reportsType: 'DCWTS',
-                    businessType: 'HYCK'
-                }
+                    businessType: 'HYCK',
+                    params: "",
+                },
+                {
+                    label: '运费证明',
+                    cnName: 'FREIGHT NOTE',
+                    classifyCode: '单证',
+                    groupCode: 'FREIGHT NOTE',
+                    reportsType: 'FREIGHT NOTE',
+                    businessType: 'HYCK',
+                    params: "",
+                },
+
             ], // 左侧获取的数据
             documentOption: {},
             documentOptionBack: {
@@ -430,6 +506,8 @@ export default {
         },
         // 新建单证按钮
         addbtnfun() {
+            console.log("this.businesstypeData", this.businesstypeData)
+
             if (!this.assemblyForm.id) {
                 this.$message.warning("请先保存数据");
                 return;
@@ -442,16 +520,17 @@ export default {
             reportsGetReportData({
                 billId: this.assemblyForm.id,
                 reportCode: this.businesstypeData.classifyCode,
-                groupCode: this.businesstypeData.groupCode=='提单详情(H)'?'提单详情':this.businesstypeData.groupCode,
+                groupCode: this.businesstypeData.groupCode,
                 reportsType: this.businesstypeData.reportsType,
-                type: 'HYCK'
+                type: 'HYCK',
+                params: this.businesstypeData.params,
             }).then(res => {
                 this.editData.groupCode = this.businesstypeData.groupCode
                 this.documentForm = res.data.data.data
                 // 联系人
                 this.documentForm.corpAttnName = this.documentForm.corpAttnName + '' + this.documentForm.corpAttnTel
-                this.documentForm.prepaidAt =this.documentForm.mpaymode=='FREIGHT PREPAID'?this.documentForm.mpayplace:null
-                this.documentForm.payableAt =this.documentForm.mpaymode=='FREIGHT COLLECT'?this.documentForm.mpayplace:null
+                // this.documentForm.prepaidAt = this.documentForm.mpaymode=='FREIGHT PREPAID'?this.documentForm.mpayplace:null
+                // this.documentForm.payableAt = this.documentForm.mpaymode=='FREIGHT COLLECT'?this.documentForm.mpayplace:null
                 // this.documenturl = this.businesstypeData.url;
                 // 打开报表选择框
                 this.documentVisible = true
@@ -613,7 +692,7 @@ export default {
         //         groupCode:'派车通知单,入货通知，提单详情',
         //         code:'BZRHTZ,TDXQ,PCTZD,'
         //     }).then(res=>{
-        //         this.feesTypeData = res.data.data.records
+        //         this.reportTypeData = res.data.data.records
         //     })
         // },
         // 类别弹窗关闭

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

@@ -568,8 +568,8 @@
             </div>
         </el-dialog>
 
-        <!--结算单位弹窗-->
-        <el-dialog title="打印" :visible.sync="printingDialog" append-to-body width="70%" :close-on-click-modal="false"
+        <!--账单打印弹窗-->
+        <el-dialog title="打印" v-dialogDrag :visible.sync="printingDialog" append-to-body width="70%" :close-on-click-modal="false"
             :before-close="handleClose">
             <div>
                 <el-row :gutter="10">
@@ -936,6 +936,7 @@ export default {
 
             printingDialog: false, // 打印弹窗开关
             printingDC: '', // 打印弹窗选择是应收还是应付
+            printingAccBill: '', // 打印弹窗选择是否打印账单 1 打印
             PrintingData: [], // 打印弹窗列表数据
             printingLoading: false, // 打印弹窗加载动画
             optionPrinting: {
@@ -957,38 +958,62 @@ export default {
                 menuWidth: '100',
                 column: [
                     {
-                        label: "币别",
-                        prop: "curCode",
-                        width: 100,
-                        cell: true,
-                        type: 'select',
-                        dicData: [{
-                            label: '全部',
-                            value: null
-                        }, {
-                            label: 'USD',
-                            value: 'USD'
-                        }, {
-                            label: 'CNY',
-                            value: 'CNY'
-                        }],
-                        overHidden: true,
+                      label: "客户编号",
+                      prop: "code",
+                      overHidden: true,
                     },
                     {
                         label: "客户名称",
                         prop: "cnName",
                         overHidden: true,
                     },
-                    {
-                        label: "客户编号",
-                        prop: "code",
-                        overHidden: true,
-                    },
+                  {
+                    label: "币别",
+                    prop: "curCode",
+                    width: 100,
+                    cell: true,
+                    type: 'select',
+                    dicData: [{
+                      label: '全部',
+                      value: null
+                    }, {
+                      label: 'USD',
+                      value: 'USD'
+                    }, {
+                      label: 'CNY',
+                      value: 'CNY'
+                    }],
+                    overHidden: true,
+                  },
                     {
                         label: "账单编号",
-                        prop: "accBillNo",
-                        overHidden: true,
-                    },
+                        prop: "billNo",
+                        overHidden: true,
+                    },
+                  {
+                    label: "应收 CNY",
+                    prop: "amountDr",
+                    showColumn: false,
+                    overHidden: true,
+                  },
+                  {
+                    label: "应收 USD",
+                    prop: "amountDrUsd",
+                    showColumn: false,
+                    overHidden: true,
+                  },
+                  {
+                    label: "应付 CNY",
+                    prop: "amountCr",
+                    showColumn: false,
+                    overHidden: true,
+                  },
+                  {
+                    label: "应付 USD",
+                    prop: "amountCrUsd",
+                    showColumn: false,
+                    overHidden: true,
+                  },
                 ]
             },
             corpVisible: false, // 结算单位弹窗
@@ -1578,6 +1603,8 @@ export default {
             }
         })
 
+        this.resetReportColumns()
+
         // 导入弹窗的表格
         this.templateOption = await this.getColumnData(this.getColumnName(309.5), this.templateOptionBack);
         this.getBcorpsListfun() // 获取客户数据
@@ -1687,10 +1714,11 @@ export default {
                 billId: this.assemblyForm.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                BillNumber: row.accBillNo,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
-                type: 'HYCK'
+                type: 'HYCK',
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
             })
@@ -1712,6 +1740,8 @@ export default {
         // 打印费用
         printingCostsfun(dc) {
             this.printingDC = dc
+            this.printingAccBill = ""
+            this.resetReportColumns()
             let groupCode = ''
             let selectionArr = []
             this.idArr = []
@@ -1774,16 +1804,26 @@ export default {
                 this.reportformsObj = res.data.data.records[0]
             })
         },
+        // 重置打印列表
+        resetReportColumns(){
+          this.optionPrinting.column.forEach(col=>{
+            if(col.prop=="amountDr") { col.showColumn = this.printingAccBill == "1" && this.printingDC == "D"}
+            if(col.prop=="amountDrUsd") { col.showColumn = this.printingAccBill == "1" && this.printingDC == "D"}
+            if(col.prop=="amountCr") { col.showColumn = this.printingAccBill == "1" && this.printingDC == "C"}
+            if(col.prop=="amountCrUsd") { col.showColumn = this.printingAccBill == "1" && this.printingDC == "C"}
+          })
+        },
         // 打印表格选择
         reportNodeClick(data) {
             console.log(data)
             if (data.cnName == '应收-账单号') {
+                this.printingAccBill = "1"
                 this.printingLoading = true
                 getFeeCenterCorpIds({
                     billId: this.assemblyForm.id,
                     dc: this.printingDC,
                     type: 'HYCK',
-                    accBillNo: '1'
+                    accBillNo: this.printingAccBill,
                 }).then(res => {
                     this.printingLoading = false
                     res.data.data.forEach(e => {
@@ -1793,12 +1833,13 @@ export default {
                     this.PrintingData = res.data.data
                 })
             } else if (data.cnName == '应付-账单号') {
+                this.printingAccBill = "1"
                 this.printingLoading = true
                 getFeeCenterCorpIds({
                     billId: this.assemblyForm.id,
                     dc: this.printingDC,
                     type: 'HYCK',
-                    accBillNo: '1'
+                    accBillNo: this.printingAccBill,
                 }).then(res => {
                     this.printingLoading = false
                     res.data.data.forEach(e => {
@@ -1808,6 +1849,7 @@ export default {
                     this.PrintingData = res.data.data
                 })
             } else {
+                this.printingAccBill = ""
                 this.printingLoading = true
                 getFeeCenterCorpIds({
                     billId: this.assemblyForm.id,
@@ -1822,6 +1864,7 @@ export default {
                     this.PrintingData = res.data.data
                 })
             }
+            this.resetReportColumns()
             this.reportformsObj = data
         },
         // 生成应收应付

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/BillofLadingDetails.vue

@@ -111,7 +111,7 @@
                 </div>
                 <div style="border: 1px solid #000;">
                     <el-form-item label="For delivery please apply to" prop="mshipperDetails">
-                        <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.mshipperDetails"
+                        <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.mconsigneeDetails"
                             size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
@@ -146,9 +146,9 @@
             </el-col>
             <el-col :span="3">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="No. of containers or packages" prop="quantityCntrDescr">
+                    <el-form-item label="No. of containers or packages" prop="numOfContainersOrPackages">
                         <el-input type="textarea" :rows="14" style="width: 100%;"
-                            v-model="documentForm.quantityCntrDescr" size="small" autocomplete="off" clearable>
+                            v-model="documentForm.numOfContainersOrPackages" size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
@@ -164,8 +164,8 @@
             </el-col>
             <el-col :span="3">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="Gross Weight" prop="grossWeight">
-                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.grossWeight"
+                    <el-form-item label="Gross Weight" prop="grossWeightOfBL">
+                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.grossWeightOfBL"
                             size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
@@ -173,8 +173,8 @@
             </el-col>
             <el-col :span="3">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="Measurement" prop="measurement">
-                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.measurement"
+                    <el-form-item label="Measurement" prop="measurementOfBL">
+                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.measurementOfBL"
                             size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
@@ -183,7 +183,11 @@
         </el-row>
         <el-row>
             <div style="border: 1px solid #000;">
-                <el-form-item label="Total No. of Containaers or Packages(in words)" prop="quantityPackingDescr">
+                <el-form-item label="Total No. of Containaers or Packages(in words)" prop="capitalLetters">
+                    <el-input style="width: 100%;" v-model="documentForm.capitalLetters"
+                              size="small" autocomplete="off" clearable>
+                    </el-input>
+                    <!--
                     <el-row>
                         <el-col :span="18">
                             <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.quantityPackingDescr"
@@ -196,7 +200,7 @@
                             </el-input>
                         </el-col>
                     </el-row>
-
+                    -->
                 </el-form-item>
             </div>
         </el-row>

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/BillofLadingDetailsCTO.vue

@@ -0,0 +1,354 @@
+<template>
+    <el-form :model="documentForm" ref="form" label-position="top" style="margin-bottom: 4px" class="demo-ruleForm">
+        <el-row>
+            <el-col :span="14">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Shippper" prop="hshipperDetails">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.hshipperDetails"
+                                  size="small" autocomplete="off" clearable placeholder=" ">
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Consignee" prop="hconsigneeDetails">
+                        <el-input type="textarea" :rows="5" style="width: 100%;"
+                                  v-model="documentForm.hconsigneeDetails" size="small" autocomplete="off" clearable
+                                  placeholder=" ">
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Notify party" prop="hnotifyDetails">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.hnotifyDetails"
+                                  size="small" autocomplete="off" clearable placeholder=" ">
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <el-row>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Pre-Carriage by" prop="value1">
+                                <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.value1"
+                                          size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="place of Receipt" prop="placeReceiptNamePrint">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          v-model="documentForm.placeReceiptNamePrint" size="small" autocomplete="off"
+                                          clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Ocean Vessel Voy No." prop="vesselCnName">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          v-model="documentForm.vesselCnName" size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Port of Loading" prop="polEnName">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          v-model="documentForm.polEnName" size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Port of Discharge" prop="destinationNamePrint">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          v-model="documentForm.destinationNamePrint" size="small" autocomplete="off"
+                                          clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Place of Delivery" prop="podEnName">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          v-model="documentForm.podEnName" size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-col>
+            <el-col :span="10">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label=" " prop="">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" disabled size="small"
+                                  autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label=" " prop="">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" disabled size="small"
+                                  autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label=" " prop="">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" disabled size="small"
+                                  autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="For delivery please apply to" prop="mshipperDetails">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.mconsigneeDetails"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Final Destination(for the Merchant's reference)" prop="">
+                        <el-input type="textarea" :rows="1" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable placeholder="">
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="9">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Marks and Numbers Conatainer No.        Seal No." prop="marks">
+                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.marks"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <!--            <el-col :span="3">-->
+            <!--                <div style="border: 1px solid #000;">-->
+            <!--                    <el-form-item label="Seal No." prop="cntrSealNo">-->
+            <!--                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.cntrSealNo"-->
+            <!--                                  size="small" autocomplete="off" clearable>-->
+            <!--                        </el-input>-->
+            <!--                    </el-form-item>-->
+            <!--                </div>-->
+            <!--            </el-col>-->
+            <el-col :span="3">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="No. of containers or packages" prop="numOfContainersOrPackages">
+                        <el-input type="textarea" :rows="14" style="width: 100%;"
+                                  v-model="documentForm.numOfContainersOrPackages" size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="6">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Kind of packages,description of goods" prop="commodityDescr">
+                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.commodityDescr"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="3">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Gross Weight" prop="grossWeightOfBL">
+                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.grossWeightOfBL"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="3">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Measurement" prop="measurementOfBL">
+                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.measurementOfBL"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row>
+            <div style="border: 1px solid #000;">
+                <el-form-item label="Total No. of Containaers or Packages(in words)" prop="capitalLetters">
+                    <el-input style="width: 100%;" v-model="documentForm.capitalLetters"
+                              size="small" autocomplete="off" clearable>
+                    </el-input>
+                    <!--
+                    <el-row>
+                        <el-col :span="18">
+                            <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.quantityPackingDescr"
+                                size="small" autocomplete="off" clearable>
+                            </el-input>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-input type="textarea" :rows="1" style="width: 100%;"
+                                v-model="documentForm.quantityCntrTypesDescr" size="small" autocomplete="off" clearable>
+                            </el-input>
+                        </el-col>
+                    </el-row>
+                    -->
+                </el-form-item>
+            </div>
+        </el-row>
+        <el-row>
+            <el-col :span="6">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Freight and charges" prop="">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="5">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Revenue Tons" prop="">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="5">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Rate Per" prop="">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="4">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Prepaid" prop="">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="4">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Collect" prop="">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+        </el-row>
+
+        <el-row>
+            <el-col :span="6">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Ex.Rate" prop="">
+                        <el-input type="textarea" :rows="5" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <el-row>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Prepaid at" prop="prepaidAt">
+                                <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.prepaidAt"
+                                          size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Payable at" prop="payableAt">
+                                <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.payableAt"
+                                          size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Total Prepaid in Local Currency" prop="">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="No. of original B(s)L" prop="numberOfObl">
+                                <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.numberOfObl"
+                                          size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-col>
+            <el-col :span="6">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Place and date of issue" prop="issueAt">
+                        <el-input type="textarea" :rows="5" style="width: 50%;" v-model="documentForm.issueAt"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                        <el-input type="textarea" :rows="5" style="width: 50%;" v-model="documentForm.issueDateOfBL"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+        </el-row>
+
+    </el-form>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+        }
+    },
+    props: {
+        // 表单对象
+        documentForm: {
+            type: Object,
+            default: {}
+        },
+
+    },
+    created() {
+    },
+    methods: {
+    }
+}
+</script>
+
+<style scoped>
+::v-deep.el-form-item {
+    margin-bottom: 0;
+}
+
+::v-deep.el-form--label-top .el-form-item__label {
+    padding: 0;
+    line-height: 20px;
+}
+</style>

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/BillofLadingDetailsJMS.vue

@@ -0,0 +1,354 @@
+<template>
+    <el-form :model="documentForm" ref="form" label-position="top" style="margin-bottom: 4px" class="demo-ruleForm">
+        <el-row>
+            <el-col :span="14">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Shippper" prop="hshipperDetails">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.hshipperDetails"
+                                  size="small" autocomplete="off" clearable placeholder=" ">
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Consignee" prop="hconsigneeDetails">
+                        <el-input type="textarea" :rows="5" style="width: 100%;"
+                                  v-model="documentForm.hconsigneeDetails" size="small" autocomplete="off" clearable
+                                  placeholder=" ">
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Notify party" prop="hnotifyDetails">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.hnotifyDetails"
+                                  size="small" autocomplete="off" clearable placeholder=" ">
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <el-row>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Pre-Carriage by" prop="value1">
+                                <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.value1"
+                                          size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="place of Receipt" prop="placeReceiptNamePrint">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          v-model="documentForm.placeReceiptNamePrint" size="small" autocomplete="off"
+                                          clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Ocean Vessel Voy No." prop="vesselCnName">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          v-model="documentForm.vesselCnName" size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Port of Loading" prop="polEnName">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          v-model="documentForm.polEnName" size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Port of Discharge" prop="destinationNamePrint">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          v-model="documentForm.destinationNamePrint" size="small" autocomplete="off"
+                                          clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Place of Delivery" prop="podEnName">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          v-model="documentForm.podEnName" size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-col>
+            <el-col :span="10">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label=" " prop="">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" disabled size="small"
+                                  autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label=" " prop="">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" disabled size="small"
+                                  autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label=" " prop="">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" disabled size="small"
+                                  autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="For delivery please apply to" prop="mshipperDetails">
+                        <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.mconsigneeDetails"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Final Destination(for the Merchant's reference)" prop="">
+                        <el-input type="textarea" :rows="1" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable placeholder="">
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="8">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Marks and Numbers Conatainer No.        Seal No." prop="marks">
+                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.marks"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+<!--            <el-col :span="3">-->
+<!--                <div style="border: 1px solid #000;">-->
+<!--                    <el-form-item label="Seal No." prop="cntrSealNo">-->
+<!--                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.cntrSealNo"-->
+<!--                                  size="small" autocomplete="off" clearable>-->
+<!--                        </el-input>-->
+<!--                    </el-form-item>-->
+<!--                </div>-->
+<!--            </el-col>-->
+            <el-col :span="3">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="No. of containers or packages" prop="numOfContainersOrPackages">
+                        <el-input type="textarea" :rows="14" style="width: 100%;"
+                                  v-model="documentForm.numOfContainersOrPackages" size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="7">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Kind of packages,description of goods" prop="commodityDescr">
+                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.commodityDescr"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="3">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Gross Weight" prop="grossWeightOfBL">
+                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.grossWeightOfBL"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="3">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Measurement" prop="measurementOfBL">
+                        <el-input type="textarea" :rows="15" style="width: 100%;" v-model="documentForm.measurementOfBL"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row>
+            <div style="border: 1px solid #000;">
+                <el-form-item label="Total No. of Containaers or Packages(in words)" prop="capitalLetters">
+                    <el-input style="width: 100%;" v-model="documentForm.capitalLetters"
+                              size="small" autocomplete="off" clearable>
+                    </el-input>
+                    <!--
+                    <el-row>
+                        <el-col :span="18">
+                            <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.quantityPackingDescr"
+                                size="small" autocomplete="off" clearable>
+                            </el-input>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-input type="textarea" :rows="1" style="width: 100%;"
+                                v-model="documentForm.quantityCntrTypesDescr" size="small" autocomplete="off" clearable>
+                            </el-input>
+                        </el-col>
+                    </el-row>
+                    -->
+                </el-form-item>
+            </div>
+        </el-row>
+        <el-row>
+            <el-col :span="6">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Freight and charges" prop="">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="5">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Revenue Tons" prop="">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="5">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Rate Per" prop="">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="4">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Prepaid" prop="">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="4">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Collect" prop="">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+        </el-row>
+
+        <el-row>
+            <el-col :span="6">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Ex.Rate" prop="">
+                        <el-input type="textarea" :rows="5" style="width: 100%;"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <el-row>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Prepaid at" prop="prepaidAt">
+                                <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.prepaidAt"
+                                          size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Payable at" prop="payableAt">
+                                <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.payableAt"
+                                          size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="Total Prepaid in Local Currency" prop="">
+                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                          size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <div style="border: 1px solid #000;">
+                            <el-form-item label="No. of original B(s)L" prop="numberOfObl">
+                                <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.numberOfObl"
+                                          size="small" autocomplete="off" clearable>
+                                </el-input>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-col>
+            <el-col :span="6">
+                <div style="border: 1px solid #000;">
+                    <el-form-item label="Place and date of issue" prop="issueAt">
+                        <el-input type="textarea" :rows="5" style="width: 50%;" v-model="documentForm.issueAt"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                        <el-input type="textarea" :rows="5" style="width: 50%;" v-model="documentForm.issueDateOfBL"
+                                  size="small" autocomplete="off" clearable>
+                        </el-input>
+                    </el-form-item>
+                </div>
+            </el-col>
+        </el-row>
+
+    </el-form>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+        }
+    },
+    props: {
+        // 表单对象
+        documentForm: {
+            type: Object,
+            default: {}
+        },
+
+    },
+    created() {
+    },
+    methods: {
+    }
+}
+</script>
+
+<style scoped>
+::v-deep.el-form-item {
+    margin-bottom: 0;
+}
+
+::v-deep.el-form--label-top .el-form-item__label {
+    padding: 0;
+    line-height: 20px;
+}
+</style>

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/FreightNote.vue

@@ -0,0 +1,63 @@
+<template>
+    <div>
+        <el-form :model="documentForm" ref="form" label-width="90px" style="margin-bottom: 4px" class="demo-ruleForm">
+            <el-form-item>
+                <h2 style="text-align: center; ">FREIGHT NOTE</h2>
+            </el-form-item>
+
+            <el-form-item label="B/L:" prop="mblno">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.mblno" size="small"
+                          autocomplete="off" clearable>
+                </el-input>
+            </el-form-item>
+<!--            Vessel/Voyage Number-->
+            <el-form-item label="Vsl/Voy:" prop="vesselCnName">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.vesselCnName" size="small" autocomplete="off"
+                          clearable>
+                </el-input>
+            </el-form-item>
+            <el-form-item label="TYRE:" prop="quantityCntrDescr">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.quantityCntrDescr" size="small"
+                          autocomplete="off" clearable>
+                </el-input>
+            </el-form-item>
+            <el-form-item prop="reserve1">
+                <el-input type="textarea" style="width: 100%;" v-model="documentForm.reserve1" size="small"
+                          autocomplete="off" rows="3" clearable placeholder=""></el-input>
+            </el-form-item>
+            <el-form-item label="DATE:" prop="reserve2">
+                <el-input type="age" style="width: 100%;" v-model="documentForm.reserve2" size="small"
+                          autocomplete="off" clearable>
+                </el-input>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import { getBcorpslistByType } from "@/api/iosBasicData/bcorps";
+
+export default {
+    components: { SearchQuery },
+    data() {
+        return {
+        }
+    },
+    props: {
+        documentForm: {
+            type: Object,
+            default: {}
+        }
+    },
+    methods: {
+    }
+
+}
+</script>
+
+<style scoped>
+::v-deep.el-form-item {
+    margin-bottom: 0;
+}
+</style>

src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -611,7 +611,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {

src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -610,7 +610,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {

src/views/iosBasicData/bfeesdefine/index.vue

@@ -405,6 +405,11 @@ export default {
                 }],
                 value: 0,
                 overHidden: true,
+                // rules: [{
+                //   required: true,
+                //   message: "请输入状态",
+                //   trigger: "blur"
+                // }]
             },
           {
             label: "状态",

src/views/iosBasicData/fastMail/fastMailAmend/detailsPage.vue

@@ -621,7 +621,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {

src/views/iosBasicData/losbfeestemplate/index.vue

@@ -339,8 +339,9 @@ export default {
           {
             label: "创建人",
             prop: "createUserName",
+            search: true,
             display: false,
-              overHidden:true
+            overHidden:true
           },
           {
             label: "创建部门",

src/views/iosBasicData/oceanShipping/manifestAmend/detailsPage.vue

@@ -618,7 +618,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {

src/views/iosBasicData/oceanShippingCar/dispatchCarAmend/detailsPage.vue

@@ -621,7 +621,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {

src/views/iosBasicData/reportClose/AEAmendClose/detailsPage.vue

@@ -620,7 +620,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {

src/views/iosBasicData/reportClose/AEreportClose/assembly/feecenter.vue

@@ -1112,7 +1112,9 @@ export default {
                 billId: this.assemblyForm.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 type: 'BGAE'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)

src/views/iosBasicData/reportClose/AIAmendClose/detailsPage.vue

@@ -620,7 +620,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {

src/views/iosBasicData/reportClose/AIreportClose/assembly/feecenter.vue

@@ -1112,7 +1112,9 @@ export default {
                 billId: this.assemblyForm.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 type: 'BGAI'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)

src/views/iosBasicData/reportClose/SEAmendClose/detailsPage.vue

@@ -620,7 +620,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {

src/views/iosBasicData/reportClose/SEreportClose/assembly/feecenter.vue

@@ -1113,7 +1113,9 @@ export default {
                 billId: this.assemblyForm.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 type: 'BGSE'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)

src/views/iosBasicData/reportClose/SIAmendClose/detailsPage.vue

@@ -620,7 +620,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {

src/views/iosBasicData/reportClose/SIreportClose/assembly/feecenter.vue

@@ -1110,7 +1110,9 @@ export default {
                 billId: this.assemblyForm.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 type: 'BGSI'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -643,7 +643,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {
@@ -864,7 +866,7 @@ export default {
             this.form.businessType = 'SEA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
             this.form.createDept=row.accDept
-            this.form.createDeptName=row.accDeptName   
+            this.form.createDeptName=row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id

src/views/iosBasicData/siamends/amendsDetails.vue

@@ -610,7 +610,9 @@ export default {
                 billId: this.form.id,
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
-                corpIds: row.id,
+                accBillId: row.id,
+                BillNumber: row.billNo,
+                corpIds: row.corpId,
                 curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -441,7 +441,7 @@
             <c-upload :data="form.filesList" :enumerationValue="76" deleteUrl="/api/blade-los/filescenter/remove"
                 display :disabled="editButton"></c-upload>
         </div>
-        <business-reports :id="form.id" ref="print" businessValue="HYJK" classifyCode="业务" groupCode="销售报告"
+        <business-reports :id="form.id" ref="print" businessValue="HYJK" classifyCode="费用" groupCode="销售报告"
             :type="1"></business-reports>
         <reports :id="form.id" :assemblyForm="form" businessValue="HYJK" ref="report"></reports>
         <!--审核弹窗-->