feat(mes): 新增设备和点检保养项目精简列表接口及批次号字段
parent
8d7b7cf473
commit
11b0b290eb
|
|
@ -44,6 +44,11 @@ export const DvMachineryApi = {
|
||||||
return await request.delete({ url: `/mes/dv/machinery/delete?id=` + id })
|
return await request.delete({ url: `/mes/dv/machinery/delete?id=` + id })
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// 获得设备精简列表(下拉选项用)
|
||||||
|
getSimpleList: async () => {
|
||||||
|
return await request.get({ url: `/mes/dv/machinery/simple-list` })
|
||||||
|
},
|
||||||
|
|
||||||
// 导出设备台账 Excel
|
// 导出设备台账 Excel
|
||||||
exportMachinery: async (params: any) => {
|
exportMachinery: async (params: any) => {
|
||||||
return await request.download({ url: `/mes/dv/machinery/export-excel`, params })
|
return await request.download({ url: `/mes/dv/machinery/export-excel`, params })
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,11 @@ export const DvSubjectApi = {
|
||||||
return await request.delete({ url: `/mes/dv/subject/delete?id=` + id })
|
return await request.delete({ url: `/mes/dv/subject/delete?id=` + id })
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// 获得点检保养项目精简列表(下拉选项用)
|
||||||
|
getSimpleList: async () => {
|
||||||
|
return await request.get({ url: `/mes/dv/subject/simple-list` })
|
||||||
|
},
|
||||||
|
|
||||||
// 导出点检保养项目 Excel
|
// 导出点检保养项目 Excel
|
||||||
exportSubject: async (params: any) => {
|
exportSubject: async (params: any) => {
|
||||||
return await request.download({ url: `/mes/dv/subject/export-excel`, params })
|
return await request.download({ url: `/mes/dv/subject/export-excel`, params })
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,8 @@ export interface ProWorkOrderVO {
|
||||||
clientName: string // 客户名称
|
clientName: string // 客户名称
|
||||||
vendorId: number // 供应商编号
|
vendorId: number // 供应商编号
|
||||||
vendorName: string // 供应商名称
|
vendorName: string // 供应商名称
|
||||||
|
vendorCode: string // 供应商编码
|
||||||
|
batchCode: string // 批次号
|
||||||
requestDate: Date // 需求日期
|
requestDate: Date // 需求日期
|
||||||
parentId: number // 父工单编号
|
parentId: number // 父工单编号
|
||||||
parentCode: string // 父工单编码
|
parentCode: string // 父工单编码
|
||||||
|
|
|
||||||
|
|
@ -110,6 +110,15 @@
|
||||||
<MdVendorSelect v-model="formData.vendorId" :disabled="isDetail" />
|
<MdVendorSelect v-model="formData.vendorId" :disabled="isDetail" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="批次号" prop="batchCode">
|
||||||
|
<el-input
|
||||||
|
v-model="formData.batchCode"
|
||||||
|
placeholder="请输入批次号"
|
||||||
|
:disabled="isDetail"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="需求日期" prop="requestDate">
|
<el-form-item label="需求日期" prop="requestDate">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
|
|
@ -198,6 +207,7 @@ const formData = ref({
|
||||||
quantity: undefined,
|
quantity: undefined,
|
||||||
clientId: undefined,
|
clientId: undefined,
|
||||||
vendorId: undefined,
|
vendorId: undefined,
|
||||||
|
batchCode: undefined,
|
||||||
requestDate: undefined,
|
requestDate: undefined,
|
||||||
status: undefined,
|
status: undefined,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
|
|
@ -336,6 +346,7 @@ const resetForm = () => {
|
||||||
quantity: undefined,
|
quantity: undefined,
|
||||||
clientId: undefined,
|
clientId: undefined,
|
||||||
vendorId: undefined,
|
vendorId: undefined,
|
||||||
|
batchCode: undefined,
|
||||||
requestDate: undefined,
|
requestDate: undefined,
|
||||||
status: undefined,
|
status: undefined,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
|
|
|
||||||
|
|
@ -63,6 +63,15 @@
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="批次号" prop="batchCode">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.batchCode"
|
||||||
|
placeholder="请输入批次号"
|
||||||
|
clearable
|
||||||
|
@keyup.enter="handleQuery"
|
||||||
|
class="!w-240px"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="工单状态" prop="status">
|
<el-form-item label="工单状态" prop="status">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="queryParams.status"
|
v-model="queryParams.status"
|
||||||
|
|
@ -148,6 +157,8 @@
|
||||||
<el-table-column label="已生产数量" align="center" prop="quantityProduced" width="100" />
|
<el-table-column label="已生产数量" align="center" prop="quantityProduced" width="100" />
|
||||||
<el-table-column label="客户编码" align="center" prop="clientCode" width="120" />
|
<el-table-column label="客户编码" align="center" prop="clientCode" width="120" />
|
||||||
<el-table-column label="客户名称" align="center" prop="clientName" width="120" />
|
<el-table-column label="客户名称" align="center" prop="clientName" width="120" />
|
||||||
|
<el-table-column label="供应商编码" align="center" prop="vendorCode" width="120" />
|
||||||
|
<el-table-column label="批次号" align="center" prop="batchCode" width="120" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="需求日期"
|
label="需求日期"
|
||||||
align="center"
|
align="center"
|
||||||
|
|
@ -282,6 +293,7 @@ const queryParams = reactive({
|
||||||
clientId: undefined,
|
clientId: undefined,
|
||||||
type: undefined,
|
type: undefined,
|
||||||
orderSourceType: undefined,
|
orderSourceType: undefined,
|
||||||
|
batchCode: undefined,
|
||||||
status: undefined,
|
status: undefined,
|
||||||
requestDate: undefined
|
requestDate: undefined
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,12 @@ export const MesProTaskStatusEnum = {
|
||||||
CANCELED: 4 // 已取消
|
CANCELED: 4 // 已取消
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** MES 点检保养方案状态枚举 */
|
||||||
|
export const MesDvCheckPlanStatusEnum = {
|
||||||
|
PREPARE: 0, // 草稿
|
||||||
|
ENABLED: 1 // 已启用
|
||||||
|
}
|
||||||
|
|
||||||
/** 获取物料/产品标识的标签 */
|
/** 获取物料/产品标识的标签 */
|
||||||
export const getItemOrProductLabel = (value: string): string => {
|
export const getItemOrProductLabel = (value: string): string => {
|
||||||
for (const item of Object.values(MesItemOrProductEnum)) {
|
for (const item of Object.values(MesItemOrProductEnum)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue