工作台首页

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

@@ -227,6 +227,7 @@ export default {
 .system {
   padding: 0 30px;
   position: relative;
+  margin-bottom: 10px;
 }
 .system .el-select {
   position: absolute;

src/pages/service_shop/shop_car_apply.vue

@@ -137,19 +137,19 @@ export default {
                     if(response.data.success&&data){
                         //应用
                         this.post_arr = [data]
-                        this.post_arr[0].app_id = parseInt(pp_data.app_id)
-                        this.post_arr[0].spec_id = parseInt(pp_data.spec_id)
-                        this.post_arr[0].duration_method = parseInt(pp_data.duration_unit)
-                        this.post_arr[0].duration = parseInt(pp_data.duration)
+                        this.post_arr[0].app_id = parseInt(app_data.app_id)
+                        this.post_arr[0].spec_id = parseInt(app_data.spec_id)
+                        this.post_arr[0].duration_method = parseInt(app_data.duration_unit)
+                        this.post_arr[0].duration = parseInt(app_data.duration)
                         this.post_arr[0].id = ''
                         this.service_arr.push({})
                         this.service_arr[0]['img'] = data.logo
                         this.service_arr[0]['title'] = data.app_name
                         this.service_arr[0]['type'] = data.type_name
                         this.service_arr[0]['auth'] = data.org_name
-                        this.service_arr[0]['size'] = pp_data.spec_id==0?'部署':'开发'
-                        this.service_arr[0]['applytype'] = '申请方式：'+pp_data.duration_unit==1?'月':'年'
-                        this.service_arr[0]['num'] = pp_data.duration
+                        this.service_arr[0]['size'] = '规格：'+(app_data.spec_id==0?'部署':'开发')
+                        this.service_arr[0]['applytype'] = '申请方式：'+(app_data.duration_unit==1?'月':'年')
+                        this.service_arr[0]['num'] = app_data.duration
                         this.service_arr[0]['isMg'] = false
                         this.service_arr[0]['isapp'] = true
                     }
@@ -212,8 +212,6 @@ export default {
             });
         },
         sub_service(){
-            console.log(this.$refs.apply_service.$refs.apply_service_state);
-            console.log(this.$refs.apply_service.$refs.apply_service_state[0].$refs.apply_service_state_table.metaData);
             let formInline = this.$refs.apply_info.formInline
             if(formInline.preson&&formInline.phone){
                 var phone_ruler=/^(?:(?:\+|00)86)?1[3-9]\d{9}$/
@@ -230,6 +228,7 @@ export default {
                 }
                 var temp1 = this.$refs.apply_service.$refs.apply_service_state
                 this.post_arr.forEach((e,idx) => {
+                    debugger
                     if(e.service_id){
                         temp.carts.push(
                             {
@@ -270,13 +269,17 @@ export default {
                 return
             }
             
-            for (let index = 0; index < temp.carts.length; index++) {
-                const e = temp.carts[index];
-                if(e.apply_fields[0].selected == 0){
-                    this.$message.error('请选择所需参数')
-                    return
+            
+                for (let index = 0; index < temp.carts.length; index++) {
+                    const e = temp.carts[index];
+                    if(e.service_id){
+                        if(e.apply_fields[0].selected == 0){
+                            this.$message.error('请选择所需参数')
+                            return
+                        }
+                    }
                 }
-            }
+            
             this.$http
             .post(`/apaas/serviceapp/v3/shopcart/apply`,temp)
             .then(response => {
@@ -285,7 +288,7 @@ export default {
                     this.$message.success('申请成功')
                     this.$router.replace('/shop/service_application_successfully')
                 }else{
-                    this.$message.error('申请失败')
+                    this.$message.error(response.data.errMsg)
                 }
             }).catch(()=>{
                 this.$message.error('申请失败')
@@ -312,8 +315,8 @@ export default {
                         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.spec_id==0?'部署':'开发'
-                        this.service_arr[l]['applytype'] = '申请方式：'+e.duration_unit==1?'月':'年'
+                        this.service_arr[l]['size'] = '规格：'+(e.spec_id==0?'部署':'开发')
+                        this.service_arr[l]['applytype'] = '申请方式：'+(e.duration_unit==1?'月':'年')
                         this.service_arr[l]['num'] = e.duration
                         this.service_arr[l]['isMg'] = false
                         this.service_arr[l]['isapp'] = true

src/pages/workbench/workPlace.vue

@@ -316,6 +316,7 @@ import helper from "@/services/helper.js";
 import dashBoard from '../../components/e-charts/dashboard'
 import { formatDateTime_date } from "@/utils/common";
 import { mapGetters,mapState } from 'vuex'
+import {getCookie} from '../../services/cookie'
 var echarts = require("echarts");
 export default {
   data() {
@@ -1162,7 +1163,7 @@ export default {
     },
     getUserData() {
       this.person = this.userInfo.user_name;
-      this.login_time = this.userInfo.last_login;
+      this.login_time = decodeURIComponent(getCookie('lastLogin'));
     },
     getoperatingdata() {
       this.$http

src/pages/workbench/yygl/approval_app_detail.vue

@@ -265,15 +265,19 @@ export default {
           let data = response.data.data;
           if(!(data&&data.length)){
             if(this.now_user==2){
-              this.approval_arr.push({
-                title: "一级审批",
-                result: "待审批"
-              })
+              
             }else{
               this.servicead_arr[1].splice(0,1)
             }
             return
           }
+          if(this.now_user==2){
+            if(data.length>=2){
+              this.servicead_arr[2].splice(1,1)
+            }
+          }else{
+            this.servicead_arr[1].splice(1,1)
+          }
           data.forEach(e => {
             this.approval_arr.push({
               title: e.level==1?"一级审批":'二级审批',
@@ -281,7 +285,7 @@ export default {
               arr: [
                 {
                   title: "审批时间：",
-                  info: e.created,
+                  info: e.created.split('.')[0].replace('T',' '),
                 },
                 {
                   title: "审批单位：",
@@ -331,8 +335,8 @@ export default {
       },
       post_result(){
         var temp = {
-          "app_id":this.$route.params.app_id,  // 申请的应用的id
-          "apply_id":this.$route.params.id, // 申请id
+          "app_id":parseInt(this.$route.params.app_id),  // 申请的应用的id
+          "apply_id":parseInt(this.$route.params.id), // 申请id
           "status": this.form.result, // 是否通过，-1 不通过   1 通过
           "comments":this.form.option   // 审批意见
         }
@@ -341,6 +345,7 @@ export default {
         .then((response) => {
           if(response.data.success){
             this.$message.success('审批成功')
+            this.back_page()
           }else{
             this.$message.error(errMsg)
           }