Skip to content

E
enterprise-platform
Commit 38e1d2c5 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 0fdbc793 80e558ea
Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 10 deletions
enterprise-manager-ui/admin/src/assets/mixins/formdialog.js
View file @ 38e1d2c5
......@@ -63,6 +63,7 @@ export default {
// 提交表单
submitForm(ref) {
const el = this.$refs.form;
// console.log(this.form);
el.validate((valid) => {
if (!valid) return;
this.loading = true;
......
enterprise-manager-ui/admin/src/views/Home.vue
View file @ 38e1d2c5
......@@ -151,12 +151,12 @@ export default {
}
if (data.sendCardStaffList.length > 0) {
if (data.businessCardDistributionList.length > 0) {
let arr = [];
data.sendCardStaffList.forEach(item => {
data.businessCardDistributionList.forEach(item => {
arr.push({
name: item.name,
value: item.sumViews
name: item.companyName,
value: item.businessCardNums
});
});
this.mpfbDayValue = arr
......
enterprise-manager-ui/admin/src/views/home/bar.vue
View file @ 38e1d2c5
......@@ -50,8 +50,8 @@ export default {
grid: {
left: "2%",
right: "2%",
top: "15%",
bottom: "15%",
top: "10%",
bottom: "0%",
containLabel: true,
},
xAxis: {
......@@ -60,6 +60,57 @@ export default {
axisTick: {
show: false,
},
axisLabel: {
//x轴文字的配置
show: true,
interval: 0,//使x轴文字显示全
// rotate: '15',// 刻度标签旋转的角度
formatter: function(value) {
var texts = value
if(label.length>3 && label.length<=6){
if (texts.length > 10) {
// 限制长度自设
texts = texts.substr(0, 10) + '...'
}
}
if(label.length>6 && label.length<=10){
if (texts.length > 6) {
// 限制长度自设
texts = texts.substr(0, 6) + '...'
}
}
if(label.length>10){
if (texts.length > 3) {
// 限制长度自设
texts = texts.substr(0, 3) + '...'
}
}
return texts
},
// formatter: function(params) {
// var newParamsName = "";
// var paramsNameNumber = params.length;
// var provideNumber = 10; //一行显示几个字
// var rowNumber = Math.ceil(paramsNameNumber / provideNumber);
// if (paramsNameNumber > provideNumber) {
// for (var p = 0; p < rowNumber; p++) {
// var tempStr = "";
// var start = p * provideNumber;
// var end = start + provideNumber;
// if (p == rowNumber - 1) {
// tempStr = params.substring(start, paramsNameNumber);
// } else {
// tempStr = params.substring(start, end) + "\n";
// }
// newParamsName += tempStr;
// }
// } else {
// newParamsName = params;
// }
// return newParamsName;
// }
}
},
yAxis: {
type: "value",
......
enterprise-manager-ui/admin/src/views/staff/drawershow.vue
View file @ 38e1d2c5
......@@ -12,7 +12,7 @@
<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="email" v-model="form.email" placeholder="请输入邮件地址"/>
<Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
......@@ -170,7 +170,6 @@
phoneNumber : "",
idCard : "",
workNum : "",
companyIds : "",
companyName : "",
positionId : null,
positionName : "",
......
enterprise-manager-ui/admin/src/views/staff/list.vue
View file @ 38e1d2c5
......@@ -33,6 +33,55 @@
toView(row) {
this.$refs.drawerform.view(row);
},
// 离职操作
toDimission(row){
console.log(row);
// 先弹窗提问
this.$confirm('此操作将'+row.name+'作离职处理，离职后，该员工在之前发送的名片将不做展示，客户点击名片消息后跳转至之前绑定的企业详情（若该员工有多张企业名片，以第一个为准），是否继续？', '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消'
}).then(() => {
// 先修改状态在修改
let query = JSON.parse(JSON.stringify(row))
query.staffStatus=3
console.log(this.$refs.drawerform.urls.saveUrl);
this.$post('staff/leave',{id:query.id})
.then(res => {
this.$message.success(res.msg);
this.getData()
})
}).catch(() => {});
},
// 重写getData
async getData() {
this.query = Object.assign({staffStatus:1}, this.query, this.$route.query);
try {
await this.beforeFecth();
} catch (error) {
return;
}
this.tableData.loading = true;
this.$post(this.pageInfo.list, this.query, {
cancelToken: this.source.token
})
.then(({ data }) => {
this.tableData = this.beforeRender(
Object.assign({}, this.tableData, data)
);
this.afterRender(this.tableData);
})
.catch(error => {
if (error.message == '自动取消ajax操作') return
this.$message.error(error.message);
})
.then(data => {
clearTimeout(this.loadingTimer);
this.loadingTimer = setTimeout(() => {
this.tableData.loading = false;
}, 300);
})
},
},
data() {
......@@ -87,15 +136,15 @@
{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: "操作",
width: 240,
formatter: row => {
return (
<div>
<span> </span>
<table-buttons 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>
);
}
......
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