From e81ae1ff5e83f6c8a315c3f6b99221308b7ceb44 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 22 五月 2024 12:02:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/student/list.vue | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index fb67075..35740e3 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -51,9 +51,9 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column width="400px" label="鎿嶄綔" fixed="right" align="center">
+ <el-table-column :width="deptAdmin() ? '310px' : '400px'" label="鎿嶄綔" fixed="right" align="center">
<template slot-scope="{row}">
- <el-button size="mini" @click="changeStatus(row)" class="link-left">
+ <el-button size="mini" v-if="!deptAdmin()" @click="changeStatus(row)" class="link-left">
{{ statusBtnFormatter(row.status) }}
</el-button>
<router-link :to="{path:'/user/student/edit', query:{id:row.id}}" class="link-left">
@@ -65,7 +65,7 @@
<el-button size="mini" @click="status(row)" class="link-left">鐘舵��</el-button>
<el-button type="primary" size="mini" @click="transposition(row)" class="link-left">璋冨姩</el-button>
<el-popconfirm title="纭鍒犻櫎鍚�" @confirm="deleteUser(row)">
- <el-button slot="reference" size="mini" type="danger" class="link-left">鍒犻櫎</el-button>
+ <el-button v-if="!deptAdmin()" slot="reference" size="mini" type="danger" class="link-left">鍒犻櫎</el-button>
</el-popconfirm>
</template>
</el-table-column>
@@ -102,8 +102,7 @@
</el-option>
</el-select>
<el-input type="textarea" maxlength="100" show-word-limit :autosize="{ minRows: 4}" :rows="2" v-model="examine.reason" placeholder="璇疯緭鍏ユ儏鍐佃鏄�" style="margin-top: 30px;"></el-input>
- <upload v-show="form.contentType" ref="upload" :fileUrl="form.contentUrl" :fileType="form.contentType"
- :fileSizeLimitM="1024" :uploadNum="1" @getUploadUrl="getUploadUrl" @removeFile="removeFile" style="margin-top: 30px;"/>
+ <upload :fileUrl="examine.contentUrl" :fileSizeLimitM="1024" :uploadNum="1" @getUploadUrl="getUploadAttachmentUrl" @removeFile="removeAttachmentFile" style="margin-top: 30px;"/>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="submitExamine">纭� 瀹�</el-button>
@@ -128,15 +127,6 @@
},
data () {
return {
-
- form: {
- contentType: 'file',
- subject: '',
- belongType: 2,
- contentUrl: [],
- attachment: [],
- temp: []
- },
user:{},
statusVisible: false,
upLoadUrl:'/api/admin/user/import',
@@ -155,6 +145,7 @@
departmentId: [],
departmentIds: '',
nowDepartmentIds: '',
+ contentUrl: [],
attachment: ''
},
title: '閮ㄩ棬璋冨姩',
@@ -166,11 +157,16 @@
this.search()
},
methods: {
- removeFile() {
- this.examine.attachment = [];
+ deptAdmin() {
+ return sessionStorage.getItem('deptAdmin') === '1'
},
- getUploadUrl(uploadData) {
+ removeAttachmentFile(fileList, fileName) {
+ this.examine.attachment = JSON.stringify(fileList.filter(item => item.name !== fileName));
+ this.examine.contentUrl = fileList.filter(item => item.name !== fileName);
+ },
+ getUploadAttachmentUrl(uploadData) {
this.examine.attachment = JSON.stringify(uploadData);
+ this.examine.contentUrl = uploadData;
},
submitExamine() {
this.examine.departmentIds = this.examine.departmentId.join(',')
--
Gitblit v1.8.0