diff --git a/src/api/po/po.js b/src/api/po/po.js index 3eef318..11bddab 100644 --- a/src/api/po/po.js +++ b/src/api/po/po.js @@ -13,11 +13,20 @@ export const getNextItemNo = data => createAPI(`po/getNextItemNo`,'post',data) // 获取待检验入库单列表 export const getQualifiedInspectionList = data => createAPI(`inspection/getQualifiedInspectionList`,'post',data) +// 获取检验不合格待处理单据列表 +export const getUnqualifiedInspectionList = data => createAPI(`inspection/getUnqualifiedInspectionList`,'post',data) + +// 扫描条码获取HandlingUnit信息 +export const scanHandlingUnitLabel = data => createAPI(`handlingunit/getHandlingUnitDetail`,'post',data) + // 检验合格入库 export const confirmQualifiedInbound = data => createAPI(`inspection/confirmQualifiedInbound`,'post',data) // 获取检验历史记录 export const getInboundHistory = data => createAPI(`inspection/getInboundHistory`,'post',data) +// 确认不合格处理 +export const confirmUnqualifiedProcess = data => createAPI(`inspection/confirmUnqualifiedProcess`,'post',data) + // 打印标签 export const printLabel = data => createAPI('/label/setting/printLabel','post',data) diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index d035c4b..267c174 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -808,7 +808,7 @@ a:hover{ .el-input__inner { height: 44px; font-size: 16px; - padding: 0 15px; + padding: 0 5px; } .el-button { diff --git a/src/router/index.js b/src/router/index.js index 5d0be3d..f9ee457 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -34,6 +34,9 @@ const globalRoutes = [ {path: "/inspectionResults",name: "inspectionResults", component: resolve => require(["@/views/modules/recv/inspectionResults.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + + // 检验不合格处理页面(统一处理页面) + {path: "/unqualified-process",name: "unqualifiedProcess", component: resolve => require(["@/views/modules/recv/unqualifiedProcess.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, // V1 // handlingunit diff --git a/src/views/modules/recv/inspectionResults.vue b/src/views/modules/recv/inspectionResults.vue index d1b2218..a208754 100644 --- a/src/views/modules/recv/inspectionResults.vue +++ b/src/views/modules/recv/inspectionResults.vue @@ -1,109 +1,447 @@ diff --git a/src/views/modules/recv/unqualifiedProcess.vue b/src/views/modules/recv/unqualifiedProcess.vue new file mode 100644 index 0000000..512aefd --- /dev/null +++ b/src/views/modules/recv/unqualifiedProcess.vue @@ -0,0 +1,942 @@ + + + + +