diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue index ab48abf9..a4f1ecb5 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue @@ -266,7 +266,7 @@ @@ -506,6 +506,14 @@ const saveMaterials = async () =>{ }) } +const deleteForm = async () =>{ + // 提示用户是否保存入库信息 + await message.confirm('确认删除当前物料需求计划?') + + await MaterialPlanApi.deleteMaterialPlan(formData.value.id) + + router.push({ path: '/purchase/materialplan' }) +} // 保存按钮数据提交 const saveForm = async () => { // 提交请求 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue index c4ade4cf..fbfc4114 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue @@ -89,8 +89,8 @@ - - + + @@ -146,7 +146,7 @@ const formData = ref({ purchaseNo:undefined, projectMaterialPlanNo: undefined, projectMaterialPlanId: undefined, - goodsType: undefined, + goodsType: 1, currencyType: undefined, taxRatio: undefined, status:1, @@ -186,10 +186,16 @@ const submitForm = async () => { const data = formData.value as unknown as PurchaseOrderApi.PurchaseOrderVO var purchaseOrderId = await PurchaseOrderApi.createPurchaseOrder(data) router.push({ path: '/purchase/edit', query: { id: purchaseOrderId } }) + + + //this.$tab.closeOpenPage({path:"/purchase/add"}); dialogVisible.value = false } finally { formLoading.value = false + + //this.$tab.closePage(); + } } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue index 5073d3c1..0675e30a 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue @@ -326,7 +326,7 @@ @@ -569,6 +569,13 @@ const saveMaterials = async () =>{ }) } +const deleteForm = async () =>{ + // 提示用户是否保存入库信息 + await message.confirm('确认删除当前采购订单?') + + await PurchaseOrderApi.deletePurchaseOrder(formData.value.id) + router.push({ path: '/purchase/purchaseorder' }) +} // 保存按钮数据提交 const saveForm = async () => { // 提交请求