update $message.error全局改成$message.warning

This commit is contained in:
赵霄
2023-10-25 17:32:18 +08:00
parent 0bee8465c2
commit 8d5c6b9380
45 changed files with 119 additions and 87 deletions
+10 -1
View File
@@ -74,6 +74,11 @@ const addComment = (params) => postAction('/compare/sarFileCompareResComment/add
// 文档对比-对比结果-评论-评论列表 // 文档对比-对比结果-评论-评论列表
const getCommentList = (params) => getAction('/compare/sarFileCompareResComment/queryListByInfoId', params) const getCommentList = (params) => getAction('/compare/sarFileCompareResComment/queryListByInfoId', params)
// 自定义比对-标准列表
const getCustomComparisonStandardList = (params) => getAction('', params)
// 自定义比对-标准列表-删除
const deleteCustomComparisonStandard = (params) => postAction('', params)
export { export {
// 文档拆分 // 文档拆分
releaseSplitStandard, releaseSplitStandard,
@@ -114,5 +119,9 @@ export {
getComparisonResultDetail, getComparisonResultDetail,
editComparisonComment, editComparisonComment,
addComment, addComment,
getCommentList getCommentList,
// 自定义比对
getCustomComparisonStandardList,
deleteCustomComparisonStandard
} }
+6
View File
@@ -20,5 +20,11 @@ module.exports = {
answerQuestion: '回复问题', answerQuestion: '回复问题',
word: '字', word: '字',
pleaseEnterAnswerDesc: '请输入回答描述' pleaseEnterAnswerDesc: '请输入回答描述'
},
// 征求意见
askForAdvice: {
standardNameNumber: '标准名称/编号',
consultationCycle: '征求意见周期'
} }
} }
+17 -1
View File
@@ -424,7 +424,6 @@ module.exports = {
changePermissions: '更改权限', changePermissions: '更改权限',
pleaseSelectUser: '请选择一个用户', pleaseSelectUser: '请选择一个用户',
longTermEffectiveness: '是否长期有效', longTermEffectiveness: '是否长期有效',
selectFileType: '请选择文件类型', selectFileType: '请选择文件类型',
onlyWord: '只能导入word文件', onlyWord: '只能导入word文件',
fileType: '文件类型', fileType: '文件类型',
@@ -488,6 +487,23 @@ module.exports = {
publishComment: '发表评论', publishComment: '发表评论',
noComment: '暂无评论', noComment: '暂无评论',
replyToComments: '回复评论' replyToComments: '回复评论'
},
// 自定义比对
customComparison: {
listName: '清单名称',
countriesInvolved: '涉及国家',
operator: '操作人',
whetherToMakePublic: '是否公开',
referenceStandard: '涉及标准',
comparisonTime: '比对时间',
onlineComparison: '在线对比',
standardList: '标准列表',
comparisonMaintain: '对比维护',
listDetails: '清单详情',
comparativeAnalysisResult: '对比分析结果',
exitEdit: '退出编辑',
specialty: '特点',
comparisonItem: '比对项'
} }
}, },
// 业务支持 // 业务支持
+8 -8
View File
@@ -257,11 +257,11 @@ export default {
return file return file
}) })
} else { } else {
this.$message.error(info.file.response.message) this.$message.warning(info.file.response.message)
} }
// this.$message.success(`${info.file.name} 上传成功!`); // this.$message.success(`${info.file.name} 上传成功!`);
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
this.$message.error(`${info.file.name} ${this.$t('uploadFile.uploadFailed')}.`) this.$message.warning(`${info.file.name} ${this.$t('uploadFile.uploadFailed')}.`)
} else if (info.file.status === 'removed') { } else if (info.file.status === 'removed') {
this.handleDelete(info.file) this.handleDelete(info.file)
} }
@@ -342,19 +342,19 @@ export default {
file.uploadGoOn = true file.uploadGoOn = true
const fileSize = file.size // 上传的文件大小 const fileSize = file.size // 上传的文件大小
if (fileSize === 0) { if (fileSize === 0) {
this.$message.error(this.$t('uploadFile.cannotUploadEmpty')) this.$message.warning(this.$t('uploadFile.cannotUploadEmpty'))
this.uploadGoOn = false this.uploadGoOn = false
file.uploadGoOn = false file.uploadGoOn = false
return false return false
} }
if (this.fileMaxSize && fileSize > 1024 * 1024 * this.fileMaxSize) { if (this.fileMaxSize && fileSize > 1024 * 1024 * this.fileMaxSize) {
this.$message.error(this.$t('uploadFile.pleaseUpload') + this.fileMaxSize + this.$t('uploadFile.theFollowingDocuments')) this.$message.warning(this.$t('uploadFile.pleaseUpload') + this.fileMaxSize + this.$t('uploadFile.theFollowingDocuments'))
this.uploadGoOn = false this.uploadGoOn = false
file.uploadGoOn = false file.uploadGoOn = false
return false return false
} }
if (fileSize > 1024 * 1024 * 500) { if (fileSize > 1024 * 1024 * 500) {
this.$message.error(this.$t('uploadFile.maxSize')) this.$message.warning(this.$t('uploadFile.maxSize'))
this.uploadGoOn = false this.uploadGoOn = false
file.uploadGoOn = false file.uploadGoOn = false
return false return false
@@ -369,7 +369,7 @@ export default {
// 截取文件后缀名 // 截取文件后缀名
const fileSuffix = (file.name ? file.name.split('.')[file.name.split('.').length - 1] : '').toLowerCase() const fileSuffix = (file.name ? file.name.split('.')[file.name.split('.').length - 1] : '').toLowerCase()
if (this.fileType === FILE_TYPE_IMG && fileType.indexOf('image') < 0) { if (this.fileType === FILE_TYPE_IMG && fileType.indexOf('image') < 0) {
this.$message.error(this.$t('uploadFile.onlyUploadPic')) this.$message.warning(this.$t('uploadFile.onlyUploadPic'))
this.uploadGoOn = false this.uploadGoOn = false
file.uploadGoOn = false file.uploadGoOn = false
return false return false
@@ -378,13 +378,13 @@ export default {
return true return true
} }
if (this.fileType === FILE_TYPE_IMG && fileSuffix !== 'png' && fileSuffix !== 'jpg') { if (this.fileType === FILE_TYPE_IMG && fileSuffix !== 'png' && fileSuffix !== 'jpg') {
this.$message.error(this.$t('uploadFile.pleaseUpload') + 'png、jpg' + this.$t('uploadFile.file')) this.$message.warning(this.$t('uploadFile.pleaseUpload') + 'png、jpg' + this.$t('uploadFile.file'))
this.uploadGoOn = false this.uploadGoOn = false
file.uploadGoOn = false file.uploadGoOn = false
return false return false
} }
if (this.fileType.indexOf(fileSuffix) === -1) { if (this.fileType.indexOf(fileSuffix) === -1) {
this.$message.error(this.$t('uploadFile.pleaseUpload') + `${this.fileType}` + this.$t('uploadFile.file')) this.$message.warning(this.$t('uploadFile.pleaseUpload') + `${this.fileType}` + this.$t('uploadFile.file'))
this.uploadGoOn = false this.uploadGoOn = false
file.uploadGoOn = false file.uploadGoOn = false
return false return false
+2 -2
View File
@@ -246,11 +246,11 @@ export default {
if (typeof test === 'object' && test) { if (typeof test === 'object' && test) {
resolve() resolve()
} else { } else {
this.$message.error('组件JTreeSelect-condition传值有误,需要一个json字符串!') this.$message.warning('组件JTreeSelect-condition传值有误,需要一个json字符串!')
reject() reject()
} }
} catch (e) { } catch (e) {
this.$message.error('组件JTreeSelect-condition传值有误,需要一个json字符串!') this.$message.warning('组件JTreeSelect-condition传值有误,需要一个json字符串!')
reject() reject()
} }
} }
+1 -1
View File
@@ -175,7 +175,7 @@ export default {
} }
// this.$message.success(`${info.file.name} 上传成功!`); // this.$message.success(`${info.file.name} 上传成功!`);
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
this.$message.error(`${info.file.name} 上传失败.`) this.$message.warning(`${info.file.name} 上传失败.`)
} else if (info.file.status === 'removed') { } else if (info.file.status === 'removed') {
this.handleDelete(info.file) this.handleDelete(info.file)
} }
+2 -2
View File
@@ -129,11 +129,11 @@ export default {
}, },
mounted () { mounted () {
if (!this.orgFields || !this.destFields || !this.code) { if (!this.orgFields || !this.destFields || !this.code) {
this.$message.error('popup参数未正确配置!') this.$message.warning('popup参数未正确配置!')
this.avalid = false this.avalid = false
} }
if (this.destFields.split(',').length !== this.orgFields.split(',').length) { if (this.destFields.split(',').length !== this.orgFields.split(',').length) {
this.$message.error('popup参数未正确配置,原始值和目标值数量不一致!') this.$message.warning('popup参数未正确配置,原始值和目标值数量不一致!')
this.avalid = false this.avalid = false
} }
}, },
+1 -1
View File
@@ -138,7 +138,7 @@ export default {
this.handleTreeNodeValue(res.result) this.handleTreeNodeValue(res.result)
this.treeData = [...res.result] this.treeData = [...res.result]
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
} }
}) })
}, },
+2 -2
View File
@@ -299,11 +299,11 @@ export default {
if (typeof test === 'object' && test) { if (typeof test === 'object' && test) {
resolve() resolve()
} else { } else {
this.$message.error('组件JTreeSelect-condition传值有误,需要一个json字符串!') this.$message.warning('组件JTreeSelect-condition传值有误,需要一个json字符串!')
reject() reject()
} }
} catch (e) { } catch (e) {
this.$message.error('组件JTreeSelect-condition传值有误,需要一个json字符串!') this.$message.warning('组件JTreeSelect-condition传值有误,需要一个json字符串!')
reject() reject()
} }
} }
+1 -1
View File
@@ -361,7 +361,7 @@ export default {
} }
// this.$message.success(`${info.file.name} 上传成功!`); // this.$message.success(`${info.file.name} 上传成功!`);
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
this.$message.error(`${info.file.name} 上传失败.`) this.$message.warning(`${info.file.name} 上传失败.`)
} else if (info.file.status === 'removed') { } else if (info.file.status === 'removed') {
this.handleDelete(info.file) this.handleDelete(info.file)
} }
+1 -1
View File
@@ -467,7 +467,7 @@ this.$refs.editableTable.getValues((error, values) => {
// 将通过后的数组提交到后台或自行进行其他处理 // 将通过后的数组提交到后台或自行进行其他处理
console.log(deleteIds, values) console.log(deleteIds, values)
} else { } else {
this.$message.error('验证未通过') this.$message.warning('验证未通过')
} }
}) })
``` ```
+1 -1
View File
@@ -90,7 +90,7 @@ export default {
}, },
ok () { ok () {
if (!this.filePath) { if (!this.filePath) {
this.$message.error('未上传任何文件') this.$message.warning('未上传任何文件')
return false return false
} }
const arr = this.filePath.split(',') const arr = this.filePath.split(',')
@@ -102,19 +102,19 @@ export default {
const status = info.file.status const status = info.file.status
info.fileList.forEach((val, index) => { info.fileList.forEach((val, index) => {
if (val.response && !val.response.result) { if (val.response && !val.response.result) {
this.$message.error(val.response.message) this.$message.warning(val.response.message)
info.fileList.splice(index, 1) info.fileList.splice(index, 1)
} }
}) })
if (this.fileTypeSatus) { if (this.fileTypeSatus) {
if (file.size > 1000000000) { if (file.size > 1000000000) {
this.$message.error(this.errorMessage) this.$message.warning(this.errorMessage)
} else { } else {
if (status === 'error') { if (status === 'error') {
this.uploadFileFlag-- this.uploadFileFlag--
this.$emit('uploadSuccess', this.fileList) this.$emit('uploadSuccess', this.fileList)
this.$message.destroy() this.$message.destroy()
this.$message.error(`${info.file.name} ` + this.$t('fileUploadFailed')) this.$message.warning(`${info.file.name} ` + this.$t('fileUploadFailed'))
} else if (status === 'removed') { } else if (status === 'removed') {
this.uploadFileFlag-- this.uploadFileFlag--
this.myFileList = info.fileList this.myFileList = info.fileList
@@ -141,7 +141,7 @@ export default {
console.log('listLength11111', info.fileList.length) console.log('listLength11111', info.fileList.length)
if (info.fileList.length > 20) { if (info.fileList.length > 20) {
this.$message.destroy() this.$message.destroy()
this.$message.error(this.$t('uploadMaximumATime')) this.$message.warning(this.$t('uploadMaximumATime'))
info.fileList.splice(20) info.fileList.splice(20)
this.myFileList = info.fileList this.myFileList = info.fileList
this.myFileList.forEach((res) => { this.myFileList.forEach((res) => {
+3 -3
View File
@@ -69,18 +69,18 @@ export default {
const status = info.file.status const status = info.file.status
info.fileList.forEach((val, index) => { info.fileList.forEach((val, index) => {
if (val.response && !val.response.result) { if (val.response && !val.response.result) {
this.$message.error(val.response.message) this.$message.warning(val.response.message)
info.fileList.splice(index, 1) info.fileList.splice(index, 1)
} }
}) })
if (this.fileTypeSatus) { if (this.fileTypeSatus) {
if (file.size > 100000000) { if (file.size > 100000000) {
this.$message.error(this.errorMessage) this.$message.warning(this.errorMessage)
} else { } else {
if (status === 'error') { if (status === 'error') {
this.$emit('uploadSuccess', this.fileList) this.$emit('uploadSuccess', this.fileList)
this.$message.destroy() this.$message.destroy()
this.$message.error(`${info.file.name}` + this.$t('fileUploadFailed')) this.$message.warning(`${info.file.name}` + this.$t('fileUploadFailed'))
} else if (status === 'removed') { } else if (status === 'removed') {
this.myFileList = info.fileList this.myFileList = info.fileList
this.fileList = [] this.fileList = []
+1 -1
View File
@@ -217,7 +217,7 @@ export default {
return that.Logout({}).then(() => { return that.Logout({}).then(() => {
window.location.replace('/user/login') window.location.replace('/user/login')
}).catch(err => { }).catch(err => {
that.$message.error({ that.$message.warning({
title: '错误', title: '错误',
description: err.message description: err.message
}) })
+5 -5
View File
@@ -183,7 +183,7 @@ export const ConfigurableTableMixin = {
}, },
loadData (arg) { loadData (arg) {
if (!this.url.list) { if (!this.url.list) {
this.$message.error('请设置url.list属性!') this.$message.warning('请设置url.list属性!')
return return
} }
// 加载数据 若传入参数1则加载第一页的内容 // 加载数据 若传入参数1则加载第一页的内容
@@ -265,7 +265,7 @@ export const ConfigurableTableMixin = {
if (Array.isArray(info.file.response.result) && info.file.response.result.length > 0) { if (Array.isArray(info.file.response.result) && info.file.response.result.length > 0) {
this.messageLineFeed(this.$t('fileImportError'), info.file.response.result) this.messageLineFeed(this.$t('fileImportError'), info.file.response.result)
} else { } else {
this.$message.error(`${info.file.name} ${info.file.response.message}.`) this.$message.warning(`${info.file.name} ${info.file.response.message}.`)
} }
} }
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
@@ -290,7 +290,7 @@ export const ConfigurableTableMixin = {
}) })
} }
} else { } else {
this.$message.error(`文件上传失败: ${info.file.msg} `) this.$message.warning(`文件上传失败: ${info.file.msg} `)
} }
} }
}, },
@@ -385,7 +385,7 @@ export const ConfigurableTableMixin = {
*/ */
batchDel () { batchDel () {
if (!this.url.delete) { if (!this.url.delete) {
this.$message.error('请设置url.deleteBatch属性!') this.$message.warning('请设置url.deleteBatch属性!')
return return
} }
if (this.selectedRowKeys.length <= 0) { if (this.selectedRowKeys.length <= 0) {
@@ -431,7 +431,7 @@ export const ConfigurableTableMixin = {
*/ */
handleDelete (id) { handleDelete (id) {
if (!this.url.delete) { if (!this.url.delete) {
this.$message.error('请设置url.delete属性!') this.$message.warning('请设置url.delete属性!')
return return
} }
const that = this const that = this
+5 -5
View File
@@ -94,7 +94,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.warning('请设置url.list属性!')
return return
} }
// 加载数据 若传入参数1则加载第一页的内容 // 加载数据 若传入参数1则加载第一页的内容
@@ -180,7 +180,7 @@ export const JeroListMixin = {
}, },
batchDel: function () { batchDel: function () {
if (!this.url.deleteBatch) { if (!this.url.deleteBatch) {
this.$message.error('请设置url.deleteBatch属性!') this.$message.warning('请设置url.deleteBatch属性!')
return return
} }
if (this.selectedRowKeys.length <= 0) { if (this.selectedRowKeys.length <= 0) {
@@ -212,7 +212,7 @@ export const JeroListMixin = {
}, },
handleDelete: function (id) { handleDelete: function (id) {
if (!this.url.delete) { if (!this.url.delete) {
this.$message.error('请设置url.delete属性!') this.$message.warning('请设置url.delete属性!')
return return
} }
const that = this const that = this
@@ -413,7 +413,7 @@ export const JeroListMixin = {
} }
this.loadData() this.loadData()
} else { } else {
this.$message.error(`${info.file.name} ${info.file.response.message}.`) this.$message.warning(`${info.file.name} ${info.file.response.message}.`)
} }
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
// 销毁这个提示 // 销毁这个提示
@@ -437,7 +437,7 @@ export const JeroListMixin = {
}) })
} }
} else { } else {
this.$message.error(`文件上传失败: ${info.file.msg} `) this.$message.warning(`文件上传失败: ${info.file.msg} `)
} }
} }
}, },
+3 -3
View File
@@ -58,7 +58,7 @@ export const SimpleListMixin = {
methods: { methods: {
loadData (arg) { loadData (arg) {
if (!this.url.list) { if (!this.url.list) {
this.$message.error('请设置url.list属性!') this.$message.warning('请设置url.list属性!')
return return
} }
// 加载数据 若传入参数1则加载第一页的内容 // 加载数据 若传入参数1则加载第一页的内容
@@ -144,7 +144,7 @@ export const SimpleListMixin = {
}, },
batchDel () { batchDel () {
if (!this.url.deleteBatch) { if (!this.url.deleteBatch) {
this.$message.error('请设置url.deleteBatch属性!') this.$message.warning('请设置url.deleteBatch属性!')
return return
} }
if (this.selectedRowKeys.length <= 0) { if (this.selectedRowKeys.length <= 0) {
@@ -177,7 +177,7 @@ export const SimpleListMixin = {
}, },
handleDelete: function (id) { handleDelete: function (id) {
if (!this.url.delete) { if (!this.url.delete) {
this.$message.error('请设置url.delete属性!') this.$message.warning('请设置url.delete属性!')
return return
} }
const that = this const that = this
+1 -1
View File
@@ -27,7 +27,7 @@ export default {
data: [ data: [
{ title: '账户密码', description: '当前密码强度', value: '强', actions: { title: '修改', callback: () => { this.$message.info('This is a normal message') } } }, { title: '账户密码', description: '当前密码强度', value: '强', actions: { title: '修改', callback: () => { this.$message.info('This is a normal message') } } },
{ title: '密保手机', description: '已绑定手机', value: '138****8293', actions: { title: '修改', callback: () => { this.$message.success('This is a message of success') } } }, { title: '密保手机', description: '已绑定手机', value: '138****8293', actions: { title: '修改', callback: () => { this.$message.success('This is a message of success') } } },
{ title: '密保问题', description: '未设置密保问题,密保问题可有效保护账户安全', value: '', actions: { title: '设置', callback: () => { this.$message.error('This is a message of error') } } }, { title: '密保问题', description: '未设置密保问题,密保问题可有效保护账户安全', value: '', actions: { title: '设置', callback: () => { this.$message.warning('This is a message of error') } } },
{ title: '备用邮箱', description: '已绑定邮箱', value: 'ant***sign.com', actions: { title: '修改', callback: () => { this.$message.warning('This is message of warning') } } }, { title: '备用邮箱', description: '已绑定邮箱', value: 'ant***sign.com', actions: { title: '修改', callback: () => { this.$message.warning('This is message of warning') } } },
{ title: 'MFA 设备', description: '未绑定 MFA 设备,绑定后,可以进行二次确认', value: '', actions: { title: '绑定', callback: () => { this.$message.info('This is a normal message') } } } { title: 'MFA 设备', description: '未绑定 MFA 设备,绑定后,可以进行二次确认', value: '', actions: { title: '绑定', callback: () => { this.$message.info('This is a normal message') } } }
] ]
@@ -378,4 +378,5 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
@import '~@assets/less/common.less';
</style> </style>
@@ -551,7 +551,7 @@ export default {
*/ */
handleDelete (id) { handleDelete (id) {
if (!this.url.delete) { if (!this.url.delete) {
this.$message.error('请设置url.delete属性!') this.$message.warning('请设置url.delete属性!')
return return
} }
const that = this const that = this
@@ -139,7 +139,7 @@ export default {
this.$emit('visible', false, 1) this.$emit('visible', false, 1)
} else { } else {
if (res.data.code === 1) { if (res.data.code === 1) {
this.$message.error(res.data.message) this.$message.warning(res.data.message)
} else { } else {
Modal.info({ Modal.info({
title: '失败', title: '失败',
+2 -2
View File
@@ -150,10 +150,10 @@ export default {
this.loadData() this.loadData()
this.$message.success(`${info.file.name} 上传成功!`) this.$message.success(`${info.file.name} 上传成功!`)
} else { } else {
this.$message.error(`${info.file.response.message}`) this.$message.warning(`${info.file.response.message}`)
} }
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
this.$message.error(`${info.file.response.message}`) this.$message.warning(`${info.file.response.message}`)
} }
}, },
ossDelete (id) { ossDelete (id) {
+1 -1
View File
@@ -430,7 +430,7 @@ export default {
this.$message.success(this.$t('savedSuccessfully')) this.$message.success(this.$t('savedSuccessfully'))
this.loadTree() this.loadTree()
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
} }
}) })
} }
+1 -1
View File
@@ -472,7 +472,7 @@ export default {
this.$message.success('保存成功!') this.$message.success('保存成功!')
this.loadTree() this.loadTree()
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
} }
}) })
} }
+6 -6
View File
@@ -384,7 +384,7 @@ export default {
}, },
handleAdd2: function () { handleAdd2: function () {
if (!this.currentRoleId) { if (!this.currentRoleId) {
this.$message.error(this.$t('roleManage.pleaseSelectARole')) this.$message.warning(this.$t('roleManage.pleaseSelectARole'))
} else { } else {
this.$refs.modalForm2.roleDisabled = true this.$refs.modalForm2.roleDisabled = true
this.$refs.modalForm2.title = this.$t('newlyAdded') this.$refs.modalForm2.title = this.$t('newlyAdded')
@@ -397,7 +397,7 @@ export default {
}, },
loadData2 (arg) { loadData2 (arg) {
if (!this.url.list2) { if (!this.url.list2) {
this.$message.error('请设置url.list2属性!') this.$message.warning('请设置url.list2属性!')
return return
} }
// 加载数据 若传入参数1则加载第一页的内容 // 加载数据 若传入参数1则加载第一页的内容
@@ -423,7 +423,7 @@ export default {
}, },
handleDelete2: function (id) { handleDelete2: function (id) {
if (!this.url.delete2) { if (!this.url.delete2) {
this.$message.error('请设置url.delete2属性!') this.$message.warning('请设置url.delete2属性!')
return return
} }
const that = this const that = this
@@ -438,7 +438,7 @@ export default {
}, },
batchDel2: function () { batchDel2: function () {
if (!this.url.deleteBatch2) { if (!this.url.deleteBatch2) {
this.$message.error('请设置url.deleteBatch2属性!') this.$message.warning('请设置url.deleteBatch2属性!')
return return
} }
if (this.selectedRowKeys2.length <= 0) { if (this.selectedRowKeys2.length <= 0) {
@@ -487,7 +487,7 @@ export default {
handleAddUserRole () { handleAddUserRole () {
if (!this.currentRoleId) { if (!this.currentRoleId) {
this.$message.error(this.$t('roleManage.pleaseSelectARole')) this.$message.warning(this.$t('roleManage.pleaseSelectARole'))
} else { } else {
this.$refs.selectUserModal.visible = true this.$refs.selectUserModal.visible = true
this.$refs.selectUserModal.searchQuery() this.$refs.selectUserModal.searchQuery()
@@ -503,7 +503,7 @@ export default {
}, },
/* handleEdit: function(record) { /* handleEdit: function(record) {
if (this.currentRoleId == '') { if (this.currentRoleId == '') {
this.$message.error('请选择一个角色!') this.$message.warning('请选择一个角色!')
} else { } else {
this.$refs.modalForm.edit(record) this.$refs.modalForm.edit(record)
this.$refs.modalForm.title = '编辑' this.$refs.modalForm.title = '编辑'
+1 -1
View File
@@ -194,7 +194,7 @@ export default {
}, },
loadData (arg) { loadData (arg) {
if (!this.url.list) { if (!this.url.list) {
this.$message.error('请设置url.list属性!') this.$message.warning('请设置url.list属性!')
return return
} }
// 加载数据 若传入参数1则加载第一页的内容 // 加载数据 若传入参数1则加载第一页的内容
+1 -1
View File
@@ -140,7 +140,7 @@ export default {
that.loading = false that.loading = false
that.loadData() that.loadData()
} else { } else {
that.$message.error(res.message) that.$message.warning(res.message)
that.loading = false that.loading = false
} }
}) })
@@ -83,7 +83,7 @@ export default {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
} }
}) })
}, },
+8 -8
View File
@@ -161,7 +161,7 @@ export default {
}, },
loadData (arg) { loadData (arg) {
if (!this.url.list) { if (!this.url.list) {
this.$message.error('请设置url.list属性!') this.$message.warning('请设置url.list属性!')
return return
} }
// 加载数据 若传入参数1则加载第一页的内容 // 加载数据 若传入参数1则加载第一页的内容
@@ -180,11 +180,11 @@ export default {
}, },
batchDel: function () { batchDel: function () {
if (!this.url.deleteBatch) { if (!this.url.deleteBatch) {
this.$message.error('请设置url.deleteBatch属性!') this.$message.warning('请设置url.deleteBatch属性!')
return return
} }
if (!this.currentDeptId) { if (!this.currentDeptId) {
this.$message.error('未选中任何部门,无法取消部门与用户的关联!') this.$message.warning('未选中任何部门,无法取消部门与用户的关联!')
return return
} }
@@ -216,11 +216,11 @@ export default {
}, },
handleDelete: function (id) { handleDelete: function (id) {
if (!this.url.delete) { if (!this.url.delete) {
this.$message.error('请设置url.delete属性!') this.$message.warning('请设置url.delete属性!')
return return
} }
if (!this.currentDeptId) { if (!this.currentDeptId) {
this.$message.error('未选中任何部门,无法取消部门与用户的关联!') this.$message.warning('未选中任何部门,无法取消部门与用户的关联!')
return return
} }
@@ -253,14 +253,14 @@ export default {
}, },
hasSelectDept () { hasSelectDept () {
if (!this.currentDeptId) { if (!this.currentDeptId) {
this.$message.error('请选择一个部门!') this.$message.warning('请选择一个部门!')
return false return false
} }
return true return true
}, },
handleAddUserDepart () { handleAddUserDepart () {
if (!this.currentDeptId) { if (!this.currentDeptId) {
this.$message.error('请选择一个部门!') this.$message.warning('请选择一个部门!')
} else { } else {
this.$refs.selectUserModal.visible = true this.$refs.selectUserModal.visible = true
} }
@@ -273,7 +273,7 @@ export default {
}, },
handleAdd: function () { handleAdd: function () {
if (!this.currentDeptId) { if (!this.currentDeptId) {
this.$message.error('请选择一个部门!') this.$message.warning('请选择一个部门!')
} else { } else {
this.$refs.modalForm.departDisabled = true this.$refs.modalForm.departDisabled = true
// 初始化负责部门 // 初始化负责部门
+1 -1
View File
@@ -271,7 +271,7 @@ export default {
if (valid) { if (valid) {
if (((this.model.menuType + '') === '1' || (this.model.menuType + '') === '2') && !this.model.parentId) { if (((this.model.menuType + '') === '1' || (this.model.menuType + '') === '2') && !this.model.parentId) {
that.validateStatus = 'error' that.validateStatus = 'error'
that.$message.error('请检查你填的类型以及信息是否正确!') that.$message.warning('请检查你填的类型以及信息是否正确!')
return return
} else { } else {
that.validateStatus = 'success' that.validateStatus = 'success'
@@ -87,7 +87,7 @@ export default {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
} }
}) })
}, },
+1 -1
View File
@@ -152,7 +152,7 @@ export default {
that.close() that.close()
} }
} else { } else {
that.$message.error(res.message) that.$message.warning(res.message)
that.loading = false that.loading = false
if (exit) { if (exit) {
that.close() that.close()
@@ -142,7 +142,7 @@ export default {
this.$emit('ok') this.$emit('ok')
this.close() this.close()
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
} }
}).finally(() => { }).finally(() => {
this.confirmLoading = false this.confirmLoading = false
+2 -2
View File
@@ -160,7 +160,7 @@ export default {
}, },
handleDelete: function (id) { handleDelete: function (id) {
if (!this.url.delete) { if (!this.url.delete) {
this.$message.error('请设置url.delete属性!') this.$message.warning('请设置url.delete属性!')
return return
} }
const that = this const that = this
@@ -187,7 +187,7 @@ export default {
}, },
batchDel () { batchDel () {
if (!this.url.deleteBatch) { if (!this.url.deleteBatch) {
this.$message.error('请设置url.deleteBatch属性!') this.$message.warning('请设置url.deleteBatch属性!')
return return
} }
if (this.selectedRowKeys.length <= 0) { if (this.selectedRowKeys.length <= 0) {
@@ -306,7 +306,7 @@ export default {
this.$emit('ok') this.$emit('ok')
this.onClose() this.onClose()
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
} }
}).finally(() => { }).finally(() => {
this.confirmLoading = false this.confirmLoading = false
+1 -1
View File
@@ -64,7 +64,7 @@ export default {
// this.$emit('ok') // this.$emit('ok')
// this.close() // this.close()
// } else { // } else {
// this.$message.error(res.message) // this.$message.warning(res.message)
// } // }
// }).finally(() => { // }).finally(() => {
// this.confirmLoading = false // this.confirmLoading = false
@@ -363,7 +363,7 @@ export default {
this.$emit('ok') this.$emit('ok')
this.onClose() this.onClose()
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
} }
}).finally(() => { }).finally(() => {
this.confirmLoading = false this.confirmLoading = false
@@ -176,7 +176,7 @@ export default {
that.$emit('ok') that.$emit('ok')
that.close() that.close()
} else { } else {
that.$message.error(res.message) that.$message.warning(res.message)
} }
}).finally(() => { }).finally(() => {
that.confirmLoading = false that.confirmLoading = false
@@ -139,7 +139,7 @@ export default {
this.$emit('ok') this.$emit('ok')
this.close() this.close()
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
} }
}).finally(() => { }).finally(() => {
this.confirmLoading = false this.confirmLoading = false
+3 -3
View File
@@ -58,7 +58,7 @@ export const TagListMixin = {
methods: { methods: {
loadData (arg) { loadData (arg) {
if (!this.url.list) { if (!this.url.list) {
this.$message.error('请设置url.list属性!') this.$message.warning('请设置url.list属性!')
return return
} }
// 加载数据 若传入参数1则加载第一页的内容 // 加载数据 若传入参数1则加载第一页的内容
@@ -144,7 +144,7 @@ export const TagListMixin = {
}, },
batchDel () { batchDel () {
if (!this.url.deleteBatch) { if (!this.url.deleteBatch) {
this.$message.error('请设置url.deleteBatch属性!') this.$message.warning('请设置url.deleteBatch属性!')
return return
} }
if (this.selectedRowKeys.length <= 0) { if (this.selectedRowKeys.length <= 0) {
@@ -179,7 +179,7 @@ export const TagListMixin = {
}, },
handleDelete: function (id) { handleDelete: function (id) {
if (!this.url.delete) { if (!this.url.delete) {
this.$message.error('请设置url.delete属性!') this.$message.warning('请设置url.delete属性!')
return return
} }
const that = this const that = this
+1 -1
View File
@@ -317,7 +317,7 @@ export default {
this.randCodeImage = res.result this.randCodeImage = res.result
this.requestCodeSuccess = true this.requestCodeSuccess = true
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
this.requestCodeSuccess = false this.requestCodeSuccess = false
} }
}).catch(() => { }).catch(() => {
+2 -2
View File
@@ -73,7 +73,7 @@ export default {
this.randCodeImage = res.result this.randCodeImage = res.result
this.requestCodeSuccess = true this.requestCodeSuccess = true
} else { } else {
this.$message.error(res.message) this.$message.warning(res.message)
this.requestCodeSuccess = false this.requestCodeSuccess = false
} }
}).catch(() => { }).catch(() => {
@@ -108,7 +108,7 @@ export default {
} }
}) })
}).catch(err => { }).catch(err => {
this.$message.error(err.message) this.$message.warning(err.message)
}) })
} }
}) })
@@ -362,7 +362,7 @@ export default {
// 推入表格中 // 推入表格中
this.dataSource = this.dataSource.concat(info.file.response.result) this.dataSource = this.dataSource.concat(info.file.response.result)
} else { } else {
this.$message.error(`${info.file.name} ${info.file.response.message}.`) this.$message.warning(`${info.file.name} ${info.file.response.message}.`)
} }
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
// 销毁这个提示 // 销毁这个提示
@@ -386,7 +386,7 @@ export default {
}) })
} }
} else { } else {
this.$message.error(`文件上传失败: ${info.file.msg} `) this.$message.warning(`文件上传失败: ${info.file.msg} `)
} }
} }
}, },
@@ -406,7 +406,7 @@ export default {
// 推入表格中 // 推入表格中
this.dataSource = this.dataSource.concat(info.file.response.result) this.dataSource = this.dataSource.concat(info.file.response.result)
} else { } else {
this.$message.error(`${info.file.name} ${info.file.response.message}.`) this.$message.warning(`${info.file.name} ${info.file.response.message}.`)
} }
} else if (info.file.status === 'error') { } else if (info.file.status === 'error') {
// 销毁这个提示 // 销毁这个提示
@@ -430,7 +430,7 @@ export default {
}) })
} }
} else { } else {
this.$message.error(`文件上传失败: ${info.file.msg} `) this.$message.warning(`文件上传失败: ${info.file.msg} `)
} }
} }
}, },