feat: 新增查询字段，场地查询

guzijian
1 parent 84e0dee7
Showing 2 changed files with 31 additions and 15 deletions
src/api/equipment/equipment.js
src/views/in/in/index.vue
@@ -60,3 +60,10 @@ export function getEquipmentAll(params) {
     params
   })
 }
+
+export function getEquipmentSiteName() {
+  return request({
+    url: '/equipment/equipment/getEquipmentSiteName',
+    method: 'get'
+  })
+}
@@ -2,30 +2,35 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
       <el-form-item label="工号" prop="jobCode">
-        <el-input v-model="queryParams.jobCode" placeholder="请输入工号" clearable @keyup.enter="handleQuery" />
+        <el-input style="width: 120px;" v-model="queryParams.jobCode" placeholder="请输入工号" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="打卡结果" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择打卡结果" clearable>
+        <el-select style="width: 120px;" v-model="queryParams.status" placeholder="打卡结果" clearable>
           <el-option v-for="dict in sign_in" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="酒精测试" prop="alcoholFlag">
-        <el-select v-model="queryParams.alcoholFlag" placeholder="请选择酒精测试" clearable>
+        <el-select style="width: 120px;" v-model="queryParams.alcoholFlag" placeholder="是否酒测" clearable>
           <el-option v-for="dict in alcohol" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="签到签退" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择签到签退" clearable>
+        <el-select style="width: 120px;" v-model="queryParams.type" placeholder="签到签退" clearable>
           <el-option v-for="dict in sign_type" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="打卡日期" prop="date">
         <!-- 日期 -->
-        <el-date-picker v-model="queryParams.date" type="date" align="right" unlink-panels format="YYYY/MM/DD"
-          value-format="YYYY-MM-DD">
+        <el-date-picker style="width: 140px;" v-model="queryParams.date" type="date" align="right" unlink-panels
+          format="YYYY/MM/DD" value-format="YYYY-MM-DD">
         </el-date-picker>
       </el-form-item>
-
+      <el-form-item label="打卡场地" prop="date">
+        <el-select style="width: 120px;" filterable v-model="queryParams.siteName" placeholder="打卡场地" clearable>
+          <el-option v-for="dict in siteNameList" :key="dict" :label="dict" :value="dict" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -34,7 +39,8 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['in:in:export']">导出</el-button>
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['in:in:export']">导出</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="CirclePlus" @click="handleAdd"
@@ -79,7 +85,6 @@
       <el-table-column label="备注" align="center" prop="remark" width="300" />
       <el-table-column label="打卡场地" align="center" prop="siteName" width="130" />
       <el-table-column label="打卡时间" align="center" prop="createTime" width="160" />
-
       <el-table-column label="打卡操作" align="center" prop="singnIn" width="320">
         <template #default="scope">
           <dict-tag :options="sys_status" :value="scope.row.singnIn ? scope.row.singnIn.split(',') : []" />
@@ -87,8 +92,8 @@
       </el-table-column>
     </el-table>
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
     <!-- 添加或修改签到对话框 -->
     <el-dialog :title="title" v-model="open" width="500px">
@@ -108,13 +113,14 @@
         </el-form-item>
         <el-form-item label="酒精测试" prop="alcoholFlag">
           <el-radio-group v-model="form.alcoholFlag">
-            <el-radio v-for="dict in alcohol" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
+            <el-radio v-for="dict in alcohol" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
+              }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="签到签退" prop="type">
           <el-radio-group v-model="form.type">
             <el-radio v-for="dict in sign_type" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
-            }}</el-radio>
+              }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="补签日期" prop="date">
@@ -140,14 +146,14 @@
 <script setup name="In">
 import { getPeopleInfo } from '@/api/attendance/attendance';
-import { getEquipmentAll } from "@/api/equipment/equipment";
+import { getEquipmentAll, getEquipmentSiteName } from "@/api/equipment/equipment";
 import { delIn, getIn, listIn, supplementarySignature } from "@/api/in/in";
 import { getReportDetail } from "@/api/report/report.js";
 import moment from "moment";
 import { computed, ref, watch } from "vue";
 const { proxy } = getCurrentInstance();
 const { sys_status, sign_type, sign_in, alcohol } = proxy.useDict('sys_status', 'sign_type', 'sign_in', 'alcohol');
-
+const siteNameList = ref([])
 const inList = ref([]);
 const signLoading = ref(false)
 const open = ref(false);
@@ -219,6 +225,9 @@ onBeforeUnmount(() =&gt; {
   clearInterval(timer.value)
 })
 onMounted(() => {
+  getEquipmentSiteName().then((res) => {
+    siteNameList.value = res.data
+  })
   queryParams.value.date = moment().format("YYYY-MM-DD");
   getList();
   timer.value = setInterval(() => {