Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/tongj/record/index.vue

@@ -26,7 +26,7 @@
 			 <el-col :span="8">
 			   <el-form-item label="打卡记录日期" prop="recordTime">
 			     <el-date-picker clearable
-			       v-model="form.recordTime"
+			       v-model="queryParams.recordTime"
 			       type="date"
 			       value-format="yyyy-MM-dd"
 			       placeholder="请选择打卡记录日期">
@@ -35,39 +35,41 @@
 			 </el-col>
 			 <el-col :span="8">
 			   <el-form-item label="开始时间" prop="startTime">
-			    <el-date-picker clearable
-			      v-model="form.startTime"
-			      type="date"
-			      value-format="yyyy-MM-dd"
-			      placeholder="请选择开始时间">
-			    </el-date-picker>
+			     <el-date-picker clearable
+			       v-model="queryParams.startTime"
+			       type="date"
+			       value-format="yyyy-MM-dd"
+			       placeholder="请选择开始时间">
+			     </el-date-picker>
 			   </el-form-item>
 			 </el-col>
 			 <el-col :span="8">
 			   <el-form-item label="结束时间" prop="endTime">
-			    <el-date-picker clearable
-			      v-model="form.endTime"
-			      type="date"
-			      value-format="yyyy-MM-dd"
-			      placeholder="请选择结束时间">
-			    </el-date-picker>
+			     <el-date-picker clearable
+			       v-model="queryParams.endTime"
+			       type="date"
+			       value-format="yyyy-MM-dd"
+			       placeholder="请选择结束时间">
+			     </el-date-picker>
 			   </el-form-item>
 			 </el-col>
 			 <el-col :span="8">
-			   <el-form-item label="身份证号" prop="idCard">
-			    <el-input
-			      v-model="queryParams.phonenumber"
-			      placeholder="请输入手机号码"
-			      clearable
-			      @keyup.enter.native="handleQuery"
-			    />
+			   <el-form-item label="是否打卡" prop="type">
+			   <el-select v-model="queryParams.type" placeholder="请选择是否打卡" clearable>
+			     <el-option
+			       v-for="dict in dict.type.sys_yes_no"
+			       :key="dict.value"
+			       :label="dict.label"
+			       :value="dict.value"
+			     />
+			   </el-select>
 			   </el-form-item>
 			 </el-col>
 			 <el-col :span="8">
-			   <el-form-item label="是否打卡" prop="type">
-			   <el-select v-model="queryParams.type" placeholder="请选择就餐类型" clearable>
+			   <el-form-item label="打卡情况" prop="isOutwork">
+			   <el-select v-model="queryParams.isOutwork" placeholder="请选择打卡情况" clearable>
 			     <el-option
-			       v-for="dict in dict.type.sys_yes_no"
+			       v-for="dict in dict.type.is_outwork"
 			       :key="dict.value"
 			       :label="dict.label"
 			       :value="dict.value"
@@ -130,37 +132,52 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 	</div>
+	<div style="display: flex;" class="nblqwt">
+		<p @click="iscvf(item)" :class=" ingsnum == item.dictValue? 'iscd' : ''" v-for="(item,index) in lishgew" :key="index">{{item.dictLabel}}<span>(45人)</span></p>
+	</div>
 
     <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <!-- <el-table-column label="打卡记录id" align="center" prop="clockId" />
       <el-table-column label="人员ID" align="center" prop="userId" /> -->
       <!-- <el-table-column label="所属部门名称" align="center" prop="deptName" /> -->
       <el-table-column label="人员姓名" align="center" prop="userName" />
       <el-table-column label="手机号码" align="center" prop="phonenumber" />
+	  <el-table-column label="打卡地点" align="center" prop="recordLocations" width="160" show-overflow-tooltip />
       <!-- <el-table-column label="人员身份证号" align="center" prop="idCard" /> -->
 	  <el-table-column label="周几" align="center" prop="week">
 	    <template slot-scope="scope">
 	      <dict-tag :options="dict.type.week" :value="scope.row.week"/>
 	    </template>
 	  </el-table-column>
