From d4d2d466d8340d06f4b5ce466fece11e1577b7d3 Mon Sep 17 00:00:00 2001
From: long <515897141@qq.com>
Date: 星期三, 16 六月 2021 16:51:36 +0800
Subject: [PATCH] 修复批量上传图片时，若不需上传要返回图片数组
---
src/pages/system/admin.vue | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/pages/system/admin.vue b/src/pages/system/admin.vue
index bdf6a28..267bedd 100644
--- a/src/pages/system/admin.vue
+++ b/src/pages/system/admin.vue
@@ -9,6 +9,7 @@
clearable
size="small"
style="width: 240px"
+ maxlength="50"
@keyup.enter.native="reGetList"
/>
</el-form-item>
@@ -40,7 +41,7 @@
<el-table-column label="璐﹀彿" prop="account" align="center" min-width="120" />
<el-table-column label="璐﹀彿绫诲瀷" prop="account" align="center" min-width="120">
<template slot-scope="scope">
- <span v-if="scope.row.type">{{ accountTypeOptions[scope.row.type].name }}</span>
+ <span v-if="accountTypeOptions[scope.row.type]">{{ accountTypeOptions[scope.row.type].name }}</span>
</template>
</el-table-column>
<el-table-column label="瑙掕壊" prop="roleName" align="center" min-width="120" />
@@ -85,19 +86,19 @@
/>
<!-- 鏂板&缂栬緫 -->
- <el-dialog :title="adminDialogData.type=='add'?'鏂板绠＄悊鍛�':'缂栬緫绠＄悊鍛�'" width="500px" :visible.sync="adminDialogVisible" append-to-body>
+ <el-dialog v-el-drag-dialog :title="adminDialogData.type==='add'?'鏂板绠＄悊鍛�':'缂栬緫绠＄悊鍛�'" width="500px" :visible.sync="adminDialogVisible" append-to-body :close-on-click-modal="false">
<el-form ref="adminDialog" :model="adminDialogData" label-width="80px" :rules="rules" size="small">
<el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="adminDialogData.name" placeholder="璇疯緭鍏ュ悕绉�" />
+ <el-input v-model="adminDialogData.name" placeholder="璇疯緭鍏ュ悕绉�" maxlength="50" />
</el-form-item>
<el-form-item label="璐﹀彿" prop="account">
- <el-input v-model="adminDialogData.account" placeholder="璇疯緭鍏ュ笎鍙�" :disabled="adminDialogData.type!='add'" />
+ <el-input v-model="adminDialogData.account" placeholder="璇疯緭鍏ュ笎鍙�" maxlength="20" :disabled="adminDialogData.type!='add'" />
</el-form-item>
- <el-form-item label="瀵嗙爜" :prop="adminDialogData.type=='add'?'password':''">
- <el-input v-model="adminDialogData.password" type="password" placeholder="璇疯緭鍏ュ瘑鐮�" />
+ <el-form-item label="瀵嗙爜" :prop="adminDialogData.type==='add'||adminDialogData.password||adminDialogData.passwordSure?'password':'none'">
+ <el-input v-model="adminDialogData.password" type="password" placeholder="璇疯緭鍏ュ瘑鐮�" maxlength="20" />
</el-form-item>
- <el-form-item label="纭瀵嗙爜" :prop="adminDialogData.type=='add'?'passwordSure':''">
- <el-input v-model="adminDialogData.passwordSure" type="password" placeholder="璇疯緭鍏ョ‘璁ゅ瘑鐮�" />
+ <el-form-item label="纭瀵嗙爜" :prop="adminDialogData.type==='add'||adminDialogData.password||adminDialogData.passwordSure?'passwordSure':'none'">
+ <el-input v-model="adminDialogData.passwordSure" type="password" placeholder="璇疯緭鍏ョ‘璁ゅ瘑鐮�" maxlength="20" />
</el-form-item>
<!-- 璐﹀彿绫诲瀷 -->
<el-form-item label="璐﹀彿绫诲瀷" prop="accountType">
@@ -122,7 +123,7 @@
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鍚敤" prop="sysRoleId">
+ <el-form-item label="鏄惁鍚敤" prop="isUse">
<el-switch
v-model="adminDialogData.isUse"
:active-value="1"
@@ -140,7 +141,6 @@
</template>
<script>
-
export default {
name: 'Admin',
data() {
@@ -194,6 +194,9 @@
],
accountType: [
{ required: true, message: '璐﹀彿绫诲瀷涓嶈兘涓虹┖', trigger: 'change' }
+ ],
+ isUse: [
+ { required: true, message: '鏄惁鍚敤涓嶈兘涓虹┖', trigger: 'change' }
]
}
}
@@ -219,10 +222,12 @@
mockData: {
code: 100,
msg: '',
- data: [{
- id: 'xxx',
- name: '閲庨┈鍙�'
- }]
+ data: {
+ list: [{
+ id: 'xxx',
+ name: '閲庨┈鍙�'
+ }]
+ }
}
}, (inf) => {
this.roleArr = inf.list || []
@@ -349,9 +354,9 @@
passwordSure: '',
sysRoleId: item.roId,
id: item.id,
- isUse: item.isUse
+ isUse: item.isUse,
+ accountType: item.type
}
- if (!item.type + '') adminDialogData.accountType = item.type
this.adminDialogVisible = true
this.$nextTick(() => {
this.adminDialogData = adminDialogData
@@ -392,7 +397,7 @@
}, () => {
this.$messageSuc('淇濆瓨鎴愬姛')
this.hideAdminDialog()
- this.getList()
+ isAdd ? this.reGetList() : this.getList()
})
}
})
--
Gitblit v1.8.0