@@ -48,7 +48,7 @@ | |||
filter-placement="top" | |||
:align="head.align || null" | |||
v-bind="head.more" | |||
:show-overflow-tooltip="head.showOverflowTooltip || !head.prop === 'operations'" | |||
:show-overflow-tooltip="head.showOverflowTooltip || !(head.prop === 'operations')" | |||
> | |||
<!-- :show-overflow-tooltip="head.showOverflowTooltip || true" --> | |||
<!-- 子组件 --> | |||
@@ -8,8 +8,8 @@ export default function () { | |||
{ type: "index", label: "序号" }, | |||
{ width: 160, prop: "createTime", label: "添加时间", filter: timeFilter }, | |||
// { prop: "kilnCode", label: "窑炉" }, | |||
{ prop: "orderCode", label: "主订单号" }, | |||
{ width: 120, prop: "orderCate", label: "主订单子号" }, | |||
{ width: 160, prop: "orderCode", label: "主订单号" }, | |||
{ prop: "orderCate", label: "主订单子号" }, | |||
{ width: 160, prop: "code", label: "混料订单号" }, | |||
{ | |||
prop: "statusDictValue", | |||
@@ -18,9 +18,9 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 160, | |||
width: 120, | |||
subcomponent: TableOperaionComponent, | |||
options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }], | |||
options: [{ name: "copy", label: "复制", icon: "copy-document" }, { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }], | |||
}, | |||
]; | |||
@@ -133,10 +133,10 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 120, | |||
width: 80, | |||
subcomponent: TableOperaionComponent, | |||
options: [ | |||
{ name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" }, | |||
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" }, | |||
{ name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" }, | |||
], | |||
}, | |||
@@ -22,9 +22,9 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 160, | |||
width: 120, | |||
subcomponent: TableOperaionComponent, | |||
options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:bom:delete" }], | |||
options: [{ name: "copy", label: "复制", icon: "copy-document" }, { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:bom:delete" }], | |||
}, | |||
]; | |||
@@ -143,18 +143,18 @@ export default function () { | |||
{ type: "index", label: "序号" }, | |||
{ prop: "createTime", label: "添加时间", filter: timeFilter }, | |||
{ prop: "material", label: "物料", isEditField: true }, | |||
{ prop: "qty", label: "配方物料重量[kg]", filter: val => !!val ? val + ' kg' : '-', isEditField: true }, | |||
{ prop: "sumqty", label: "配方总重量[kg]", filter: val => !!val ? val + ' kg' : '-', isEditField: true }, | |||
{ prop: "percent", label: "配比[%]", filter: val => !!val ? val + ' %' : '-', isEditField: true }, | |||
{ width: 130, prop: "qty", label: "配方物料重量", filter: val => !!val ? val + ' kg' : '-', isEditField: true }, | |||
{ width: 130, prop: "sumqty", label: "配方总重量", filter: val => !!val ? val + ' kg' : '-', isEditField: true }, | |||
{ prop: "percent", label: "配比 [%]", filter: val => !!val ? val + ' %' : '-', isEditField: true }, | |||
{ prop: "remark", label: "备注", isEditField: true }, | |||
{ | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 120, | |||
width: 90, | |||
subcomponent: TableOperaionComponent, | |||
options: [ | |||
{ name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:bomMaterial:update" }, | |||
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:bomMaterial:update" }, | |||
{ name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:bomMaterial:delete" }, | |||
], | |||
}, | |||
@@ -19,7 +19,7 @@ export default function () { | |||
prop: 'operations', | |||
name: '操作', | |||
fixed: 'right', | |||
width: 120, | |||
width: 90, | |||
subcomponent: TableOperaionComponent, | |||
options: [{ name: "edit", label: "编辑", icon: "edit-outline"}, { name: 'delete', label: '删除', icon: 'delete', emitFull: true, permission: 'pms:equipment:delete' }] | |||
} | |||
@@ -102,10 +102,10 @@ export default function () { | |||
prop: 'operations', | |||
name: '操作', | |||
fixed: 'right', | |||
width: 120, | |||
width: 90, | |||
subcomponent: TableOperaionComponent, | |||
options: [ | |||
{ name: { name: "edit", label: "编辑", icon: "edit-outline"}, permission: 'pms:equipment:update' }, | |||
{ name: "edit", label: "编辑", icon: "edit-outline", permission: 'pms:equipment:update' }, | |||
{ name: 'delete', label: '删除', icon: 'delete', emitFull: true, permission: 'pms:equipment:delete' }, | |||
] | |||
} | |||
@@ -14,7 +14,7 @@ export default function () { | |||
prop: 'operations', | |||
name: '操作', | |||
fixed: 'right', | |||
width: 120, | |||
width: 80, | |||
subcomponent: TableOperaionComponent, | |||
// options: [{ name: "edit", label: "编辑", icon: "edit-outline"}, { name: 'delete', icon: 'delete', permission: 'pms:blenderStep:delete' }] | |||
options: ['view'] | |||
@@ -18,9 +18,9 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 160, | |||
width: 120, | |||
subcomponent: TableOperaionComponent, | |||
options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }], | |||
options: [ { name: "copy", label: "复制", icon: "copy-document" }, { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }], | |||
}, | |||
]; | |||
@@ -133,10 +133,10 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 120, | |||
width: 90, | |||
subcomponent: TableOperaionComponent, | |||
options: [ | |||
{ name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" }, | |||
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" }, | |||
{ name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" }, | |||
], | |||
}, | |||
@@ -8,8 +8,8 @@ export default function () { | |||
{ type: "index", label: "序号" }, | |||
{ width: 160, prop: "createTime", label: "添加时间", filter: timeFilter }, | |||
{ prop: "kilnCode", label: "窑炉" }, | |||
{ prop: "orderCode", label: "主订单号" }, | |||
{ prop: "orderCate", label: "主订单子号" }, | |||
{ width: 160, prop: "orderCode", label: "主订单号" }, | |||
{ width: 160, prop: "orderCate", label: "主订单子号" }, | |||
{ width: 160, prop: "code", label: "烧成订单号" }, | |||
{ prop: "statusDictValue", label: "订单状态", filter: (val) => (val !== null && val !== undefined ? ["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝"][val] : "-"), }, | |||
{ prop: "startTime", label: "开始时间" }, | |||
@@ -22,7 +22,7 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 180, | |||
width: 120, | |||
subcomponent: TableOperaionComponent, | |||
options: [{ name: "add-sub", permission: "pms:material:save" }, { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:material:save" },], | |||
}, | |||
@@ -173,10 +173,10 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 120, | |||
width: 90, | |||
subcomponent: TableOperaionComponent, | |||
options: [ | |||
{ name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:materialArrt:save" }, | |||
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:materialArrt:save" }, | |||
{ name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:materialArrt:save" }, | |||
], | |||
}, | |||
@@ -8,12 +8,12 @@ export default function () { | |||
{ type: "index", label: "序号" }, | |||
{ width: 160, prop: "createTime", label: "添加时间", filter: timeFilter }, | |||
// { prop: "kilnCode", label: "窑炉" }, | |||
{ prop: "orderCode", label: "主订单号" }, | |||
{ width: 120, prop: "orderCate", label: "主订单子号" }, | |||
{ width: 160, prop: "orderCode", label: "主订单号" }, | |||
{ width: 100, prop: "orderCate", label: "主订单子号" }, | |||
{ width: 160, prop: "code", label: "压制订单号" }, | |||
{ prop: "statusDictValue", label: "订单状态", filter: (val) => (val !== null && val !== undefined ? ["等待", "确认", "生产", "暂停", "结束", "接受", "拒绝"][val] : "-"), }, | |||
{ prop: "startTime", label: "开始时间" }, | |||
{ prop: "shapeCode", label: "砖型" }, | |||
{ width: 100, prop: "shapeCode", label: "砖型" }, | |||
{ prop: "pressCode", label: "压机" }, | |||
{ width: 120, prop: "qty", label: "要求生产数量" }, | |||
{ prop: "qtyComplete", label: "完成数量" }, | |||
@@ -28,9 +28,9 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 160, | |||
width: 80, | |||
subcomponent: TableOperaionComponent, | |||
options: [{ name: 'detach', label: '下发' }] // , url: '/pms/trans/pressDeli' }] | |||
options: [{ name: 'detach', label: '下发', icon: 'bottom-right' }] // , url: '/pms/trans/pressDeli' }] | |||
// options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }], | |||
}, | |||
]; | |||
@@ -74,7 +74,7 @@ export default async function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 120, | |||
width: 90, | |||
subcomponent: TableOperaionComponent, | |||
options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:productionLine:delete" }], | |||
}, | |||
@@ -14,7 +14,7 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 240, | |||
width: 120, | |||
subcomponent: TableOperaionComponent, | |||
options: [ | |||
{ name: "edit", label: "编辑", icon: "edit-outline" }, | |||
@@ -18,9 +18,9 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 160, | |||
width: 120, | |||
subcomponent: TableOperaionComponent, | |||
options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:shapeStep:delete" }], | |||
options: [ { name: "copy", label: "复制", icon: "copy-document" }, { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:shapeStep:delete" }], | |||
}, | |||
]; | |||
@@ -138,10 +138,10 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 120, | |||
width: 90, | |||
subcomponent: TableOperaionComponent, | |||
options: [ | |||
{ name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" }, | |||
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" }, | |||
{ name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" }, | |||
], | |||
}, | |||
@@ -18,9 +18,9 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 160, | |||
width: 120, | |||
subcomponent: TableOperaionComponent, | |||
options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:testingStep:delete" }], | |||
options: [ { name: "copy", label: "复制", icon: "copy-document" }, { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:testingStep:delete" }], | |||
}, | |||
]; | |||
@@ -139,10 +139,10 @@ export default function () { | |||
prop: "operations", | |||
name: "操作", | |||
fixed: "right", | |||
width: 120, | |||
width: 90, | |||
subcomponent: TableOperaionComponent, | |||
options: [ | |||
{ name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" }, | |||
{ name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" }, | |||
{ name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" }, | |||
], | |||
}, | |||