sunyadv пре 5 година
родитељ
комит
771e7a82be
2 измењених фајлова са 13 додато и 12 уклоњено
  1. 7 6
      ys_vue/src/views/base/comp.vue
  2. 6 6
      ys_vue/src/views/base/factory.vue

+ 7 - 6
ys_vue/src/views/base/comp.vue

@@ -58,25 +58,25 @@
         <!--新增界面-->
 		<el-dialog :title="addTitle" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm">
-				<el-form-item label="资产方名称" prop="companyName" v-if="addState">
+				<el-form-item label="资产方名称" prop="companyName" v-show="addState">
 					<el-input v-model="addForm.companyName" autocomplete="off" placeholder="请输入资产方地址"></el-input>
 				</el-form-item>
-                <el-form-item label="关联生产方" v-if="addState">
+                <el-form-item label="关联生产方" v-show="addState">
                     <el-select v-model="addForm.companyIds" clearable multiple filterable placeholder="请选择生产方" style="width:533px">
                         <el-option v-for="item in companys" :key="item.id" :label="item.companyName" :value="item.id">
                         </el-option>
                     </el-select>
 				</el-form-item>
-                <el-form-item label="资产方地址" prop="companyAddress" v-if="addState">
+                <el-form-item label="资产方地址" prop="companyAddress" v-show="addState">
 					<el-input v-model="addForm.companyAddress" autocomplete="off" placeholder="请输入资产方地址"></el-input>
 				</el-form-item>
-                <el-form-item label="姓名" prop="username" v-if="!addState">
+                <el-form-item label="姓名" prop="username" v-show="!addState">
 					<el-input v-model="addForm.username" autocomplete="off" placeholder="请输入姓名"></el-input>
 				</el-form-item>
-				<el-form-item label="手机号" prop="account" v-if="!addState">
+				<el-form-item label="手机号" prop="account" v-show="!addState">
 					<el-input v-model="addForm.account" autocomplete="off" placeholder="请输入手机号(登录账号)"></el-input>
 				</el-form-item>
-                <el-form-item label="角色" v-if="!addState">
+                <el-form-item label="角色" v-show="!addState">
                     <el-input v-model="addForm.roleName" autocomplete="off" placeholder="请输入角色名称"></el-input>
 				</el-form-item>
 			</el-form>
@@ -123,6 +123,7 @@
                     return callback(new Error('请输入联系方式'));
                 } else {
                     const reg = /^1[0-9]\d{9}$/
+                    console.log(reg.test(value));
                     if (reg.test(value)) {
                         callback();
                     } else {

+ 6 - 6
ys_vue/src/views/base/factory.vue

@@ -54,10 +54,10 @@
         <!--新增界面-->
 		<el-dialog title="新增生产方" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm">
-				<el-form-item label="生产方名称" prop="companyName" v-if="addState">
+				<el-form-item label="生产方名称" prop="companyName" v-show="addState">
 					<el-input v-model="addForm.companyName" autocomplete="off" placeholder="请输入生产方名称"></el-input>
 				</el-form-item>
-                <el-form-item label="关联资产方" v-if="addState">
+                <el-form-item label="关联资产方" v-show="addState">
                     <el-select v-model="addForm.companyIds" clearable multiple filterable placeholder="请选择生产方" style="width:533px">
                         <el-option v-for="item in companys" :key="item.id" :label="item.companyName" :value="item.id">
                         </el-option>
@@ -66,14 +66,14 @@
                 <el-form-item label="生产方地址" prop="companyAddress" v-show="addState">
 					<el-input v-model.lazy="addForm.companyAddress" autocomplete="off" @change="changeFactoryArea('addContainer')" placeholder="请输入生产方地址"></el-input>
 				</el-form-item>
-                <div id="addContainer" class="formMap" v-if="addState"></div>
-                <el-form-item label="姓名" prop="username" v-if="!addState">
+                <div id="addContainer" class="formMap" v-show="addState"></div>
+                <el-form-item label="姓名" prop="username" v-show="!addState">
 					<el-input v-model="addForm.username" autocomplete="off" placeholder="请输入姓名"></el-input>
 				</el-form-item>
-				<el-form-item label="手机号" prop="account" v-if="!addState">
+				<el-form-item label="手机号" prop="account" v-show="!addState">
 					<el-input v-model="addForm.account" autocomplete="off" placeholder="请输入手机号(登录账号)"></el-input>
 				</el-form-item>
-                <el-form-item label="角色" v-if="!addState">
+                <el-form-item label="角色" v-show="!addState">
                     <el-input v-model="addForm.roleName" autocomplete="off" placeholder="请输入角色名称"></el-input>
 				</el-form-item>
 			</el-form>