zpy 7.28

ruoyi-ui/src/api/smartSchool/personWork/businessAwards/index.js

+import request from "@/utils/request";
+
+// 新增获奖情况
+export function addAward(data) {
+  return request({
+    url: "/award/add",
+    method: "post",
+    data: data,
+  });
+}
+// 修改获奖情况
+export function updateaAward(data) {
+  return request({
+    url: "/award",
+    method: "put",
+    data: data,
+  });
+}
+//查询获奖情况列表
+export function getAward(query) {
+  return request({
+    url: "/award/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询获奖情况详情
+export function listAward(ids) {
+  return request({
+    url: "/award/" + ids,
+    method: "get",
+  });
+}
+
+// 删除获奖情况
+export function delAward(ids) {
+  return request({
+    url: "/award/" + ids,
+    method: "delete",
+  });
+}

ruoyi-ui/src/api/smartSchool/personWork/logisticsWarranty/index.js

+import request from "@/utils/request";
+
+// 查询报修列表
+export function listRepairs(query) {
+  return request({
+    url: "/repairs/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 新增报修信息
+export function addRepairs(data) {
+  return request({
+    url: "/repairs/add",
+    method: "post",
+    data: data,
+  });
+}
+// 查询报修信息详情
+export function getRepairs(id) {
+  return request({
+    url: "/repairs/" + id,
+    method: "get",
+  });
+}
+
+// 修改报修信息
+export function updateRepairs(data) {
+  return request({
+    url: "/repairs",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除报修信息
+export function delRepairs(ids) {
+  return request({
+    url: "/repairs/" + ids,
+    method: "delete",
+  });
+}
+
+//反馈结果接口
+export function submitRepairs(data) {
+  return request({
+    url: "/repairs",
+    method: "put",
+    data: data,
+  });
+}
+
+//获取报修单号
+export function numberRepairs(data) {
+  return request({
+    url: "/repairs/getNumber",
+    method: "get",
+    data: data,
+  });
+}

ruoyi-ui/src/api/smartSchool/personWork/materialPreparation/index.js

+import request from "@/utils/request";
+
+// 新增材料编写情况
+export function addMaterial(data) {
+  return request({
+    url: "/material/add",
+    method: "post",
+    data: data,
+  });
+}
+// 修改材料编写情况
+export function updateMaterial(data) {
+  return request({
+    url: "/material",
+    method: "put",
+    data: data,
+  });
+}
+// 查看材料编写情况列表
+export function getMaterial(query) {
+  return request({
+    url: "/material/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查看材料编写详情
+export function listMaterial(ids) {
+  return request({
+    url: "/material/" + ids,
+    method: "get",
+  });
+}
+
+// 删除材料编写情况
+export function delMaterial(ids) {
+  return request({
+    url: "/material/" + ids,
+    method: "delete",
+  });
+}

ruoyi-ui/src/api/smartSchool/personWork/paperSituation/index.js

+import request from "@/utils/request";
+
+// 新增论文情况
+export function addThesis(data) {
+  return request({
+    url: "/thesis/add",
+    method: "post",
+    data: data,
+  });
+}
+
+// 查看论文情况列表
+export function getThesis(query) {
+  return request({
+    url: "/thesis/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查看论文情况详情
+export function listThesis(ids) {
+  return request({
+    url: "/thesis/" + ids,
+    method: "get",
+  });
+}
+// 修改论文情况
+export function updateThesis(data) {
+  return request({
+    url: "/thesis",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除论文情况
+export function delThesis(ids) {
+  return request({
+    url: "/thesis/" + ids,
+    method: "delete",
+  });
+}

ruoyi-ui/src/api/smartSchool/personWork/traiNing/index.js

+import request from "@/utils/request";
+
+// 新增培训情况
+export function addTraining(data) {
+  return request({
+    url: "/training/add",
+    method: "post",
+    data: data,
+  });
+}
+//修改培训情况
+export function updateTraining(data) {
+  return request({
+    url: "/training",
+    method: "put",
+    data: data,
+  });
+}
+// 查询培训情况列表
+export function getTraining(query) {
+  return request({
+    url: "/training/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询培训情况详情
+export function listTraining(ids) {
+  return request({
+    url: "/training/" + ids,
+    method: "get",
+  });
+}
+
+// 删除培训情况
+export function delTraining(ids) {
+  return request({
+    url: "/training/" + ids,
+    method: "delete",
+  });
+}

ruoyi-ui/src/components/FilepersonUploadNew/index.vue

+<template>
+  <div class="upload-file">
+    <el-upload multiple :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" :limit="limit"
+      :on-error="handleUploadError" :on-exceed="handleExceed" :on-success="handleUploadSuccess" :show-file-list="false"
+      :headers="headers" class="upload-file-uploader" ref="fileUpload">
+      <!-- 上传按钮 -->
+      <el-button size="mini" type="primary">上传附件</el-button>
+      <!-- 上传提示 -->
+      <!--      <div class="el-upload__tip" slot="tip" v-if="showTip">-->
+      <!--        请上传-->
+      <!--        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>-->
+      <!--        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>-->
+      <!--        的文件-->
+      <!--      </div>-->
+    </el-upload>
+    <!-- 文件列表 -->
+    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+      <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
+        <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
+          <span class="el-icon-document"> {{ file.name }} </span>
+        </el-link>
+        <div class="ele-upload-list__item-content-action" style="float: right">
+          <el-link style="margin-left: 10px;color: #1890ff" :href="`${baseUrl}${file.url}`" :underline="false"
+            target="_blank">下载</el-link>
+          <el-link style="margin-left: 15px" :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
+        </div>
+      </li>
+    </transition-group>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/utils/auth";
+export default {
+  name: "UploadFileNew",
+  props: {
+    // 值
+    value: [String, Object, Array],
+    // 数量限制
+    limit: {
+      type: Number,
+      default: 5,
+    },
+    // 大小限制(MB)
+    fileSize: {
+      type: Number,
+      default: 5,
+    },
+    // 文件类型, 例如['png', 'jpg', 'jpeg']
+    fileType: {
+      type: Array,
+      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+    },
+    // 是否显示提示
+    isShowTip: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      number: 0,
+      uploadList: [],
+      baseUrl: process.env.VUE_APP_BASE_API,
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      fileList: [],
+    };
+  },
+  watch: {
+    value: {
+      handler(val) {
+        if (val) {
+          let temp = 1;
+          // 首先将值转为数组
+          const list = Array.isArray(val) ? val : this.value.split(',');
+          // 然后将数组转为对象数组
+          this.fileList = list.map(item => {
+            if (typeof item === "string") {
+              item = { name: item, url: item };
+            }
+            item.uid = item.uid || new Date().getTime() + temp++;
+            return item;
+          });
+        } else {
+          this.fileList = [];
+          return [];
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  computed: {
+    // 是否显示提示
+    showTip() {
+      return this.isShowTip && (this.fileType || this.fileSize);
+    },
+  },
+  methods: {
+    // 上传前校检格式和大小
+    handleBeforeUpload(file) {
+      // 校检文件类型
+      // if (this.fileType) {
+      //   const fileName = file.name.split('.');
+      //   const fileExt = fileName[fileName.length - 1];
+      //   const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
+      //   if (!isTypeOk) {
+      //     this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
+      //     return false;
+      //   }
+      // }
+      // 校检文件大小
+      // if (this.fileSize) {
+      //   const isLt = file.size / 1024 / 1024 < this.fileSize;
+      //   if (!isLt) {
+      //     this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
+      //     return false;
+      //   }
+      // }
+      this.$modal.loading("正在上传文件，请稍候...");
+      this.number++;
+      return true;
+    },
+    // 文件个数超出
+    handleExceed() {
+      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
+    },
+    // 上传失败
+    handleUploadError(err) {
+      this.$modal.msgError("上传文件失败，请重试");
+      this.$modal.closeLoading()
+    },
+    // 上传成功回调
+    handleUploadSuccess(res, file) {
+      console.log('handleUploadSuccess', res)
+      console.log('file', file)
+      if (res.code === 200) {
+        this.uploadList.push({ name: res.newFileName, url: res.fileName });
+        this.uploadedSuccessfully();
+      } else {
+        this.number--;
+        this.$modal.closeLoading();
+        this.$modal.msgError(res.msg);
+        this.$refs.fileUpload.handleRemove(file);
+        this.uploadedSuccessfully();
+      }
+    },
+    // 删除文件
+    handleDelete(index) {
+      this.fileList.splice(index, 1);
+      // this.$emit("input", this.listToString(this.fileList));
+      this.$emit("input", this.fileList);
+    },
+    // 上传结束处理
+    uploadedSuccessfully() {
+      if (this.number > 0 && this.uploadList.length === this.number) {
+        this.fileList = this.fileList.concat(this.uploadList);
+        this.uploadList = [];
+        this.number = 0;
+        // this.$emit("input", this.listToString(this.fileList));
+        this.$emit("input", this.fileList);
+        this.$modal.closeLoading();
+      }
+    },
+    // 获取文件名称
+    getFileName(name) {
+      if (name.lastIndexOf("/") > -1) {
+        return name.slice(name.lastIndexOf("/") + 1);
+      } else {
+        return "";
+      }
+    },
+    // 对象转成指定字符串分隔
+    // listToString(list, separator) {
+    //   let strs = "";
+    //   separator = separator || ",";
+    //   for (let i in list) {
+    //     strs += list[i].url + separator;
+    //   }
+    //   return strs != '' ? strs.substr(0, strs.length - 1) : '';
+    // }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.upload-file {
+  vertical-align: center;
+  width: 100%;
+  text-align: right;
+  position: relative;
+}
+
+::v-deep .el-upload {
+  position: absolute;
+  right: 0px;
+  top: 0px;
+}
+
+.upload-file-uploader {
+  margin-bottom: 5px;
+}
+
+.upload-file-list {
+  width: 85%;
+  position: relative !important;
+  top: 0px !important;
+}
+
+.upload-file-list .el-upload-list__item {
+  // border: 1px solid #e4e7ed;
+  line-height: 2;
+  margin-bottom: 10px;
+  position: relative;
+}
+
+.upload-file-list .ele-upload-list__item-content {
+  display: flex;
+  justify-content: flex-start;
+  ;
+  align-items: center;
+  color: inherit;
+}
+
+.ele-upload-list__item-content-action .el-link {
+  margin-right: 10px;
+}
+</style>

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

@@ -22,7 +22,14 @@
             <el-table-column label="分管领导" prop="leadershipName" align="center" />
             <el-table-column label="备注" prop="remark" align="center" />
             <el-table-column label="填报时间" prop="tbTime" align="center" />
-            <el-table-column label="当前任务" prop="state" align="center" />
+            <el-table-column label="当前任务" prop="state" align="center">
+                <template slot-scope="{ row }">
+                    {{ row.state === '0' ? "未提交" :
+                        row.state === '1' ? "分管领导审核" :
+                            row.state === '2' ? "审核通过" :
+                                "审核不通过" }}
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
 
@@ -193,6 +200,7 @@ export default {
         handleLook(row) {
             const id = row.id || this.ids
             depBudget(id).then(response => {
+                console.log('response', response);
                 this.lookTable = response.data.schoolDepartmentBudgetProjectmxList;
                 this.form.year = response.data.year;
                 this.form.deptName = response.data.deptName;
@@ -207,8 +215,7 @@ export default {
 
             })
         },
-
-
+       
 
         // 重置
         reset() {

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

@@ -66,21 +66,23 @@
                     <el-table-column prop="projectName" label="项目名称" align="center" />
                     <el-table-column prop="content" label="申报政策依据、理由及主要内容" width="300" align="center" />
                     <el-table-column label="项目支出明细" prop="projectExpenditures" align="center" />
-                    <el-table-column label="是否政府采购" prop="isGovernmentPurchase" align="center" width="200" />
+                    <el-table-column label="是否政府采购" prop="isGovernmentPurchase" align="center" width="200">
+                        <template slot-scope="scope">
+                            {{ scope.row.isGovernmentPurchase === '1' ? '是' : '否' }}
+                        </template>
+                    </el-table-column>
                     <el-table-column label="申请金额" prop="applyMoney" align="center" width="200" />
                     <el-table-column label="备注" prop="remark" align="center" width="200" />
                 </el-table>
                 <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>
@@ -212,31 +214,56 @@ export default {
             this.handleQuery();
         },
 
-
-
         // 查看按钮
+        // handleLook(row) {
+        //     this.openLook = true;
+        //     const id = row.id || this.ids
+        //     depBudget(id).then(response => {
+        //         console.log(222, response.data);
+        //         this.lookTable = [{
+        //             projectName
+        //         }]
+        //         this.lookTable.projectName = response.data.projectName;
+        //         console.log('this.lookTable.projectName', this.lookTable.projectName);
+        //         this.lookTable.content = response.data.content;
+        //         console.log('this.content', this.lookTable.content);
+        //         this.lookTable.projectExpenditures = response.data.projectExpenditures;
+        //         this.lookTable.isGovernmentPurchase = response.data.isGovernmentPurchase;
+        //         this.lookTable.applyMoney = response.data.applyMoney;
+        //         this.lookTable.remark = response.data.remark;
+        //         this.form.year = response.data.year;
+        //         this.form.deptName = response.data.deptName;
+        //         this.form.informant = response.data.informant;
+        //         this.form.leadershipName = response.data.leadershipName;
+        //     }).catch(err => {
+        //     })
+        // },
         handleLook(row) {
             this.openLook = true;
-            const id = row.id || this.ids
+            const id = row.id || this.ids;
             depBudget(id).then(response => {
                 console.log(222, response.data);
-
-                this.lookTable.projectName = response.data.projectName;
-                this.lookTable.content = response.data.content;
-                this.lookTable.projectExpenditures = response.data.projectExpenditures;
-                this.lookTable.isGovernmentPurchase = response.data.isGovernmentPurchase;
-                this.lookTable.applyMoney = response.data.applyMoney;
-                this.lookTable.remark = response.data.remark;
+                this.lookTable = [{
+                    projectName: response.data.projectName,
+                    content: response.data.content,
+                    projectExpenditures: response.data.projectExpenditures,
+                    isGovernmentPurchase: response.data.isGovernmentPurchase,
+                    applyMoney: response.data.applyMoney,
+                    remark: response.data.remark
+                }];
+                console.log(1119, this.lookTable);
                 this.form.year = response.data.year;
                 this.form.deptName = response.data.deptName;
-                this.$modal.closeLoading();
+                this.form.informant = response.data.informant;
+                this.form.leadershipName = response.data.leadershipName;
             }).catch(err => {
-
-            })
+                // 错误处理
+            });
         },
 
 
 
+
         // 重置
         reset() {
             this.postForm = {
@@ -261,9 +288,9 @@ export default {
         },
         // 导出
         handleExport() {
-            this.download('monitor/job/export', {
+            this.download('/departmentBudgetProjectmx/export', {
                 ...this.queryParams
-            }, `job_${Date.now()}.xlsx`)
+            }, `科室预算查看_${Date.now()}.xlsx`)
         }
 
 

ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue

@@ -8,7 +8,7 @@
                 <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
                     end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeData(dateRange)">
                 </el-date-picker>
-                <!-- @change="changeData(queryForm.sj) -->
+                <!-- 时间短（天） -->
                 <span v-if="diffDate !== ''" style="font-size: 14px">({{ diffDate }})天</span>
             </el-form-item>
             <el-form-item>
@@ -932,11 +932,15 @@ export default {
                 htNumber: "",
                 // fjmc: null, 
                 // fjlj: null, 
+
                 leadershipId: "",
                 pageNum: 1,
                 pageSize: 10,
-                leadershipName: ""
+                leadershipName: "",
+
+
             };
+            this.fileList = []; // 清空附件列表
             this.resetForm("postForm");
         },
 

ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.vue

@@ -6,22 +6,16 @@
         <el-date-picker size="small" v-model="queryParams.startTime" type="date" placeholder="开始日期"
           value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDate" :picker-options="pickerOptions"
           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="studioName" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]">
         <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>
-
       </el-form-item>
-
       <el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button>
       <el-button size="mini" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       <!-- :disabled="isReservationDisabled" -->
@@ -62,7 +56,6 @@
         </tr>
       </tbody>
     </table>
-
     <!-- 预约录播室成功的弹窗 -->
     <el-dialog :visible.sync="successDialogVisible" title="预约">
       <el-form ref="form" :model="form" label-width="80px">
@@ -156,7 +149,7 @@ export default {
     changeDate() {
       this.endTime = moment(this.queryParams.startTime).add(9, 'days')
     },
-
+    // 查询列表
     fetchStudioUseData() {
       // 调用接口获取录播室占用情况数据
       console.log(123654, this.queryParams);

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

@@ -2,8 +2,8 @@
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="86px">
             <el-form-item prop="dateRange">
-                <el-date-picker v-model="queryParams.dateRange" value-format="yyyy-MM-dd" type="datetimerange"
-                    range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+                <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="datetimerange" range-separator="至"
+                    start-placeholder="开始日期" end-placeholder="结束日期">
                 </el-date-picker>
             </el-form-item>
             <el-form-item prop="appointmentUserName">
@@ -24,10 +24,10 @@
             <el-table-column label="预约人" align="center" prop="appointmentUserName" />
             <el-table-column label="申请时间" align="center" min-width="200px" prop="applyTime" />
             <el-table-column label="状态" align="center" min-width="200px" prop="statu">
-                    <template slot-scope="{ row }">
-                        {{ row.statu == '1' ? "预约成功" : row.statu == '2' ? "已取消" : "" }}
-                    </template>
-                </el-table-column>   
+                <template slot-scope="{ row }">
+                    {{ row.statu == '1' ? "预约成功" : row.statu == '2' ? "已取消" : "" }}
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">详情
@@ -98,6 +98,7 @@ export default {
             dateRange: [],
             // 模糊搜索
             queryParams: {
+                dateRange: [],
                 appointmentUserName: "",
             },
             // 加载遮罩
@@ -137,7 +138,13 @@ export default {
         // 获取列表
         getList() {
             this.loading = true;
-            listStuditor(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+            const params = {
+                appointmentUserName: this.queryParams.appointmentUserName,
+                startTime: this.dateRange[0],
+                endTime: this.dateRange[1],
+            };
+            console.log(123, params);
+            listStuditor(params).then(response => {
                 this.studioList = response.rows;
                 this.total = response.total;
                 this.loading = false;