Merge branch 'dev' of http://git.echepei.com/tire-platform/Smart_platform_ui into dev

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

@@ -2862,11 +2862,11 @@ export default {
             if (this.business == 1) {
                 let similarDataD = similarValues(this.assemblyForm.feeCenterListD, 'feeCnName', 'curCode')
                 if (similarDataD) {
-                    return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
+                    // return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
                 }
                 let similarDataC = similarValues(this.assemblyForm.feeCenterListC, 'feeCnName', 'curCode')
                 if (similarDataC) {
-                    return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+                    // return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
                 }
             }
             // 判断必填项

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

@@ -22,6 +22,7 @@
                             <el-button type="primary" size="small" icon="el-icon-plus" :disabled="disabled"
                                 @click="addbtnfun()">新增
                             </el-button>
+                            <spa style="color: #d4791a; " v-text="'单证类别：' + (businesstypeData && businesstypeData.label ? businesstypeData.label : '未选择')"></spa>
                         </template>
                         <template slot-scope="scope" slot="menu">
                             <el-button type="text" size="small" :disabled="disabled"
@@ -573,8 +574,15 @@ export default {
 
             })
         },
+        focusBusinesstypeData(row){
+            var bus = this.reportTypeData.find(b=>b.groupCode==row.groupCode && b.reportsType==row.reportsCode)
+            console.log('bus', bus)
+            this.businesstypeData = bus ? bus : {}
+        },
         // 编辑
         printEditing(row) {
+            this.focusBusinesstypeData(row)
+
             if (!this.businesstypeData.label) {
                 this.$message.warning("请先选择报表类型");
                 return
@@ -759,10 +767,9 @@ export default {
         },
         // 类别弹窗关闭
         corpTypeClose(done) {
-            console.log(1111)
             this.editData = {}
             this.documentForm = {}
-            this.businesstypeData = {}
+            // this.businesstypeData = {}
             done();
         },
         // 点击搜索触发

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

@@ -57,9 +57,9 @@
                     </el-col>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="Port of Loading" prop="polEnName">
+                            <el-form-item label="Port of Loading" prop="polEnNamePrint">
                                 <el-input type="textarea" :rows="1" style="width: 100%;"
-                                    v-model="documentForm.polEnName" size="small" autocomplete="off" clearable>
+                                    v-model="documentForm.polEnNamePrint" size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
@@ -68,9 +68,9 @@
                 <el-row>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="Port of Discharge" prop="destinationNamePrint">
+                            <el-form-item label="Port of Discharge" prop="podNamePrint">
                                 <el-input type="textarea" :rows="1" style="width: 100%;"
-                                    v-model="documentForm.destinationNamePrint" size="small" autocomplete="off"
+                                    v-model="documentForm.podNamePrint" size="small" autocomplete="off"
                                     clearable>
                                 </el-input>
                             </el-form-item>
@@ -78,9 +78,9 @@
                     </el-col>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="Place of Delivery" prop="podEnName">
+                            <el-form-item label="Place of Delivery" prop="destinationNamePrint">
                                 <el-input type="textarea" :rows="1" style="width: 100%;"
-                                    v-model="documentForm.podEnName" size="small" autocomplete="off" clearable>
+                                    v-model="documentForm.destinationNamePrint" size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
@@ -117,8 +117,8 @@
                     </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%;"
+                    <el-form-item label="Final Destination(for the Merchant's reference)" prop="finalDestinationNamePrint">
+                        <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.finalDestinationNamePrint"
                             size="small" autocomplete="off" clearable placeholder="">
                         </el-input>
                     </el-form-item>

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

@@ -57,9 +57,9 @@
                     </el-col>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="Port of Loading" prop="polEnName">
+                            <el-form-item label="Port of Loading" prop="polNamePrint">
                                 <el-input type="textarea" :rows="1" style="width: 100%;"
-                                          v-model="documentForm.polEnName" size="small" autocomplete="off" clearable>
+                                          v-model="documentForm.polNamePrint" size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
@@ -68,9 +68,9 @@
                 <el-row>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="Port of Discharge" prop="destinationNamePrint">
+                            <el-form-item label="Port of Discharge" prop="podNamePrint">
                                 <el-input type="textarea" :rows="1" style="width: 100%;"
-                                          v-model="documentForm.destinationNamePrint" size="small" autocomplete="off"
+                                          v-model="documentForm.podNamePrint" size="small" autocomplete="off"
                                           clearable>
                                 </el-input>
                             </el-form-item>
@@ -78,9 +78,9 @@
                     </el-col>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="Place of Delivery" prop="podEnName">
+                            <el-form-item label="Place of Delivery" prop="destinationNamePrint">
                                 <el-input type="textarea" :rows="1" style="width: 100%;"
-                                          v-model="documentForm.podEnName" size="small" autocomplete="off" clearable>
+                                          v-model="documentForm.destinationNamePrint" size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
@@ -117,8 +117,8 @@
                     </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%;"
+                    <el-form-item label="Final Destination(for the Merchant's reference)" prop="finalDestinationNamePrint">
+                        <el-input type="textarea" :rows="1" style="width: 100%;"  v-model="documentForm.finalDestinationNamePrint"
                                   size="small" autocomplete="off" clearable placeholder="">
                         </el-input>
                     </el-form-item>

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

@@ -57,9 +57,9 @@
                     </el-col>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="Port of Loading" prop="polEnName">
+                            <el-form-item label="Port of Loading" prop="polNamePrint">
                                 <el-input type="textarea" :rows="1" style="width: 100%;"
-                                          v-model="documentForm.polEnName" size="small" autocomplete="off" clearable>
+                                          v-model="documentForm.polNamePrint" size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
@@ -68,9 +68,9 @@
                 <el-row>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="Port of Discharge" prop="destinationNamePrint">
+                            <el-form-item label="Port of Discharge" prop="podNamePrint">
                                 <el-input type="textarea" :rows="1" style="width: 100%;"
-                                          v-model="documentForm.destinationNamePrint" size="small" autocomplete="off"
+                                          v-model="documentForm.podNamePrint" size="small" autocomplete="off"
                                           clearable>
                                 </el-input>
                             </el-form-item>
@@ -78,9 +78,9 @@
                     </el-col>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="Place of Delivery" prop="podEnName">
+                            <el-form-item label="Place of Delivery" prop="destinationNamePrint">
                                 <el-input type="textarea" :rows="1" style="width: 100%;"
-                                          v-model="documentForm.podEnName" size="small" autocomplete="off" clearable>
+                                          v-model="documentForm.destinationNamePrint" size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
@@ -117,8 +117,8 @@
                     </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%;"
+                    <el-form-item label="Final Destination(for the Merchant's reference)" prop="finalDestinationNamePrint">
+                        <el-input type="textarea" :rows="1" style="width: 100%;" v-model="documentForm.finalDestinationNamePrint"
                                   size="small" autocomplete="off" clearable placeholder="">
                         </el-input>
                     </el-form-item>

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

@@ -96,8 +96,8 @@
             </el-col>
             <el-col :span="7">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="PORT OF LOADING" prop="polEnName" >
-                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.polEnName"
+                    <el-form-item label="PORT OF LOADING" prop="polNamePrint" >
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.polNamePrint"
                                   size="small" autocomplete="off" clearable >
                         </el-input>
                     </el-form-item>
@@ -105,8 +105,8 @@
             </el-col>
             <el-col :span="10">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="FINAL DESTINATION(for the Merchant's reference only" prop="value3" >
-                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value3"
+                    <el-form-item label="FINAL DESTINATION(for the Merchant's reference only" prop="finalDestinationNamePrint" >
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.finalDestinationNamePrint"
                                   size="small" autocomplete="off" clearable
                                   placeholder="" >
                         </el-input>
@@ -117,8 +117,8 @@
         <el-row>
             <el-col :span="7">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="PORT OF DISCHARGE" prop="destinationNamePrint" >
-                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.destinationNamePrint"
+                    <el-form-item label="PORT OF DISCHARGE" prop="podNamePrint" >
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.podNamePrint"
                                   size="small" autocomplete="off" clearable >
                         </el-input>
                     </el-form-item>
@@ -126,8 +126,8 @@
             </el-col>
             <el-col :span="7">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="PLACE OF DELIVERY" prop="podEnName" >
-                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.podEnName"
+                    <el-form-item label="PLACE OF DELIVERY" prop="destinationNamePrint" >
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.destinationNamePrint"
                                   size="small" autocomplete="off" clearable >
                         </el-input>
                     </el-form-item>
@@ -152,19 +152,19 @@
             <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-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.cntryString"-->
+<!--                                  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="QUANTITY(FOR CUSTOMS DECLARATION ONLY)" prop="quantity" >
-                        <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.quantity"
+                    <el-form-item label="QUANTITY(FOR CUSTOMS DECLARATION ONLY)" prop="numOfContainersOrPackages" >
+                        <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.numOfContainersOrPackages"
                                   size="small" autocomplete="off" clearable >
                         </el-input>
                     </el-form-item>
@@ -181,8 +181,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="10" style="width: 100%;" v-model="documentForm.grossWeight"
+                    <el-form-item label="GROSS WEIGHT" prop="grossWeightOfBL" >
+                        <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.grossWeightOfBL"
                                   size="small" autocomplete="off" clearable >
                         </el-input>
                     </el-form-item>
@@ -190,8 +190,8 @@
             </el-col>
             <el-col :span="4">
                 <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"
+                    <el-form-item label="GROSS MEASUREMENT" prop="measurementOfBL" >
+                        <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.measurementOfBL"
                                   size="small" autocomplete="off" clearable >
                         </el-input>
                     </el-form-item>

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

@@ -2418,11 +2418,11 @@ export default {
             if (this.business == 1) {
                 let similarDataD = similarValues(this.form.feeCenterListD, 'feeCnName', 'curCode')
                 if (similarDataD) {
-                    return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
+                    // return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
                 }
                 let similarDataC = similarValues(this.form.feeCenterListC, 'feeCnName', 'curCode')
                 if (similarDataC) {
-                    return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+                    // return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
                 }
             }
             this.form.feeCenterListD.map((row, index) => {