Merge branch 'zj' into dev

src/components/organization-list/organization-card.vue

@@ -53,6 +53,8 @@ export default {
       default: 0,
     },
   },
+  created(){
+  },
   methods: {
     deleteAction() {
       this.$emit("delete-action", this.data);

src/components/shop-car-apply/apply_service_state.vue

@@ -27,7 +27,11 @@
                       backgroundColor: 'rgba(255, 239, 239, 1)',
                       border: 'solid 1px rgba(215, 164, 169, 1)',
                     }
-                  : {}
+                  : {
+                      color: '#ef9433',
+                      backgroundColor: '#fffee8',
+                      border: 'solid 1px #e4c884',
+                  }
               "
               >{{ item.tip }}</span
             >
@@ -58,16 +62,17 @@
         placeholder="请填写申请服务的应用场景"
       ></el-input>
     </div>
-    <p class="inputtitle degr" @click="showtable = !showtable">
+    <p class="inputtitle degr" v-if="!data.isapp" @click="showtable = !showtable">
       <i :class="showtable ? 'el-icon-caret-bottom' : 'el-icon-caret-right'"></i
       >选择需要申请的数据项：
     </p>
     <table-um
+     v-if="!data.isapp"
       v-show="showtable"
       :isSelection="true"
       :headers="headers"
       :stripe="true"
-      :url="data.tableurl"
+      :datas="data.data"
       class="table"
     ></table-um>
   </div>
@@ -116,9 +121,13 @@ export default {
   },
   watch: {},
   computed: {},
-  created() {},
+  created() {
+
+  },
   mounted() {},
-  methods: {},
+  methods: {
+    
+  },
 };
 </script>
 

src/pages/authority/organizationedit.vue

@@ -155,6 +155,7 @@ export default {
         console.log(this.$route);
         if(this.$route.path.indexOf('add')!==-1){
             this.edit_flag = 0 
+            this.get_now_user()
         }
         if(this.$route.path.indexOf('edit')!==-1){
             this.edit_flag = 1
@@ -165,6 +166,21 @@ export default {
             this.get_user()
         }
     },
+    get_now_user(){
+      this.$http
+            .get(`/apaas/backmgt/user/getCurrentUser`)
+            .then(response => {
+                console.log(response);
+                let data = response.data.data
+                this.form={
+                    person:data.user_name,
+                    date:data.create_date.replace('T',' ').replace('Z',' '),
+                }
+            })
+            .catch((response)=> {
+                
+            });
+    },
     get_user(){
         this.$http
             .get(`/apaas/backmgt/department/detail?department_id=${this.$route.params.id}`)

src/pages/authority/organizationuser.vue

@@ -257,9 +257,7 @@ export default {
                   desc:data.description,
                   person:data.create_user,
                   date:data.create_date,
-                  ip:data.ip_whitelist.map((v,k)=>{
-                    return v
-                  }).join(';'),
+                  ip:data.ip_whitelist,
                   domain:data.domain_name
                 }
             })

src/pages/service_shop/shop_car_apply.vue

@@ -84,6 +84,21 @@ export default {
                     tableurl:'applydata',
                 },
             ],
+            share_arr:[
+                '',
+                {
+                    name:'共享',
+                    val:'share'
+                },
+                {
+                    name:'受限',
+                    val:'limit'
+                },
+                {
+                    name:'敏感',
+                    val:'mg'
+                }
+            ],
            
         };
     },
@@ -94,12 +109,63 @@ export default {
 
     },
     created() {
-
+        this.get_car_list()
     },
     mounted() {
         
     },
     methods: {
+        get_car_list(){
+            this.service_arr = []
+            this.$http
+            .get(`/apaas/serviceapp/v3/shopcart/list`)
+            .then(response => {
+                console.log(response);
+                let data = response.data.data.valid
+                data.forEach(e => {
+                    this.service_arr.push({})
+                    let l = this.service_arr.length -1
+                    if(e.app_id){
+                        //应用
+                        this.service_arr[l]['img'] = e.application.logo
+                        this.service_arr[l]['title'] = e.application.app_name
+                        this.service_arr[l]['type'] = e.application.type_name
+                        this.service_arr[l]['auth'] = e.application.org_name
+                        this.service_arr[l]['size'] = e.app_apply.apply_type==0?'部署':'开发'
+                        this.service_arr[l]['applytype'] = '申请方式：'+e.app_apply.duration_unit==1?'月':'年'
+                        this.service_arr[l]['num'] = e.app_apply.duration
+                        this.service_arr[l]['isMg'] = false
+                        this.service_arr[l]['isapp'] = true
+                    }else{
+                        //服务
+                        this.service_arr[l]['img'] = e.service.cover
+                        this.service_arr[l]['title'] = e.service.name
+                        this.service_arr[l]['type'] = e.service.data_service_type1_name
+                        this.service_arr[l]['tips'] = [
+                            {
+                                tip:this.share_arr[e.service.openness].name,
+                                type:this.share_arr[e.service.openness].val
+                            }
+                        ]
+                        this.service_arr[l]['auth'] = e.service.organization_name
+                        this.service_arr[l]['size'] = '规格：'
+                        e.service.request_spcs_info.forEach(el => {
+                            this.service_arr[l]['size'] = this.service_arr[l]['size'] + '访问次数：'+el.count+',访问量：'+el.pv+','
+                        });
+                        this.service_arr[l]['applytype'] = '申请方式：'+(e.service_apply.duration_unit==1?'月':'年')
+                        this.service_arr[l]['num'] = e.service_apply.duration
+                        this.service_arr[l]['isMg'] = e.service.openness == 3
+                        this.service_arr[l]['data'] = JSON.parse(e.service.res_fields)
+                        console.log(this.service_arr[l]['data']);
+                        this.service_arr[l]['isapp'] = false
+                    }
+                });
+                // this.service_arr = 
+            })
+            .catch((response)=> {
+                
+            });
+        },
         
     },
 };

src/pages/workbench/fwgl/approval_service_detail.vue

@@ -256,7 +256,9 @@ export default {
   },
   watch: {},
   computed: {},
-  created() {},
+  created() {
+    this.get_service_info()
+  },
   mounted() {},
   methods: {
       onSubmit(formName){
@@ -271,7 +273,18 @@ export default {
       },
       download(val){
         console.log(val);
-      }
+      },
+      get_service_info(){
+        this.$http
+          .get(`/apaas/service/v3/service/apply/service?apply_id=${this.$route.params.id}`)
+          .then((response) => {
+            console.log(response);
+          
+          })
+          .catch(function(response) {
+
+          });
+      },
   }
 };
 </script>