任务取消按钮显示优化

skyouc

3 天以前 2acbcdae0923b28be1dd4b7f6315eee64126dc01

任务取消按钮显示优化

 rsf-admin/src/page/task/TaskList.jsx

@@ -273,7 +273,7 @@
        }
    }
    return (
        (record.taskStatus >= 1 && record.taskType  < 50) || (record.taskStatus == 101) ?  
        (record.taskStatus == 1 || record.taskStatus  < 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 104) ?  
            <Button
                onClick={clickCancel}
                label="toolbar.cancel">

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -566,6 +566,7 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R removeTask(Long[] ids) {
        List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
        List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_EMPITY_IN.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);