ソースを参照

科德ce测试员问题修复

刘湘琪 2 年 前
コミット
ed71c583e9
共有4 個のファイルを変更した31 個の追加25 個の削除を含む
  1. 0 8
      src/views/account/index.vue
  2. 14 5
      src/views/enterprise/employee/index.vue
  3. 2 2
      src/views/enterprise/project/components/addProject.vue
  4. 15 10
      src/views/index.vue

+ 0 - 8
src/views/account/index.vue

@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

+ 14 - 5
src/views/enterprise/employee/index.vue

@@ -65,6 +65,11 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
+      </el-table-column>
+      <el-table-column label="最新登录时间" prop="loginDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.loginDate) }}</span>
+        </template>
       </el-table-column>
      <el-table-column label="操作" align="center" width="220" class-name="small-padding fixed-width">
        <template slot-scope="scope">
@@ -121,7 +126,7 @@
                 <el-input v-model="form.userName" placeholder="请输入登录名称" maxlength="30" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="pwdVisible">
               <el-form-item label="用户密码" prop="password">
                 <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
               </el-form-item>
@@ -187,7 +192,8 @@ export default {
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: true,
+      pwdVisible: true,
       // 总条数
       total: 0,
       // 角色表格数据
@@ -297,7 +303,8 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加用户";
+      this.title = "添加用户";
+      this.pwdVisible =  true
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -306,8 +313,10 @@ export default {
       getUserByIdApi(userId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改用户";
-        this.form.password = "";
+        this.title = "修改用户";
+        this.pwdVisible = false
+        // this.$set(this.form, 'password', '')
+        // this.form.password = "";
       });
     },
     /** 提交按钮 */

+ 2 - 2
src/views/enterprise/project/components/addProject.vue

@@ -12,12 +12,12 @@
       </el-form-item>
       <el-form-item label="技术员分配" prop="techUserId">
         <el-select v-model="form.techUserId">
-          <el-option v-for="(item, index) in techUserOptions" :key="index" :value="item.userId" :label="item.userName"></el-option>
+          <el-option v-for="(item, index) in techUserOptions" :key="index" :value="item.userId" :label="item.nickName"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="财务员分配" prop="finUserId">
         <el-select v-model="form.finUserId">
-          <el-option v-for="(item, index) in finUserOptions" :key="index" :value="item.userId" :label="item.userName"></el-option>
+          <el-option v-for="(item, index) in finUserOptions" :key="index" :value="item.userId" :label="item.nickName"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="是否跨年项目" prop="overYearFlag">

+ 15 - 10
src/views/index.vue

@@ -27,11 +27,13 @@
           </div>
         </el-col>
         <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_5"></i>
-            <span class="num">{{info.proSumCnt}}</span>
-            <span class="label">项目总数</span>
-          </div>
+          <router-link to="project/project">
+            <div class="stat_box">
+              <i class="icon icon_5"></i>
+              <span class="num">{{info.proSumCnt}}</span>
+              <span class="label">项目总数</span>
+            </div>
+          </router-link>
         </el-col>
         <el-col :span="8">
           <div class="stat_box">
@@ -70,11 +72,14 @@
     <template v-if="userType == 'ENT_ADMIN' || userType == 'ENT_TECH' || userType == 'ENT_ADMIN_TECH' || userType == 'ENT_FIN' || userType == 'ENT_ADMIN_FIN'">
       <el-row :gutter="20">
         <el-col :span="8">
-          <div class="stat_box">
-            <i class="icon icon_5"></i>
-            <span class="num">{{info.proSumCnt}}</span>
-            <span class="label">项目总数</span>
-          </div>
+          <router-link to="project/project">
+            <div class="stat_box">
+              <i class="icon icon_5"></i>
+              <span class="num">{{info.proSumCnt}}</span>
+              <span class="label">项目总数</span>
+            </div>
+          </router-link>
+
         </el-col>
         <el-col :span="8">
           <div class="stat_box">