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="leadershipName" align="center" />
             <el-table-column label="备注" prop="remark" align="center" />
             <el-table-column label="备注" prop="remark" align="center" />
             <el-table-column label="填报时间" prop="tbTime" 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">
             <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
 
 
@@ -193,6 +200,7 @@ export default {
         handleLook(row) {
         handleLook(row) {
             const id = row.id || this.ids
             const id = row.id || this.ids
             depBudget(id).then(response => {
             depBudget(id).then(response => {
+                console.log('response', response);
                 this.lookTable = response.data.schoolDepartmentBudgetProjectmxList;
                 this.lookTable = response.data.schoolDepartmentBudgetProjectmxList;
                 this.form.year = response.data.year;
                 this.form.year = response.data.year;
                 this.form.deptName = response.data.deptName;
                 this.form.deptName = response.data.deptName;
@@ -207,8 +215,7 @@ export default {
 
 
             })
             })
         },
         },
-
-
+       
 
 
         // 重置
         // 重置
         reset() {
         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="projectName" label="项目名称" align="center" />
                     <el-table-column prop="content" label="申报政策依据、理由及主要内容" width="300" 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="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="applyMoney" align="center" width="200" />
                     <el-table-column label="备注" prop="remark" align="center" width="200" />
                     <el-table-column label="备注" prop="remark" align="center" width="200" />
                 </el-table>
                 </el-table>
                 <el-row style="margin-top: 15px;margin-left: 20px;">
                 <el-row style="margin-top: 15px;margin-left: 20px;">
                     <el-col :span="14">
                     <el-col :span="14">
                         <span class="uploadname" style="font-size: 16px;font-weight: bold;">填报人:
                         <span class="uploadname" style="font-size: 16px;font-weight: bold;">填报人:
-                            <!-- <img v-if="jlqztp" :src="jlqztp">
-                        <span v-else>{{ jlmc }}</span> -->
+                            {{ form.informant }}
                         </span>
                         </span>
                     </el-col>
                     </el-col>
                     <el-col :span="10">
                     <el-col :span="10">
                         <span class="uploadname" style="font-size: 16px;font-weight: bold;">分管领导:
                         <span class="uploadname" style="font-size: 16px;font-weight: bold;">分管领导:
-                            <!-- <img v-if="sjqztp" :src="sjqztp">
-                        <span v-else>{{ sjmc }}</span> -->
+                            {{ form.leadershipName }}
                         </span>
                         </span>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
@@ -212,31 +214,56 @@ export default {
             this.handleQuery();
             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) {
         handleLook(row) {
             this.openLook = true;
             this.openLook = true;
-            const id = row.id || this.ids
+            const id = row.id || this.ids;
             depBudget(id).then(response => {
             depBudget(id).then(response => {
                 console.log(222, response.data);
                 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.year = response.data.year;
                 this.form.deptName = response.data.deptName;
                 this.form.deptName = response.data.deptName;
-                this.$modal.closeLoading();
+                this.form.informant = response.data.informant;
+                this.form.leadershipName = response.data.leadershipName;
             }).catch(err => {
             }).catch(err => {
-
-            })
+                // 错误处理
+            });
         },
         },
 
 
 
 
 
 
+
         // 重置
         // 重置
         reset() {
         reset() {
             this.postForm = {
             this.postForm = {
@@ -261,9 +288,9 @@ export default {
         },
         },
         // 导出
         // 导出
         handleExport() {
         handleExport() {
-            this.download('monitor/job/export', {
+            this.download('/departmentBudgetProjectmx/export', {
                 ...this.queryParams
                 ...this.queryParams
-            }, `job_${Date.now()}.xlsx`)
+            }, `科室预算查看_${Date.now()}.xlsx`)
         }
         }
 
 
 
 

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

+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="报修单号">
+                <el-input v-model="queryParams.id" placeholder="请输入报修单号" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="报修时间" prop="repairsTime">
+                <el-date-picker v-model="queryParams.repairsTime" type="datetime" placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd HH:mm:ss" clearable>
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item label="维修状态" prop="maintainState">
+                <el-select v-model="queryParams.maintainState" placeholder="维修状态" clearable>
+                    <el-option v-for="dict in dict.type.
+                        maintain_state" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                    v-hasPermi="['system:application:add']">新增
+                </el-button>
+            </el-col>
+        </el-row>
+        <!-- 表格数据 -->
+        <el-table :data="applyTable" border style="width: 100%" :header-cell-style="{ background: '#f6f9fe' }">
+            <el-table-column align="center" type="index" label="序号" width="80px " />
+            <el-table-column align="center" prop="id" label="报修单号" />
+            <el-table-column align="center" prop="repairsName" label="报修人" />
+            <el-table-column align="center" prop="phone" label="联系方式" />
+            <el-table-column align="center" prop="repairsTime" label="报修时间" />
+            <el-table-column align="center" prop="failureEquipment" label="故障设备" />
+            <el-table-column align="center" prop="failureEquipmentArea" label="设备地点" />
+            <el-table-column align="center" prop="failureEquipmentDescribe" label="故障描述" />
+            <el-table-column align="center" prop="maintainResult" label="维修结果" />
+            <el-table-column align="center" prop="maintainState" label="维修状态">
+                <template slot-scope="{ row }">
+                    {{ row.maintainState == 1 ? "未接单" : row.maintainState == 2 ? "维修中" : "已维修 " }}
+                </template>
+            </el-table-column>
+
+            <el-table-column label="操作" width="180px" align="center" fixed="right" class-name="small-padding fixed-width">
+                <template slot-scope="{ row }">
+                    <div v-if="row.maintainState === 3">
+                        <el-button size="mini" type="text" icon="el-icon-search" @click="handleLook(row)">
+                            查看
+                        </el-button>
+                    </div>
+                    <div v-else-if="row.maintainState === 1">
+                        <el-button size="mini" type="text" icon="el-icon-search" @click="handleLook(row)">
+                            查看
+                        </el-button>
+                        <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(row)"
+                            v-hasPermi="['system:application:remove']">
+                            修改
+                        </el-button>
+                        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(row)"
+                            v-hasPermi="['system:application:remove']">
+                            删除
+                        </el-button>
+                    </div>
+                    <div v-else>
+                        <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="submitApply(row)"
+                            v-hasPermi="['system:application:edit']">
+                            反馈结果
+                        </el-button>
+                        <el-button size="mini" type="text" icon="el-icon-search" @click="handleLook(row)">
+                            查看
+                        </el-button>
+                    </div>
+                </template>
+
+
+            </el-table-column>
+
+        </el-table>
+
+        <!-- 新增/修改对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body @close="cancel">
+            <el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="报修单号" prop="id">
+                            <el-input v-model="postForm.id" placeholder="报修单号"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="报修人" prop="repairsName">
+                            <el-input v-model="postForm.repairsName" placeholder="报修人"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="联系方式" prop="phone">
+                            <el-input v-model="postForm.phone" placeholder="联系方式"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="报修时间" prop="repairsTime">
+                            <el-date-picker v-model="postForm.repairsTime" type="datetime" placeholder="选择日期时间"
+                                value-format="yyyy-MM-dd HH:mm:ss" :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="故障设备" prop="failureEquipment">
+                            <el-input v-model="postForm.failureEquipment" placeholder="故障设备"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="故障设备地点" prop="failureEquipmentArea">
+                            <el-input v-model="postForm.failureEquipmentArea" placeholder="故障设备地点"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="故障描述" prop="failureEquipmentDescribe">
+                            <el-input type="textarea" v-model="postForm.failureEquipmentDescribe"
+                                placeholder="故障描述"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div style="text-align: center">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+
+        </el-dialog>
+        <!-- 查看对话框 -->
+
+        <el-dialog :title="title" :visible.sync="openLook" width="1200px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="维修人" prop="maintainName">
+                            <el-input v-model="form.maintainName" placeholder="维修人"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="维修人联系方式" prop="maintainPhone">
+                            <el-input v-model="form.maintainPhone" placeholder="维修人联系方式"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="维修结果" prop="maintainResult">
+                            <el-input v-model="form.maintainResult" placeholder="保修结果"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="评价" prop="phevaluateone">
+                            <el-rate v-model="form.evaluate" :max="5"></el-rate>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="报修单号" prop="id">
+                            <el-input v-model="form.id" placeholder="报修单号"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="报修人" prop="repairsName">
+                            <el-input v-model="form.repairsName" placeholder="报修人"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="联系方式" prop="phone">
+                            <el-input v-model="form.phone" placeholder="联系方式"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="报修时间" prop="repairsTime">
+                            <el-date-picker v-model="form.repairsTime" type="datetime" placeholder="选择日期时间"
+                                value-format="yyyy-MM-dd HH:mm:ss" :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="故障设备" prop="failureEquipment">
+                            <el-input v-model="form.failureEquipment" placeholder="故障设备"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="故障设备地点" prop="failureEquipmentArea">
+                            <el-input v-model="form.failureEquipmentArea" placeholder="故障设备地点"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="故障描述" prop="failureEquipmentDescribe">
+                            <el-input type="textarea" v-model="form.failureEquipmentDescribe" placeholder="故障描述"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- </div> -->
+            </el-form>
+            <div style="text-align: center">
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+
+
+
+
+        <!--反馈结果对话框 -->
+
+        <el-dialog :title="title" :visible.sync="openfk" width="1100px" append-to-body @close="cancel">
+            <el-form ref="formfk" :model="formfk" :rules="rules" label-width="100px">
+                <el-form-item label="报修单号" prop="id">
+                    <el-input v-model="formfk.id" placeholder="报修单号"></el-input>
+                </el-form-item>
+                <el-form-item class="hidden-item" label="" prop="maintainState">
+                    <el-input v-model="formfk.maintainState" placeholder="维修状态"></el-input>
+                </el-form-item>
+
+                <el-form-item label="报修结果" prop="maintainResult">
+                    <el-input v-model="formfk.maintainResult" placeholder="报修结果"></el-input>
+                </el-form-item>
+                <el-form-item label="评价" prop="phevaluateone">
+                    <el-rate v-model="formfk.evaluate" :max="5"></el-rate>
+                </el-form-item>
+
+            </el-form>
+            <div style="text-align: center">
+                <el-button type="primary" @click="submitFormfk">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+
+        </el-dialog>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
+            @pagination="getList"></pagination>
+
+
+    </div>
+</template>
+
+<script>
+import {
+    listRepairs,// 查询报修列表
+    addRepairs,// 新增报修信息
+    getRepairs,// 查询报修信息详情
+    updateRepairs, // 修改报修信息
+    delRepairs,// 删除报修信息
+    submitRepairs,//反馈结果接口
+    numberRepairs,//获取报修单号
+
+} from "@/api/smartSchool/personWork/logisticsWarranty";
+
+
+export default {
+    name: 'logisticsWarranty',
+    dicts: ['maintain_state'],
+    data() {
+
+        return {
+            maintainState: '',
+            queryParams: {
+                id: "",
+                repairsTime: "",
+                maintainState: "",
+            },
+            // 表格数据
+            applyTable: [],
+            // 查询表单
+            queryForm: {
+
+                pageNum: 1,
+                pageSize: 10,
+
+
+            },
+
+
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 是否只读
+            readonly: false,
+            // 多个禁用
+            multi: false,
+            // 显示搜索条件
+            showSearch: true,
+            // 信息列表
+            infoList: [],
+            // 数据总数
+            total: 0,
+
+            // 新增/修改表单
+            postForm: {
+
+
+
+
+
+
+            },
+            // 反馈结果
+            formfk: {
+                id: "",
+                maintainResult: "",
+                maintainState: "3",
+                evaluate: "",
+            },
+            // 是否显示新增弹出层
+            open: false,
+            // 查看对话框
+            openLook: false,
+            // 反馈对话框
+            openfk: false,
+            // // 表单校验
+            rules: {
+
+                phone: [
+                    { required: true, message: "联系方式不能为空", trigger: "blur" }
+                ],
+
+                repairsTime: [
+                    { required: true, message: "保修时间不能为空", trigger: "blur" }
+                ],
+                failureEquipment: [
+                    { required: true, message: "故障设备不能为空", trigger: "blur" }
+                ],
+                failureEquipmentArea: [
+                    { required: true, message: "故障设备地点不能为空", trigger: "blur" }
+                ],
+                failureEquipmentDescribe: [
+                    { required: true, message: "故障设备描述", trigger: "blur" }
+                ],
+
+            },
+            // 弹出层标题
+            title: '',
+            form: {
+                id: "",
+                maintainResult: "",
+                evaluate: "",
+            }
+
+        }
+    },
+    mounted() {
+        this.formfk.evaluate = 5;
+
+    },
+
+    created() {
+        this.getList();
+
+    },
+    methods: {
+        /** 获取列表数据 */
+        getList() {
+            listRepairs(this.queryParams).then(response => {
+                this.loading = false;
+                this.applyTable = response.rows;
+
+                console.log('this.applyTable', this.applyTable);
+                this.total = response.total;
+            }).catch(err => {
+                this.loading = false;
+            })
+        },
+
+
+        // 搜索按钮
+        handleQuery() {
+            this.throttle(() => {
+                this.queryForm.pageNum = 1;
+                this.getList();
+            })
+        },
+        /** 查看 */
+        handleLook(row) {
+            this.form = row;
+            const id = row.id || this.ids;
+            getRepairs(id).then(response => {
+                this.form = response.data;
+                console.log('this.form', this.form);
+                this.openLook = true;
+            }).catch(err => {
+
+            })
+            this.title = "查看报修情况";
+        },
+        // 重置按钮
+        resetQuery() {
+            this.queryParams = {
+                id: "",
+                repairsTime: null,
+                pageNum: 1,
+                pageSize: 10,
+            }
+
+            this.handleQuery(); // 重新发一次请求
+        },
+        // 新增按钮操作
+        handleAdd() {
+            this.reset();
+            numberRepairs().then((response) => {
+                this.postForm.id = response.data.id;
+                console.log('this.postForm.id', this.postForm.id);
+                this.postForm.repairsName = this.$store.state.user.name;
+                this.postForm.phone = this.$store.state.user.teacher.teacherTel;
+                console.log(123, this.postForm.repairsName);
+                console.log(123, this.postForm.phone);
+                // 设置 isNew 为 true，表示当前是新增操作
+                this.isNew = true;
+                this.open = true;
+                this.title = "添加申请";
+            });
+        },
+
+        // 修改按钮操作
+        handleUpdate(row) {
+            const id = row.id || this.ids;
+            this.title = "修改申请";
+            getRepairs(id).then(response => {
+                this.postForm = response.data;
+                this.open = true;
+            }).catch(err => {
+
+            })
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除"' + ids + '"的数据项？').then(function () {
+                return delRepairs(ids);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+
+        // 提交表单
+        submitForm() {
+            this.throttle(() => {
+                this.$refs["postForm"].validate(valid => {
+                    if (valid) {
+                        this.$modal.loading('正在上传数据，请稍等...');
+                        if (this.isNew) {
+                            // 新增操作
+                            addRepairs(this.postForm).then(response => {
+                                this.$modal.closeLoading();
+                                this.$modal.msgSuccess("新增成功");
+                                this.open = false;
+                                this.getList();
+                            }).catch(err => {
+                                this.$modal.closeLoading();
+                            });
+                        } else {
+                            // 修改操作
+                            updateRepairs(this.postForm).then(response => {
+                                this.$modal.closeLoading();
+                                this.$modal.msgSuccess("修改成功");
+                                this.open = false;
+                                this.getList();
+                            }).catch(err => {
+                                this.$modal.closeLoading();
+                            });
+                        }
+                    }
+                });
+            })
+        },
+        // 反馈结果按钮
+        submitFormfk() {
+            this.$refs.formfk.validate((valid) => {
+                if (valid) {
+                    const newObj = {};
+                    newObj.id = this.formfk.id;
+                    newObj.maintainResult = this.formfk.maintainResult;
+                    newObj.maintainState = this.formfk.maintainState;
+                    newObj.evaluate = this.formfk.evaluate;
+                    console.log('newObj', newObj);
+                    console.log(newObj.maintainState);
+                    submitRepairs(newObj)
+                        .then((response) => {
+                            this.$modal.msgSuccess("反馈成功");
+                            this.openfk = false;
+                            this.formfk.maintainResult = '';
+                            this.getList();
+                        })
+                        .catch((error) => {
+                            // 处理错误
+                        });
+                } else {
+                    return false;
+                }
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.openLook = false;
+            this.openfk = false;
+            // this.resetQuery();
+            this.reset();
+        },
+
+        reset() {
+            // 这里需要重置对话框表单
+            this.postForm = {
+
+            };
+            this.resetForm('postForm');
+        },
+
+
+
+        // 反馈结果
+        submitApply(row) {
+            const id = row.id || this.ids;
+            getRepairs(id).then(response => {
+                this.formfk.id = response.data.id;
+                console.log('this.form', this.form);
+                this.openfk = true;
+                this.formfk.maintainResult = '';
+                this.title = "反馈结果";
+
+            })
+
+        },
+
+    }
+}
+</script>
+
+<style>
+.hidden-item {
+    display: none;
+}
+</style>

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

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

+<template>
+    <div class="" style="padding:15px 10px 0 10px">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" style="padding:0 0 0 0" size="small">
+            <el-form-item prop="awardName">
+                <el-input v-model="queryParams.awardName" placeholder="获奖名称" clearable />
+            </el-form-item>
+            <el-form-item prop="awardTime">
+                <el-date-picker v-model="queryParams.awardTime" type="date" value-format="yyyy-MM-dd" placeholder="获奖时间"
+                    clearable>
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="gradeOfAward">
+                <el-select v-model="queryParams.gradeOfAward" placeholder="获奖等级" clearable>
+                    <el-option v-for="dict in dict.type.
+                        grade_type1" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="licenseIssuingAuthority">
+                <el-input v-model="queryParams.licenseIssuingAuthority" placeholder="发证机关" clearable />
+            </el-form-item>
+
+            <el-form-item>
+                <el-button type="primary" size="mini" plain icon="el-icon-plus" @click="handleAdd"> 新增 </el-button>
+                <el-button icon="el-icon-search" type="primary" size="mini" @click="getList">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-table :data="tableData">
+            <el-table-column prop="lesson" label="序号" width="60" align="center" style="height: 20px;" type="index">
+            </el-table-column>
+            <el-table-column prop="awardName" label="获奖名称" align="center">
+            </el-table-column>
+            <el-table-column label="获奖时间" align="center" prop="awardTime">
+            </el-table-column>
+            <el-table-column label="获奖等级" align="center" prop="gradeOfAward">
+                <template slot-scope="{ row }">
+                    {{ row.gradeOfAward == 1 ? "一等奖" : row.gradeOfAward == 2 ? "二等奖" : "三等奖" }}
+                </template>
+            </el-table-column>
+            <el-table-column label="发证机关" align="center" prop="licenseIssuingAuthority">
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleLook(scope.row)">查看
+                    </el-button>
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:device:remove']">修改
+                    </el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:device:remove']">删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList" /> -->
+        <!-- 新增/修改弹窗 -->
+        <el-dialog :title="title" :visible.sync="open" width="1200px">
+            <el-form ref="form" :model="form" label-width="114px" :rules="rules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="获奖名称" prop="awardName">
+                            <el-input v-model="form.awardName" :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="获奖时间：" prop="awardTime">
+                            <el-date-picker v-model="form.awardTime" type="date" placeholder="选择获奖时间"
+                                :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="获奖等级">
+                            <el-select v-model="queryParams.gradeOfAward" placeholder="获奖等级" clearable>
+                                <el-option v-for="dict in dict.type.
+                                    grade_type1" :key="dict.value" :label="dict.label" :value="dict.value" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="发证机关">
+                            <el-input v-model="form.licenseIssuingAuthority" :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="16">
+                        <el-form-item label="附件 :" prop="url">
+                            <FilepersonUploadNew @input="getFileList" :value="fileList"></FilepersonUploadNew>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+            </el-form>
+            <div slot="footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancle">取 消</el-button>
+            </div>
+        </el-dialog>
+        <!-- 查看弹窗 -->
+        <el-dialog :title="title" :visible.sync="openLook" width="1200px">
+            <el-form ref="form" :model="form" label-width="114px" :rules="rules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="获奖名称" prop="awardName">
+                            <el-input v-model="form.awardName" :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="获奖时间：" prop="awardTime">
+                            <el-date-picker v-model="form.awardTime" type="date" placeholder="选择获奖时间"
+                                :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="获奖等级">
+                            <el-select v-model="form.gradeOfAward" placeholder="获奖等级" :style="{ width: '100%' }">
+                                <el-option label="一等奖" value="1"></el-option>
+                                <el-option label="二等奖" value="2"></el-option>
+                                <el-option label="三等奖" value="3"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="发证机关">
+                            <el-input v-model="form.licenseIssuingAuthority" :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="附件 :">
+                            <li class="el-upload-list__item ele-upload-list__item-content" v-for="file in fileList"
+                                :key="file.id">
+                                <el-link :href="`${file.accessoryUrl}`" :underline="false" target="_blank">
+                                    <span class="el-icon-document"> {{ file.accessoryName }} </span>
+                                </el-link>
+                            </li>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer">
+
+                <el-button @click="cancle">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    addAward, // 新增获奖情况
+    getAward,//查询获奖情况列表
+    updateaAward,  // 修改获奖情况
+    delAward,// 删除获奖情况
+    listAward,// 查询获奖情况详情
+
+} from "@/api/smartSchool/personWork/businessAwards";
+import FilepersonUploadNew from "@/components/FilepersonUploadNew";
+export default {
+    name: 'businessAwards',
+    dicts: ['grade_type1'],
+
+    components: {
+        FilepersonUploadNew,
+    },
+    data() {
+        return {
+            fileList: [],
+            queryParams: {
+                awardName: "",
+                awardTime: "",
+                gradeOfAward: "",
+                licenseIssuingAuthority: "",
+
+            },
+            title: "",
+            rules: {
+
+            },
+            // 查看表格
+            lookTable: [],
+            tableData: [],
+            options: [
+                { value: '1', label: '启用' },
+                { value: '2', label: '禁用' },
+            ],
+            form: {
+                awardName: "",
+                awardTime: "",
+                gradeOfAward: "",
+                licenseIssuingAuthority: "",
+
+            },
+            open: false,
+            openLook: false,
+            total: 0,
+        }
+    },
+
+    created() {
+        this.getList();
+    },
+
+
+    methods: {
+        /** 查询 */
+        getList() {
+            getAward(this.queryParams).then((response) => {
+                this.tableData = response.rows;
+                this.loading = false;
+                console.log(111, response.rows);
+
+            });
+        },
+        // 重置
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.getList();
+        },
+
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            const id = row.id || this.ids;
+            listAward(id).then(response => {
+                this.form = response.data;
+                this.fileList = response.data.schoolAccessoryList.map(item => {
+                    return {
+                        name: item.accessoryName,
+                        url: item.accessoryUrl,
+                    }
+                })
+                this.schoolAccessoryList = response.data.schoolAccessoryList;
+                this.open = true;
+                this.title = "修改任务";
+            });
+        },
+
+        // 附件上传回调函数
+        getFileList(data) {
+            console.log('getFileList', data)
+            // this.form.files = data
+            this.schoolAccessoryList = data.map(item => {
+                return {
+                    "accessoryUrl": item.url,
+                    "accessoryName": item.name
+                }
+            })
+            console.log('schoolAccessoryList', this.schoolAccessoryList)
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.id !== undefined) {
+                        const newObj = {};
+                        newObj.id = this.form.id;
+                        newObj.awardName = this.form.awardName;
+                        newObj.awardTime = this.form.awardTime;
+                        newObj.gradeOfAward = this.form.gradeOfAward;
+                        newObj.licenseIssuingAuthority = this.form.licenseIssuingAuthority;
+                        //附件列表
+                        newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
+                            return {
+                                "accessoryUrl": item.accessoryUrl,
+                                "accessoryName": item.accessoryName
+                            }
+                        });
+                        updateaAward(newObj).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        const newObj = {};
+                        newObj.id = this.form.id;
+                        newObj.awardName = this.form.awardName;
+                        newObj.awardTime = this.form.awardTime;
+                        newObj.gradeOfAward = this.form.gradeOfAward;
+                        newObj.licenseIssuingAuthority = this.form.licenseIssuingAuthority;
+                        //附件列表
+                        newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
+                            return {
+                                "accessoryUrl": item.accessoryUrl,
+                                "accessoryName": item.accessoryName
+                            }
+                        });
+                        addAward(newObj).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除"' + ids + '"的数据项？').then(function () {
+                return delAward(ids);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+        /** 查看 */
+        handleLook(row) {
+            this.form = row;
+            this.openLook = true;
+            const id = row.id || this.ids;
+            listAward(id).then((response) => {
+                this.form = response.data;
+                console.log('this.form ', this.form);
+                this.fileList = response.data.schoolAccessoryList;
+                console.log('this.fileList', this.fileList);
+            });
+            this.title = "查看业务获奖情况";
+        },
+        //新增按钮操作
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "新增业务获奖情况";
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                awardName: null,
+                awardTime: null,
+                gradeOfAward: null,
+                licenseIssuingAuthority: null,
+
+            };
+            this.fileList = [];
+            this.resetForm("form");
+        },
+        cancle() {
+            this.open = false;
+            this.openLook = false
+        }
+    },
+
+}
+</script>
+
+<style scoped></style>
+

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

+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="报修单号">
+                <el-input v-model="queryParams.id" placeholder="请输入报修单号" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="报修时间" prop="repairsTime">
+                <el-date-picker v-model="queryParams.repairsTime" type="datetime" placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd HH:mm:ss" clearable>
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item label="维修状态" prop="maintainState">
+                <el-select v-model="queryParams.maintainState" placeholder="维修状态" clearable>
+                    <el-option v-for="dict in dict.type.
+                        maintain_state" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                    v-hasPermi="['system:application:add']">新增
+                </el-button>
+            </el-col>
+        </el-row>
+        <!-- 表格数据 -->
+        <el-table :data="applyTable" border style="width: 100%" :header-cell-style="{ background: '#f6f9fe' }">
+            <el-table-column align="center" type="index" label="序号" width="80px " />
+            <el-table-column align="center" prop="id" label="报修单号" />
+            <el-table-column align="center" prop="repairsName" label="报修人" />
+            <el-table-column align="center" prop="phone" label="联系方式" />
+            <el-table-column align="center" prop="repairsTime" label="报修时间" />
+            <el-table-column align="center" prop="failureEquipment" label="故障设备" />
+            <el-table-column align="center" prop="failureEquipmentArea" label="设备地点" />
+            <el-table-column align="center" prop="failureEquipmentDescribe" label="故障描述" />
+            <el-table-column align="center" prop="maintainResult" label="维修结果" />
+            <el-table-column align="center" prop="maintainState" label="维修状态">
+                <template slot-scope="{ row }">
+                    {{ row.maintainState == 1 ? "未接单" : row.maintainState == 2 ? "维修中" : "已维修 " }}
+                </template>
+            </el-table-column>
+
+            <el-table-column label="操作" width="180px" align="center" fixed="right" class-name="small-padding fixed-width">
+                <template slot-scope="{ row }">
+                    <div v-if="row.maintainState === 3">
+                        <el-button size="mini" type="text" icon="el-icon-search" @click="handleLook(row)">
+                            查看
+                        </el-button>
+                    </div>
+                    <div v-else-if="row.maintainState === 1">
+                        <el-button size="mini" type="text" icon="el-icon-search" @click="handleLook(row)">
+                            查看
+                        </el-button>
+                        <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(row)"
+                            v-hasPermi="['system:application:remove']">
+                            修改
+                        </el-button>
+                        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(row)"
+                            v-hasPermi="['system:application:remove']">
+                            删除
+                        </el-button>
+                    </div>
+                    <div v-else>
+                        <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="submitApply(row)"
+                            v-hasPermi="['system:application:edit']">
+                            反馈结果
+                        </el-button>
+                        <el-button size="mini" type="text" icon="el-icon-search" @click="handleLook(row)">
+                            查看
+                        </el-button>
+                    </div>
+                </template>
+
+
+            </el-table-column>
+
+        </el-table>
+
+        <!-- 新增/修改对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body @close="cancel">
+            <el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="报修单号" prop="id">
+                            <el-input v-model="postForm.id" placeholder="报修单号"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="报修人" prop="repairsName">
+                            <el-input v-model="postForm.repairsName" placeholder="报修人"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="联系方式" prop="phone">
+                            <el-input v-model="postForm.phone" placeholder="联系方式"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="报修时间" prop="repairsTime">
+                            <el-date-picker v-model="postForm.repairsTime" type="datetime" placeholder="选择日期时间"
+                                value-format="yyyy-MM-dd HH:mm:ss" :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="故障设备" prop="failureEquipment">
+                            <el-input v-model="postForm.failureEquipment" placeholder="故障设备"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="故障设备地点" prop="failureEquipmentArea">
+                            <el-input v-model="postForm.failureEquipmentArea" placeholder="故障设备地点"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="故障描述" prop="failureEquipmentDescribe">
+                            <el-input type="textarea" v-model="postForm.failureEquipmentDescribe"
+                                placeholder="故障描述"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div style="text-align: center">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+
+        </el-dialog>
+        <!-- 查看对话框 -->
+
+        <el-dialog :title="title" :visible.sync="openLook" width="1200px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="维修人" prop="maintainName">
+                            <el-input v-model="form.maintainName" placeholder="维修人"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="维修人联系方式" prop="maintainPhone">
+                            <el-input v-model="form.maintainPhone" placeholder="维修人联系方式"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="维修结果" prop="maintainResult">
+                            <el-input v-model="form.maintainResult" placeholder="保修结果"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="评价" prop="phevaluateone">
+                            <el-rate v-model="form.evaluate" :max="5"></el-rate>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="报修单号" prop="id">
+                            <el-input v-model="form.id" placeholder="报修单号"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="报修人" prop="repairsName">
+                            <el-input v-model="form.repairsName" placeholder="报修人"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="联系方式" prop="phone">
+                            <el-input v-model="form.phone" placeholder="联系方式"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="报修时间" prop="repairsTime">
+                            <el-date-picker v-model="form.repairsTime" type="datetime" placeholder="选择日期时间"
+                                value-format="yyyy-MM-dd HH:mm:ss" :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="故障设备" prop="failureEquipment">
+                            <el-input v-model="form.failureEquipment" placeholder="故障设备"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="故障设备地点" prop="failureEquipmentArea">
+                            <el-input v-model="form.failureEquipmentArea" placeholder="故障设备地点"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="故障描述" prop="failureEquipmentDescribe">
+                            <el-input type="textarea" v-model="form.failureEquipmentDescribe" placeholder="故障描述"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <!-- </div> -->
+            </el-form>
+            <div style="text-align: center">
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+
+
+
+
+        <!--反馈结果对话框 -->
+
+        <el-dialog :title="title" :visible.sync="openfk" width="1100px" append-to-body @close="cancel">
+            <el-form ref="formfk" :model="formfk" :rules="rules" label-width="100px">
+                <el-form-item label="报修单号" prop="id">
+                    <el-input v-model="formfk.id" placeholder="报修单号"></el-input>
+                </el-form-item>
+                <el-form-item class="hidden-item" label="" prop="maintainState">
+                    <el-input v-model="formfk.maintainState" placeholder="维修状态"></el-input>
+                </el-form-item>
+
+                <el-form-item label="报修结果" prop="maintainResult">
+                    <el-input v-model="formfk.maintainResult" placeholder="报修结果"></el-input>
+                </el-form-item>
+                <el-form-item label="评价" prop="phevaluateone">
+                    <el-rate v-model="formfk.evaluate" :max="5"></el-rate>
+                </el-form-item>
+
+            </el-form>
+            <div style="text-align: center">
+                <el-button type="primary" @click="submitFormfk">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+
+        </el-dialog>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
+            @pagination="getList"></pagination>
+
+
+    </div>
+</template>
+
+<script>
+import {
+    listRepairs,// 查询报修列表
+    addRepairs,// 新增报修信息
+    getRepairs,// 查询报修信息详情
+    updateRepairs, // 修改报修信息
+    delRepairs,// 删除报修信息
+    submitRepairs,//反馈结果接口
+    numberRepairs,//获取报修单号
+
+} from "@/api/smartSchool/personWork/logisticsWarranty";
+
+
+export default {
+    name: 'logisticsWarranty',
+    dicts: ['maintain_state'],
+    data() {
+
+        return {
+            maintainState: '',
+            queryParams: {
+                id: "",
+                repairsTime: "",
+                maintainState: "",
+            },
+            // 表格数据
+            applyTable: [],
+            // 查询表单
+            queryForm: {
+
+                pageNum: 1,
+                pageSize: 10,
+
+
+            },
+
+
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 是否只读
+            readonly: false,
+            // 多个禁用
+            multi: false,
+            // 显示搜索条件
+            showSearch: true,
+            // 信息列表
+            infoList: [],
+            // 数据总数
+            total: 0,
+
+            // 新增/修改表单
+            postForm: {
+
+
+
+
+
+
+            },
+            // 反馈结果
+            formfk: {
+                id: "",
+                maintainResult: "",
+                maintainState: "3",
+                evaluate: "",
+            },
+            // 是否显示新增弹出层
+            open: false,
+            // 查看对话框
+            openLook: false,
+            // 反馈对话框
+            openfk: false,
+            // // 表单校验
+            rules: {
+
+                phone: [
+                    { required: true, message: "联系方式不能为空", trigger: "blur" }
+                ],
+
+                repairsTime: [
+                    { required: true, message: "保修时间不能为空", trigger: "blur" }
+                ],
+                failureEquipment: [
+                    { required: true, message: "故障设备不能为空", trigger: "blur" }
+                ],
+                failureEquipmentArea: [
+                    { required: true, message: "故障设备地点不能为空", trigger: "blur" }
+                ],
+                failureEquipmentDescribe: [
+                    { required: true, message: "故障设备描述", trigger: "blur" }
+                ],
+
+            },
+            // 弹出层标题
+            title: '',
+            form: {
+                id: "",
+                maintainResult: "",
+                evaluate: "",
+            }
+
+        }
+    },
+    mounted() {
+        this.formfk.evaluate = 5;
+
+    },
+
+    created() {
+        this.getList();
+
+    },
+    methods: {
+        /** 获取列表数据 */
+        getList() {
+            listRepairs(this.queryParams).then(response => {
+                this.loading = false;
+                this.applyTable = response.rows;
+
+                console.log('this.applyTable', this.applyTable);
+                this.total = response.total;
+            }).catch(err => {
+                this.loading = false;
+            })
+        },
+
+
+        // 搜索按钮
+        handleQuery() {
+            this.throttle(() => {
+                this.queryForm.pageNum = 1;
+                this.getList();
+            })
+        },
+        /** 查看 */
+        handleLook(row) {
+            this.form = row;
+            const id = row.id || this.ids;
+            getRepairs(id).then(response => {
+                this.form = response.data;
+                console.log('this.form', this.form);
+                this.openLook = true;
+            }).catch(err => {
+
+            })
+            this.title = "查看报修情况";
+        },
+        // 重置按钮
+        resetQuery() {
+            this.queryParams = {
+                id: "",
+                repairsTime: null,
+                pageNum: 1,
+                pageSize: 10,
+            }
+
+            this.handleQuery(); // 重新发一次请求
+        },
+        // 新增按钮操作
+        handleAdd() {
+            this.reset();
+            numberRepairs().then((response) => {
+                this.postForm.id = response.data.id;
+                console.log('this.postForm.id', this.postForm.id);
+                this.postForm.repairsName = this.$store.state.user.name;
+                this.postForm.phone = this.$store.state.user.teacher.teacherTel;
+                console.log(123, this.postForm.repairsName);
+                console.log(123, this.postForm.phone);
+                // 设置 isNew 为 true，表示当前是新增操作
+                this.isNew = true;
+                this.open = true;
+                this.title = "添加申请";
+            });
+        },
+
+        // 修改按钮操作
+        handleUpdate(row) {
+            const id = row.id || this.ids;
+            this.title = "修改申请";
+            getRepairs(id).then(response => {
+                this.postForm = response.data;
+                this.open = true;
+            }).catch(err => {
+
+            })
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除"' + ids + '"的数据项？').then(function () {
+                return delRepairs(ids);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+
+        // 提交表单
+        submitForm() {
+            this.throttle(() => {
+                this.$refs["postForm"].validate(valid => {
+                    if (valid) {
+                        this.$modal.loading('正在上传数据，请稍等...');
+                        if (this.isNew) {
+                            // 新增操作
+                            addRepairs(this.postForm).then(response => {
+                                this.$modal.closeLoading();
+                                this.$modal.msgSuccess("新增成功");
+                                this.open = false;
+                                this.getList();
+                            }).catch(err => {
+                                this.$modal.closeLoading();
+                            });
+                        } else {
+                            // 修改操作
+                            updateRepairs(this.postForm).then(response => {
+                                this.$modal.closeLoading();
+                                this.$modal.msgSuccess("修改成功");
+                                this.open = false;
+                                this.getList();
+                            }).catch(err => {
+                                this.$modal.closeLoading();
+                            });
+                        }
+                    }
+                });
+            })
+        },
+        // 反馈结果按钮
+        submitFormfk() {
+            this.$refs.formfk.validate((valid) => {
+                if (valid) {
+                    const newObj = {};
+                    newObj.id = this.formfk.id;
+                    newObj.maintainResult = this.formfk.maintainResult;
+                    newObj.maintainState = this.formfk.maintainState;
+                    newObj.evaluate = this.formfk.evaluate;
+                    console.log('newObj', newObj);
+                    console.log(newObj.maintainState);
+                    submitRepairs(newObj)
+                        .then((response) => {
+                            this.$modal.msgSuccess("反馈成功");
+                            this.openfk = false;
+                            this.formfk.maintainResult = '';
+                            this.getList();
+                        })
+                        .catch((error) => {
+                            // 处理错误
+                        });
+                } else {
+                    return false;
+                }
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.openLook = false;
+            this.openfk = false;
+            // this.resetQuery();
+            this.reset();
+        },
+
+        reset() {
+            // 这里需要重置对话框表单
+            this.postForm = {
+
+            };
+            this.resetForm('postForm');
+        },
+
+
+
+        // 反馈结果
+        submitApply(row) {
+            const id = row.id || this.ids;
+            getRepairs(id).then(response => {
+                this.formfk.id = response.data.id;
+                console.log('this.form', this.form);
+                this.openfk = true;
+                this.formfk.maintainResult = '';
+                this.title = "反馈结果";
+
+            })
+
+        },
+
+    }
+}
+</script>
+
+<style>
+.hidden-item {
+    display: none;
+}
+</style>

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

+<template>
+    <div class="" style="padding:15px 10px 0 10px">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" style="padding:0 0 0 0" size="small">
+            <el-form-item prop="name">
+                <el-input v-model="queryParams.name" placeholder="名称" />
+            </el-form-item>
+            <el-form-item prop="publishTime">
+                <el-date-picker v-model="queryParams.publishTime" type="date" value-format="yyyy-MM-dd" placeholder="发表时间">
+                </el-date-picker>
+            </el-form-item>
+
+            <el-form-item>
+                <el-button type="primary" size="mini" plain icon="el-icon-plus" @click="handleAdd"> 新增 </el-button>
+                <el-button icon="el-icon-search" type="primary" size="mini" @click="getList">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-table :data="tableData">
+            <el-table-column prop="lesson" label="序号" width="60" align="center" style="height: 20px;" type="index">
+            </el-table-column>
+            <el-table-column prop="name" label="名称" align="center">
+            </el-table-column>
+            <el-table-column label="发表时间" align="center" prop="publishTime">
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleLook(scope.row)">查看
+                    </el-button>
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:device:remove']">修改
+                    </el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:device:remove']">删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList" /> -->
+        <!-- 新增/修改弹窗 -->
+        <el-dialog :title="title" :visible.sync="open" width="1200px">
+            <el-form ref="form" :model="form" label-width="114px" :rules="rules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="名称">
+                            <el-input v-model="form.name" :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="发表时间：" prop="publishTime">
+                            <el-date-picker v-model="form.publishTime" type="date" placeholder="选择发表时间"
+                                :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="16">
+                        <el-form-item label="附件 :" prop="url">
+                            <FilepersonUploadNew @input="getFileList" :value="fileList"></FilepersonUploadNew>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                </el-row>
+
+            </el-form>
+            <div slot="footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancle">取 消</el-button>
+            </div>
+        </el-dialog>
+        <!-- 查看弹窗 -->
+        <el-dialog :title="title" :visible.sync="openLook" width="1200px">
+            <el-form ref="form" :model="form" label-width="114px" :rules="rules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="名称">
+                            <el-input v-model="form.name" :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="发表时间：" prop="publishTime" :style="{ width: '100%' }">
+                            <el-date-picker v-model="form.publishTime" type="date" placeholder="选择发表时间">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-row>
+                        <el-col :span="10">
+                            <el-form-item label="附件 :">
+                                <li class="el-upload-list__item ele-upload-list__item-content" v-for="file in fileList"
+                                    :key="file.id">
+                                    <el-link :href="`${file.accessoryUrl}`" :underline="false" target="_blank">
+                                        <span class="el-icon-document"> {{ file.accessoryName }} </span>
+                                    </el-link>
+                                </li>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-row>
+
+            </el-form>
+            <div slot="footer">
+
+                <el-button @click="cancle">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    addMaterial, // 新增材料编写情况
+    getMaterial,// 查看材料编写情况列表
+    updateMaterial, // 修改材料编写情况
+    delMaterial,// 删除材料编写情况
+    listMaterial,// 查看材料编写详情
+
+} from "@/api/smartSchool/personWork/materialPreparation";
+import FilepersonUploadNew from "@/components/FilepersonUploadNew";
+export default {
+
+    name: 'materialPreparation',
+    components: {
+        FilepersonUploadNew,
+    },
+    data() {
+        return {
+            fileList: [],
+            queryParams: {
+                name: "",
+                publishTime: "",
+            },
+            title: "",
+            rules: {
+
+            },
+            // 附件
+            schoolAccessoryList: [],
+            // 查看表格
+            lookTable: [],
+            tableData: [],
+            options: [
+                // { value: '1', label: '启用' },
+                // { value: '2', label: '禁用' },
+            ],
+            form: {
+                name: "",
+                publishTime: "",
+
+            },
+            open: false,
+            openLook: false,
+            total: 0,
+        }
+    },
+
+    created() {
+        this.getList();
+    },
+
+
+    methods: {
+        /** 查询 */
+        getList() {
+            getMaterial(this.queryParams).then((response) => {
+                this.tableData = response.rows;
+                this.loading = false;
+                console.log(111, response.rows);
+
+            });
+        },
+        // 重置
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.getList();
+        },
+
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            const id = row.id || this.ids;
+            listMaterial(id).then(response => {
+                this.form = response.data;
+                this.fileList = response.data.schoolAccessoryList.map(item => {
+                    return {
+                        name: item.accessoryName,
+                        url: item.accessoryUrl,
+                    }
+                })
+                this.schoolAccessoryList = response.data.schoolAccessoryList;
+                console.log(this.fileList);
+                this.open = true;
+                this.title = "修改任务";
+            });
+        },
+
+        // 附件上传回调函数
+        getFileList(data) {
+            console.log('getFileList', data)
+            // this.form.files = data
+            this.schoolAccessoryList = data.map(item => {
+                return {
+                    "accessoryUrl": item.url,
+                    "accessoryName": item.name
+                }
+            })
+            console.log('schoolAccessoryList', this.schoolAccessoryList)
+        },
+
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.id !== undefined) {
+                        const newObj = {};
+                        newObj.id = this.form.id;
+                        newObj.name = this.form.name;
+                        newObj.publishTime = this.form.publishTime;
+                        //附件列表
+                        newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
+                            return {
+                                "accessoryUrl": item.accessoryUrl,
+                                "accessoryName": item.accessoryName
+                            }
+                        });
+                        updateMaterial(newObj).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        const newObj = {};
+                        newObj.name = this.form.name;
+                        newObj.publishTime = this.form.publishTime;
+                        //附件列表
+                        newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
+                            return {
+                                "accessoryUrl": item.accessoryUrl,
+                                "accessoryName": item.accessoryName
+                            }
+                        });
+                        addMaterial(newObj).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除"' + ids + '"的数据项？').then(function () {
+                return delMaterial(ids);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+        /** 查看 */
+        handleLook(row) {
+            this.form = row;
+            this.openLook = true;
+            const id = row.id || this.ids;
+            listMaterial(id).then((response) => {
+                this.form = response.data;
+                console.log('this.tableData', this.tableData);
+                this.fileList = response.data.schoolAccessoryList;
+                console.log('this.fileList', this.fileList);
+                console.log(response.data);
+            });
+            this.title = "查看";
+
+        },
+        //新增按钮操作
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "新增材料编写情况";
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                name: null,
+                publishTime: null,
+
+            };
+            this.fileList = [];
+            this.resetForm("form");
+        },
+        cancle() {
+            this.open = false;
+            this.openLook = false;
+        }
+    },
+
+}
+</script>
+
+<style scoped></style>
+

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

