zpy 7.21

a13bec33 · zhaopanyu · 8e736907 · a13bec33 · a13bec33 · a13bec33
Commit a13bec33 authored Jul 21, 2023 by zhaopanyu
4 changed files
--- a/ruoyi-ui/src/api/smartSchool/logisticsManage/departmentBudgetview.js
+++ b/ruoyi-ui/src/api/smartSchool/logisticsManage/departmentBudgetview.js
 import request from "@/utils/request";
 //查询科室预算填报项目明细列表
 export function getksBudgetList(query) {
@@ -15,4 +14,3 @@ export function depBudget(id) {
    method: "get",
  });
 }
--- a/ruoyi-ui/src/views/smartSchool/logisticsManage/budgetFillingfollows/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/logisticsManage/budgetFillingfollows/index.vue
@@ -63,14 +63,12 @@
                <el-row style="margin-top: 15px;margin-left: 20px;">
                    <el-col :span="14">
                        <span class="uploadname" style="font-size: 16px;font-weight: bold;">填报人:
-                            <!-- <img v-if="jlqztp" :src="jlqztp">
+                            {{ form.informant }}
-                        <span v-else>{{ jlmc }}</span> -->
                        </span>
                    </el-col>
                    <el-col :span="10">
                        <span class="uploadname" style="font-size: 16px;font-weight: bold;">分管领导:
-                            <!-- <img v-if="sjqztp" :src="sjqztp">
+                            {{ form.leadershipName }}
-                        <span v-else>{{ sjmc }}</span> -->
                        </span>
                    </el-col>
                </el-row>
