刘湘琪 3 年之前
父节点
当前提交
0528cfe121

+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '企业研发归集系统',
+      title: '科德科研系统',
       logo: logoImg
     }
   }

+ 1 - 1
src/router/index.js

@@ -116,7 +116,7 @@ export const constantRoutes = [
         path: 'info/:id',
         component: (resolve) => require(['@/views/enterprise/ent/info'], resolve),
         name: 'ViewInfo',
-        meta: { title: '修改企业信息'}
+        meta: { title: '查看企业信息'}
       },
     ]
   },{

+ 2 - 0
src/views/common/registerFirst.vue

@@ -78,6 +78,7 @@
                 <el-input type="text"
                   v-model="registerForm.regCapital"
                   placeholder="请输入注册资金">
+                  <template slot="append">万元</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -250,6 +251,7 @@
             <el-col :span="12" v-if="registerForm.investFlag == 1">
               <el-form-item label="风险投资金额" prop="investCapital">
                 <el-input v-model="registerForm.investCapital" type="text" auto-complete="off" placeholder="请输入风险投资金额">
+                  <template slot="append">万元</template>
                 </el-input>
               </el-form-item>
             </el-col>

+ 2 - 2
src/views/components/login/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">企业研发归集系统</h3>
+      <h3 class="title">科德科研系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -217,4 +217,4 @@ export default {
   height: 38px;
 }
 </style>
- -->
+ -->

+ 33 - 6
src/views/enterprise/employee/index.vue

@@ -91,7 +91,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="用户角色">
+              <el-form-item label="用户角色" prop="userType">
                 <el-select v-model="form.userType" placeholder="请选择用户角色">
                   <el-option
                     v-for="(item, index) in userListOptions"
@@ -129,7 +129,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="用户性别">
+              <el-form-item label="用户性别" prop="sex">
                 <el-select v-model="form.sex" placeholder="请选择性别">
                   <el-option
                     v-for="dict in dict.type.sys_user_sex"
@@ -141,7 +141,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="状态">
+              <el-form-item label="状态" prop="status">
                 <el-radio-group v-model="form.status">
                   <el-radio
                     v-for="dict in dict.type.sys_normal_disable"
@@ -212,9 +212,36 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        roleName: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
-        ],
+        nickName: [
+          { required: true, message: "用户名称不能为空", trigger: "blur" }
+        ],
+        userType: [
+          { required: true, message: "请选择用户角色", trigger: "change"}
+        ],
+        phonenumber: [
+          { required: true, trigger: "blur", message: "请输入手机号" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ],
+        email: [
+          { required: true, trigger: ["blur", "change"], message: "请输入邮箱",type: "email", },
+        ],
+        userName: [
+          { required: true, message: "登录名称不能为空", trigger: "blur" }
+        ],
+        password: [
+          { required: true, trigger: "blur", message: "请输入您的密码" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+        ],
+        sex: [
+          { required: true, message: "请选择性别", trigger: "change"}
+        ],
+        status: [
+          { required: true, message: "请选择状态", trigger: "change"}
+        ]
       }
     };
   },

+ 1 - 1
src/views/enterprise/ent/info.vue

@@ -153,7 +153,7 @@
     </table>
     <div class="oper">
       <el-button @click="cancel" v-if="type == 'view' || type == 'audit'">返回</el-button>
-      <template v-if="info.authState == '1' && (type == 'view' || type == 'audit')">
+      <template v-if="info.authState == '1' && type == 'audit'">
         <el-button @click="handleAudit">通过审核</el-button>
         <el-button @click="handleRefuse">驳回</el-button>
       </template>

+ 4 - 1
src/views/enterprise/project/components/EntBasic.vue

