Skip to content

E
enterprise-platform
Commit e6268553 authored by 姬鋆屾's avatar 姬鋆屾
Browse files
Options

feated:反馈信息列表添加删除操作及参数添加部门字段,优化所提bug及系统功能

parent 9008190b
Show whitespace changes
Inline Side-by-side
Showing with 655 additions and 526 deletions
enterprise-manager-ui/admin/src/assets/mixins/formdialog.js
View file @ e6268553
...@@ -8,15 +8,15 @@ export default { ...@@ -8,15 +8,15 @@ export default {
methods: { methods: {
// 渲染前置处理 // 渲染前置处理
beforeRender(data) { beforeRender(data) {
return data console.log(data);
},
// 渲染后置处理
afterRender(data) {
return data;
}, },
// 渲染后置处理
afterRender(data) {},
// 提交表单的前置处理 // 提交表单的前置处理
beforeSubmit(data) { beforeSubmit(data) {
return data return data;
}, },
// 提交表单的后置处理, 会阻断默认的回退行为 // 提交表单的后置处理, 会阻断默认的回退行为
afterSubmit(data) { afterSubmit(data) {
...@@ -49,16 +49,16 @@ export default { ...@@ -49,16 +49,16 @@ export default {
this.afterRender(res); this.afterRender(res);
}) })
.catch(error => { .catch((error) => {
this.$message.error(error.message) this.$message.error(error.message);
throw error throw error;
}) })
.then(data => { .then((data) => {
clearTimeout(this.loadingTimer); clearTimeout(this.loadingTimer);
this.loadingTimer = setTimeout(() => { this.loadingTimer = setTimeout(() => {
this.loading = false; this.loading = false;
}, 300); }, 300);
}) });
}, },
// 提交表单 // 提交表单
submitForm(ref) { submitForm(ref) {
...@@ -67,70 +67,83 @@ export default { ...@@ -67,70 +67,83 @@ export default {
el.validate((valid) => { el.validate((valid) => {
if (!valid) return; if (!valid) return;
this.loading = true; this.loading = true;
this.$post(this.urls.saveUrl || this.pageInfo.saveUrl, this.beforeSubmit(this.form)) this.$post(
.then(res => { this.urls.saveUrl || this.pageInfo.saveUrl,
this.beforeSubmit(this.form)
)
.then((res) => {
this.$message.success(res.msg); this.$message.success(res.msg);
this.afterSubmit(res); this.afterSubmit(res);
}) })
.catch(error => { .catch((error) => {
this.$message.error(error.message); this.$message.error(error.message);
}) })
.then(data => { .then((data) => {
clearTimeout(this.loadingTimer); clearTimeout(this.loadingTimer);
this.loadingTimer = setTimeout(() => { this.loadingTimer = setTimeout(() => {
this.loading = false; this.loading = false;
}, 200); }, 200);
}) });
}); });
}, },
// 复制一个数组或对象 // 复制一个数组或对象
util_copy(data) { util_copy(data) {
return JSON.parse(JSON.stringify(data)) return JSON.parse(JSON.stringify(data));
}, },
// 工具方法，把数字转化为字符串 // 工具方法，把数字转化为字符串
util_toString(data, array) { util_toString(data, array) {
//原始数据 //原始数据
const dataCopy = Object.assign({}, data); const dataCopy = Object.assign({}, data);
array.forEach(item => { array.forEach((item) => {
//如果相等做操作 //如果相等做操作
dataCopy[item] = dataCopy[item] === undefined ? '' : dataCopy[item] + ''; dataCopy[item] =
}) dataCopy[item] === undefined ? "" : dataCopy[item] + "";
});
return dataCopy; return dataCopy;
}, },
// 工具方法，把字符串转化为数组 // 工具方法，把字符串转化为数组
util_toArrays(data, array) { util_toArrays(data, array) {
const dataCopy = Object.assign({}, data); const dataCopy = Object.assign({}, data);
array.forEach(item => { array.forEach((item) => {
dataCopy[item] = dataCopy[item] === undefined ? [] : dataCopy[item].split(","); dataCopy[item] =
}) dataCopy[item] === undefined || dataCopy[item] === ""
? []
: dataCopy[item].split(",");
});
return dataCopy; return dataCopy;
}, },
// 工具方法，把字符串转化为格式化日期 // 工具方法，把字符串转化为格式化日期
util_toDateStr(data, array) { util_toDateStr(data, array) {
const dataCopy = Object.assign({}, data); const dataCopy = Object.assign({}, data);
array.forEach(item => { array.forEach((item) => {
dataCopy[item] = dataCopy[item] === undefined ? '' : this.util_formatterDate(dataCopy[item]); dataCopy[item] =
}) dataCopy[item] === undefined
? ""
: this.util_formatterDate(dataCopy[item]);
});
return dataCopy; return dataCopy;
}, },
util_formatterDate(time) { util_formatterDate(time) {
let date = new Date(Number(time)); let date = new Date(Number(time));
let Y = date.getFullYear() + '-'; let Y = date.getFullYear() + "-";
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'; let M =
let D = this.panLeft(date.getDate()) + ' '; (date.getMonth() + 1 < 10
let h = this.panLeft(date.getHours()) + ':'; ? "0" + (date.getMonth() + 1)
let m = this.panLeft(date.getMinutes()) + ':'; : date.getMonth() + 1) + "-";
let D = this.panLeft(date.getDate()) + " ";
let h = this.panLeft(date.getHours()) + ":";
let m = this.panLeft(date.getMinutes()) + ":";
let s = this.panLeft(date.getSeconds()); let s = this.panLeft(date.getSeconds());
return Y + M + D + h + m + s; return Y + M + D + h + m + s;
}, },
panLeft(num) { panLeft(num) {
return num < 10 ? '0' + num : num; return num < 10 ? "0" + num : num;
}, },
// 从dict字段暴力取值，取不到则返回原值 // 从dict字段暴力取值，取不到则返回原值
util_formatter(key, val) { util_formatter(key, val) {
try { try {
return this.dict[key][val] return this.dict[key][val];
} catch (error) { } catch (error) {
return val; return val;
} }
...@@ -143,24 +156,24 @@ export default { ...@@ -143,24 +156,24 @@ export default {
} }
}); });
}, 0); }, 0);
} },
}, },
computed: { computed: {
pageInfo() { pageInfo() {
let currUrl = this.$route.path; let currUrl = this.$route.path;
let urlArray = currUrl.split('/'); let urlArray = currUrl.split("/");
let type = urlArray.pop(); let type = urlArray.pop();
urlArray.push('save'); urlArray.push("save");
let saveUrl = urlArray.join('/'); let saveUrl = urlArray.join("/");
urlArray.pop(); urlArray.pop();
urlArray.push('edit'); urlArray.push("edit");
let editUrl = urlArray.join('/'); let editUrl = urlArray.join("/");
urlArray.pop(); urlArray.pop();
urlArray.push('add'); urlArray.push("add");
let addUrl = urlArray.join('/'); let addUrl = urlArray.join("/");
urlArray.pop(); urlArray.pop();
urlArray.push('view'); urlArray.push("view");
let viewUrl = urlArray.join('/'); let viewUrl = urlArray.join("/");
return { return {
type, type,
currUrl, currUrl,
...@@ -184,9 +197,6 @@ export default { ...@@ -184,9 +197,6 @@ export default {
toString: [], // 需要把number转化为string的表单字段name数组 toString: [], // 需要把number转化为string的表单字段name数组
toArrays: [], // 需要把number转化为arrays的表单字段name数组 toArrays: [], // 需要把number转化为arrays的表单字段name数组
toDate: [], // 需要把number转化为date的表单字段name数组 toDate: [], // 需要把number转化为date的表单字段name数组
} };
} },
} };
enterprise-manager-ui/admin/src/components/ImageUpload.vue
View file @ e6268553
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
:file-list="imgList" :file-list="imgList"
accept=".jpeg,.png,.jpg,.bmp,.gif" accept=".jpeg,.png,.jpg,.bmp,.gif"
:headers="headers" :headers="headers"
:limit="limit"
v-else v-else
> >
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
...@@ -98,6 +99,10 @@ export default { ...@@ -98,6 +99,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
limit: {
type: Number,
default: undefined,
},
}, },
mounted() { mounted() {
// 判断是否为多图上传 // 判断是否为多图上传
......
enterprise-manager-ui/admin/src/views/company/list.vue
View file @ e6268553
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" :config="tableConfig" notDel> <LayoutTable :data="tableData" :config="tableConfig" notDel> </LayoutTable>
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "CompanyList", name: "CompanyList",
components: { components: {
drawerShow drawerShow,
},
mixins: [table],
created() {
}, },
mixins: [table],
created() {},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
this.$refs.drawerform.add(row); this.$refs.drawerform.add(row);
...@@ -33,11 +30,9 @@ ...@@ -33,11 +30,9 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
}, },
data() { data() {
return { return {
config: { config: {
search: [ search: [
{ {
...@@ -48,30 +43,49 @@ ...@@ -48,30 +43,49 @@
}, },
], ],
columns: [ columns: [
{type: "index",label: "序号",width: 50}, { type: "index", label: "序号", width: 50 },
{label: "公司名称", prop: "companyName"}, { label: "公司名称", prop: "companyName" },
{label: "联系电话", prop: "contactPhone"}, { label: "联系电话", prop: "contactPhone" },
{label: "经营地址", prop: "businessAdress",formatter: this.formatters}, {
label: "经营地址",
prop: "businessAdress",
formatter: this.formatters,
},
{label: "描述", prop: "companyIntroduction",formatter: this.formatters}, {
label: "描述",
prop: "companyIntroduction",
formatter: this.formatters,
},
{label: "更新时间", prop: "createTime", formatter: this.formatterDate}, {
label: "更新时间",
prop: "updateTime",
formatter: this.formatterDate,
},
{ {
label: "操作", label: "操作",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons
noAdd
noView
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
); );
} },
} },
] ],
} },
};
}
}; };
},
};
</script> </script>
enterprise-manager-ui/admin/src/views/favorites/product/list.vue
View file @ e6268553
...@@ -3,23 +3,21 @@ ...@@ -3,23 +3,21 @@
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
</LayoutTable> </LayoutTable>
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "FavoritesProductList", name: "FavoritesProductList",
components: { components: {
drawerShow drawerShow,
},
mixins: [table],
created() {
}, },
mixins: [table],
created() {},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
...@@ -33,34 +31,42 @@ ...@@ -33,34 +31,42 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
}, },
data() { data() {
return { return {
config: { config: {
search: [ search: [],
],
columns: [ columns: [
{type: "selection", width: 60}, { type: "selection", width: 60 },
{type: "index",label: "序号",width: 50}, { type: "index", label: "序号", width: 50 },
{label: "用户", prop: "userId", formatter: this.formatter}, { label: "用户", prop: "userId", formatter: this.formatter },
{label: "产品", prop: "productId", formatter: this.formatter}, { label: "产品", prop: "productId", formatter: this.formatter },
{label: "创建用户", prop: "createUserId", formatter: this.formatter}, {
label: "创建用户",
prop: "createUserId",
formatter: this.formatter,
},
{ {
label: "操作", label: "操作",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons
noAdd
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
); );
} },
} },
] ],
} },
};
}
}; };
},
};
</script> </script>
enterprise-manager-ui/admin/src/views/feedback/drawershow.vue
View file @ e6268553
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
prop="deptId" prop="deptId"
v-model="form.deptId" v-model="form.deptId"
placeholder="请输入所属部门" placeholder="请输入所属部门"
:enum-data="dict.deptId"
/> />
</el-row> </el-row>
<!-- <el-row> <!-- <el-row>
...@@ -271,6 +272,11 @@ export default { ...@@ -271,6 +272,11 @@ export default {
cancel() { cancel() {
this.open = false; this.open = false;
}, },
/**获取数据前弹框 */
beforeRender(data) {
data.entity.deptId = String(data.entity.deptId);
return data;
},
/**获取数据后弹框 */ /**获取数据后弹框 */
afterRender(data) { afterRender(data) {
this.open = true; this.open = true;
......
enterprise-manager-ui/admin/src/views/feedback/list.vue
View file @ e6268553
...@@ -169,17 +169,38 @@ export default { ...@@ -169,17 +169,38 @@ export default {
width: 240, width: 240,
formatter: (row) => { formatter: (row) => {
return ( return (
<el-button <table-buttons
type="text" noAdd
icon="el-icon-edit" noView
size="mini" row={row}
onClick={() => { onEdit={this.toEdit}
this.toEdit(row); onView={this.toView}
}} onDel={this.toDel}
title="详情" />
> // <div>
详情 // <el-button
</el-button> // type="text"
// icon="el-icon-edit"
// size="mini"
// onClick={() => {
// this.toEdit(row);
// }}
// title="详情"
// >
// 详情
// </el-button>
// <el-button
// type="text"
// icon="el-icon-edit"
// size="mini"
// onClick={() => {
// this.toEdit(row);
// }}
// title="详情"
// >
// 删除
// </el-button>
// </div>
); );
}, },
}, },
......
enterprise-manager-ui/admin/src/views/news/drawershow.vue
View file @ e6268553
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
:visible.sync="open" :visible.sync="open"
:direction="direction" :direction="direction"
:destroy-on-close="true" :destroy-on-close="true"
size="100%" size="70%"
> >
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<div class="form"> <div class="form">
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
v-model="form.titleLogoPath" v-model="form.titleLogoPath"
prePath="/file/preview" prePath="/file/preview"
:isList="true" :isList="true"
:limit="9"
ref="imgList" ref="imgList"
/> />
</Field> </Field>
...@@ -174,13 +175,17 @@ export default { ...@@ -174,13 +175,17 @@ export default {
cancel() { cancel() {
this.open = false; this.open = false;
}, },
/**获取数据前弹框 */
beforeRender(data) {
data.entity.deptId = String(data.entity.deptId);
return data;
},
/**获取数据后弹框 */ /**获取数据后弹框 */
afterRender(data) { afterRender(data) {
this.open = true; this.open = true;
}, },
// 提交前数据处理 // 提交前数据处理
beforeSubmit(data) { beforeSubmit(data) {
console.log(data, "123");
let arr = []; let arr = [];
arr = this.$refs.imgList.imgList.map((v) => { arr = this.$refs.imgList.imgList.map((v) => {
return v.response ? v.response.url : v.url.substr(v.url.indexOf("f")); return v.response ? v.response.url : v.url.substr(v.url.indexOf("f"));
......
enterprise-manager-ui/admin/src/views/news/list.vue
View file @ e6268553
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
{ {
label: "创建时间", label: "创建时间",
prop: "createDateTime", prop: "createTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
......
enterprise-manager-ui/admin/src/views/staff/drawershow.vue
View file @ e6268553
...@@ -5,137 +5,172 @@ ...@@ -5,137 +5,172 @@
:visible.sync="open" :visible.sync="open"
:direction="direction" :direction="direction"
:destroy-on-close="true" :destroy-on-close="true"
size="50%"> size="50%"
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field :span="20" label="员工姓名" prop="name" v-model="form.name" placeholder="请输入员工姓名"/> <Field
<Field :span="20" label="所属公司" prop="companyIds" v-model="form.companyIds" :multiple="true" type="select" :enum-data="dict.companyIds" placeholder="请输入所属公司"/> :span="20"
<Field :span="20" label="职位" prop="positionId" v-model="form.positionId" type="select" :enum-data="dict.positionId" placeholder="请输入职位ID"/> label="员工姓名"
<Field :span="20" label="联系电话" prop="phoneNumber" v-model="form.phoneNumber" placeholder="请输入联系电话"/> prop="name"
v-model="form.name"
placeholder="请输入员工姓名"
/>
<Field
:span="20"
label="所属公司"
prop="companyIds"
v-model="form.companyIds"
:multiple="true"
type="select"
:enum-data="dict.companyIds"
placeholder="请输入所属公司"
/>
<Field
:span="20"
label="职位"
prop="positionId"
v-model="form.positionId"
type="select"
:enum-data="dict.positionId"
placeholder="请输入职位ID"
/>
<Field
:span="20"
label="联系电话"
prop="phoneNumber"
v-model="form.phoneNumber"
placeholder="请输入联系电话"
/>
<!-- <Field :span="20" label="员工状态" type="select" prop="staffStatus" v-model="form.staffStatus" :enum-data="dict.staffStatus" placeholder="请输入员工状态"/> --> <!-- <Field :span="20" label="员工状态" type="select" prop="staffStatus" v-model="form.staffStatus" :enum-data="dict.staffStatus" placeholder="请输入员工状态"/> -->
<Field :span="20" label="头像" prop="photoPath" placeholder="请输入照片"><imageUpload v-model="form.photoPath" prePath="/file/preview"/> </Field> <Field :span="20" label="头像" prop="photoPath" placeholder="请输入照片"
<Field :span="20" label="邮件地址" prop="email" v-model="form.email" placeholder="请输入邮件地址"/> ><imageUpload v-model="form.photoPath" prePath="/file/preview" />
<Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/> </Field>
<Field
:span="20"
label="邮件地址"
prop="email"
v-model="form.email"
placeholder="请输入邮件地址"
/>
<Field
:span="20"
label="备注"
prop="remark"
v-model="form.remark"
type="textarea"
placeholder="请输入备注"
/>
</el-row> </el-row>
<form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn /> <form-buttons
@submit="submitForm"
v-if="pageInfo.type != 'view'"
noCancelBtn
/>
</el-form> </el-form>
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
export default { export default {
name: "StaffDetail", name: "StaffDetail",
mixins: [form], mixins: [form],
components: { components: {},
},
created() { created() {
this.changePath("staff") this.changePath("staff");
}, },
data() { data() {
var checkEmail = (rule, value, callback) => { var checkEmail = (rule, value, callback) => {
let mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/; let mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/;
if (!value) { //如果输入为空直接返回 if (!value) {
//如果输入为空直接返回
callback(); callback();
} else { } else {
//如果字符串 string 中含有与 RegExpObject 匹配的文本，则返回 true，否则返回 false。 //如果字符串 string 中含有与 RegExpObject 匹配的文本，则返回 true，否则返回 false。
if (mailReg.test(value)) { //匹配成功返回 if (mailReg.test(value)) {
//匹配成功返回
callback(); callback();
} else { //匹配不成功返回错误显示 } else {
callback(new Error("邮箱格式:xx@xx.xx，只含数字、大小写字母、下划线、横杠")); //匹配不成功返回错误显示
callback(
new Error("邮箱格式:xx@xx.xx，只含数字、大小写字母、下划线、横杠")
);
} }
} }
}; };
var checkPhone = (rule,value,callback) =>{ var checkPhone = (rule, value, callback) => {
let phoneReg = /^1[3|4|5|7|8][0-9]{9}$/ let phoneReg = /^1[3|4|5|7|8][0-9]{9}$/;
if(!value){ if (!value) {
callback() callback();
}else{ } else {
if(phoneReg.test(value)){ if (phoneReg.test(value)) {
callback() callback();
}else{ } else {
callback(new Error("电话格式:13、14、15、17、18开头+9位阿拉伯数字")) callback(new Error("电话格式:13、14、15、17、18开头+9位阿拉伯数字"));
}
} }
} }
};
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 弹出层标题 // 弹出层标题
title: "员工基本信息", title: "员工基本信息",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
direction:"rtl", direction: "rtl",
toString:[ toString: ["gender", "staffType", "staffStatus", "source", "positionId"],
"gender", toArrays: ["companyIds"],
"staffType",
"staffStatus",
"source",
"positionId"
],
toArrays:["companyIds"],
toDate:[ toDate: ["birthday", "entryDate", "regularDate", "leaveDate"],
"birthday",
"entryDate",
"regularDate",
"leaveDate",
],
// 表单校验 // 表单校验
rules: { rules: {
name: [ name: [
{required: true,message: "请输入员工姓名", trigger: "blur" }, { required: true, message: "请输入员工姓名", trigger: "blur" },
{max: 64,message: "最多只能录入64个字符",trigger: "blur",}, { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
], ],
positionId: [ positionId: [
{required: true,message: "请选择职位", trigger: "blur" } { required: true, message: "请选择职位", trigger: "blur" },
], ],
companyIds: [ companyIds: [
{required: true,message: "请选择所属企业", trigger: "blur" } { required: true, message: "请选择所属企业", trigger: "blur" },
], ],
phoneNumber: [ phoneNumber: [
{required: true,message: "请输入联系电话", trigger: "blur" }, { required: true, message: "请输入联系电话", trigger: "blur" },
{ validator: checkPhone,trigger: "blur" }, { validator: checkPhone, trigger: "blur" },
{max: 11,message: "最多只能录入11个字符",trigger: "blur",}, { max: 11, message: "最多只能录入11个字符", trigger: "blur" },
],
email: [
{ validator: checkEmail,trigger: "blur" }
], ],
} email: [{ validator: checkEmail, trigger: "blur" }],
},
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl ="staff/edit"; this.urls.currUrl = "staff/edit";
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type = "edit";
this.title = "修改员工基本信息"; this.title = "修改员工基本信息";
}, },
/** 新增 */ /** 新增 */
add(row) { add(row) {
this.reset() this.reset();
this.urls.currUrl = "staff/add"; this.urls.currUrl = "staff/add";
this.getData(); this.getData();
this.pageInfo.type="add" this.pageInfo.type = "add";
this.title = "新增员工基本信息"; this.title = "新增员工基本信息";
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl ="staff/view"; this.urls.currUrl = "staff/view";
this.getData(); this.getData();
this.pageInfo.type="view" this.pageInfo.type = "view";
this.title = "员工基本信息详细"; this.title = "员工基本信息详细";
}, },
/**取消按钮 */ /**取消按钮 */
...@@ -148,10 +183,9 @@ ...@@ -148,10 +183,9 @@
}, },
beforeSubmit(data) { beforeSubmit(data) {
data.companyIds = data.companyIds.join(",");
data.companyIds=data.companyIds.join(",") return data;
return data
}, },
afterSubmit(data) { afterSubmit(data) {
...@@ -162,28 +196,28 @@ ...@@ -162,28 +196,28 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
name : "", name: "",
gender : 1, gender: 1,
birthday : null, birthday: null,
photoPath : "", photoPath: "",
Email : "", Email: "",
phoneNumber : "", phoneNumber: "",
idCard : "", idCard: "",
workNum : "", workNum: "",
companyName : "", companyName: "",
positionId : null, positionId: null,
positionName : "", positionName: "",
staffType : 1, staffType: 1,
staffStatus : 1, staffStatus: 1,
source : 1, source: 1,
registerPath : "", registerPath: "",
entryDate : null, entryDate: null,
regularDate : null, regularDate: null,
leaveDate : null, leaveDate: null,
remark : "", remark: "",
sumViews : 0, sumViews: 0,
viewsByDay : 0, viewsByDay: 0,
sendBusinessCardTimes : 0, sendBusinessCardTimes: 0,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -193,5 +227,5 @@ ...@@ -193,5 +227,5 @@
} }
}, },
}, },
}; };
</script> </script>
enterprise-manager-ui/admin/src/views/staff/list.vue
View file @ e6268553
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notDel :config="tableConfig"> <LayoutTable :data="tableData" notDel :config="tableConfig"> </LayoutTable>
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "StaffList", name: "StaffList",
components: { components: {
drawerShow drawerShow,
},
mixins: [table],
created() {
}, },
mixins: [table],
created() {},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
...@@ -34,28 +31,39 @@ ...@@ -34,28 +31,39 @@
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
// 离职操作 // 离职操作
toDimission(row){ toDimission(row) {
console.log(row); console.log(row);
// 先弹窗提问 // 先弹窗提问
this.$confirm('此操作将'+row.name+'作离职处理，离职后，该员工在之前发送的名片将不做展示，客户点击名片消息后跳转至之前绑定的企业详情（若该员工有多张企业名片，以第一个为准），是否继续？', '系统提示', { this.$confirm(
confirmButtonText: '确定', "此操作将" +
cancelButtonText: '取消' row.name +
}).then(() => { "作离职处理，离职后，该员工在之前发送的名片将不做展示，客户点击名片消息后跳转至之前绑定的企业详情（若该员工有多张企业名片，以第一个为准），是否继续？",
"系统提示",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
}
)
.then(() => {
// 先修改状态在修改 // 先修改状态在修改
let query = JSON.parse(JSON.stringify(row)) let query = JSON.parse(JSON.stringify(row));
query.staffStatus=3 query.staffStatus = 3;
console.log(this.$refs.drawerform.urls.saveUrl); console.log(this.$refs.drawerform.urls.saveUrl);
this.$post('staff/leave',{id:query.id}) this.$post("staff/leave", { id: query.id }).then((res) => {
.then(res => {
this.$message.success(res.msg); this.$message.success(res.msg);
this.getData() this.getData();
});
}) })
}).catch(() => {}); .catch(() => {});
}, },
// 重写getData // 重写getData
async getData() { async getData() {
this.query = Object.assign({staffStatus:1}, this.query, this.$route.query); this.query = Object.assign(
{ staffStatus: 1 },
this.query,
this.$route.query
);
try { try {
await this.beforeFecth(); await this.beforeFecth();
} catch (error) { } catch (error) {
...@@ -63,7 +71,7 @@ ...@@ -63,7 +71,7 @@
} }
this.tableData.loading = true; this.tableData.loading = true;
this.$post(this.pageInfo.list, this.query, { this.$post(this.pageInfo.list, this.query, {
cancelToken: this.source.token cancelToken: this.source.token,
}) })
.then(({ data }) => { .then(({ data }) => {
this.tableData = this.beforeRender( this.tableData = this.beforeRender(
...@@ -71,47 +79,45 @@ ...@@ -71,47 +79,45 @@
); );
this.afterRender(this.tableData); this.afterRender(this.tableData);
}) })
.catch(error => { .catch((error) => {
if (error.message == '自动取消ajax操作') return if (error.message == "自动取消ajax操作") return;
this.$message.error(error.message); this.$message.error(error.message);
}) })
.then(data => { .then((data) => {
clearTimeout(this.loadingTimer); clearTimeout(this.loadingTimer);
this.loadingTimer = setTimeout(() => { this.loadingTimer = setTimeout(() => {
this.tableData.loading = false; this.tableData.loading = false;
}, 300); }, 300);
}) });
}, },
}, },
data() { data() {
return { return {
config: { config: {
search: [ search: [
{ {
name: "companyId", name: "companyId",
type: "select", type: "select",
placeholder:"请选择所属企业", placeholder: "请选择所属企业",
label: "所属企业" label: "所属企业",
}, },
{ {
name: "name", name: "name",
type: "text", type: "text",
placeholder:"请输入员工姓名", placeholder: "请输入员工姓名",
label: "员工姓名" label: "员工姓名",
}, },
], ],
columns: [ columns: [
{type: "index",label: "序号",width: 50}, { type: "index", label: "序号", width: 50 },
{label: "员工姓名", prop: "name"}, { label: "员工姓名", prop: "name" },
{label: "头像", prop: "photoPath",formatter: (row) => { {
label: "头像",
prop: "photoPath",
formatter: (row) => {
return row.photoPath != "" ? ( return row.photoPath != "" ? (
<el-image <el-image
style="width: 70px; height: 70px" style="width: 70px; height: 70px"
...@@ -121,37 +127,59 @@ ...@@ -121,37 +127,59 @@
) : ( ) : (
"--" "--"
); );
},}, },
},
{label: "联系电话", prop: "phoneNumber"},
{label: "邮件地址", prop: "email",formatter: this.formatters}, { label: "联系电话", prop: "phoneNumber" },
{label: "所属公司", prop: "companyIds",formatter: this.formatters}, { label: "邮件地址", prop: "email", formatter: this.formatters },
{ label: "所属公司", prop: "companyIds", formatter: this.formatters },
{label: "职位", prop: "positionId",formatter:this.formatter}, { label: "职位", prop: "positionId", formatter: this.formatter },
{label: "发送名片次数", prop: "sendBusinessCardTimes"}, { label: "发送名片次数", prop: "sendBusinessCardTimes" },
{label: "累计查看次数", prop: "sumViews"}, { label: "累计查看次数", prop: "sumViews" },
{label: "最近更新时间", prop: "updateTime", formatter: this.formatterDate}, {
{label: "更新人员", prop: "updateUserId", formatter: this.formatter}, label: "最近更新时间",
prop: "updateTime",
formatter: this.formatterDate,
},
{
label: "更新人员",
prop: "updateUserId",
formatter: this.formatter,
},
// {label: "员工状态", prop: "staffStatus",formatter: this.formatter}, // {label: "员工状态", prop: "staffStatus",formatter: this.formatter},
{ {
label: "操作", label: "操作",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<div> <div>
<table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons
<span onClick={ ()=>{this.toDimission(row)}} style="color:#409EFF;margin-left:20px">离职</span> noAdd
noView
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
<span
onClick={() => {
this.toDimission(row);
}}
style="color:#409EFF;margin-left:20px"
>
离职
</span>
</div> </div>
); );
} },
} },
] ],
} },
};
}
}; };
},
};
</script> </script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment