From 685266f803cd307cb15341a247a32247745f0825 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 11 Jun 2024 17:03:56 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitial/inventoryinitRequestMain/index.vue | 5 +++++ .../inventoryinitRequestMain.data.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index ec7d59008..49575f82c 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -117,10 +117,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['uom'] = val[0]['uom'] }else if(formField=='packUnit'){ //包装规格1 + row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] }else if(formField=='secondPackUnit'){ //包装规格2 + row['secondPackUnit'] = val[0]['packUnit'] row['secondPackQty'] = val[0]['packQty'] + }else if(formField == 'balancePackUnit'){ + // 入库存包装规格 + row['balancePackUnit'] = val[0]['packUnit'] } } else { const setV = {} diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index aa7656d24..e9a8828c2 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -787,7 +787,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( disabled: true, isInpuFocusShow: true, searchListPlaceholder: '请选择包装', - searchField: 'itemCode', + searchField: 'packUnit', searchTitle: '物品包装信息', searchAllSchemas: Itempackaging.allSchemas, searchPage: ItemPackageApi.getItempackagingPage, @@ -923,7 +923,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( disabled: true, isInpuFocusShow: true, searchListPlaceholder: '请选择包装', - searchField: 'itemCode', + searchField: 'packUnit', searchTitle: '物品包装信息', searchAllSchemas: Itempackaging.allSchemas, searchPage: ItemPackageApi.getItempackagingPage, From 97065424563f89778faa1678e7560c885f6b9286 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 11 Jun 2024 17:24:31 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/eam/sparepartsinlocation/index.vue | 10 +++++----- .../sparePartsInLocationMain.data.ts | 20 +------------------ 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/views/eam/sparepartsinlocation/index.vue b/src/views/eam/sparepartsinlocation/index.vue index 1ad5d3387..5507d516f 100644 --- a/src/views/eam/sparepartsinlocation/index.vue +++ b/src/views/eam/sparepartsinlocation/index.vue @@ -168,9 +168,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 - // defaultButtons.defaultImportBtn(null), // 导入 - defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'eam:spare-parts-in-location-main:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'eam:spare-parts-in-location-main:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'eam:spare-parts-in-location-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -218,7 +218,7 @@ const isShowMainButton = (row, val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({ hasPermi: 'wms:sparePartsInLocationMain:update' }) // 编辑 + defaultButtons.mainListEditBtn({ hasPermi: 'eam:spare-parts-in-location-main:update' }) // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:sparePartsInLocationMain:delete' }) // 删除 ] } @@ -358,7 +358,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '采购订单主导入模版.xlsx' + templateTitle: '备件入库记录导入模版.xlsx' }) // 导入成功之后 diff --git a/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts index 865f8cf1e..d5c6cf39c 100644 --- a/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts +++ b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts @@ -120,25 +120,7 @@ export const SparePartsInLocationMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - isSearch: false, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - isForm: false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - }, + { label: '操作', field: 'action', From af518b36ce0779b877355903b6bc930016ae9cd8 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 11 Jun 2024 17:32:51 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitRequestMain/index.vue | 16 ++++++++++++++++ .../inventoryinitRequestMain.data.ts | 10 +++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 49575f82c..a79c4221d 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -129,6 +129,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } else { const setV = {} + setV[formField] = val[0][searchField] //setV['supplierCode'] = val[0]['supplierCode'] formRef.setValues(setV) @@ -139,6 +140,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} + if(formField=='itemCode'){ + //物料代码 + setV['uom'] = val[0]['uom'] + }else if(formField=='packUnit'){ + //包装规格1 + setV['packUnit'] = val[0]['packUnit'] + setV['packQty'] = val[0]['packQty'] + }else if(formField=='secondPackUnit'){ + //包装规格2 + setV['secondPackUnit'] = val[0]['packUnit'] + setV['secondPackQty'] = val[0]['packQty'] + }else if(formField == 'balancePackUnit'){ + // 入库存包装规格 + setV['balancePackUnit'] = val[0]['packUnit'] + } setV[formField] = val[0][searchField] formRef.setValues(setV) }) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index e9a8828c2..146a535f0 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -751,14 +751,12 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( valueFormat: 'x', } }, - { label: '包装规格1', field: 'packUnit', isTable: true, sort: 'custom', - table: { - width: 150, + form: { componentProps: { disabled: true, isSearchList: true, @@ -825,8 +823,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( field: 'secondPackUnit', isTable: true, sort: 'custom', - table: { - width: 150, + form: { componentProps: { disabled: true, isSearchList: true, @@ -893,7 +890,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( label: '入库存包装规格', field: 'balancePackUnit', sort: 'custom', - table: { + form: { width: 150, componentProps: { disabled: true, @@ -948,7 +945,6 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( dictType: DICT_TYPE.IS_LINE_ITEM, dictClass: 'string', isSearch: false, - isForm: false, isTable: true, sort: 'custom', table: { From e52f3e3cba7bcdf2d015ac12d04d4d8d0e1a08cc Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Tue, 11 Jun 2024 17:54:36 +0800 Subject: [PATCH 04/10] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 2 +- .../supplierinvoiceInvoiced.data.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 8ffbba17a..35c84edf3 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -574,7 +574,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive }, }, { - label: '物流收货单号', + label: '待开票单据号', field: 'recvBillNum', table: { width: 150 diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts index bc0f16f29..d6da58d98 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts @@ -28,7 +28,7 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ }, }, { - label: '物流单据号', + label: '待开票单据号', field: 'recvBillNum', sort: 'custom', isSearch: true, @@ -120,7 +120,7 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ width: 150 }, }, - + { label: '状态', field: 'status', @@ -140,8 +140,8 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ } } }, - - + + { label: '订单行', field: 'poLine', From d0aca8df5564c6430f5ec85e9edb2ac1041a88e5 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Tue, 11 Jun 2024 18:11:35 +0800 Subject: [PATCH 05/10] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index b4e35e991..6b4cb2bdf 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -65,7 +65,7 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive( } }, }, - + { label: '采购价格审批人', field: 'procurementCreator', @@ -548,7 +548,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( // } } }, - + { label: '采购审批时间', field: 'procurementCreateTime', @@ -885,7 +885,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Wed, 12 Jun 2024 09:34:26 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 9e679d66b..438b35df3 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -148,7 +148,7 @@ :apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage" :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" :Echo="Echo" - :detailButtonIsShowEdit="false" + :detailButtonIsShowEdit="true" :detailButtonIsShowDelete="false" :detailButtonIsShowAdd="false" @buttonBaseClick="detailButtonBaseClick" From 298fb1cdda48d18aa08e4f7accd59aeca51a5f7e Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 12 Jun 2024 09:34:41 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index 847a1533b..e322068ed 100644 --- a/index.html +++ b/index.html @@ -6,14 +6,8 @@ - - + + %VITE_APP_TITLE% From 6803f440b4e1d95c2643c555cc187ffdcb7ae07a Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 12 Jun 2024 09:44:12 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=AD=90=E8=A1=A8=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 438b35df3..25d20fbaf 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -149,6 +149,7 @@ :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" :Echo="Echo" :detailButtonIsShowEdit="true" + :detailButtonIsShowAddStatusArray="['1','6']" :detailButtonIsShowDelete="false" :detailButtonIsShowAdd="false" @buttonBaseClick="detailButtonBaseClick" From 5e919fb10938f4d468c6d7a5577bbb4e34759829 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Wed, 12 Jun 2024 09:45:13 +0800 Subject: [PATCH 09/10] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81SCP?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=9B=9E=EF=BC=8C=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=8F=AF=E4=BB=A5=E5=AF=B9=E6=98=8E=E7=BB=86=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=90=A6=E5=88=99=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E5=B7=A5=E4=BD=9C=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 25d20fbaf..47b084d41 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -443,11 +443,11 @@ const handleImport = () => { /** 添加/修改操作 */ const formRef = ref() const openForm = async (type : string, row ?: number) => { - if(type=='update'){ - SupplierinvoiceRequestMainRules.invoiceTime[0].required = true - }else{ + // if(type=='update'){ + // SupplierinvoiceRequestMainRules.invoiceTime[0].required = true + // }else{ SupplierinvoiceRequestMainRules.invoiceTime[0].required = false - } + // } if(row&&row.procurementCreator) row.procurementCreator = Number(row.procurementCreator) // 校验是否可以开票 SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then(res => { From a4f2a1a25d1647f911edc34dd8bb0b0d5fe8bf97 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 12 Jun 2024 10:37:18 +0800 Subject: [PATCH 10/10] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=20=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E9=A2=84=E8=A7=88=20=E5=89=8D=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/equipmentRepairJobMain/index.ts | 1 + .../eam/equipmentReportRepairRequest/index.ts | 5 ++ src/utils/disposition/defaultButtons.ts | 12 +++ .../equipmentRepairJobMain.data.ts | 67 ++++++++++++++-- .../equipmentRepairJobMain/finishForm1.vue | 4 +- .../eam/equipmentRepairJobMain/index.vue | 76 ++++++++++++++++-- .../equipmentRepairRecordMain.data.ts | 2 +- .../equipmentReportRepairRequest.data.ts | 13 +++ .../equipmentReportRepairRequest/index.vue | 80 +++++++++++++++++-- 9 files changed, 240 insertions(+), 20 deletions(-) diff --git a/src/api/eam/equipmentRepairJobMain/index.ts b/src/api/eam/equipmentRepairJobMain/index.ts index ed01ac342..e06982c20 100644 --- a/src/api/eam/equipmentRepairJobMain/index.ts +++ b/src/api/eam/equipmentRepairJobMain/index.ts @@ -79,6 +79,7 @@ export const updateEquipmentRepairMain = async (data: EquipmentRepairJobMainVO) return await request.post({ url: `/eam/equipment-repair-job-main/updateRepair`, data }) } + // 完成维修工单主 export const executeEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => { return await request.post({ url: `/eam/equipment-repair-job-main/execute`, data }) diff --git a/src/api/eam/equipmentReportRepairRequest/index.ts b/src/api/eam/equipmentReportRepairRequest/index.ts index 1eeec7e86..10542bbf9 100644 --- a/src/api/eam/equipmentReportRepairRequest/index.ts +++ b/src/api/eam/equipmentReportRepairRequest/index.ts @@ -81,3 +81,8 @@ export const updateEquipmentReportRepairOrder = async (data: EquipmentReportRepa export const createEquipmentWeixiuOrder = async (data: EquipmentReportRepairRequestVO) => { return await request.post({ url: `/eam/equipment-report-repair-request/updateCreateOrder`, data }) } + +// 查询报修工单文件附件 +export const getEquipmentReportFileInfo = async (data) => { + return await request.post({ url: `/eam/equipment-report-repair-request/fileListInfo`, data }) +} diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index e56253106..8081b48ef 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -440,6 +440,18 @@ export function mainListValidateRepairBtn(option:any) { hasPermi: '' }) } +// 主列表-预览按钮 +export function viewBtn(option:any) { + return __defaultBtnOption(option,{ + label: '预览', + name: 'view', + hide: false, + type: 'success', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} // 主列表-审核按钮 export function mainListAuditingBtn(option:any) { diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts index d431d5ddd..e6e3a50f6 100644 --- a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts +++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts @@ -4,7 +4,6 @@ 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 {getBasicFaultCausePage} from "@/api/eam/basicFaultCause"; // 表单校验 export const EquipmentRepairJobMainRules = reactive({ @@ -14,9 +13,9 @@ export const EquipmentRepairJobMainRules = reactive({ urgency: [required], level: [required], equipmentCode: [required], - totalMinutes: [required], faultType: [required], status: [required], + shutDown:[required], }) export const EquipmentRepairJobMain = useCrudSchemas(reactive([ @@ -34,6 +33,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ field: 'number', sort: 'custom', isSearch: true, + isTable: true, + isForm: false, + isDetail:true, }, { label: '设备类别', @@ -48,20 +50,30 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ field: 'repairNumber', sort: 'custom', isSearch: true, + isTable: true, + isForm: false, + isDetail:true, }, { - label: '来源字典', + label: '来源', field: 'sources', sort: 'custom', dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES, dictClass: 'string', isSearch: false, + isForm: true, + form:{ + value:'1' + } }, { label: '维修描述', field: 'maintenanceDesc', sort: 'custom', - isSearch: false, + isSearch: true, + isTable: true, + isForm: false, + isDetail:true, }, { label: '紧急程度', @@ -121,6 +133,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: true, + isForm: false, + isDetail:true, search: { component: 'DatePicker', componentProps: { @@ -143,6 +158,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: true, + isForm: false, + isDetail:true, search: { component: 'DatePicker', componentProps: { @@ -164,18 +182,27 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ field: 'totalMinutes', sort: 'custom', isSearch: false, + isTable: true, + isForm: false, + isDetail:true, }, { label: '维修验证人', field: 'verifyerRepair', sort: 'custom', isSearch: false, + isTable: true, + isForm: false, + isDetail:true, }, { label: '维修验证内容', field: 'verifyContentRepair', sort: 'custom', isSearch: false, + isTable: true, + isForm: false, + isDetail:true, }, { label: '维修验证时间', @@ -183,6 +210,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: true, + isForm: false, + isDetail:true, search: { component: 'DatePicker', componentProps: { @@ -204,12 +234,18 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ field: 'verifyerReport', sort: 'custom', isSearch: false, + isTable: true, + isForm: false, + isDetail:true, }, { label: '报修验证内容', field: 'verifyContentReport', sort: 'custom', isSearch: false, + isTable: true, + isForm: false, + isDetail:true, }, { label: '报修验证时间', @@ -217,6 +253,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: true, + isForm: false, + isDetail:true, search: { component: 'DatePicker', componentProps: { @@ -238,12 +277,18 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ field: 'maintenancer', sort: 'custom', isSearch: false, + isTable: true, + isForm: false, + isDetail:true, }, { label: '维修人联系电话', field: 'maintenancePhone', sort: 'custom', isSearch: false, + isTable: true, + isForm: false, + isDetail:true, }, { label: '结果', @@ -251,7 +296,10 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.EAM_COMPLETE_RESULT, dictClass: 'string', - isSearch: true, + isSearch: false, + isTable: true, + isForm: false, + isDetail:true, }, { label: '完成时间', @@ -259,6 +307,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: true, + isForm: false, + isDetail:true, search: { component: 'DatePicker', componentProps: { @@ -306,6 +357,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: true, + isForm: false, + isDetail:true, search: { component: 'DatePicker', componentProps: { @@ -327,6 +381,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ field: 'repairer', sort: 'custom', isSearch: false, + isTable: true, + isForm: false, + isDetail:true, }, { label: '故障类型', diff --git a/src/views/eam/equipmentRepairJobMain/finishForm1.vue b/src/views/eam/equipmentRepairJobMain/finishForm1.vue index 6fe664349..d0b042e01 100644 --- a/src/views/eam/equipmentRepairJobMain/finishForm1.vue +++ b/src/views/eam/equipmentRepairJobMain/finishForm1.vue @@ -63,6 +63,7 @@ const InputRef = ref>() const formData = ref({ id:'', number:'', + sources:'', verifyerRepair: '', verifyContentRepair: '', verifyTimeRepair: '', @@ -158,6 +159,7 @@ const open = async (type: string, row?: object) => { //初始化数据 formData.value.id = row.id formData.value.number = row.number + formData.value.sources = row.sources } defineExpose({ open }) // 提供 open 方法，用于打开弹窗 @@ -172,7 +174,7 @@ const submitForm = async (val) => { //发送数据 await EquipmentRepairJobMainApi.updateEquipmentRepairJobMain(formData.value) //把success函数传递到父页面 - emit('success',formData.value.id) + emit('success',formData.value.id,formData.value.sources) dialogVisible.value = false } diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue index 5943cdd48..71dd0c1f4 100644 --- a/src/views/eam/equipmentRepairJobMain/index.vue +++ b/src/views/eam/equipmentRepairJobMain/index.vue @@ -48,6 +48,7 @@ :apiCreate="EquipmentRepairJobMainApi.createEquipmentRepairJobMain" @searchTableSuccess="searchTableSuccess" :isBusiness="false" + @onChange="onChange" /> @@ -88,6 +89,10 @@ import Detail from '@/views/eam/equipmentRepairJobMain/EquipmentRepairJobDetail. import FinishForm1 from '@/views/eam/equipmentRepairJobMain/finishForm1.vue' import FinishForm2 from '@/views/eam/equipmentRepairJobMain/finishForm2.vue' import FinishForm3 from '@/views/eam/equipmentRepairJobMain/finishForm3.vue' +import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data"; +import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; +import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data"; +import * as ToolItemApi from "@/api/eam/toolAccounts"; defineOptions({ name: 'EquipmentRepairJobMain' }) @@ -163,6 +168,15 @@ const isShowStatusButton = (row,val) => { } } +//true 是隐藏 +const isShowBaoXiuButton = (row) => { + if(row.sources =='0' && row.status == '7'){ + return false + }else{ + return true + } +} + // 列表-操作按钮 const butttondata = (row) => { @@ -172,7 +186,7 @@ const butttondata = (row) => { defaultButtons.mainListExecuteBtn({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: isShowStatusButton(row,['7']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 报修验证 + defaultButtons.mainListValidateReportBtn({hide: isShowBaoXiuButton(row),hasPermi:'eam:equipmentRepairJobMain:update'}), // 报修验证 ] } @@ -200,6 +214,27 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + if(type == "create"){ + EquipmentRepairJobMain.allSchemas.formSchema.forEach((item) => { + if(item.field == 'sources'){ + item.value = '1' + item.componentProps.disabled = true + } + if(item.field == 'status'){ + item.value = '3' + item.componentProps.disabled = true + } + }) + }else{ + EquipmentRepairJobMain.allSchemas.formSchema.forEach((item) => { + if(item.field == 'sources'){ + item.componentProps.disabled = true + } + if(item.field == 'status'){ + item.componentProps.disabled = true + } + }) + } basicFormRef.value.open(type, row) } @@ -384,16 +419,20 @@ const getClosed1=(val)=> { } //finishForm1 提交按钮回传 -const getData1=(val)=> { +const getData1=(val1,val2)=> { nextTick?.(async () => { - console.log(val) try { const params = ref({ id: '', status:'', }) - params.value.id = val - params.value.status = '7' + params.value.id = val1 + if(val2 == '1'){ + params.value.status = '8' + } + if(val2 == '0'){ + params.value.status = '7' + } await EquipmentRepairJobMainApi.updateEquipmentRepairOrder(params.value) message.success(t('工单已流转')) // 刷新列表 @@ -461,6 +500,33 @@ const getData3=(val)=> { ) } +const onChange = (field, item) => { + //设备 + if(field == 'type' && item == 'DEVICE'){ + EquipmentRepairJobMain.allSchemas.formSchema.forEach((items) => { + if (items.field == 'equipmentCode') { + basicFormRef.value.formRef.setValues({ + equipmentCode:'' + }) + items.componentProps.searchAllSchemas = EquipmentAccounts.allSchemas + items.componentProps.searchPage = EquipmentItemApi.getEquipmentAccountsPage + } + }) + } + //工装 + if(field == 'type' && item == 'EQUIPMENT'){ + EquipmentRepairJobMain.allSchemas.formSchema.forEach((items) => { + if (items.field == 'equipmentCode') { + basicFormRef.value.formRef.setValues({ + equipmentCode:'' + }) + items.componentProps.searchAllSchemas = ToolAccounts.allSchemas + items.componentProps.searchPage = ToolItemApi.getToolAccountsPage + } + }) + } +} + /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { diff --git a/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts b/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts index c42362e3a..c21187fa8 100644 --- a/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts +++ b/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts @@ -42,7 +42,7 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES, dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: false + isSearch: false, }, { label: '维修描述', diff --git a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts index c20a61e45..3099abca8 100644 --- a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts +++ b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts @@ -98,6 +98,19 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive + @@ -54,6 +57,16 @@ + + + + @@ -61,6 +74,7 @@ +