From f5600766d112c19cc520f2ed5ec1ef34f192a0fc Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Fri, 9 Sep 2022 15:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/pdm/service/impl/WorkOrderServiceImpl.java    | 4 ++++
 mes/qd/src/views/wms/pdm/produce/producetask/index.vue   | 9 ++++++---
 mes/qd/src/views/wms/pdm/produce/workorder/index.vue     | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
index ea521e82..deffdc4c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
@@ -184,6 +184,10 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
             if(jo==null){
                 throw new BadRequestException("该记录不存在！");
             }
+            String status = jo.getString("status");
+            if(!"10".equals(status)){
+                continue;
+            }
             JSONObject param = new JSONObject();
             param.put("workorder_id", String.valueOf(workorder_id));
             param.put("is_delete", "1");
diff --git a/mes/qd/src/views/wms/pdm/produce/producetask/index.vue b/mes/qd/src/views/wms/pdm/produce/producetask/index.vue
index e0f7ae8a..15971861 100644
--- a/mes/qd/src/views/wms/pdm/produce/producetask/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/producetask/index.vue
@@ -152,7 +152,7 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange">
         <el-table-column
-          v-permission="['admin','producetask:del']"
+          v-permission="['admin','workorder:del','workorder:edit']"
           min-width="60"
           label="操作"
           align="center"
@@ -224,7 +224,7 @@ export default {
       optShow: {
         add: false,
         edit: false,
-        del: false,
+        del: true,
         download: false,
         reset: false
       }})
@@ -241,7 +241,9 @@ export default {
       fullscreenLoading: false,
       checkrows: [],
       permission: {
-        del: ['admin', 'producetask:del']
+        add: ['admin', 'workorder:add'],
+        edit: ['admin', 'workorder:edit'],
+        del: ['admin', 'workorder:del']
       },
       form: { name: '' },
       rules: {
@@ -275,6 +277,7 @@ export default {
     },
     mySelectionChange(rows) {
       this.buttonChange(rows)
+      this.crud.selectionChangeHandler(rows)
     },
     buttonChange(rows) {
       if (rows.length !== 0) {
diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
index ca9a0b33..a6891e30 100644
--- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
@@ -302,7 +302,7 @@ export default {
       optShow: {
         add: true,
         edit: false,
-        del: false,
+        del: true,
         reset: true,
         download: false
       }})
@@ -372,6 +372,7 @@ export default {
     },
     mySelectionChange(rows) {
       this.buttonChange(rows)
+      this.crud.selectionChangeHandler(rows)
     },
     workorder_typeFormat2(row) {
       return this.dict.label.workorder_type2[row.workorder_type]