前:邮箱正则修改

src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -453,7 +453,7 @@
     data () {
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -802,7 +802,7 @@ export default {
   data () {
     var checkemail = (rule, value, callback) => {
       if (value) {
-        let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+        let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
         if (!re.test(value)) {
           callback(new Error('请输入正确的邮箱地址'))
         } else {
@@ -1080,7 +1080,7 @@ export default {
           trigger: 'change'
         }],
         EMail: [{
-          required: false,
+          required: true,
           validator: checkemail,
           trigger: 'change'
         }],

src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -455,7 +455,7 @@
       }
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/components/oilsupplierstore/basisinfo.vue

@@ -361,7 +361,7 @@
     data () {
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/components/oilsupplierstore/goodsinfo.vue

@@ -674,7 +674,7 @@
     data () {
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/components/oilsupplierstore/techinfo.vue

@@ -394,7 +394,7 @@
       }
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -1142,7 +1142,7 @@ export default {
     data () {
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/basicauditoperation.vue

@@ -969,7 +969,7 @@
     data () {
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -1026,7 +1026,7 @@ import Viewer from 'v-viewer'
     data () {
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -1206,7 +1206,7 @@
     data () {
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -944,7 +944,7 @@ import Viewer from 'v-viewer'
     data () {
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -895,7 +895,7 @@
     data () {
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -1381,7 +1381,7 @@
       var checkemail = (rule, value, callback) => {
         // console.log(value)
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -1106,7 +1106,7 @@
       var checkemail = (rule, value, callback) => {
         // console.log(value)
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -1317,7 +1317,7 @@
       var checkemail = (rule, value, callback) => {
         // console.log(value)
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -1112,7 +1112,7 @@
       var checkemail = (rule, value, callback) => {
         // console.log(value)
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/setting/triggers/actions.vue

@@ -99,7 +99,7 @@
         } else {
           if (this.actionform.item === '1') {
             let emails = value.split(',')
-            let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+            let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
             let isapproved = true
             for (let i = emails.length - 1; i >= 0; i--) {
               if (!re.test(emails[i])) {

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -208,7 +208,7 @@
     data () {
       var checkemail = (rule, value, callback) => {
         if (value) {
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/system/businessusers.vue

@@ -163,7 +163,7 @@
           if (this.appclient == 'lims') { //大港油田lims系统不用邮箱
             callback()
           }
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {

src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -197,7 +197,7 @@
           if (this.appclient === 'lims') { // 大港油田lims系统不用邮箱
             callback()
           }
-          /* let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          /* let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {