src/api/iosBasicData/bills.js

@@ -303,6 +303,14 @@ export const listFeeCountByCorp = (data) => {
     params: data
   })
 }
+// 收发通校验接口
+export const verificationDetails = (row) => {
+  return request({
+    url: '/api/blade-los/bills/verificationDetails',
+    method: 'post',
+    data: row
+  })
+}
 // 单据校验接口
 export const documentVerification = (row) => {
   return request({

src/api/iosBasicData/reports.js

@@ -107,7 +107,7 @@ export const getDocumentTypesListAll = (params) => {
 }
 
 export const buildExportFileName = (report, form) => {
-    let fmt = report ? (report.fileNameFormat ? report.fileNameFormat : report.cnName) : "";
+    let fmt = report ? (report.fileNameFormat ? report.fileNameFormat : (report.cnName + " #mblno")) : "";
     if(!fmt) fmt = "report";
     if(form){
         for(const key in form){

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -1471,14 +1471,29 @@ export default {
         },
         // 货物详情弹窗开启
         DetailAdd() {
-            this.Detailform.packingUnitId = this.assemblyForm.packingUnitId
-            this.Detailform.packingUnit = this.assemblyForm.packingUnit
+            let cntrRow = this.selectionList.length>0 ? this.selectionList[0] : {};
+            // this.Detailform.packingUnitId = this.assemblyForm.packingUnitId
+            // this.Detailform.packingUnit = this.assemblyForm.packingUnit
+
+            this.Detailform.packingUnitId = cntrRow.packingUnitId ? cntrRow.packingUnitId : this.assemblyForm.packingUnitId;
+            this.Detailform.packingUnit = cntrRow.packingUnit ? cntrRow.packingUnit : this.assemblyForm.packingUnit;
+
+            this.Detailform.quantity = cntrRow.quantity ? cntrRow.quantity : 0;
+            this.Detailform.grossWeight = cntrRow.grossWeight ? cntrRow.grossWeight : 0;
+            this.Detailform.measurement = cntrRow.measurement ? cntrRow.measurement : 0;
+
             this.Detailform.commodityDescr = this.assemblyForm.commodityDescr
             this.Detailform.marks = this.assemblyForm.marks
-            this.Detailform.Detailform = {
-                dgEmerTemperatureUnit: 'C',
-                dgCtrlTemperatureUnit: 'C',
-            }
+            // this.Detailform.Detailform = {
+            //     dgFlashPointUnit: "C",
+            //     dgEmerTemperatureUnit: 'C',
+            //     dgCtrlTemperatureUnit: 'C',
+            // }
+
+            this.Detailform.dgFlashPointUnit = "C"
+            this.Detailform.dgEmerTemperatureUnit = 'C'
+            this.Detailform.dgCtrlTemperatureUnit = 'C'
+
             this.Detailform.hscode = this.assemblyForm.hscode
             this.Detailform.commodityEnName = this.assemblyForm.commodityEnName
             this.Detailform.commodityCnName = this.assemblyForm.commodityCnName

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

@@ -1224,7 +1224,7 @@ export default {
         allowPrintCount: printRow.allowPrintCount,
         printCount: 0,
         canPrint: printRow.allowPrintCount >= 0,
-        fileName: buildExportFileName(printRow, printData)
+        fileName: buildExportFileName(printRow, data)
       };
 
       if (printRow.allowPrintCount > 0) {

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

@@ -258,7 +258,7 @@ export default {
             {
                 label: "发送地址",
                 prop: "receiverAddress",
-                width: "80",
+                width: "200",
             },
           // {
           //   label: "排序",

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

@@ -28,7 +28,7 @@
                     <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"
+                                <el-input style="width: 100%;" v-model="documentForm.value1"
                                           size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
@@ -37,7 +37,7 @@
                     <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%;"
+                                <el-input style="width: 100%;"
                                           v-model="documentForm.placeReceiptNamePrint" size="small" autocomplete="off"
                                           clearable>
                                 </el-input>
@@ -49,7 +49,7 @@
                     <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%;"
+                                <el-input style="width: 100%;"
                                           v-model="documentForm.vesselCnName" size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
@@ -58,7 +58,7 @@
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
                             <el-form-item label="Port of Loading" prop="polNamePrint">
-                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                <el-input style="width: 100%;"
                                           v-model="documentForm.polNamePrint" size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
@@ -69,7 +69,7 @@
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
                             <el-form-item label="Port of Discharge" prop="podNamePrint">
-                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                <el-input style="width: 100%;"
                                           v-model="documentForm.podNamePrint" size="small" autocomplete="off"
                                           clearable>
                                 </el-input>
@@ -79,7 +79,7 @@
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
                             <el-form-item label="Place of Delivery" prop="destinationNamePrint">
-                                <el-input type="textarea" :rows="1" style="width: 100%;"
+                                <el-input style="width: 100%;"
                                           v-model="documentForm.destinationNamePrint" size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
@@ -88,8 +88,8 @@
                 </el-row>
             </el-col>
             <el-col :span="10">
-              <el-row>
-                <el-col :span="6">
+              <el-row style="line-height: 40px;">
+                <el-col :span="6" style="text-align: center;">
                   <span style="width: 100px;">MBL NO</span>
                 </el-col>
                 <el-col :span="18">
@@ -98,8 +98,8 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
-                <el-col :span="6">
+              <el-row style="line-height: 40px;">
+                <el-col :span="6" style="text-align: center;">
                   <span style="width: 100px;">HBL NO</span>
                 </el-col>
                 <el-col :span="18">
@@ -140,6 +140,16 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-row style="line-height: 40px;">
+                <el-col :span="6" style="text-align: center;">
+                  <span style="width: 100px;">HS CODE</span>
+                </el-col>
+                <el-col :span="18">
+                  <el-form-item label="" prop="mblNo">
+                    <el-input style="width: 100%;" v-model="documentForm.hscode" size="small" autocomplete="off" clearable> </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <!--
                 <div style="border: 1px solid #000;">
                     <el-form-item label=" " prop="">
@@ -321,7 +331,7 @@
                     <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"
+                                <el-input style="width: 100%;" v-model="documentForm.prepaidAt"
                                           size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
@@ -330,7 +340,7 @@
                     <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"
+                                <el-input style="width: 100%;" v-model="documentForm.payableAt"
                                           size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
@@ -341,7 +351,7 @@
                     <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%;"
+                                <el-input style="width: 100%;"
                                           size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
@@ -350,7 +360,7 @@
                     <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"
+                                <el-input style="width: 100%;" v-model="documentForm.numberOfObl"
                                           size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>