wfg преди 4 месеца
родител
ревизия
230edfb36b

+ 31 - 31
package-lock.json

@@ -1170,7 +1170,7 @@
     },
     "@gar/promisify": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz",
       "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="
     },
     "@hapi/address": {
@@ -1308,7 +1308,7 @@
     },
     "@npmcli/fs": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@npmcli/fs/-/fs-1.1.1.tgz",
       "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
       "requires": {
         "@gar/promisify": "^1.0.1",
@@ -1324,7 +1324,7 @@
     },
     "@npmcli/move-file": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/@npmcli/move-file/-/move-file-1.1.2.tgz",
       "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
       "requires": {
         "mkdirp": "^1.0.4",
@@ -1333,12 +1333,12 @@
       "dependencies": {
         "mkdirp": {
           "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz",
           "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
         },
         "rimraf": {
           "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
           "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
           "requires": {
             "glob": "^7.1.3"
@@ -2068,7 +2068,7 @@
     },
     "aggregate-error": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz",
       "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "requires": {
         "clean-stack": "^2.0.0",
@@ -2077,7 +2077,7 @@
       "dependencies": {
         "indent-string": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/indent-string/-/indent-string-4.0.0.tgz",
           "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
         }
       }
@@ -3807,7 +3807,7 @@
     },
     "clean-stack": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
     },
     "cli-cursor": {
@@ -4149,7 +4149,7 @@
     },
     "compression-webpack-plugin": {
       "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-5.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/compression-webpack-plugin/-/compression-webpack-plugin-5.0.2.tgz",
       "integrity": "sha512-F2G4cQfsMZ6CiPlG22Q5EDUCqnfyZqTjyJP5cMgNYUbBg/dUzV3hto8yTFFIogDCTWooVbePHQE0qL6FrJUSsA==",
       "requires": {
         "cacache": "^15.0.5",
@@ -4161,7 +4161,7 @@
       "dependencies": {
         "cacache": {
           "version": "15.3.0",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+          "resolved": "https://registry.npmmirror.com/cacache/-/cacache-15.3.0.tgz",
           "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
           "requires": {
             "@npmcli/fs": "^1.0.0",
@@ -4186,12 +4186,12 @@
         },
         "chownr": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz",
           "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
         },
         "fs-minipass": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+          "resolved": "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz",
           "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
           "requires": {
             "minipass": "^3.0.0"
@@ -4199,7 +4199,7 @@
         },
         "lru-cache": {
           "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
           "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "requires": {
             "yallist": "^4.0.0"
@@ -4207,7 +4207,7 @@
         },
         "minipass": {
           "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+          "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
           "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
           "requires": {
             "yallist": "^4.0.0"
@@ -4215,7 +4215,7 @@
         },
         "minizlib": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz",
           "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
           "requires": {
             "minipass": "^3.0.0",
@@ -4224,12 +4224,12 @@
         },
         "mkdirp": {
           "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz",
           "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
         },
         "p-map": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/p-map/-/p-map-4.0.0.tgz",
           "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
           "requires": {
             "aggregate-error": "^3.0.0"
@@ -4237,7 +4237,7 @@
         },
         "rimraf": {
           "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
           "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
           "requires": {
             "glob": "^7.1.3"
@@ -4245,7 +4245,7 @@
         },
         "ssri": {
           "version": "8.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz",
           "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
           "requires": {
             "minipass": "^3.1.1"
@@ -4253,7 +4253,7 @@
         },
         "tar": {
           "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+          "resolved": "https://registry.npmmirror.com/tar/-/tar-6.2.1.tgz",
           "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
           "requires": {
             "chownr": "^2.0.0",
@@ -4266,14 +4266,14 @@
           "dependencies": {
             "minipass": {
               "version": "5.0.0",
-              "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+              "resolved": "https://registry.npmmirror.com/minipass/-/minipass-5.0.0.tgz",
               "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="
             }
           }
         },
         "yallist": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
           "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
@@ -10029,7 +10029,7 @@
     },
     "minipass-collect": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/minipass-collect/-/minipass-collect-1.0.2.tgz",
       "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
       "requires": {
         "minipass": "^3.0.0"
@@ -10037,7 +10037,7 @@
       "dependencies": {
         "minipass": {
           "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+          "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
           "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
           "requires": {
             "yallist": "^4.0.0"
@@ -10045,14 +10045,14 @@
         },
         "yallist": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
           "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
     "minipass-flush": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "resolved": "https://registry.npmmirror.com/minipass-flush/-/minipass-flush-1.0.5.tgz",
       "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
       "requires": {
         "minipass": "^3.0.0"
@@ -10060,7 +10060,7 @@
       "dependencies": {
         "minipass": {
           "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+          "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
           "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
           "requires": {
             "yallist": "^4.0.0"
@@ -10068,14 +10068,14 @@
         },
         "yallist": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
           "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
     "minipass-pipeline": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "resolved": "https://registry.npmmirror.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
       "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
       "requires": {
         "minipass": "^3.0.0"
@@ -10083,7 +10083,7 @@
       "dependencies": {
         "minipass": {
           "version": "3.3.6",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+          "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
           "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
           "requires": {
             "yallist": "^4.0.0"
@@ -10091,7 +10091,7 @@
         },
         "yallist": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
           "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }

+ 16 - 8
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -156,7 +156,9 @@
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;"
                                         v-model="assemblyForm.placeReceiptNamePrint" size="small" autocomplete="off"
-                                        :disabled="detailData.seeDisabled" clearable placeholder="收货地"></el-input>
+                                        :disabled="detailData.seeDisabled" clearable placeholder="收货地"
+                                              @change="textareaBlur('placeReceiptNamePrint')"
+                                    ></el-input>
                                 </el-col>
                             </el-row>
                         </el-form-item>
@@ -188,7 +190,7 @@
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.polNamePrint"
                                         size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" clearable
-                                        placeholder="装货港"></el-input>
+                                        placeholder="装货港" @change="textareaBlur('polNamePrint')"></el-input>
                                 </el-col>
                             </el-row>
                         </el-form-item>
@@ -218,7 +220,7 @@
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.podNamePrint"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
-                                        placeholder="卸货港"></el-input>
+                                        placeholder="卸货港" @change="textareaBlur('podNamePrint')"></el-input>
                                 </el-col>
                             </el-row>
                         </el-form-item>
@@ -251,7 +253,7 @@
                                     <el-input type="age" style="width: 100%;"
                                         v-model="assemblyForm.destinationNamePrint" size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled || generateBillsfalse" clearable
-                                        placeholder="目的地"></el-input>
+                                        placeholder="目的地" @change="textareaBlur('destinationNamePrint')"></el-input>
                                 </el-col>
                             </el-row>
                         </el-form-item>
@@ -282,7 +284,8 @@
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;"
                                         v-model="assemblyForm.placeDeliveryNamePrint" size="small" autocomplete="off"
-                                        :disabled="detailData.seeDisabled" clearable placeholder="交货地"></el-input>
+                                        :disabled="detailData.seeDisabled" clearable placeholder="交货地"
+                                              @change="textareaBlur('placeDeliveryNamePrint')"></el-input>
                                 </el-col>
                             </el-row>
                         </el-form-item>
@@ -312,7 +315,7 @@
                                     <span style="padding-left: 20px"></span>
                                     <el-input type="age" style="width: 100%;" v-model="assemblyForm.potNamePrint"
                                         size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
-                                        placeholder="中转港"></el-input>
+                                        placeholder="中转港" @change="textareaBlur('potNamePrint')"></el-input>
                                 </el-col>
                             </el-row>
                         </el-form-item>
@@ -1548,12 +1551,17 @@ export default {
             let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','hnotify2Details']
             if (arr.indexOf(name) != -1) {
                 this.assemblyForm.detail[name] =_.toUpper(this.assemblyForm.detail[name])
-                
+
             }
             let arr2=['marks','commodityDescr','bookingRemarks','siRemarks','forwarding','remarks','cyRemarks']
             if (arr2.indexOf(name) != -1) {
                 this.assemblyForm[name] =_.toUpper(this.assemblyForm[name])
-                
+
+            }
+            let arr3='placeReceiptNamePrint,polNamePrint,podNamePrint,destinationNamePrint,placeDeliveryNamePrint,potNamePrint'.split(',')
+            if (arr3.indexOf(name) != -1) {
+                this.assemblyForm[name] =_.toUpper(this.assemblyForm[name])
+
             }
             // this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
         },

+ 14 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/mbinformation.vue

@@ -385,11 +385,24 @@ export default {
                         this.$set(this.assemblyForm.detail, name + 'CnName', item.cnName)
                         this.$set(this.assemblyForm.detail, name + 'EnName', item.enName)
                         this.$set(this.assemblyForm.detail, name + 'Code', item.code)
-                        this.$set(this.assemblyForm.detail, name + 'Details', item.details)
                         // 国家名称
                         this.$set(this.assemblyForm.detail, name + 'CntyName', item.cntyName)
                         // 国家代码
                         this.$set(this.assemblyForm.detail, name + 'CntyCode', item.cntyCode)
+
+                        var details = typeof item.details == "string" ? item.details.trim() : ""
+                        if(!details && name == 'mconsignee'){
+                            var s = typeof item.enName == "string" && item.enName.trim().toUpperCase() ? item.enName.trim() : ""
+                            if(s) details += `${s}\r\n`
+                            s = typeof item.enAddr == "string" && item.enAddr.trim()? item.enAddr.trim().toUpperCase() : ""
+                            if(s) details += `${s}\r\n`
+                            s = typeof item.tel == "string" && item.tel.trim() ? ('TEL:'+item.tel.trim().toUpperCase()) : ""
+                            s += typeof item.fax == "string" && item.fax.trim() ? ((s ? " / " : "")+'FAX:'+item.fax.trim().toUpperCase()) : ""
+                            if(s) details += `${s}\r\n`
+                            s = typeof item.email == "string" && item.email.trim() ? ('EMAIL:' + item.email.trim().toUpperCase()) : ""
+                            if(s) details += `${s}\r\n`
+                        }
+                        this.$set(this.assemblyForm.detail, name + 'Details', details)
                     }
                 }
             }

+ 110 - 2
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -410,7 +410,8 @@ export default {
                 placeDeliveryNamePrint: '',
                 potEnName: '',
                 potNamePrint: '',
-                detail: {}
+                detail: {},
+                hmmEdi:{},
             },
             oldForm: {
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
@@ -449,7 +450,8 @@ export default {
                 placeDeliveryNamePrint: '',
                 potEnName: '',
                 potNamePrint: '',
-                detail: {}
+                detail: {},
+                hmmEdi:{},
             },
             // 循环的配置
             basicData: {
@@ -1029,6 +1031,50 @@ export default {
                 });
                 return
             }
+            if (checkFullWidthSymbols(this.form.detail.mshipperDetails).hasFullWidth) {
+                let msg = []
+                for (let item of checkFullWidthSymbols(this.form.detail.mshipperDetails).positions) {
+                    msg.push(`第${item.row}行的"${item.symbol}"`)
+                }
+                if (msg.length > 0) {
+                    this.$message({
+                        dangerouslyUseHTMLString: true,
+                        message: `MBL 发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,请确认`,
+                        type: 'error'
+                    });
+                    return
+                }
+            }
+
+            if (checkFullWidthSymbols(this.form.detail.mconsigneeDetails).hasFullWidth) {
+                let msg = []
+                for (let item of checkFullWidthSymbols(this.form.detail.mconsigneeDetails).positions) {
+                    msg.push(`第${item.row}行的"${item.symbol}"`)
+                }
+                if (msg.length > 0) {
+                    this.$message({
+                        dangerouslyUseHTMLString: true,
+                        message: `MBL 收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,请确认`,
+                        type: 'error'
+                    });
+                    return
+                }
+            }
+            if (checkFullWidthSymbols(this.form.detail.mnotifyDetails).hasFullWidth) {
+                let msg = []
+                for (let item of checkFullWidthSymbols(this.form.detail.mnotifyDetails).positions) {
+                    msg.push(`第${item.row}行的"${item.symbol}"`)
+                }
+                if (msg.length > 0) {
+                    this.$message({
+                        dangerouslyUseHTMLString: true,
+                        message: `MBL 通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,请确认`,
+                        type: 'error'
+                    });
+                    return
+                }
+            }
+
             if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
                 let msg = []
                 for (let item of checkFullWidthSymbols(this.form.marks).positions) {
@@ -1074,6 +1120,15 @@ export default {
             if (!verifyEnglish(this.form.detail.hnotifyDetails)) {
                 msgsList.push('通知人')
             }
+            if (!verifyEnglish(this.form.detail.mshipperDetails)) {
+                msgsList.push('MBL 发货人')
+            }
+            if (!verifyEnglish(this.form.detail.mconsigneeDetails)) {
+                msgsList.push('MBL 收货人')
+            }
+            if (!verifyEnglish(this.form.detail.mnotifyDetails)) {
+                msgsList.push('MBL 通知人')
+            }
             if (!verifyEnglish(this.form.marks)) {
                 msgsList.push('唛头')
             }
@@ -1874,6 +1929,50 @@ export default {
                                 return
                             }
                         }
+                        if (checkFullWidthSymbols(this.form.detail.mshipperDetails).hasFullWidth) {
+                            let msg = []
+                            for (let item of checkFullWidthSymbols(this.form.detail.mshipperDetails).positions) {
+                                msg.push(`第${item.row}行的"${item.symbol}"`)
+                            }
+                            if (msg.length > 0) {
+                                this.$message({
+                                    dangerouslyUseHTMLString: true,
+                                    message: `MBL 发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,请确认`,
+                                    type: 'error'
+                                });
+                                return
+                            }
+                        }
+
+                        if (checkFullWidthSymbols(this.form.detail.mconsigneeDetails).hasFullWidth) {
+                            let msg = []
+                            for (let item of checkFullWidthSymbols(this.form.detail.mconsigneeDetails).positions) {
+                                msg.push(`第${item.row}行的"${item.symbol}"`)
+                            }
+                            if (msg.length > 0) {
+                                this.$message({
+                                    dangerouslyUseHTMLString: true,
+                                    message: `MBL 收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,请确认`,
+                                    type: 'error'
+                                });
+                                return
+                            }
+                        }
+                        if (checkFullWidthSymbols(this.form.detail.mnotifyDetails).hasFullWidth) {
+                            let msg = []
+                            for (let item of checkFullWidthSymbols(this.form.detail.mnotifyDetails).positions) {
+                                msg.push(`第${item.row}行的"${item.symbol}"`)
+                            }
+                            if (msg.length > 0) {
+                                this.$message({
+                                    dangerouslyUseHTMLString: true,
+                                    message: `MBL 通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,请确认`,
+                                    type: 'error'
+                                });
+                                return
+                            }
+                        }
+
                         if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
                             let msg = []
                             for (let item of checkFullWidthSymbols(this.form.marks).positions) {
@@ -1925,6 +2024,15 @@ export default {
                         if (!verifyEnglish(this.form.detail.hnotifyDetails)) {
                             msgsList.push('通知人')
                         }
+                        if (!verifyEnglish(this.form.detail.mshipperDetails)) {
+                            msgsList.push('MBL 发货人')
+                        }
+                        if (!verifyEnglish(this.form.detail.mconsigneeDetails)) {
+                            msgsList.push('MBL 收货人')
+                        }
+                        if (!verifyEnglish(this.form.detail.mnotifyDetails)) {
+                            msgsList.push('MBL 通知人')
+                        }
                         if (!verifyEnglish(this.form.marks)) {
                             msgsList.push('唛头')
                         }

+ 3 - 0
src/views/iosBasicData/bserviceterms/index.vue

@@ -461,6 +461,9 @@ export default {
       });
     },
     rowSave(row, done, loading) {
+      if(!Array.isArray(row.extendedDataArr)){
+          row.extendedDataArr=[]
+      }
       row.extendedDataArr.map(item => {
         delete item.edit
       })

+ 2 - 2
vue.config.js

@@ -51,9 +51,9 @@ module.exports = {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
         // target: 'http://192.168.8.101:1080',
-        // target: 'http://127.0.0.1:1080',
+        target: 'http://127.0.0.1:1080',
         // 打包地址
-        target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://192.168.161.11:10004',//服务器ip
         //  target: 'http://127.0.0.1:10004',
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名