Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -107,7 +107,7 @@
             </el-form>
         </el-col>
         <!--列表-->
-        <el-table ref="projectlistOfWudulist" @cell-click="clickCell" :cell-class-name="tableCellClassName" :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @selection-change="checkedWudulist" @sort-change="tableSort">
+        <el-table ref="projectlistOfWudulist" @cell-mouse-enter="hoverCall" @cell-mouse-leave="handCall" @cell-click="clickCell" :cell-class-name="tableCellClassName" :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @selection-change="checkedWudulist" @sort-change="tableSort">
             <el-table-column type="selection" width="60" :selectable="isSelectable">
                 <!-- creator 项目创建人    incharger 项目负责人 -->
             </el-table-column>
@@ -156,7 +156,7 @@
                         <el-link v-else type="primary" :underline="false">{{scope.row.currentStage == null ? '暂无' : scope.row.currentStage}}</el-link>
                     </span> 
                     
-                    <el-link v-if="(permissions.projectManagement || user.id==scope.row.inchargerId || user.id==scope.row.creatorId) && scope.row.index + ',' + scope.column.index != currentCell" type="primary" :underline="false"><i class="el-icon-edit"></i></el-link> 
+                    <el-link v-if="(permissions.projectManagement || user.id==scope.row.inchargerId || user.id==scope.row.creatorId) && scope.row.index + ',' + scope.column.index != currentCell && rowid == scope.row.id" type="primary" :underline="false"><i class="el-icon-edit"></i></el-link> 
                 </template>
             </el-table-column>
 
@@ -947,6 +947,7 @@ a {
                 phaseProjectId: '', // 阶段项目id
                 phaseProjectValie: null, // 阶段项目值
                 listHeader: [], // 列表表头
+                rowid: ''
             };
         },
         // 过滤器
@@ -986,6 +987,12 @@ a {
             }
         },
         methods: {
+            hoverCall(row) {
+                this.rowid=row.id
+            },
+            handCall() {
+                this.rowid = ''
+            },
             // 获取阶段
             obtainPhase(item) {
                 this.http.post('/stages/getProjectStages', {

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

@@ -6,11 +6,11 @@
                 <el-form-item label="部门：">
                     <el-cascader v-model="search.departmentId" placeholder="请选择部门" style="width: 100%"
                     :options="option" :props="{ checkStrictly: false,expandTrigger: 'hover' }" :show-all-levels="false" clearable
-                    @change="getList()"
+                    @change="getList()" size="small"
                     ></el-cascader>
                 </el-form-item>
                 <el-form-item label="项目：">
-                    <el-select v-model="search.projectId" placeholder="请选择" clearable @change="getList()" filterable="true">
+                    <el-select v-model="search.projectId" placeholder="请选择" clearable @change="getList()" filterable="true" size="small">
                         <el-option v-for="item in projectList" :key="item.id" :label="item.projectName + item.projectCode" :value="item.id">
                             <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
                             <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
@@ -20,15 +20,15 @@
                 <el-form-item style="margin-left:20px;">
                     <template>
                         <div>
-                            <el-select v-model="search.dateType" placeholder="请选择" style="width: 80px" @change="dataFlgs()">
+                            <el-select v-model="search.dateType" placeholder="请选择" style="width: 80px" @change="dataFlgs()" size="small">
                                 <el-option v-for="item in dataFlgList" :key="item.value" :label="item.label" :value="item.value">
                                 </el-option>
                             </el-select>
-                            <el-date-picker v-if="search.dateType == 0" v-model="search.date" :editable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
+                            <el-date-picker v-if="search.dateType == 0" v-model="search.date" :editable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" size="small" 
                                 @change="getList()" :clearable="true" type="date" placeholder="选择工作日期"></el-date-picker>
                             <!-- <el-date-picker v-if="search.dateType == 0" v-model="date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"  @change="getList()" :clearable="true">
                             </el-date-picker> -->
-                             <el-date-picker v-if="search.dateType == 1" v-model="search.date" type="month" placeholder="请选择月份" format="yyyy-MM" value-format="yyyy-MM"  @change="dataYue()" :clearable="true">
+                             <el-date-picker size="small" v-if="search.dateType == 1" v-model="search.date" type="month" placeholder="请选择月份" format="yyyy-MM" value-format="yyyy-MM"  @change="dataYue()" :clearable="true">
                              </el-date-picker>
                         </div>
                     </template>
@@ -36,9 +36,9 @@
                     @change="getList()" :clearable="true" type="date" placeholder="选择工作日期"></el-date-picker> -->
                 </el-form-item>
                 <el-form-item   style="margin-left:20px;">
-                    <el-button @click="batchApprove(true)" style="margin-left:10px;" :disabled="multipleSelection.length==0">批量通过</el-button>
-                    <el-button @click="batchApprove(false)"  :disabled="multipleSelection.length==0">批量驳回</el-button>
-                    <el-button @click="approveAll" style="margin-left:10px;" :disabled="list.length==0">一键全部通过</el-button>
+                    <el-button @click="batchApprove(true)" style="margin-left:10px;" :disabled="multipleSelection.length==0" size="small">批量通过</el-button>
+                    <el-button @click="batchApprove(false)"  :disabled="multipleSelection.length==0" size="small">批量驳回</el-button>
+                    <el-button @click="approveAll" style="margin-left:10px;" :disabled="list.length==0" size="small">一键全部通过</el-button>
                 </el-form-item>
                 <el-form-item style="margin-left:20px;" v-if="permissions.importAudit">
                    <el-link type="primary" @click="recordList(),recordDialogVisible = true,pageIndexList = 1,pageSizeList = 20">审核记录</el-link>