From 508346f0b01b0bbf89129a2610ff7af347aaf87b Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 15 Dec 2023 17:15:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8A=A5=E5=BA=9F=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/bomDismantle/index.ts | 5 + src/api/wms/productscrapRequestMain/index.ts | 32 +- .../productrepairRequestMain.data.ts | 7 +- .../productscrapRecordMain.data.ts | 120 +++- .../productscrapRequestMain/index.vue | 222 ++++++- .../productscrapRequestMain.data.ts | 596 ++++++++++++++++-- 6 files changed, 894 insertions(+), 88 deletions(-) diff --git a/src/api/wms/bomDismantle/index.ts b/src/api/wms/bomDismantle/index.ts index d014b113f..fcfd1302a 100644 --- a/src/api/wms/bomDismantle/index.ts +++ b/src/api/wms/bomDismantle/index.ts @@ -9,3 +9,8 @@ export const getBomDismantlePage = async (params) => { export const getBomDismantleRecordPage = async (params) => { return await request.get({ url: `/wms/productrepair-record-main/bomPage`, params }) } + +// 查询制品报废申请子列表 +export const getProductscrapBomDismantlePage = async (params) => { + return await request.get({ url: `/wms/productscrap-request-main/bomPage`, params }) +} diff --git a/src/api/wms/productscrapRequestMain/index.ts b/src/api/wms/productscrapRequestMain/index.ts index cdf2c22ce..5aff8ed73 100644 --- a/src/api/wms/productscrapRequestMain/index.ts +++ b/src/api/wms/productscrapRequestMain/index.ts @@ -60,4 +60,34 @@ export const exportProductscrapRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productscrap-request-main/get-import-template' }) -} \ No newline at end of file +} + +// 关闭-制品报废申请 +export const closeProductscrapRequestMain = async (id) => { + return await request.put({ url: `/wms/productscrap-request-main/close?id=` + id }) +} + +// 重新添加-制品报废申请 +export const reAddProductscrapRequestMain = async (id) => { + return await request.put({ url: `/wms/productscrap-request-main/reAdd?id=` + id }) +} + +// 提交审批-制品报废申请 +export const submitProductscrapRequestMain = async (id) => { + return await request.put({ url: `/wms/productscrap-request-main/submit?id=` + id }) +} + +// 审批驳回-制品报废申请 +export const refusedProductscrapRequestMain = async (id) => { + return await request.put({ url: `/wms/productscrap-request-main/refused?id=` + id }) +} + +// 审批通过-制品报废申请 +export const agreeProductscrapRequestMain = async (id) => { + return await request.put({ url: `/wms/productscrap-request-main/agree?id=` + id }) +} + +// 处理-制品报废申请 +export const handleProductscrapRequestMain = async (id) => { + return await request.put({ url: `/wms/productscrap-request-main/handle?id=` + id }) +} diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index b24f260ed..9b212e0dd 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -452,13 +452,14 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive field: 'fromOwnerCode', sort: 'custom', table: { - width: 150 + width: 150, + show: false }, isTableForm: false, isForm: false, }, { - label: '生产线代码', + label: '返修生产线代码', field: 'productionLineCode', sort: 'custom', table: { @@ -503,7 +504,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive } }, { - label: '工位代码', + label: '返修工位代码', field: 'workStationCode', sort: 'custom', table: { diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index d23b871e2..3896e6f00 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -1,5 +1,25 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' +import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data"; +import * as WorkshopApi from "@/api/wms/workshop"; +import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data"; +import * as TeamApi from "@/api/wms/team"; +import {Shift} from "@/views/wms/basicDataManage/orderManage/shift/shift.data"; +import * as ShiftApi from "@/api/wms/shift"; +import { + Productionline +} from "@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data"; +import * as ProductionlineApi from "@/api/wms/productionline"; +import { + Workstation +} from "@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data"; +import * as WorkstationApi from "@/api/wms/workstation"; +import {Process} from "@/views/wms/basicDataManage/factoryModeling/process/process.data"; +import * as ProcessApi from "@/api/wms/process"; +import { + Productionlineitem +} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data"; +import * as ProductionlineitemApi from "@/api/wms/productionlineitem"; /** * @returns {Array} 制品报废记录主表 @@ -19,7 +39,8 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ field: 'jobNumber', sort: 'custom', table: { - width: 150 + width: 150, + show:false }, isSearch: true }, @@ -39,6 +60,30 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '车间代码', + field: 'workshopCode', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '班组', + field: 'team', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '班次', + field: 'shift', + sort: 'custom', + table: { + width: 150 + } + }, { label: '执行时间', field: 'executeTime', @@ -205,7 +250,8 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ field: 'fromWarehouseCode', sort: 'custom', table: { - width: 150 + width: 150, + show: false }, }, { @@ -307,7 +353,8 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ field: 'fromOwnerCode', sort: 'custom', table: { - width: 150 + width: 150, + show: false }, }, { @@ -315,7 +362,8 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ field: 'packingNumber', sort: 'custom', table: { - width: 150 + width: 150, + show: false }, }, { @@ -323,7 +371,8 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ field: 'containerNumber', sort: 'custom', table: { - width: 150 + width: 150, + show: false }, }, { @@ -331,9 +380,42 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ field: 'batch', sort: 'custom', table: { - width: 150 + width: 150, + show: false }, }, + { + label: '来源生产线代码', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '来源工位代码', + field: 'workStationCode', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '工序代码', + field: 'processCode', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + } + }, { label: '从库位代码', field: 'fromLocationCode', @@ -410,14 +492,6 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '备注', field: 'remark', @@ -535,6 +609,22 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 150, + fixed: 'right' + }, + isTableForm: true, + tableForm: { + type: 'action', + buttonText: 'Bom', + buttonName: 'Bom' + } + }, ])) //表单校验 @@ -569,4 +659,4 @@ export const ProductscrapRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index da5b0e042..451f0fe9e 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -54,6 +54,7 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" + @buttonOperationClick="buttonOperationClick" /> @@ -69,8 +70,31 @@ :apiDelete="ProductscrapRequestDetailApi.deleteProductscrapRequestDetail" :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" + :buttondataTable="buttondataTable" + @tableFormButton="tableFormButton" /> + + + + + + @@ -78,10 +102,12 @@