From 7c3c48a543fdde58330ac2af3012bdb35d9292ae Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 24 Oct 2022 15:38:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=97=B6=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1018712 --user=刘瑞斌 【项目设置】版本管理-创建版本的结束时间可以大于开始时间 https://www.tapd.cn/55049933/s/1274400
---
 .../menu/version/MxProjectVersion.vue         | 34 +++++++++++++------
 .../frontend/src/i18n/lang/en-US.js           |  4 ++-
 .../frontend/src/i18n/lang/zh-CN.js           |  3 ++
 .../frontend/src/i18n/lang/zh-TW.js           |  3 ++
 4 files changed, 32 insertions(+), 12 deletions(-)

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 @@
             <el-date-picker style="width: 100%" v-model="form.publishTime" type="datetime"
                             value-format="timestamp"></el-date-picker>
           </el-form-item>
-          <el-form-item :label="$t('project.version.start_time')" prop="startTime">
-            <el-date-picker style="width: 100%" v-model="form.startTime" type="datetime"
-                            value-format="timestamp"></el-date-picker>
-          </el-form-item>
-          <el-form-item :label="$t('project.version.end_time')" prop="endTime">
-            <el-date-picker style="width: 100%" v-model="form.endTime" type="datetime"
-                            value-format="timestamp"></el-date-picker>
+          <el-form-item :label="$t('project_version.version_time')" prop="startTime">
+            <el-date-picker
+              v-model="form.versionTime"
+              style="width: 100%"
+              type="datetimerange"
+              range-separator="-"
+              value-format="timestamp"
+              :start-placeholder="$t('project.version.start_time')"
+              :end-placeholder="$t('project.version.end_time')">
+            </el-date-picker>
           </el-form-item>
         </el-form>
         <template v-slot:footer>
@@ -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: '版本週期',
   }
 }