|
|
@@ -3,28 +3,28 @@
|
|
|
<!--工具条-->
|
|
|
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
|
|
|
<el-form :inline="true">
|
|
|
- <el-form-item label="部门：">
|
|
|
- <el-cascader v-model="search.departmentIdArray" placeholder="请选择部门" style="width: 100%"
|
|
|
+ <el-form-item label="部门" style="width: 215px">
|
|
|
+ <el-cascader v-model="search.departmentIdArray" placeholder="请选择部门" style="width: 175px"
|
|
|
:options="option" :props="{ checkStrictly: false,expandTrigger: 'hover' }" :show-all-levels="false" clearable
|
|
|
- @change="getList()"
|
|
|
+ @change="getList()" size="mini"
|
|
|
></el-cascader>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="项目：">
|
|
|
- <el-select v-model="search.projectId" placeholder="请选择" clearable @change="getList()" filterable="true">
|
|
|
+ <el-form-item label="项目" style="width: 215px">
|
|
|
+ <el-select v-model="search.projectId" placeholder="请选择" clearable @change="getList()" filterable="true" size="mini" style="width: 175px">
|
|
|
<el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item style="margin-left:20px;">
|
|
|
+ <!-- <el-form-item style="margin-left:20px;">
|
|
|
<el-button @click="batchApprove(true)" style="margin-left:10px;" :loading="batchApproveLoading" :disabled="multipleSelection.length==0">批量通过</el-button>
|
|
|
- <el-button @click="batchApprove(false)" :loading="batchDenyLoading" :disabled="multipleSelection.length==0">批量驳回</el-button>
|
|
|
- </el-form-item>
|
|
|
- <div>
|
|
|
- <el-form-item label="人员：">
|
|
|
- <el-select v-model="search.userId" placeholder="请选择" clearable @change="getList()" filterable="true">
|
|
|
+ <el-button @click="batchApprove(false)" :loading="batchDenyLoading" :disabled="multipleSelection.length==0">批量驳回</el-button>
|
|
|
+ </el-form-item> -->
|
|
|
+ <!-- <div> -->
|
|
|
+ <el-form-item label="人员" style="width: 160px">
|
|
|
+ <el-select v-model="search.userId" placeholder="请选择" clearable @change="getList()" filterable="true" size="mini" style="width: 100px">
|
|
|
<el-option v-for="item in usersList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="日期：">
|
|
|
+ <el-form-item label="日期">
|
|
|
<!-- <el-date-picker v-model="search.date" :editable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
|
|
|
@change="getList()" :clearable="true" type="date" placeholder="选择工作日期"></el-date-picker> -->
|
|
|
<el-date-picker
|
|
|
@@ -33,10 +33,15 @@
|
|
|
range-separator="至"
|
|
|
start-placeholder="工作开始日期"
|
|
|
end-placeholder="工作结束日期"
|
|
|
- format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="dataTimes()">
|
|
|
+ format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="dataTimes()" size="mini">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- </div>
|
|
|
+
|
|
|
+ <el-form-item style="margin-left:20px;">
|
|
|
+ <el-button @click="batchApprove(true)" style="margin-left:10px;" :loading="batchApproveLoading" :disabled="multipleSelection.length==0" size="mini">批量通过</el-button>
|
|
|
+ <el-button @click="batchApprove(false)" :loading="batchDenyLoading" :disabled="multipleSelection.length==0" size="mini">批量驳回</el-button>
|
|
|
+ </el-form-item>
|
|
|
+ <!-- </div> -->
|
|
|
</el-form>
|
|
|
</el-col>
|
|
|
<!--列表-->
|
Lijy