学年标签适配学生奖惩、学生资助模块

src/views/dormitory/accommodation-management/fdy.vue

@@ -73,8 +73,8 @@
                 @pagination="getList"
     />
 
-    <!-- 原辅导员审批宿舍管理申请对话框 -->
-    <!-- <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <!-- 添加或修改宿舍管理申请对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" class="audit-form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="学号" prop="stuNo">
           <el-input v-model="form.stuNo" readonly />
@@ -155,7 +155,7 @@
         <el-button v-if="this.form.status == 0" type="primary" @click="submitForm">同 意</el-button>
         <el-button v-if="this.form.status == 0" @click="cancel">拒 绝</el-button>
       </div>
-    </el-dialog> -->
+    </el-dialog>
 
     <!-- 查看学生调宿计划对话框 -->
     <el-dialog :visible.sync="taskV" title="查看学生调宿计划" width="90%">
@@ -198,8 +198,14 @@
         </el-form-item>
 
         <el-form-item label="学号" prop="stuNo">
-          <el-input v-model="applyForm.stuNo" style="width: 70%; display: inline-block;" />
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchStudentInfo">查询</el-button>
+          <el-row :gutter="10">
+            <el-col :span="18">
+              <el-input v-model="applyForm.stuNo" />
+            </el-col>
+            <el-col :span="6">
+              <el-button type="primary" style="width: 100%" @click="fetchStudentInfo">查询</el-button>
+            </el-col>
+          </el-row>
         </el-form-item>
         
         <el-form-item label="姓名" prop="stuName">
@@ -215,7 +221,7 @@
             type="date" 
             value-format="yyyy-MM-dd" 
             placeholder="请选择执行时间"
-            :picker-options="{ disabledDate: time => time.getTime() < new Date(new Date().setHours(0, 0, 0, 0)).getTime() }"
+            :picker-options="{ disabledDate: time => time.getTime() < Date.now() }"
           />
         </el-form-item>
         
@@ -523,8 +529,8 @@ export default {
         }
       })
     },
-    /** 原辅导员审批提交按钮 */
-    /* submitForm() {
+    /** 提交按钮 */
+    submitForm() {
       this.$refs['form'].validate(valid => {
         if (this.form.time == null && this.form.type != '3') {
           this.$message.info('请选择执行时间')
@@ -556,7 +562,7 @@ export default {
 
         }
       })
-    }, */
+    },
     campusChange(e) {
       this.form.parkId = null
       this.form.tarBuildingId = null