mt-fe-group/pms-aomei
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update table

Browse Source
This commit is contained in:
lb 2023-03-17 11:32:29 +08:00
parent f25d7f306a
commit d412057a38
37 changed files with 109 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/BaseListTable.vue
View File

@ -44,12 +44,13 @@
:width="head.width || null" :width="head.width || null"
:min-width="head.minWidth || null" :min-width="head.minWidth || null"
:fixed="head.fixed || null" :fixed="head.fixed || null"
:show-overflow-tooltip="head.showOverflowTooltip || true"
:tooltip-effect="head.tooltipEffect || 'light'" :tooltip-effect="head.tooltipEffect || 'light'"
filter-placement="top" filter-placement="top"
:align="head.align || null" :align="head.align || null"
v-bind="head.more" v-bind="head.more"
> :show-overflow-tooltip="head.showOverflowTooltip || !head.prop === 'operations'"
>
<!-- :show-overflow-tooltip="head.showOverflowTooltip || true" -->
<!-- 子组件 --> <!-- 子组件 -->
<template v-if="head.prop" slot-scope="scope"> <template v-if="head.prop" slot-scope="scope">
<component <component

4
src/components/DialogWithMenu.vue
View File

@ -852,7 +852,9 @@ export default {
switch (type) { switch (type) {
case "delete": { case "delete": {
// 确认是否删除 // 确认是否删除
return this.$confirm(`是否删除条目: ${data.name ?? (data.material ? data.material : data.id)}`, "提示", { console.log('delete....', data)
const itemName = typeof data === 'object' ? (data.attrName || data.name || data.material || data.id) : data
return this.$confirm(`是否删除条目: ${itemName}`, "提示", {
confirmButtonText: "确认", confirmButtonText: "确认",
cancelButtonText: "我再想想", cancelButtonText: "我再想想",
type: "warning", type: "warning",

2
src/components/noTemplateComponents/detailComponent.js
View File

@ -26,6 +26,6 @@ export default {
}, },
render: function (h) { render: function (h) {
// console.log('button content:', this.injectData) // console.log('button content:', this.injectData)
return h('span', null, [h('el-button', { props: { type: 'text' }, style: { paddingLeft: 0 }, on: { click: this.emitClick } }, this.injectData.head?.buttonContent || this.defaultText)]) return h('span', null, [h('el-button', { props: { type: 'text' }, style: { padding: 0, margin: '5px 0' }, on: { click: this.emitClick } }, this.injectData.head?.buttonContent || this.defaultText)])
} }
} }

6
src/components/noTemplateComponents/operationComponent.css
View File

@ -10,7 +10,7 @@
content: ""; content: "";
width: 1px; width: 1px;
background: #ccc; background: #ccc;
right: -6px; right: -4px;
top: 15%; top: 10%;
height: 70%; height: 80%;
} }

4
src/components/noTemplateComponents/operationComponent.js
View File

@ -107,7 +107,7 @@ export default {
domProps: { domProps: {
title: opt.label ?? opt.name, title: opt.label ?? opt.name,
}, },
style: { color: !shouldDisabled && (opt.color || this.colors[opt.name] || "#0b58ff"), padding: '5px 0' }, style: { color: !shouldDisabled && (opt.color || this.colors[opt.name] || "#0b58ff"), padding: 0, margin: '5px 9px 5px 0' },
class: ['operate--btn'], class: ['operate--btn'],
on: { click: this.emit.bind(null, opt) }, on: { click: this.emit.bind(null, opt) },
}, },
@ -126,7 +126,7 @@ export default {
domProps: { domProps: {
title: opt.label ?? opt.name, title: opt.label ?? opt.name,
}, },
style: { color: this.colors[opt] || "#0b58ff", padding: 0 }, style: { color: this.colors[opt] || "#0b58ff", padding: 0, margin: '5px 9px 5px 0' },
class: ['operate--btn'], class: ['operate--btn'],
on: { click: this.emit.bind(null, opt) }, on: { click: this.emit.bind(null, opt) },
}, },

6
src/views/modules/pms/blenderBatch/config.js
View File

@ -29,11 +29,11 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: 'edit', enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } }, { name: { name: "edit", label: "编辑", icon: "edit-outline"}, enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } },
{ name: 'delete', enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } }, { name: 'delete', icon: 'delete', enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } },
] // 只有 injectRow.task 为手动时，才允许编辑 ] // 只有 injectRow.task 为手动时，才允许编辑
}, },
]; ];

2
src/views/modules/pms/blenderBatchDetails/config.js
View File

