diff --git a/src/views/eam/basic/item/index.vue b/src/views/eam/basic/item/index.vue index bb6adcf..c09acaf 100644 --- a/src/views/eam/basic/item/index.vue +++ b/src/views/eam/basic/item/index.vue @@ -226,8 +226,9 @@ const formsSuccess = async (formType, data) => { return item.field === 'maxInventory' || item.field === 'minInventory' }) if (isHave) { - if (data.minInventory && data.maxInventory && data.minInventory >= data.maxInventory) { + if (data.minInventory && data.maxInventory && data.minInventory > data.maxInventory) { message.error('最高库存要大于最低库存') + basicFormRef.value.formLoading = false return false } } diff --git a/src/views/eam/item/countadjustPlan/index.vue b/src/views/eam/item/countadjustPlan/index.vue index 9d1237d..4fd8135 100644 --- a/src/views/eam/item/countadjustPlan/index.vue +++ b/src/views/eam/item/countadjustPlan/index.vue @@ -134,7 +134,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ // defaultButtons.mainListEditBtn({hasPermi:'eam:countadjustPlan:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'eam:countadjustPlan:delete'}), // 删除 + defaultButtons.mainListDeleteBtn({hasPermi:'item:countadjustPlan:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/report/itemWarning/index.vue b/src/views/eam/report/itemWarning/index.vue index c445592..2f13949 100644 --- a/src/views/eam/report/itemWarning/index.vue +++ b/src/views/eam/report/itemWarning/index.vue @@ -10,7 +10,7 @@ - @@ -257,14 +257,16 @@ function tableRowClassName({row, rowIndex}) { console.log(row.classification); if (row.classification =='A') { - return { - background: 'red !important' - }; + // return { + // background: '#ff4800 !important' + // }; + return 'red-row'; } if (row.classification =='B') { - return { - background: 'yellow !important' - }; + // return { + // background: 'yellow !important' + // }; + return 'yellow-row'; } return ''; } @@ -296,17 +298,13 @@ // color: white !important; // } ::v-deep .el-table .red-row { - background: red !important; + background: #ff4800 !important; } ::v-deep .el-table .yellow-row { background: yellow !important; } - ::v-deep .el-table tr > red-row{ - background: red !important; - } - // ::v-deep .el-table .red-row { // --el-table-tr-bg-color: var(--el-color-warning-light-9) !important; // }