Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -252,7 +252,27 @@ export default {
     this.$route.name == "attendance/stat/list"
       ? (this.visible = true)
       : (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);
   },
   methods: {

attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue

@@ -175,6 +175,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -202,6 +208,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue

@@ -176,6 +176,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -209,6 +215,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {
@@ -216,7 +224,7 @@ export default {
             prop: "complainTitle",
             formatter: this.formatter,
           },
-
+          
           {
             label: "投诉内容",
             prop: "complainContent",

attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue

@@ -176,6 +176,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -204,6 +210,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue

@@ -176,6 +176,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -203,6 +209,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           { label: "办件编码", prop: "goworkCode", formatter: this.formatter },

attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue

@@ -175,6 +175,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -202,6 +208,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue

@@ -175,6 +175,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -208,6 +214,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/check/window/perform/list.vue

@@ -78,6 +78,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -122,7 +128,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName" },
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/list.vue

@@ -79,6 +79,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -123,7 +129,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName" },
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue

@@ -192,7 +192,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue

@@ -177,6 +177,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "processStatus",
             type: "select",
@@ -209,6 +215,7 @@ export default {
           { label: "姓名", prop: "staffName", formatter: this.formatter },
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue

@@ -245,7 +245,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue

@@ -183,6 +183,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -216,6 +222,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue

@@ -220,7 +220,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue

@@ -184,6 +184,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -212,6 +218,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue

@@ -197,7 +197,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue

@@ -183,6 +183,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -210,6 +216,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           { label: "办件编码", prop: "goworkCode", formatter: this.formatter },

attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue

@@ -156,7 +156,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue

@@ -183,6 +183,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -210,6 +216,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           // {

attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue

@@ -210,7 +210,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
-            <p>{{ form.score }}</p>
+            <p>{{ form.subAddType == 1 ? "+" : "-" }} {{ form.score }}</p>
           </el-form-item>
         </el-col>
       </el-row>

attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue

@@ -183,6 +183,12 @@ export default {
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -216,6 +222,8 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {

attendance-performance-manager-ui/admin/src/views/staff/list.vue

@@ -269,7 +269,7 @@ export default {
 
     handleNodeClick(node) {
       this.currentNode = node;
-      this.query = { deptId: node.id };
+      this.query = Object.assign({}, { deptId: node.id }, this.query);
       this.getData();
     },
     doExport() {

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue

@@ -84,6 +84,13 @@ export default {
             fuzzy: false,
           },
 
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
+
           {
             name: "deptId",
             type: "select",
@@ -108,6 +115,8 @@ export default {
 
           { label: "手机号", prop: "phoneNumber", formatter: this.formatter },
 
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
           {
             label: "所属中心",

attendance-performance-manager-ui/admin/src/views/window/perform/list.vue

@@ -80,6 +80,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -124,7 +130,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName" },
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager-ui/admin/src/views/window/workman/perform/list.vue

@@ -78,6 +78,12 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
             type: "select",
@@ -122,7 +128,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName" },
+          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
 
           {
             label: "所属部门",