zpy 7.20

a0077cde · zhaopanyu · b32e66f7 · a0077cde · a0077cde · a0077cde
Commit a0077cde authored Jul 20, 2023 by zhaopanyu
5 changed files
--- a/ruoyi-ui/src/api/smartSchool/personWork/venueReservation/recordingroomManagement/index.js
+++ b/ruoyi-ui/src/api/smartSchool/personWork/venueReservation/recordingroomManagement/index.js
@@ -10,10 +10,11 @@ export function addStudio(data) {
 }
 // 查看录播室列表
-export function getStudio() {
+export function getStudio(query) {
  return request({
    url: "/studio/list",
    method: "get",
+    params: query,
  });
 }

--- a/ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
@@ -161,8 +161,10 @@
                        <el-form-item label="分管领导" prop="leadershipName">
                            <el-input :value="postForm.leadershipName" placeholder="请选择分管领导"
                                @focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
                        </el-form-item>
                    </el-col>
                </el-row>
                <el-row>
                    <el-col :span="24">
@@ -243,7 +245,7 @@
                        <tr>
                            <td rowspan="2" class="btntxt">附件</td>
-                            <td colspan="3">
+                            <td colspan="6">
                                <p v-for="(item, index) in fileList" :key="index">
                                    <el-link :underline="false" :href="item.fjlj" type="primary" target="_blank">
                                        {{ item.fjmc }}
@@ -420,6 +422,7 @@ export default {
                fjmc: "",
                fjlj: "",
                leadershipId: "",
+                leadershipName: "",
            },
            // 分管领导id
@@ -457,9 +460,7 @@ export default {
                activityArea: [
                    { required: true, message: "活动场地不能为空", trigger: "blur" }
                ],
-                activityTime: [
-                    { required: true, message: "活动不能为空", trigger: "blur" }
-                ],
                specificUserName: [
                    { required: true, message: "具体负责人不能为空", trigger: "blur" }
@@ -488,9 +489,9 @@ export default {
                    { required: true, message: "是否需要大屏不能为空", trigger: "blur" }
                ],
-                // leadershipName: [
+                leadershipName: [
-                //     { required: true, message: "分管领导不能为空", trigger: "change" }
+                    { required: true, message: "分管领导不能为空", trigger: "change" }
-                // ],
+                ],
                fjmc: [
                    { required: true, message: "流程单附件不能为空", trigger: "blur" }
@@ -508,6 +509,7 @@ export default {
    },
    created() {
        this.getList();
+        const rules = JSON.parse('[{ "required": true, "message": "请选择分管领导" }]');
@@ -702,15 +704,6 @@ export default {
        },
-        // getFormatDate(timeDate) {
-        //     let date = new Date(timeDate);
-        //     let year = date.getFullYear();
-        //     let month = date.getMonth() + 1;
-        //     let day = date.getDate();
-        //     return [year, '-', month, '-', day].join('');
-        // },
        readNodes(nodes = [], arr = []) {
            for (let item of nodes) {
@@ -726,16 +719,20 @@ export default {
            this.selectHandles.title = title;
            this.selectHandles.method = method;
            this.selectHandles.type = type;
+            console.log('this.selectHandles', this.selectHandles);
        },
        // 选择处理人
        selectUser(select) {
            console.log('select', select);
+            console.log('this.postForm', this.postForm);
            // 这种写法存在一定危险，后续最好是可以有更好的字段名对应
-            this.$set(this.form, `handUserName${this.selectHandles.type}`, select.name);
+            // this.$set(this.postForm, leadershipName, select.name);
-            this.$set(this.form, `handUserId${this.selectHandles.type}`, select.id);
+            // this.$set(this.postForm, leadershipId, select.id);
            this.postForm.leadershipName = select.name;
            this.postForm.leadershipId = select.id;
+            console.log('this.postForm', this.postForm);
        },
@@ -875,6 +872,7 @@ export default {
                leadershipId: "",
                pageNum: 1,
                pageSize: 10,
+                leadershipName: ""
            };
            this.resetForm("postForm");
        },

--- a/ruoyi-ui/src/views/smartSchool/personWork/leaveApply/components/SelectUser.vue
+++ b/ruoyi-ui/src/views/smartSchool/personWork/leaveApply/components/SelectUser.vue
@@ -154,6 +154,7 @@ export default {
    },
    /** 选项选中发生变化 */
    selectionChange(selections) {
+      console.log('seselections', selections);
      this.selectUser = selections[0];
    },
    /** 点击选中、取消 */

--- a/ruoyi-ui/src/views/smartSchool/personWork/leaveApply/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/personWork/leaveApply/index.vue
@@ -9,7 +9,7 @@
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5" v-show="activeName === SubmitState.WILL_SUBMIT">
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:leave:add']">新增
+          v-hasPermi="['system:leave:add']">新增
        </el-button>
      </el-col>
      <el-col :span="1.5">
@@ -18,12 +18,12 @@
      </el-col>
      <el-col :span="1.5" v-show="activeName === SubmitState.WILL_SUBMIT">
        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-                   v-hasPermi="['system:leave:edit']">修改
+          v-hasPermi="['system:leave:edit']">修改
        </el-button>
      </el-col>
      <el-col :span="1.5" v-show="activeName === SubmitState.WILL_SUBMIT">
        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                   v-hasPermi="['system:leave:remove']">删除
+          v-hasPermi="['system:leave:remove']">删除
        </el-button>
      </el-col>
      <!--      <el-col :span="1.5">-->
@@ -34,38 +34,38 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="teacherLeaveList" @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" prop="instanceId" min-width="100" key="instanceId"
-                       v-if="activeName === SubmitState.HAS_SUBMIT" align="center"></el-table-column>
+        v-if="activeName === SubmitState.HAS_SUBMIT" align="center"></el-table-column>
      <el-table-column label="教师名称" key="teacherName" v-if="columns[0].visible" align="center" prop="teacherName"
-                       show-overflow-tooltip/>
+        show-overflow-tooltip />
      <el-table-column label="标题" key="title" v-if="columns[1].visible" align="center" min-width="250" prop="title"
-                       show-overflow-tooltip/>
+        show-overflow-tooltip />
      <el-table-column label="请假类型" key="type" min-width="100" v-if="columns[7].visible" align="center" prop="type">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.biz_leave_type" :value="scope.row.type"></dict-tag>
        </template>
      </el-table-column>
      <el-table-column label="请假开始时间" key="startTime" v-if="columns[3].visible" min-width="125" align="center"
-                       prop="startTime">
+        prop="startTime">
        <template slot-scope="scope">
          <span v-if="scope.row.applyType == 0">{{
-              parseTime(scope.row.startTime, "{y}-{m}-{d}")
+            parseTime(scope.row.startTime, "{y}-{m}-{d}")
-            }} 第{{ scope.row.startSort }}节课</span>
+          }} 第{{ scope.row.startSort }}节课</span>
          <span v-else>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}-{h}:{m}:{s}") }}</span>
        </template>
      </el-table-column>
      <el-table-column label="请假结束时间" key="endTime" v-if="columns[4].visible" min-width="125" align="center"
-                       prop="endTime">
+        prop="endTime">
        <template slot-scope="scope">
          <span v-if="scope.row.applyType == 0">{{
-              parseTime(scope.row.endTime, "{y}-{m}-{d}")
+            parseTime(scope.row.endTime, "{y}-{m}-{d}")
-            }} 第{{ scope.row.endSort }}节课</span>
+          }} 第{{ scope.row.endSort }}节课</span>
          <span v-else>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}-{h}:{m}:{s}") }}</span>
        </template>
      </el-table-column>
      <el-table-column label="申请人" key="applyUser" align="center" prop="applyUser"
