调整样式

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -8,12 +8,14 @@
                     <span>{{$t('workingHoursHousekeeper')}}</span>
                 </div>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="8">
                 <div class="tools" @click.prevent="collapse" style="position: relative;">
                     <i class="fa fa-align-justify"></i>
-                    <span style="position: absolute;width: 350px;left: 60px;">
+                    <div class="gongshimingz">
                         {{user.companyName}}
-                    </span>
+                        {{user.companyName}}
+                        {{user.companyName}}
+                    </div>
                 </div>
             </el-col>
 
@@ -111,6 +113,7 @@
                 </el-dropdown>
             </el-col>
         </el-col>
+
         <el-col :span="24" class="main">
 
             <aside :class="collapsed?'menu-collapsed':'menu-expanded'">
@@ -630,6 +633,16 @@
 </script>
 
 <style scoped lang="scss">
+.gongshimingz {
+    position: absolute;
+    left: 0px;
+    display: inline-block;
+    overflow: hidden; 
+    white-space: nowrap; 
+    text-overflow: ellipsis; 
+    box-sizing: border-box;
+    padding-left: 60px;
+}
     .el-menu-vertical-demo i {
         margin-right: 10px;
     }
@@ -717,7 +730,7 @@
             }
             .tools {
                 padding: 0px 23px;
-                width: 14px;
+                // width: 14px;
                 height: 60px;
                 line-height: 60px;
                 cursor: pointer;

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -297,7 +297,8 @@
         <el-dialog :title="depTitle" :visible.sync="departmentVisible" width="500px" >
             <el-form ref="depForm" :model="depForm" :rules="depRules" label-width="100px">
                 <el-form-item :label="$t('departmentname')" prop="name">
-                    <el-input v-model="depForm.name" :placeholder="$t('peaseenterthe')" clearable style="width: 100%"></el-input>
+                    <el-input v-model="depForm.name" :placeholder="$t('peaseenterthe')" clearable style="width: 100%" v-if="user.userNameNeedTranslate != '1'"></el-input>
+                    <div v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='departmentName' :openid='depForm.name'></ww-open-data></div>
                 </el-form-item>
 
                 <!-- 主要负责人 -->
@@ -308,7 +309,7 @@
                           <span style="float: right; color: #8492a6; font-size: 13px">{{ item.jobNumber }}</span>
                         </el-option>
                     </el-select>
-                    <selectCat :size="'small'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.managerId" :distinction="'3'" @selectCal="selectCal"></selectCat>
+                    <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.managerId" :distinction="'3'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
 
                 <!-- 其他负责人 --> 
@@ -319,14 +320,14 @@
                           <span style="float: right; color: #8492a6; font-size: 13px">{{ item.jobNumber }}</span>
                         </el-option>
                     </el-select>
-                    <selectCat :size="'small'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.otherManagerIds" :distinction="'4'" @selectCal="selectCal"></selectCat>
+                    <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.otherManagerIds" :distinction="'4'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
                 <!-- 直属领导 -->
                 <el-form-item :label="$t('leadership')" prop="reportAuditUserid" v-if="user.timeType.needDeptAudit && user.userNameNeedTranslate != '1'">
                     <el-select v-model="depForm.reportAuditUserid" filterable  clearable  :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%">
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
-                    <selectCat :size="'small'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.reportAuditUserid" :distinction="'5'" @selectCal="selectCal"></selectCat>
+                    <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.reportAuditUserid" :distinction="'5'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">