47 3 months ago
parent
commit
94f0a6a30b

+ 7 - 7
src/views/system/studentAttendanceManage/studentAttendanceExcused/StudentAttendanceForm.vue

@@ -8,7 +8,7 @@
       v-loading="formLoading"
     >
     <el-row>
-      <el-col :span="12">
+      <el-col :span="24">
         <el-form-item label="日期" prop="date">
           <el-date-picker
             class="!w-full"
@@ -19,14 +19,14 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <!-- <el-col :span="12">
         <el-form-item label="姓名" prop="studentName">
           <el-input v-model="formData.studentName" placeholder="请输入姓名" />
         </el-form-item>
-      </el-col>
+      </el-col> -->
     </el-row>
 
-    <el-row>
+    <!-- <el-row>
       <el-col :span="12">
         <el-form-item label="学号" prop="userNumber">
           <el-input v-model="formData.userNumber" placeholder="请输入学号" />
@@ -50,15 +50,15 @@
           <el-input v-model="clockInStatuE" value="请假" disabled />
         </el-form-item>
       </el-col>
-    </el-row>
+    </el-row> -->
 
-    <!-- <el-row>
+    <el-row>
       <el-col :span="24">
         <el-form-item label="备注原因" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注原因" />
       </el-form-item>
       </el-col>
-    </el-row> -->
+    </el-row>
     
       <!-- <el-form-item label="学生id" prop="studentId">
         <el-input v-model="formData.studentId" placeholder="请输入学生id" />

+ 4 - 4
src/views/system/studentAttendanceManage/studentFaceManage/index.vue

@@ -45,9 +45,9 @@
         />
       </el-form-item>
 
-      <!-- <el-form-item label="导入时间" prop="createTime">
+      <!-- <el-form-item label="导入时间" prop="photoUpdateTime">
             <el-date-picker
-              v-model="queryParams.createTime"
+              v-model="queryParams.photoUpdateTime"
               value-format="YYYY-MM-DD HH:mm:ss"
               type="datetime"
               class="!w-240px"
@@ -115,7 +115,7 @@
       <el-table-column
         label="导入时间"
         align="center"
-        prop="createTime"
+        prop="photoUpdateTime"
         :formatter="dateFormatter"
         width="180px"
       />
@@ -229,7 +229,7 @@ const queryParams = reactive({
   id: undefined,
   nickname: undefined,
   userNumber: undefined,
-  createTime: [],
+  photoUpdateTime: [],
   photoIsExist: undefined,
   remark: undefined,
   supervisor: undefined,

+ 1 - 1
src/views/system/workroomCollege/dept/index.vue

@@ -8,7 +8,7 @@
       :inline="true"
       label-width="100px"
     >
-      <el-form-item label="工作间" prop="name">
+      <el-form-item label="工作间名称" prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="请输入工作间名称"

+ 3 - 2
src/views/system/workroomCollege/user/student.vue

@@ -44,9 +44,9 @@
               class="!w-240px"
             />
           </el-form-item>
-          <el-form-item label="工作间" prop="deptId" v-if="userInfo.userType === '4'">
+          <el-form-item label="工作间" prop="deptName" v-if="userInfo.userType === '4'">
             <el-input
-              v-model="queryParams.deptId"
+              v-model="queryParams.deptName"
               placeholder="请输入工作间"
               clearable
               @keyup.enter="handleQuery"
@@ -315,6 +315,7 @@ const queryParams = reactive({
   email: undefined,
   status: undefined,
   deptId: undefined,
+  deptName: undefined,
   createTime: [],
   isGraduate: undefined,
 })

+ 3 - 2
src/views/system/workroomCollege/user/teacher.vue

@@ -44,9 +44,9 @@
               class="!w-240px"
             />
           </el-form-item>
-          <el-form-item label="工作间" prop="deptId" v-if="userInfo.userType === '4'">
+          <el-form-item label="工作间" prop="deptName" v-if="userInfo.userType === '4'">
             <el-input
-              v-model="queryParams.deptId"
+              v-model="queryParams.deptName"
               placeholder="请输入工作间"
               clearable
               @keyup.enter="handleQuery"
@@ -290,6 +290,7 @@ const queryParams = reactive({
   email: undefined,
   status: undefined,
   deptId: undefined,
+  deptName: undefined,
   createTime: []
 })
 

+ 3 - 2
src/views/system/workroomTeacher/user/student.vue

@@ -39,8 +39,8 @@
               class="!w-240px"
             />
           </el-form-item>
-          <el-form-item label="工作间" prop="deptId">
-            <el-input v-model="queryParams.deptId" placeholder="请输入工作间" clearable @keyup.enter="handleQuery" class="!w-240px" />
+          <el-form-item label="工作间" prop="deptName">
+            <el-input v-model="queryParams.deptName" placeholder="请输入工作间" clearable @keyup.enter="handleQuery" class="!w-240px" />
           </el-form-item>
           <el-form-item label="手机号码" prop="mobile">
             <el-input
@@ -276,6 +276,7 @@ const queryParams = reactive({
   mobile: undefined,
   status: undefined,
   deptId: undefined,
+  deptName: undefined,
   createTime: [],
   isGraduate: undefined,
 })