1

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1284,7 +1284,7 @@
       :visible.sync="monthWorkTimeDialog"
       :close-on-click-modal="false"
       customClass="customWidth selectworktime"
-      width="63%"
+      width="1200px"
       title=""
     >
       <!-- <el-input style="width:100%" v-model="filterName" placeholder="请输入姓名搜索" @change="findUserInTree"></el-input> -->
@@ -1487,20 +1487,22 @@
             </div>
             <div>
                 <div style="margin-top:10px;">
-                <el-cascader v-if="user.userNameNeedTranslate != 1" v-model="deptIdForNoReport" placeholder="请选择部门" :options="departmentList" :props="{ checkStrictly: true, value: 'id' }" clearable style="width: 350px;" @change="showMonthNotWorkTime()"></el-cascader>
-                <vueCascader :size="'medium'" :widthStr="'350'" :clearable="true" :subject="departmentList" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1" :selectNameChuan="$t('other.allDepartments')" @change="showMonthNotWorkTime()"></vueCascader>
+                    <el-cascader v-if="user.userNameNeedTranslate != 1" :size="'small'" v-model="deptIdForNoReport" placeholder="请选择部门" :options="departmentList" :props="{ checkStrictly: true, value: 'id' }" clearable style="width: 200px;" @change="showMonthNotWorkTime()"></el-cascader>
+                    <vueCascader :size="'medium'" :widthStr="'200'" :clearable="true" :subject="departmentList" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1" :selectNameChuan="$t('other.allDepartments')" @change="showMonthNotWorkTime()"></vueCascader>
+                    <el-input style="width:200px;margin-left: 15px" v-if="user.userNameNeedTranslate != '1'" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
+                        <el-button slot="append" @click="searchScreen(1)" icon="el-icon-search"></el-button>
+                    </el-input>
+                    <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="usersList" :subjectId="usersListId" :distinction="'13'" :clearable="true" @selectCal="selectCal"></selectCat>
+
+                    <el-link
+                        type="primary"
+                        style="float: right; vertical-align: middle;height:32px"
+                        @click="exportMembNotWorkHours()"
+                        >{{$t('export.exportData')}}</el-link
+                    >
                 </div>
-                <el-input style="float:left;width:22%" v-if="user.userNameNeedTranslate != '1'" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
-                    <el-button slot="append" @click="searchScreen(1)" icon="el-icon-search"></el-button>
-                </el-input>
-                <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'small'" :subject="usersList" :subjectId="usersListId" :distinction="'13'" :clearable="true" @selectCal="selectCal"></selectCat>
             </div>
-            <el-link
-              type="primary"
-              style="float: right; vertical-align: middle;height:32px"
-              @click="exportMembNotWorkHours()"
-              >{{$t('export.exportData')}}</el-link
-            >
+            
           </div>
           <el-table
             ref="hasworkTbl2"
@@ -7864,7 +7866,7 @@
       top: 48px !important;
     }
     .selectworktime_export .selectworktime_export_l{
-        width: 65%;
+        width: 650px;
         float: left;
         height: 42px;
     }