-
-
+
+
{{ p.name }}
{{ p.planStartTime }}
@@ -431,7 +435,7 @@ const handleHover = (e: any, item: any) => {
console.log(666);
console.log(e);
console.log(item);
- if (item.state == 4) {
+ if (item.state == 4 || item.state == 5 || item.state == 6) {
const { clientX, clientY } = e;
const decreaseLeft = clientX - 380;
const decreaseTop = clientY - 200;
diff --git a/src/views/project/progressManagement/subItemManagement/index.vue b/src/views/project/progressManagement/subItemManagement/index.vue
index 77c0386..d707584 100644
--- a/src/views/project/progressManagement/subItemManagement/index.vue
+++ b/src/views/project/progressManagement/subItemManagement/index.vue
@@ -29,6 +29,9 @@
:on-success="uploadFileSuccess"
multiple
:limit="1"
+ :data="{
+ engineeringSn: searchSn
+ }"
style="margin-left: 20px"
:show-file-list="false"
>
@@ -160,10 +163,18 @@
-
+
-
+
-
+
({
required: true,
message: "请输入",
trigger: "blur"
+ },
+ workload: {
+ required: true,
+ message: "请输入",
+ trigger: "blur"
+ },
+ completeRatio: {
+ required: true,
+ message: "请输入",
+ trigger: "blur"
+ },
+ state: {
+ required: true,
+ message: "请选择",
+ trigger: "change"
+ },
+ planStartTime: {
+ required: true,
+ message: "请选择",
+ trigger: "change"
+ },
+ planEndTime: {
+ required: true,
+ message: "请选择",
+ trigger: "change"
}
});
const childrenVisible = ref(false);
@@ -352,6 +392,12 @@ const childrenConfirm = async (formEl: FormInstance | undefined, form: any) => {
if (!formEl) return;
await formEl.validate(async (valid, fields) => {
if (valid) {
+ if (form.planStartTime && form.planEndTime) {
+ if (new Date(form.planEndTime).getTime() < new Date(form.planStartTime).getTime()) {
+ ElMessage.error("预计完成日期需大于等于预计开始日期");
+ return;
+ }
+ }
if (form.id) {
if (newTitle.value == "编辑子项") {
form.parentId = parentObj.value.parentId;
@@ -462,8 +508,8 @@ const handleEditItem = async (row: any) => {
newTitle.value = "编辑";
}
childrenFormData.value = { ...row };
- fileList.value = [{ name: "文件", url: row.annexFile }];
- fileList1.value = [{ name: "文件", url: row.overdueIssueFile }];
+ fileList.value = row.annexFile?[{ name: "文件", url: row.annexFile }]:[];
+ fileList1.value = row.overdueIssueFile?[{ name: "文件", url: row.overdueIssueFile }]:[];
childrenVisible.value = true;
};
onMounted(() => {