|
@@ -3,43 +3,43 @@
|
|
|
<el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true" label-width="80px">
|
|
<el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true" label-width="80px">
|
|
|
<el-form-item label="转正人" prop="employeeName">
|
|
<el-form-item label="转正人" prop="employeeName">
|
|
|
<el-input v-model="queryParams.employeeName" placeholder="转正人" clearable style="width: 250px"
|
|
<el-input v-model="queryParams.employeeName" placeholder="转正人" clearable style="width: 250px"
|
|
|
- @keyup.enter.native="handleQuery"/>
|
|
|
|
|
|
|
+ @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="部门" prop="deptId">
|
|
<el-form-item label="部门" prop="deptId">
|
|
|
- <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
|
|
|
|
|
|
|
+ <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions"
|
|
|
|
|
+ :normalizer="normalizer" placeholder="选择部门" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="职位" prop="position">
|
|
<el-form-item label="职位" prop="position">
|
|
|
- <el-select v-model="queryParams.position" placeholder="请选择"
|
|
|
|
|
- style="width: 250px">
|
|
|
|
|
- <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
|
|
|
|
|
- </el-option>
|
|
|
|
|
|
|
+ <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
|
|
|
|
|
+ <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="手机号" prop="employeePhone">
|
|
<el-form-item label="手机号" prop="employeePhone">
|
|
|
<el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
|
|
<el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
|
|
|
- @keyup.enter.native="handleQuery"/>
|
|
|
|
|
|
|
+ @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="转正日期" prop="conversionDate">
|
|
<el-form-item label="转正日期" prop="conversionDate">
|
|
|
- <el-date-picker v-model="queryParams.conversionDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
- type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
|
|
|
|
|
- :default-time="['00:00:00', '23:59:59']" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- <el-form-item label="申请人"prop="creator">
|
|
|
|
|
|
|
+ <el-date-picker v-model="queryParams.conversionDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
+ type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
|
|
|
|
|
+ :default-time="['00:00:00', '23:59:59']" />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ <el-form-item label="申请人" prop="creator">
|
|
|
<el-input v-model="queryParams.creator" placeholder="申请人" clearable style="width: 250px"
|
|
<el-input v-model="queryParams.creator" placeholder="申请人" clearable style="width: 250px"
|
|
|
- @keyup.enter.native="handleQuery"/>
|
|
|
|
|
|
|
+ @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
<el-form-item label="申请时间" prop="createTime">
|
|
<el-form-item label="申请时间" prop="createTime">
|
|
|
- <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
- type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
|
|
|
|
|
- :default-time="['00:00:00', '23:59:59']" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
|
|
+ <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
+ type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
|
|
|
|
|
+ :default-time="['00:00:00', '23:59:59']" />
|
|
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="审批状态" prop="auditStatus">
|
|
<el-form-item label="审批状态" prop="auditStatus">
|
|
|
<el-select v-model="queryParams.auditStatus" placeholder="审批状态" clearable style="width: 250px">
|
|
<el-select v-model="queryParams.auditStatus" placeholder="审批状态" clearable style="width: 250px">
|
|
|
- <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
|
|
|
|
|
|
|
+ <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)"
|
|
|
|
|
+ :label="dict.label" :value="parseInt(dict.value)" />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
<el-form-item label="">
|
|
<el-form-item label="">
|
|
|
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
|
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
|
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
|
@@ -49,7 +49,7 @@
|
|
|
<el-row :gutter="10" class="mb8">
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
<el-col :span="1.5">
|
|
|
<el-button type="warning" icon="el-icon-download" @click="handleExport" :loading="exportLoading"
|
|
<el-button type="warning" icon="el-icon-download" @click="handleExport" :loading="exportLoading"
|
|
|
- v-hasPermi="['system:role:export']">导出</el-button>
|
|
|
|
|
|
|
+ v-hasPermi="['system:role:export']">导出</el-button>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
</el-row>
|
|
@@ -69,13 +69,13 @@
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="审批状态" align="center" prop="auditStatus" min-width="100">
|
|
<el-table-column label="审批状态" align="center" prop="auditStatus" min-width="100">
|
|
|
<template v-slot="scope">
|
|
<template v-slot="scope">
|
|
|
- <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus"/>
|
|
|
|
|
|
|
+ <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus" />
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="当前处理人" align="center" prop="currentAuditEmployeeName" min-width="120" />
|
|
<el-table-column label="当前处理人" align="center" prop="currentAuditEmployeeName" min-width="120" />
|
|
|
</el-table>
|
|
</el-table>
|
|
|
- <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
|
|
|
|
|
- @pagination="getList"/>
|
|
|
|
|
|
|
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
|
|
|
|
|
+ @pagination="getList" />
|
|
|
|
|
|
|
|
<!-- 修改 -->
|
|
<!-- 修改 -->
|
|
|
<el-dialog title="转正申请(修改)" :visible.sync="openEdit" width="800px" append-to-body v-loading="detailLoading">
|
|
<el-dialog title="转正申请(修改)" :visible.sync="openEdit" width="800px" append-to-body v-loading="detailLoading">
|
|
@@ -89,7 +89,8 @@
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
-import { getListData,exportList } from "@/api/oa/conversion"
|
|
|
|
|
|
|
+import { listSimplePosts } from "@/api/system/post";
|
|
|
|
|
+import { getListData, exportList } from "@/api/oa/conversion"
|
|
|
import detail from "./detail.vue";
|
|
import detail from "./detail.vue";
|
|
|
import edit from "./edit.vue";
|
|
import edit from "./edit.vue";
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
@@ -105,9 +106,9 @@ export default {
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
- detailLoading:false,
|
|
|
|
|
- posOptions: [],
|
|
|
|
|
- id:'',
|
|
|
|
|
|
|
+ detailLoading: false,
|
|
|
|
|
+ postOptions: [],
|
|
|
|
|
+ id: '',
|
|
|
// 遮罩层
|
|
// 遮罩层
|
|
|
loading: true,
|
|
loading: true,
|
|
|
// 导出遮罩层
|
|
// 导出遮罩层
|
|
@@ -134,7 +135,7 @@ export default {
|
|
|
creator: undefined,
|
|
creator: undefined,
|
|
|
createTime: [],
|
|
createTime: [],
|
|
|
auditStatus: undefined,
|
|
auditStatus: undefined,
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
@@ -143,11 +144,16 @@ export default {
|
|
|
this.getListDept();
|
|
this.getListDept();
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
- /** 查询部门列表 */
|
|
|
|
|
- getListDept() {
|
|
|
|
|
|
|
+ /** 查询部门列表 */
|
|
|
|
|
+ getListDept() {
|
|
|
listDept().then(response => {
|
|
listDept().then(response => {
|
|
|
this.deptOptions = this.handleTree(response.data, "id");
|
|
this.deptOptions = this.handleTree(response.data, "id");
|
|
|
});
|
|
});
|
|
|
|
|
+ listSimplePosts().then(response => {
|
|
|
|
|
+ // 处理 postOptions 参数
|
|
|
|
|
+ this.postOptions = [];
|
|
|
|
|
+ this.postOptions.push(...response.data);
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
/** 转换部门数据结构 */
|
|
/** 转换部门数据结构 */
|
|
|
normalizer(node) {
|
|
normalizer(node) {
|
|
@@ -162,9 +168,9 @@ export default {
|
|
|
},
|
|
},
|
|
|
handdle(row) {
|
|
handdle(row) {
|
|
|
this.id = row.id;
|
|
this.id = row.id;
|
|
|
- if(row.auditStatus==0){
|
|
|
|
|
|
|
+ if (row.auditStatus == 0) {
|
|
|
this.openEdit = true;
|
|
this.openEdit = true;
|
|
|
- }else{
|
|
|
|
|
|
|
+ } else {
|
|
|
this.openDetail = true;
|
|
this.openDetail = true;
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
@@ -197,20 +203,20 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** 导出按钮操作 */
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
handleExport() {
|
|
|
const queryParams = this.queryParams;
|
|
const queryParams = this.queryParams;
|
|
|
- this.$modal.confirm('是否确认导出所有数据项?').then(function() {
|
|
|
|
|
- this.exportLoading = true;
|
|
|
|
|
- return exportList(queryParams);
|
|
|
|
|
- }).then(response => {
|
|
|
|
|
- this.$download.excel(response, '转正申请数据.xls');
|
|
|
|
|
- this.exportLoading = false;
|
|
|
|
|
- }).catch(() => {});
|
|
|
|
|
|
|
+ this.$modal.confirm('是否确认导出所有数据项?').then(function () {
|
|
|
|
|
+ this.exportLoading = true;
|
|
|
|
|
+ return exportList(queryParams);
|
|
|
|
|
+ }).then(response => {
|
|
|
|
|
+ this.$download.excel(response, '转正申请数据.xls');
|
|
|
|
|
+ this.exportLoading = false;
|
|
|
|
|
+ }).catch(() => { });
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|