评价报表增添大厅和部门筛选项

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/departmentEvaluation.vue

@@ -13,6 +13,18 @@
       </div>
       <span>
         <a-space>
+          <a-select v-model="hallid">
+            <a-select-option value=""> 全部大厅 </a-select-option>
+            <a-select-option v-for="item in datingList" :key="item.id" :value="item.id">
+              {{ item.hallName }}
+            </a-select-option>
+          </a-select>
+          <a-select v-model="sectionid">
+            <a-select-option value=""> 全部部门 </a-select-option>
+            <a-select-option v-for="item in bumenList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
           <a-select v-model="evaChoose" placeholder="全部评价" mode="multiple">
             <a-select-option v-for="item in optonList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
           </a-select>
@@ -62,6 +74,8 @@ import table from "@/mixins/table";
 import { export2Excel } from "@/utils/js/exportExcel";
 import HandlingDetails from "./components/HandlingDetails.vue";
 import {
+  getDatingList,
+  getBumenList,
   getOptonList,
   getEvaList,
   getEvaData,
@@ -219,12 +233,20 @@ export default {
         "pjxt",
         "pj_name",
       ],
+      // 大厅列表
+      datingList:[],
+      // 部门列表
+      bumenList:[],
+      hallid:'',
+      sectionid:''
     };
   },
   components: {
     HandlingDetails,
   },
   created() {
+    this.getDatingListArr();
+    this.getBumenListArr();
     this.togetevalist();
   },
   mounted() {
@@ -235,6 +257,18 @@ export default {
     });
   },
   methods: {
+    // 获取大厅列表
+    async getDatingListArr() {
+      await getDatingList({ page: 1, size: -1 }).then((res) => {
+        this.datingList = res.data.data;
+      });
+    },
+    // // 获取部门列表
+    async getBumenListArr() {
+      await getBumenList({ page: 1, size: -1 }).then((res) => {
+        this.bumenList = res.data.data;
+      });
+    },
     // 重置
     clearnAllChoose() {
       this.evaChoose = [];
@@ -303,6 +337,8 @@ export default {
         pjxt,
         time: this.BegindAndEndTime,
         info: this.searchName,
+        hallid:this.hallid,
+        sectionid:this.sectionid,
         ...search,
       });
       if (res.code == 1) {

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/matterEvaluation.vue

@@ -13,6 +13,18 @@
       </div>
       <span>
         <a-space>
+          <a-select v-model="hallid">
+            <a-select-option value=""> 全部大厅 </a-select-option>
+            <a-select-option v-for="item in datingList" :key="item.id" :value="item.id">
+              {{ item.hallName }}
+            </a-select-option>
+          </a-select>
+          <a-select v-model="sectionid">
+            <a-select-option value=""> 全部部门 </a-select-option>
+            <a-select-option v-for="item in bumenList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
           <a-select v-model="evaChoose" placeholder="全部评价" mode="multiple">
             <a-select-option v-for="item in optonList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
           </a-select>
@@ -62,6 +74,8 @@ import { export2Excel } from "@/utils/js/exportExcel";
 import table from "@/mixins/table";
 import HandlingDetails from "./components/HandlingDetails.vue";
 import {
+  getDatingList,
+  getBumenList,
   getOptonList,
   getEvaList,
   getEvaData,
@@ -219,17 +233,37 @@ export default {
         "pjxt",
         "pj_name",
       ],
+      // 大厅列表
+      datingList:[],
+      // 部门列表
+      bumenList:[],
+      hallid:'',
+      sectionid:''
     };
   },
   components: {
     HandlingDetails,
   },
   created() {
+    this.getDatingListArr();
+    this.getBumenListArr();
     this.togetevalist();
     this.getOptonList();
   },
 
   methods: {
+    // 获取大厅列表
+    async getDatingListArr() {
+      await getDatingList({ page: 1, size: -1 }).then((res) => {
+        this.datingList = res.data.data;
+      });
+    },
+    // // 获取部门列表
+    async getBumenListArr() {
+      await getBumenList({ page: 1, size: -1 }).then((res) => {
+        this.bumenList = res.data.data;
+      });
+    },
     // 重置
     clearnAllChoose() {
       this.evaChoose = [];
@@ -305,6 +339,8 @@ export default {
         pjxt,
         time: this.BegindAndEndTime,
         info: this.searchName,
+        hallid:this.hallid,
+        sectionid:this.sectionid,
         ...search,
       });
       if (res.code == 1) {

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue

@@ -13,6 +13,18 @@
       </div>
       <span>
         <a-space>
+          <a-select v-model="hallid">
+            <a-select-option value=""> 全部大厅 </a-select-option>
+            <a-select-option v-for="item in datingList" :key="item.id" :value="item.id">
+              {{ item.hallName }}
+            </a-select-option>
+          </a-select>
+          <a-select v-model="sectionid">
+            <a-select-option value=""> 全部部门 </a-select-option>
+            <a-select-option v-for="item in bumenList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
           <a-select v-model="evaChoose" placeholder="全部评价" mode="multiple">
             <a-select-option v-for="item in optonList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
           </a-select>
@@ -63,6 +75,8 @@ import table from "@/mixins/table";
 import { export2Excel } from "@/utils/js/exportExcel";
 import HandlingDetails from "./components/HandlingDetails.vue";
 import {
+  getDatingList,
+  getBumenList,
   getOptonList,
   getEvaList,
   getEvaData,
@@ -219,6 +233,10 @@ export default {
         "pjxt",
         "pj_name",
       ],
+      datingList:[],
+      bumenList:[],
+      hallid:'',
+      sectionid:''
     };
   },
   components: {
@@ -226,10 +244,24 @@ export default {
   },
 
   created() {
+    this.getDatingListArr();
+    this.getBumenListArr();
     this.getOptonList();
     this.togetevalist();
   },
   methods: {
+    // 获取大厅列表
+    async getDatingListArr() {
+      await getDatingList({ page: 1, size: -1 }).then((res) => {
+        this.datingList = res.data.data;
+      });
+    },
+    // 获取部门列表
+    async getBumenListArr() {
+      await getBumenList({ page: 1, size: -1 }).then((res) => {
+        this.bumenList = res.data.data;
+      });
+    },
     // 重置
     clearnAllChoose() {
       this.evaChoose = [];
@@ -242,6 +274,8 @@ export default {
         this.$moment(new Date()).format("YYYY-MM-DD"),
         this.$moment(new Date()).format("YYYY-MM-DD"),
       ];
+      this.sectionid = ''
+      this.hallid = ''
       this.togetevalist();
     },
     // 搜索
@@ -309,6 +343,8 @@ export default {
         pjxt,
         time: this.BegindAndEndTime,
         info: this.searchName,
+        hallid:this.hallid,
+        sectionid:this.sectionid,
         ...search,
       });
       if (res.code == 1) {