@@ -198,8 +196,10 @@ export default {
                this.lookTable = response.data.schoolDepartmentBudgetProjectmxList;
                this.form.year = response.data.year;
                this.form.deptName = response.data.deptName;
+                this.form.informant = response.data.informant;
+                this.form.leadershipName = response.data.leadershipName;
                console.log(this.form.year, this.form.deptName);
-                console.log(response.data);
+                console.log(11110, response.data);
                this.openLook = true;
                this.$modal.closeLoading();

--- a/ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
@@ -20,7 +20,7 @@
        <!-- 表格信息 -->
        <el-table stripe ref="applyTable" v-loading="loading" :data="infoList" :cell-style="cellStyle">
            <el-table-column type="index" label="序号" width="55" align="center" fixed="left"></el-table-column>
-            <el-table-column label="活动名称" align="center" prop="activityName" width="100px" fixed="left"/>
+            <el-table-column label="活动名称" align="center" prop="activityName" width="100px" fixed="left" />
            <el-table-column label="活动地点" align="center" width="120px" prop="activityArea" />
            <el-table-column label="负责人" align="center" prop="specificUserName" />
            <el-table-column label="活动人数" align="center" prop="activityNumber" />
@@ -244,7 +244,7 @@
                        <tr>
                            <td rowspan="2" class="btntxt">附件</td>
                            <td colspan="6">
-                                <p v-for="(item, index) in fileList" :key="index">
+                                <!-- <p v-for="(item, index) in fileList" :key="index">
                                    <el-link :underline="false" :href="item.fjlj" type="primary" target="_blank">
                                        {{ item.fjmc }}
                                    </el-link>
@@ -577,10 +577,16 @@ export default {
        getFileList(data) {
            console.log('data', data);
            this.fileList = data;
+            if (this.fileList.length != 0) {
                this.postForm.fjlj = data[0].fjlj;
                this.postForm.fjmc = data[0].fjmc;
                console.log('this.postForm', this.postForm);
+            } else {
+                this.postForm.fjlj = '';
+                this.postForm.fjmc = '';
+            }
        },
        /** 获取列表数据 */
@@ -737,12 +743,13 @@ export default {
        // 重置按钮
        resetQuery() {
            const state = this.queryForm.state;
+            this.dateRange = []; // 重置日期选择器
+            this.diffDate = ''; // 重置 diffDate 为默认值
            this.queryForm = {
                state: state,
                pageNum: 1,
                pageSize: 10,
            };
-            this.dateRange = [];
            this.week = "";
            this.handleQuery(); // 重新发一次请求
        },
@@ -789,11 +796,11 @@ export default {
        // 新增按钮操作
        handleAdd() {
            this.reset();
            // const userId = this.$store.state.user.userId;
            this.postForm.activityArea = "博远礼堂";
            // this.postForm.specificUserName = this.$store.state.user.name;
+            this.postForm.fjlj = '';
+            this.postForm.fjmc = '';
            this.isShow = true;
            this.isDisabled = false;
            this.open = true;
@@ -809,9 +816,9 @@ export default {
            getAuditor(id).then(response => {
                this.postForm = response.data;
                console.log('this.fileList', this.fileList)
-                  if(this.postForm.fjlj == '' || this.postForm.fjlj == undefined || this.postForm.fjlj == null){
+                if (this.postForm.fjlj == '' || this.postForm.fjlj == undefined || this.postForm.fjlj == null) {
                    this.fileList = []
-                  }else{
+                } else {
                    this.fileList = [{
                        fjlj: this.postForm.fjlj,
                        fjmc: this.postForm.fjmc,
@@ -861,7 +868,7 @@ export default {
                        console.log('this.postForm', this.postForm);
                        // this.$modal.loading("正在上传数据，请稍等...");
                        if (this.postForm.id != null) {
-                          if(this.fileList.length != 0){
+                            if (this.fileList.length != 0) {
                                // 查看表单
                                updateAuditor(this.postForm)
                                    .then((response) => {
@@ -873,7 +880,7 @@ export default {
                                    .catch((err) => {
                                        this.$modal.closeLoading();
                                    });
-                          }else{
+                            } else {
                                this.$modal.msgError("流程单附件不能为空");
                            }
@@ -923,8 +930,8 @@ export default {
                isLive: "",
                isBigScreen: "",
                htNumber: "",
-                fjmc: null, // 设置为null
+                // fjmc: null, 
-                fjlj: null, // 设置为null
+                // fjlj: null, 
                leadershipId: "",
                pageNum: 1,
                pageSize: 10,

--- a/ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.vue
+++ b/ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.vue
@@ -4,8 +4,7 @@
    <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="日期" prop="startTime">
        <el-date-picker size="small" v-model="queryParams.startTime" type="date" placeholder="开始日期"
-                        value-format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDate" :picker-options="pickerOptions"
-                        format="yyyy-MM-dd" @change="changeDate" :picker-options="pickerOptions"
          style="margin-right:10px">
        </el-date-picker>
@@ -16,7 +15,7 @@
      <el-form-item prop="studioName" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]">
-        <el-select v-model="queryParams.studioId" placeholder="录播室" >
+        <el-select 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>
@@ -24,7 +23,7 @@
      </el-form-item>
      <el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button>
-      <!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> -->
+      <el-button size="mini" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
      <!-- :disabled="isReservationDisabled" -->
      <el-button size="mini" @click="reserve">预约</el-button>
    </el-form>
@@ -143,6 +142,17 @@ export default {
    // this.fetchData();
  },
  methods: {
+    // 重置按钮
+    resetQuery() {
+      this.queryParams = {
+        studioId: "",
+        startTime: "",
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.fetchStudioUseData(); // 重新发一次请求
+    },
    changeDate() {
      this.endTime = moment(this.queryParams.startTime).add(9, 'days')
    },
@@ -161,7 +171,7 @@ export default {
      const occupiedData = this.studioUseData.find((item) => {
        // console.log('Array.from(item.useJc)',item.useJc.split(','))
        // console.log('Array.from(item.useJc)',index + 1)
-        return item.useDate === day && item.useJc.split(',').includes((index+1).toString());
+        return item.useDate === day && item.useJc.split(',').includes((index + 1).toString());
      });
      return occupiedData ? occupiedData.useUserId : false;
    },
@@ -170,7 +180,7 @@ export default {
      if (this.isOccupied(day, index)) {
        return false
      } else {
-        console.log('this.selectedTimeSlots',this.selectedTimeSlots)
+        console.log('this.selectedTimeSlots', this.selectedTimeSlots)
        // 检查时间段是否已选中
        return this.selectedTimeSlots.some((selectedSlot) => {
          // console.log('selectedSlot',selectedSlot)
@@ -190,7 +200,7 @@ export default {
        return
      } else if (this.selectedTimeSlots.length == 0) {
        // 处理单元格点击事件，点击第一个
-        this.selectedTimeSlots.push({day, index})
+        this.selectedTimeSlots.push({ day, index })
        this.remark = true
        //没有选同一天
      } else if (this.selectedTimeSlots[0].day != day) {
@@ -211,7 +221,7 @@ export default {
          this.selectedTimeSlots = this.selectedTimeSlots.filter(item => item.index != index)
          this.selectedTimeSlots.length == 0 ? this.remark = false : this.selectedTimeSlots
        } else {
-          this.selectedTimeSlots.push({day, index})
+          this.selectedTimeSlots.push({ day, index })
        }
      }
    },
@@ -220,7 +230,7 @@ export default {
    getRoomList() {
      getAppointmentList({}).then((res) => {
        this.options = res.rows;
-        console.log('res',res)
+        console.log('res', res)
      });
    },
@@ -272,13 +282,13 @@ export default {
    handleMouseDown(day, index) {
      // 处理鼠标按下事件
      this.isMouseDown = true;
-      this.startSelection = {day, index};
+      this.startSelection = { day, index };
-      this.endSelection = {day, index};
+      this.endSelection = { day, index };
    },
    handleMouseUp(day, index) {
      // 处理鼠标松开事件
      this.isMouseDown = false;
-      this.endSelection = {day, index};
+      this.endSelection = { day, index };
      // 根据按下的键盘按键进行选择操作
      if (event.ctrlKey) {
@@ -296,7 +306,7 @@ export default {
    handleMouseEnter(day, index) {
      // 处理鼠标进入单元格事件（用于 Shift 键多选）
      if (this.isMouseDown && event.shiftKey) {
-        this.endSelection = {day, index};
+        this.endSelection = { day, index };
        this.selectMultipleSlots();
      }
    },
@@ -321,22 +331,22 @@ export default {
          dayIndex === this.days.indexOf(endDay)
        ) {
          for (let index = startIndex; index <= endIndex; index++) {
-            selectedTimeSlots.push({day, index});
+            selectedTimeSlots.push({ day, index });
          }
        } else if (dayIndex === this.days.indexOf(startDay)) {
          // 对于起始日期，选择从起始索引到最后一个时间段
          for (let index = startIndex; index < this.timeSlots.length; index++) {
-            selectedTimeSlots.push({day, index});
+            selectedTimeSlots.push({ day, index });
          }
        } else if (dayIndex === this.days.indexOf(endDay)) {
          // 对于结束日期，选择从第一个时间段到结束索引
          for (let index = 0; index <= endIndex; index++) {
-            selectedTimeSlots.push({day, index});
+            selectedTimeSlots.push({ day, index });
          }
        } else {
          // 其他日期完全选择
          for (let index = 0; index < this.timeSlots.length; index++) {
-            selectedTimeSlots.push({day, index});
+            selectedTimeSlots.push({ day, index });
          }
        }
      }
@@ -368,13 +378,13 @@ export default {
    //弹窗
    reserve(day, index) {
      if (this.remark) {
-          if(this.queryParams.studioId == ''){
+        if (this.queryParams.studioId == '') {
          this.successDialogVisible = false;
          this.$modal.alertWarning("请选择录播室");
-          }else{
+        } else {
          this.successDialogVisible = true;
        }
-        } else{
+      } else {
        console.log(this.remark)
        this.successDialogVisible = false;
      }
@@ -393,27 +403,27 @@ export default {
      // 在这里，你可以处理预约操作，例如发送请求进行录播室预约操作
      // 预约成功后，你可以根据已选时间段的数据来更新录播室的占用情况
      this.successDialogVisible = false;
-      console.log('queryParams.studioName',this.queryParams)
+      console.log('queryParams.studioName', this.queryParams)
-      console.log('this.selectedTimeSlots',this.selectedTimeSlots)
+      console.log('this.selectedTimeSlots', this.selectedTimeSlots)
-      console.log('form.studioContent',this.form.studioContent)
+      console.log('form.studioContent', this.form.studioContent)
      const jc = this.selectedTimeSlots.map(item => {
-        return item.index+1
+        return item.index + 1
      })
      const stringJC = jc.toString()
-      console.log('stringJC',stringJC)
+      console.log('stringJC', stringJC)
      const params = {
        //录播室id
-        studioId:this.queryParams.studioId,
+        studioId: this.queryParams.studioId,
        //预约时间
-        appointmentTime:this.selectedTimeSlots[0].day,
+        appointmentTime: this.selectedTimeSlots[0].day,
        //预约节次
-        appointmentJc:stringJC,
+        appointmentJc: stringJC,
        //录播内容
-        studioContent:this.form.studioContent
+        studioContent: this.form.studioContent
      }
      addIdle(params).then(res => {
-        console.log('res',res)
+        console.log('res', res)
-        if(res.code == 200){
+        if (res.code == 200) {
          this.$message({
            message: "预约成功",
            type: "success",
@@ -480,5 +490,4 @@ th {
  background-color: #66b3ff;
 }
 </style>