From 1dbdcddb44d4695b39bcd5d1c7cff225be73dfde Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 27 Dec 2023 16:36:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=B6=E5=93=81=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E4=B8=8E=E6=8A=A5=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/containerMain/index.ts | 12 ++++- .../containerRepairRecordMain.data.ts | 4 +- .../containerinitadd/containerMain.data.ts | 10 ++++ .../containerinit/containerinitadd/index.vue | 46 ++++++++++++++++++- 4 files changed, 68 insertions(+), 4 deletions(-) diff --git a/src/api/wms/containerMain/index.ts b/src/api/wms/containerMain/index.ts index e5c24f9e7..7e10ebf1b 100644 --- a/src/api/wms/containerMain/index.ts +++ b/src/api/wms/containerMain/index.ts @@ -48,4 +48,14 @@ export const exportContainerMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/container-main/get-import-template' }) -} \ No newline at end of file +} + +// 器具维修 +export const repairSubmitContainerRequestMain = async (id) => { + return await request.put({ url: `/wms/container-main/repair?id=` + id }) +} + +// 器具报废 +export const scrapSubmitContainerRequestMain = async (id) => { + return await request.put({ url: `/wms/container-main/scrap?id=` + id }) +} diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts index a71559004..9eeddeb76 100644 --- a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts +++ b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts @@ -65,7 +65,9 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive label: '单据号', field: 'number', sort: 'custom', - isSearch: true, + table: { + width: 150 + } }, { label: '器具号', diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts index 37c395eaa..91fbddc1c 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts +++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts @@ -133,6 +133,16 @@ export const ContainerMain = useCrudSchemas(reactive([ } } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } ])) diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue index 3e80e71e6..956735566 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue @@ -144,8 +144,26 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:containerMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:containerMain:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'wms:container-main:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main:delete'}), // 删除 + { + label: '维修', + name: 'repair', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }, + { + label: '报废', + name: 'scrap', + hide: false, + type: 'danger', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + } ] // 列表-操作按钮事件 @@ -154,9 +172,33 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + } else if(val == 'repair'){ // 维修 + repairSubmit(row.id) + } else if(val == 'scrap'){ // 报废 + scrapSubmit(row.id) } } +/** 维修按钮操作 */ +const repairSubmit = async (id: number) => { + try { + await message.confirm(t('common.confirmSubmit')) + await ContainerMainApi.repairSubmitContainerRequestMain(id) + message.success(t('common.submitSuccess')) + await getList() + } catch {} +} + +/** 报废按钮操作 */ +const scrapSubmit = async (id: number) => { + try { + await message.confirm(t('common.confirmSubmit')) + await ContainerMainApi.scrapSubmitContainerRequestMain(id) + message.success(t('common.submitSuccess')) + await getList() + } catch {} +} + /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { From 922c73e26809e60a716943a79bdafa8c90d845bb Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 27 Dec 2023 17:12:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryManage/container/containerMain.data.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryManage/container/containerMain.data.ts b/src/views/wms/inventoryManage/container/containerMain.data.ts index 329f80d27..32b728b0b 100644 --- a/src/views/wms/inventoryManage/container/containerMain.data.ts +++ b/src/views/wms/inventoryManage/container/containerMain.data.ts @@ -30,8 +30,12 @@ export const ContainerMain = useCrudSchemas(reactive([ isSearch: true, }, { - label: '状态', - field: 'status', + label: '器具状态', + field: 'containerStatus', + dictType: DICT_TYPE.CONTAINER_STATUS, + dictClass: 'string', + isTable: true, + isForm: true, sort: 'custom', isSearch: true, }, @@ -140,4 +144,4 @@ export const ContainerDetailRules = reactive({ containerContentType: [ { required: true, message: '请选择内容物类型', trigger: 'change' } ], -}) \ No newline at end of file +}) From 6f5160638d0524fe4cc66a97bf4d29dcc1f19943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 27 Dec 2023 19:45:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3=20?= =?UTF-8?q?=E4=B8=BB=E5=AD=90=E4=B8=8D=E5=9B=9E=E6=98=BE=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E5=85=B8=E5=90=A6=E5=88=99=E5=8D=A1?= =?UTF-8?q?=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantleRequestMain.data.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index f4bd20ff0..f614ddfc3 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -735,8 +735,8 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive([ { label: '库存状态', field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', + // dictType: DICT_TYPE.INVENTORY_STATUS, + // dictClass: 'string', isTable: true, sort: 'custom', table: {