From 796db0b3b0b6d83d1dc3b37ed53ad8f04e26f175 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Fri, 3 Jan 2025 15:30:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=87=BA=E5=8A=9E=E4=BA=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E4=B8=B4=E6=97=B6=E5=A4=96=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/topTwo.vue                | 16 +++----
 src/views/exceptionHandle/errorForm/index.vue | 48 +++++++++----------
 src/views/process/outApply/index.vue          |  4 +-
 src/views/process/outExam/index.vue           |  6 +--
 src/views/process/requestReport/index.vue     |  2 +-
 src/views/process/workReport/index.vue        |  6 +--
 src/views/report/monthReport/index.vue        |  1 +
 src/views/system/messages/index.vue           |  2 +-
 8 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/views/dashboard/topTwo.vue b/src/views/dashboard/topTwo.vue
index 1ef4abe..3cd0590 100644
--- a/src/views/dashboard/topTwo.vue
+++ b/src/views/dashboard/topTwo.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class="content"> 
+    <div class="content">
         <div class="content-box">
             <div class="title-box">
-                <div style="margin-left: 10px;font-size: 22px;font-weight: bold;">当月轮休、外出办事异常情况</div>
+                <div style="margin-left: 10px;font-size: 22px;font-weight: bold;">当月轮休、临时外出异常情况</div>
             </div>
             <div class="list-box">
                 <div class="listItem" style="background-color: #FFF7F1;" @click="toggleDialog(10)">
