From 551a6a0a51a23f7586a5329196a6132faf904f11 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Mon, 13 Jun 2022 23:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/wm/rtvendor.js          |  8 ++++++++
 src/views/mes/wm/rtvendor/index.vue | 28 +++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/api/mes/wm/rtvendor.js b/src/api/mes/wm/rtvendor.js
index a739805..8d82d4c 100644
--- a/src/api/mes/wm/rtvendor.js
+++ b/src/api/mes/wm/rtvendor.js
@@ -42,3 +42,11 @@ export function delRtvendor(rtId) {
     method: 'delete'
   })
 }
+
+//执行入库
+export function execute(rtId) {
+  return request({
+    url: '/mes/wm/rtvendor/' + rtId,
+    method: 'put'
+  })
+}
\ No newline at end of file
diff --git a/src/views/mes/wm/rtvendor/index.vue b/src/views/mes/wm/rtvendor/index.vue
index 1068121..96b39f4 100644
--- a/src/views/mes/wm/rtvendor/index.vue
+++ b/src/views/mes/wm/rtvendor/index.vue
@@ -112,6 +112,14 @@
       </el-table-column>      
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            v-if="scope.row.status =='CONFIRMED'"
+            @click="handleExecute(scope.row)"
+            v-hasPermi="['mes:wm:rtvendor:edit']"
+          >执行退货</el-button>
           <el-button
             size="mini"
             type="text"
@@ -224,7 +232,7 @@
 </template>
 
 <script>
-import { listRtvendor, getRtvendor, delRtvendor, addRtvendor, updateRtvendor } from "@/api/mes/wm/rtvendor";
+import { listRtvendor, getRtvendor, delRtvendor, addRtvendor, updateRtvendor,execute } from "@/api/mes/wm/rtvendor";
 import {genCode} from "@/api/system/autocode/rule"
 import VendorSelect from "@/components/vendorSelect/single.vue";
 import Rtvendorline from "./line.vue"
@@ -386,6 +394,24 @@ export default {
         }
       });
     },
+    //确认单据
+    doconfirm(){
+      let that = this;
+      this.$modal.confirm('是否完成供应商退货编制？【完成后将不能更改】').then(function(){
+        that.form.status = 'CONFIRMED';
+        that.submitForm();
+      });
+    },
+    //执行退货
+    handleExecute(row){
+      const rtIds = row.rtId || this.ids;
+      this.$modal.confirm('确认执行退货？').then(function() {
+        return execute(rtIds)//执行入库
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("退货成功");
+      }).catch(() => {});
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const rtIds = row.rtId || this.ids;