fix: 修改编辑员工信息校验方法

aa6a7b9f · 无尘 · 1d1b13ed · aa6a7b9f · aa6a7b9f · aa6a7b9f
Commit aa6a7b9f authored Feb 21, 2019 by 无尘
5 changed files
--- a/changelog.md
+++ b/changelog.md
@@ -3,12 +3,20 @@

 ### Bug Fixes

+* 修改员工信息提示 ([acb832d](http://115.159.76.241/office/office-web/commits/acb832d))
+* 修改档案设置 ([7e4f100](http://115.159.76.241/office/office-web/commits/7e4f100))
 * 修改编辑员工信息 bug ([ccb26ec](http://115.159.76.241/office/office-web/commits/ccb26ec))
+* 修改编辑员工提示信息 ([126417d](http://115.159.76.241/office/office-web/commits/126417d))
 * 修改门店图片上传 ([4b813c9](http://115.159.76.241/office/office-web/commits/4b813c9))
 * 修改门店图片上传插件方法 ([8eff208](http://115.159.76.241/office/office-web/commits/8eff208))
 * 修改门点编辑判断 ([71ebfba](http://115.159.76.241/office/office-web/commits/71ebfba))


+### Features
+
+* 增加编辑员工信息校验 ([1d1b13e](http://115.159.76.241/office/office-web/commits/1d1b13e))
+
+

 ## [1.0.8](http://115.159.76.241/office/office-web/compare/v1.0.7...v1.0.8) (2019-02-21)


--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.6dab2c8563c2d04983172d0777ed7981.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.2ec030fbc268a9bc85c4.js></script><script type=text/javascript src=./static/js/vendor.fe6bbed1214c1931680c.js></script><script type=text/javascript src=./static/js/app.77362d705af60a68bceb.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.6dab2c8563c2d04983172d0777ed7981.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.526994ba85e727b14cb2.js></script><script type=text/javascript src=./static/js/vendor.fe6bbed1214c1931680c.js></script><script type=text/javascript src=./static/js/app.77362d705af60a68bceb.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/10.0c1df4b546ec5e6a614b.js
+++ b/dist/static/js/10.0c1df4b546ec5e6a614b.js
--- a/dist/static/js/manifest.2ec030fbc268a9bc85c4.js
+++ b/dist/static/js/manifest.2ec030fbc268a9bc85c4.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var b,d,o,i=0,u=[];i<f.length;i++)d=f[i],a[d]&&u.push(a[d][0]),a[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(c&&c(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var f={},a={44:0};function n(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,n){c=a[e]=[f,n]});c[2]=f;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"eb0a4246ba12b2f19e2a",1:"0ebe3ead93207dc78a78",2:"a3034ac019ab3b076959",3:"7f87f1f60c09bb6ad371",4:"7dd9b3bb0689b9db1cf3",5:"3417bcae84d670c66db1",6:"fbd06ea78358b8144d70",7:"fb9879c0177f64d093fb",8:"1a34bcb6afc2f082ef3a",9:"325d932bbdd43400378c",10:"0c1df4b546ec5e6a614b",11:"e520fec57c7e2a952a8e",12:"c25271c62951b988f342",13:"60a490fd5d0e6fe747e1",14:"74cc9b3a9d7e1bbdf26c",15:"b13b0c9736e097a6fc38",16:"595627f80b382a73a092",17:"fc675433297f48540fa4",18:"0ddca03b14efa60e12ca",19:"5094b323ee4cf1f50bf5",20:"81f6c674a6461ef85896",21:"68212dc5cb8b4a50f4fc",22:"e803b89b6f90efd65a43",23:"5ed1b5fd3abff19ce342",24:"8018e4156e92e8875b3f",25:"31f913b9e9e07552cc40",26:"b1c31f6d9d345d8c509f",27:"e85ffa7929197dc4609a",28:"c75ca2dc62974c43903c",29:"25c23e727c71fda1821b",30:"5546948c939232668fc6",31:"16358ad3a9085c551664",32:"20338d6b658d38bf70dc",33:"375e96e88f2f82b30e3c",34:"57d4132e0ff6a5a8ac00",35:"aed8a28b82487ff5f295",36:"158063a49dabc462fe14",37:"f30f4e653b1f9e708aaa",38:"ac5ef7410309c861198f",39:"3e612f993ddd107c14dd",40:"f965564e0c6bf413d47f",43:"13848f214bb993c20004"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,c,f){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,r,t){for(var d,b,o,i=0,u=[];i<f.length;i++)b=f[i],a[b]&&u.push(a[b][0]),a[b]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(f,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var f={},a={44:0};function n(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,n){c=a[e]=[f,n]});c[2]=f;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"eb0a4246ba12b2f19e2a",1:"0ebe3ead93207dc78a78",2:"a3034ac019ab3b076959",3:"7f87f1f60c09bb6ad371",4:"7dd9b3bb0689b9db1cf3",5:"3417bcae84d670c66db1",6:"fbd06ea78358b8144d70",7:"fb9879c0177f64d093fb",8:"1a34bcb6afc2f082ef3a",9:"325d932bbdd43400378c",10:"da9ae5a520b0e3adaa53",11:"e520fec57c7e2a952a8e",12:"c25271c62951b988f342",13:"60a490fd5d0e6fe747e1",14:"74cc9b3a9d7e1bbdf26c",15:"b13b0c9736e097a6fc38",16:"595627f80b382a73a092",17:"fc675433297f48540fa4",18:"0ddca03b14efa60e12ca",19:"5094b323ee4cf1f50bf5",20:"81f6c674a6461ef85896",21:"68212dc5cb8b4a50f4fc",22:"e803b89b6f90efd65a43",23:"5ed1b5fd3abff19ce342",24:"8018e4156e92e8875b3f",25:"31f913b9e9e07552cc40",26:"b1c31f6d9d345d8c509f",27:"e85ffa7929197dc4609a",28:"c75ca2dc62974c43903c",29:"25c23e727c71fda1821b",30:"5546948c939232668fc6",31:"16358ad3a9085c551664",32:"20338d6b658d38bf70dc",33:"375e96e88f2f82b30e3c",34:"57d4132e0ff6a5a8ac00",35:"aed8a28b82487ff5f295",36:"158063a49dabc462fe14",37:"f30f4e653b1f9e708aaa",38:"ac5ef7410309c861198f",39:"3e612f993ddd107c14dd",40:"f965564e0c6bf413d47f",43:"13848f214bb993c20004"}[e]+".js";var d=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(d);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),f},n.m=e,n.c=f,n.d=function(e,c,f){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/employeeRecord/editableCell.vue
+++ b/src/components/employeeRecord/editableCell.vue
@@ -159,8 +159,7 @@ export default {
            // 校验规则

            if (!!field.regular && !!newInfo[field.fieldCode]) {
-              // console.log(field.regular.replace(/d/g,'0-9').replace(/\\0-9/g,'[0-9]'));
-              regFlag.push(eval(field.regular.replace(/d/g,'0-9').replace(/\\0-9/g,'[0-9]')).test(newInfo[field.fieldCode]));
+              regFlag.push(eval(field.regular).test(newInfo[field.fieldCode]));
            }
          });
          if (!!regFlag.length && regFlag.includes(false)) {