Commit 6ba21e65 authored by 姬鋆屾's avatar 姬鋆屾

parent 26e91263
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
size="mini" size="mini"
@click="$emit('edit', row)" @click="$emit('edit', row)"
title="编辑" title="编辑"
style="margin-left: 0;margin-right: 5px"
>编辑</el-button >编辑</el-button
> >
<span>&nbsp;</span>
<el-button <el-button
v-if="!noView" v-if="!noView"
type="text" type="text"
...@@ -17,18 +17,18 @@ ...@@ -17,18 +17,18 @@
size="mini" size="mini"
@click="$emit('view', row)" @click="$emit('view', row)"
title="查看" title="查看"
style="margin-left: 0;margin-right: 5px"
>查看</el-button >查看</el-button
> >
<span>&nbsp;</span>
<el-switch <el-switch
v-if="switchBtn" v-if="switchBtn"
v-model="row.check" v-model="row.check"
@change="$emit('view', row)" @change="$emit('view', row)"
title="核查" title="核查"
:active-value="true" :active-value="true"
style="margin-left: 0;margin-right: 5px"
:inactive-value="false" :inactive-value="false"
></el-switch> ></el-switch>
<span>&nbsp;</span>
<el-button <el-button
v-if="reCheck" v-if="reCheck"
type="text" type="text"
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
size="mini" size="mini"
@click="$emit('edit', row)" @click="$emit('edit', row)"
title="核查" title="核查"
style="margin-left: 0;margin-right: 5px"
>核查</el-button >核查</el-button
> >
<span>&nbsp;</span>
<el-button <el-button
v-if="chuli" v-if="chuli"
type="text" type="text"
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
size="mini" size="mini"
@click="$emit('edit', row)" @click="$emit('edit', row)"
title="处理" title="处理"
style="margin-left: 0;margin-right: 5px"
>处理</el-button >处理</el-button
> >
<span>&nbsp;</span>
<Confirm @confirm="$emit('del', row.id)" message="确定要删除该条记录吗?"> <Confirm @confirm="$emit('del', row.id)" message="确定要删除该条记录吗?">
<el-button <el-button
v-if="!noDel" v-if="!noDel"
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
title="删除" title="删除"
style="margin-left: 0;margin-right: 5px"
>删除</el-button >删除</el-button
> >
</Confirm> </Confirm>
......
...@@ -255,6 +255,7 @@ export default { ...@@ -255,6 +255,7 @@ export default {
{ {
label: "操作", label: "操作",
width: 200, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.checkStatus == 1 ? ( return row.checkStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -262,6 +262,7 @@ export default { ...@@ -262,6 +262,7 @@ export default {
{ {
label: "操作", label: "操作",
width: 200, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.checkStatus == 1 ? ( return row.checkStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -262,6 +262,7 @@ export default { ...@@ -262,6 +262,7 @@ export default {
{ {
label: "操作", label: "操作",
width: 200, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.checkStatus == 1 ? ( return row.checkStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -250,6 +250,7 @@ export default { ...@@ -250,6 +250,7 @@ export default {
{ {
label: "操作", label: "操作",
width: 200, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.checkStatus == 1 ? ( return row.checkStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -258,6 +258,7 @@ export default { ...@@ -258,6 +258,7 @@ export default {
{ {
label: "操作", label: "操作",
width: 200, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.checkStatus == 1 ? ( return row.checkStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -259,6 +259,7 @@ export default { ...@@ -259,6 +259,7 @@ export default {
{ {
label: "操作", label: "操作",
width: 200, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.checkStatus == 1 ? ( return row.checkStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -507,6 +507,9 @@ export default { ...@@ -507,6 +507,9 @@ export default {
], ],
createTime: [{ required: true, message: "请选择创建时间" }], createTime: [{ required: true, message: "请选择创建时间" }],
}, },
urls: {
saveUrl: "/perform/attend/appeal/audit",
},
}; };
}, },
......
...@@ -218,7 +218,7 @@ export default { ...@@ -218,7 +218,7 @@ export default {
{ label: "异常结果", prop: "errorResult" }, { label: "异常结果", prop: "errorResult" },
/* /*
{ {
label: "图片凭证", label: "图片凭证",
prop: "filePaths", prop: "filePaths",
...@@ -232,10 +232,13 @@ export default { ...@@ -232,10 +232,13 @@ export default {
formatter: this.formatterPic, formatter: this.formatterPic,
}, },
{ label: "绩效规则", prop: "ruleNme" }, { label: "绩效规则", prop: "ruleNme" },
{ label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter }, {
label: "加分/扣分方式",
prop: "subMethod",
formatter: this.formatter,
},
{ {
label: "加分/扣分时间", label: "加分/扣分时间",
...@@ -256,6 +259,7 @@ export default { ...@@ -256,6 +259,7 @@ export default {
{ {
label: "操作", label: "操作",
width: 200, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -232,7 +232,11 @@ export default { ...@@ -232,7 +232,11 @@ export default {
{ label: "绩效规则", prop: "ruleNme" }, { label: "绩效规则", prop: "ruleNme" },
{ label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter }, {
label: "加分/扣分方式",
prop: "subMethod",
formatter: this.formatter,
},
{ {
label: "加分/扣分时间", label: "加分/扣分时间",
...@@ -253,6 +257,7 @@ export default { ...@@ -253,6 +257,7 @@ export default {
{ {
label: "操作", label: "操作",
width: 200, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -232,7 +232,11 @@ export default { ...@@ -232,7 +232,11 @@ export default {
}, },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
{ label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter }, {
label: "加分/扣分方式",
prop: "subMethod",
formatter: this.formatter,
},
{ {
label: "加分/扣分时间", label: "加分/扣分时间",
...@@ -252,7 +256,8 @@ export default { ...@@ -252,7 +256,8 @@ export default {
{ {
label: "操作", label: "操作",
width: 240, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -219,7 +219,11 @@ export default { ...@@ -219,7 +219,11 @@ export default {
}, },
{ label: "绩效规则", prop: "ruleName" }, { label: "绩效规则", prop: "ruleName" },
{ label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter }, {
label: "加分/扣分方式",
prop: "subMethod",
formatter: this.formatter,
},
{ {
label: "加分/扣分时间", label: "加分/扣分时间",
...@@ -239,7 +243,8 @@ export default { ...@@ -239,7 +243,8 @@ export default {
{ {
label: "操作", label: "操作",
width: 240, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -248,7 +248,8 @@ export default { ...@@ -248,7 +248,8 @@ export default {
{ {
label: "操作", label: "操作",
width: 240, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -230,7 +230,11 @@ export default { ...@@ -230,7 +230,11 @@ export default {
{ label: "绩效规则", prop: "ruleNme" }, { label: "绩效规则", prop: "ruleNme" },
{ label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter }, {
label: "加分/扣分方式",
prop: "subMethod",
formatter: this.formatter,
},
{ {
label: "加分/扣分时间", label: "加分/扣分时间",
...@@ -251,6 +255,7 @@ export default { ...@@ -251,6 +255,7 @@ export default {
{ {
label: "操作", label: "操作",
width: 200, width: 200,
fixed: "right",
formatter: (row) => { formatter: (row) => {
return row.processStatus == 1 ? ( return row.processStatus == 1 ? (
<table-buttons <table-buttons
......
...@@ -40,14 +40,12 @@ ...@@ -40,14 +40,12 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="userDeptDialog.title" :title="userDeptDialog.title"
:visible.sync="userDeptDialog.open" :visible.sync="userDeptDialog.open"
width="60%" width="60%"
append-to-body append-to-body
> >
<div class="mytree"> <div class="mytree">
<el-tree <el-tree
ref="bomTree" ref="bomTree"
...@@ -95,7 +93,7 @@ export default { ...@@ -95,7 +93,7 @@ export default {
this.tableData.loading = false; this.tableData.loading = false;
}, },
renderContent: function (h, { node, data, store }) { renderContent: function(h, { node, data, store }) {
return ( return (
<span> <span>
<i style="font-size:16px;color:#409EFF" class={data.icon}></i> <i style="font-size:16px;color:#409EFF" class={data.icon}></i>
...@@ -128,18 +126,17 @@ export default { ...@@ -128,18 +126,17 @@ export default {
// }); // });
}, },
userDeptConfirm(row) { userDeptConfirm(row) {
if(Object.keys(this.node).length === 0){ if (Object.keys(this.node).length === 0) {
this.$message.error("请选择一个部门!"); this.$message.error("请选择一个部门!");
return; return;
} }
this.userDeptDialog.data['deptId']=this.node.id; this.userDeptDialog.data["deptId"] = this.node.id;
this.userDeptDialog.data['deptName']=this.node.label; this.userDeptDialog.data["deptName"] = this.node.label;
this.$post("/user/save", this.userDeptDialog.data).then((res) => { this.$post("/user/save", this.userDeptDialog.data).then((res) => {
if (res && res.code == 1) { if (res && res.code == 1) {
this.userDeptDialog.data = {}; this.userDeptDialog.data = {};
this.node=null; this.node = null;
this.$message.success("分配部门成功!"); this.$message.success("分配部门成功!");
this.getData(); this.getData();
} }
...@@ -148,7 +145,6 @@ export default { ...@@ -148,7 +145,6 @@ export default {
}); });
}, },
// 获取角色列表与当前用户角色列表 // 获取角色列表与当前用户角色列表
userRoleConfirm(row) { userRoleConfirm(row) {
let data = this.userRoleDialog.data; let data = this.userRoleDialog.data;
...@@ -182,7 +178,6 @@ export default { ...@@ -182,7 +178,6 @@ export default {
this.tableData.loading = false; this.tableData.loading = false;
}, },
async distributeDept(row) { async distributeDept(row) {
console.log("分配部门"); console.log("分配部门");
try { try {
...@@ -193,9 +188,8 @@ export default { ...@@ -193,9 +188,8 @@ export default {
parentId: 0, parentId: 0,
}).then(({ data }) => { }).then(({ data }) => {
this.data = data.result; this.data = data.result;
this.node={} this.node = {};
console.log("data",this.data) console.log("data", this.data);
}); });
this.userDeptDialog.open = true; this.userDeptDialog.open = true;
}); });
...@@ -218,8 +212,8 @@ export default { ...@@ -218,8 +212,8 @@ export default {
getRoleUsers(id) { getRoleUsers(id) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.$post("/role/user/list", { this.$post("/role/user/list", {
"userId": id, userId: id,
"size": -1, size: -1,
}) })
.then(({ data }) => { .then(({ data }) => {
const result = data.data const result = data.data
...@@ -247,7 +241,7 @@ export default { ...@@ -247,7 +241,7 @@ export default {
return { return {
allRoles: {}, allRoles: {},
nodeData: {}, nodeData: {},
node:{}, node: {},
data: [], data: [],
tree: [], tree: [],
roles: [], roles: [],
...@@ -276,10 +270,10 @@ export default { ...@@ -276,10 +270,10 @@ export default {
visible: false, visible: false,
}, },
config: { config: {
isshowTabPane:true, isshowTabPane: true,
columns: [ columns: [
{ type: "selection",reserveSelection:true, width: 60 }, { type: "selection", reserveSelection: true, width: 60 },
{ type: "index", label: "序号",align:"center", width: 50 }, { type: "index", label: "序号", align: "center", width: 50 },
{ {
prop: "loginName", prop: "loginName",
label: "登录名称", label: "登录名称",
...@@ -353,7 +347,7 @@ export default { ...@@ -353,7 +347,7 @@ export default {
> >
分配部门 分配部门
</el-button> </el-button>
<span> </span> <span> </span>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
...@@ -362,7 +356,6 @@ export default { ...@@ -362,7 +356,6 @@ export default {
> >
修改密码 修改密码
</el-button> </el-button>
</div> </div>
); );
}, },
...@@ -464,7 +457,5 @@ export default { ...@@ -464,7 +457,5 @@ export default {
top: 12px; top: 12px;
width: 24px; width: 24px;
} }
} }
</style> </style>
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