@@ -25,7 +25,7 @@ import * as echarts from 'echarts';
 import { getHomePageData } from '@/api/dashboard'
 export default {
     components: {
-        
+
     },
     name: 'topOne',
     props: {
@@ -33,10 +33,10 @@ export default {
             // required: true,
             type: Object,
             default:{
-                
+
             }
         },
-  
+
     },
     data() {
         return {
@@ -47,7 +47,7 @@ export default {
     created() {
 
     },
-    mounted() {  
+    mounted() {
         // this.getInitData()
     },
     methods: {
@@ -57,7 +57,7 @@ export default {
             }else if(v==11){
                 this.$emit('openDialog', { order: v, isExamine:'1'})
             }
-            
+
         },
     },
 }
@@ -103,7 +103,7 @@ export default {
         }
     }
 
-  
+
 }
 
 </style>
diff --git a/src/views/exceptionHandle/errorForm/index.vue b/src/views/exceptionHandle/errorForm/index.vue
index 1445416..883d98f 100644
--- a/src/views/exceptionHandle/errorForm/index.vue
+++ b/src/views/exceptionHandle/errorForm/index.vue
@@ -36,8 +36,8 @@
           >导出数据</el-button>
         </el-form-item>
       </el-form>
-  
-  
+
+
       <el-table v-loading="loading" :data="tableData" ref="multipleTable" row-key="id" >
         <el-table-column label="序号" align="center" width="80" type="index">
         <template slot-scope="scope">
@@ -56,7 +56,7 @@
              <div v-else>{{ scope.row.errorRestCount}}</div>
         </template>
         </el-table-column>
-        <el-table-column label="外出办事未审批条数" align="center" prop="errorOutCount" sortable>
+        <el-table-column label="临时外出未审批条数" align="center" prop="errorOutCount" sortable>
           <template slot-scope="scope">
             <div v-if="scope.row.errorOutCount!=0"
             @click="openRecord(scope.row,title2)" style="color: #02a7f0; cursor: pointer">
@@ -65,9 +65,9 @@
              <div v-else>{{ scope.row.errorOutCount}}</div>
         </template>
         </el-table-column>
-      
+
       </el-table>
-  
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -126,7 +126,7 @@
             <span v-if="scope.row.examineStatus==3">{{ '待审核' }}</span>
             <span v-else>{{  }}</span>
         </template>
-        </el-table-column> 
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
           <template slot-scope="scope">
             <el-button
@@ -138,7 +138,7 @@
           </template>
         </el-table-column>
       </el-table>
-  
+
       <pagination
         v-show="totalTwo>0"
         :total="totalTwo"
@@ -163,7 +163,7 @@
                   >
                   </el-input>
                   <!-- <el-input v-model="form.content" placeholder="请输入" maxlength="20"/> -->
-              </el-form-item>         
+              </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">发送</el-button>
@@ -172,13 +172,13 @@
       </el-dialog>
     </div>
   </template>
-  
+
   <script>
   import { listExceptionFormError,getDetailExceptionRest,getDetailExceptionOut,exportExceptionError,examineRemind} from "@/api/exceptionHandle/errorForm";
   import { downloadFile } from '@/utils/download'
   // import { getEngineeringList } from "@/api/select";
   import Treeselect from "@riophae/vue-treeselect";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";  
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import { listDept } from "@/api/system/dept";
   import { getToken } from '@/utils/auth'
   export default {
@@ -186,7 +186,7 @@
     dicts: ['sys_normal_disable','sys_voltage_level','sys_org_name','sys_pro_type','sys_pro_status',
     'sys_yz_manage','sys_sg_manage','sys_jl_manage','sys_device_type'],
     components: {
-      Treeselect 
+      Treeselect
 		},
     data() {
       return {
@@ -211,7 +211,7 @@
         // 弹出层标题
         title: "",
         title1: "轮休未审批记录",
-        title2: "外出办事未审批记录",
+        title2: "临时外出未审批记录",
         titleExamine:'',
         // 是否显示弹出层
         open: false,
@@ -282,7 +282,7 @@
   //         // 如果没有传递数据，搜索栏保持为空
   //         this.queryParams.attCurrentMonth = '';
   //     }
-  //   },  
+  //   },
 
   //   watch: {
   //       // 如果路由的参数发生变化，更新搜索栏内容
@@ -298,7 +298,7 @@
     methods: {
 
       disabledDate(time) {
-          const str=this.queryRecord.attCurrentMonth+'-01'; 
+          const str=this.queryRecord.attCurrentMonth+'-01';
           // 获取当前日期
           var currentDate = new Date(str);
           // 获取当前月份的第一天
@@ -334,7 +334,7 @@
 
           return `${year}-${month}-${day} ${weekday}`; // 组合成所需格式
         },
- 
+
         getDeptList(){
             listDept().then(response => {
                 this.deptOptions = this.handleTree(response.data, "id");
@@ -352,7 +352,7 @@
             };
         },
 
-        handleSelect(value, instanceId) { 
+        handleSelect(value, instanceId) {
             console.log('Selected:', value);
             // 在这里处理选择事件
             this.queryParams.orgName=value.orgName;
@@ -405,7 +405,7 @@
           this.queryRecord.attCurrentMonth = row.attCurrentMonth;
           if(titleBoss=='轮休未审批记录'){
            this.queryRecord.attStatis=1
-          }else if(titleBoss=='外出办事未审批记录'){
+          }else if(titleBoss=='临时外出未审批记录'){
             this.queryRecord.attStatis=2;
           }
           this.showRecord = true;
@@ -422,10 +422,10 @@
             this.totalTwo = response.total;
             this.loadingTwo = false;
             });
-          }else if(this.title=='外出办事未审批记录'){
+          }else if(this.title=='临时外出未审批记录'){
             getDetailExceptionOut(this.addDateRange(this.queryRecord, this.dateRange)).then(response => {
             this.tableDataRecord = response.rows;
-            this.leaveType="外出办事"
+            this.leaveType="临时外出"
             this.totalTwo = response.total;
             this.loadingTwo = false;
             });
@@ -452,7 +452,7 @@
         },
 
           /** 提交按钮 */
-          submitForm() { 
+          submitForm() {
           this.form.orgId = this.queryRecord.orgId;
           this.form.title = this.leaveType+'异常数据';
           this.form.leaveType=this.leaveType
@@ -479,14 +479,14 @@
             this.form = {};
             this.resetForm("form");
         },
-  
+
         /** 导出按钮操作 */
         handleExport() {
         exportExceptionError(this.queryParams).then(res => {
-          downloadFile({ fileName: `轮休外出办事异常报表_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+          downloadFile({ fileName: `轮休临时外出异常报表_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
         })
       },
-  
+
     }
   };
   </script>
@@ -513,4 +513,4 @@
           display: none;
       }
   }
-  </style>
\ No newline at end of file
+  </style>
diff --git a/src/views/process/outApply/index.vue b/src/views/process/outApply/index.vue
index 2f2d22d..6492d84 100644
--- a/src/views/process/outApply/index.vue
+++ b/src/views/process/outApply/index.vue
@@ -319,7 +319,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        leaveType:"外出办事",
+        leaveType:"临时外出",
         leaveDate: undefined,
         examineStatus: undefined
       },
@@ -445,7 +445,7 @@ export default {
         leaveEndDate: undefined,
         leaveEndInterval:undefined,
         leaveDuration:undefined,
-        leaveType:"外出办事",
+        leaveType:"临时外出",
         examineStatus:"0",
         isAgree: "0",
         hostUserId:[],
diff --git a/src/views/process/outExam/index.vue b/src/views/process/outExam/index.vue
index 9bd8a3a..aecae8b 100644
--- a/src/views/process/outExam/index.vue
+++ b/src/views/process/outExam/index.vue
@@ -273,7 +273,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        leaveType:"外出办事",
+        leaveType:"临时外出",
         userName: undefined,
         orgName: undefined,
       },
@@ -419,7 +419,7 @@ export default {
           let param = {
             id:this.form.id,
             examineStatus:'1',
-            leaveType:"外出办事",
+            leaveType:"临时外出",
             examineOpinion:this.form.examineOpinion,
             orgName: name
           }
@@ -440,7 +440,7 @@ export default {
           let param = {
             id:this.form.id,
             examineStatus:'2',
-            leaveType:"外出办事",
+            leaveType:"临时外出",
             examineOpinion:this.form.examineOpinion,
             orgName:name
           }
diff --git a/src/views/process/requestReport/index.vue b/src/views/process/requestReport/index.vue
index 6540506..8dd53ad 100644
--- a/src/views/process/requestReport/index.vue
+++ b/src/views/process/requestReport/index.vue
@@ -476,7 +476,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        leaveType:"外出办事",
+        leaveType:"临时外出",
         leaveDate: undefined,
         examineStatus: ''
       },
diff --git a/src/views/process/workReport/index.vue b/src/views/process/workReport/index.vue
index 3ba5721..f96942e 100644
--- a/src/views/process/workReport/index.vue
+++ b/src/views/process/workReport/index.vue
@@ -49,7 +49,7 @@
       </el-table-column>
       <el-table-column label="临时外出人数" align="center" width="180">
         <template slot-scope="scope">
-        <span class="clickable" @click="handleClick('外出办事',scope.row)" style="color: blue; cursor: pointer;">
+        <span class="clickable" @click="handleClick('临时外出',scope.row)" style="color: blue; cursor: pointer;">
           {{ scope.row.outNum }}
         </span>
         </template>
@@ -123,7 +123,7 @@
         <el-table-column label="开始时间" align="center" prop="startDate" width="160"/>
         <el-table-column label="结束时间" align="center" prop="endDate" width="160"/>
         <el-table-column label="时长（天）" align="center" prop="leaveDuration" :show-overflow-tooltip="true" width="100"/>
-        <el-table-column label="审批状态" align="center" prop="examineStatus" width="100" v-if="tableDialogList.some(row => row.type === '轮休' || row.type === '外出办事')">
+        <el-table-column label="审批状态" align="center" prop="examineStatus" width="100" v-if="tableDialogList.some(row => row.type === '轮休' || row.type === '临时外出')">
           <template slot-scope="scope">
             <span v-if="scope.row.examineStatus === '0'">待审核</span>
             <span v-else-if="scope.row.examineStatus === '1'">已通过</span>
@@ -586,7 +586,7 @@ export default {
       this.open = true;
       if (type==='轮休'){
         this.title = "轮休人员";
-      } else if (type==='外出办事'){
+      } else if (type==='临时外出'){
         this.title = "临时外出人员";
       } else if (type==='出差报备'){
         this.title = "出差人员";
diff --git a/src/views/report/monthReport/index.vue b/src/views/report/monthReport/index.vue
index 1a848d7..6e9f3a8 100644
--- a/src/views/report/monthReport/index.vue
+++ b/src/views/report/monthReport/index.vue
@@ -475,6 +475,7 @@ export default {
       this.title = "工作时间外出次数";
       this.queryRecordOutCount.userId = row.userId;
       this.queryRecordOutCount.attCurrentDay = row.attCurrentDay;
+      this.queryRecordOutCount.attCurrentMonth = row.attCurrentMonth;
       this.showOutCount = true;
       this.getOutCountList();
     },
diff --git a/src/views/system/messages/index.vue b/src/views/system/messages/index.vue
index 151f6b6..f7c77f5 100644
--- a/src/views/system/messages/index.vue
+++ b/src/views/system/messages/index.vue
@@ -117,7 +117,7 @@
         updateStatus(param).then(response => {
           if(row.type.indexOf('月异常考勤统计')>-1){//month
             this.$router.replace({ path: '/attendanceReport/monthlyError',query:{param:value}})
-          }else if(row.type.indexOf('月轮休外出办事异常统计')>-1){//month
+          }else if(row.type.indexOf('月轮休临时外出异常统计')>-1){//month
             this.$router.replace({ path: '/exceptionHandle/errorData',query:{param:value} })
           }else if(row.type.indexOf('项目部角色未配置')>-1){//项目经理
             this.$router.replace({ path: '/process/pro/rolesRemind',query:{param:value}})