Ryuiso пре 2 недеља
родитељ
комит
ba17cc4034
2 измењених фајлова са 76 додато и 10 уклоњено
  1. 22 0
      src/views/system/project/index.vue
  2. 54 10
      src/views/system/staff/index.vue

+ 22 - 0
src/views/system/project/index.vue

@@ -1,12 +1,23 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目来源" prop="sourceFrom">
+        <el-select v-model="queryParams.sourceFrom" placeholder="请选择项目来源" clearable filterable @change="handleQuery">
+          <el-option
+            v-for="item in projectSourceList"
+            :key="item.dictCode || item.dictValue || item.value"
+            :label="item.dictLabel || item.label"
+            :value="item.dictValue || item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="项目编号" prop="projectPid">
         <el-input v-model="queryParams.projectPid" placeholder="请输入项目编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
         <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+
       <!-- <el-form-item label="应用名称" prop="appId">
         <el-select v-model="queryParams.appId">
           <el-option
@@ -161,9 +172,11 @@ export default {
         projectPid: null,
         projectName: null,
         appId: null,
+        sourceFrom: null,
       },
       appList: [],
       projectTypeList: [],
+      projectSourceList: [],
       // 表单参数
       form: {},
       // 表单校验
@@ -181,6 +194,7 @@ export default {
     this.getList();
     this.getAppList();
     this.getProjectTypeList();
+    this.getProjectSourceList();
   },
   methods: {
     /** 查询项目列表 */
@@ -198,6 +212,14 @@ export default {
         this.projectTypeList = response.data;
       });
     },
+    getProjectSourceList() {
+      // 假设后端提供字典类型 project_source
+      getDicts('project_source').then(response => {
+        this.projectSourceList = response.data || [];
+      }).catch(() => {
+        this.projectSourceList = [];
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;

+ 54 - 10
src/views/system/staff/index.vue

@@ -20,7 +20,7 @@
           <el-option v-for="itemR in roleList" :key="itemR.roleId" :label="itemR.roleName" :value="itemR.roleId" />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="进入项目日期" prop="mBdate">
+      <!-- <el-form-item label="进入项目日期" prop="mBdate">
         <el-date-picker clearable v-model="queryParams.mBdate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择进入项目日期">
         </el-date-picker>
@@ -29,7 +29,7 @@
         <el-date-picker clearable v-model="queryParams.mEdate" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择撤出项目日期">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -65,21 +65,36 @@
 
     <el-table v-loading="loading" :data="staffList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="项目编号" align="center" prop="projectPid" />
-      <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="成员名称" align="center" prop="userName" />
+      <el-table-column label="项目编号" align="center" prop="projectPid" min-width="90">
+        <template slot-scope="scope">
+          <el-tooltip placement="top" popper-class="pid-tooltip">
+            <div slot="content" class="pid-tooltip-content">{{ scope.row.projectPid }}</div>
+            <span class="pid-ellipsis">{{ scope.row.projectPid }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" align="center" prop="projectName" min-width="320">
+        <template slot-scope="scope">
+          <el-tooltip placement="top" popper-class="pid-tooltip">
+            <div slot="content" class="pid-tooltip-content">{{ scope.row.projectName }}</div>
+            <span class="name-ellipsis">{{ scope.row.projectName }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户名称" align="center" prop="userName" />
       <!-- <el-table-column label="角色" align="center" prop="roleName" /> -->
-      <el-table-column label="进入项目日期" align="center" prop="mBdate" width="180">
+      <!-- <el-table-column label="进入项目日期" align="center" prop="mBdate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.mBdate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
+      <el-table-column label="用户进入系统时间" width="180" align="center" prop="createTime" />
       <el-table-column label="撤出项目日期" align="center" prop="mEdate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.mEdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建日期" align="center" prop="createTime" />
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -118,10 +133,10 @@
             <el-option v-for="itemR in roleList" :key="itemR.roleId" :label="itemR.roleName" :value="itemR.roleId" />
           </el-select>
         </el-form-item>
-        <el-form-item label="进入项目日期" prop="mBdate">
+        <!-- <el-form-item label="进入项目日期" prop="mBdate">
           <el-date-picker clearable v-model="form.mBdate" type="date" value-format="yyyy-MM-dd" placeholder="请选择进入项目日期">
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="撤出项目日期" prop="mEdate">
           <el-date-picker clearable v-model="form.mEdate" type="date" value-format="yyyy-MM-dd" placeholder="请选择撤出项目日期">
           </el-date-picker>
@@ -402,3 +417,32 @@ export default {
   }
 };
 </script>
+
+<style>
+.pid-ellipsis {
+  display: inline-block;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+.name-ellipsis {
+  display: inline-block;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+.pid-tooltip {
+  max-width: 640px;
+  user-select: text;
+  word-break: break-all;
+}
+.pid-tooltip .pid-tooltip-content {
+  font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+  font-size: 12px;
+  line-height: 1.5;
+}
+</style>