-                       v-if="columns[8].visible && activeName === SubmitState.HAS_SUBMIT">
+        v-if="columns[8].visible && activeName === SubmitState.HAS_SUBMIT">
      </el-table-column>
      <el-table-column label="当前任务名称" key="taskName" prop="taskName" min-width="140" align="center">
        <template slot-scope="scope">
@@ -73,20 +73,20 @@
        </template>
      </el-table-column>
      <el-table-column label="操作" v-if="columns[9].visible" align="center" class-name="small-padding fixed-width"
-                       min-width="180" key="operate">
+        min-width="180" key="operate">
        <template slot-scope="scope">
          <el-button v-if="scope.row.instanceId == null" size="mini" type="text" icon="el-icon-s-promotion"
-                     @click="submitApply(scope.row)" v-hasPermi="['system:teacherLeave:edit']">提交申请
+            @click="submitApply(scope.row)" v-hasPermi="['system:teacherLeave:edit']">提交申请
          </el-button>
          <el-button v-if="scope.row.instanceId == null" size="mini" type="text" icon="el-icon-edit"
-                     @click="handleUpdate(scope.row)" v-hasPermi="['system:teacherLeave:edit']">修改
+            @click="handleUpdate(scope.row)" v-hasPermi="['system:teacherLeave:edit']">修改
          </el-button>
          <el-button v-if="scope.row.instanceId == null" size="mini" type="text" icon="el-icon-delete"
