From 75787bbc11eaf23f144f3dca8e5f632a66ec8a24 Mon Sep 17 00:00:00 2001
From: unknown <zheng_z@azut.cn>
Date: Mon, 19 Oct 2020 16:38:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=20=20?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B7=A5=E4=BD=9C=E9=93=BE=20=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components_web/newProj/newProj.vue | 49 ++++++++++++--------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/views/components_web/newProj/newProj.vue b/src/views/components_web/newProj/newProj.vue
index da1ea590..81a39aec 100644
--- a/src/views/components_web/newProj/newProj.vue
+++ b/src/views/components_web/newProj/newProj.vue
@@ -67,8 +67,8 @@
                     <el-form-item label="选择工作链">
                       <el-select v-model="newProjData.projectData.templateID" filterable no-data-text="暂无数据"
                         placeholder="请选择工作链" class="bg_w" @change="changeSelectTemplate">
-                        <el-option v-for="item in selectTemlateData" :key="item.templateID" :label="item.tempName"
-                          :value="item.templateID">
+                        <el-option v-for="item in templateList" :key="item.Id" :label="item.TempName"
+                          :value="item.Id">
                         </el-option>
                       </el-select>
                     </el-form-item>
@@ -549,6 +549,7 @@
 </template>
 
 <script>
+  import * as templateService from '@/services/template';
   export default {
     props: {
       isNewProj: {
@@ -640,6 +641,9 @@
         currSelectData: [],
         currUser:JSON.parse(sessionStorage.user),
         isShowManager:true,
+
+        /*  */
+        templateList: [], // 模板列表
       };
     },
     watch: {
@@ -1416,23 +1420,30 @@
       /**
        * 获取模板列表数据
        */
-      getSelectTemplateData: function() {
-        var thisApp = this;
-        this.$axios({
-            method: 'get',
-            url: encodeURI(process.env.API_HOST + "templates/company/enable/" + sessionStorage.companyId),
-          })
-          .then(response => {
-            thisApp.selectTemlateData = response.data;
-            if (thisApp.selectTemlateData != null && thisApp.selectTemlateData.length > 0) {
-              thisApp.selectTemlateID = thisApp.selectTemlateData[0].templateID;
-              // thisApp.newProjData.projectData.templateID= thisApp.selectTemlateID;
-              // thisApp.changeSelectTemplate(thisApp.selectTemlateID);
-            }
-          })
-          .catch(error => {
-            console.log(error);
-          });
+      async getSelectTemplateData() {
+        const templateListRes = await templateService.queryTemplateList();
+        const templateList = templateListRes.Data || [];
+        this.templateList = templateList;
+        console.log(templateList);
+        if(this.templateList && this.templateList.length) {
+          this.selectTemlateID = templateList[0].Id;
+        }
+        // var thisApp = this;
+        // this.$axios({
+        //     method: 'get',
+        //     url: encodeURI(process.env.API_HOST + "templates/company/enable/" + sessionStorage.companyId),
+        //   })
+        //   .then(response => {
+        //     thisApp.selectTemlateData = response.data;
+        //     if (thisApp.selectTemlateData != null && thisApp.selectTemlateData.length > 0) {
+        //       thisApp.selectTemlateID = thisApp.selectTemlateData[0].templateID;
+        //       // thisApp.newProjData.projectData.templateID= thisApp.selectTemlateID;
+        //       // thisApp.changeSelectTemplate(thisApp.selectTemlateID);
+        //     }
+        //   })
+        //   .catch(error => {
+        //     console.log(error);
+        //   });
       },
       /**
        * 获取模板属性字段