Commit c7eeea00 authored by 姬鋆屾's avatar 姬鋆屾

推修改智能人事分页查询数据展示错误的问题;绩效处添加大厅搜索和展示字段;绩效核查编辑页与查看页面添加分值加减符号

parent 7d2e1156
...@@ -252,7 +252,27 @@ export default { ...@@ -252,7 +252,27 @@ export default {
this.$route.name == "attendance/stat/list" this.$route.name == "attendance/stat/list"
? (this.visible = true) ? (this.visible = true)
: (this.visible = false); : (this.visible = false);
this.$route.name == "attendance/stat/list" ? this.getArr() : ""; if (
this.$route.name == "attendance/stat/list" ||
this.$route.name == "check/window/perform/list" ||
this.$route.name == "check/window/workman/perform/list" ||
this.$route.name == "check/attend/record/list" ||
this.$route.name == "check/review/record/list" ||
this.$route.name == "check/complain/record/list" ||
this.$route.name == "check/gowork/record/list" ||
this.$route.name == "check/effect/record/list" ||
this.$route.name == "window/perform/list" ||
this.$route.name == "window/workman/perform/list" ||
this.$route.name == "perform/attend/record/list" ||
this.$route.name == "perform/review/record/list" ||
this.$route.name == "perform/complain/record/list" ||
this.$route.name == "perform/gowork/record/list" ||
this.$route.name == "perform/effect/record/list" ||
this.$route.name == "staff/perform/summary/list"
) {
this.getArr();
}
this.initForm(this.$route.query); this.initForm(this.$route.query);
}, },
methods: { methods: {
......
...@@ -175,6 +175,12 @@ export default { ...@@ -175,6 +175,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -202,6 +208,8 @@ export default { ...@@ -202,6 +208,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ {
......
...@@ -176,6 +176,12 @@ export default { ...@@ -176,6 +176,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -209,6 +215,8 @@ export default { ...@@ -209,6 +215,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName", formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ {
...@@ -216,7 +224,7 @@ export default { ...@@ -216,7 +224,7 @@ export default {
prop: "complainTitle", prop: "complainTitle",
formatter: this.formatter, formatter: this.formatter,
}, },
{ {
label: "投诉内容", label: "投诉内容",
prop: "complainContent", prop: "complainContent",
......
...@@ -176,6 +176,12 @@ export default { ...@@ -176,6 +176,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -204,6 +210,8 @@ export default { ...@@ -204,6 +210,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ {
......
...@@ -176,6 +176,12 @@ export default { ...@@ -176,6 +176,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -203,6 +209,8 @@ export default { ...@@ -203,6 +209,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ label: "办件编码", prop: "goworkCode", formatter: this.formatter }, { label: "办件编码", prop: "goworkCode", formatter: this.formatter },
......
...@@ -175,6 +175,12 @@ export default { ...@@ -175,6 +175,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -202,6 +208,8 @@ export default { ...@@ -202,6 +208,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ {
......
...@@ -175,6 +175,12 @@ export default { ...@@ -175,6 +175,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -208,6 +214,8 @@ export default { ...@@ -208,6 +214,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ {
......
...@@ -78,6 +78,12 @@ export default { ...@@ -78,6 +78,12 @@ export default {
config: { config: {
isshowTabPane: true, isshowTabPane: true,
search: [ search: [
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -122,7 +128,7 @@ export default { ...@@ -122,7 +128,7 @@ export default {
}, },
}, },
{ label: "所属大厅", prop: "salaName" }, { label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ {
label: "所属部门", label: "所属部门",
......
...@@ -79,6 +79,12 @@ export default { ...@@ -79,6 +79,12 @@ export default {
config: { config: {
isshowTabPane: true, isshowTabPane: true,
search: [ search: [
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -123,7 +129,7 @@ export default { ...@@ -123,7 +129,7 @@ export default {
}, },
}, },
{ label: "所属大厅", prop: "salaName" }, { label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ {
label: "所属部门", label: "所属部门",
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'"> <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<p>{{ form.score }}</p> <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -177,6 +177,12 @@ export default { ...@@ -177,6 +177,12 @@ export default {
config: { config: {
isshowTabPane: true, isshowTabPane: true,
search: [ search: [
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "processStatus", name: "processStatus",
type: "select", type: "select",
...@@ -209,6 +215,7 @@ export default { ...@@ -209,6 +215,7 @@ export default {
{ label: "姓名", prop: "staffName", formatter: this.formatter }, { label: "姓名", prop: "staffName", formatter: this.formatter },
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
......
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'"> <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<p>{{ form.score }}</p> <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -183,6 +183,12 @@ export default { ...@@ -183,6 +183,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -216,6 +222,8 @@ export default { ...@@ -216,6 +222,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ {
......
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'"> <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<p>{{ form.score }}</p> <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -184,6 +184,12 @@ export default { ...@@ -184,6 +184,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -212,6 +218,8 @@ export default { ...@@ -212,6 +218,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ {
......
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'"> <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<p>{{ form.score }}</p> <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -183,6 +183,12 @@ export default { ...@@ -183,6 +183,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -210,6 +216,8 @@ export default { ...@@ -210,6 +216,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ label: "办件编码", prop: "goworkCode", formatter: this.formatter }, { label: "办件编码", prop: "goworkCode", formatter: this.formatter },
......
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'"> <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<p>{{ form.score }}</p> <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -183,6 +183,12 @@ export default { ...@@ -183,6 +183,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -210,6 +216,8 @@ export default { ...@@ -210,6 +216,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
// { // {
......
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
<el-row> <el-row>
<el-col :span="22"> <el-col :span="22">
<el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'"> <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
<p>{{ form.score }}</p> <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -183,6 +183,12 @@ export default { ...@@ -183,6 +183,12 @@ export default {
label: "处理状态", label: "处理状态",
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -216,6 +222,8 @@ export default { ...@@ -216,6 +222,8 @@ export default {
{ label: "窗口编号", prop: "windowNum", formatter: this.formatter }, { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ {
......
...@@ -269,7 +269,7 @@ export default { ...@@ -269,7 +269,7 @@ export default {
handleNodeClick(node) { handleNodeClick(node) {
this.currentNode = node; this.currentNode = node;
this.query = { deptId: node.id }; this.query = Object.assign({}, { deptId: node.id }, this.query);
this.getData(); this.getData();
}, },
doExport() { doExport() {
......
...@@ -84,6 +84,13 @@ export default { ...@@ -84,6 +84,13 @@ export default {
fuzzy: false, fuzzy: false,
}, },
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -108,6 +115,8 @@ export default { ...@@ -108,6 +115,8 @@ export default {
{ label: "手机号", prop: "phoneNumber", formatter: this.formatter }, { label: "手机号", prop: "phoneNumber", formatter: this.formatter },
{ label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ label: "所属部门", prop: "deptName", formatter: this.formatter }, { label: "所属部门", prop: "deptName", formatter: this.formatter },
{ {
label: "所属中心", label: "所属中心",
......
...@@ -80,6 +80,12 @@ export default { ...@@ -80,6 +80,12 @@ export default {
config: { config: {
isshowTabPane: true, isshowTabPane: true,
search: [ search: [
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -124,7 +130,7 @@ export default { ...@@ -124,7 +130,7 @@ export default {
}, },
}, },
{ label: "所属大厅", prop: "salaName" }, { label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ {
label: "所属部门", label: "所属部门",
......
...@@ -78,6 +78,12 @@ export default { ...@@ -78,6 +78,12 @@ export default {
config: { config: {
isshowTabPane: true, isshowTabPane: true,
search: [ search: [
{
name: "salaId",
type: "selectSalaId",
label: "大厅",
fuzzy: false,
},
{ {
name: "deptId", name: "deptId",
type: "select", type: "select",
...@@ -122,7 +128,7 @@ export default { ...@@ -122,7 +128,7 @@ export default {
}, },
}, },
{ label: "所属大厅", prop: "salaName" }, { label: "所属大厅", prop: "salaName",formatter: this.formatter },
{ {
label: "所属部门", label: "所属部门",
......
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