zhaoke 10 月之前
父节点
当前提交
63ece98f0d
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      src/views/newBagDetails/components/baggageMessage.vue
  2. 1 1
      src/views/newUserManagement/index.vue

+ 1 - 1
src/views/newBagDetails/components/baggageMessage.vue

@@ -81,7 +81,7 @@ export default {
               const len = dataObjectId.length
               const popNums = [100, 101, 102].map(item => item.toString())
               const target = dataObjectId.substring(len - 3, len)
-              const place = popNums.includes(target) ? '(国航)' : '(广州)'
+              const place = popNums.includes(target) ? '(国航)' : dataObjectId.substring(len - 5, len) == '10000' ? '(国航)' : '(广州)'
               item.readTime = item.readTime ? item.readTime.replace('T', ' ') + place : item.readTime
             } else {
               item.readTime = item.readTime ? item.readTime.replace('T', ' ') + '(广州)' : item.readTime

+ 1 - 1
src/views/newUserManagement/index.vue

@@ -284,7 +284,7 @@ export default {
         user_name: [{ required: true, message: "请输入账号名称", trigger: "blur" }],
         user_group_id: [{ required: true, message: '请选择账号组', trigger: 'change' }],
         user_pwd: [{ required: true, message: "请输入密码", trigger: "blur" }],
-        email: [{ required: true, pattern: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/, message: '请输入正确的邮箱格式', trigger: 'blur' }],
+        //email: [{ required: true, pattern: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/, message: '请输入正确的邮箱格式', trigger: 'blur' }],
       },
       paswordFlag: false,//修改密码
       tableFlag: false,