diff --git a/src/api/iot/device/index.ts b/src/api/iot/device/index.ts index 683b986e..2a411261 100644 --- a/src/api/iot/device/index.ts +++ b/src/api/iot/device/index.ts @@ -3,11 +3,14 @@ import qs from 'qs' // 物联设备 VO export interface DeviceVO { - id: number // ID + id: string | number // ID deviceCode: string // 设备编号 deviceName: string // 设备名称 boundLedgerName?: string // 已绑定的设备台账名称 deviceType: string // 设备类型 + ledgerBound?: boolean + selectable?: boolean + boundLedgerId?: string | number | null status: string // 状态 isConnect?: string | number operatingStatus?: string | number @@ -91,7 +94,7 @@ export const DeviceApi = { return await request.get({ url: `/iot/device/deviceList`, params }) }, // 查询物联设备详情 - getDevice: async (id: number) => { + getDevice: async (id: string | number) => { return await request.get({ url: `/iot/device/get?id=` + id }) }, getDeviceListByNoUsed: async () => { diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 1b96d3be..be44a029 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -700,6 +700,11 @@ export default { exportName: '产品库存.xls' }, In: { + all: '全部', + waitIn: '待入库', + rejected: '已驳回', + auditing: '审核中', + inStock: '已入库', no: '入库单号', product: '产品', inTime: '入库时间', @@ -762,6 +767,11 @@ export default { addItem: '添加入库产品' }, Out: { + all: '全部', + waitOut: '待出库', + rejected: '已驳回', + auditing: '审核中', + outStock: '已出库', no: '出库单号', customer: '客户', product: '产品', @@ -907,6 +917,13 @@ export default { stockCountExceededWarning: '数量不能超出可用库存,已自动调整为可用库存数量' }, Check: { + all: '全部', + waitSubmit: '待提交', + rejected: '已驳回', + auditing: '审核中', + approved: '审核通过', + checked: '已盘点', + unchecked: '未盘点', no: '盘点单号', product: '产品', checkTime: '盘点时间', @@ -1045,6 +1062,11 @@ export default { exportName: '产品库存明细.xls' }, Move: { + all: '全部', + waitSubmit: '待提交', + rejected: '已驳回', + auditing: '审核中', + approved: '审核通过', no: '调拨单号', product: '产品', moveTime: '调度时间', @@ -1117,6 +1139,10 @@ export default { validatorStatusRequired: '状态不能为空' }, Pallet: { + all: '全部', + idle: '空闲', + occupied: '占用', + scrapped: '报废', code: '托盘编码', palletType: '托盘类型', specification: '规格', diff --git a/src/views/erp/stock/checkExecution/index.vue b/src/views/erp/stock/checkExecution/index.vue index 081bb9e1..ab4c50f9 100644 --- a/src/views/erp/stock/checkExecution/index.vue +++ b/src/views/erp/stock/checkExecution/index.vue @@ -1,5 +1,13 @@