Merge branch 'master' of http://git.echepei.com/caojunjie/digital_transformation_ui

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

@@ -155,16 +155,13 @@
             <el-col :span="6">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="CNTR.NOS.W/SEAL NOS.MARKS & NUMBERS" prop="marks">
-                        <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.marks"
-                            size="small" autocomplete="off" clearable>
-                        </el-input>
-                        <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.cntryString"
+                        <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.marks"
                             size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
-            <el-col :span="7">
+            <el-col :span="5">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="QUANTITY(FOR CUSTOMS DECLARATION ONLY)" prop="quantity">
                         <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.quantity"
@@ -173,10 +170,10 @@
                     </el-form-item>
                 </div>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="8">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="DESCRIPTION OF GOODS" prop="commodityDescr">
-                        <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.commodityDescr"
+                        <el-input type="textarea" :rows="11" style="width: 100%;" v-model="documentForm.commodityDescr"
                             size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
@@ -185,13 +182,13 @@
             <el-col :span="3">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="GROSS WEIGHT" prop="grossWeight">
-                        <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.grossWeight"
+                        <el-input type="textarea" :rows="11" style="width: 100%;" v-model="documentForm.grossWeight"
                             size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="2">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="GROSS MEASUREMENT" prop="measurement">
                         <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.measurement"
@@ -202,6 +199,16 @@
             </el-col>
         </el-row>
         <el-row>
+            <el-col>
+                <div style="border: 1px solid #000;">
+                    <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.cntryString"
+                              size="small" autocomplete="off" clearable>
+                    </el-input>
+                </div>
+            </el-col>
+        </el-row>
+
+        <el-row>
             <el-col :span="12">
                 <div style="border: 1px solid #000;">
                     <el-form-item label="QUANTITYCNTRDESCR" prop="quantityCntrDescr">