From 14c19ca912f055a796c5d1de54d82424244b2542 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Tue, 11 Aug 2020 16:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/approval_service_detail.vue | 2 +-
 src/pages/workbench/fwgl/serviceEdit.vue             | 6 +++---
 src/pages/workbench/workPlace.vue                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/workbench/fwgl/approval_service_detail.vue b/src/pages/workbench/fwgl/approval_service_detail.vue
index eb3e694..3aa91aa 100644
--- a/src/pages/workbench/fwgl/approval_service_detail.vue
+++ b/src/pages/workbench/fwgl/approval_service_detail.vue
@@ -384,7 +384,7 @@ export default {
                               },
                               { 
                                   title:'审批单位：',
-                                  info:e.user_info.department_name
+                                  info:e.user_info.department_name?e.user_info.department_name:'无'
                               },
                               {
                                   title:'审批人：',
diff --git a/src/pages/workbench/fwgl/serviceEdit.vue b/src/pages/workbench/fwgl/serviceEdit.vue
index ac70ac6..bdf6d1f 100644
--- a/src/pages/workbench/fwgl/serviceEdit.vue
+++ b/src/pages/workbench/fwgl/serviceEdit.vue
@@ -311,7 +311,7 @@ export default {
           if(reg.test(this.maxline)){
 
           }else{
-            this.$message.error('请输入长度小于6的正整数')
+            this.$message.error('请输入6位内的正整数')
             return
           }
         }else{
@@ -327,7 +327,7 @@ export default {
           if(reg.test(this.maxline1)){
 
           }else{
-            this.$message.error('请输入长度小于6的正整数')
+            this.$message.error('请输入6位内的正整数')
             return
           }
         }
@@ -338,7 +338,7 @@ export default {
           if(reg.test(this.maxline1)){
 
           }else{
-            this.$message.error('请输入长度小于6的正整数')
+            this.$message.error('请输入6位内的正整数')
             return
           }
         }
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index 8cd512e..15c3fad 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -3,7 +3,7 @@
     <div class="person_info">
       <div class="preson">
         <div class="person_text">
-          <img style="width:40px;" :src="picture_path" alt />
+          <img style="width:40px;" :src="picture_path?picture_path:require('../../assets/imgs/img_head.png')" alt />
           <span>你好，{{ person }}！{{login_time?'最近登录 ':''}}{{ login_time }}</span>
         </div>
         <div class="person_menu">
-- 
2.26.0