-                     @click="handleDelete(scope.row)" v-hasPermi="['system:teacherLeave:remove']">删除
+            @click="handleDelete(scope.row)" v-hasPermi="['system:teacherLeave:remove']">删除
          </el-button>
          <el-button v-if="scope.row.instanceId != null" size="mini" type="text" icon="el-icon-search"
-                     @click="handleDetailAwait(scope.row)" v-hasPermi="['system:teacherOvertime:edit']">查看
+            @click="handleDetailAwait(scope.row)" v-hasPermi="['system:teacherOvertime:edit']">查看
          </el-button>
        </template>
@@ -94,27 +94,26 @@
    </el-table>
    <ExPagination v-show="total > 0" :total="total" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum"
-                  @pagination="getList"></ExPagination>
+      @pagination="getList"></ExPagination>
    <!-- 添加或修改教师请假信息对话框 -->
    <el-dialog :title="dialogTitle" :visible.sync="dialogTeacherLeave" width="1000px" append-to-body>
      <el-form ref="form" :model="form" :disabled="isEdit" :rules="rules" label-width="110px"
-               style="width: 100%; margin: auto">
+        style="width: 100%; margin: auto">
        <el-form-item label="标题" prop="title">
-          <el-input :value="title" placeholder="请输入标题"/>
+          <el-input :value="title" placeholder="请输入标题" />
        </el-form-item>
        <el-row>
          <el-col :span="11">
            <el-form-item label="姓名" prop="teacherName">
-              <el-input :value="form.teacherName" placeholder="请输入教师名称"/>
+              <el-input :value="form.teacherName" placeholder="请输入教师名称" />
            </el-form-item>
          </el-col>
          <el-col :offset="2" :span="11">
            <el-form-item label="级部/处室" prop="applyOrgid">
              <template v-if="!isEdit">
                <Treeselect v-model="form.applyOrgid" :options="gradeOfficeList" :disable-branch-nodes="true"
-                            :searchable="true" :show-count="true"
+                  :searchable="true" :show-count="true" :clearable="false" @select="deptIdAndName" placeholder="请选择归属部门"
-                            :clearable="false" @select="deptIdAndName" placeholder="请选择归属部门"
+                  style="width:224px" />
-                            style="width:224px"/>
              </template>
              <template v-else>
                <el-input :value="form.applyOrgname"></el-input>