-      <el-table-column label="打卡记录时间" align="center" prop="recordDt" />
+      <el-table-column label="打卡记录时间" align="center" prop="recordDt" width="160" />
      <!-- <el-table-column label="上班打卡时间" align="center" prop="workingTime" />
       <el-table-column label="下班打卡时间" align="center" prop="dutyTime" /> -->
-	  <el-table-column label="是否打卡" align="center" prop="type">
+	  <!-- <el-table-column label="是否打卡" align="center" prop="type">
 	    <template slot-scope="scope">
 	      <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.type"/>
 	    </template>
+	  </el-table-column> -->
+	  <el-table-column label="打卡情况" align="center" prop="isOutwork">
+	    <template slot-scope="scope">
+	      <dict-tag :options="dict.type.is_outwork" :value="scope.row.isOutwork"/>
+	    </template>
 	  </el-table-column>
-      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+	  <el-table-column label="打卡图片" align="center" prop="pictureUrl">
+	    <template slot-scope="scope">
+			<image-preview :src="scope.row.pictureUrl" :width="50" :height="50"/>
+	    </template>
+	  </el-table-column>
+	  <el-table-column label="备注" align="center" prop="remark" width="60" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:clock:edit']"
-          >修改</el-button>
+          >修改</el-button> -->
           <el-button
             size="mini"
             type="text"
@@ -169,7 +186,7 @@
             v-hasPermi="['system:clock:remove']"
           >删除</el-button>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     
     <pagination
@@ -225,7 +242,7 @@ import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api
 
 export default {
   name: "Record",
-  dicts: ['sys_yes_no','week'],
+  dicts: ['sys_yes_no','week','is_outwork'],
   data() {
     return {
       // 遮罩层
@@ -258,6 +275,7 @@ export default {
         recordTime: null,
         workingTime: null,
         dutyTime: null,
+		isOutwork:'1'
       },
       // 表单参数
       form: {},
@@ -266,13 +284,31 @@ export default {
         userName: [
           { required: true, message: "人员姓名不能为空", trigger: "blur" }
         ],
-      }
+      },
+	  lishgew:[],
+	  ingsnum:1
     };
   },
   created() {
+	  this.queryParams.startTime=  this.getNowDate()
     this.getList();
+	this.getDicts("is_outwork").then(response => {
+	          this.lishgew = response.data;
+	    });
+	
   },
   methods: {
+	  getNowDate() {
+	        const timeOne = new Date()
+	        const year = timeOne.getFullYear()
+	        let month = timeOne.getMonth() + 1
+	        let day = timeOne.getDate()
+	        month = month < 10 ? '0' + month : month
+	        day = day < 10 ? '0' + day : day
+	        const NOW_MONTHS_AGO = `${year}-${month}-${day}`
+	        return NOW_MONTHS_AGO
+	      },
+
     /** 查询打卡记录列表 */
     getList() {
       this.loading = true;
@@ -374,7 +410,13 @@ export default {
       this.download('system/record/export', {
         ...this.queryParams
       }, `record_${new Date().getTime()}.xlsx`)
-    }
+    },
+	iscvf(item){
+		this.ingsnum = item.dictValue
+		this.queryParams.isOutwork = item.dictValue
+		this.queryParams.pageNum = 1
+		this.getList()
+	}
   }
 };
 </script>
@@ -391,6 +433,21 @@ export default {
   }
 </style>
 <style scoped lang="scss">
+	.nblqwt{
+		padding-left: 10px;
+		p{
+			padding: 5px 14px ;
+			background-color: #eaeaea;
+			border-radius: 3px;
+			margin-right: 5px;
+			color: #666666 ;
+		}
+		.iscd{
+			border: 1px solid #3565ed;
+			background-color: #fff;
+			color: #3565ed ;
+		}
+	}
   .iuer{
     display: flex;
     justify-content: space-between;