From 006c7998d1c4809930c62ba498650fe205b3ae2f Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 6 Jun 2024 11:41:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/balance/index.vue | 22 +++++++++---------- .../inventorychangeRequestMain.data.ts | 6 ++++- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index bc9a950bc..d7fd2b8da 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{ } // 列表-操作按钮 const butttondata = [ - // { - // label: '标签信息', - // name: 'bqxx', - // hide: false, - // type: 'primary', - // icon: '', - // color: '', - // link: true, - // float:'right', - // hasPermi: '' - // }, + { + label: '标签信息', + name: 'bqxx', + hide: false, + type: 'primary', + icon: '', + color: '', + link: true, + float:'right', + hasPermi: '' + }, defaultButtons.mainListPointBtn(null), // 标签打印 // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index b29734a9b..b105b47c0 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -19,15 +19,19 @@ const queryParams = { const businessTypeQueryParams = { pageSize:10, pageNo:1, - code:'Change' + code:'Change', + name:'库存修改' } const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const requestsettingData =data?.list[0]||{} const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams) const businessTypeData =businessTypeValue?.list[0]||{} + console.log(businessTypeData.code); + // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' import { TableColumn } from '@/types/table' +import { log } from 'console' const userStore = useUserStore() const userDept = userStore.userSelfInfo.dept // id 转str 否则form回显匹配不到 From 03d7b9d1f9c4a65209023cdee51f0b7baa35eb2a Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 6 Jun 2024 11:42:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/balance/index.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index d7fd2b8da..bc9a950bc 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{ } // 列表-操作按钮 const butttondata = [ - { - label: '标签信息', - name: 'bqxx', - hide: false, - type: 'primary', - icon: '', - color: '', - link: true, - float:'right', - hasPermi: '' - }, + // { + // label: '标签信息', + // name: 'bqxx', + // hide: false, + // type: 'primary', + // icon: '', + // color: '', + // link: true, + // float:'right', + // hasPermi: '' + // }, defaultButtons.mainListPointBtn(null), // 标签打印 // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 From 5d9b97d5ed6fc26e5aed4e6ff04af182ebf154da Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 6 Jun 2024 11:59:34 +0800 Subject: [PATCH 3/6] =?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=20=E5=AE=8C=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/equipmentMaintenanceMain/index.ts | 5 + src/api/eam/equipmentRepairJobMain/index.ts | 11 +- .../equipmentMaintenanceMain/finishForm2.vue | 9 +- .../eam/equipmentMaintenanceMain/index.vue | 2 +- .../equipmentRepairJobMain.data.ts | 3 + .../equipmentRepairJobMain/finishForm2.vue | 262 ++++++++++++++++++ .../eam/equipmentRepairJobMain/index.vue | 46 +++ 7 files changed, 333 insertions(+), 5 deletions(-) create mode 100644 src/views/eam/equipmentRepairJobMain/finishForm2.vue diff --git a/src/api/eam/equipmentMaintenanceMain/index.ts b/src/api/eam/equipmentMaintenanceMain/index.ts index 1a0396846..e257dd16a 100644 --- a/src/api/eam/equipmentMaintenanceMain/index.ts +++ b/src/api/eam/equipmentMaintenanceMain/index.ts @@ -70,6 +70,11 @@ export const updateEquipmentMaintenanceMain = async (data: EquipmentMaintenanceM return await request.put({ url: `/eam/equipment-maintenance-main/update`, data }) } +// 修改设备保养工单主 +export const updateEquipmentMaintenance = async (data: EquipmentMaintenanceMainVO) => { + return await request.post({ url: `/eam/equipment-maintenance-main/updateOrders`, data }) +} + // 删除设备保养工单主 export const deleteEquipmentMaintenanceMain = async (id: number) => { return await request.delete({ url: `/eam/equipment-maintenance-main/delete?id=` + id }) diff --git a/src/api/eam/equipmentRepairJobMain/index.ts b/src/api/eam/equipmentRepairJobMain/index.ts index 471f98905..0d83bcb3e 100644 --- a/src/api/eam/equipmentRepairJobMain/index.ts +++ b/src/api/eam/equipmentRepairJobMain/index.ts @@ -1,5 +1,4 @@ import request from '@/config/axios' -import {EquipmentReportRepairRequestVO} from "@/api/eam/equipmentReportRepairRequest"; export interface EquipmentRepairJobMainVO { id: number @@ -72,6 +71,16 @@ export const updateEquipmentRepairJobMain = async (data: EquipmentRepairJobMainV return await request.put({ url: `/eam/equipment-repair-job-main/update`, data }) } +// 修改维修工单主 +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 }) +} + // 删除维修工单主 export const deleteEquipmentRepairJobMain = async (id: number) => { return await request.delete({ url: `/eam/equipment-repair-job-main/delete?id=` + id }) diff --git a/src/views/eam/equipmentMaintenanceMain/finishForm2.vue b/src/views/eam/equipmentMaintenanceMain/finishForm2.vue index 60b73fe59..946493a41 100644 --- a/src/views/eam/equipmentMaintenanceMain/finishForm2.vue +++ b/src/views/eam/equipmentMaintenanceMain/finishForm2.vue @@ -50,6 +50,7 @@ import * as EquipmentMaintenanceMainApi from '@/api/eam/equipmentMaintenanceMain' import { SearchTable } from '@/components/SearchTable' import {ElInput} from "element-plus"; +import {updateEquipmentMaintenance} from "@/api/eam/equipmentMaintenanceMain"; defineOptions({ name: 'TeamForm' }) @@ -168,15 +169,17 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗 /** 提交表单 */ const submitForm = async (val) => { - //把success函数传递到父页面 - emit('success',formData.value.id) + // 校验表单 if (!basicFormRef) return const valid = await basicFormRef.value.validate() if (!valid) return //发送数据 - await EquipmentMaintenanceMainApi.updateEquipmentMaintenanceMain(formData.value) + await EquipmentMaintenanceMainApi.updateEquipmentMaintenance(formData.value); + + //把success函数传递到父页面 + emit('success',formData.value.id) dialogVisible.value = false } diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue index e4219bc6d..d9f106904 100644 --- a/src/views/eam/equipmentMaintenanceMain/index.vue +++ b/src/views/eam/equipmentMaintenanceMain/index.vue @@ -547,7 +547,7 @@ const getData2=(val)=> { params.value.status = '5' // 发起 await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value) - message.success(t('工单已完成')) + //message.success(t('工单已完成')) // 刷新列表 await getList() }) diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts index 4be0eadb5..2b9c97950 100644 --- a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts +++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts @@ -245,6 +245,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isTable: false, + isForm: false, + isDetail:false, search: { component: 'DatePicker', componentProps: { diff --git a/src/views/eam/equipmentRepairJobMain/finishForm2.vue b/src/views/eam/equipmentRepairJobMain/finishForm2.vue new file mode 100644 index 000000000..9228d1980 --- /dev/null +++ b/src/views/eam/equipmentRepairJobMain/finishForm2.vue @@ -0,0 +1,262 @@ + + + + diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue index 2d5d60699..dbfbfb27e 100644 --- a/src/views/eam/equipmentRepairJobMain/index.vue +++ b/src/views/eam/equipmentRepairJobMain/index.vue @@ -50,6 +50,8 @@ :isBusiness="false" /> + + { handleReceive(row.id) } else if (val == 'execute') { // 执行 handleExecute(row.id) + } else if (val == 'finish') { // 完成 + handleFinish(row) } @@ -220,6 +230,16 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { detailRef.value.openDetail(row, titleName, titleValue, 'basicEquipmentRepairJobMain') } +/** 完成按钮操作 */ +const finishForm2Ref = ref() +const handleFinish = async (row) => { + // 二次确认 + await message.delConfirm('是否完成所选中工单？'); + + //打开提交表单 + finishForm2Ref.value.open('update', row); +} + /** 接单按钮操作 */ const handleReceive = async (id: number) => { try { @@ -271,6 +291,32 @@ const handleDelete = async (id: number) => { } catch {} } + + +//finishForm2 关闭按钮回传 +const getClosed2=(val)=> { + nextTick?.(() => { + getList() + }) +} + +//finishForm2 提交按钮回传 +const getData2=(val)=> { + nextTick?.(async () => { + const params = ref({ + id: '', + status: '', + }) + params.value.id = val + params.value.status = '5' + // 发起 + await EquipmentRepairJobMainApi.executeEquipmentRepairJobMain(params.value) + message.success(t('工单已完成')) + // 刷新列表 + await getList() + }) +} + /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { From 1e4de6e43360372319b0d706fae3939d68c339c6 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Thu, 6 Jun 2024 13:26:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20business=5Ftype=20=20=3D=20ReturnToStore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain/index.vue | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index ec46cb9df..410cf97f0 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -89,7 +89,7 @@ @searchTableSuccess="searchTableSuccess" @submitForm="submitFormLabel" /> - + @@ -123,7 +123,7 @@ const tableColumns = ref([...ProductionreturnRequestMain.allSchemas.tableColumns const detailListTableColumns = ProductionreturnRequestDetailLabel.allSchemas const isCreateLabel = ref(false) const formLabelRef = ref() -const labelType = ref('') // 标签类别 采购还是制造等 +const labelType = ref('') // 标签类别 采购还是制造等 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ getListApi: ProductionreturnRequestDetailApi.getProductionreturnRequestDetailPage }) @@ -199,7 +199,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { row['batch'] = '000000' } - // 修改 tableform 属性 数量最大值设置为库存余额中数量 + // 修改 tableform 属性 数量最大值设置为库存余额中数量 // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如： 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制 ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => { if(item.field == 'qty' && val[0]['qty'] > 0) { @@ -278,7 +278,7 @@ const HeadButttondata = [ defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 - + ] // 头部按钮事件 @@ -492,7 +492,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = false console.log(err) }) - } else if (val == 'edit') { // 编辑 + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.masterId) @@ -750,10 +750,19 @@ const labelPrint = async (row) => { // 筛选提交 const searchFormClick = (searchData) => { - tableObject.params = { - isSearch: true, - filters: searchData.filters + tableObject.params.isSearch = true + if(!searchData.filters){//重置的时候应用 + searchData.filters = [] + } + let filters = [...searchData.filters] + if(!filters.find(item=>item.column=='business_type')) { + filters = [...filters,{ + action:'==', + column:'business_type', + value:'ReturnToStore', + }] } + tableObject.params.filters = filters getList() // 刷新当前列表 } From 4b121c2891ee0746feb7c314f75b68c1e8fe991c Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 6 Jun 2024 13:39:43 +0800 Subject: [PATCH 5/6] =?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=20=E5=AD=90=E8=A1=A8=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=BB=B4=E4=BF=AE=E6=8E=AA=E6=96=BD=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentRepairJobMain.data.ts | 12 +++++-- .../eam/equipmentRepairJobMain/index.vue | 31 ++++++++++++++++--- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts index 2b9c97950..f516ddd2a 100644 --- a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts +++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts @@ -484,7 +484,10 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ export const EquipmentRepairJobDetailRules = reactive({ number: [required], masterId: [required], - concurrencyStamp: [required], + describing:[required], + faultCause:[required], + workOut:[required], + maintenances:[required], }) export const EquipmentRepairJobDetail = useCrudSchemas(reactive([ @@ -555,7 +558,7 @@ export const EquipmentRepairJobDetail = useCrudSchemas(reactive([ isSearch: true, }, { - label: '维修人员字符串多个', + label: '维修人员', field: 'maintenances', sort: 'custom', isSearch: true, @@ -592,7 +595,10 @@ export const EquipmentRepairJobDetail = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - isSearch: true, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, }, { label: '地点ID', diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue index dbfbfb27e..d341b418a 100644 --- a/src/views/eam/equipmentRepairJobMain/index.vue +++ b/src/views/eam/equipmentRepairJobMain/index.vue @@ -65,6 +65,9 @@ :detailButtonIsShowAdd=statusBtn :detailButtonIsShowEdit=statusBtn :detailButtonIsShowDelete=statusBtn + @handleMainFefresh="handleMainFefresh" + @searchTableSuccessDetail="searchTableSuccessDetail" + :key="count" /> @@ -81,11 +84,6 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/views/eam/equipmentRepairJobMain/EquipmentRepairJobDetail.vue' import FinishForm2 from '@/views/eam/equipmentRepairJobMain/finishForm2.vue' -import * as EquipmentMaintenanceMainApi from "@/api/eam/equipmentMaintenanceMain"; -import { - executeEquipmentRepairJobMain, - executEquipmentRepairJobMain -} from "@/api/eam/equipmentRepairJobMain"; defineOptions({ name: 'EquipmentRepairJobMain' }) @@ -230,6 +228,29 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { detailRef.value.openDetail(row, titleName, titleValue, 'basicEquipmentRepairJobMain') } +/** 页面操作 */ +let count = ref(0) +const handleMainFefresh = async()=>{ + count.value++ + getList() +} + +// 子页面查询字典页面返回 +const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { + nextTick(() => { + const setV = {} + let result = ''; + for (var i = 0; i < val.length; i++) { + result += val[i].code + ','; + } + if(result.endsWith(',')){ + result = result.substring(0,result.length -1) + } + setV[formField] = result; + formRef.setValues(setV) + }) +} + /** 完成按钮操作 */ const finishForm2Ref = ref() const handleFinish = async (row) => { From dafe11e16da93db249d5d15dc64abaaefe373b41 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Thu, 6 Jun 2024 13:40:53 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=AD=9B=E9=80=89=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20business=5Ftype=20=3D=20?= =?UTF-8?q?=20ReturnToHold?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMainNo/index.vue | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 94db7444d..6d581ac4a 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -120,7 +120,7 @@ const tableColumns = ref([...ProductionreturnRequestMain.allSchemas.tableColumns const detailListTableColumns = ProductionreturnRequestDetailNoLabel.allSchemas const isCreateLabel = ref(false) const formLabelRef = ref() -const labelType = ref('') // 标签类别 采购还是制造等 +const labelType = ref('') // 标签类别 采购还是制造等 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ getListApi: ProductionreturnRequestDetailNoApi.getProductionreturnRequestDetailPage }) @@ -254,7 +254,7 @@ const HeadButttondata = [ defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 - + ] // 头部按钮事件 @@ -468,7 +468,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = false console.log(err) }) - } else if (val == 'edit') { // 编辑 + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.masterId) @@ -659,13 +659,23 @@ const importFormRef = ref() // 筛选提交 const searchFormClick = (searchData) => { - tableObject.params = { - isSearch: true, - filters: searchData.filters + tableObject.params.isSearch = true + if(!searchData.filters){//重置的时候应用 + searchData.filters = [] + } + let filters = [...searchData.filters] + if(!filters.find(item=>item.column=='business_type')) { + filters = [...filters,{ + action:'==', + column:'business_type', + value:'ReturnToHold', + }] } + tableObject.params.filters = filters getList() // 刷新当前列表 } + /** 初始化 **/ onMounted(async () => { getList()