@ -17,7 +17,7 @@ export default function () {
// fixed: "right", // fixed: "right",
// width: 120, // width: 120,
// subcomponent: TableOperaionComponent, // subcomponent: TableOperaionComponent,
// options: [{ name: 'edit', enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } }] // 只有 injectRow.task 为手动时，才允许编辑 // options: [{ name: { name: "edit", label: "编辑", icon: "edit-outline"}, enable: injectRow => { return 'task' in injectRow && injectRow.task === 'Manual' } }] // 只有 injectRow.task 为手动时，才允许编辑
// }, // },
]; ];

10
src/views/modules/pms/blenderOrder/config.js
View File

@ -32,14 +32,14 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 180, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: "edit", label: "编辑", emitFull: true, icon: 'edit-outline' }, { name:"edit", label: "编辑", emitFull: true, icon: 'edit-outline' },
{ name: "view-batch", label: "查看批次", color: "#ff8000", toRouter: 'pms-blenderBatch', icon: 'document-copy' }, // 路由跳转至 pms-blenderBatch { name: "view-batch", label: "查看批次", color: "#ff8000", toRouter: 'pms-blenderBatch', icon: 'document-copy' }, // 路由跳转至 pms-blenderBatch
{ name: "detach", label: "下发", color: "#099", icon: 'bottom-right' }, { name: "detach", label: "下发", color: "#099", icon: 'bottom-right' },
], // , url: '/pms/trans/pressDeli' }] ], // , url: '/pms/trans/pressDeli' }]
// options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }], // options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
}, },
]; ];
@ -186,8 +186,8 @@ export default function () {
// width: 120, // width: 120,
// subcomponent: TableOperaionComponent, // subcomponent: TableOperaionComponent,
// options: [ // options: [
// { name: "edit", permission: "pms:blenderStepParam:update" }, // { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
// { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" }, // { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
// ], // ],
// }, // },
// ], // ],

6
src/views/modules/pms/blenderStep/config.js
View File

@ -20,7 +20,7 @@ export default function () {
fixed: "right", fixed: "right",
width: 160, width: 160,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }], options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
}, },
]; ];
@ -136,8 +136,8 @@ export default function () {
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: "edit", permission: "pms:blenderStepParam:update" }, { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
{ name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
], ],
}, },
], ],

6
src/views/modules/pms/bom/config.js
View File

@ -24,7 +24,7 @@ export default function () {
fixed: "right", fixed: "right",
width: 160, width: 160,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:bom:delete" }], options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:bom:delete" }],
}, },
]; ];
@ -154,8 +154,8 @@ export default function () {
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: "edit", permission: "pms:bomMaterial:update" }, { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:bomMaterial:update" },
{ name: "delete", emitFull: true, permission: "pms:bomMaterial:delete" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:bomMaterial:delete" },
], ],
}, },
], ],

4
src/views/modules/pms/brokeLog/config.js
View File

@ -23,9 +23,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:brokeLog:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:brokeLog:delete" }],
}, },
]; ];

4
src/views/modules/pms/car/config.js
View File

@ -20,9 +20,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:car:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:car:delete" }],
}, },
]; ];

4
src/views/modules/pms/customer/config.js
View File

@ -19,9 +19,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:customer:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:customer:delete" }],
}, },
]; ];

8
src/views/modules/pms/equipment/config.js
View File

@ -21,7 +21,7 @@ export default function () {
fixed: 'right', fixed: 'right',
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ['edit', { name: 'delete', emitFull: true, permission: 'pms:equipment:delete' }] options: [{ name: "edit", label: "编辑", icon: "edit-outline"}, { name: 'delete', label: '删除', icon: 'delete', emitFull: true, permission: 'pms:equipment:delete' }]
} }
] ]
@ -62,7 +62,7 @@ export default function () {
{ {
select: true, select: true,
label: '设备类型', label: '设备类型',
prop: 'equipmentTypeId', prop: 'equipmentTypeId',
rules: { required: true, message: '必填项不能为空', trigger: 'blur' }, rules: { required: true, message: '必填项不能为空', trigger: 'blur' },
options: [ options: [
// { label: '1', value: 1 }, // { label: '1', value: 1 },
@ -105,8 +105,8 @@ export default function () {
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: 'edit', permission: 'pms:equipment:update' }, { name: { name: "edit", label: "编辑", icon: "edit-outline"}, permission: 'pms:equipment:update' },
{ name: 'delete', permission: 'pms:equipment:delete' }, { name: 'delete', label: '删除', icon: 'delete', emitFull: true, permission: 'pms:equipment:delete' },
] ]
} }
], ],