@@ -126,9 +125,8 @@
          <el-col :span="11">
            <el-form-item label="请假开始时间" prop="startTime">
              <el-date-picker @change="leaveTime" style="width: 100%" v-model="form.startTime" type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptionsStart"
-                              :picker-options="pickerOptionsStart"
+                placeholder="选择开始时间">
-                              placeholder="选择开始时间">
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -136,8 +134,7 @@
          <el-col :offset="2" :span="11">
            <el-form-item label="请假结束时间" prop="endTime">
              <el-date-picker @change="leaveTime" style="width: 100%" v-model="form.endTime" type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptionsEnd"
+                value-format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptionsEnd" placeholder="选择结束时间">
-                              placeholder="选择结束时间">
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -147,28 +144,28 @@
          <el-col :span="7">
            <el-form-item label="请假开始时间" prop="startTime">
              <el-date-picker v-model="form.startTime" type="date" style="width: 100%" value-format="yyyy-MM-dd"
-                              @change="leaveTime" :picker-options="pickerOptionsStart" placeholder="日期">
+                @change="leaveTime" :picker-options="pickerOptionsStart" placeholder="日期">
              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-select v-model="form.startSort" @change="leaveTime" style="width: 100%" placeholder="课程节次">
              <el-option v-for="dict in dict.type.course_arrange" :key="dict.value" :label="dict.label"
-                         :value="dict.value">
+                :value="dict.value">
              </el-option>
            </el-select>
          </el-col>
          <el-col :offset="2" :span="7">
            <el-form-item label="请假结束时间" prop="endTime">
              <el-date-picker type="date" v-model="form.endTime" value-format="yyyy-MM-dd" @change="leaveTime"
-                              style="width: 100%" :picker-options="pickerOptionsEnd" placeholder="日期">
+                style="width: 100%" :picker-options="pickerOptionsEnd" placeholder="日期">
              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-select v-model="form.endSort" @change="leaveTime" style="width: 100%" placeholder="课程节次">
              <el-option v-for="dict in dict.type.course_arrange" :key="dict.value" :label="dict.label"
-                         :value="dict.value">
+                :value="dict.value">
              </el-option>
            </el-select>
          </el-col>
@@ -185,7 +182,7 @@
        <el-row v-else>
          <el-col :span="11">
            <el-form-item label="请假时间" prop="dayCourse">
-              <el-input :value="form.dayCourse" placeholder="请假时间"/>
+              <el-input :value="form.dayCourse" placeholder="请假时间" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -194,7 +191,7 @@
            <el-form-item label="请假类型" prop="type">
              <el-select v-model="form.type" style="width: 100%" placeholder="请选择请假类型">
                <el-option v-for="dict in dict.type.biz_leave_type" :key="dict.value" :label="dict.label"
-                           :value="dict.value">
+                  :value="dict.value">
                </el-option>
              </el-select>
            </el-form-item>
@@ -202,7 +199,7 @@
          <el-col :offset="2" :span="11">
            <el-form-item label="级部/处室主任" prop="handUserName1">
              <el-input :value="form.handUserName1" placeholder="请先选择级部/处室"
-                        @focus="openSelect('选择级部/处室主任', 'gradeOfficeDirector', 1)"></el-input>
+                @focus="openSelect('选择级部/处室主任', 'gradeOfficeDirector', 1)"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -210,20 +207,20 @@
          <el-col :span="11">
            <el-form-item label="分管领导" prop="handUserName2" v-if="form.totalTime > 0.5">
              <el-input :value="form.handUserName2" placeholder="请选择分管领导"
-                        @focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
+                @focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
            </el-form-item>
          </el-col>
          <el-col :offset="2" :span="11">
            <el-form-item label="主要领导" prop="handUserName3" v-if="form.totalTime > 2">
              <el-input :value="form.handUserName3" placeholder="请选择主要领导"
