From 879619f383ed012c9672962d41ce13ec77806ed7 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Wed, 26 Feb 2025 15:10:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=98=8E=E7=BB=86=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=94=B9=E4=B8=BA=E5=A4=9A=E9=80=89=E3=80=82=E6=97=A5?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=8C=E6=9C=88=E6=8A=A5=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=88=E5=BC=82=E5=B8=B8=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=96=E5=8B=A4=E5=A4=A9=E6=95=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/process/restExam/index.vue    | 37 ++++++++++++++++++++----
 src/views/report/attReport/index.vue    | 38 +++++++++++++++++++++----
 src/views/report/dayReport/index.vue    | 11 +++++++
 src/views/report/monthReport/index.vue  | 11 +++++++
 src/views/report/monthlyError/index.vue | 11 +++++++
 5 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/src/views/process/restExam/index.vue b/src/views/process/restExam/index.vue
index add784e..53ffc7a 100644
--- a/src/views/process/restExam/index.vue
+++ b/src/views/process/restExam/index.vue
@@ -130,7 +130,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="所属部门:" prop="orgId">
+<!--            <el-form-item label="所属部门:" prop="orgId">
               <el-select v-model="form.orgId" disabled>
                 <el-option
                   v-for="item in orgList"
@@ -139,6 +139,9 @@
                   :value="item.id"
                 />
               </el-select>
+            </el-form-item>-->
+            <el-form-item label="所属部门" prop="orgId">
+              <treeselect v-model="form.orgId" :multiple="false" :flat="true" :options="deptOptions" :normalizer="normalizer" placeholder="选择所属部门" @select="onSelect" />
             </el-form-item>
           </el-col>
 
@@ -153,7 +156,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="轮休开始时间：" prop="leaveStartDate">
-              <el-input v-model="form.leaveStartDate" :readonly="true" style="width: 70%;"/>
+              <el-input v-model="form.leaveStartDate" :readonly="true" style="width: 100%;"/>
 <!--              <el-select v-model="form.leaveStartInterval" style="width: 25%;margin-left: 10px;" disabled>-->
 <!--                <el-option-->
 <!--                  v-for="item in timeStatusList"-->
@@ -166,7 +169,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="轮休结束时间:" prop="leaveEndDate">
-              <el-input v-model="form.leaveEndDate" :readonly="true" style="width: 70%;"/>
+              <el-input v-model="form.leaveEndDate" :readonly="true" style="width: 100%;"/>
 <!--              <el-select v-model="form.leaveEndInterval" style="width: 25%;margin-left: 10px;" disabled>-->
 <!--                <el-option-->
 <!--                  v-for="item in timeStatusList"-->
@@ -208,7 +211,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="代理主持工作人员："  prop="hostUserId">
-              <el-select v-model="form.hostUserId" multiple  placeholder="请选择" filterable clearable>
+              <el-select v-model="form.hostUserId" multiple  placeholder="请选择" filterable clearable style="width: 100%;">
                 <el-option
                   v-for="item in userList"
                   :key="item.userId"
@@ -263,6 +266,7 @@
 import { checkListHoliday,getHoliday,changeHolidayStatus,exportHoliday,getPostName,getUserList,batchLxCheckStatus } from "@/api/process/rest";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listDeptTree } from '@/api/system/userInfo'
 export default {
   name: "RestExam",
   dicts: ['apply_status'],
@@ -328,7 +332,8 @@ export default {
         // examineOpinion: [
         //   { required: true, message: "审批意见不能为空", trigger: "blur" }
         // ],
-      }
+      },
+      deptOptions:[],
     };
   },
   created() {
@@ -338,6 +343,7 @@ export default {
     }
     this.getList();
     this.getUserLists();
+    this.getDeptList();
   },
   methods: {
     /** 查询列表 */
@@ -565,6 +571,27 @@ export default {
         this.getList();
       });
     },
+
+    getDeptList(){
+      listDeptTree().then(response => {
+        this.deptOptions = this.handleTree(response.data, "id");
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.orgName,
+        children: node.children
+      };
+    },
+    onSelect(selectedNode) {
+      this.form.orgName = selectedNode.orgName;
+    }
+
   }
 };
 </script>
diff --git a/src/views/report/attReport/index.vue b/src/views/report/attReport/index.vue
index 6878866..125927b 100644
--- a/src/views/report/attReport/index.vue
+++ b/src/views/report/attReport/index.vue
@@ -6,9 +6,9 @@
                   @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="部门" prop="orgId">
-        <treeselect v-model="queryParams.orgId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门"
-                    style="width: 240px"
+      <el-form-item label="部门" prop="orgIdList">
+        <treeselect v-model="queryParams.orgIdList" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门"
+                    style="width: 240px" :multiple="true"
         />
       </el-form-item>
       <el-form-item label="状态" prop="attStatus">
