Merge branch 'master' of http://121.40.234.130:8899/root/yongYuJiaJu

2022-10-26 11:00:55 +08:00
parent e55a9f35a1 19f29989c1
commit 43435792ba
23 changed files with 543 additions and 62 deletions
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -138,7 +138,7 @@
          v-permission="['admin','instruction:edit','instruction:del']"
          fixed="right"
          label="操作"
-          width="120px"
+          width="160px"
          align="center"
        >
          <template slot-scope="scope">
@@ -152,6 +152,11 @@
              icon="el-icon-success"
              @click="doOperate(scope.row, 'a')"
            >完成</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-error"
+              @click="doOperate(scope.row, 'b')"
+            >取消</el-button>
          </template>
        </el-table-column>
      </el-table>