From 00acee7453ac2a23175d4c842082263f3b6330e5 Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 17 Mar 2023 13:50:11 +0800 Subject: [PATCH] update configs --- src/components/BaseListTable.vue | 2 +- src/views/modules/pms/blenderOrder/config.js | 4 ++-- src/views/modules/pms/blenderStep/config.js | 8 ++++---- src/views/modules/pms/bom/config.js | 14 +++++++------- src/views/modules/pms/equipment/config.js | 6 +++--- src/views/modules/pms/factory/config.js | 2 +- src/views/modules/pms/firingStep/config.js | 8 ++++---- src/views/modules/pms/kilnOrder/config.js | 4 ++-- src/views/modules/pms/material/config.js | 6 +++--- src/views/modules/pms/pressOrder/config.js | 10 +++++----- src/views/modules/pms/reportSheet/config copy.js | 2 +- .../modules/pms/reportSheetCategory/config.js | 2 +- src/views/modules/pms/shapeStep/config.js | 8 ++++---- src/views/modules/pms/testingStep/config.js | 8 ++++---- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/components/BaseListTable.vue b/src/components/BaseListTable.vue index 1fd8b11..b770257 100644 --- a/src/components/BaseListTable.vue +++ b/src/components/BaseListTable.vue @@ -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')" > diff --git a/src/views/modules/pms/blenderOrder/config.js b/src/views/modules/pms/blenderOrder/config.js index cb6da18..90f40ea 100644 --- a/src/views/modules/pms/blenderOrder/config.js +++ b/src/views/modules/pms/blenderOrder/config.js @@ -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", diff --git a/src/views/modules/pms/blenderStep/config.js b/src/views/modules/pms/blenderStep/config.js index 777278c..f7f86a7 100644 --- a/src/views/modules/pms/blenderStep/config.js +++ b/src/views/modules/pms/blenderStep/config.js @@ -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" }, ], }, diff --git a/src/views/modules/pms/bom/config.js b/src/views/modules/pms/bom/config.js index 89a784c..da91708 100644 --- a/src/views/modules/pms/bom/config.js +++ b/src/views/modules/pms/bom/config.js @@ -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" }, ], }, diff --git a/src/views/modules/pms/equipment/config.js b/src/views/modules/pms/equipment/config.js index e971d01..0795454 100644 --- a/src/views/modules/pms/equipment/config.js +++ b/src/views/modules/pms/equipment/config.js @@ -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' }, ] } diff --git a/src/views/modules/pms/factory/config.js b/src/views/modules/pms/factory/config.js index 1823369..2a2feae 100644 --- a/src/views/modules/pms/factory/config.js +++ b/src/views/modules/pms/factory/config.js @@ -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'] diff --git a/src/views/modules/pms/firingStep/config.js b/src/views/modules/pms/firingStep/config.js index c512320..ba4c7bb 100644 --- a/src/views/modules/pms/firingStep/config.js +++ b/src/views/modules/pms/firingStep/config.js @@ -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" }, ], }, diff --git a/src/views/modules/pms/kilnOrder/config.js b/src/views/modules/pms/kilnOrder/config.js index 4f6a958..b86853b 100644 --- a/src/views/modules/pms/kilnOrder/config.js +++ b/src/views/modules/pms/kilnOrder/config.js @@ -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: "开始时间" }, diff --git a/src/views/modules/pms/material/config.js b/src/views/modules/pms/material/config.js index e2b2617..62779db 100644 --- a/src/views/modules/pms/material/config.js +++ b/src/views/modules/pms/material/config.js @@ -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" }, ], }, diff --git a/src/views/modules/pms/pressOrder/config.js b/src/views/modules/pms/pressOrder/config.js index bfdec69..3056962 100644 --- a/src/views/modules/pms/pressOrder/config.js +++ b/src/views/modules/pms/pressOrder/config.js @@ -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" }], }, ]; diff --git a/src/views/modules/pms/reportSheet/config copy.js b/src/views/modules/pms/reportSheet/config copy.js index 3a37265..67385c6 100644 --- a/src/views/modules/pms/reportSheet/config copy.js +++ b/src/views/modules/pms/reportSheet/config copy.js @@ -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" }], }, diff --git a/src/views/modules/pms/reportSheetCategory/config.js b/src/views/modules/pms/reportSheetCategory/config.js index 9ddbe40..9e35de0 100644 --- a/src/views/modules/pms/reportSheetCategory/config.js +++ b/src/views/modules/pms/reportSheetCategory/config.js @@ -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" }, diff --git a/src/views/modules/pms/shapeStep/config.js b/src/views/modules/pms/shapeStep/config.js index 5254489..ac75618 100644 --- a/src/views/modules/pms/shapeStep/config.js +++ b/src/views/modules/pms/shapeStep/config.js @@ -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" }, ], }, diff --git a/src/views/modules/pms/testingStep/config.js b/src/views/modules/pms/testingStep/config.js index 1452567..800cde6 100644 --- a/src/views/modules/pms/testingStep/config.js +++ b/src/views/modules/pms/testingStep/config.js @@ -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" }, ], },