@@ -446,8 +446,9 @@ export default {
         pageNum: 1,
         pageSize: 10,
         userName: undefined,
-        orgId: undefined,
-        attStatus: undefined
+        orgIdList: undefined,
+        attStatus: undefined,
+        orgIds:undefined
       },
       queryRecord: {
         pageNum: 1,
@@ -544,6 +545,13 @@ export default {
         this.queryParams.startDate = undefined
         this.queryParams.endDate = undefined
       }
+
+      if (this.queryParams.orgIdList && this.queryParams.orgIdList.length > 0) {
+        // 将数组中的每个元素转换为字符串（如果需要）
+        this.queryParams.orgIds = this.queryParams.orgIdList.map(id => id.toString());
+      }else{
+        this.queryParams.orgIds = undefined
+      }
       getDetailsList(this.queryParams).then(response => {
           this.typeList = response.rows
           this.total = response.total
@@ -561,6 +569,9 @@ export default {
       this.dateRange = []
       this.getWeekDates()
       this.resetForm('queryForm')
+
+      this.queryParams.orgIdList =undefined
+      this.queryParams.orgIds = undefined
       this.handleQuery()
     },
     // 多选框选中数据
@@ -798,6 +809,14 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.queryParams.exportType = '考勤明细'
+
+      if (this.queryParams.orgIdList && this.queryParams.orgIdList.length > 0) {
+        // 将数组中的每个元素转换为字符串（如果需要）
+        this.queryParams.orgIds = this.queryParams.orgIdList.map(id => id.toString());
+      }else{
+        this.queryParams.orgIds = undefined
+      }
+
       exportAttRecord(this.queryParams).then(res => {
         this.downloadFile({
           fileName: `考勤记录_${new Date().getTime()}.xlsx`,
@@ -810,6 +829,15 @@ export default {
     /** 异常排名导出 */
     abnormalRankingExport() {
       this.queryParams.exportType = '异常排名导出'
+
+      if (this.queryParams.orgIdList && this.queryParams.orgIdList.length > 0) {
+        // 将数组中的每个元素转换为字符串（如果需要）
+        this.queryParams.orgIds = this.queryParams.orgIdList.map(id => id.toString());
+      }else{
+        this.queryParams.orgIds = undefined
+      }
+
+
       exportAbnormalRanking(this.queryParams).then(res => {
         this.downloadFile({
           fileName: `异常排名_${new Date().getTime()}.xlsx`,
diff --git a/src/views/report/dayReport/index.vue b/src/views/report/dayReport/index.vue
index 5211830..c2f3cf1 100644
--- a/src/views/report/dayReport/index.vue
+++ b/src/views/report/dayReport/index.vue
@@ -127,6 +127,14 @@
           </div>
         </template>
       </el-table-column>
+
+      <el-table-column label="外勤天数" align="center" prop="outsideAttNum">
+        <template slot-scope="scope">
+          <div @click="openRecord(scope.row,title10)" style="color: #02a7f0; cursor: pointer" >
+            {{ scope.row.outsideAttNum }}
+          </div>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -274,6 +282,7 @@ export default {
       title7: "请假记录",
       title8: "轮休记录",
       title9: "临时外出记录",
+      title10: "外勤记录",
       // 是否显示弹出层
       open: false,
       dialogQueryForm: {
@@ -403,6 +412,8 @@ export default {
         this.dialogQueryForm.attStatus = 5;
       } else if (titleBoss == '临时外出记录') {
         this.dialogQueryForm.attStatus = 7;
+      }  else if(titleBoss == '外勤记录'){
+        this.dialogQueryForm.attStatus = 26;
       }
       this.open = true;
       this.resetForm("dialogQueryForm");
diff --git a/src/views/report/monthReport/index.vue b/src/views/report/monthReport/index.vue
index 3af13c4..0b173db 100644
--- a/src/views/report/monthReport/index.vue
+++ b/src/views/report/monthReport/index.vue
@@ -132,6 +132,14 @@
         </template>
       </el-table-column>
 
+      <el-table-column label="外勤天数" align="center" prop="outsideAttNum">
+        <template slot-scope="scope">
+          <div @click="openRecord(scope.row,title12)" style="color: #02a7f0; cursor: pointer" >
+            {{ scope.row.outsideAttNum }}
+          </div>
+        </template>
+      </el-table-column>
+
     </el-table>
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -291,6 +299,7 @@ export default {
       title9: "临时外出记录",
       title10: "出差天数",
       title11: "打卡记录",
+      title12: "外勤记录",
       // 是否显示弹出层
       open: false,
       showRecord: false,
@@ -456,6 +465,8 @@ export default {
         this.queryRecord.attStatis = 7;
       } else if (titleBoss == '出差天数') {
         this.queryRecord.attStatis = 10;
+      }else if(titleBoss == '外勤记录'){
+        this.queryRecord.attStatus = 26;
       }
       this.showRecord = true;
       this.getListRecord();
diff --git a/src/views/report/monthlyError/index.vue b/src/views/report/monthlyError/index.vue
index 32c7bad..ef4903c 100644
--- a/src/views/report/monthlyError/index.vue
+++ b/src/views/report/monthlyError/index.vue
@@ -126,6 +126,14 @@
         </template>
       </el-table-column>
 
+      <el-table-column label="外勤天数" align="center" prop="outsideAttNum">
+        <template slot-scope="scope">
+          <div @click="openRecord(scope.row,title10)" style="color: #02a7f0; cursor: pointer" >
+            {{ scope.row.outsideAttNum }}
+          </div>
+        </template>
+      </el-table-column>
+
     </el-table>
 
     <pagination
@@ -282,6 +290,7 @@ export default {
       title5: '打卡地异常记录',
       title6: '出入异常记录',
       title7: '请假记录',
+      title10: "外勤记录",
       // 是否显示弹出层
       open: false,
       dateRange: [],
@@ -461,6 +470,8 @@ export default {
         this.queryRecord.attStatis = 8
       } else if (titleBoss == '请假记录') {
         this.queryRecord.attStatis = 6
+      }else if(titleBoss == '外勤记录'){
+        this.queryRecord.attStatus = 26;
       }
       this.showRecord = true
       this.getListRecord()