|
@@ -139,7 +139,7 @@
|
|
@change="handleCheckAllChange"
|
|
@change="handleCheckAllChange"
|
|
>全选</el-checkbox
|
|
>全选</el-checkbox
|
|
>
|
|
>
|
|
- <div style="margin: 15px 0;"></div>
|
|
|
|
|
|
+ <div style="margin: 15px 0"></div>
|
|
<el-checkbox-group
|
|
<el-checkbox-group
|
|
v-model="checkedCities"
|
|
v-model="checkedCities"
|
|
@change="handleCheckedCitiesChange"
|
|
@change="handleCheckedCitiesChange"
|
|
@@ -195,7 +195,7 @@
|
|
>
|
|
>
|
|
<div class="model">
|
|
<div class="model">
|
|
<div class="import-msg">
|
|
<div class="import-msg">
|
|
- <p style="margin-bottom:5px;">注意:</p>
|
|
|
|
|
|
+ <p style="margin-bottom: 5px">注意:</p>
|
|
<p>1.请严格按照模板中提供的数据案例格式进行填写;</p>
|
|
<p>1.请严格按照模板中提供的数据案例格式进行填写;</p>
|
|
<p>
|
|
<p>
|
|
2.其中姓名、学号、班级、支部名必须填写;其中支部名必须是已经存在的支部完整名称,否则数据不能导入;
|
|
2.其中姓名、学号、班级、支部名必须填写;其中支部名必须是已经存在的支部完整名称,否则数据不能导入;
|
|
@@ -496,9 +496,7 @@
|
|
</el-form>
|
|
</el-form>
|
|
<span slot="footer" class="dialog-footer">
|
|
<span slot="footer" class="dialog-footer">
|
|
<el-button @click="partyShow = false">取 消</el-button>
|
|
<el-button @click="partyShow = false">取 消</el-button>
|
|
- <el-button type="primary" @click="resetParty"
|
|
|
|
- >确 定</el-button
|
|
|
|
- >
|
|
|
|
|
|
+ <el-button type="primary" @click="resetParty">确 定</el-button>
|
|
</span>
|
|
</span>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
</div>
|
|
</div>
|
|
@@ -517,7 +515,7 @@ import {
|
|
batchPolitics,
|
|
batchPolitics,
|
|
batchParty,
|
|
batchParty,
|
|
fileGuidang,
|
|
fileGuidang,
|
|
- getNationList
|
|
|
|
|
|
+ getNationList,
|
|
} from "@/api/personnel/index";
|
|
} from "@/api/personnel/index";
|
|
import { classLists } from "@/api/organizationList/index";
|
|
import { classLists } from "@/api/organizationList/index";
|
|
import { getToken } from "@/utils/auth";
|
|
import { getToken } from "@/utils/auth";
|
|
@@ -547,7 +545,7 @@ const cityOptions = [
|
|
"性别",
|
|
"性别",
|
|
"民族",
|
|
"民族",
|
|
"联系电话",
|
|
"联系电话",
|
|
- "政治面貌"
|
|
|
|
|
|
+ "政治面貌",
|
|
];
|
|
];
|
|
|
|
|
|
export default {
|
|
export default {
|
|
@@ -565,12 +563,12 @@ export default {
|
|
resetPasswordVisible: false,
|
|
resetPasswordVisible: false,
|
|
importVisible: false,
|
|
importVisible: false,
|
|
resetPoliticsVisible: false,
|
|
resetPoliticsVisible: false,
|
|
- partyShow:false,
|
|
|
|
|
|
+ partyShow: false,
|
|
importFieldsVisible: false, // 选择需要导出的字段
|
|
importFieldsVisible: false, // 选择需要导出的字段
|
|
classList: "",
|
|
classList: "",
|
|
resetPassword: {
|
|
resetPassword: {
|
|
staff_id: "",
|
|
staff_id: "",
|
|
- password: ""
|
|
|
|
|
|
+ password: "",
|
|
}, //重置密码
|
|
}, //重置密码
|
|
fileList: [], //上传文件列表
|
|
fileList: [], //上传文件列表
|
|
fileName: "", //文件名称
|
|
fileName: "", //文件名称
|
|
@@ -582,49 +580,49 @@ export default {
|
|
is_graduate: 0,
|
|
is_graduate: 0,
|
|
politics_status: "",
|
|
politics_status: "",
|
|
organization_id: "", //组织id
|
|
organization_id: "", //组织id
|
|
- is_rdsqs: '',
|
|
|
|
|
|
+ is_rdsqs: "",
|
|
limit: 15, //每页显示条数
|
|
limit: 15, //每页显示条数
|
|
- page: 1 //当前页码
|
|
|
|
|
|
+ page: 1, //当前页码
|
|
}, //搜索框数据
|
|
}, //搜索框数据
|
|
rdsqs_list: [
|
|
rdsqs_list: [
|
|
{
|
|
{
|
|
value: 0,
|
|
value: 0,
|
|
- label: "未上传入党申请书"
|
|
|
|
|
|
+ label: "未上传入党申请书",
|
|
},
|
|
},
|
|
{
|
|
{
|
|
value: 1,
|
|
value: 1,
|
|
- label: "已上传入党申请书"
|
|
|
|
- }
|
|
|
|
|
|
+ label: "已上传入党申请书",
|
|
|
|
+ },
|
|
],
|
|
],
|
|
|
|
|
|
politics: {
|
|
politics: {
|
|
ids: [],
|
|
ids: [],
|
|
- politics_status: ""
|
|
|
|
|
|
+ politics_status: "",
|
|
},
|
|
},
|
|
politics_status: [
|
|
politics_status: [
|
|
{
|
|
{
|
|
id: "",
|
|
id: "",
|
|
- name: ""
|
|
|
|
- }
|
|
|
|
|
|
+ name: "",
|
|
|
|
+ },
|
|
],
|
|
],
|
|
politicsIndex: "", //选中身份索引
|
|
politicsIndex: "", //选中身份索引
|
|
totalPage: 0, //总页码
|
|
totalPage: 0, //总页码
|
|
tableList: [], //人员列表
|
|
tableList: [], //人员列表
|
|
personnelDetails: {
|
|
personnelDetails: {
|
|
organization: {
|
|
organization: {
|
|
- name: ""
|
|
|
|
- }
|
|
|
|
|
|
+ name: "",
|
|
|
|
+ },
|
|
}, //人员详情
|
|
}, //人员详情
|
|
nationList: [], //民族liebiao
|
|
nationList: [], //民族liebiao
|
|
sex: [
|
|
sex: [
|
|
{
|
|
{
|
|
value: 1,
|
|
value: 1,
|
|
- label: "男"
|
|
|
|
|
|
+ label: "男",
|
|
},
|
|
},
|
|
{
|
|
{
|
|
value: 2,
|
|
value: 2,
|
|
- label: "女"
|
|
|
|
- }
|
|
|
|
|
|
+ label: "女",
|
|
|
|
+ },
|
|
],
|
|
],
|
|
nation: [],
|
|
nation: [],
|
|
//政治面貌
|
|
//政治面貌
|
|
@@ -637,15 +635,15 @@ export default {
|
|
graduate: [
|
|
graduate: [
|
|
{
|
|
{
|
|
value: 1,
|
|
value: 1,
|
|
- label: "已归档"
|
|
|
|
|
|
+ label: "已归档",
|
|
},
|
|
},
|
|
{
|
|
{
|
|
value: 0,
|
|
value: 0,
|
|
- label: "未归档"
|
|
|
|
- }
|
|
|
|
|
|
+ label: "未归档",
|
|
|
|
+ },
|
|
],
|
|
],
|
|
modelUrl: "http://api.party.site.ximengnaikang.com/学生导入模板.xlsx",
|
|
modelUrl: "http://api.party.site.ximengnaikang.com/学生导入模板.xlsx",
|
|
- partyArr:[]
|
|
|
|
|
|
+ partyArr: [],
|
|
};
|
|
};
|
|
},
|
|
},
|
|
|
|
|
|
@@ -659,12 +657,12 @@ export default {
|
|
this.getNationList();
|
|
this.getNationList();
|
|
this.getTreeLists();
|
|
this.getTreeLists();
|
|
//获取班级列表
|
|
//获取班级列表
|
|
- classLists().then(res => {
|
|
|
|
|
|
+ classLists().then((res) => {
|
|
this.classList = res;
|
|
this.classList = res;
|
|
});
|
|
});
|
|
console.log(token, "token");
|
|
console.log(token, "token");
|
|
this.importHeader = {
|
|
this.importHeader = {
|
|
- Authorization: "Bearer " + token
|
|
|
|
|
|
+ Authorization: "Bearer " + token,
|
|
};
|
|
};
|
|
|
|
|
|
this.politics_status = [
|
|
this.politics_status = [
|
|
@@ -672,7 +670,7 @@ export default {
|
|
{ id: 3, name: "积极分子" },
|
|
{ id: 3, name: "积极分子" },
|
|
{ id: 4, name: "中共预备党员" },
|
|
{ id: 4, name: "中共预备党员" },
|
|
{ id: 5, name: "中共党员" },
|
|
{ id: 5, name: "中共党员" },
|
|
- { id: 6, name: "发展对象" }
|
|
|
|
|
|
+ { id: 6, name: "发展对象" },
|
|
];
|
|
];
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -700,11 +698,11 @@ export default {
|
|
ceshi(e) {
|
|
ceshi(e) {
|
|
console.log(this.searchParams.is_graduate, "ceshi");
|
|
console.log(this.searchParams.is_graduate, "ceshi");
|
|
},
|
|
},
|
|
- cancelSelectField: function() {
|
|
|
|
|
|
+ cancelSelectField: function () {
|
|
this.fieldSelect = [];
|
|
this.fieldSelect = [];
|
|
this.importFieldsVisible = false;
|
|
this.importFieldsVisible = false;
|
|
},
|
|
},
|
|
- sureSelectField: function() {
|
|
|
|
|
|
+ sureSelectField: function () {
|
|
if (this.fieldSelect.length == 0) {
|
|
if (this.fieldSelect.length == 0) {
|
|
this.$message.error("请选择需要导出的字段");
|
|
this.$message.error("请选择需要导出的字段");
|
|
} else {
|
|
} else {
|
|
@@ -717,7 +715,7 @@ export default {
|
|
//到出选择项
|
|
//到出选择项
|
|
let arr = [];
|
|
let arr = [];
|
|
let selection = this.selection;
|
|
let selection = this.selection;
|
|
- selection.forEach(item => {
|
|
|
|
|
|
+ selection.forEach((item) => {
|
|
item.id;
|
|
item.id;
|
|
arr.push(item.id);
|
|
arr.push(item.id);
|
|
return arr;
|
|
return arr;
|
|
@@ -729,7 +727,7 @@ export default {
|
|
//导出当前页
|
|
//导出当前页
|
|
let arr = [];
|
|
let arr = [];
|
|
let selection = this.tableList;
|
|
let selection = this.tableList;
|
|
- selection.forEach(item => {
|
|
|
|
|
|
+ selection.forEach((item) => {
|
|
item.id;
|
|
item.id;
|
|
arr.push(item.id);
|
|
arr.push(item.id);
|
|
console.log(arr);
|
|
console.log(arr);
|
|
@@ -759,7 +757,7 @@ export default {
|
|
console.log(value, "----------------");
|
|
console.log(value, "----------------");
|
|
let arr = [];
|
|
let arr = [];
|
|
|
|
|
|
- value.map(item => {
|
|
|
|
|
|
+ value.map((item) => {
|
|
let index = this.cities.indexOf(item) + 1;
|
|
let index = this.cities.indexOf(item) + 1;
|
|
arr.push(index);
|
|
arr.push(index);
|
|
console.log(index, "++++++++++++K++++++++++++++");
|
|
console.log(index, "++++++++++++K++++++++++++++");
|
|
@@ -778,15 +776,15 @@ export default {
|
|
getFileList(row) {
|
|
getFileList(row) {
|
|
this.$router.push({
|
|
this.$router.push({
|
|
name: "filelist",
|
|
name: "filelist",
|
|
- query: { staff_id: row.id, organization_id: row.organization_id }
|
|
|
|
|
|
+ query: { staff_id: row.id, organization_id: row.organization_id },
|
|
});
|
|
});
|
|
},
|
|
},
|
|
//获取组织树状列表
|
|
//获取组织树状列表
|
|
async getTreeLists() {
|
|
async getTreeLists() {
|
|
this.loadingFull = true;
|
|
this.loadingFull = true;
|
|
- await treeOrganizationList().then(res => {
|
|
|
|
|
|
+ await treeOrganizationList().then((res) => {
|
|
this.treeList = this.treeList.concat(res.data);
|
|
this.treeList = this.treeList.concat(res.data);
|
|
- this.partyArr = res.data
|
|
|
|
|
|
+ this.partyArr = res.data;
|
|
console.log(res, "获取组织树状列表");
|
|
console.log(res, "获取组织树状列表");
|
|
this.personnelList();
|
|
this.personnelList();
|
|
});
|
|
});
|
|
@@ -797,7 +795,7 @@ export default {
|
|
if (this.searchParams.organization_id == 0) {
|
|
if (this.searchParams.organization_id == 0) {
|
|
this.searchParams.organization_id = "";
|
|
this.searchParams.organization_id = "";
|
|
}
|
|
}
|
|
- await personnelList(this.searchParams).then(res => {
|
|
|
|
|
|
+ await personnelList(this.searchParams).then((res) => {
|
|
console.log(res, "获取人员列表");
|
|
console.log(res, "获取人员列表");
|
|
this.tableList = res.data.data;
|
|
this.tableList = res.data.data;
|
|
this.totalPage = res.data.meta.pagination.total;
|
|
this.totalPage = res.data.meta.pagination.total;
|
|
@@ -813,24 +811,24 @@ export default {
|
|
//选中政治面貌
|
|
//选中政治面貌
|
|
async resetChangePolics(e) {
|
|
async resetChangePolics(e) {
|
|
await batchPolitics(this.politics)
|
|
await batchPolitics(this.politics)
|
|
- .then(res => {
|
|
|
|
|
|
+ .then((res) => {
|
|
console.log(res, "piliangxiiugai ");
|
|
console.log(res, "piliangxiiugai ");
|
|
this.$message.success("批量修改成功");
|
|
this.$message.success("批量修改成功");
|
|
this.resetPoliticsVisible = false;
|
|
this.resetPoliticsVisible = false;
|
|
this.personnelList();
|
|
this.personnelList();
|
|
})
|
|
})
|
|
- .catch(err => {});
|
|
|
|
|
|
+ .catch((err) => {});
|
|
},
|
|
},
|
|
//选中党组织
|
|
//选中党组织
|
|
- async resetParty(){
|
|
|
|
|
|
+ async resetParty() {
|
|
await batchParty(this.politics)
|
|
await batchParty(this.politics)
|
|
- .then(res => {
|
|
|
|
|
|
+ .then((res) => {
|
|
console.log(res, "piliangxiiugai ");
|
|
console.log(res, "piliangxiiugai ");
|
|
this.$message.success("批量修改成功");
|
|
this.$message.success("批量修改成功");
|
|
this.partyShow = false;
|
|
this.partyShow = false;
|
|
this.personnelList();
|
|
this.personnelList();
|
|
})
|
|
})
|
|
- .catch(err => {});
|
|
|
|
|
|
+ .catch((err) => {});
|
|
},
|
|
},
|
|
//批量修改政治面貌
|
|
//批量修改政治面貌
|
|
batchRevise() {
|
|
batchRevise() {
|
|
@@ -841,7 +839,7 @@ export default {
|
|
console.log(this.selection, "selection");
|
|
console.log(this.selection, "selection");
|
|
let arr = [];
|
|
let arr = [];
|
|
let selection = this.selection;
|
|
let selection = this.selection;
|
|
- selection.forEach(item => {
|
|
|
|
|
|
+ selection.forEach((item) => {
|
|
item.id;
|
|
item.id;
|
|
arr.push(item.id);
|
|
arr.push(item.id);
|
|
return arr;
|
|
return arr;
|
|
@@ -852,7 +850,7 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
//修改党组织
|
|
//修改党组织
|
|
- partyOrganization(){
|
|
|
|
|
|
+ partyOrganization() {
|
|
if (this.selection.length == 0) {
|
|
if (this.selection.length == 0) {
|
|
this.$message.error("请先选择需要修改的人员");
|
|
this.$message.error("请先选择需要修改的人员");
|
|
} else {
|
|
} else {
|
|
@@ -860,7 +858,7 @@ export default {
|
|
console.log(this.partyArr, "selection");
|
|
console.log(this.partyArr, "selection");
|
|
let arr = [];
|
|
let arr = [];
|
|
let selection = this.selection;
|
|
let selection = this.selection;
|
|
- selection.forEach(item => {
|
|
|
|
|
|
+ selection.forEach((item) => {
|
|
item.id;
|
|
item.id;
|
|
arr.push(item.id);
|
|
arr.push(item.id);
|
|
return arr;
|
|
return arr;
|
|
@@ -878,7 +876,7 @@ export default {
|
|
console.log(this.selection, "selection");
|
|
console.log(this.selection, "selection");
|
|
let arr = [];
|
|
let arr = [];
|
|
let selection = this.selection;
|
|
let selection = this.selection;
|
|
- selection.forEach(item => {
|
|
|
|
|
|
+ selection.forEach((item) => {
|
|
item.id;
|
|
item.id;
|
|
arr.push(item.id);
|
|
arr.push(item.id);
|
|
return arr;
|
|
return arr;
|
|
@@ -886,12 +884,12 @@ export default {
|
|
let ids = arr;
|
|
let ids = arr;
|
|
const date = {
|
|
const date = {
|
|
ids: arr,
|
|
ids: arr,
|
|
- is_graduate: 1
|
|
|
|
|
|
+ is_graduate: 1,
|
|
};
|
|
};
|
|
this.$confirm("此操作将选中人员移入历史党员档案, 是否继续?", "提示", {
|
|
this.$confirm("此操作将选中人员移入历史党员档案, 是否继续?", "提示", {
|
|
confirmButtonText: "确定",
|
|
confirmButtonText: "确定",
|
|
cancelButtonText: "取消",
|
|
cancelButtonText: "取消",
|
|
- type: "warning"
|
|
|
|
|
|
+ type: "warning",
|
|
})
|
|
})
|
|
.then(() => {
|
|
.then(() => {
|
|
this.fileGuidang(date);
|
|
this.fileGuidang(date);
|
|
@@ -899,14 +897,14 @@ export default {
|
|
.catch(() => {
|
|
.catch(() => {
|
|
this.$message({
|
|
this.$message({
|
|
type: "info",
|
|
type: "info",
|
|
- message: "已取消删除"
|
|
|
|
|
|
+ message: "已取消删除",
|
|
});
|
|
});
|
|
this.selection = [];
|
|
this.selection = [];
|
|
});
|
|
});
|
|
}
|
|
}
|
|
},
|
|
},
|
|
async fileGuidang(date) {
|
|
async fileGuidang(date) {
|
|
- await fileGuidang(date).then(res => {
|
|
|
|
|
|
+ await fileGuidang(date).then((res) => {
|
|
this.personnelList();
|
|
this.personnelList();
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -924,7 +922,7 @@ export default {
|
|
//this.$refs.upload.submit();
|
|
//this.$refs.upload.submit();
|
|
console.log(file, "filr");
|
|
console.log(file, "filr");
|
|
this.importVisible = false;
|
|
this.importVisible = false;
|
|
- setTimeout(function() {
|
|
|
|
|
|
+ setTimeout(function () {
|
|
that.personnelList();
|
|
that.personnelList();
|
|
this.loadingFull = false;
|
|
this.loadingFull = false;
|
|
}, 1000);
|
|
}, 1000);
|
|
@@ -943,31 +941,30 @@ export default {
|
|
method: "get",
|
|
method: "get",
|
|
url: "/staffs/export",
|
|
url: "/staffs/export",
|
|
headers: {
|
|
headers: {
|
|
- Authorization: "Bearer " + getToken()
|
|
|
|
|
|
+ Authorization: "Bearer " + getToken(),
|
|
},
|
|
},
|
|
params: {
|
|
params: {
|
|
ids: arr,
|
|
ids: arr,
|
|
fields: this.fieldSelect,
|
|
fields: this.fieldSelect,
|
|
politics_status: this.searchParams.politics_status,
|
|
politics_status: this.searchParams.politics_status,
|
|
- organization_id: this.searchParams.organization_id
|
|
|
|
|
|
+ organization_id: this.searchParams.organization_id,
|
|
},
|
|
},
|
|
- responseType: "blob"
|
|
|
|
- }).then(response => {
|
|
|
|
|
|
+ responseType: "blob",
|
|
|
|
+ }).then((response) => {
|
|
this.convertRes2Blob(response);
|
|
this.convertRes2Blob(response);
|
|
});
|
|
});
|
|
},
|
|
},
|
|
|
|
|
|
convertRes2Blob(response) {
|
|
convertRes2Blob(response) {
|
|
// 提取文件名
|
|
// 提取文件名
|
|
- const fileNameList = response.headers["content-disposition"].match(
|
|
|
|
- /filename=(.*)(.*)/
|
|
|
|
- );
|
|
|
|
|
|
+ const fileNameList =
|
|
|
|
+ response.headers["content-disposition"].match(/filename=(.*)(.*)/);
|
|
console.log(fileNameList, "Mead");
|
|
console.log(fileNameList, "Mead");
|
|
const fileName = fileNameList[1];
|
|
const fileName = fileNameList[1];
|
|
|
|
|
|
// 将二进制流转为blob
|
|
// 将二进制流转为blob
|
|
const blob = new Blob([response.data], {
|
|
const blob = new Blob([response.data], {
|
|
- type: "application/vnd.ms-excel"
|
|
|
|
|
|
+ type: "application/vnd.ms-excel",
|
|
});
|
|
});
|
|
if (typeof window.navigator.msSaveBlob !== "undefined") {
|
|
if (typeof window.navigator.msSaveBlob !== "undefined") {
|
|
// 兼容IE,window.navigator.msSaveBlob:以本地方式保存文件
|
|
// 兼容IE,window.navigator.msSaveBlob:以本地方式保存文件
|
|
@@ -1002,8 +999,8 @@ export default {
|
|
//导出
|
|
//导出
|
|
async exportPersonnel(params) {
|
|
async exportPersonnel(params) {
|
|
await exportPersonnel(params)
|
|
await exportPersonnel(params)
|
|
- .then(res => {})
|
|
|
|
- .catch(e => {
|
|
|
|
|
|
+ .then((res) => {})
|
|
|
|
+ .catch((e) => {
|
|
this.loadingFull = false;
|
|
this.loadingFull = false;
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -1025,9 +1022,9 @@ export default {
|
|
is_graduate: 0,
|
|
is_graduate: 0,
|
|
politics_status: "",
|
|
politics_status: "",
|
|
organization_id: "", //组织id
|
|
organization_id: "", //组织id
|
|
- is_rdsqs: '',
|
|
|
|
|
|
+ is_rdsqs: "",
|
|
limit: 15, //每页显示条数
|
|
limit: 15, //每页显示条数
|
|
- page: 1 //当前页码
|
|
|
|
|
|
+ page: 1, //当前页码
|
|
}; //搜索框数据
|
|
}; //搜索框数据
|
|
this.searchParams.is_graduate = 0;
|
|
this.searchParams.is_graduate = 0;
|
|
this.searchParams.organization_id = e.id;
|
|
this.searchParams.organization_id = e.id;
|
|
@@ -1036,13 +1033,13 @@ export default {
|
|
//查看详情
|
|
//查看详情
|
|
getDetail(id) {
|
|
getDetail(id) {
|
|
const params = {
|
|
const params = {
|
|
- id: id
|
|
|
|
|
|
+ id: id,
|
|
};
|
|
};
|
|
this.personnelDetail(params);
|
|
this.personnelDetail(params);
|
|
},
|
|
},
|
|
async personnelDetail(params) {
|
|
async personnelDetail(params) {
|
|
this.loadingFull = true;
|
|
this.loadingFull = true;
|
|
- await personnelDetail(params).then(res => {
|
|
|
|
|
|
+ await personnelDetail(params).then((res) => {
|
|
console.log(res, "人员详情");
|
|
console.log(res, "人员详情");
|
|
this.personnelDetails = res.data;
|
|
this.personnelDetails = res.data;
|
|
this.dialogVisible = true;
|
|
this.dialogVisible = true;
|
|
@@ -1058,7 +1055,7 @@ export default {
|
|
this.$confirm("此操作将永久删除该人员信息, 是否继续?", "提示", {
|
|
this.$confirm("此操作将永久删除该人员信息, 是否继续?", "提示", {
|
|
confirmButtonText: "确定",
|
|
confirmButtonText: "确定",
|
|
cancelButtonText: "取消",
|
|
cancelButtonText: "取消",
|
|
- type: "warning"
|
|
|
|
|
|
+ type: "warning",
|
|
})
|
|
})
|
|
.then(() => {
|
|
.then(() => {
|
|
this.deletePersonnelList(id);
|
|
this.deletePersonnelList(id);
|
|
@@ -1066,23 +1063,23 @@ export default {
|
|
.catch(() => {
|
|
.catch(() => {
|
|
this.$message({
|
|
this.$message({
|
|
type: "info",
|
|
type: "info",
|
|
- message: "已取消删除"
|
|
|
|
|
|
+ message: "已取消删除",
|
|
});
|
|
});
|
|
});
|
|
});
|
|
},
|
|
},
|
|
async deletePersonnelList(id) {
|
|
async deletePersonnelList(id) {
|
|
- await deletePersonnelList(id).then(res => {
|
|
|
|
|
|
+ await deletePersonnelList(id).then((res) => {
|
|
if (!res.code) {
|
|
if (!res.code) {
|
|
this.$message({
|
|
this.$message({
|
|
type: "success",
|
|
type: "success",
|
|
- message: "删除成功"
|
|
|
|
|
|
+ message: "删除成功",
|
|
});
|
|
});
|
|
|
|
|
|
this.personnelList();
|
|
this.personnelList();
|
|
} else {
|
|
} else {
|
|
this.$message({
|
|
this.$message({
|
|
type: "error",
|
|
type: "error",
|
|
- message: "删除失败"
|
|
|
|
|
|
+ message: "删除失败",
|
|
});
|
|
});
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -1096,12 +1093,12 @@ export default {
|
|
resetPwd() {
|
|
resetPwd() {
|
|
this.loadingFull = true;
|
|
this.loadingFull = true;
|
|
remarkPwd(this.resetPassword)
|
|
remarkPwd(this.resetPassword)
|
|
- .then(res => {
|
|
|
|
|
|
+ .then((res) => {
|
|
this.$message.success("重置密码成功");
|
|
this.$message.success("重置密码成功");
|
|
this.resetPasswordVisible = false;
|
|
this.resetPasswordVisible = false;
|
|
this.loadingFull = false;
|
|
this.loadingFull = false;
|
|
})
|
|
})
|
|
- .catch(err => {
|
|
|
|
|
|
+ .catch((err) => {
|
|
this.$message.error("重置密码失败");
|
|
this.$message.error("重置密码失败");
|
|
this.loadingFull = false;
|
|
this.loadingFull = false;
|
|
});
|
|
});
|
|
@@ -1118,15 +1115,12 @@ export default {
|
|
this.searchParams.page = e;
|
|
this.searchParams.page = e;
|
|
|
|
|
|
this.personnelList();
|
|
this.personnelList();
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ },
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|
|
-<style lang="scss">
|
|
|
|
-@import "@/assets/styles/content.scss";
|
|
|
|
|
|
+<style lang="scss" scoped>
|
|
.app-main {
|
|
.app-main {
|
|
- padding-left: 10px !important;
|
|
|
|
- padding-bottom: 0 !important;
|
|
|
|
.el-checkbox {
|
|
.el-checkbox {
|
|
line-height: 40px;
|
|
line-height: 40px;
|
|
}
|
|
}
|
|
@@ -1169,7 +1163,8 @@ export default {
|
|
flex: 1;
|
|
flex: 1;
|
|
padding-bottom: 50px;
|
|
padding-bottom: 50px;
|
|
margin-left: 20px;
|
|
margin-left: 20px;
|
|
- width: 83%;
|
|
|
|
|
|
+ width: calc(100% - 300px);
|
|
|
|
+ // margin-right: 10px;
|
|
.upload-import {
|
|
.upload-import {
|
|
text-align: center;
|
|
text-align: center;
|
|
}
|
|
}
|