From 4ca489427b44e01fc1e104ca2ee15a1cee0ff5ba Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Fri, 19 Jun 2020 15:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/menu.vue                       |  3 +-
 .../workbench/fwgl/apply_service_detail.vue   | 67 +++++++++++--------
 .../fwgl/approval_service_detail.vue          |  2 +-
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/components/menu.vue b/src/components/menu.vue
index 858d328..c5fc60f 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -26,8 +26,9 @@
     <div
       style="float:right;cursor: pointer;position:relative;"
       class="shop_hover"
+      @click="gotopage('/shop/shopping_cart')"
     >
-      <div class="number">99+</div>
+      <div class="number">{{shopping_list.length>=100?'99+':shopping_list.length}}</div>
       <img src="../assets/imgs/home_ic_shop.png" alt class="car" />
       <div class="shop_menu">
         <div class="shop_list_title">最近加入的服务：</div>
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index f4e6012..ec7cd2a 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -378,36 +378,45 @@ export default {
                     }
                 ]
                 console.log(this.zd_table_arr);
-                data.service_apply_info.approval_process.forEach(e => {
-                        this.use_approval_arr.push(
-                            {
-                                title:e.level==1?'一级审批':'二级审批',
-                                result:e.status==-1?'审批未通过':e.status==0?'审批中':'审批通过',
-                            }
-                        )
-                    
-                    if(e.status!==0){
-                        this.use_approval_arr[this.use_approval_arr.length - 1]['arr']=[
-                            {
-                                title:'审批时间：',
-                                info:e.approval_time.split('+')[0].replace("T",' ')
-                            },
-                            { 
-                                title:'审批单位：',
-                                info:e.user_info.department_name
-                            },
-                            {
-                                title:'审批人：',
-                                info:e.user_info.user_name
-                            },
-                            {
-                                title:'审批意见：',
-                                info:e.comments
-                            },
-                        ]
+                if(data.service_apply_info.approval_process){
+                    data.service_apply_info.approval_process.forEach(e => {
+                            this.use_approval_arr.push(
+                                {
+                                    title:e.level==1?'一级审批':'二级审批',
+                                    result:e.status==-1?'审批未通过':e.status==0?'审批中':'审批通过',
+                                }
+                            )
                         
-                    }
-                });
+                        if(e.status!==0){
+                            this.use_approval_arr[this.use_approval_arr.length - 1]['arr']=[
+                                {
+                                    title:'审批时间：',
+                                    info:e.approval_time.split('+')[0].replace("T",' ')
+                                },
+                                { 
+                                    title:'审批单位：',
+                                    info:e.user_info.department_name
+                                },
+                                {
+                                    title:'审批人：',
+                                    info:e.user_info.user_name
+                                },
+                                {
+                                    title:'审批意见：',
+                                    info:e.comments
+                                },
+                            ]
+                            
+                        }
+                    });
+                }else{
+                    this.use_approval_arr.push(
+                                {
+                                    title:'一级审批',
+                                    result:'待审批',
+                                }
+                            )
+                }
                 this.res_data = JSON.parse(data.res_fields)
             })
             .catch(function(response) {
diff --git a/src/pages/workbench/fwgl/approval_service_detail.vue b/src/pages/workbench/fwgl/approval_service_detail.vue
index 9e64c05..cbb63f7 100644
--- a/src/pages/workbench/fwgl/approval_service_detail.vue
+++ b/src/pages/workbench/fwgl/approval_service_detail.vue
@@ -81,7 +81,7 @@ export default {
           option:[
               { required: true, message: '请输入意见', trigger: 'blur' },
               {
-                  min: 10, message: '长度大于10个字符', trigger: 'blur'
+                  min: 10, message: '长度应大于10个字符', trigger: 'blur'
               }
           ]
       },
-- 
2.26.0