From f99b42437b426614a8d84594e08c43e838c68bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 3 Apr 2024 16:03:14 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/inspection/inspectionRecord/index.vue | 10 +- ...n.data.ts => inspectionRecordMain.data.ts} | 88 ++-- .../inspection/inspectionRequest/index.vue | 387 +++++++++--------- 3 files changed, 229 insertions(+), 256 deletions(-) rename src/views/qms/inspection/inspectionRecord/{inspectionJobMain.data.ts => inspectionRecordMain.data.ts} (89%) diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspection/inspectionRecord/index.vue index b73e9ddfd..7116df0d8 100644 --- a/src/views/qms/inspection/inspectionRecord/index.vue +++ b/src/views/qms/inspection/inspectionRecord/index.vue @@ -30,9 +30,9 @@ + :apiUpdate="InspectionRecordMainApi.updateInspectionRecordMain" + :apiCreate="InspectionRecordMainApi.createInspectionRecordMain" :isBusiness="true" @handleAddTable="handleAddTable" + @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" /> + :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail" + @searchTableSuccessDetail="searchTableSuccessDetail" :isShowAddBtn="false" :detailButtonIsShow="true" /> ([ { - label: 'id', - field: 'id', - sort: 'custom', - isTable: false, - isSearch: true, - isForm: false, - }, - { - label: '编码', + label: '记录编号', field: 'number', sort: 'custom', isSearch: true, @@ -32,82 +24,82 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ label: '任务编码', field: 'taskCode', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '供应商编码', field: 'supplierCode', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '物料编码', field: 'materialCode', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '批次', field: 'batch', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '检验方案编码', field: 'inspectionSchemeCode', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '检验方案Json', field: 'inspectionSchemeJson', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '检验批次', field: 'inspectionBatch', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '检验批数量', field: 'inspectionBatchAmount', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '采样总数量', field: 'sampleTatalAmount', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '检验类型', field: 'inspectionType', sort: 'custom', - isSearch: true, + isSearch: false, form: { - component: 'SelectV2' + component: 'Select' }, }, { label: '检验批来源', field: 'inspectionBatchSource', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '订单号', field: 'orderCode', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '订单行', field: 'orderRow', sort: 'custom', - isSearch: true, + isSearch: false, form: { component: 'InputNumber', value: 0 @@ -117,13 +109,13 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ label: '凭证号', field: 'certificateCode', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '凭证行', field: 'certificateRow', sort: 'custom', - isSearch: true, + isSearch: false, form: { component: 'InputNumber', value: 0 @@ -133,7 +125,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ label: '检验阶段', field: 'inspectionStage', sort: 'custom', - isSearch: true, + isSearch: false, form: { component: 'InputNumber', value: 0 @@ -143,20 +135,20 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ label: '检验严格性', field: 'inspectionStringency', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '使用决策', field: 'useDecision', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '计划开始时间', field: 'planStartTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -178,7 +170,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ field: 'planEndTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -200,7 +192,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ field: 'realStartTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -222,7 +214,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ field: 'realEndTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -243,26 +235,26 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ label: '检验水平', field: 'inspectionLevel', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: 'AQL值', field: 'aqlValue', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '是否可用', field: 'available', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '创建时间', field: 'createTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -319,32 +311,32 @@ export const InspectionRecordDetail = useCrudSchemas(reactive([ field: 'id', sort: 'custom', isTable: false, - isSearch: true, + isSearch: false, isForm: false, }, { label: '记录编码', field: 'recordCode', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '工序编码', field: 'processCode', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '工序描述', field: 'processDescribe', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '顺序号', field: 'sequenceCode', sort: 'custom', - isSearch: true, + isSearch: false, form: { component: 'InputNumber', value: 0 @@ -354,7 +346,7 @@ export const InspectionRecordDetail = useCrudSchemas(reactive([ label: '是否破坏性检验', field: 'isDestroyInspection', sort: 'custom', - isSearch: true, + isSearch: false, form: { component: 'Radio' }, @@ -364,7 +356,7 @@ export const InspectionRecordDetail = useCrudSchemas(reactive([ field: 'inspectionStartTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -386,7 +378,7 @@ export const InspectionRecordDetail = useCrudSchemas(reactive([ field: 'inspectionEndTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -407,26 +399,26 @@ export const InspectionRecordDetail = useCrudSchemas(reactive([ label: '检验人', field: 'inspectionOperator', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '检验特性编码', field: 'inspectionFeaturesCode', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '是否可用', field: 'available', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '创建时间', field: 'createTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspection/inspectionRequest/index.vue index 74269bfa7..002343e54 100644 --- a/src/views/qms/inspection/inspectionRequest/index.vue +++ b/src/views/qms/inspection/inspectionRequest/index.vue @@ -4,29 +4,17 @@ - - + + - + }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" + v-model:sort="tableObject.sort">