From 6cf16c10845b444f0bdce9a63ab7bb8926765512 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 21 五月 2024 18:56:56 +0800
Subject: [PATCH] feat：部门调动增加情况说明、可上传文件
---
src/views/user/student/list.vue | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index ba02de0..fb67075 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -40,7 +40,7 @@
<el-tag :type="row.condition == '姝ｅ父' || row.condition == null ? 'success' : 'warning'">{{ row.condition ? row.condition : '姝ｅ父' }}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="conditionDetail" label="鍏蜂綋鎯呭喌" show-overflow-tooltip="true"/>
+ <el-table-column prop="conditionDetail" label="鍏蜂綋鎯呭喌" :show-overflow-tooltip="true"/>
<el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>
<el-table-column prop="phone" label="鎵嬫満鍙�" width="120"/>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px"/>
@@ -64,7 +64,9 @@
</router-link>
<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-button size="mini" type="danger" @click="deleteUser(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-popconfirm>
</template>
</el-table-column>
</el-table>
@@ -72,7 +74,7 @@
@pagination="search"/>
<!-- 鐘舵�佸脊绐� -->
- <el-dialog :visible.sync="statusVisible" append-to-body :close-on-click-modal="false" :show-close="false" center width="400px">
+ <el-dialog :visible.sync="statusVisible" append-to-body :show-close="false" center width="400px">
<el-radio-group v-model="user.condition">
<el-radio label="姝ｅ父">姝ｅ父</el-radio>
<el-radio label="鐥呭亣">鐥呭亣</el-radio>
@@ -99,6 +101,9 @@
:value="item.id">
</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;"/>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="submitExamine">纭� 瀹�</el-button>
@@ -112,18 +117,33 @@
import Pagination from '@/components/Pagination'
import userApi from '@/api/user'
import departmentExamineApi from '@/api/departmentExamine'
+import Upload from '@/components/UploadC'
export default {
- components: { Pagination },
+ components: { Pagination, Upload },
+ computed: {
+ fileContentUrl: () => {
+ return this.form ? this.form.contentUrl ? [this.form.contentUrl] : [] : [];
+ }
+ },
data () {
return {
+
+ form: {
+ contentType: 'file',
+ subject: '',
+ belongType: 2,
+ contentUrl: [],
+ attachment: [],
+ temp: []
+ },
user:{},
statusVisible: false,
upLoadUrl:'/api/admin/user/import',
fileList:[],
queryParam: {
userName: '',
- role: 1,
+ roles: [1],
pageIndex: 1,
pageSize: 10
},
@@ -135,6 +155,7 @@
departmentId: [],
departmentIds: '',
nowDepartmentIds: '',
+ attachment: ''
},
title: '閮ㄩ棬璋冨姩',
dialogVisible: false,
@@ -145,6 +166,12 @@
this.search()
},
methods: {
+ removeFile() {
+ this.examine.attachment = [];
+ },
+ getUploadUrl(uploadData) {
+ this.examine.attachment = JSON.stringify(uploadData);
+ },
submitExamine() {
this.examine.departmentIds = this.examine.departmentId.join(',')
departmentExamineApi.save(this.examine).then(res => {
--
Gitblit v1.8.0