diff --git a/src/api/qms/qcInspectionItem/types.ts b/src/api/qms/qcInspectionItem/types.ts index 2c37b4c..947813e 100644 --- a/src/api/qms/qcInspectionItem/types.ts +++ b/src/api/qms/qcInspectionItem/types.ts @@ -67,12 +67,12 @@ export interface QcInspectionItemVO { /** * 规格上限 */ - specUpper: number; + specUpper: string; /** * 规格下限 */ - specLower: number; + specLower: string; /** * 检测项说明 @@ -174,12 +174,12 @@ export interface QcInspectionItemForm extends BaseEntity { /** * 规格上限 */ - specUpper?: number; + specUpper?: string; /** * 规格下限 */ - specLower?: number; + specLower?: string; /** * 检测项说明 @@ -283,12 +283,12 @@ export interface QcInspectionItemQuery extends PageQuery { /** * 规格上限 */ - specUpper?: number; + specUpper?: string; /** * 规格下限 */ - specLower?: number; + specLower?: string; /** * 检测项说明 diff --git a/src/api/qms/qcInspectionResult/types.ts b/src/api/qms/qcInspectionResult/types.ts index 3f67b2c..d57e05c 100644 --- a/src/api/qms/qcInspectionResult/types.ts +++ b/src/api/qms/qcInspectionResult/types.ts @@ -92,12 +92,12 @@ export interface QcInspectionResultVO { /** * 规格上限(快照) */ - specUpper: number; + specUpper: string; /** * 规格下限(快照) */ - specLower: number; + specLower: string; /** * 检测项说明(快照) @@ -200,12 +200,12 @@ export interface QcInspectionResultForm extends BaseEntity { /** * 规格上限(快照) */ - specUpper?: number; + specUpper?: string; /** * 规格下限(快照) */ - specLower?: number; + specLower?: string; /** * 检测项说明(快照) @@ -309,12 +309,12 @@ export interface QcInspectionResultQuery extends PageQuery { /** * 规格上限(快照) */ - specUpper?: number; + specUpper?: string; /** * 规格下限(快照) */ - specLower?: number; + specLower?: string; /** * 检测项说明(快照) diff --git a/src/api/qms/qcTemplateItem/types.ts b/src/api/qms/qcTemplateItem/types.ts index c824eb9..63563b2 100644 --- a/src/api/qms/qcTemplateItem/types.ts +++ b/src/api/qms/qcTemplateItem/types.ts @@ -72,12 +72,12 @@ export interface QcTemplateItemVO { /** * 规格上限 */ - specUpper: number; + specUpper: string; /** * 规格下限 */ - specLower: number; + specLower: string; /** * 检测项说明 @@ -160,12 +160,12 @@ export interface QcTemplateItemForm extends BaseEntity { /** * 规格上限 */ - specUpper?: number; + specUpper?: string; /** * 规格下限 */ - specLower?: number; + specLower?: string; /** * 检测项说明 @@ -249,12 +249,12 @@ export interface QcTemplateItemQuery extends PageQuery { /** * 规格上限 */ - specUpper?: number; + specUpper?: string; /** * 规格下限 */ - specLower?: number; + specLower?: string; /** * 检测项说明 diff --git a/src/api/qms/qcUnqualifiedRecord/types.ts b/src/api/qms/qcUnqualifiedRecord/types.ts index 921fc97..2410901 100644 --- a/src/api/qms/qcUnqualifiedRecord/types.ts +++ b/src/api/qms/qcUnqualifiedRecord/types.ts @@ -28,6 +28,7 @@ export interface QcUnqualifiedRecordVO { * 检测项目类别 */ categoryName: number; + categoryId: string | number; /** * 关联检测类型表 @@ -72,12 +73,12 @@ export interface QcUnqualifiedRecordVO { /** * 规格上限 */ - specUpper: number; + specUpper: string; /** * 规格下限 */ - specLower: number; + specLower: string; /** * 检查项说明 @@ -116,6 +117,7 @@ export interface QcUnqualifiedRecordForm extends BaseEntity { * 检测项目类别 */ categoryName?: number; + categoryId?: string | number; /** * 关联检测类型表 @@ -160,12 +162,12 @@ export interface QcUnqualifiedRecordForm extends BaseEntity { /** * 规格上限 */ - specUpper?: number; + specUpper?: string; /** * 规格下限 */ - specLower?: number; + specLower?: string; /** * 检查项说明 @@ -205,6 +207,7 @@ export interface QcUnqualifiedRecordQuery extends PageQuery { * 检测项目类别 */ categoryName?: number; + categoryId?: string | number; /** * 关联检测类型表 @@ -249,12 +252,12 @@ export interface QcUnqualifiedRecordQuery extends PageQuery { /** * 规格上限 */ - specUpper?: number; + specUpper?: string; /** * 规格下限 */ - specLower?: number; + specLower?: string; /** * 检查项说明 diff --git a/src/api/qms/qcUnqualifiedReview/index.ts b/src/api/qms/qcUnqualifiedReview/index.ts index 9f3e1ce..0966739 100644 --- a/src/api/qms/qcUnqualifiedReview/index.ts +++ b/src/api/qms/qcUnqualifiedReview/index.ts @@ -75,3 +75,15 @@ export function getQcUnqualifiedReviewList (query) { params: query }); }; + +/** + * 删除不合格品待评审 + * @param dispositionType + * @param reviewId + */ +export const handleUnqualified = (dispositionType: string | number, reviewId: string | number | Array) => { + return request({ + url: '/qms/qcMobile/handleUnqualified/' + dispositionType + '/' + reviewId, + method: 'get' + }); +}; diff --git a/src/views/qms/QcInspectionMain/index.vue b/src/views/qms/QcInspectionMain/index.vue index 8e3bad0..fa83e7f 100644 --- a/src/views/qms/QcInspectionMain/index.vue +++ b/src/views/qms/QcInspectionMain/index.vue @@ -21,11 +21,11 @@ - - - - - + + + + + @@ -103,11 +103,7 @@ - - - +