diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts index f12b0a5c4..1e8e44a8f 100644 --- a/src/api/mes/workstation/index.ts +++ b/src/api/mes/workstation/index.ts @@ -46,4 +46,4 @@ export const exportWorkstation = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/mes/workstation/get-import-template' }) -} +} \ No newline at end of file diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue index c72da2656..35f6f2dd1 100644 --- a/src/views/mes/workstation/index.vue +++ b/src/views/mes/workstation/index.vue @@ -65,7 +65,6 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -import {mainBindBtn} from "@/utils/disposition/defaultButtons"; defineOptions({ name: 'Workstation' }) @@ -136,7 +135,7 @@ const buttonBaseClick = (val, item) => { const butttondata = [ defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑 defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除 - defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 删除 + defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 绑定 ] // 列表-操作按钮事件 @@ -144,9 +143,9 @@ const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) - }else if (val == 'bind') { // 绑定 - detailRef.value.openDetail(row, row.name, "绑定", 'mesWorkstation') + await handleDelete(row.id) + }else if (val == 'bind') { // 删除 + await detailRef.value.openDetail(row, '绑定', row.name, 'mesWorkstation') } } diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts index b74f05a6d..611194817 100644 --- a/src/views/mes/workstation/workstation.data.ts +++ b/src/views/mes/workstation/workstation.data.ts @@ -1,12 +1,13 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' + // 表单校验 export const WorkstationRules = reactive({ - code: [required], - name: [required] + code: [required] }) export const Workstation = useCrudSchemas(reactive([ + { label: '代码', field: 'code',