提交相关代码

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

@@ -1,13 +1,15 @@
 <template>
     <div class="resetElEmtClass">
-        <el-dialog :title="$t('zhuanYIGongShi')" :visible.sync="modelValue" width="90vw" :top="'8vh'" :before-close="handleClose">
+        <el-dialog :title="$t('zhuanYIGongShi')" :visible.sync="modelValue" width="96vw" :top="'4vh'"
+            :before-close="handleClose">
             <div class="transferWorkingHours">
                 <!-- 筛选条件 -->
                 <div class="transferWorkingHours-title">
                     <el-form :inline="true" :model="filterCriteriaForm" class="demo-form-inline">
                         <el-form-item :label="$t('ren-yuan')">
-                            <el-select v-model="filterCriteriaForm.userList" multiple :placeholder="$t('defaultText.pleaseChoose')" clearable
-                                collapse-tags size="small" @change="filterSelect()" v-if="user.userNameNeedTranslate != 1">
+                            <el-select v-model="filterCriteriaForm.userList" multiple filterable
+                                :placeholder="$t('defaultText.pleaseChoose')" clearable collapse-tags size="small"
+                                @change="filterSelect()" v-if="user.userNameNeedTranslate != 1">
                                 <el-option v-for="item in allUserList" :key="item.id" :label="item.name" :value="item.id">
                                 </el-option>
                             </el-select>
@@ -22,13 +24,14 @@
                                 :end-placeholder="$t('time.endDate')"></el-date-picker>
                         </el-form-item>
                         <el-form-item :label="$t('other.project')">
-                            <el-select v-model="filterCriteriaForm.projectId" clearable :placeholder="$t('defaultText.pleaseChoose')" size="small"
-                                @change="filterSelect()">
+                            <el-select v-model="filterCriteriaForm.projectId" filterable clearable
+                                :placeholder="$t('defaultText.pleaseChoose')" size="small" @change="filterSelect()">
                                 <el-option v-for="item in allProjectList" :key="item.id" :label="item.projectName"
                                     :value="item.id">
-                                    <span style="float: left">{{ item.projectName }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.projectCode
-                                    }}</span>
+                                    <div class="omitText">
+                                        <div class="left">{{ item.projectName }}</div>
+                                        <div class="right">{{ item.projectCode }}</div>
+                                    </div>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -36,10 +39,11 @@
                 </div>
                 <!-- 表格 -->
                 <div>
-                    <el-table :data="tableData" ref="multipleTable" height="50vh" border v-loading="tableDataLoading"
+                    <el-table :data="tableData" ref="multipleTable" height="58vh" border v-loading="tableDataLoading"
                         @selection-change="handleSelectionChange" style="width: 100%">
                         <el-table-column align="center" type="selection" width="55"></el-table-column>
-                        <el-table-column align="center" prop="jobNumber" :label="$t('Worknumber')" width="180"></el-table-column>
+                        <el-table-column align="center" prop="jobNumber" :label="$t('Worknumber')"
+                            width="180"></el-table-column>
                         <el-table-column align="center" prop="userName" :label="$t('lable.name')" width="180">
                             <template slot-scope="scope">
                                 <TranslationOpenDataText type='userName' :openid='scope.row.userName'>
@@ -52,17 +56,24 @@
                                 </TranslationOpenDataText>
                             </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="projectCode" :label="$t('Itemno')" width="240"></el-table-column>
-                        <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')" width="240"></el-table-column>
-                        <el-table-column align="center" prop="createDate" :label="$t('screening.workingDate')" width="180"></el-table-column>
-                        <el-table-column align="center" prop="workingTime" :label="$t('screening.workTime')" width="100"></el-table-column>
-                        <el-table-column align="center" prop="groupName" :label="$t('other.taskGroup')" width="180"></el-table-column>
-                        <el-table-column align="center" prop="stageName" :label="$t('other.inputStage')" width="180"></el-table-column>
+                        <el-table-column align="center" prop="projectCode" :label="$t('Itemno')"
+                            width="240"></el-table-column>
+                        <el-table-column align="center" prop="projectName" :label="$t('headerTop.projectName')"
+                            width="240"></el-table-column>
+                        <el-table-column align="center" prop="createDate" :label="$t('screening.workingDate')"
+                            width="180"></el-table-column>
+                        <el-table-column align="center" prop="workingTime" :label="$t('screening.workTime')"
+                            width="100"></el-table-column>
+                        <el-table-column align="center" prop="groupName" :label="$t('other.taskGroup')"
+                            width="180"></el-table-column>
+                        <el-table-column align="center" prop="stageName" :label="$t('other.inputStage')"
+                            width="180"></el-table-column>
                     </el-table>
                 </div>
                 <!-- 分页 -->
                 <div class="transferWorkingHours-paging">
