From fe16a10214c37b3d1ff919503800960337c7197d Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Wed, 15 Jul 2020 17:13:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BB=93=E5=BA=93tabs?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/image-detail.vue         |  5 +++--
 src/components/table/table-um.vue       |  4 ++--
 src/pages/workbench/workPlace.vue       | 24 +++++++++++++++++++-----
 src/pages/workbench/yygl/app_detail.vue |  6 +++++-
 src/pages/workbench/yygl/yyglList.vue   |  2 +-
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/components/image-detail.vue b/src/components/image-detail.vue
index a716100..8a9bcea 100644
--- a/src/components/image-detail.vue
+++ b/src/components/image-detail.vue
@@ -86,7 +86,8 @@ export default {
     },
   },
   methods: {
-    showDialog(image) {
+    showDialog(image,id) {
+      image.id = id
       this.image = image;
       this.imageData = [];
       this.getImageDetail();
@@ -152,7 +153,7 @@ export default {
     },
     getImageDetail() {
       this.$http
-        .get(`/apaas/hubApi/image/imageDetails/${this.image.name}`)
+        .get(`/apaas/hubApi/image/imageDetails/${this.image.name}?app_id=${this.image.id}`)
         .then(({ data }) => {
           this.imageData = data.data || [];
         })
diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue
index 594e840..7587329 100644
--- a/src/components/table/table-um.vue
+++ b/src/components/table/table-um.vue
@@ -89,12 +89,12 @@
               <b v-for="(btn, key) in item.btnList" :key="key" :style="{marginRight:item.btngap}">
                 <em v-if="btn.label == '分配'">
                   <em
-                    v-if="btn.label == '分配' && scope.row.state == 0"
+                    v-if="btn.label == '分配' && !scope.row.use_uid"
                     class="cur_pointer"
                     style="color: #0f2683"
                     @click="handleClick(btn.type, scope.row)"
                   >分配</em>
-                  <em v-if="btn.label == '分配' && scope.row.state == 1">已分配</em>
+                  <em v-if="btn.label == '分配' && scope.row.use_uid">已分配</em>
                 </em>
 
                 <em v-else-if="btn.label == '当前版本'">
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index 81f9f81..dbbc1f1 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -253,6 +253,9 @@
             </div>
           </div>
           <table-um
+            v-for="(itx,idx) in service_head[now_user]"
+            :key="idx+5000"
+            v-show="idx == now_type"
             :headers="service_head[now_user][now_type]"
             :datas="service_data"
             :stripe="true"
@@ -325,6 +328,10 @@
         </div>
       </div>
     </div>
+    <allot-info-confirm
+      ref="allotConfirm"
+      @allot-success="allotSuccess"
+    ></allot-info-confirm>
   </div>
 </template>
 
@@ -334,6 +341,7 @@ import tableUm from "@/components/table/table-um";
 import ListPagination from "@/components/comments-pagination";
 import helper from "@/services/helper.js";
 import dashBoard from "../../components/e-charts/dashboard";
+import allotInfoConfirm from "@/components/allot-info-confirm";
 import { formatDateTime_date } from "@/utils/common";
 import { mapGetters, mapState } from "vuex";
 import { getCookie } from "../../services/cookie";
@@ -753,7 +761,7 @@ export default {
             {
               prop: "sqzt",
               label: "操作",
-              width: "110px",
+              width: "80px",
               align: "center",
               type: "Button",
               btnList: [
@@ -761,9 +769,9 @@ export default {
                   label: "分配",
                   type: "distribut"
                 },
-                {
-                  label: "已分配"
-                }
+                // {
+                //   label: "已分配"
+                // }
               ]
             }
           ]
@@ -1054,7 +1062,8 @@ export default {
   components: {
     tableUm,
     ListPagination,
-    dashBoard
+    dashBoard,
+    allotInfoConfirm
   },
   computed: {
     ...mapGetters(["level"]),
@@ -1394,9 +1403,14 @@ export default {
         })
         .catch(function(response) {});
     },
+    allotSuccess() {
+      // this.init(this.tempFliter);
+      this.get_service_list()
+    }, 
     //分配接口调用
     distribut(val) {
       console.log(val);
+      this.$refs.allotConfirm.getDetail(val.apply_id);
     },
     manage_func(n) {
       console.log(n);
diff --git a/src/pages/workbench/yygl/app_detail.vue b/src/pages/workbench/yygl/app_detail.vue
index 85e4d58..aeaf46f 100644
--- a/src/pages/workbench/yygl/app_detail.vue
+++ b/src/pages/workbench/yygl/app_detail.vue
@@ -292,6 +292,7 @@ export default {
 
   },
   created() {
+    console.log(this.$route);
     if(this.userInfo){
       this.now_user = this.level
       this.getServiceInfo();
@@ -305,6 +306,9 @@ export default {
     this.get_options()
     this.get_file_name()
     this.get_app_code()
+    if((this.now_user==0||this.now_user==4)&&this.$route.query.source=='apply'){
+      this.service_arr[0].splice(1, 2);
+    }
   },
   mounted() {
     this.header_arr = [
@@ -339,7 +343,7 @@ export default {
   },
   methods: {
     showImageDetail(item) {
-      this.$refs.imageDetail.showDialog(item);
+      this.$refs.imageDetail.showDialog(item,this.$route.params.id);
     },
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue
index 837345f..08b580f 100644
--- a/src/pages/workbench/yygl/yyglList.vue
+++ b/src/pages/workbench/yygl/yyglList.vue
@@ -1268,7 +1268,7 @@ export default {
         `${this.detailsUrl +
           [item.app_id, item.deploy_id, item.id + "/" + item.app_id][
             this.type
-          ]}`
+          ]}?source=${item.source}`
       );
     },
     detailItemDeploy(item) {
-- 
2.26.0