Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

ruoyi-ui/src/views/smartSchool/logisticsManage/repairReport/index.vue

@@ -513,9 +513,10 @@ export default {
                         .then((response) => {
                             this.$modal.closeLoading();
                             this.$modal.msgSuccess("派单成功");
+                            this.getList();
                             this.openpd = false;
                             this.formpd.maintainResult = '';
-                            this.getList();
+
                         })
                         .catch((error) => {
 

ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairClassManage/index.vue

@@ -471,8 +471,8 @@ export default {
         schoolYear: [{required: true, message: '学年不能为空', trigger: 'change'}],
         gradeValue: [{required: true, message: '年级不能为空', trigger: 'change'}],
         classValue: [{required: true, message: '班级不能为空', trigger: 'change'}],
-        teacherName: [{required: true, message: '班主任姓名不能为空', trigger: 'change'}],
-        teacherTel: [{required: true, message: '班主任手机号不能为空', trigger: 'change'}],
+        // teacherName: [{required: true, message: '班主任姓名不能为空', trigger: 'change'}],
+        // teacherTel: [{required: true, message: '班主任手机号不能为空', trigger: 'change'}],
         // houseName: [{required: true, message: '所在教学楼不能为空', trigger: 'change'}],
         classNum1: [{required: true, message: '高一班级数量不能为空', trigger: 'blur'}],
         classNum2: [{required: true, message: '高二班级数量不能为空', trigger: 'blur'}],

ruoyi-ui/src/views/smartSchool/venueReservation/useRecordingroom/index.vue

@@ -8,18 +8,17 @@
                     style="margin-right:10px">
                 </el-date-picker>
                 <el-date-picker size="small" type="date" v-model="endTime" disabled>
-
                 </el-date-picker>
             </el-form-item>
             <el-form-item prop="studioId" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]">
-                <el-select v-model="queryParams.studioId" placeholder="录播室">
+                <el-select @change="changeStudio" v-model="queryParams.studioId" placeholder="录播室">
                     <el-option v-for="item in options" :key="item.id" :label="item.studioName" :value="item.id">
                     </el-option>
                 </el-select>
             </el-form-item>
 
-            <el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <!-- <el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
         </el-form>
         <p style="margin: 0 0 0 30px;font-size: 14px">
             说明：（1）录播室每天开放上午四节、下午四节、晚上三节。共计每天11节。（2）请提前一天进行预约。（3）预约不可跨天，跨天请进行多次预约</p>
@@ -54,7 +53,7 @@
             </tbody>
         </table>
 
-       
+
     </div>
 </template>
 
@@ -124,6 +123,11 @@ export default {
         changeDate() {
             this.endTime = moment(this.queryParams.startTime).add(9, 'days')
         },
+        changeStudio(value) {
+            this.selectedTimeSlots = []; // 在切换录播室时清空已选时间段
+            this.queryParams.studioId = value;
+            this.fetchStudioUseData();
+        },
 
         fetchStudioUseData() {
             // 调用接口获取录播室占用情况数据
@@ -166,7 +170,7 @@ export default {
             this.queryParams = {
                 startTime: "",
                 studioName: "",
-              
+
             };
             this.resetForm("queryParams");
         },