diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 05d390269..c529779a0 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -309,7 +309,7 @@ export enum DICT_TYPE { QUALITY_NOTIFICATION_TYPE = "quality_notification_type", // 质量通知类型 QUALITY_NOTICE_STATUS = "quality_notice_status", // 质量通知状态 QUALITY_TASK_STATUS = "quality_task_status", // 质量通知任务状态 - + // ========== 业务 - mes -gaojs ========== QUALIFY_STATUS = 'qualify_status',//质检状态 QUALIFY_ITEM_DATA_TYPE='qualify_item_data_type',//质检项目数据类型 @@ -350,9 +350,10 @@ export enum DICT_TYPE { PART_CLASS = 'part_class', //备件分类 FAILURE_DEGREE = 'failure_degree', // 故障紧急程度 FAILURE_REASON = 'failure_reason', //故障类型 - REPAIR_DEGREE = 'repair_degree', //维修紧急程度 + REPAIR_DEGREE = 'repair_degree', //维修紧急程度 REPAIR_LEVEL = 'repair_level', //维修级别 IS_COMPLETED = 'is_completed', //是否完成 MAINTENANCE_CYCLE ='maintenance_cycle', // 保养周期 - EAM_ORDER_STATUS = 'eam_order_status' + EAM_ORDER_STATUS = 'eam_order_status', + OFF_BACK_STATUS = 'off_back_status' } diff --git a/src/views/mes/productBackline/index.vue b/src/views/mes/productBackline/index.vue index b132565f6..11c9eb1d5 100644 --- a/src/views/mes/productBackline/index.vue +++ b/src/views/mes/productBackline/index.vue @@ -33,7 +33,7 @@ @@ -138,10 +138,20 @@ const buttonBaseClick = (val, item) => { } // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'mes:product-backline:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'mes:product-backline:delete'}), // 删除 -] +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:delete'}), // 删除 + ] +} + +const isShowMainButton = (row,val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { diff --git a/src/views/mes/productBackline/productBackline.data.ts b/src/views/mes/productBackline/productBackline.data.ts index f6111e2df..06f527488 100644 --- a/src/views/mes/productBackline/productBackline.data.ts +++ b/src/views/mes/productBackline/productBackline.data.ts @@ -92,6 +92,14 @@ export const ProductBackline = useCrudSchemas(reactive([ } } }, + { + label: '状态', + field: 'status', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.OFF_BACK_STATUS, + dictClass: 'string', + }, { label: '返线工序', field: 'processCode', diff --git a/src/views/mes/productOffline/index.vue b/src/views/mes/productOffline/index.vue index 319b76cab..2165b6415 100644 --- a/src/views/mes/productOffline/index.vue +++ b/src/views/mes/productOffline/index.vue @@ -33,7 +33,7 @@ @@ -138,10 +138,20 @@ const buttonBaseClick = (val, item) => { } // 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'mes:product-offline:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'mes:product-offline:delete'}), // 删除 -] +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hide: isShowMainButton(row,['1']),hasPermi:'mes:reworkSingle:delete'}), // 删除 + ] +} + +const isShowMainButton = (row,val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { diff --git a/src/views/mes/productOffline/productOffline.data.ts b/src/views/mes/productOffline/productOffline.data.ts index 6cd91a20f..563b3f473 100644 --- a/src/views/mes/productOffline/productOffline.data.ts +++ b/src/views/mes/productOffline/productOffline.data.ts @@ -114,6 +114,14 @@ export const ProductOffline = useCrudSchemas(reactive([ } } }, + { + label: '状态', + field: 'status', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.OFF_BACK_STATUS, + dictClass: 'string', + }, { label: '产品去向', field: 'productDestination', diff --git a/src/views/mes/reworkBatch/reworkBatch.data.ts b/src/views/mes/reworkBatch/reworkBatch.data.ts index 2e06d3db9..f6834c95c 100644 --- a/src/views/mes/reworkBatch/reworkBatch.data.ts +++ b/src/views/mes/reworkBatch/reworkBatch.data.ts @@ -9,6 +9,7 @@ export const ReworkBatchRules = reactive({ productionCode:[required], replaceFlag:[required], status:[required], + productionCount:[required] }) export const ReworkBatch = useCrudSchemas(reactive([