diff --git a/src/api/system/importantErrorConfig.js b/src/api/system/importantErrorConfig.js new file mode 100644 index 0000000..8e60876 --- /dev/null +++ b/src/api/system/importantErrorConfig.js @@ -0,0 +1,17 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +// ========== 查询相关 ========== - rqrq + +// 查询重要错误配置列表 - rqrq +export const getImportantErrorConfigList = data => createAPI('/api/importantErrorConfig/list', 'POST', data) + +// ========== 保存相关 ========== - rqrq + +// 新增重要错误配置 - rqrq +export const addImportantErrorConfig = data => createAPI('/api/importantErrorConfig/add', 'POST', data) + +// 修改重要错误配置 - rqrq +export const updateImportantErrorConfig = data => createAPI('/api/importantErrorConfig/update', 'POST', data) + +// 删除重要错误配置 - rqrq +export const deleteImportantErrorConfig = data => createAPI('/api/importantErrorConfig/delete', 'POST', data) diff --git a/src/views/modules/check/currentPhysicalInventory.vue b/src/views/modules/check/currentPhysicalInventory.vue index 0e0963f..d9d2256 100644 --- a/src/views/modules/check/currentPhysicalInventory.vue +++ b/src/views/modules/check/currentPhysicalInventory.vue @@ -18,11 +18,11 @@ 选择处理方式 + :disabled="headerLoading || handleExceptionLoading">标记处理方式 - {{ autoAdjustLoading ? '处理中...' : '自动处理盈亏' }} + + + {{ continuePushLoading ? '推送中...' : '手工继续推送' }} diff --git a/src/views/modules/system/importantErrorConfig.vue b/src/views/modules/system/importantErrorConfig.vue new file mode 100644 index 0000000..ac4d142 --- /dev/null +++ b/src/views/modules/system/importantErrorConfig.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/src/views/modules/warehouse/sysErrorLog.vue b/src/views/modules/warehouse/sysErrorLog.vue index 3623b52..da08f2c 100644 --- a/src/views/modules/warehouse/sysErrorLog.vue +++ b/src/views/modules/warehouse/sysErrorLog.vue @@ -32,6 +32,14 @@ + + + + + + + + @@ -122,6 +130,13 @@ - + + + {{ scope.row.isImportantError === 'Y' ? '是' : '否' }} + + {{ scope.row[item.columnProp] }} @@ -192,6 +207,13 @@ {{ detailData.interfaceName || '-' }} + + + {{ detailData.isImportantError === 'Y' ? '是' : '否' }} + + {{ detailData.methodName || '-' }} @@ -274,6 +296,7 @@ export default { businessKey: '', isInterface: '', interfaceType: '', + isImportantError: '', interfaceName: '', username: '', searchErrorDetail: '', @@ -336,6 +359,16 @@ export default { showOverflowTooltip: true, fixed: "" }, + { + columnProp: "isImportantError", + headerAlign: "center", + align: "center", + columnLabel: "是否重要错误", + columnWidth: 100, + columnSortable: false, + showOverflowTooltip: true, + fixed: "" + }, { columnProp: "interfaceName", headerAlign: "center", @@ -476,6 +509,7 @@ export default { businessKey: '', isInterface: '', interfaceType: '', + isImportantError: '', interfaceName: '', username: '', searchErrorDetail: '', @@ -563,7 +597,8 @@ export default { return (data.page.list || []).map(item => { return { ...item, - isInterface: item.isInterface === 'Y' ? '是' : '否' + isInterface: item.isInterface === 'Y' ? '是' : '否', + isImportantError: item.isImportantError === 'Y' ? '是' : '否' } }) }