zpy 7.21

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",
   });
 }
-

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">
-                        <span v-else>{{ jlmc }}</span> -->
+                            {{ form.informant }}
                         </span>
                     </el-col>
                     <el-col :span="10">
                         <span class="uploadname" style="font-size: 16px;font-weight: bold;">分管领导:
-                            <!-- <img v-if="sjqztp" :src="sjqztp">
-                        <span v-else>{{ sjmc }}</span> -->
+                            {{ form.leadershipName }}
                         </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();
 

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,12 +244,12 @@
                         <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>
 
-                                </p> -->
+                                </p>  -->
                                 <p>
                                     <el-link :underline="false" :href="postForm.fjlj" type="primary" target="_blank">
                                         {{ postForm.fjmc }}
@@ -577,10 +577,16 @@ export default {
         getFileList(data) {
             console.log('data', data);
             this.fileList = data;
-            this.postForm.fjlj = data[0].fjlj;
-            this.postForm.fjmc = data[0].fjmc;
-            console.log('this.postForm', this.postForm);
+            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,14 +816,14 @@ 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,
+                        fjlj: this.postForm.fjlj,
+                        fjmc: this.postForm.fjmc,
                     }]
-                  }
+                }
 
 
                 console.log('postForm', this.postForm);
@@ -861,21 +868,21 @@ export default {
                         console.log('this.postForm', this.postForm);
                         // this.$modal.loading("正在上传数据，请稍等...");
                         if (this.postForm.id != null) {
-                          if(this.fileList.length != 0){
-                            // 查看表单
-                            updateAuditor(this.postForm)
-                              .then((response) => {
-                                this.$modal.closeLoading();
-                                this.$modal.msgSuccess("修改成功");
-                                this.open = false;
-                                this.getList();
-                              })
-                              .catch((err) => {
-                                this.$modal.closeLoading();
-                              });
-                          }else{
-                            this.$modal.msgError("流程单附件不能为空");
-                          }
+                            if (this.fileList.length != 0) {
+                                // 查看表单
+                                updateAuditor(this.postForm)
+                                    .then((response) => {
+                                        this.$modal.closeLoading();
+                                        this.$modal.msgSuccess("修改成功");
+                                        this.open = false;
+                                        this.getList();
+                                    })
+                                    .catch((err) => {
+                                        this.$modal.closeLoading();
+                                    });
+                            } else {
+                                this.$modal.msgError("流程单附件不能为空");
+                            }
 
                         } else {
                             if (this.fileList.length != 0) {
@@ -923,8 +930,8 @@ export default {
                 isLive: "",
                 isBigScreen: "",
                 htNumber: "",
-                fjmc: null, // 设置为null
-                fjlj: null, // 设置为null
+                // fjmc: null, 
+                // fjlj: null, 
                 leadershipId: "",
                 pageNum: 1,
                 pageSize: 10,