4
src/views/modules/pms/equipmentType/config.js
View File

@ -16,9 +16,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:equipmentType:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:equipmentType:delete" }],
}, },
]; ];

2
src/views/modules/pms/factory/config.js
View File

@ -16,7 +16,7 @@ export default function () {
fixed: 'right', fixed: 'right',
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
// options: ['edit', { name: 'delete', permission: 'pms:blenderStep:delete' }] // options: [{ name: "edit", label: "编辑", icon: "edit-outline"}, { name: 'delete', icon: 'delete', permission: 'pms:blenderStep:delete' }]
options: ['view'] options: ['view']
} }
] ]

6
src/views/modules/pms/firingStep/config.js
View File

@ -20,7 +20,7 @@ export default function () {
fixed: "right", fixed: "right",
width: 160, width: 160,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }], options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
}, },
]; ];
@ -136,8 +136,8 @@ export default function () {
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: "edit", permission: "pms:blenderStepParam:update" }, { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
{ name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
], ],
}, },
], ],

6
src/views/modules/pms/kilnOrder/config.js
View File

@ -28,7 +28,7 @@ export default function () {
// fixed: "right", // fixed: "right",
// width: 160, // width: 160,
// subcomponent: TableOperaionComponent, // subcomponent: TableOperaionComponent,
// options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }], // options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
// }, // },
]; ];
@ -153,8 +153,8 @@ export default function () {
// width: 120, // width: 120,
// subcomponent: TableOperaionComponent, // subcomponent: TableOperaionComponent,
// options: [ // options: [
// { name: "edit", permission: "pms:blenderStepParam:update" }, // { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
// { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" }, // { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
// ], // ],
// }, // },
// ], // ],

1
src/views/modules/pms/material/components/BaseListTable.vue
View File

@ -12,6 +12,7 @@
row-key="id" row-key="id"
:lazy="true" :lazy="true"
:load="loadSubClassFn" :load="loadSubClassFn"
border
> >
<!-- @cell-mouse-enter="(row, col, cell, event) => $emit('cell-mouse-enter', row, col, cell, event)"> --> <!-- @cell-mouse-enter="(row, col, cell, event) => $emit('cell-mouse-enter', row, col, cell, event)"> -->
<!-- @cell-mouse-leave="(row, col, cell, event) => $emit('cell-mouse-leave', row, col, cell, event)"> --> <!-- @cell-mouse-leave="(row, col, cell, event) => $emit('cell-mouse-leave', row, col, cell, event)"> -->

6
src/views/modules/pms/material/config.js
View File

@ -24,7 +24,7 @@ export default function () {
fixed: "right", fixed: "right",
width: 180, width: 180,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [{ name: "add-sub", permission: "pms:material:save" }, "edit", { name: "delete", emitFull: true, permission: "pms:material:save" },], 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" },],
}, },
]; ];
@ -176,8 +176,8 @@ export default function () {
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: "edit", permission: "pms:materialArrt:save" }, { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:materialArrt:save" },
{ name: "delete", emitFull: true, permission: "pms:materialArrt:save" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:materialArrt:save" },
], ],
}, },
], ],

4
src/views/modules/pms/materialStorage/config.js
View File

@ -18,9 +18,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:materialStorage:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:materialStorage:delete" }],
}, },
]; ];

4
src/views/modules/pms/materialType/config.js
View File

@ -15,9 +15,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:materialType:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:materialType:delete" }],
}, },
]; ];

4
src/views/modules/pms/materialUpload/config.js
View File

@ -24,9 +24,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:materialUpload:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:materialUpload:delete" }],
}, },
]; ];

34
src/views/modules/pms/order/config.js
View File

