优化

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");

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) {

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]