+<template>
+    <div class="" style="padding:15px 10px 0 10px">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" style="padding:0 0 0 0" size="small">
+            <el-form-item prop="thesisName">
+                <el-input v-model="queryParams.thesisName" placeholder="论文名称" clearable />
+            </el-form-item>
+            <el-form-item prop="level">
+                <el-select v-model="queryParams.level" placeholder="级别" clearable>
+                    <el-option v-for="dict in dict.type.level" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="grade">
+                <el-select v-model="queryParams.grade" placeholder="等级" clearable>
+                    <el-option v-for="dict in dict.type.
+                        grade_type1" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="publishTime">
+                <el-date-picker v-model="queryParams.publishTime" type="date" value-format="yyyy-MM-dd" placeholder="发表日期"
+                    clearable>
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" size="mini" plain icon="el-icon-plus" @click="handleAdd"> 新增 </el-button>
+                <el-button icon="el-icon-search" type="primary" size="mini" @click="getList">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-table :data="tableData">
+            <el-table-column prop="lesson" label="序号" width="60" align="center" style="height: 20px;" type="index">
+            </el-table-column>
+            <el-table-column prop="thesisName" label="论文名称" align="center">
+            </el-table-column>
+            <el-table-column label="级别" align="center" prop="level">
+                <template slot-scope="{ row }">
+                    {{ row.level == 1 ? "国家级" : row.level == 2 ? "省级" : "市级" }}
+                </template>
+            </el-table-column>
+            <el-table-column label="等级" align="center" prop="grade">
+                <template slot-scope="{ row }">
+                    {{ row.grade == 1 ? "一等奖" : row.grade == 2 ? "二等奖" : "三等奖" }}
+                </template>
+
+            </el-table-column>
+            <el-table-column label="发表时间" align="center" prop="publishTime">
+            </el-table-column>
+
+            <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleLook(scope.row)">查看
+                    </el-button>
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:device:remove']">修改
+                    </el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:device:remove']">删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 新增/修改弹窗 -->
+        <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+
+
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="论文名称">
+                            <el-input v-model="form.thesisName" :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="级别">
+                            <el-select v-model="form.level" :style="{ width: '100%' }">
+                                <el-option v-for="dict in dict.type.level" :key="dict.value" :label="dict.label"
+                                    :value="dict.value" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="等级:">
+                            <el-select v-model="form.grade" :style="{ width: '100%' }">
+                                <el-option v-for="dict in dict.type.grade_type1" :key="dict.value" :label="dict.label"
+                                    :value="dict.value" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="发表时间：" prop="publishTime">
+                            <el-date-picker v-model="form.publishTime" type="date" placeholder="选择发表时间"
+                                :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="16">
+                        <el-form-item label="附件 :" prop="url">
+                            <FilepersonUploadNew @input="getFileList" :value="fileList" :style="{ width: '100%' }">
+                            </FilepersonUploadNew>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+
+            </el-form>
+            <div slot="footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancle">取 消</el-button>
+            </div>
+        </el-dialog>
+        <!-- 查看弹窗 -->
+        <el-dialog :title="title" :visible.sync="openLook" width="1200px">
+            <el-form ref="form" :model="form" label-width="114px" :rules="rules">
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="论文名称">
+                            <el-input v-model="form.thesisName" :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="级别">
+                            <el-select v-model="form.level" :style="{ width: '100%' }">
+                                <el-option v-for="dict in dict.type.level" :key="dict.value" :label="dict.label"
+                                    :value="dict.value" />
+
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="等级:">
+                            <el-select v-model="form.grade" :style="{ width: '100%' }">
+                                <el-option v-for="dict in dict.type.
+                                    grade_type1" :key="dict.value" :label="dict.label" :value="dict.value" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="发表时间：" prop="publishTime">
+                            <el-date-picker v-model="form.publishTime" type="date" placeholder="选择发表时间"
+                                :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="附件 :">
+
+                            <li class="el-upload-list__item ele-upload-list__item-content" v-for="file in fileList"
+                                :key="file.id">
+                                <el-link :href="`${file.accessoryUrl}`" :underline="false" target="_blank">
+                                    <span class="el-icon-document"> {{ file.accessoryName }} </span>
+                                </el-link>
+                            </li>
+                        </el-form-item>
+                    </el-col>
+
+
+                </el-row>
+
+            </el-form>
+            <div slot="footer">
+
+                <el-button @click="cancle">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    addThesis,// 新增论文情况
+    getThesis,// 查看论文情况列表
+    listThesis,// 查看论文情况详情
+    updateThesis,// 修改论文情况
+    delThesis,
+    // 删除论文情况
+
+} from "@/api/smartSchool/personWork/paperSituation";
+import FilepersonUploadNew from "@/components/FilepersonUploadNew"
+export default {
+    dicts: ['level', 'grade_type1'],
+
+    name: 'paperSituation',
+    components: {
+        FilepersonUploadNew,
+    },
+    data() {
+        return {
+            // 上传文件
+            fileList: [],
+            queryParams: {
+                thesisName: "",
+                level: "",
+                grade: "",
+                publishTime: "",
+            },
+            title: "",
+            rules: {
+               
+              
+            },
+            // 查看表格
+            lookTable: [],
+            tableData: [],
+
+            form: {
+                thesisName: "",
+                level: "",
+                grade: "",
+                publishTime: "",
+
+            },
+            open: false,
+            openLook: false,
+            total: 0,
+        }
+    },
+
+    created() {
+        this.getList();
+    },
+
+
+    methods: {
+        /** 查询 */
+        getList() {
+            console.log('this.queryParams', this.queryParams);
+            getThesis(this.queryParams).then((response) => {
+                this.tableData = response.rows;
+                console.log('this.tableData', this.tableData);
+                this.loading = false;
+                console.log(111, response.rows);
+
+            });
+        },
+        // 重置
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.getList();
+        },
+
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            const id = row.id || this.ids;
+            listThesis(id).then(response => {
+                this.form = response.data;
+                this.fileList = response.data.schoolAccessoryList.map(item => {
+                    return {
+                        name: item.accessoryName,
+                        url: item.accessoryUrl,
+                    }
+                })
+                this.schoolAccessoryList = response.data.schoolAccessoryList;
+                console.log('this.form', this.form);
+                this.open = true;
+                this.title = "修改论文情况";
+            });
+        },
+
+        // 附件上传回调函数
+        getFileList(data) {
+            console.log('getFileList', data)
+            // this.form.files = data
+            this.schoolAccessoryList = data.map(item => {
+                return {
+                    "accessoryUrl": item.url,
+                    "accessoryName": item.name
+                }
+            })
+            console.log('schoolAccessoryList', this.schoolAccessoryList)
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.id !== undefined) {
+                        const newObj = {};
+                        newObj.id = this.form.id;
+                        newObj.thesisName = this.form.thesisName;
+                        newObj.level = this.form.level;
+                        newObj.grade = this.form.grade;
+                        newObj.publishTime = this.form.publishTime;
+                        //附件列表
+                        newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
+                            return {
+                                "accessoryUrl": item.accessoryUrl,
+                                "accessoryName": item.accessoryName
+                            }
+                        });
+                        updateThesis(newObj).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        const newObj = {};
+                        newObj.thesisName = this.form.thesisName;
+                        newObj.level = this.form.level;
+                        newObj.grade = this.form.grade;
+                        newObj.publishTime = this.form.publishTime;
+                        //附件列表
+                        newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
+                            return {
+                                "accessoryUrl": item.accessoryUrl,
+                                "accessoryName": item.accessoryName
+                            }
+                        });
+                        addThesis(newObj).then(response => {
+                            console.log('this.form', this.form);
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then(function () {
+                return delThesis(ids);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+        /** 查看 */
+        handleLook(row) {
+            this.form = row;
+            this.openLook = true
+            const id = row.id || this.ids
+            listThesis(id).then((response) => {
+                this.form = response.data;
+                console.log('this.form ', this.form);
+                this.fileList = response.data.schoolAccessoryList;
+                console.log('this.fileList', this.fileList);
+            });
+            this.title = "查看培训情况";
+        },
+        //新增按钮操作
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "新增论文情况";
+        },
+
+        // 表单重置
+        reset() {
+            this.form = {
+                thesisName: null,
+                level: null,
+                grade: null,
+                publishTime: null,
+
+            };
+            this.fileList = [];
+            this.resetForm("form");
+        },
+        cancle() {
+            this.open = false;
+            this.openLook = false
+        }
+    },
+
+}
+</script>
+
+<style scoped></style>
+

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

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

+<template>
+    <div class="" style="padding:15px 10px 0 10px">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" style="padding:0 0 0 0" size="small">
+            <el-form-item prop="trainingTime" >
+                <el-date-picker v-model="queryParams.trainingTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
+                    format="yyyy-MM-dd" clearable>
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="trainingName">
+                <el-input v-model="queryParams.trainingName" placeholder="培训名称" clearable/>
+            </el-form-item>
+            <el-form-item prop="isQualified">
+                <el-select v-model="queryParams.isQualified" placeholder="是否合格">
+                    <el-option v-for="dict in dict.type.
+                        is_qualified" :key="dict.value" :label="dict.label" :value="dict.value" clearable/>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" size="mini" plain icon="el-icon-plus" @click="handleAdd"> 新增 </el-button>
+                <el-button icon="el-icon-search" type="primary" size="mini" @click="getList">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <!-- 表格数据 -->
+        <el-table :data="tableData">
+            <el-table-column prop="lesson" label="序号" width="60" align="center" style="height: 20px;" type="index">
+            </el-table-column>
+            <el-table-column prop="trainingTime" label="培训时间" align="center">
+            </el-table-column>
+            <el-table-column label="培训名称" align="center" prop="trainingName">
+            </el-table-column>
+            <el-table-column label="是否合格" align="center" prop="isQualified">
+                <template slot-scope="scope">
+                    {{ scope.row.isQualified === '0' ? '不合格' : '合格' }}
+                </template>
+            </el-table-column>
+
+            <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleLook(scope.row)">查看
+                    </el-button>
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:device:remove']">修改
+                    </el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:device:remove']">删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList" /> -->
+        <!-- 新增/修改弹窗 -->
+        <el-dialog :title="title" :visible.sync="open" width="1200px">
+            <el-form ref="form" :model="form" label-width="114px" :rules="rules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="培训时间：" prop="trainingTime">
+                            <el-date-picker v-model="form.trainingTime" type="date" placeholder="选择发表时间"
+                                :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="培训名称">
+                            <el-input v-model="form.trainingName" :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="是否合格">
+                            <el-select v-model="form.isQualified" placeholder="是否合格" :style="{ width: '100%' }">
+                                <el-option label="是" value="1"></el-option>
+                                <el-option label="否" value="0"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="16">
+                        <el-form-item label="附件 :" prop="url">
+                            <FilepersonUploadNew @input="getFileList" :value="fileList"></FilepersonUploadNew>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+
+
+            </el-form>
+            <div slot="footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancle">取 消</el-button>
+            </div>
+        </el-dialog>
+        <!-- 查看弹窗 -->
+        <el-dialog :title="title" :visible.sync="openLook" width="1200px">
+            <el-form ref="form" :model="form" label-width="114px" :rules="rules">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="培训时间：" prop="trainingTime">
+                            <el-date-picker v-model="form.trainingTime" type="date" placeholder="选择发表时间"
+                                :style="{ width: '100%' }">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="培训名称">
+                            <el-input v-model="form.trainingName" :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="是否合格">
+                            <el-select v-model="form.isQualified" placeholder="是否合格" :style="{ width: '100%' }">
+                                <el-option label="是" value="1"></el-option>
+                                <el-option label="否" value="0"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="附件 :">
+                            <li class="el-upload-list__item ele-upload-list__item-content" v-for="file in fileList"
+                                :key="file.id">
+                                <el-link :href="`${file.accessoryUrl}`" :underline="false" target="_blank">
+                                    <span class="el-icon-document"> {{ file.accessoryName }} </span>
+                                </el-link>
+                            </li>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer">
+
+                <el-button @click="cancle">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    addTraining, // 新增培训情况
+    getTraining,// 查询培训情况列表
+    updateTraining,  //修改培训情况
+    delTraining,//// 删除培训情况
+    listTraining,// // 查询培训情况详情
+
+} from "@/api/smartSchool/personWork/traiNing";
+import FilepersonUploadNew from "@/components/FilepersonUploadNew"
+
+export default {
+    dicts: ['is_qualified'],
+
+    name: 'traiNing',
+    components: {
+        FilepersonUploadNew,
+    },
+    data() {
+        return {
+            fileList: [],
+            queryParams: {
+                trainingTime: "",
+                trainingName: "",
+                isQualified: "",
+
+
+            },
+            // 附件
+            schoolAccessoryList: [],
+            title: "",
+            rules: {
+
+            },
+            // 查看表格
+            lookTable: [],
+            tableData: [],
+            options: [
+
+            ],
+            form: {
+                trainingTime: "",
+                trainingName: "",
+                isQualified: "",
+
+            },
+            open: false,
+            openLook: false,
+            total: 0,
+        }
+    },
+
+    created() {
+        this.getList();
+    },
+
+
+    methods: {
+        /** 查询 */
+        getList() {
+            getTraining(this.queryParams).then((response) => {
+                this.tableData = response.rows;
+                console.log('this.tableData', this.tableData);
+                this.loading = false;
+
+            });
+        },
+        // 重置
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.getList();
+        },
+
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            const id = row.id || this.ids;
+            listTraining(id).then(response => {
+                this.form = response.data;
+                this.fileList = response.data.schoolAccessoryList.map(item => {
+                    return {
+                        name: item.accessoryName,
+                        url: item.accessoryUrl,
+                    }
+                })
+                this.schoolAccessoryList = response.data.schoolAccessoryList;
+                console.log(this.fileList);
+                this.open = true;
+                this.title = "修改培训情况";
+            });
+        },
+
+        // 附件上传回调函数
+        getFileList(data) {
+            console.log('getFileList', data)
+            // this.form.files = data
+            this.schoolAccessoryList = data.map(item => {
+                return {
+                    "accessoryUrl": item.url,
+                    "accessoryName": item.name
+                }
+            })
+            console.log('schoolAccessoryList', this.schoolAccessoryList)
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.id !== undefined) {
+                        const newObj = {};
+                        newObj.id = this.form.id;
+                        newObj.trainingTime = this.form.trainingTime;
+                        newObj.trainingName = this.form.trainingName;
+                        newObj.isQualified = this.form.isQualified;
+                        //附件列表
+                        newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
+                            return {
+                                "accessoryUrl": item.accessoryUrl,
+                                "accessoryName": item.accessoryName
+                            }
+                        });
+                        updateTraining(newObj).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        const newObj = {};
+                        newObj.trainingTime = this.form.trainingTime;
+                        newObj.trainingName = this.form.trainingName;
+                        newObj.isQualified = this.form.isQualified;
+                        //附件列表
+                        newObj.schoolAccessoryList = this.schoolAccessoryList.map(item => {
+                            return {
+                                "accessoryUrl": item.accessoryUrl,
+                                "accessoryName": item.accessoryName
+                            }
+                        });
+                        addTraining(newObj).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除"' + ids + '"的数据项？').then(function () {
+                return delTraining(ids);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+        /** 查看 */
+        handleLook(row) {
+            this.form = row;
+            this.openLook = true;
+            const id = row.id || this.ids
+            listTraining(id).then((response) => {
+                this.form = response.data;
+                console.log('this.tableData', this.tableData);
+                this.fileList = response.data.schoolAccessoryList;
+                console.log('this.fileList', this.fileList);
+                console.log(response.data);
+            });
+            this.title = "查看";
+
+        },
+        //新增按钮操作
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "新增培训情况";
+
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                trainingTime: null,
+                trainingName: null,
+                isQualified: null,
+
+            };
+            this.fileList = [];
+            this.resetForm("form");
+        },
+        cancle() {
+            this.open = false;
+            this.openLook = false;
+        }
+    },
+
+}
+</script>
+
+<style scoped></style>
+

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

@@ -2,8 +2,8 @@
     <div class="app-container">
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="86px">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="86px">
             <el-form-item prop="dateRange">
             <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-date-picker>
             </el-form-item>
             </el-form-item>
             <el-form-item prop="appointmentUserName">
             <el-form-item prop="appointmentUserName">
@@ -24,10 +24,10 @@
             <el-table-column label="预约人" align="center" prop="appointmentUserName" />
             <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="applyTime" />
             <el-table-column label="状态" align="center" min-width="200px" prop="statu">
             <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">
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">详情
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">详情
@@ -98,6 +98,7 @@ export default {
             dateRange: [],
             dateRange: [],
             // 模糊搜索
             // 模糊搜索
             queryParams: {
             queryParams: {
+                dateRange: [],
                 appointmentUserName: "",
                 appointmentUserName: "",
             },
             },
             // 加载遮罩
             // 加载遮罩
@@ -137,7 +138,13 @@ export default {
         // 获取列表
         // 获取列表
         getList() {
         getList() {
             this.loading = true;
             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.studioList = response.rows;
                 this.total = response.total;
                 this.total = response.total;
                 this.loading = false;
                 this.loading = false;