@ -1,6 +1,6 @@
import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent"; import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent";
import TableTextComponent from "@/components/noTemplateComponents/detailComponent"; import TableTextComponent from "@/components/noTemplateComponents/detailComponent";
import StatusComponent from "@/components/noTemplateComponents/statusComponent"; // import StatusComponent from "@/components/noTemplateComponents/statusComponent";
import { timeFilter, dictFilter } from "@/utils/filters"; import { timeFilter, dictFilter } from "@/utils/filters";
function changeOrderSort(orderId, location) { function changeOrderSort(orderId, location) {
@ -24,23 +24,23 @@ export default function () {
const operations = { const operations = {
ongoing: [ ongoing: [
// { name: 'confirm-order', label: '确认', icon: 'success', showText: true }, // { name: 'confirm-order', label: '确认', icon: 'success', showText: true },
{ name: 'view', label: '查看详情' }, { name: 'view', label: '查看详情', icon: 'view' },
{ name: "end-order", label: "结束", icon: "error", showText: true }, { name: "end-order", label: "结束", icon: "finished" },
{ name: "move-up", label: "上移", icon: "caret-top", showText: true }, { name: "move-up", label: "上移", icon: "arrow-up" },
{ name: "move-down", label: "下移", icon: "caret-bottom", showText: true }, { name: "move-down", label: "下移", icon: "arrow-down" },
{ name: "move-to-top", label: "至顶", icon: "upload2", showText: true }, { name: "move-to-top", label: "至顶", icon: "upload2" },
{ name: "move-to-bottom", label: "至底", icon: "download", showText: true }, { name: "move-to-bottom", label: "至底", icon: "download" },
{ name: "destroy-order", label: "废除", icon: "delete-solid", showText: true }, { name: "destroy-order", label: "废除", icon: "close" },
], ],
pending: [ pending: [
"edit", { name: "edit", label: "编辑", icon: "edit-outline" },
{ name: 'view', label: '查看详情' }, { name: 'view', label: '查看详情', icon: 'view' },
{ name: "confirm-order", label: "确认订单", icon: "success", showText: true }, { name: "confirm-order", label: "确认订单", icon: "success" },
{ name: "move-up", label: "上移", icon: "caret-top", showText: true }, { name: "move-up", label: "上移", icon: "arrow-up" },
{ name: "move-down", label: "下移", icon: "caret-bottom", showText: true }, { name: "move-down", label: "下移", icon: "arrow-down" },
{ name: "move-to-top", label: "至顶", icon: "upload2", showText: true }, { name: "move-to-top", label: "至顶", icon: "upload2" }, // , showText: true },
{ name: "move-to-bottom", label: "至底", icon: "download", showText: true }, { name: "move-to-bottom", label: "至底", icon: "download" }, // , showText: true },
{ name: "delete", emitFull: true, permission: "" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "" },
], ],
finished: [ finished: [
{ name: 'view', label: '查看详情' }, { name: 'view', label: '查看详情' },
@ -86,7 +86,7 @@ export default function () {
fixed: "right", fixed: "right",
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: operations[type], options: operations[type],
width: operations[type].length * 64, width: operations[type].length * 32,
} }
// type !== "finished" // type !== "finished"

6
src/views/modules/pms/packingStep/config.js
View File

@ -20,7 +20,7 @@ export default function () {
fixed: "right", fixed: "right",
width: 160, width: 160,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:packingStep:delete" }], options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:packingStep:delete" }],
}, },
]; ];
@ -142,8 +142,8 @@ export default function () {
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: "edit", permission: "pms:blenderStepParam:update" }, { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
{ name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
], ],
}, },
], ],

6
src/views/modules/pms/pressOrder/config.js
View File

@ -31,7 +31,7 @@ export default function () {
width: 160, width: 160,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [{ name: 'detach', label: '下发' }] // , url: '/pms/trans/pressDeli' }] options: [{ name: 'detach', label: '下发' }] // , url: '/pms/trans/pressDeli' }]
// options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }], // options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
}, },
]; ];
@ -156,8 +156,8 @@ export default function () {
// width: 120, // width: 120,
// subcomponent: TableOperaionComponent, // subcomponent: TableOperaionComponent,
// options: [ // options: [
// { name: "edit", permission: "pms:blenderStepParam:update" }, // { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
// { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" }, // { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
// ], // ],
// }, // },
// ], // ],

8
src/views/modules/pms/product/config.js
View File

@ -20,9 +20,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:product:delete" }], options: [ {name: { name: "edit", label: "编辑", icon: "edit-outline" }, label: '编辑', icon: 'edit-outline' }, { name: "delete", icon: "delete", label: "删除", emitFull: true, icon: 'delete', label: '删除', emitFull: true, permission: "pms:product:delete" }],
}, },
]; ];
@ -137,8 +137,8 @@ export default function () {
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: "edit", permission: "pms:productArrt:update" }, { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:productArrt:update" },
{ name: "delete", emitFull: true, permission: "pms:productArrt:delete" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:productArrt:delete" },
], ],
}, },
], ],

4
src/views/modules/pms/productionLine/config.js
View File

@ -19,9 +19,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:productionLine:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:productionLine:delete" }],
}, },
]; ];

6
src/views/modules/pms/qualityPackOrder/config.js
View File

