乙方运维，删除必填验证；修复表格组件报错

@@ -202,7 +202,7 @@ export default {
 
 
         let getTextContent = (val) =>{
         let getTextContent = (val) =>{
             if(val && val != '' && val != null){
             if(val && val != '' && val != null){
-                val = val.replace(/[^\x00-\xff]/g,"$&\x01").replace(/.{50}\x01?/g,"$&<br/>").replace(/\x01/g,"");
+                val = val+''.replace(/[^\x00-\xff]/g,"$&\x01").replace(/.{50}\x01?/g,"$&<br/>").replace(/\x01/g,"");
             }
             }
             return val;
             return val;
 
 

@@ -297,7 +297,7 @@ export default {
             var re1=/^0\d{2}-[1-9]\d{7}$/;
             var re1=/^0\d{2}-[1-9]\d{7}$/;
             var re2=/^0\d{3}-[1-9]\{6,7}$/;
             var re2=/^0\d{3}-[1-9]\{6,7}$/;
             var result=re1.test(value)||re2.test(value);
             var result=re1.test(value)||re2.test(value);
-            if (!result) {
+            if (!result && value) {
                 return callback(new Error('请输入正确的座机号！'))
                 return callback(new Error('请输入正确的座机号！'))
             }else{
             }else{
                 callback()
                 callback()
@@ -330,6 +330,7 @@ export default {
             var obj = document.getElementById("email"); //要验证的对象
             var obj = document.getElementById("email"); //要验证的对象
             if(obj.value === ""){ //输入不能为空
             if(obj.value === ""){ //输入不能为空
                 //return callback(new Error('邮箱不能为空！'));
                 //return callback(new Error('邮箱不能为空！'));
+                callback()
             }else if(!reg.test(obj.value)){ //正则验证不通过，格式不对
             }else if(!reg.test(obj.value)){ //正则验证不通过，格式不对
                 return callback(new Error('邮箱格式不正确！'));
                 return callback(new Error('邮箱格式不正确！'));
             }else{
             }else{
@@ -353,9 +354,6 @@ export default {
             nickname: [
             nickname: [
                 {  message: '请输入姓名', trigger: 'blur' }
                 {  message: '请输入姓名', trigger: 'blur' }
             ],
             ],
-            tel: [
-                { validator: checkTel, trigger: 'blur' }
-            ],
             phone: [
             phone: [
                 { validator: checkPhone, trigger: 'blur' }
                 { validator: checkPhone, trigger: 'blur' }
             ],
             ],
@@ -380,6 +378,7 @@ export default {
          */
          */
             // 保存用户信息
             // 保存用户信息
         let saveUser = () => {
         let saveUser = () => {
+                debugger
             proxy.$refs.rule.validate((valid) => {
             proxy.$refs.rule.validate((valid) => {
                 if (valid) {
                 if (valid) {
                     console.log('submit!!');
                     console.log('submit!!');

@@ -14,7 +14,8 @@
 					<div style="width: calc(100% - 100px)">
 					<div style="width: calc(100% - 100px)">
 						<el-form :inline="true" :model="searchForm" class="demo-form-inline">
 						<el-form :inline="true" :model="searchForm" class="demo-form-inline">
 							<el-form-item v-for="searchInfo in obj.searchList" :label="searchInfo.name">
 							<el-form-item v-for="searchInfo in obj.searchList" :label="searchInfo.name">
-								<el-input v-model="searchForm[searchInfo.key]" placeholder="请输入资源名称"></el-input>
+								<el-input v-if="searchInfo.type == 'INPUT'" v-model="searchForm[searchInfo.key]" :placeholder="'请输入' + searchInfo.name"></el-input>
+								<el-input v-else v-model="searchForm[searchInfo.key]" :placeholder="'请输入' + searchInfo.name"></el-input>
 							</el-form-item>
 							</el-form-item>
 
 
 							<el-form-item>
 							<el-form-item>
@@ -22,7 +23,7 @@
 							</el-form-item>
 							</el-form-item>
 						</el-form>
 						</el-form>
 					</div>
 					</div>
-					<div style="width: 100px" v-if="$global.isAdminRole()">
+					<div style="width: 100px" v-if="$global.common.isAdminManager()">
 						<el-button type="primary" @click="showConfigDialog(true)">配置</el-button>
 						<el-button type="primary" @click="showConfigDialog(true)">配置</el-button>
 					</div>
 					</div>
 				</div>
 				</div>