From 45d532f14f59a2798a191bf925c708018aa34c71 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Fri, 28 Mar 2025 18:18:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/attReport/index.vue | 32 ++++++++++++++--------------
 src/views/system/userInfo/index.vue  | 16 +++++++++++++-
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/views/report/attReport/index.vue b/src/views/report/attReport/index.vue
index 85d49ff..34fb639 100644
--- a/src/views/report/attReport/index.vue
+++ b/src/views/report/attReport/index.vue
@@ -25,7 +25,7 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-right: 10px;"
         >搜索
         </el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"       
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
         >重置
         </el-button>
         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
@@ -56,20 +56,20 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="typeList" border resizable @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="序号" align="center" width="80" type="index">
+      <el-table-column label="序号" align="center" width="80" type="index" fixed>
         <template slot-scope="scope">
           <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="姓名" align="center" prop="userName"/>
-      <el-table-column label="所属部门" align="center" prop="orgName" :show-overflow-tooltip="true"/>
+      <el-table-column label="姓名" align="center" prop="userName" fixed />
       <el-table-column label="考勤日期" align="center" prop="attCurrentDay" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ formatDate(scope.row.attCurrentDay) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="所属部门" align="center" width="500" prop="orgName" :show-overflow-tooltip="true"/>
       <el-table-column label="工作时间外出次数" align="center" prop="normalNum" width="180">
         <template slot-scope="scope">
           <div @click="openOutCountList(scope.row)" style="color: #02a7f0; cursor: pointer">
@@ -91,7 +91,7 @@
           <dict-tag :options="dict.type.att_status" :value="scope.row.toWorkAttStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="打卡地址" align="center" prop="toWorkAttAddress" :show-overflow-tooltip="true"/>
+      <el-table-column label="打卡地址" align="center" prop="toWorkAttAddress" width="500" :show-overflow-tooltip="true"/>
       <el-table-column label="异常备注" align="center" prop="toWorkErrorRemake" :show-overflow-tooltip="true"/>
       <el-table-column label="下班打卡时间" align="center" prop="offWorkAttCurrentTime" width="180"></el-table-column>
       <el-table-column label="下班状态" align="center" prop="offWorkAttStatus">
@@ -99,7 +99,7 @@
           <dict-tag :options="dict.type.att_status" :value="scope.row.offWorkAttStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="打卡地址" align="center" prop="offWorkAttAddress" :show-overflow-tooltip="true"/>
+      <el-table-column label="打卡地址" align="center" prop="offWorkAttAddress" width="500" :show-overflow-tooltip="true"/>
       <el-table-column label="异常备注" align="center" prop="offWorkErrorRemake" :show-overflow-tooltip="true"/>
     </el-table>
 
@@ -107,11 +107,11 @@
                 @pagination="getList"
     />
 
-    <el-dialog title="批量修改" :visible.sync="open" width="1200px" append-to-body @close="cancel">
+    <el-dialog title="批量修改" :visible.sync="open" width="1200px" border resizable append-to-body @close="cancel">
       <el-table v-loading="loading" :data="dialogList" width="100%" height="500px">
         <el-table-column label="序号" type="index" width="55" align="center" fixed/>
         <el-table-column label="姓名" align="center" prop="userName" fixed/>
-        <el-table-column label="所属部门" align="center" prop="orgName" :show-overflow-tooltip="true" width="150"
+        <el-table-column label="所属部门" align="center" prop="orgName"  :show-overflow-tooltip="true" width="500"
                          fixed
         />
         <el-table-column label="考勤日期" align="center" prop="attCurrentDay" :show-overflow-tooltip="true" width="180"
@@ -168,7 +168,7 @@
         </el-table-column>
 
         <el-table-column label="打卡地址" align="center" prop="toWorkAttAddress" :show-overflow-tooltip="true"
-                         width="180"
+                         width="500"
         />
         <el-table-column align="center" prop="toErrorRemake" width="200">
           <template slot="header">
@@ -203,7 +203,7 @@
           </template>
         </el-table-column>
         <el-table-column label="打卡地址" align="center" prop="offWorkAttAddress" :show-overflow-tooltip="true"
-                         width="180"
+                         width="500"
         ></el-table-column>
 
         <el-table-column align="center" prop="offFilePath" width="180">
@@ -242,7 +242,7 @@
 
 
     <!-- 外出次数查询 -->
-    <el-dialog :title="title" :visible.sync="showOutCount" width="1200px" height="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="showOutCount" border resizable width="1200px" height="1000px" append-to-body>
       <el-form :model="queryRecord" ref="queryFormRecord" size="small" :inline="true" v-show="showSearch"
                label-width="110px"
       >
@@ -264,7 +264,7 @@
           </template>
         </el-table-column>
         <el-table-column label="打卡时间" align="center" prop="attCurrentTime" sortable :show-overflow-tooltip="true"/>
-        <el-table-column label="打卡地址" align="center" prop="attAddress" sortable :show-overflow-tooltip="true"/>
+        <el-table-column label="打卡地址" align="center" prop="attAddress" width="500" sortable :show-overflow-tooltip="true"/>
       </el-table>
 
       <pagination v-show="totalTwo > 0" :total="totalTwo" :page.sync="queryRecord.pageNum"
@@ -283,7 +283,7 @@
         </el-form-item>
       </el-form>
 
-      <el-table v-loading="loadingAttCount" :data="tableDataAttCount" width="900px" height="600px" row-key="id">
+      <el-table v-loading="loadingAttCount" :data="tableDataAttCount" border resizable width="900px" height="600px" row-key="id">
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
             <span>{{ (queryAttCount.pageNum - 1) * queryAttCount.pageSize + scope.$index + 1 }}</span>
@@ -295,7 +295,7 @@
           </template>
         </el-table-column>
         <el-table-column label="打卡时间" align="center" prop="attCurrentTime" sortable :show-overflow-tooltip="true"/>
-        <el-table-column label="打卡地址" align="center" prop="attAddress" sortable :show-overflow-tooltip="true"/>
+        <el-table-column label="打卡地址" align="center" prop="attAddress" width="500" sortable :show-overflow-tooltip="true"/>
       </el-table>
 
       <pagination v-show="totalAttCount > 0" :total="totalAttCount" :page.sync="queryAttCount.pageNum"
@@ -751,7 +751,7 @@ export default {
           isErrorMsg = '上班时间或状态改变时，原因说明、附件不能为空！';
           return true;
         }
-        
+
         if(newItem.toErrorRemake!=""&&this.hasAttachments(newItem.filesVoList, '1')){
           hasChanges = true
         }
diff --git a/src/views/system/userInfo/index.vue b/src/views/system/userInfo/index.vue
index 1a0ab27..c206a96 100644
--- a/src/views/system/userInfo/index.vue
+++ b/src/views/system/userInfo/index.vue
@@ -10,6 +10,19 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+
+        <el-form-item label="手机号" prop="phone">
+          <el-input
+            v-model="queryParams.phone"
+            placeholder="请输入手机号"
+            clearable
+            maxlength="11"
+            style="width: 240px"
+            @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>
@@ -118,7 +131,7 @@
               @click="handleExamine(scope.row)"
             >审核</el-button>
             </el-tooltip>
-        
+
 
           </template>
         </el-table-column>
@@ -319,6 +332,7 @@
           pageNum: 1,
           pageSize: 10,
           userName: undefined,
+          phone: undefined,
           orgId: undefined,
           postId: undefined,
           isAttend: undefined,