mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-12 11:19:56 +00:00
perf: 延期任务支持快选时间
This commit is contained in:
parent
906d87f43f
commit
43e6b4dc2f
@ -132,7 +132,6 @@ class SystemController extends AbstractController
|
|||||||
$setting['auto_archived'] = $setting['auto_archived'] ?: 'close';
|
$setting['auto_archived'] = $setting['auto_archived'] ?: 'close';
|
||||||
$setting['archived_day'] = floatval($setting['archived_day']) ?: 7;
|
$setting['archived_day'] = floatval($setting['archived_day']) ?: 7;
|
||||||
$setting['task_visible'] = $setting['task_visible'] ?: 'close';
|
$setting['task_visible'] = $setting['task_visible'] ?: 'close';
|
||||||
$setting['task_default_time'] = $setting['task_default_time'] ? Base::json2array($setting['task_default_time']) : ['09:00', '18:00'];
|
|
||||||
$setting['all_group_mute'] = $setting['all_group_mute'] ?: 'open';
|
$setting['all_group_mute'] = $setting['all_group_mute'] ?: 'open';
|
||||||
$setting['all_group_autoin'] = $setting['all_group_autoin'] ?: 'yes';
|
$setting['all_group_autoin'] = $setting['all_group_autoin'] ?: 'yes';
|
||||||
$setting['user_private_chat_mute'] = $setting['user_private_chat_mute'] ?: 'open';
|
$setting['user_private_chat_mute'] = $setting['user_private_chat_mute'] ?: 'open';
|
||||||
|
|||||||
@ -3,6 +3,7 @@
|
|||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use App\Module\Base;
|
use App\Module\Base;
|
||||||
|
use App\Module\Timer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* App\Models\Setting
|
* App\Models\Setting
|
||||||
@ -46,6 +47,9 @@ class Setting extends AbstractModel
|
|||||||
switch ($this->name) {
|
switch ($this->name) {
|
||||||
case 'system':
|
case 'system':
|
||||||
$value['system_alias'] = $value['system_alias'] ?: env('APP_NAME');
|
$value['system_alias'] = $value['system_alias'] ?: env('APP_NAME');
|
||||||
|
if (!is_array($value['task_default_time']) || count($value['task_default_time']) != 2 || !Timer::isTime($value['task_default_time'][0]) || !Timer::isTime($value['task_default_time'][1])) {
|
||||||
|
$value['task_default_time'] = ['09:00', '18:00'];
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'fileSetting':
|
case 'fileSetting':
|
||||||
$value['permission_pack_type'] = $value['permission_pack_type'] ?: 'all';
|
$value['permission_pack_type'] = $value['permission_pack_type'] ?: 'all';
|
||||||
|
|||||||
@ -500,6 +500,13 @@
|
|||||||
</Select>
|
</Select>
|
||||||
</template>
|
</template>
|
||||||
</Input>
|
</Input>
|
||||||
|
<div v-if="delayTaskQuick.length > 0" class="form-tip delay-task-quick-select">
|
||||||
|
<span>{{$L('快捷选择')}}:</span>
|
||||||
|
<em
|
||||||
|
v-for="(item, index) in delayTaskQuick"
|
||||||
|
:key="index"
|
||||||
|
@click="onTaskQuick(item.time, item.type)">{{$L(item.name)}}</em>
|
||||||
|
</div>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
<FormItem :label="$L('延期备注')" prop="remark">
|
<FormItem :label="$L('延期备注')" prop="remark">
|
||||||
<Input type="textarea" v-model="delayTaskForm.remark" :placeholder="$L('请输入修改备注')"></Input>
|
<Input type="textarea" v-model="delayTaskForm.remark" :placeholder="$L('请输入修改备注')"></Input>
|
||||||
@ -527,6 +534,22 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
.delay-task-quick-select {
|
||||||
|
> span {
|
||||||
|
margin-right: 4px;
|
||||||
|
}
|
||||||
|
> em {
|
||||||
|
margin-right: 4px;
|
||||||
|
cursor: pointer;
|
||||||
|
color: #2b85e4;
|
||||||
|
font-style: normal;
|
||||||
|
&:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
<script>
|
<script>
|
||||||
import {mapState} from "vuex";
|
import {mapState} from "vuex";
|
||||||
import TaskPriority from "./TaskPriority";
|
import TaskPriority from "./TaskPriority";
|
||||||
@ -644,9 +667,10 @@ export default {
|
|||||||
time: "24",
|
time: "24",
|
||||||
remark: ""
|
remark: ""
|
||||||
},
|
},
|
||||||
|
delayTaskQuick: [],
|
||||||
delayTaskRule: {
|
delayTaskRule: {
|
||||||
time: [
|
time: [
|
||||||
{ required: true, message: this.$L('请输入时长'), trigger: 'blur' },
|
{ required: true, message: this.$L('请输入时长'), trigger: 'blur', type: 'number' },
|
||||||
],
|
],
|
||||||
remark: [
|
remark: [
|
||||||
{ required: true, message: this.$L('请输入备注'), trigger: 'blur' },
|
{ required: true, message: this.$L('请输入备注'), trigger: 'blur' },
|
||||||
@ -1799,6 +1823,12 @@ export default {
|
|||||||
dropDeadline(command) {
|
dropDeadline(command) {
|
||||||
switch (command) {
|
switch (command) {
|
||||||
case 1:
|
case 1:
|
||||||
|
this.delayTaskQuick = [
|
||||||
|
{time: 1, type: 'day', name: '1天'},
|
||||||
|
{time: 2, type: 'day', name: '2天'},
|
||||||
|
{time: 3, type: 'day', name: '3天'},
|
||||||
|
{time: 5, type: 'day', name: '5天'},
|
||||||
|
];
|
||||||
this.delayTaskShow = true;
|
this.delayTaskShow = true;
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
@ -1854,6 +1884,11 @@ export default {
|
|||||||
|
|
||||||
updateVisible() {
|
updateVisible() {
|
||||||
this.updateData(['visibility', 'visibility_appointor'])
|
this.updateData(['visibility', 'visibility_appointor'])
|
||||||
|
},
|
||||||
|
|
||||||
|
onTaskQuick(time, type) {
|
||||||
|
this.$set(this.delayTaskForm, 'time', time)
|
||||||
|
this.$set(this.delayTaskForm, 'type', type)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user