From 40fd9e82db87ceae9dee79ce44188afd508843be Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 12 Jun 2024 13:17:16 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/countJobMain/index.ts | 4 ++-- src/api/wms/countPlanMain/index.ts | 4 ++-- src/api/wms/countRecordMain/index.ts | 4 ++-- src/api/wms/countRequestMain/index.ts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts index 2f685a8cf..c5f532bd9 100644 --- a/src/api/wms/countJobMain/index.ts +++ b/src/api/wms/countJobMain/index.ts @@ -76,7 +76,7 @@ export const exportCountJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-job-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-job-main/export-excel`, params }) } @@ -98,4 +98,4 @@ export const handleExportCountJob = async (id: number) => { masterId:id } return await request.download({ url: `/wms/count-job-main/export-excel-single`, params }) -} \ No newline at end of file +} diff --git a/src/api/wms/countPlanMain/index.ts b/src/api/wms/countPlanMain/index.ts index 0e3bc85fb..69cc8d502 100644 --- a/src/api/wms/countPlanMain/index.ts +++ b/src/api/wms/countPlanMain/index.ts @@ -63,7 +63,7 @@ export const exportCountPlanMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-plan-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-plan-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-plan-main/export-excel`, params }) } @@ -107,4 +107,4 @@ export const publish = (id) => { // 重置 export const resetting = (id) => { return request.put({ url: '/wms/count-plan-main/resetting?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/countRecordMain/index.ts b/src/api/wms/countRecordMain/index.ts index 35d2ef3db..71012a8e2 100644 --- a/src/api/wms/countRecordMain/index.ts +++ b/src/api/wms/countRecordMain/index.ts @@ -59,7 +59,7 @@ export const exportCountRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-record-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-record-main/export-excel`, params }) } @@ -73,4 +73,4 @@ export const importTemplate = () => { // 生成盘点调整 export const generateCountRecordMain = async (id) => { return await request.put({ url: `/wms/count-record-main/generate?id=` + id}) -} \ No newline at end of file +} diff --git a/src/api/wms/countRequestMain/index.ts b/src/api/wms/countRequestMain/index.ts index b353bf0f9..77ff0c03d 100644 --- a/src/api/wms/countRequestMain/index.ts +++ b/src/api/wms/countRequestMain/index.ts @@ -58,7 +58,7 @@ export const exportCountRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-request-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-request-main/export-excel`, params }) } @@ -115,4 +115,4 @@ export const generateCountadjustRequest = async (id) => { //解冻 export const thaw = async (id) => { return await request.put({ url: `/wms/count-request-main/thaw?id=` + id }) -} \ No newline at end of file +} From de99df58c40613ea187509640aa5a0b7c395748f Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 12 Jun 2024 13:33:39 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 47b084d41..60284524b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -150,8 +150,8 @@ :Echo="Echo" :detailButtonIsShowEdit="true" :detailButtonIsShowAddStatusArray="['1','6']" - :detailButtonIsShowDelete="false" - :detailButtonIsShowAdd="false" + :detailButtonIsShowDelete="true" + :detailButtonIsShowAdd="true" @buttonBaseClick="detailButtonBaseClick" @tableFormButton="tableFormButton" > From 0d902388dd582c8d0f50d34a72c9beaf05cd9791 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 12 Jun 2024 13:34:26 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchaseMain/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index 780e58776..14080c706 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -173,12 +173,12 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc newRow['uom'] = item['supplierUom'] tableData.value.push(newRow) }) - const itemCodes = val.map(valItem=>valItem['itemCode']) - await ItembasicApi.getItembasicPage({ - code: itemCodes.join(',') - }).then(res => { - row['uom'] = res.list[0].uom - }) + // const itemCodes = val.map(valItem=>valItem['itemCode']) + // await ItembasicApi.getItembasicPage({ + // code: itemCodes.join(',') + // }).then(res => { + // row['uom'] = res.list[0].uom + // }) } } From a47aac077c8783b35b2ed6a261900b2bc32c299d Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 12 Jun 2024 13:53:06 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 28 ++++++++++++------- .../supplierinvoiceRequestMain/index.vue | 2 ++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 8b6a0636c..47be4fccd 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -384,6 +384,11 @@ const props = defineProps({ required: false, default: false }, + fieldTableColumn:{ + type: String, + required: false, + default: '' + }, //扩展其他按钮 otherHeadButttonData:{ type:Array, @@ -728,16 +733,19 @@ const buttonBaseClick = (val, item) => { masterId: masterParmas.value.masterId, number: masterParmas.value.number }) - const item = props.detailAllSchemas.formSchema[0] - opensearchTable( - item.field, item?.componentProps?.searchField, - item?.componentProps?.searchTitle, - item?.componentProps?.searchAllSchemas, - item?.componentProps?.searchPage, - item?.componentProps?.searchCondition, - item?.componentProps?.multiple, - undefined,undefined - ) + if(props.fieldTableColumn!=''){ + const item = props.detailAllSchemas.formSchema.find(item=>item.field == props.fieldTableColumn) + opensearchTable( + item.field, item?.componentProps?.searchField, + item?.componentProps?.searchTitle, + item?.componentProps?.searchAllSchemas, + item?.componentProps?.searchPage, + item?.componentProps?.searchCondition, + item?.componentProps?.multiple, + undefined,undefined + ) + } + }else{ openForm('create') } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 60284524b..e3b6c6463 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -83,6 +83,8 @@ ( label: '单据号', field: 'number', sort: 'custom', + hiddenInMain:true, table: { width: 180 }, @@ -696,7 +697,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150, fixed: 'right' }, - hiddenInMain: true, + hiddenInMain: false, isTableForm:false, } ])) From 71955965e48c6484c3b6a354492113d6e99ad70b Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 12 Jun 2024 15:09:45 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 2 +- .../supplierinvoiceRequestMain.data.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index e3b6c6463..73b36e684 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -150,7 +150,7 @@ :apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage" :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" :Echo="Echo" - :detailButtonIsShowEdit="true" + :detailButtonIsShowEdit="false" :detailButtonIsShowAddStatusArray="['1','6']" :detailButtonIsShowDelete="true" :detailButtonIsShowAdd="true" diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 6b4cb2bdf..d00c58928 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -839,6 +839,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Wed, 12 Jun 2024 15:12:42 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=EF=BC=8C=20=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=EF=BC=8C?= =?UTF-8?q?=EF=BC=8C=E6=89=B9=E9=87=8F=E5=8F=91=E5=B8=83=20=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchaseMain/index.vue | 4 ++-- .../supplierdeliver/purchasePlanMain/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index 14080c706..a3d026459 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -10,7 +10,7 @@
{ defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // 新增 defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入 defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出 - defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布 + // defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 From f248c9bf9076dbe10dbfbf3d55c3e12d624f037c Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 12 Jun 2024 15:21:52 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index c913cac57..a779b1bf2 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -197,7 +197,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( disabled: true } }, - isSearch: false, + isSearch: true, }, { label: '从仓库代码', From 22d3e8250d8d1beff9d8d90697bb976bc784ef78 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 12 Jun 2024 15:34:34 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/countadjustRecordMain/index.ts | 4 ++-- src/api/wms/countadjustRequestMain/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/wms/countadjustRecordMain/index.ts b/src/api/wms/countadjustRecordMain/index.ts index 02dc4ed60..8cb6da3f7 100644 --- a/src/api/wms/countadjustRecordMain/index.ts +++ b/src/api/wms/countadjustRecordMain/index.ts @@ -57,7 +57,7 @@ export const exportCountadjustRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/countadjust-record-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/countadjust-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/countadjust-record-main/export-excel`, params }) } @@ -66,4 +66,4 @@ export const exportCountadjustRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/countadjust-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/countadjustRequestMain/index.ts b/src/api/wms/countadjustRequestMain/index.ts index 4cc19ee4d..d1612bd5e 100644 --- a/src/api/wms/countadjustRequestMain/index.ts +++ b/src/api/wms/countadjustRequestMain/index.ts @@ -57,7 +57,7 @@ export const exportCountadjustRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/countadjust-request-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/countadjust-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/countadjust-request-main/export-excel`, params }) } From 7eb3166fefee1c0d710eb4128dcb39748071d545 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 12 Jun 2024 15:58:09 +0800 Subject: [PATCH 10/17] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E5=B7=A5=E5=8D=95=E8=BD=AC=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/disposition/defaultButtons.ts | 13 + .../equipmentRepairJobMain.data.ts | 38 +- .../eam/equipmentRepairJobMain/index.vue | 43 +++ .../equipmentRepairJobMain/transferForm.vue | 344 ++++++++++++++++++ 4 files changed, 436 insertions(+), 2 deletions(-) create mode 100644 src/views/eam/equipmentRepairJobMain/transferForm.vue diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 8081b48ef..c5c2ec237 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -389,6 +389,19 @@ export function mainListExecuteBtn(option:any) { }) } +// 主列表-转办按钮 +export function mainListTransferBtn(option:any) { + return __defaultBtnOption(option,{ + label: t(`ts.转办`).replace('ts.', ''), + name: 'transfer', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} + // 主列表-完成按钮 export function mainListFinishBtn(option:any) { return __defaultBtnOption(option,{ diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts index e6e3a50f6..e15b32625 100644 --- a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts +++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts @@ -4,6 +4,10 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; import {BasicFaultCause} from "@/views/eam/basicFaultCause/basicFaultCause.data"; import * as ItemApi from "@/api/eam/basicFaultCause"; +import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data"; +import * as WorkshopApi from "@/api/wms/workshop"; +import {BasicFaultType} from "@/views/eam/basicFaultType/basicFaultType.data"; +import * as BasicFaultTypeApi from "@/api/eam/basicFaultType"; // 表单校验 export const EquipmentRepairJobMainRules = reactive({ @@ -388,10 +392,23 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ { label: '故障类型', field: 'faultType', - dictType: DICT_TYPE.FAILURE_REASON, - dictClass: 'string', sort: 'custom', isSearch: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择故障类型', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '车间信息', // 查询弹窗标题 + searchAllSchemas: BasicFaultType.allSchemas, // 查询弹窗所需类 + searchPage: BasicFaultTypeApi.getBasicFaultTypePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, }, { label: '流程状态', @@ -442,6 +459,23 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ field: 'workshopCode', sort: 'custom', isSearch: false, + required: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择车间', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '车间信息', // 查询弹窗标题 + searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 + searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, }, // { // label: '产线编号', diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue index 71dd0c1f4..d11441bf7 100644 --- a/src/views/eam/equipmentRepairJobMain/index.vue +++ b/src/views/eam/equipmentRepairJobMain/index.vue @@ -54,6 +54,7 @@ + { defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentRepairJobMain:update'}), // 编辑 defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 接单 defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 执行 + defaultButtons.mainListTransferBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 转办 defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentRepairJobMain:update'}), //完成 defaultButtons.mainListValidateRepairBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 维修验证 defaultButtons.mainListValidateReportBtn({hide: isShowBaoXiuButton(row),hasPermi:'eam:equipmentRepairJobMain:update'}), // 报修验证 @@ -206,6 +209,8 @@ const buttonTableClick = async (val, row) => { handleValidateRepair(row) } else if (val == 'validate_report') { // 报修验证 handleValidateReport(row) + } else if (val == 'transfer') { // 转办 + handleTransferReport(row) } @@ -296,6 +301,14 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { }) } +/** 转办按钮操作 */ +const transferForm = ref() +const handleTransferReport = async (row) => { + await message.delConfirm('是否转办所选中工单？'); + transferForm.value.open('update', row); + +} + /** 报修验证按钮操作 */ const finishForm3Ref = ref() @@ -500,6 +513,36 @@ const getData3=(val)=> { ) } + +//finishForm4 关闭按钮回传 +const getClosed4=(val)=> { + nextTick?.(() => { + console.log(val) + getList() + }) +} + +//finishForm4 提交按钮回传 +const getData4=(val)=> { + nextTick?.(async () => { + console.log(val) + try { + const params = ref({ + id: '', + status:'', + }) + params.value.id = val + params.value.status = '3' + await EquipmentRepairJobMainApi.updateEquipmentRepairOrder(params.value) + message.success(t('工单已流转')) + // 刷新列表 + await getList() + } catch {} + + } + ) +} + const onChange = (field, item) => { //设备 if(field == 'type' && item == 'DEVICE'){ diff --git a/src/views/eam/equipmentRepairJobMain/transferForm.vue b/src/views/eam/equipmentRepairJobMain/transferForm.vue new file mode 100644 index 000000000..e6fe8bfec --- /dev/null +++ b/src/views/eam/equipmentRepairJobMain/transferForm.vue @@ -0,0 +1,344 @@ + + + + From 7b9d8e407be70d2b4c57808b2ebf640d870280bd Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 12 Jun 2024 19:16:38 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierinvoiceRequestDetail/index.ts | 2 +- src/components/Detail/src/Detail.vue | 25 +++++++++++++++---- .../supplierinvoiceRequestMain/index.vue | 13 +++++++++- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/api/wms/supplierinvoiceRequestDetail/index.ts b/src/api/wms/supplierinvoiceRequestDetail/index.ts index 7cbc9a250..0dd4c5343 100644 --- a/src/api/wms/supplierinvoiceRequestDetail/index.ts +++ b/src/api/wms/supplierinvoiceRequestDetail/index.ts @@ -51,7 +51,7 @@ export const getSupplierinvoiceRequestDetail = async (id: number) => { } // 新增供应商发票申请子 -export const createSupplierinvoiceRequestDetail = async (data: SupplierinvoiceRequestDetailVO) => { +export const createSupplierinvoiceRequestDetail = async (data) => { return await request.post({ url: `/wms/supplierinvoice-request-detail/create`, data }) } diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 47be4fccd..1477668af 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -394,7 +394,13 @@ const props = defineProps({ type:Array, required: false, default: () => [] - } + }, + //主表单独操作--明细左上角新增按钮 + mainSubmitCreateApi:{ + type: Boolean, + required: false, + default: false + }, }) const isShowDrawer = ref(false) const detailLoading = ref(false) @@ -676,7 +682,10 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: } } } -defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗 +const updateList = ()=>{ + getList() +} +defineExpose({ openDetail, formRef ,updateList}) // 提供 open 方法，用于打开弹窗 // 获取备注列表 const getRemarkList = async () => { @@ -875,13 +884,19 @@ const submitForm = async (formType, data) => { const searchTableSuccess1 = (formField, searchField, val, formRef) => { searchTableFormModel.value[formField] = val.map(item=>item[searchField]).join(',') console.log('searchTableSuccess1',searchTableFormModel) - submitForm(searchTableFormType.value,searchTableFormModel.value) - emit('searchTableSuccessDetail', formField, searchField, val, formRef) + if(props.mainSubmitCreateApi){ + emit('searchTableSuccessDetail', formField, searchField, val, formRef,searchTableFormModel.value) + }else{ + submitForm(searchTableFormType.value,searchTableFormModel.value) + emit('searchTableSuccessDetail', formField, searchField, val, formRef) + + } } // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { emit('searchTableSuccessDetail', formField, searchField, val, formRef) } + // 传递给父类 const emit = defineEmits([ 'searchTableSuccessDetail', @@ -893,7 +908,7 @@ const emit = defineEmits([ 'onBlur', 'detailBasicFormOnChange', 'formFormDateChange', - 'buttonBaseClick' + 'buttonBaseClick', ]) /** 删除按钮操作 */ const handleDelete = async (id: number) => { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 73b36e684..17bd9efa9 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -156,6 +156,8 @@ :detailButtonIsShowAdd="true" @buttonBaseClick="detailButtonBaseClick" @tableFormButton="tableFormButton" + :mainSubmitCreateApi="true" + @searchTableSuccessDetail="searchTableSuccessDetail" > - + + diff --git a/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue b/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue index 81917dc99..7b9018259 100644 --- a/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue +++ b/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue @@ -101,10 +101,6 @@ import { SearchTable } from '@/components/SearchTable' import { BasicMaintenanceItemSelectSet} from "@/views/eam/maintenanceItemSelectSet/maintenanceItemSelectSet.data"; import * as maintenanceItemSelectSetApi from "@/api/eam/maintenanceItemSelectSet"; import {ElInput} from "element-plus"; -import { - BasicMaintenanceOptionVO, - createBasicMaintenanceOption, updateBasicMaintenanceOption -} from "@/api/eam/basicMaintenanceOption"; defineOptions({ name: 'TeamForm' }) diff --git a/src/views/eam/inspectionItem/inspectionItem.data.ts b/src/views/eam/inspectionItem/inspectionItem.data.ts index e652e6091..be37928b8 100644 --- a/src/views/eam/inspectionItem/inspectionItem.data.ts +++ b/src/views/eam/inspectionItem/inspectionItem.data.ts @@ -27,6 +27,12 @@ export const InspectionItem = useCrudSchemas(reactive([ component:'InputNumber' }, }, + { + label: '巡检名称', + field: 'name', + sort: 'custom', + isSearch: true + }, { label: '巡检内容', field: 'content', @@ -40,7 +46,7 @@ export const InspectionItem = useCrudSchemas(reactive([ } }, { - label: '保养部位', + label: '巡检部位', field: 'equipmentParts', sort: 'custom', isSearch: true From 6503dbeff2d88b3dd2ce9f14e037cea1591711bd Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 13 Jun 2024 07:34:41 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workstationBind/src/Detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/workstationBind/src/Detail.vue b/src/components/workstationBind/src/Detail.vue index 899d5fc31..79fcf7895 100644 --- a/src/components/workstationBind/src/Detail.vue +++ b/src/components/workstationBind/src/Detail.vue @@ -153,7 +153,7 @@ import BasicForm from '@/components/BasicForm/src/BasicForm.vue' import TableHead from '@/components/TableHead/src/TableHead.vue' import DetailTable from '@/components/DetailTable/src/DetailTable.vue' -defineOptions({ name: 'Detail' }) +defineOptions({ name: 'WorkstationBindDetail' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 From af806a6a4253c0bcba35cc92161c494d5db86bfb Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 13 Jun 2024 08:45:22 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workstationBind/src/Detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/workstationBind/src/Detail.vue b/src/components/workstationBind/src/Detail.vue index 79fcf7895..899d5fc31 100644 --- a/src/components/workstationBind/src/Detail.vue +++ b/src/components/workstationBind/src/Detail.vue @@ -153,7 +153,7 @@ import BasicForm from '@/components/BasicForm/src/BasicForm.vue' import TableHead from '@/components/TableHead/src/TableHead.vue' import DetailTable from '@/components/DetailTable/src/DetailTable.vue' -defineOptions({ name: 'WorkstationBindDetail' }) +defineOptions({ name: 'Detail' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 From 37baed9760cf818276858fc52c2185ae4bffe6be Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 13 Jun 2024 09:36:51 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapRequestMain/index.vue | 12 ++++++++++-- .../productreceiptscrapRequestMain.data.ts | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index 12036ffa0..0235a1311 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -120,6 +120,7 @@