|
@@ -2,39 +2,16 @@
|
|
|
<div class="app-container">
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- plain
|
|
|
- icon="el-icon-plus"
|
|
|
- size="mini"
|
|
|
- @click="handleAdd"
|
|
|
- v-hasPermi="['peopleChuRu:peopleBorrow:add']"
|
|
|
- >新增</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
|
|
+ v-hasPermi="['peopleChuRu:peopleBorrow:add']">新增</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- plain
|
|
|
- icon="el-icon-edit"
|
|
|
- size="mini"
|
|
|
- :disabled="single"
|
|
|
- @click="handleUpdate"
|
|
|
- v-hasPermi="['peopleChuRu:peopleBorrow:edit']"
|
|
|
- >修改</el-button
|
|
|
- >
|
|
|
+ <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
|
|
+ v-hasPermi="['peopleChuRu:peopleBorrow:edit']">修改</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="danger"
|
|
|
- plain
|
|
|
- icon="el-icon-delete"
|
|
|
- size="mini"
|
|
|
- :disabled="multiple"
|
|
|
- @click="handleDelete"
|
|
|
- v-hasPermi="['peopleChuRu:peopleBorrow:remove']"
|
|
|
- >删除</el-button
|
|
|
- >
|
|
|
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
|
|
+ v-hasPermi="['peopleChuRu:peopleBorrow:remove']">删除</el-button>
|
|
|
</el-col>
|
|
|
<!-- <el-col :span="1.5">
|
|
|
<el-button
|
|
@@ -54,26 +31,18 @@
|
|
|
></right-toolbar> -->
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table
|
|
|
- v-loading="loading"
|
|
|
- :data="peopleBorrowList"
|
|
|
- @selection-change="handleSelectionChange"
|
|
|
- :header-cell-style="{ background: '#003C69', color: 'white' }"
|
|
|
- >
|
|
|
+ <el-table v-loading="loading" :data="peopleBorrowList" @selection-change="handleSelectionChange"
|
|
|
+ :header-cell-style="{ background: '#003C69', color: 'white' }">
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="序号" align="center" prop="id">
|
|
|
<template scope="scope">
|
|
|
<span>{{
|
|
|
- (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
|
|
+ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
|
|
|
}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="单位" align="center" prop="unitName" />
|
|
|
- <el-table-column
|
|
|
- label="借调人姓名"
|
|
|
- align="center"
|
|
|
- prop="transferPeople"
|
|
|
- />
|
|
|
+ <el-table-column label="借调人姓名" align="center" prop="transferPeople" />
|
|
|
<!-- <el-table-column
|
|
|
label="借调人id"
|
|
|
align="center"
|
|
@@ -81,32 +50,18 @@
|
|
|
/> -->
|
|
|
|
|
|
<!-- <el-table-column label="单位id" align="center" prop="unitId" /> -->
|
|
|
- <el-table-column
|
|
|
- label="借调单位"
|
|
|
- align="center"
|
|
|
- prop="transferUnitName"
|
|
|
- />
|
|
|
+ <el-table-column label="借调单位" align="center" prop="transferUnitName" />
|
|
|
<!-- <el-table-column
|
|
|
label="借调单位id"
|
|
|
align="center"
|
|
|
prop="transferUnitId"
|
|
|
/> -->
|
|
|
- <el-table-column
|
|
|
- label="开始时间"
|
|
|
- align="center"
|
|
|
- prop="startTime"
|
|
|
- width="180"
|
|
|
- >
|
|
|
+ <el-table-column label="开始时间" align="center" prop="startTime" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="结束时间"
|
|
|
- align="center"
|
|
|
- prop="endTime"
|
|
|
- width="180"
|
|
|
- >
|
|
|
+ <el-table-column label="结束时间" align="center" prop="endTime" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
|
|
|
</template>
|
|
@@ -114,52 +69,27 @@
|
|
|
<el-table-column label="借调事由" align="center" prop="transferReason" />
|
|
|
<el-table-column label="职位" align="center" prop="jobTitle">
|
|
|
<template slot-scope="scope">
|
|
|
- <dict-tag
|
|
|
- :options="dict.type.post_Level"
|
|
|
- :value="scope.row.jobTitle"
|
|
|
- />
|
|
|
+ <dict-tag :options="dict.type.post_Level" :value="scope.row.jobTitle" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="军衔" align="center" prop="rankId">
|
|
|
<template slot-scope="scope">
|
|
|
- <dict-tag
|
|
|
- :options="dict.type.sys_user_rank"
|
|
|
- :value="scope.row.rankId"
|
|
|
- />
|
|
|
+ <dict-tag :options="dict.type.sys_user_rank" :value="scope.row.rankId" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column label="创建人" align="center" prop="creatName" /> -->
|
|
|
<el-table-column label="人员状态" align="center" prop="state">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="scope.row.state == '0'" style="color: #ff4949"
|
|
|
- >未归队</span
|
|
|
- >
|
|
|
- <span v-if="scope.row.state == '1'" style="color: #13ce66"
|
|
|
- >已归队</span
|
|
|
- >
|
|
|
+ <span v-if="scope.row.state == '0'" style="color: #ff4949">未归队</span>
|
|
|
+ <span v-if="scope.row.state == '1'" style="color: #13ce66">已归队</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="操作"
|
|
|
- align="center"
|
|
|
- class-name="small-padding fixed-width"
|
|
|
- >
|
|
|
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button
|
|
|
- v-if="scope.row.common == '1'"
|
|
|
- size="btu"
|
|
|
- type="text"
|
|
|
- v-hasPermi="['peopleChuRu:peopleBorrow:edit']"
|
|
|
- @click="handle(scope.row)"
|
|
|
- >归队</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- size="btd"
|
|
|
- type="text"
|
|
|
- @click="handleDelete(scope.row)"
|
|
|
- v-hasPermi="['peopleChuRu:peopleBorrow:remove']"
|
|
|
- >删除</el-button
|
|
|
- >
|
|
|
+ <el-button v-if="scope.row.common == '1'" size="btu" type="text"
|
|
|
+ v-hasPermi="['peopleChuRu:peopleBorrow:edit']" @click="handle(scope.row)">归队</el-button>
|
|
|
+ <el-button size="btd" type="text" @click="handleDelete(scope.row)"
|
|
|
+ v-hasPermi="['peopleChuRu:peopleBorrow:remove']">删除</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -173,86 +103,39 @@
|
|
|
/> -->
|
|
|
|
|
|
<!-- 添加或修改人员借调对话框 -->
|
|
|
- <el-dialog
|
|
|
- :title="title"
|
|
|
- :visible.sync="open"
|
|
|
- width="800px"
|
|
|
- append-to-body
|
|
|
- :close-on-click-modal="false"
|
|
|
- >
|
|
|
- <el-form
|
|
|
- ref="form"
|
|
|
- :model="form"
|
|
|
- :rules="rules"
|
|
|
- label-width="80px"
|
|
|
- inline
|
|
|
- >
|
|
|
+ <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
|
|
|
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
|
|
|
<div class="jiben">基本信息</div>
|
|
|
<el-form-item label="单位" prop="unitId">
|
|
|
<!-- <el-input v-model="form.unitName" placeholder="请输入单位" /> -->
|
|
|
- <treeselect
|
|
|
- v-model="form.unitId"
|
|
|
- :options="deptOptions"
|
|
|
- placeholder="请选择单位"
|
|
|
- @select="selectPeo"
|
|
|
- @open="blurSelect"
|
|
|
- />
|
|
|
+ <treeselect v-model="form.unitId" :options="deptOptions" placeholder="请选择单位" @select="selectPeo"
|
|
|
+ @open="blurSelect" />
|
|
|
</el-form-item>
|
|
|
<el-form-item />
|
|
|
<el-form-item label="借调人姓名" prop="transferPeople">
|
|
|
- <el-select
|
|
|
- v-model="form.transferPeopleId"
|
|
|
- placeholder="请输入借调人姓名"
|
|
|
- ref="headerSearchSelect"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, i) in renYuan"
|
|
|
- :key="i"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- @click.native="
|
|
|
- jieRen(item.name, item.rankId, item.jobTitle, item)
|
|
|
- "
|
|
|
- class="input_xiala"
|
|
|
- >
|
|
|
+ <el-select v-model="form.transferPeopleId" placeholder="请输入借调人姓名" ref="headerSearchSelect">
|
|
|
+ <el-option v-for="(item, i) in renYuan" :key="i" :label="item.name" :value="item.id" @click.native="
|
|
|
+ jieRen(item.name, item.rankId, item.jobTitle, item)
|
|
|
+ " class="input_xiala">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="借调单位名称" prop="transferUnitName">
|
|
|
- <el-input
|
|
|
- v-model="form.transferUnitName"
|
|
|
- placeholder="请输入借调单位名称"
|
|
|
- />
|
|
|
+ <el-input v-model="form.transferUnitName" placeholder="请输入借调单位名称" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="借调开始时间" prop="startTime">
|
|
|
- <el-date-picker
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- v-model="form.startTime"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择借调开始时间"
|
|
|
- >
|
|
|
+ <el-date-picker clearable size="small" v-model="form.startTime" type="date" value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择借调开始时间">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="借调结束时间" prop="endTime">
|
|
|
- <el-date-picker
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- v-model="form.endTime"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择借调结束时间"
|
|
|
- >
|
|
|
+ <el-date-picker clearable size="small" v-model="form.endTime" type="date" value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择借调结束时间">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<div class="jiben">借调事由</div>
|
|
|
<el-form-item prop="transferReason">
|
|
|
- <el-input
|
|
|
- v-model="form.transferReason"
|
|
|
- type="textarea"
|
|
|
- placeholder="请输入借调原因"
|
|
|
- />
|
|
|
+ <el-input v-model="form.transferReason" type="textarea" placeholder="请输入借调原因" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -480,7 +363,7 @@ export default {
|
|
|
this.getList();
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
@@ -495,7 +378,7 @@ export default {
|
|
|
this.$download.name(response.msg);
|
|
|
this.exportLoading = false;
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
// 点击归队弹出询问框
|
|
|
handle(row) {
|
|
@@ -512,7 +395,7 @@ export default {
|
|
|
this.getList();
|
|
|
});
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
},
|
|
|
};
|
|
@@ -522,26 +405,32 @@ export default {
|
|
|
::v-deep .el-dialog {
|
|
|
background: #004d86 !important;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-textarea__inner {
|
|
|
width: 650px;
|
|
|
height: 104px;
|
|
|
margin: auto;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-dialog__header {
|
|
|
border-bottom: 1px solid #718a9d;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-dialog__title {
|
|
|
color: #fff;
|
|
|
font: 18px;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-dialog__headerbtn .el-dialog__close {
|
|
|
color: #fff;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-form-item__label {
|
|
|
font: 16px;
|
|
|
color: #fff;
|
|
|
width: 100px !important;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-input__inner {
|
|
|
/* width: 200px !important;
|
|
|
height: 36px; */
|
|
@@ -550,10 +439,12 @@ export default {
|
|
|
border-color: #fff;
|
|
|
border: 1px solid white !important;
|
|
|
}
|
|
|
+
|
|
|
/* 单位框背景颜色 */
|
|
|
::v-deep .vue-treeselect__control {
|
|
|
background: #004d86 !important;
|
|
|
}
|
|
|
+
|
|
|
/* 基本信息背景 */
|
|
|
.jiben {
|
|
|
width: 660px;
|
|
@@ -565,18 +456,22 @@ export default {
|
|
|
padding-left: 16px;
|
|
|
line-height: 32px;
|
|
|
}
|
|
|
+
|
|
|
/*调整表单间距 */
|
|
|
::v-deep .el-form-item__content {
|
|
|
width: 200px;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-input__inner {
|
|
|
cursor: pointer !important;
|
|
|
}
|
|
|
+
|
|
|
/* 底部确定取消按钮 */
|
|
|
::v-deep .el-dialog__footer {
|
|
|
padding: 18px 50px !important;
|
|
|
margin-right: 28px !important;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-dialog__body {
|
|
|
/* margin: 10px 30px 20px 30px; */
|
|
|
margin-left: 56px;
|
|
@@ -585,17 +480,21 @@ export default {
|
|
|
box-sizing: border-box;
|
|
|
/* padding: 30px 12px 30px 28px; */
|
|
|
}
|
|
|
+
|
|
|
.contents {
|
|
|
padding: 0px 40px !important;
|
|
|
}
|
|
|
+
|
|
|
/* 下拉菜单 */
|
|
|
.el-dropdown-link {
|
|
|
cursor: pointer;
|
|
|
color: #409eff;
|
|
|
}
|
|
|
+
|
|
|
.el-icon-arrow-down {
|
|
|
font-size: 12px;
|
|
|
}
|
|
|
+
|
|
|
/* 刷新图标 */
|
|
|
/* .el-icon-refresh {
|
|
|
width: 76px;
|
|
@@ -613,47 +512,57 @@ export default {
|
|
|
background-color: #004d86;
|
|
|
color: #fff;
|
|
|
}
|
|
|
+
|
|
|
.el-select-dropdown__item {
|
|
|
color: #fff;
|
|
|
}
|
|
|
+
|
|
|
/* 时间选择 */
|
|
|
::v-deep .el-input--small .el-input__inner {
|
|
|
width: 200px;
|
|
|
height: 36px;
|
|
|
line-height: 36px;
|
|
|
}
|
|
|
+
|
|
|
.el-date-editor.el-input {
|
|
|
width: 200px;
|
|
|
height: 36px;
|
|
|
line-height: 36px;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-date-editor.el-input .el-input__inner {
|
|
|
height: 36px;
|
|
|
line-height: 36px;
|
|
|
}
|
|
|
+
|
|
|
/* 单位框背景颜色 */
|
|
|
::v-deep .vue-treeselect__control {
|
|
|
background: #004d86 !important;
|
|
|
color: #fff;
|
|
|
}
|
|
|
+
|
|
|
/* 单位下拉菜单选中字体颜色 */
|
|
|
::v-deep .vue-treeselect__single-value {
|
|
|
color: #fff !important;
|
|
|
}
|
|
|
+
|
|
|
/* 分页按钮 */
|
|
|
::v-deep .el-pagination.is-background .el-pager li {
|
|
|
background-color: #004d86;
|
|
|
color: #fff;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-pagination.is-background .btn-next {
|
|
|
background-color: #004d86;
|
|
|
color: #fff;
|
|
|
}
|
|
|
+
|
|
|
/* 底部确定取消按钮 */
|
|
|
::v-deep .el-dialog__footer {
|
|
|
padding: 18px 50px;
|
|
|
margin-right: 42px;
|
|
|
}
|
|
|
+
|
|
|
/* 增加按钮弹框 */
|
|
|
/* ::v-deep .el-dialog {
|
|
|
width: 1060px !important;
|