-                        @focus="openSelect('选择主要领导', 'leaderList', 3)"></el-input>
+                @focus="openSelect('选择主要领导', 'leaderList', 3)"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-form-item label="请假事由" prop="reasonForLeave">
          <el-input type="textarea" placeholder="请输入请假事由" resize="none" :autosize="{ minRows: 5 }"
-                    v-model="form.reasonForLeave"/>
+            v-model="form.reasonForLeave" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -241,14 +238,14 @@
          <el-descriptions-item label="请假结束时间">{{ form.endTime }}</el-descriptions-item>
          <!--          <el-descriptions-item label="请假类型">{{ form.type }}</el-descriptions-item>-->
          <el-descriptions-item label="请假类型">
-            <dict-tag :options="dict.type.biz_leave_type" :value="form.type"/>
+            <dict-tag :options="dict.type.biz_leave_type" :value="form.type" />
          </el-descriptions-item>
        </el-descriptions>
      </el-card>
-      <br/>
+      <br />
      <el-card>
-        <el-descriptions title="请假原因"/>
+        <el-descriptions title="请假原因" />
-        <span v-html="form.reasonForLeave"/>
+        <span v-html="form.reasonForLeave" />
      </el-card>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="progress.open = false">确 定</el-button>
@@ -260,7 +257,7 @@
    <!-- 选择对应处理人 -->
    <SelectUser :id="selectHandles.id" :open.sync="selectHandles.open" :title="selectHandles.title"
-                :width="selectHandles.width" :execute="selectHandles.method" @select="selectUser"></SelectUser>
+      :width="selectHandles.width" :execute="selectHandles.method" @select="selectUser"></SelectUser>
  </div>
 </template>
 <script>
@@ -273,10 +270,10 @@ import {
  listHistory,
  submitApply,
 } from "@/api/smartSchool/personWork/leaveApply";
-import {SubmitState} from "@/enums/apply";
+import { SubmitState } from "@/enums/apply";
-import {listInform} from "@/api/smartSchool/teacherManage/teacherInformation";
+import { listInform } from "@/api/smartSchool/teacherManage/teacherInformation";
-import {getListByRole} from "@/api/smartSchool/common";
+import { getListByRole } from "@/api/smartSchool/common";
-import {ExportType} from "@/enums/common";
+import { ExportType } from "@/enums/common";
 import TeacherSelect from '@/views/components/moduleComponets/TeacherSelect/index.vue'
 import HandleResolve from "@/views/smartSchool/teacherManage/teacherLeave/components/HandleResolve";
 import HandleEntrust from "@/views/components/moduleComponets/HandleEntrust";
@@ -286,8 +283,8 @@ import {
  getGradeOfficeDirectorList,
  getLeaderList
 } from "@/api/smartSchool/personWork/leaveApply";
