From 6558e97c2c5c4e9b4e341c9b7fec7867d092737d Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 26 Feb 2024 18:21:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

采购订单 删除按钮
---
 .../src/views/heli/materialplan/edit.vue             | 10 +++++++++-
 .../src/views/heli/purchaseorder/add.vue             | 12 +++++++++---
 .../src/views/heli/purchaseorder/edit.vue            |  9 ++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

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 @@
     </el-form>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
-      <el-button @click="deleteForm" type="danger" size="large" v-if="formData.status !== 2 && formData.status !==3">删 除</el-button>
+      <el-button @click="deleteForm" type="danger" size="large" v-if="formData.status == 1">删 除</el-button>
       <el-button @click="saveForm" type="primary" size="large" v-if="formData.status !== 2 && formData.status !==3">保 存</el-button>
       <el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !==3">送 审</el-button>
     </div>
@@ -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 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="采购物类型" prop="goodsType" :rules="formRules.goodsType">
-                      <el-select v-model="formData.goodsType" placeholder="下拉选择" clearable class="!w-240px">
+                    <el-form-item label="采购物料类型" prop="goodsType" :rules="formRules.goodsType">
+                      <el-select v-model="formData.goodsType" placeholder="下拉选择" clearable class="!w-240px" disabled>
                         <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PURCHASE_GOODS_TYPE)"
                           :key="dict.value" :label="dict.label" :value="dict.value" />
                       </el-select>
@@ -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 @@
     </el-form>
     <div class="text-center hl-footer">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
-      <el-button @click="deleteForm" type="danger" size="large" v-if="formData.status !== 2 && formData.status !==3">删 除</el-button>
+      <el-button @click="deleteForm" type="danger" size="large" v-if="formData.status == 1">删 除</el-button>
       <el-button @click="saveForm" type="primary" size="large" v-if="formData.status !== 2 && formData.status !==3">保 存</el-button>
       <el-button @click="submitForm" type="success" size="large" v-if="formData.status !== 2 && formData.status !==3">送 审</el-button>
     </div>
@@ -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 () => {
   // 提交请求