Skip to content

A
attendance-performance-platform
Commit a8721582 authored by 姬鋆屾's avatar 姬鋆屾
Browse files
Options

推

parent bfbd457c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2029 additions and 1042 deletions
attendance-performance-manager-ui/admin/src/assets/mixins/formdialog.js
View file @ a8721582
......@@ -64,7 +64,7 @@ export default {
url = "/perform/perpose/save";
} else if (url == "/perform/rules/attend/save") {
url = "/perform/rules/category/save";
} else if ((url == "/perform/staff/conf/save")) {
} else if (url == "/perform/staff/conf/save") {
sessionStorage.getItem("type") == 1
? (url = "/perform/dept/conf/save")
: sessionStorage.getItem("type") == 2
......
attendance-performance-manager-ui/admin/src/components/SearchForm.vue
View file @ a8721582
......@@ -35,7 +35,7 @@
clearable="true"
@change="item.change"
@clear="item.clear"
:placeholder="item.label?item.label:'请选择'"
:placeholder="item.label ? item.label : '请选择'"
v-if="item.type === 'select'"
>
<el-option
......@@ -111,7 +111,7 @@
v-if="item.type === 'date' && !item.valueFormat"
type="date"
value-format="yyyy-MM-dd"
:placeholder="item.label?item.label:'选择日期'"
:placeholder="item.label ? item.label : '选择日期'"
>
</el-date-picker>
......@@ -120,7 +120,7 @@
v-if="item.type === 'date' && item.valueFormat"
type="date"
:value-format="item.valueFormat"
:placeholder="item.label?item.label:'选择日期'"
:placeholder="item.label ? item.label : '选择日期'"
>
</el-date-picker>
......@@ -129,7 +129,7 @@
v-if="item.type === 'month' && !item.valueFormat"
type="month"
value-format="yyyy-MM"
:placeholder="item.label?item.label:'选择月份'"
:placeholder="item.label ? item.label : '选择月份'"
>
</el-date-picker>
......@@ -138,7 +138,7 @@
v-if="item.type === 'month' && item.valueFormat"
type="month"
:value-format="item.valueFormat"
:placeholder="item.label?item.label:'选择月份'"
:placeholder="item.label ? item.label : '选择月份'"
>
</el-date-picker>
......@@ -259,7 +259,6 @@ export default {
},
cleanForm() {
this.clean();
this.onSubmit();
},
// 清空表单值
clean() {
......@@ -268,34 +267,35 @@ export default {
if (item.name === "groupList") {
newData[item.name] = [];
} else {
newData[item.name] = item.multiple ? [] : undefined;
newData[item.name] = item.multiple ? [] : "";
}
});
this.form = Object.assign({}, this.form, newData);
this.onSubmit();
},
onSubmit() {
let { path, query } = this.$route;
if(this.form.attendanceDateStart && this.form.attendanceDateEnd){
let startValue = Date.parse(this.form.attendanceDateStart)
let endValue = Date.parse(this.form.attendanceDateEnd)
if(startValue>endValue){
this.$message.error('查询-结束的日期需大于开始日期')
this.form.attendanceDateEnd = ''
return false
if (this.form.attendanceDateStart && this.form.attendanceDateEnd) {
let startValue = Date.parse(this.form.attendanceDateStart);
let endValue = Date.parse(this.form.attendanceDateEnd);
if (startValue > endValue) {
this.$message.error("查询-结束的日期需大于开始日期");
this.form.attendanceDateEnd = "";
return false;
}
}
if(this.form.startTime && this.form.endTime){
let startValue = Date.parse(this.form.startTime)
let endValue = Date.parse(this.form.endTime)
if(startValue>endValue){
this.$message.error('查询-结束的日期需大于开始日期')
this.form.endTime = ''
return false
if (this.form.startTime && this.form.endTime) {
let startValue = Date.parse(this.form.startTime);
let endValue = Date.parse(this.form.endTime);
if (startValue > endValue) {
this.$message.error("查询-结束的日期需大于开始日期");
this.form.endTime = "";
return false;
}
}
let params = JSON.parse(JSON.stringify(this.form)) //不更改原始数据
let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
// console.log(this.form,'form参数')
let data = this.decode(params);
// Object.assign({}, query, data)
......@@ -303,9 +303,9 @@ export default {
path: path,
query: {
...query,
...data
...data,
},
})
});
},
// 解析url字符串，去除query字段
encode(data, formTemp) {
......@@ -352,17 +352,17 @@ export default {
val.length > 0
) {
//支持模糊查询,收尾增加百分号
val = val.trim()
if(val.charAt(0)!='%'){
val = "%" + val
val = val.trim();
if (val.charAt(0) != "%") {
val = "%" + val;
}
if(val.charAt(val.length-1)!='%'){
val =val + "%";
if (val.charAt(val.length - 1) != "%") {
val = val + "%";
}
}
})
});
newData[item] = this.decodeVal(val);
})
});
return newData;
},
decodeVal(val) {
......@@ -389,8 +389,8 @@ export default {
// groupList: [],
},
remoteOptions: {},
}
}
};
},
};
</script>
......@@ -424,4 +424,3 @@ export default {
}
}
</style>
attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
View file @ a8721582
......@@ -112,7 +112,8 @@ export default {
this.$download(
"/check/attend/record/exportExcel",
{
idList: this.selection,
page: 1,
size: -1,
},
{ type: "excel" }
)
......@@ -157,7 +158,7 @@ export default {
isshowTabPane: true,
search: [
{
name: "status",
name: "checkStatus",
type: "select",
label: "全部状态",
fuzzy: false,
......@@ -177,7 +178,7 @@ export default {
{
name: "staffName",
type: "text",
label: "请输入员工姓名搜索",
label: "员工姓名搜索",
fuzzy: false,
},
],
......@@ -209,9 +210,13 @@ export default {
{ label: "异常结果", prop: "errorResult" },
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleNme" },
{ label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter },
......@@ -227,7 +232,7 @@ export default {
{
label: "处理状态",
prop: "processStatus",
prop: "checkStatus",
formatter: this.formatter,
},
......@@ -235,12 +240,23 @@ export default {
label: "操作",
width: 200,
formatter: (row) => {
return (
return row.checkStatus == 1 ? (
<table-buttons
noAdd
noDel
noEdit
reCheck
noView
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
) : (
<table-buttons
noAdd
noDel
noEdit
row={row}
onEdit={this.toEdit}
onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
View file @ a8721582
......@@ -112,7 +112,8 @@ export default {
this.$download(
"/check/complain/record/exportExcel",
{
idList: this.selection,
page: 1,
size: -1,
},
{ type: "excel" }
)
......@@ -158,7 +159,7 @@ export default {
isshowTabPane: true,
search: [
{
name: "status",
name: "checkStatus",
type: "select",
label: "全部状态",
fuzzy: false,
......@@ -170,7 +171,7 @@ export default {
fuzzy: false,
},
{
name: "source",
name: "complainSource",
type: "select",
label: "全部来源",
fuzzy: false,
......@@ -214,7 +215,11 @@ export default {
{ label: "投诉来源", prop: "complainSource" },
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "投诉设备", prop: "complainDevice" },
......@@ -234,7 +239,7 @@ export default {
{
label: "处理状态",
prop: "processStatus",
prop: "checkStatus",
formatter: this.formatter,
},
......@@ -242,11 +247,22 @@ export default {
label: "操作",
width: 200,
formatter: (row) => {
return (
return row.checkStatus == 1 ? (
<table-buttons
noAdd
noDel
noEdit
reCheck
noView
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
) : (
<table-buttons
noAdd
noDel
noEdit
row={row}
onEdit={this.toEdit}
......
attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
View file @ a8721582
......@@ -112,7 +112,8 @@ export default {
this.$download(
"/check/effect/record/exportExcel",
{
idList: this.selection,
page: 1,
size: -1,
},
{ type: "excel" }
)
......@@ -216,7 +217,11 @@ export default {
formatter: this.formatterDate,
},
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleName" },
......@@ -234,20 +239,31 @@ export default {
{
label: "处理状态",
prop: "processStatus",
prop: "checkStatus",
formatter: this.formatter,
},
{
label: "操作",
width: 240,
width: 200,
formatter: (row) => {
return (
return row.checkStatus == 1 ? (
<table-buttons
noAdd
noDel
noEdit
reCheck
noView
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
) : (
<table-buttons
noAdd
noDel
noEdit
row={row}
onEdit={this.toEdit}
onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
View file @ a8721582
......@@ -112,7 +112,8 @@ export default {
this.$download(
"/check/gowork/record/exportExcel",
{
idList: this.selection,
page: 1,
size: -1,
},
{ type: "excel" }
)
......@@ -158,7 +159,7 @@ export default {
isshowTabPane: true,
search: [
{
name: "status",
name: "checkStatus",
type: "select",
label: "全部状态",
fuzzy: false,
......@@ -204,7 +205,11 @@ export default {
formatter: this.formatterDate,
},
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleName" },
......@@ -222,20 +227,31 @@ export default {
{
label: "处理状态",
prop: "processStatus",
prop: "checkStatus",
formatter: this.formatter,
},
{
label: "操作",
width: 240,
width: 200,
formatter: (row) => {
return (
return row.checkStatus == 1 ? (
<table-buttons
noAdd
noDel
noEdit
reCheck
noView
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
) : (
<table-buttons
noAdd
noDel
noEdit
row={row}
onEdit={this.toEdit}
onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
View file @ a8721582
......@@ -112,7 +112,8 @@ export default {
this.$download(
"/check/other/record/exportExcel",
{
idList: this.selection,
page: 1,
size: -1,
},
{ type: "excel" }
)
......@@ -157,7 +158,7 @@ export default {
isshowTabPane: true,
search: [
{
name: "status",
name: "checkStatus",
type: "select",
label: "全部状态",
fuzzy: false,
......@@ -212,7 +213,11 @@ export default {
// },
// { label: "绩效规则id", prop: "ruleId", formatter: this.formatter },
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleName" },
......@@ -230,20 +235,31 @@ export default {
{
label: "处理状态",
prop: "processStatus",
prop: "checkStatus",
formatter: this.formatter,
},
{
label: "操作",
width: 240,
width: 200,
formatter: (row) => {
return (
return row.checkStatus == 1 ? (
<table-buttons
noAdd
noDel
noEdit
reCheck
noView
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
) : (
<table-buttons
noAdd
noDel
noEdit
row={row}
onEdit={this.toEdit}
onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
View file @ a8721582
......@@ -112,7 +112,8 @@ export default {
this.$download(
"/check/review/record/exportExcel",
{
idList: this.selection,
page: 1,
size: -1,
},
{ type: "excel" }
)
......@@ -157,7 +158,7 @@ export default {
isshowTabPane: true,
search: [
{
name: "status",
name: "checkStatus",
type: "select",
label: "全部状态",
fuzzy: false,
......@@ -169,7 +170,7 @@ export default {
fuzzy: false,
},
{
name: "source",
name: "reviewSource",
type: "select",
label: "全部来源",
fuzzy: false,
......@@ -213,7 +214,11 @@ export default {
formatter: this.formatterDate,
},
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleNme" },
......@@ -231,7 +236,7 @@ export default {
{
label: "处理状态",
prop: "processStatus",
prop: "checkStatus",
formatter: this.formatter,
},
......@@ -239,12 +244,23 @@ export default {
label: "操作",
width: 200,
formatter: (row) => {
return (
return row.checkStatus == 1 ? (
<table-buttons
noAdd
noDel
noEdit
reCheck
noView
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
) : (
<table-buttons
noAdd
noDel
noEdit
row={row}
onEdit={this.toEdit}
onView={this.toView}
......
attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
View file @ a8721582
......@@ -215,7 +215,11 @@ export default {
{ label: "异常结果", prop: "errorResult" },
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleNme" },
......
attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue
View file @ a8721582
......@@ -219,7 +219,11 @@ export default {
{ label: "投诉来源", prop: "complainSource" },
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "投诉设备", prop: "complainDevice" },
......
attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue
View file @ a8721582
......@@ -222,8 +222,11 @@ export default {
formatter: this.formatterDate,
},
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter },
......
attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue
View file @ a8721582
......@@ -209,8 +209,11 @@ export default {
formatter: this.formatterDate,
},
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter },
......
attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue
View file @ a8721582
......@@ -218,8 +218,11 @@ export default {
// },
// { label: "绩效规则id", prop: "ruleId", formatter: this.formatter },
{ label: "图片凭证", prop: "snapPath" },
{
label: "图片凭证",
prop: "filePaths",
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleName" },
{ label: "扣分方式", prop: "subMethod", formatter: this.formatter },
......
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