ME hace 1 semana
padre
commit
8e80c198b5

+ 2 - 8
src/views/emergency/attendance-add-or-update.vue

@@ -99,9 +99,8 @@ const rules = ref({
           photoPath: [
       { required: true, message: '必填项不能为空', trigger: 'blur' }
     ],
-                  remark: [
-      { required: true, message: '必填项不能为空', trigger: 'blur' }
-    ]
+          remark: []
+    
   });
 
 const init = (id?: number) => {
@@ -124,7 +123,6 @@ const getInfo = (id: number) => {
     Object.assign(dataForm, res.data);
   });
 };
-
 // 表单提交
 const dataFormSubmitHandle = () => {
   dataFormRef.value.validate((valid: boolean) => {
@@ -143,10 +141,6 @@ const dataFormSubmitHandle = () => {
     });
   });
 };
-// 判断是否是图片URL
-const isImageUrl = (url: string) => {
-  return url.toLowerCase().match(/\.(jpg|gif|png)$/);
-};
 
 const handleFileChange = (event: Event) => {
   const target = event.target as HTMLInputElement;

+ 20 - 3
src/views/emergency/attendance.vue

@@ -1,6 +1,18 @@
 <template>
   <div class="mod-demo__attendance">
     <el-form :inline="true" :model="state.dataForm" @keyup.enter="state.getDataList()">
+      <el-form-item>
+        <el-input v-model="state.dataForm.creator" placeholder="考勤人员名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="state.dataForm.date" placeholder="考勤日期" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="state.dataForm.status" placeholder="出勤状态" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="state.getDataList()">查询</el-button>
+      </el-form-item>
       <el-form-item>
         <el-button v-if="state.hasPermission('emergency:attendance:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
       </el-form-item>
@@ -14,7 +26,7 @@
     <el-table v-loading="state.dataListLoading" :data="state.dataList" border @selection-change="state.dataListSelectionChangeHandle" style="width: 100%">
       <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
               <el-table-column prop="id" label="记录ID" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="date" label="勤日期" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="date" label="勤日期" header-align="center" align="center"></el-table-column>
               <el-table-column prop="checkInTime" label="签到时间" header-align="center" align="center"></el-table-column>
               <el-table-column prop="checkOutTime" label="签退时间" header-align="center" align="center"></el-table-column>
               <el-table-column prop="status" label="出勤状态" header-align="center" align="center">
@@ -29,7 +41,7 @@
                 </template>
               </el-table-column>
               <el-table-column prop="photoPath" label="照片存储路径" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="creator" label="创建人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="creator" label="考勤人员名称" header-align="center" align="center"></el-table-column>
               <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
               <el-table-column prop="updater" label="更新人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
@@ -57,7 +69,12 @@ const view = reactive({
   getDataListURL: "/emergency/attendance/page",
   getDataListIsPage: true,
   exportURL: "/emergency/attendance/export",
-  deleteURL: "/emergency/attendance"
+  deleteURL: "/emergency/attendance",
+  dataForm: {
+    creator: "",     
+    date: "",         
+    status: "",         
+  }
 });
 
 const state = reactive({ ...useView(view), ...toRefs(view) });