-import {formatDate} from "../../../../utils";
+import { formatDate } from "../../../../utils";
-import {getDepId} from "../../../../api/smartSchool/personWork/leaveApply";
+import { getDepId } from "../../../../api/smartSchool/personWork/leaveApply";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import SelectUser from "./components/SelectUser";
@@ -393,28 +390,28 @@ export default {
      // 列信息
      columns: [
-        {key: 0, label: `教师名称`, visible: true},
+        { key: 0, label: `教师名称`, visible: true },
-        {key: 1, label: `标题`, visible: true},
+        { key: 1, label: `标题`, visible: true },
-        {key: 2, label: `请假原因`, visible: true},
+        { key: 2, label: `请假原因`, visible: true },
-        {key: 3, label: `请假开始时间`, visible: true},
+        { key: 3, label: `请假开始时间`, visible: true },
-        {key: 4, label: `请假结束时间`, visible: true},
+        { key: 4, label: `请假结束时间`, visible: true },
-        {key: 5, label: `请假时长`, visible: true},
+        { key: 5, label: `请假时长`, visible: true },
-        {key: 6, label: `流程实例ID`, visible: true},
+        { key: 6, label: `流程实例ID`, visible: true },
-        {key: 7, label: `申请人`, visible: true},
+        { key: 7, label: `申请人`, visible: true },
-        {key: 8, label: `申请时间`, visible: true},
+        { key: 8, label: `申请时间`, visible: true },
-        {key: 9, label: `操作`, visible: true},
+        { key: 9, label: `操作`, visible: true },
      ],
      // 表单校验
      rules: {
-        teacherName: [{required: true, message: '教师名称不能为空', trigger: 'change'}],
+        teacherName: [{ required: true, message: '教师名称不能为空', trigger: 'change' }],
-        applyOrgname: [{required: true, message: '级部/处室不能为空', trigger: 'change'}],
+        applyOrgname: [{ required: true, message: '级部/处室不能为空', trigger: 'change' }],
-        handUserName1: [{required: true, message: '级部/处室主任不能为空', trigger: 'change'}],
+        handUserName1: [{ required: true, message: '级部/处室主任不能为空', trigger: 'change' }],
-        handUserName2: [{required: true, message: '分管领导', trigger: 'change'}],
+        handUserName2: [{ required: true, message: '分管领导', trigger: 'change' }],
-        handUserName3: [{required: true, message: '主要领导', trigger: 'change'}],
+        handUserName3: [{ required: true, message: '主要领导', trigger: 'change' }],
-        startTime: [{required: true, message: '请假开始时间不能为空', trigger: 'blur'}],
+        startTime: [{ required: true, message: '请假开始时间不能为空', trigger: 'blur' }],
-        endTime: [{required: true, message: '请假结束时间不能为空', trigger: 'blur'}],
+        endTime: [{ required: true, message: '请假结束时间不能为空', trigger: 'blur' }],
-        type: [{required: true, message: '请假类型不能为空', trigger: 'blur'}],
+        type: [{ required: true, message: '请假类型不能为空', trigger: 'blur' }],
-        reasonForLeave: [{required: true, message: '请假原因不能为空', trigger: 'blur'}]
+        reasonForLeave: [{ required: true, message: '请假原因不能为空', trigger: 'blur' }]
      },
      // 导出选项
      exportOptions: {
@@ -476,7 +473,7 @@ export default {
      this.multiple = !selection.length
    },
    /** 切换tab标签 */
-    handleClick({name}) {
+    handleClick({ name }) {
      this.$set(this.queryParams, 'submitState', Number(name));
      this.resetQuery();
    },
@@ -547,13 +544,13 @@ export default {
      const ids = this.ids;
      // TODO: 这里因为是两种状态： 提交和未提交，所以需要判断状态
      const options = [
-        {type: ExportType.TOTAL, path: '/school/teacherLeave/export', params: {}},
+        { type: ExportType.TOTAL, path: '/school/teacherLeave/export', params: {} },
        {
          type: ExportType.SELECT,
          path: '/school/teacherLeave/export/' + ids,
          params: {}
        },
-        {type: ExportType.QUERY, path: '/school/teacherLeave/export', params: this.queryParams},
+        { type: ExportType.QUERY, path: '/school/teacherLeave/export', params: this.queryParams },
      ]
      callback(options, `老师请假信息${new Date().getTime()}.xlsx`);
    },
@@ -592,15 +589,15 @@ export default {
      this.$refs["form"].validate(valid => {
        let temp1, temp2, temp3
        [this.form.startTime,
-          this.form.endTime,
+        this.form.endTime,
          temp1,
          temp2,
          temp3] =
          [formatDate(this.form.startTime),
-            formatDate(this.form.endTime),
+          formatDate(this.form.endTime),
-            this.form.startTime,
+          this.form.startTime,
-            this.form.endTime,
+          this.form.endTime,
-            this.title]
+          this.title]
        console.log(temp1, temp2)
        if (valid) {
          if (this.form.totalTime < 2) {
@@ -613,13 +610,13 @@ export default {
          }
          if (this.form.id != null) {
-            updateTeacherLeave({...this.form, title: temp3}).then(response => {
+            updateTeacherLeave({ ...this.form, title: temp3 }).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.dialogTeacherLeave = false;
              this.getList();
            });
          } else {
-            addTeacherLeave({...this.form, title: temp3}).then(response => {
+            addTeacherLeave({ ...this.form, title: temp3 }).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.dialogTeacherLeave = false;
              this.getList();
@@ -652,7 +649,7 @@ export default {
      this.getApproveHistoryList(row)
    },
    getApproveHistoryList(row) {
-      listHistory({instanceId: row.instanceId}).then(res => {
+      listHistory({ instanceId: row.instanceId }).then(res => {
      })
    },
    openTeacherSelect() {
@@ -758,7 +755,7 @@ export default {
      if (this.form.handUserName1) {
        this.form.handUserName1 = ""
      }
-      const {id, label} = data;
+      const { id, label } = data;
      console.log(id, label, 758)
      this.form.applyOrgname = label;
      this.form.applyOrgid = id;
@@ -769,19 +766,19 @@ export default {
      }))
    },
    handleDirector(data) {
-      const {handUserName1, handUserId1} = data;
+      const { handUserName1, handUserId1 } = data;
      this.form.handUserName1 = handUserName1;
      this.form.handUserId1 = handUserId1;
    },
    handleDeputyLeader(data) {
-      const {handUserName2, handUserId2} = data;
+      const { handUserName2, handUserId2 } = data;
      this.form.handUserName2 = handUserName2;
      this.form.handUserId2 = handUserId2;
    },
    handleLeader(data) {
-      const {handUserName3, handUserId3} = data;
+      const { handUserName3, handUserId3 } = data;
      this.form.handUserName3 = handUserName3;
      this.form.handUserId3 = handUserId3;
    },
@@ -862,7 +859,7 @@ export default {
    },
    readNodes(nodes = [], arr = []) {
      for (let item of nodes) {
-        arr.push({id: item.id, label: item.label})
+        arr.push({ id: item.id, label: item.label })
        if (item.children && item.children.length) this.readNodes(item.children, arr)
      }
      return arr
@@ -876,12 +873,16 @@ export default {
      this.selectHandles.type = type;
      // 将级部、处室 id赋值
      this.selectHandles.id = this.form.applyOrgid;
+      console.log('this.selectHandles', this.selectHandles);
    },
    // 选择处理人
    selectUser(select) {
+      console.log('this.form1', this.form);
      // 这种写法存在一定危险，后续最好是可以有更好的字段名对应
      this.$set(this.form, `handUserName${this.selectHandles.type}`, select.name);
      this.$set(this.form, `handUserId${this.selectHandles.type}`, select.id);
+      console.log('this.form', this.form);
    }
  }
 };

--- a/ruoyi-ui/src/views/smartSchool/venueReservation/recordingroomManagement/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/venueReservation/recordingroomManagement/index.vue
@@ -34,8 +34,8 @@
                </template>
            </el-table-column>
        </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+            @pagination="getList" /> -->
        <!-- 新增/修改弹窗 -->
        <el-dialog :title="title" :visible.sync="open" width="1200px">
            <el-form ref="form" :model="form" label-width="114px" :rules="rules">
@@ -90,12 +90,7 @@ export default {
        return {
            studioStatu: "",
            queryParams: {
-                id: "",
+                studioArea: "",
-                studioName: "",
-                studioStatu: "",
-                studioArea: '',
-                pageNum: 1,
-                pageSize: 10,
            },
            title: "",
            rules: {
@@ -125,7 +120,7 @@ export default {
    methods: {
        /** 查询 */
        getList() {
-            getStudio(this.queryParams.studioArea).then((response) => {
+            getStudio(this.queryParams).then((response) => {
                this.tableData = response.rows;
                this.loading = false;
                console.log(111, response.rows);