Merge pull request 'master-dev' (#129) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/129

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1042,7 +1042,18 @@ data() {
     // 表单校验
     rules: {
       billCode: [
-        { required: true, message: "运单号不能为空", trigger: ["blur",'change']  }
+        { required: true, message: "运单号不能为空", trigger: ["blur",'change']  },
+        {
+          pattern: /^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$/,
+          message: this.$t('运单号格式错误，仅支持字母、数字和横杠，横杠需在字母/数字中间'),
+          trigger: 'blur'
+        },
+        {
+          min: 6,
+          max: 18,
+          message: this.$t('运单号长度在6-18个字符之间'),
+          trigger: 'blur'
+        }
       ],
       destinationCountry: [
           { required: true, message: "目的国不能为空",  trigger: ["blur",'change'] }