From f3d88812372397e7c14366275356df22b066cfaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Tue, 12 Sep 2023 23:03:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=8C=E6=88=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/pro/workorder.js          |  7 +++++++
 src/views/mes/pro/workorder/index.vue | 27 ++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/api/mes/pro/workorder.js b/src/api/mes/pro/workorder.js
index d5abb1a..ef8118a 100644
--- a/src/api/mes/pro/workorder.js
+++ b/src/api/mes/pro/workorder.js
@@ -50,4 +50,11 @@ export function listItems(query) {
     method: 'get',
     params: query
   })
+}
+
+export function dofinish(workorderId){
+  return request({
+    url: '/mes/pro/workorder/'+workorderId,
+    method: 'put'
+  })
 }
\ No newline at end of file
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 3f44e0e..6aee0e8 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -179,8 +179,16 @@
             icon="el-icon-plus"
             v-if="scope.row.status =='CONFIRMED'"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['mes:pro:workorder:add']"
+            v-hasPermi="['mes:pro:workorder:update']"
           >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-circle-check"
+            v-if="scope.row.status =='CONFIRMED'"
+            @click="handleFinish(scope.row)"
+            v-hasPermi="['mes:pro:workorder:update']"
+          >完成</el-button>
           <el-button
             size="mini"
             type="text"
@@ -350,7 +358,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
         <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>
-        <el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view'  && form.workorderId !=null">完成</el-button>
+        <el-button type="success" @click="handleConfirm" v-if="form.status =='PREPARE' && optType !='view'  && form.workorderId !=null">完成</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -358,7 +366,7 @@
 </template>
 
 <script>
-import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder } from "@/api/mes/pro/workorder";
+import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder ,dofinish} from "@/api/mes/pro/workorder";
 import Workorderbom from "./bom/bom.vue";
 import WorkorderItemList from "./items/item.vue";
 import ItemSelect  from "@/components/itemSelect/single.vue";
@@ -639,13 +647,22 @@ export default {
         ...this.queryParams
       }, `workorder_${new Date().getTime()}.xlsx`)
     },
-    handleFinish(){
+    handleConfirm(){
       let that = this;
-      this.$modal.confirm('是否完成工单编制？【完成后将不能更改】').then(function(){
+      this.$modal.confirm('是确认完成工单编制？【确认后将不能更改】').then(function(){
         that.form.status = 'CONFIRMED';
         that.submitForm();
       });
     },
+    handleFinish(row){
+      const workorderIds = row.workorderId || this.ids;
+      this.$modal.confirm('确认完成工单？一旦完成，此工单将无法继续报工').then(function() {
+        return dofinish(workorderIds) //完成工单
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("更改成功");
+      }).catch(() => {});
+    },
     //物料选择弹出框
     onItemSelected(obj){
         if(obj != undefined && obj != null){