-                    <div>{{ $t('yiXuanZe') }} {{ tableSelected.length }} {{ $t('tiaoShuJu') }}，{{ $t('gongJiGongShi') }}：{{ totalWorkingHours }} {{ $t('time.hour') }}</div>
+                    <div>{{ $t('yiXuanZe') }} {{ tableSelected.length }} {{ $t('tiaoShuJu') }}，{{ $t('gongJiGongShi') }}：{{
+                        totalWorkingHours }} {{ $t('time.hour') }}</div>
                     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
                         :current-page="pagingForm.pageIndex" :page-sizes="[30, 50, 100, 150, 200, 300]"
                         :page-size="pagingForm.pageSize" layout="prev, pager, next, sizes" :total="pagingTotal">
@@ -72,25 +83,29 @@
                 <div slot="footer">
                     <el-form :inline="true" :model="transform" class="demo-form-inline">
                         <el-form-item :label="$t('zhuanYiZhi')">
-                            <el-select v-model="transform.projectId" clearable :placeholder="$t('defaultText.pleaseChoose')" size="small"
-                                :disabled="!tableSelected.length" @change="changeProject()">
+                            <el-select v-model="transform.projectId" filterable clearable
+                                :placeholder="$t('defaultText.pleaseChoose')" size="small" :disabled="!tableSelected.length"
+                                @change="changeProject()">
                                 <el-option v-for="item in allProjectList" :key="item.id" :label="item.projectName"
                                     :value="item.id">
-                                    <span style="float: left">{{ item.projectName }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.projectCode
-                                    }}</span>
+                                    <div class="omitText">
+                                        <div class="left">{{ item.projectName }}</div>
+                                        <div class="right">{{ item.projectCode }}</div>
+                                    </div>
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item>
-                            <el-select v-model="transform.taskGroupingId" clearable :placeholder="$t('defaultText.pleaseSelectaTaskGroup')"
-                                :disabled="!transform.projectId" size="small" @change="changeTaskGroup()">
+                            <el-select v-model="transform.taskGroupingId" filterable clearable
+                                :placeholder="$t('defaultText.pleaseSelectaTaskGroup')" :disabled="!transform.projectId"
+                                size="small" @change="changeTaskGroup()">
                                 <el-option v-for="item in taskGroupingList" :key="item.id" :label="item.name"
                                     :value="item.id"></el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item>
-                            <el-select v-model="transform.stageId" clearable :placeholder="$t('pleaseselecttheprojectphase')"
+                            <el-select v-model="transform.stageId" filterable clearable
+                                :placeholder="$t('pleaseselecttheprojectphase')"
                                 :disabled="!(transform.projectId && transform.taskGroupingId)" size="small">
                                 <el-option v-for="item in stageList" :key="item.id" :label="item.stagesName"
                                     :value="item.id">
@@ -100,7 +115,8 @@
                         <el-form-item>
                             <el-button type="primary" :size="'small'" :loading="confirmTransformLoading"
                                 @click="confirmTransform()"
-                                :disabled="!(transform.projectId && transform.taskGroupingId && transform.stageId)">{{ $t('queRenZhuanYi') }}</el-button>
+                                :disabled="!(transform.projectId && transform.taskGroupingId && transform.stageId)">{{
+                                    $t('queRenZhuanYi') }}</el-button>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -240,7 +256,7 @@ export default {
         filterSelect() {
             this.pagingForm.pageIndex = 1
             this.getTableList()
-        },  
+        },
         emptyBasicData() {
             this.transform = {
                 projectId: '',
@@ -340,11 +356,31 @@ export default {
 }
 </script>
 <style scoped lang='scss'>
+.omitText {
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+
+    .left {
+        max-width: 300px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    .right {
+        flex: 1;
+        color: #8492a6;
+        font-size: 13px;
+        margin-left: 10px;
+        text-align: right;
+    }
+}
+
 .transferWorkingHours {
     padding: 0 20px;
 
-    .transferWorkingHours-title {}
-
     .transferWorkingHours-paging {
         margin: 10px 0;
         display: flex;