Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

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:'审批人：',

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
           }
         }

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">