From caf1e876bd0487d76dff041ecbe200becb5762c7 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 31 May 2024 19:24:35 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain.data.ts | 105 +++++++++++------- 1 file changed, 62 insertions(+), 43 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 2b302bfad..c2c4592a0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -743,7 +743,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, + isTableForm:false, + isTable:false, hiddenInMain: true, tableForm:{ disabled:true @@ -760,7 +762,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, + isTableForm:false, + isTable:false, hiddenInMain: true, tableForm:{ disabled:true @@ -771,7 +775,22 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, - + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, { label: '替代批次', field: 'altBatch', @@ -880,6 +899,46 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive // disabled:false // } // }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + // labelMessage: '信息提示说明！！！', + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择从库位代码', + searchField: 'code', + searchTitle: '库位代码信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.getLocationListByAreaAndBusinesstype, + searchCondition: [{ + key: 'businessType', + value: 'PurchaseReturn', + message: '请填写业务类型', + isMainValue: false + }] + }, + hiddenInMain: true, + isTable: false, + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + isTable: false, + form: { + componentProps:{ + disabled:true + } + } + }, { label: '库存余额', field: 'inventoryBalance', @@ -922,21 +981,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive precision: 6 } }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain: true, - isTable: false, - form: { - componentProps:{ - disabled:true - } - } - }, { label: '库存状态', field: 'inventoryStatus', @@ -960,31 +1004,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, - { - label: '从库位代码', - field: 'fromLocationCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - // labelMessage: '信息提示说明！！！', - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择从库位代码', - searchField: 'code', - searchTitle: '库位代码信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.getLocationListByAreaAndBusinesstype, - searchCondition: [{ - key: 'businessType', - value: 'PurchaseReturn', - message: '请填写业务类型', - isMainValue: false - }] - }, - hiddenInMain: true, - isTable: false, - }, { label: '到库位代码', field: 'toLocationCode', From 9e3a35f01422bdee1c1060e554d0719dcfe5cdae Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 31 May 2024 19:41:21 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 40 ++++++++++--------- .../purchasereturnRequestMain.data.ts | 35 +++++++++++++++- 2 files changed, 55 insertions(+), 20 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index e0f65f42e..27581ecc1 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -260,14 +260,16 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row // row['fromLocationCode'] = val[0]['fromLocationCode'] row['toLocationCode'] = val[0]['toLocationCode'] }else if(formField=='fromLocationCode'){ - let params = { - itemCode: row.itemCode, - batch: row.batch, - locationCode:val[0]['code'] - } - let aa = await BalanceApi.getSumByConditions(params); - console.log('23423423',aa); - row['inventoryBalance'] = aa//库存余额 + // let params = { + // itemCode: row.itemCode, + // batch: row.batch, + // locationCode:val[0]['code'] + // } + // let aa = await BalanceApi.getSumByConditions(params); + // console.log('23423423',aa); + // row['inventoryBalance'] = aa//库存余额 + }else if(formField=='packingNumber'){ + row['inventoryBalance'] = val[0]['qty']//库存余额 } } else { const setV = {} @@ -491,17 +493,17 @@ const butttondata = (row,$index) => { hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchasereceipt-request-main:update' }), // 编辑 - { - label: '生成标签', - name: 'ssbq', - hide: isShowMainButton(row, ['3']), - type: 'primary', - icon: '', - color: '', - hasPermi: '', - link: true // 文本展现按钮 - }, - defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印 + // { + // label: '生成标签', + // name: 'ssbq', + // hide: isShowMainButton(row, ['3']), + // type: 'primary', + // icon: '', + // color: '', + // hasPermi: '', + // link: true // 文本展现按钮 + // }, + // defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印 ] } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index c2c4592a0..e26d13203 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -10,6 +10,8 @@ import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackag import * as ItemPackageApi from '@/api/wms/itempackage/index' import * as LocationApi from "@/api/wms/location"; import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data"; +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' @@ -937,7 +939,38 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive componentProps:{ disabled:true } - } + }, + tableForm:{ + // labelMessage: '信息提示说明！！！', + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码、批次、从库位代码', + searchField: 'packingNumber', + searchTitle: '库存余额信息', // 查询弹窗标题 + searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 + searchPage: BalanceApi.getBalancePage, + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + required:true, + isMainValue:false + },{ + key: 'batch', + value: 'batch', + message: '请填写批次', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + required:true, + isMainValue:false + },{ + key: 'fromLocationCode', + value: 'fromLocationCode', + message: '请选择从库位代码', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + required:true, + isMainValue:false + }] + }, }, { label: '库存余额', From 8bf7721322648ccfb08f15f0ddb954c34dbaa5f6 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 31 May 2024 19:43:43 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E5=89=8D=E7=BD=AE=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 2dfe94013..716e2006a 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -390,6 +390,13 @@ const opensearchTable = ( return } }else if(searchCondition[i].isTableRowValue){ + if(searchCondition[i].required){ + if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) { + message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！') + return + } + } + row[searchCondition[i].value] //查询当前table表数据的值 _searchCondition[searchCondition[i].key] = row[searchCondition[i].value] } else { From 45817ec58d91ef224db1189ccbb476d15cd48d4d Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 31 May 2024 19:59:13 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/purchasereturnRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index e26d13203..26962e000 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -963,7 +963,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive required:true, isMainValue:false },{ - key: 'fromLocationCode', + key: 'locationCode', value: 'fromLocationCode', message: '请选择从库位代码', isTableRowValue: true, //查询当前searchTable表中行数据的值 From 38fe212202828d37dd59716178059e0d8dd1a0a9 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Fri, 31 May 2024 20:15:54 +0800 Subject: [PATCH 05/22] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E4=BF=9D?= =?UTF-8?q?=E5=85=BB=E5=B7=A5=E5=8D=95=20=E6=8F=90=E4=BA=A4=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=AA=8C=E8=AF=81=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/equipmentMaintenanceMain/index.ts | 25 +- .../equipmentMaintenanceMain.data.ts | 175 ++++++++++--- .../equipmentMaintenanceMain/finishForm.vue | 232 ++++++++++++++++++ .../eam/equipmentMaintenanceMain/index.vue | 91 +++++-- 4 files changed, 463 insertions(+), 60 deletions(-) create mode 100644 src/views/eam/equipmentMaintenanceMain/finishForm.vue diff --git a/src/api/eam/equipmentMaintenanceMain/index.ts b/src/api/eam/equipmentMaintenanceMain/index.ts index 5bc59771d..4037defac 100644 --- a/src/api/eam/equipmentMaintenanceMain/index.ts +++ b/src/api/eam/equipmentMaintenanceMain/index.ts @@ -3,27 +3,32 @@ import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; export interface EquipmentMaintenanceMainVO { id: number - number: string describing: string + number: string + sources: string equipmentCode: string type: string - classes: string - planNumber: string faultType: string - cycle: string - times: string + planNumber: string + planStartTime: Date + planEndTime: Date + startTime: Date + endTime: Date + classType: string verifyer: number verifyContent: string verifyTime: Date maintenancer: number maintenancePhone: string - completeResult: string completionTime: Date maintenanceTime: Date status: string + autoOrder: string + autoPerform: string + autoVerify: string + directCreateRecord: string factoryAreaCode: string workshopCode: string - workshopSectionCode: string departmentCode: string remark: string siteId: string @@ -49,6 +54,12 @@ export const getEquipmentMaintenanceMain = async (id: number) => { return await request.get({ url: `/eam/equipment-maintenance-main/get?id=` + id }) } + + +export const getMaintenanceOrderConfig = async () => { + return await request.get({ url: `/eam/equipment-maintenance-main/get-order-config`}) +} + // 新增设备保养工单主 export const createEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => { return await request.post({ url: `/eam/equipment-maintenance-main/create`, data }) diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts index d2f92e2ed..717f499ca 100644 --- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts +++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts @@ -7,15 +7,16 @@ import * as WorkshopApi from "@/api/wms/workshop"; import {RelationMaintenancePlanItem} from "@/views/eam/maintenance/maintenance.data"; import * as ItemApi from "@/api/eam/relationMaintenancePlanItem"; import {validateroundNumber} from "@/utils/validator"; -import {getRelationMaintenancePlanItemPage} from "@/api/eam/relationMaintenancePlanItem"; // 表单校验 export const EquipmentMaintenanceMainRules = reactive({ number: [required], + sources: [required], equipmentCode: [required], - planNumber: [required], + type: [required], + planStartTime: [required], + planEndTime: [required], status: [required], - factoryAreaCode: [required], }) export const EquipmentMaintenanceMain = useCrudSchemas(reactive([ @@ -29,23 +30,23 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive([ isDetail:false, }, { - label: '保养工单编号', - field: 'number', + label: '描述', + field: 'describing', sort: 'custom', + isSearch: false, + isTable: false, isForm: false, - isSearch: true, + isDetail:false, }, { - label: '描述', - field: 'describing', + label: '保养工单编号', + field: 'number', sort: 'custom', isSearch: true, }, { - label: '设备类别', - field: 'type', - dictType: DICT_TYPE.DEVICE_TYPE, - dictClass: 'string', + label: '来源字典', + field: 'sources', sort: 'custom', isSearch: true, }, @@ -75,8 +76,16 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive([ } }, { - label: '班次枚举', - field: 'classes', + label: '设备类别', + field: 'type', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', + sort: 'custom', + isSearch: true, + }, + { + label: '故障类型枚举', + field: 'faultType', sort: 'custom', isSearch: true, }, @@ -87,26 +96,98 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive([ isSearch: true, }, { - label: '故障类型枚举', - field: 'faultType', + label: '计划开始时间', + field: 'planStartTime', sort: 'custom', + formatter: dateFormatter, isSearch: true, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, }, { - label: '保养周期', - field: 'cycle', + label: '计划结束时间', + field: 'planEndTime', sort: 'custom', + formatter: dateFormatter, isSearch: true, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, }, { - label: '保养次数', - field: 'times', + label: '保养开始时间', + field: 'startTime', sort: 'custom', + formatter: dateFormatter, isSearch: true, + 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')] + } + }, form: { - component: 'InputNumber', - value: 0 + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '保养结束时间', + field: 'endTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + 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')] + } }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '保养班组', + field: 'classType', + sort: 'custom', + isSearch: true, }, { label: '验证人', @@ -119,6 +200,13 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive([ field: 'verifyContent', sort: 'custom', isSearch: true, + form: { + component: 'Editor', + componentProps: { + valueHtml: '', + height: 200 + } + }, }, { label: '验证时间', @@ -154,12 +242,6 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, }, - { - label: '结果枚举临时措施、完成', - field: 'completeResult', - sort: 'custom', - isSearch: true, - }, { label: '完成时间', field: 'completionTime', @@ -212,14 +294,35 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.EAM_ORDER_STATUS, dictClass: 'string', }, + // { + // label: '自动接单', + // field: 'autoOrder', + // sort: 'custom', + // isSearch: true, + // }, + // { + // label: '自动执行', + // field: 'autoPerform', + // sort: 'custom', + // isSearch: true, + // }, + // { + // label: '自动验证', + // field: 'autoVerify', + // sort: 'custom', + // isSearch: true, + // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + sort: 'custom', + isSearch: true, + }, { label: '所属厂区编号', field: 'factoryAreaCode', sort: 'custom', - isSearch: false, - isTable: false, - isForm: false, - isDetail:false, + isSearch: true, }, { label: '车间编号', @@ -288,9 +391,10 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive([ label: '是否可用默认TRUE', field: 'available', sort: 'custom', - isSearch: true, - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, }, { label: '删除时间', @@ -351,6 +455,7 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive([ ])) + export const EquipmentMaintenanceDetailRules = reactive({ number: [required], masterId: [required], diff --git a/src/views/eam/equipmentMaintenanceMain/finishForm.vue b/src/views/eam/equipmentMaintenanceMain/finishForm.vue new file mode 100644 index 000000000..3834f8f70 --- /dev/null +++ b/src/views/eam/equipmentMaintenanceMain/finishForm.vue @@ -0,0 +1,232 @@ + + + + diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue index 4e0295cb2..fb244e15a 100644 --- a/src/views/eam/equipmentMaintenanceMain/index.vue +++ b/src/views/eam/equipmentMaintenanceMain/index.vue @@ -51,6 +51,20 @@ @onChange="onChange" /> + + + + { } else if (val == 'execute') { // 执行 handleExecute(row.id) } else if (val == 'finish') { // 完成 - handleFinish(row.id) + handleFinish(row) } else if (val == 'validate') { // 验证 handleValidate(row.id) } @@ -330,22 +345,38 @@ const handleExecute = async (id: number) => { } /** 完成按钮操作 */ -const handleFinish = async (id: number) => { - try { - // 中止的二次确认 - await message.delConfirm('是否完成所选中工单？'); - const params = ref({ - id: '', - status:'', - }) - params.value.id = id - params.value.status = '5' - // 发起 - await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value) - message.success(t('工单已完成')) - // 刷新列表 - await getList() - } catch {} +const finishFormRef = ref() +const handleFinish = async (row) => { + let res = await EquipmentMaintenanceMainApi.getMaintenanceOrderConfig(); + //系统配置需要验证 + if(res.remark === 'TRUE'){ + try { + // 中止的二次确认 + await message.delConfirm('是否完成所选中工单？'); + const params = ref({ + id: '', + status:'', + }) + params.value.id = row.id + params.value.status = '5' + // 发起 + await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value) + message.success(t('工单已完成')) + // 刷新列表 + await getList() + } catch {} + } + //系统配置不需要验证 + if(res.remark === 'FALSE'){ + try { + // 中止的二次确认 + await message.delConfirm('是否完成所选中工单？'); + + //打开提交表单 + finishFormRef.value.open('update', row); + + } catch {} + } } /** 验证按钮操作 */ @@ -498,6 +529,30 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } +const getClosed=(val)=> { + //console.log('orderday-publishClosed-200',val) + nextTick?.(() => { + console.log(val) + getList() + }) +} + +const getData=(val)=> { + nextTick?.(async () => { + console.log(val) + const params = ref({ + id: '', + status: '', + }) + params.value.id = val + params.value.status = '5' + // 发起 + await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value) + message.success(t('工单已完成')) + // 刷新列表 + await getList()}) +} + /** 初始化 **/ onMounted(async () => { getList() From 0e1ce7a45099da6c8a9588245b207e940beca94d Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 31 May 2024 20:23:05 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueRequestMain/issueRequestMain.data.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 190e928ae..38407d012 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -673,12 +673,14 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - },{ - key:'productionLineCode', - value:'productionLineCode', - message: '请填写生产线代码！', - isMainValue: true - },{ + }, + // ,{ + // key:'productionLineCode', + // value:'productionLineCode', + // message: '请填写生产线代码！', + // isMainValue: true + // }, + { key: 'businessTypeCode', value: 'Issue', isMainValue: false From d61bdce3e8eda2d9f18eb83ef8a4cdfdd1c205e1 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Fri, 31 May 2024 20:30:40 +0800 Subject: [PATCH 07/22] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?= =?UTF-8?q?=E7=A7=AF=E6=9C=A8=E6=8A=A5=E8=A1=A8=E7=89=88=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/reportList/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/reportList/index.vue b/src/views/wms/reportList/index.vue index a9fdf79dd..a81ebae68 100644 --- a/src/views/wms/reportList/index.vue +++ b/src/views/wms/reportList/index.vue @@ -6,9 +6,11 @@ From 258873383befeac29f47f6810c699af6d631ffdf Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 1 Jun 2024 08:30:59 +0800 Subject: [PATCH 08/22] =?UTF-8?q?dev=E5=8F=91=E5=B8=832024-06-01-001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52d41693e..871612b43 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## dev发布2024-05-23-002 +## dev发布2024-06-01-001 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { From 4872f5498cf73a952c0afc805f8d5fa8c7daad1c Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sat, 1 Jun 2024 10:37:12 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86--=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factoryModeling/productionline/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue index 7defa8b4c..7c32a3771 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue @@ -67,7 +67,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -// 生产线 +// 生产线管理 defineOptions({ name: 'Productionline' }) const message = useMessage() // 消息弹窗 @@ -154,10 +154,10 @@ const openForm = (type: string, row?: any) => { if (item.field == 'code') { item.componentProps.disabled = true } - if (item.field == 'workshopCode') { - item.componentProps.disabled = true - item.componentProps.isSearchList = false - } + // if (item.field == 'workshopCode') { + // item.componentProps.disabled = true + // item.componentProps.isSearchList = false + // } }) }else { From ef6c976405a87e2d614617f52226b75742520381 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sat, 1 Jun 2024 14:47:01 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E8=AF=B7=E8=BE=93=E5=85=A5=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain.data.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 26962e000..35528de62 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -1344,9 +1344,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive //表单校验 export const PurchasereturnRequestDetailRules = reactive({ - // packingNumber: [ - // { required: true, message: '请输入包装号', trigger: 'blur' } - // ], + packingNumber: [ + { required: true, message: '请输入包装号', trigger: 'blur' } + ], // batch: [ // { required: true, message: '请输入批次', trigger: 'blur' } // ], From 597dec6c0edf4ae2eb39188165f4e5f25d12c47e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sat, 1 Jun 2024 18:59:34 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturn/productionreturnRequestMainNo/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 1c0ce5e05..94db7444d 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -590,7 +590,7 @@ const submitForm = async (formType, data) => { const submitFormLabel = async (formType, data) => { try { detatableData.tableList.forEach(async (item) => { - await PackageApi.createPackageLabel(item).then(res => { + await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => { isCreateLabel.value = true message.success('创建标签成功') }).catch(err => { From 33252d2a2b4c3361ee2acd4b1f98933e0b198529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sat, 1 Jun 2024 22:52:25 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8D=A1=E6=AD=BB=20=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/components/material.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/home/components/material.vue b/src/views/home/components/material.vue index 841bab035..2649ab4b3 100644 --- a/src/views/home/components/material.vue +++ b/src/views/home/components/material.vue @@ -251,7 +251,7 @@ const getJobCharts = async () => { lineIndex.value++ } onMounted(async () => { - await getMaterialData() + // await getMaterialData() })