KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix

Browse Source
This commit is contained in:
bupengxiang
2023-07-31 16:15:35 +08:00
parent 7c631f273d 856072675f
commit e3893bb752
22 changed files with 127 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/jero/JModal/JModal.vue
+3 -1
View File
@@ -205,7 +205,9 @@ export default {
} }
} }
} }
.ant-modal-body{
height:500px !important;
}
.j-modal-title-row { .j-modal-title-row {
.left { .left {
width: calc(100% - 56px - 56px); width: calc(100% - 56px - 56px);
jero-web/src/mixins/JeroListMixin.js
+77 -58
View File
@@ -15,6 +15,7 @@ let importModalLoading
export const JeroListMixin = { export const JeroListMixin = {
data () { data () {
return { return {
uploading: false,
/* 查询条件-请不要在queryParam中声明非字符串值的属性 */ /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
queryParam: {}, queryParam: {},
/* 数据源 */ /* 数据源 */
@@ -73,6 +74,7 @@ export const JeroListMixin = {
} }
}, },
methods: { methods: {
loadData (arg) { loadData (arg) {
if (!this.url.list) { if (!this.url.list) {
this.$message.error('请设置url.list属性!') this.$message.error('请设置url.list属性!')
@@ -314,73 +316,90 @@ export const JeroListMixin = {
modalLoading.destroy() modalLoading.destroy()
}) })
}, },
//导入前
beforeUpload( file) {
// console.log(file,"jjjj")
if (file.size > 20 * 1024 * 1024) {
this.uploading = true
this.$message.warning('最大上传20M')
return false
}
this.uploading = false
return true
},
/* 导入 */ /* 导入 */
handleImportExcel (info) { handleImportExcel (info) {
// 加一个大的提示 // 加一个大的提示
if (!this.loading) { if (!this.uploading) {
importModalLoading = this.$info({ if (!this.loading) {
title: '提示', importModalLoading = this.$info({
content: <span>正在导入，请稍候 <a-spin size="small"/></span>, title: '提示',
keyboard: false content: <span>正在导入，请稍候 <a-spin size="small" /></span>,
keyboard: false
})
}
this.loading = true
// 把知道了这个按钮去掉
this.$nextTick(() => {
document.getElementsByClassName('ant-modal-confirm-btns')[0].style = 'display:none'
}) })
} if (info.file.status !== 'uploading') {
this.loading = true console.log(info.file, info.fileList)
// 把知道了这个按钮去掉 }
this.$nextTick(() => { if (info.file.status === 'done') {
document.getElementsByClassName('ant-modal-confirm-btns')[0].style = 'display:none' // 销毁这个提示
}) importModalLoading && importModalLoading.destroy()
if (info.file.status !== 'uploading') { this.loading = false
console.log(info.file, info.fileList) if (info.file.response.success) {
} // this.$message.success(`${info.file.name} 文件上传成功`);
if (info.file.status === 'done') { if (info.file.response.code === 201) {
// 销毁这个提示 const { message, result: { msg, fileUrl, fileName } } = info.file.response
importModalLoading && importModalLoading.destroy() const href = window._CONFIG.domianURL + fileUrl
this.loading = false this.$warning({
if (info.file.response.success) { title: message,
// this.$message.success(`${info.file.name} 文件上传成功`); content: (<div>
if (info.file.response.code === 201) { <span>{msg}</span><br />
const { message, result: { msg, fileUrl, fileName } } = info.file.response <span>具体详情请 <a href={href} target="_blank" download={fileName}>点击下载</a> </span>
const href = window._CONFIG.domianURL + fileUrl </div>
this.$warning({ )
title: message, })
content: (<div> } else {
<span>{msg}</span><br/> this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
<span>具体详情请 <a href={href} target="_blank" download={fileName}>点击下载</a> </span> }
</div> this.loadData()
)
})
} else { } else {
this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`) this.$message.error(`${info.file.name} ${info.file.response.message}.`)
} }
this.loadData() } else if (info.file.status === 'error') {
} else { // 销毁这个提示
this.$message.error(`${info.file.name} ${info.file.response.message}.`) importModalLoading && importModalLoading.destroy()
} this.loading = false
} else if (info.file.status === 'error') {
// 销毁这个提示 if (info.file.response.status === 500) {
importModalLoading && importModalLoading.destroy() const data = info.file.response
this.loading = false const token = Vue.ls.get(ACCESS_TOKEN)
if (info.file.response.status === 500) { if (token && data.message.includes('Token失效')) {
const data = info.file.response this.error({
const token = Vue.ls.get(ACCESS_TOKEN) title: '登录已过期',
if (token && data.message.includes('Token失效')) { content: '很抱歉，登录已过期，请重新登录',
this.error({ okText: '重新登录',
title: '登录已过期', mask: false,
content: '很抱歉，登录已过期，请重新登录', onOk: () => {
okText: '重新登录', store.dispatch('Logout').then(() => {
mask: false, Vue.ls.remove(ACCESS_TOKEN)
onOk: () => { window.location.reload()
store.dispatch('Logout').then(() => { })
Vue.ls.remove(ACCESS_TOKEN) }
window.location.reload() })
}) }
} } else {
}) this.$message.error(`文件上传失败: ${info.file.msg} `)
} }
} else {
this.$message.error(`文件上传失败: ${info.file.msg} `)
} }
} }
}, },
/* 图片预览 */ /* 图片预览 */
getImgView (text) { getImgView (text) {
jero-web/src/views/demo/JeroDemoList.vue
+1 -1
View File
@@ -58,7 +58,7 @@
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="plus" @click="onetomany">一对多</a-button> <a-button type="primary" icon="plus" @click="onetomany">一对多</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('单表示例')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('单表示例')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<!-- 高级查询区域 --> <!-- 高级查询区域 -->
jero-web/src/views/modules/message/SysMessageList.vue
+1 -1
View File
@@ -42,7 +42,7 @@
<a-button @click="handleAdd" v-show="show" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" v-show="show" type="primary" icon="plus">新增</a-button>
<a-button type="primary" v-show="show" icon="download" @click="handleExportXls('消息')">导出</a-button> <a-button type="primary" v-show="show" icon="download" @click="handleExportXls('消息')">导出</a-button>
<a-upload v-show="show" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload v-show="show" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel"> @change="handleImportExcel" :before-upload='beforeUpload'>
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
jero-web/src/views/modules/message/SysMessageTemplateList.vue
+1 -1
View File
@@ -43,7 +43,7 @@
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('消息模板')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('消息模板')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel"> @change="handleImportExcel" :before-upload='beforeUpload'>
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
jero-web/src/views/system/DepartList.vue
+2 -2
View File
@@ -8,7 +8,7 @@
<a-button @click="handleAdd(1)" type="primary">添加部门</a-button> <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
<a-button @click="handleAdd(2)" type="primary">添加下级</a-button> <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button> <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
@@ -111,7 +111,7 @@
</template> </template>
</a-form-model-item> </a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-input-number v-model="model.departOrder" /> <a-input-number :max="1000000" :min="1" v-model="model.departOrder" />
</a-form-model-item> </a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号">
<a-input placeholder="请输入手机号" v-model="model.mobile" /> <a-input placeholder="请输入手机号" v-model="model.mobile" />
jero-web/src/views/system/DepartListSync.vue
+2 -2
View File
@@ -8,7 +8,7 @@
<a-button @click="handleAdd(1)" type="primary">添加部门</a-button> <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
<a-button @click="handleAdd(2)" type="primary">添加下级</a-button> <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<j-third-app-button biz-type="depart" :selected-row-keys="selectedRowKeys" syncToApp @sync-finally="onSyncFinally"/> <j-third-app-button biz-type="depart" :selected-row-keys="selectedRowKeys" syncToApp @sync-finally="onSyncFinally"/>
@@ -105,7 +105,7 @@
</template> </template>
</a-form-model-item> </a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序" prop="departOrder"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序" prop="departOrder">
<a-input-number v-model="model.departOrder"/> <a-input-number :max="1000000" :min="1" v-model="model.departOrder"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号" prop="mobile"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号" prop="mobile">
<a-input placeholder="请输入手机号" v-model="model.mobile"/> <a-input placeholder="请输入手机号" v-model="model.mobile"/>
jero-web/src/views/system/DictList.vue
+1 -1
View File
@@ -27,7 +27,7 @@
<div class="table-operator" style="border-top: 5px"> <div class="table-operator" style="border-top: 5px">
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:dict:operation'">添加</a-button> <a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:dict:operation'">添加</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('字典信息')" v-has="'sys:dict:operation'">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('字典信息')" v-has="'sys:dict:operation'">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" v-has="'sys:dict:operation'"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" :before-upload='beforeUpload' @change="handleImportExcel" v-has="'sys:dict:operation'">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-button type="primary" icon="sync" @click="refleshCache()">刷新缓存</a-button> <a-button type="primary" icon="sync" @click="refleshCache()">刷新缓存</a-button>
jero-web/src/views/system/QuartzJobList.vue
+1 -1
View File
@@ -36,7 +36,7 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('定时任务信息')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('定时任务信息')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :before-upload='beforeUpload' :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
jero-web/src/views/system/SysCategoryList.vue
+1 -1
View File
@@ -5,7 +5,7 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:category:add'">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:category:add'">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('分类字典')" v-has="'sys:category:export'">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('分类字典')" v-has="'sys:category:export'">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" v-has="'sys:category:import'"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" :before-upload='beforeUpload' @change="handleImportExcel" v-has="'sys:category:import'">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0" v-has="'sys:category:del'"> <a-dropdown v-if="selectedRowKeys.length > 0" v-has="'sys:category:del'">
jero-web/src/views/system/SysCheckRuleList.vue
+1 -1
View File
@@ -37,7 +37,7 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('编码校验规则')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('编码校验规则')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
jero-web/src/views/system/SysDataSourceList.vue
+1 -1
View File
@@ -33,7 +33,7 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('多数据源管理')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('多数据源管理')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
jero-web/src/views/system/SysFillRuleList.vue
+1 -1
View File
@@ -29,7 +29,7 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('填值规则')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('填值规则')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
jero-web/src/views/system/UserList.vue
+1 -1
View File
@@ -91,7 +91,7 @@
<div class="table-operator" style="border-top: 5px"> <div class="table-operator" style="border-top: 5px">
<a-button @click="handleAdd" type="primary" icon="plus" >添加用户</a-button> <a-button @click="handleAdd" type="primary" icon="plus" >添加用户</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" :before-upload='beforeUpload'>
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-button type="primary" icon="hdd" @click="recycleBinVisible=true">回收站</a-button> <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">回收站</a-button>
jero-web/src/views/system/log/OperatorLogList.vue
+6
View File
@@ -137,6 +137,12 @@ export default {
dataIndex: 'createTime', dataIndex: 'createTime',
align: 'center', align: 'center',
sorter: true sorter: true
},
{
title: '操作类型',
dataIndex: 'operateType_dictText',
align: 'center'
} }
], ],
operateColumn: operateColumn:
jero-web/src/views/system/modules/DepartModal.vue
+5 -5
View File
@@ -19,7 +19,7 @@
prop="departName" prop="departName"
:hidden="false" :hidden="false"
:hasFeedback="true" > :hasFeedback="true" >
<a-input id="departName" placeholder="请输入机构/部门名称" v-model="model.departName"/> <a-input id="departName" :maxLength='100' placeholder="请输入机构/部门名称" v-model="model.departName"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级部门" :hasFeedback="true"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级部门" :hasFeedback="true">
<a-tree-select <a-tree-select
@@ -64,25 +64,25 @@
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="传真"> label="传真">
<a-input placeholder="请输入传真" v-model="model.fax"/> <a-input :maxLength='32' placeholder="请输入传真" v-model="model.fax"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="地址"> label="地址">
<a-input placeholder="请输入地址" v-model="model.address"/> <a-input :maxLength='100' placeholder="请输入地址" v-model="model.address"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="排序"> label="排序">
<a-input-number v-model="model.departOrder"/> <a-input-number :max="1000000" :min="1" v-model="model.departOrder"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="备注"> label="备注">
<a-textarea placeholder="请输入备注" v-model="model.memo"/> <a-textarea :maxLength='200' placeholder="请输入备注" v-model="model.memo"/>
</a-form-model-item> </a-form-model-item>
</a-form-model> </a-form-model>
jero-web/src/views/system/modules/DeptBaseInfo.vue
+1 -1
View File
@@ -43,7 +43,7 @@
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
label="排序"> label="排序">
<a-input-number style="border:0;" v-model="model.departOrder"/> <a-input-number :max="1000000" :min="1" style="border:0;" v-model="model.departOrder"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item
:labelCol="labelCol" :labelCol="labelCol"
jero-web/src/views/system/modules/PasswordModal.vue
+12 -2
View File
@@ -17,11 +17,19 @@
</a-form-item> </a-form-item>
<a-form-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" :hasFeedback="true" > <a-form-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" :hasFeedback="true" >
<a-input type="password" placeholder="请输入登录密码" v-decorator="[ 'password', validatorRules.password]" /> <a-input :type="passwordType" placeholder="请输入登录密码" v-decorator="[ 'password', validatorRules.password]" >
<a-icon title="显示密码" @click="passwordType='text'" slot="suffix" v-if="passwordType==='password'" type="eye" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
<a-icon title="隐藏密码" @click="passwordType='password'" slot="suffix" v-else type="eye-invisible" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
<!-- <a-icon slot="prefix" type="lock" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>-->
</a-input>
</a-form-item> </a-form-item>
<a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" :hasFeedback="true" > <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" :hasFeedback="true" >
<a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/> <a-input :type="passwordType2" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]">
<a-icon title="显示密码" @click="passwordType2='text'" slot="suffix" v-if="passwordType2==='password'" type="eye" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
<a-icon title="隐藏密码" @click="passwordType2='password'" slot="suffix" v-else type="eye-invisible" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
<!-- <a-icon slot="prefix" type="lock" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>-->
</a-input>
</a-form-item> </a-form-item>
</a-form> </a-form>
@@ -36,6 +44,8 @@ export default {
name: 'PasswordModal', name: 'PasswordModal',
data () { data () {
return { return {
passwordType2: 'password',
passwordType: 'password',
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
confirmDirty: false, confirmDirty: false,
jero-web/src/views/system/modules/PermissionModal.vue
+1 -1
View File
@@ -114,7 +114,7 @@
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
prop="sortNo" prop="sortNo"
label="排序"> label="排序">
<a-input-number placeholder="请输入菜单排序" v-model="model.sortNo" style="width: 200px" :readOnly="disableSubmit"/> <a-input-number :max="1000000" :min="1" placeholder="请输入菜单排序" v-model="model.sortNo" style="width: 200px" :readOnly="disableSubmit"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item
jero-web/src/views/system/modules/SysAnnouncementModal.vue
+1 -1
View File
@@ -19,7 +19,7 @@
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
prop="titile" prop="titile"
label="标题"> label="标题">
<a-input placeholder="请输入标题" v-model="model.titile" :readOnly="disableSubmit"/> <a-input :maxLength='100' placeholder="请输入标题" v-model="model.titile" :readOnly="disableSubmit"/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24/2"> <a-col :span="24/2">
jero-web/src/views/system/modules/UserModal.vue
+4 -3
View File
@@ -126,9 +126,10 @@
</a-spin> </a-spin>
<div class="drawer-bootom-button" v-show="!disableSubmit"> <div class="drawer-bootom-button" v-show="!disableSubmit">
<a-popconfirm title="确定放弃编辑？" @confirm="handleCancel" okText="确定" cancelText="取消"> <div class="drawer-bootom-button" v-show="!disableSubmit">
<a-button style="margin-right: .8rem">取消</a-button> <!-- <a-popconfirm title="确定放弃编辑？" @confirm="handleCancel" okText="确定" cancelText="取消">-->
</a-popconfirm> <a-button style="margin-right: .8rem" @click="handleCancel">取消</a-button>
<!-- </a-popconfirm>-->
<a-button @click="handleSubmit" type="primary" :loading="confirmLoading">提交</a-button> <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">提交</a-button>
</div> </div>
jero-web/src/views/system/modules/UserRoleModal.vue
+3 -3
View File
@@ -42,9 +42,9 @@
树操作 <a-icon type="up" /> 树操作 <a-icon type="up" />
</a-button> </a-button>
</a-dropdown> </a-dropdown>
<a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消"> <!-- <a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">-->
<a-button style="margin-right: .8rem">取消</a-button> <a-button style="margin-right: .8rem" @click="close">取消</a-button>
</a-popconfirm> <!-- </a-popconfirm>-->
<a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button> <a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button>
<a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button> <a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button>
</div> </div>