From 3d3e7f45086799fdd7a412e2079710a6cdf8dc2b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 24 十月 2024 08:30:04 +0800
Subject: [PATCH] Merge branch 'lsf-dataproduct-1018'
---
src/views/fysp/task/components/CompSubTaskEdit.vue | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/views/fysp/task/components/CompSubTaskEdit.vue b/src/views/fysp/task/components/CompSubTaskEdit.vue
index a7d6f47..f80a20a 100644
--- a/src/views/fysp/task/components/CompSubTaskEdit.vue
+++ b/src/views/fysp/task/components/CompSubTaskEdit.vue
@@ -1,5 +1,6 @@
<template>
<FYForm
+ ref="formRef"
:form-info="formInfo"
:rules="rules"
:useCancel="true"
@@ -23,6 +24,7 @@
:initValue="false"
type="date"
v-model:value="formObj.planstarttime"
+ @change="handleTimeChange"
></FYOptionTime>
<el-form-item label="鎵ц浜�" prop="_executors">
<el-select
@@ -49,6 +51,7 @@
import { ref, computed, onMounted, reactive } from 'vue';
import subtaskApi from '@/api/fysp/subtaskApi';
import userApi from '@/api/fysp/userApi';
+import dayjs from 'dayjs';
const props = defineProps({
//鍩烘湰淇℃伅
@@ -57,8 +60,9 @@
create: Boolean
});
-const emit = defineEmits(['submit', 'cancel']);
+const emit = defineEmits(['submit', 'cancel', 'update:modelValue']);
+const formRef = ref(null);
// 浠诲姟鎵ц浜洪�夐」
const executorOptions = ref([]);
const formInfo = computed(() => {
@@ -86,6 +90,10 @@
}
]
});
+
+function handleTimeChange(time) {
+ formRef.value.formObj.planendtime = dayjs(time).endOf('day').set('millisecond', 0)
+}
function getExecutors(data) {
const ids = [];
@@ -123,6 +131,7 @@
return subtaskApi
.adjustSubtask(v)
.then(() => {
+ emit('update:modelValue', v)
emit('submit', v);
success();
})
@@ -131,6 +140,10 @@
});
}
function submit(v, success, fail) {
+ const executors = getExecutors(v.value);
+ v.value.executorguids = executors.id
+ v.value.executorusernames = executors.uName
+ v.value.executorrealtimes = executors.rName
return props.create
? createScene(v.value, success, fail)
: updateScene(v.value, success, fail);
--
Gitblit v1.9.3