diff --git a/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts b/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts index 61623d5..22390ad 100644 --- a/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts +++ b/src/views/eam/device/deviceAccounts/deviceAccounts.data.ts @@ -2,7 +2,9 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import { selectAllFactoryArea } from '@/api/system/dept' import { validateHanset,validateNumDot, validateEmail } from '@/utils/validator' +import * as SupplierApi from '@/api/eam/basic/supplier' const factoryList = await selectAllFactoryArea() +const supplierList = await SupplierApi.getSupplierNoPage() // 表单校验 export const DeviceAccountsRules = reactive({ name: [ @@ -202,12 +204,23 @@ export const DeviceAccounts = useCrudSchemas(reactive([ }, }, { - label: '供应商编号', + label: '供应商', field: 'supplierNumber', sort: 'custom', table: { width: '150', }, + form:{ + component: 'Select', + componentProps: { + options: supplierList, + optionsAlias: { + labelField: 'name', + valueField: 'number' + }, + placeholder: "请选择供应商" + } + } }, { label: '出厂日期', diff --git a/src/views/eam/mold/moldmaintainjob/index.vue b/src/views/eam/mold/moldmaintainjob/index.vue index 4fc0084..a223a85 100644 --- a/src/views/eam/mold/moldmaintainjob/index.vue +++ b/src/views/eam/mold/moldmaintainjob/index.vue @@ -226,7 +226,7 @@ const butttondata = (row) => { defaultButtons.acceptOrderBtn({ hide: !( - row.status == 'PENDING' && row.status == 1 + row.status == 'PENDING' ) }), // 接单 // defaultButtons.turnOrderBtn({