diff --git a/src/views/biz/flowingAround/index.vue b/src/views/biz/flowingAround/index.vue index 318d919..3bc4dc7 100644 --- a/src/views/biz/flowingAround/index.vue +++ b/src/views/biz/flowingAround/index.vue @@ -181,6 +181,8 @@ const formRules = { // 表格列 const columns: DataTableColumns = [ { type: 'selection' }, + { title: '物料名称', key: 'materialName' }, + { title: '物料编码', key: 'materialCode' }, { title: '当前序ID', key: 'currentlyPrefaceName' }, { title: '下一序ID', key: 'nextPrefaceName' }, { title: '业务来源', key: 'businessName' }, diff --git a/src/views/biz/qualityTesting/index.vue b/src/views/biz/qualityTesting/index.vue index 958fe58..95eee87 100644 --- a/src/views/biz/qualityTesting/index.vue +++ b/src/views/biz/qualityTesting/index.vue @@ -478,6 +478,18 @@ const formRules = { const columns: DataTableColumns = [ { type: 'selection' }, { title: '质检编号', key: 'qcNo',align: 'center' }, + { + title: '物料名称', + key: 'materialName', + align: 'center', + width: 150 + }, + { + title: '物料编码', + key: 'materialCode', + align: 'center', + width: 120 + }, { title: '来源类型', key: 'sourceType',align: 'center', render(row) { const val = row.sourceType diff --git a/src/views/production/componets/AssingWorkTreeTable.vue b/src/views/production/componets/AssingWorkTreeTable.vue index 9a84a36..978a12d 100644 --- a/src/views/production/componets/AssingWorkTreeTable.vue +++ b/src/views/production/componets/AssingWorkTreeTable.vue @@ -185,6 +185,37 @@ const AssingWorkColumns :DataTableColumns = [ key: 'processCode', minWidth: 200 }, + { + align:'center', + title: '是否质检', + key: 'qualityInspection', + minWidth: 200, + render(row) { + var opt = row.qualityInspection + if (opt == 0) { + return h(NTag, { type: 'error', size: 'small' }, { default: () => "否" }) + } + if (opt == 1) { + return h(NTag, { type: 'success', size: 'small' }, { default: () => "是" }) + } + } + }, + { + align:'center', + title: '是否入库', + key: 'storageEntry', + minWidth: 200, + render(row) { + var opt = row.storageEntry + if (opt == 0) { + return h(NTag, { type: 'error', size: 'small' }, { default: () => "否" }) + } + if (opt == 1) { + return h(NTag, { type: 'success', size: 'small' }, { default: () => "是" }) + } + } + }, + { align:'center', title: '派工状态',