@@ -203,7 +203,10 @@ export default {
           { required: true, trigger: "blur", message: "请输入您的密码" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        address: [
+          { required: true, trigger: "blur", message: "请输入通讯地址" },
+          { max: 100, message: '不超过100字符', trigger: 'blur' }
+        ]
       },
       loading: false,
       captchaOnOff: true

+ 55 - 55
src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">企业研发归集系统</h3>
+      <h3 class="title">科德科研系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -49,43 +49,43 @@
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
-        <div>
-          <div style="float: left;">
-            <router-link class="link-type" :to="'/registerFirst'">企业账号注册</router-link>
-          </div>
-          <div style="float: right;">
-            <el-button type="text" @click="forgetPwd" class="link-type">忘记密码</el-button>
-          </div>
+        <div>
+          <div style="float: left;">
+            <router-link class="link-type" :to="'/registerFirst'">企业账号注册</router-link>
+          </div>
+          <div style="float: right;">
+            <el-button type="text" @click="forgetPwd" class="link-type">忘记密码</el-button>
+          </div>
         </div>
       </el-form-item>
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
       <span>Copyright © 2022 All Rights Reserved.</span>
-    </div>
-    <el-dialog
-      title="系统提示"
-      :visible.sync="dialogVisible"
-      width="30%"
-      :before-close="handleClose">
-      <div>请联系管理员重置密码</div>
-      <div>管理员联系方式:kedekeyan@163.com</div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog
-      title="系统提示"
-      :visible.sync="pwdVisible"
-      width="30%"
-      :before-close="handleClose">
-      <div>企业账号正在审核,请联系管理员审核信息</div>
-      <div>管理员联系方式:kedekeyan@163.com</div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="pwdVisible = false">取 消</el-button>
-        <el-button type="primary" @click="pwdVisible = false">确 定</el-button>
-      </span>
+    </div>
+    <el-dialog
+      title="系统提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <div>请联系管理员重置密码</div>
+      <div>管理员联系方式:kedekeyan@163.com</div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="系统提示"
+      :visible.sync="pwdVisible"
+      width="30%"
+      :before-close="handleClose">
+      <div>企业账号正在审核,请联系管理员审核信息</div>
+      <div>管理员联系方式:kedekeyan@163.com</div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="pwdVisible = false">取 消</el-button>
+        <el-button type="primary" @click="pwdVisible = false">确 定</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -98,9 +98,9 @@ import { encrypt, decrypt } from '@/utils/jsencrypt'
 export default {
   name: "Login",
   data() {
-    return {
-      errMsg: "",
-      dialogVisible: false,
+    return {
+      errMsg: "",
+      dialogVisible: false,
       pwdVisible: false,
       codeUrl: "",
       loginForm: {
@@ -158,14 +158,14 @@ export default {
         password: password === undefined ? this.loginForm.password : decrypt(password),
         rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
       };
-    },
-    forgetPwd() {
-      this.dialogVisible = true
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭?').then(_ => {
-          done();
-      }).catch(_ => {});
+    },
+    forgetPwd() {
+      this.dialogVisible = true
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭?').then(_ => {
+          done();
+      }).catch(_ => {});
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
@@ -182,18 +182,18 @@ export default {
           }
           this.$store.dispatch("Login", this.loginForm).then((res) => {
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch((err) => {
-            this.errMsg = err
-            if(err == -2) {
-              this.pwdVisible = true
-            }
-            if(err.code == -1) {
-              this.$alert("审核资料已驳回,请重新提交", '系统提示', {
-                dangerouslyUseHTMLString: true,
-                type: 'success'
-              }).then(() => {
-                this.$router.push({name: 'registerFirst', params: {token: err.token}});
-              }).catch(() => {});
+          }).catch((err) => {
+            this.errMsg = err
+            if(err == -2) {
+              this.pwdVisible = true
+            }
+            if(err.code == -1) {
+              this.$alert("审核资料已驳回,请重新提交", '系统提示', {
+                dangerouslyUseHTMLString: true,
+                type: 'success'
+              }).then(() => {
+                this.$router.push({name: 'registerFirst', params: {token: err.token}});
+              }).catch(() => {});
             }
             this.loading = false;
             if (this.captchaOnOff) {

+ 1 - 1
src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">企业研发归集系统</h3>
+      <h3 class="title">科德科研系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />