diff --git a/project-management/frontend/src/business/menu/version/MxProjectVersion.vue b/project-management/frontend/src/business/menu/version/MxProjectVersion.vue
index 28afbbec07..d0c351f359 100644
--- a/project-management/frontend/src/business/menu/version/MxProjectVersion.vue
+++ b/project-management/frontend/src/business/menu/version/MxProjectVersion.vue
@@ -117,13 +117,16 @@
-
-
-
-
-
+
+
+
@@ -165,9 +168,12 @@ import MsTableButton from "metersphere-frontend/src/components/MsTableButton";
import MsTableSearchBar from "metersphere-frontend/src/components/MsTableSearchBar";
import {
changeLatest,
- changeProjectVersionEnable, changeStatus,
- checkForDelete, deleteProjectVersion,
- getProjectMembers, getProjectVersion,
+ changeProjectVersionEnable,
+ changeStatus,
+ checkForDelete,
+ deleteProjectVersion,
+ getProjectMembers,
+ getProjectVersion,
isProjectVersionEnable,
listProjectVersions,
saveProjectVersion
@@ -272,6 +278,9 @@ export default {
.then(response => {
this.form = response.data;
this.form.setLatestAble = !response.data.latest;
+ if (this.form.startTime && this.form.endTime) {
+ this.form.versionTime = [this.form.startTime, this.form.endTime];
+ }
this.createVisible = true;
});
},
@@ -300,7 +309,6 @@ export default {
});
},
save(create) {
- this.createLoading = true;
this.$refs['form'].validate(valid => {
if (valid) {
this.form.projectId = this.projectId;
@@ -312,6 +320,10 @@ export default {
});
}
}
+ if (this.form.versionTime) {
+ this.form.startTime = this.form.versionTime[0];
+ this.form.endTime = this.form.versionTime[1];
+ }
this.createLoading = saveProjectVersion(this.form)
.then(resp => {
this.$success(this.$t('commons.save_success'));
diff --git a/project-management/frontend/src/i18n/lang/en-US.js b/project-management/frontend/src/i18n/lang/en-US.js
index 3c159e261f..b152243943 100644
--- a/project-management/frontend/src/i18n/lang/en-US.js
+++ b/project-management/frontend/src/i18n/lang/en-US.js
@@ -30,8 +30,10 @@ const message = {
},
pj_batch_delete: {
error_library: "Confirm batch delete error library"
+ },
+ project_version: {
+ version_time: 'Version cycle',
}
-
}
export default {
diff --git a/project-management/frontend/src/i18n/lang/zh-CN.js b/project-management/frontend/src/i18n/lang/zh-CN.js
index bf04ba616c..b12b864cd0 100644
--- a/project-management/frontend/src/i18n/lang/zh-CN.js
+++ b/project-management/frontend/src/i18n/lang/zh-CN.js
@@ -30,6 +30,9 @@ const message = {
},
pj_batch_delete: {
error_library: "确定批量删除误报库"
+ },
+ project_version: {
+ version_time: '版本周期',
}
}
diff --git a/project-management/frontend/src/i18n/lang/zh-TW.js b/project-management/frontend/src/i18n/lang/zh-TW.js
index 937411bc8e..fd72b75297 100644
--- a/project-management/frontend/src/i18n/lang/zh-TW.js
+++ b/project-management/frontend/src/i18n/lang/zh-TW.js
@@ -30,6 +30,9 @@ const message = {
},
pj_batch_delete: {
error_library: "確定刪除誤報庫"
+ },
+ project_version: {
+ version_time: '版本週期',
}
}