@ -37,7 +37,7 @@ export default function () {
// fixed: "right", // fixed: "right",
// width: 160, // width: 160,
// subcomponent: TableOperaionComponent, // subcomponent: TableOperaionComponent,
// options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:blenderStep:delete" }], // options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStep:delete" }],
// }, // },
]; ];
@ -162,8 +162,8 @@ export default function () {
// width: 120, // width: 120,
// subcomponent: TableOperaionComponent, // subcomponent: TableOperaionComponent,
// options: [ // options: [
// { name: "edit", permission: "pms:blenderStepParam:update" }, // { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
// { name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" }, // { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
// ], // ],
// }, // },
// ], // ],

2
src/views/modules/pms/reportSheet/config copy.js
View File

@ -76,7 +76,7 @@ export default async function () {
fixed: "right", fixed: "right",
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:productionLine:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:productionLine:delete" }],
}, },
]; ];

12
src/views/modules/pms/reportSheet/config.js
View File

@ -35,7 +35,7 @@ const CategoryList = {
// console.log('【报表分类】', item.value) // console.log('【报表分类】', item.value)
childOptions.push(h("el-option", { props: { label: item.label, value: item.value } }, null)); childOptions.push(h("el-option", { props: { label: item.label, value: item.value } }, null));
}); });
return h("el-select", { props: { size: 'small', value: this.pickedId }, on: { change: this.handleChange } }, childOptions); return h("el-select", { props: { size: 'mini', value: this.pickedId }, on: { change: this.handleChange } }, childOptions);
}, },
}; };
@ -56,13 +56,13 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 240, width: 160,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: "preview", label: '预览', emitFull: true, permission: "pms:reportSheet:preview" }, { name: "preview", label: '预览', icon: 'view', emitFull: true, permission: "pms:reportSheet:preview" },
{ name: "design", label: '设计', emitFull: true, permission: "pms:reportSheet:design" }, { name: "design", label: '设计', icon: 'edit', emitFull: true, permission: "pms:reportSheet:design" },
{ name: "edit", label: '编辑' }, { name: "edit", label: "编辑", icon: "edit-outline", label: '编辑' },
{ name: "delete", label: '删除', icon: 'delete', emitFull: true, permission: "pms:reportSheet:delete" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:reportSheet:delete" },
], ],
}, },
]; ];

4
src/views/modules/pms/reportSheetCategory/config.js
View File

@ -17,8 +17,8 @@ export default function () {
width: 240, width: 240,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
"edit", { name: "edit", label: "编辑", icon: "edit-outline" },
{ name: "delete", emitFull: true, permission: "pms:reportSheetCategory:delete" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:reportSheetCategory:delete" },
], ],
}, },
]; ];

4
src/views/modules/pms/shape/config.js
View File

@ -17,9 +17,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:shape:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:shape:delete" }],
}, },
]; ];

6
src/views/modules/pms/shapeStep/config.js
View File

@ -20,7 +20,7 @@ export default function () {
fixed: "right", fixed: "right",
width: 160, width: 160,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:shapeStep:delete" }], options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:shapeStep:delete" }],
}, },
]; ];
@ -141,8 +141,8 @@ export default function () {
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: "edit", permission: "pms:blenderStepParam:update" }, { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
{ name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
], ],
}, },
], ],

4
src/views/modules/pms/supplier/config.js
View File

@ -20,9 +20,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:supplier:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:supplier:delete" }],
}, },
]; ];

6
src/views/modules/pms/testingStep/config.js
View File

@ -20,7 +20,7 @@ export default function () {
fixed: "right", fixed: "right",
width: 160, width: 160,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["copy", "edit", { name: "delete", emitFull: true, permission: "pms:testingStep:delete" }], options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:testingStep:delete" }],
}, },
]; ];
@ -142,8 +142,8 @@ export default function () {
width: 120, width: 120,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: [ options: [
{ name: "edit", permission: "pms:blenderStepParam:update" }, { name: { name: "edit", label: "编辑", icon: "edit-outline" }, permission: "pms:blenderStepParam:update" },
{ name: "delete", emitFull: true, permission: "pms:blenderStepParam:delete" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" },
], ],
}, },
], ],

4
src/views/modules/pms/workSequence/config.js
View File

@ -14,9 +14,9 @@ export default function () {
prop: "operations", prop: "operations",
name: "操作", name: "操作",
fixed: "right", fixed: "right",
width: 120, width: 90,
subcomponent: TableOperaionComponent, subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", emitFull: true, permission: "pms:workSequence:delete" }], options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:workSequence:delete" }],
}, },
]; ];