diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue index a946c772a..5f427db67 100644 --- a/fe/PC/src/components/umyTable/index.vue +++ b/fe/PC/src/components/umyTable/index.vue @@ -702,9 +702,9 @@ export default { background: #f6f7fb !important; border: none !important; - &:last-child{ - background: unset !important; - } + // &:last-child{ + // background: unset !important; + // } } ::v-deep .el-form-item__error{ position: relative; diff --git a/fe/PC/src/filters/index.js b/fe/PC/src/filters/index.js index 92cd33a7e..a674ed054 100644 --- a/fe/PC/src/filters/index.js +++ b/fe/PC/src/filters/index.js @@ -114,8 +114,15 @@ export function isTableColumns(data) { return isData } +/** + * @param {*} index 枚举值 + * @param {*} text 枚举函数名称 + * @param {*} prop 返回字段 + * @param {*} type dictType + */ export function trigger(index, text, prop, type) { let Function = statusType.default[text] + if(!Function)return '无' return Function(index, prop, type) } // 多数据源,集合 diff --git a/fe/PC/src/utils/index.js b/fe/PC/src/utils/index.js index 09d37fcee..aec7bb21e 100644 --- a/fe/PC/src/utils/index.js +++ b/fe/PC/src/utils/index.js @@ -386,12 +386,14 @@ export function removeClass(ele, cls) { //返回 export function Enum(status, index, prop) { + let _no_text = '无' + if(!status)return _no_text if (index != undefined) { //如果传入的是index if (prop === 'color') { const domColor = status[index] ? status[index][prop] : "" return 'color:' + domColor } else { - const dom = status[index] ? status[index][prop] : "无" + const dom = status[index] ? status[index][prop] : _no_text return dom } } else { @@ -492,7 +494,7 @@ export function getMatchRegConformValue(type,defaultValue,fixedNum){ // 字典格式化数据结构 export function dictFormatData() { - return new Promise(resolve => { + return new Promise((resolve,reject) => { let rs = [] let childRs = {} let param = { diff --git a/fe/PC/src/utils/request.js b/fe/PC/src/utils/request.js index 58180b04e..1c1750bf9 100644 --- a/fe/PC/src/utils/request.js +++ b/fe/PC/src/utils/request.js @@ -91,7 +91,7 @@ service.interceptors.response.use( }, error => { let err = error.response.data.error // for debug - if (err.validationErrors) { + if (err && err.validationErrors) { for (let item in err.validationErrors) { Message({ message: err.validationErrors[item].message,