licailing пре 4 година
родитељ
комит
b388ed1c53

+ 1 - 1
src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -167,7 +167,7 @@
             :height="tableHeight"
             :height="tableHeight"
         >
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
+            <el-table-column prop="id" label="编号" width="80"> </el-table-column>
             <el-table-column prop="name" label="节目名称" fixed="left"> </el-table-column>
             <el-table-column prop="name" label="节目名称" fixed="left"> </el-table-column>
             <el-table-column prop="specialty" label="参赛专业"> </el-table-column>
             <el-table-column prop="specialty" label="参赛专业"> </el-table-column>
             <el-table-column
             <el-table-column

+ 6 - 1
src/main/vue/src/views/user/UserList.vue

@@ -2,6 +2,7 @@
     <div class="list-view">
     <div class="list-view">
         <div class="filters-container">
         <div class="filters-container">
             <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
             <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-input placeholder="输入工作单位" v-model="work" clearable class="filter-item"></el-input>
             <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">查询 </el-button>
             <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">查询 </el-button>
             <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
             <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
             <!-- <el-select v-model="authority" placeholder="请选择权限">
             <!-- <el-select v-model="authority" placeholder="请选择权限">
@@ -84,7 +85,8 @@ export default {
             url: '/user/all2',
             url: '/user/all2',
             downloading: false,
             downloading: false,
             authority: '',
             authority: '',
-            authorities: [{ label: '管理员', value: 'ROLE_ADMIN' }]
+            authorities: [{ label: '管理员', value: 'ROLE_ADMIN' }],
+            work: ''
         };
         };
     },
     },
     computed: {
     computed: {
@@ -103,6 +105,9 @@ export default {
             if (!this.getAdmin()) {
             if (!this.getAdmin()) {
                 data.query.id = this.userInfo.id;
                 data.query.id = this.userInfo.id;
             }
             }
+            if (this.work) {
+                data.query.work = this.work;
+            }
             return data;
             return data;
         },
         },
         toggleMultipleMode(multipleMode) {
         toggleMultipleMode(multipleMode) {