From fbeb09e44c85b0e4ecdd61d5b9cf2c4b0a17c11e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 11:42:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AC=AC=E4=B8=89=E6=96=B9=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/project/menu/EditProject.vue      | 16 +++++++++++-----
 .../workspace/template/TemplateSelect.vue        |  2 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/project/menu/EditProject.vue b/frontend/src/business/components/project/menu/EditProject.vue
index 862151e977..6b0482c604 100644
--- a/frontend/src/business/components/project/menu/EditProject.vue
+++ b/frontend/src/business/components/project/menu/EditProject.vue
@@ -19,14 +19,16 @@
           <template-select :data="form" scene="API_CASE" prop="caseTemplateId" ref="caseTemplate"/>
         </el-form-item>
 
-        <el-form-item v-if="form.platform == 'Jira'" :label-width="labelWidth" :label="$t('test_track.issue.use_third_party')" prop="scenarioCustomNum">
-          <el-switch v-model="form.thirdPartTemplate"></el-switch>
-        </el-form-item>
-
-        <el-form-item v-if="!form.thirdPartTemplate" :label-width="labelWidth"
+        <el-form-item :label-width="labelWidth"
                       :label="$t('workspace.issue_template_manage')" prop="issueTemplateId">
           <template-select :platform="form.platform" :data="form" scene="ISSUE" prop="issueTemplateId"
+                           :disabled="form.platform === 'Jira' && form.thirdPartTemplate"
                            ref="issueTemplate"/>
+
+          <el-checkbox @change="thirdPartTemplateChange" v-if="form.platform === 'Jira'" v-model="form.thirdPartTemplate" style="margin-left: 10px">
+            {{ $t('test_track.issue.use_third_party') }}
+          </el-checkbox>
+
         </el-form-item>
 
         <el-form-item :label-width="labelWidth" label="TCP Mock Port">
@@ -215,6 +217,10 @@ export default {
         this.$refs.caseTemplate.getTemplateOptions();
       }
     },
+    thirdPartTemplateChange(val) {
+      if (val)
+        this.form.issueTemplateId = '';
+    },
     edit(row) {
       this.title = this.$t('project.edit');
       this.getOptions();
diff --git a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
index 21b13bb180..ddefb18bd3 100644
--- a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
+++ b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
@@ -1,6 +1,7 @@
 <template>
   <el-select filterable v-model="data[prop]">
     <el-option
+      :disabled="disabled"
       v-for="(item, index) in templateFilterOptions"
       :key="index"
       :label="item.name"
@@ -19,6 +20,7 @@ export default {
     scene: String,
     prop: String,
     platform: String,
+    disabled: Boolean,
     data: {
       type: Object,
       default() {