申请提交

src/api/reward/apply.js

@@ -8,37 +8,48 @@ export function listApply(query) {
     params: query
   })
 }
-
-// 查询公告详细
-export function getNotice(noticeId) {
+//根据奖项类型生成applyId
+export function getApplyId(query) {
   return request({
-    url: '/system/notice/' + noticeId,
-    method: 'get'
+    url: '/reward/apply/getApplyId',
+    method: 'get',
+    params: query
   })
 }
-
-// 新增公告
-export function addNotice(data) {
+//查询详细
+export function getDetail(query) {
   return request({
-    url: '/system/notice',
-    method: 'post',
-    data: data
+    url: '/reward/apply/detail/' + query,
+    method: 'get'
   })
 }
-
-// 修改公告
-export function updateNotice(data) {
+// 修改
+export function updateApply(data) {
   return request({
-    url: '/system/notice',
-    method: 'put',
+    url: '/reward/apply/submit',
+    method: 'post',
     data: data
   })
 }
-
 // 删除公告
-export function delNotice(noticeId) {
+export function delApply(applyId) {
   return request({
-    url: '/system/notice/' + noticeId,
+    url: '/reward/apply/delete/' + applyId,
     method: 'delete'
   })
 }
+// 删除文件
+export function delFile(fileId) {
+  return request({
+    url: '/reward/file/delFile/' + fileId,
+    method: 'get'
+  })
+}
+// 查询文件列表
+export function listFile(query) {
+  return request({
+    url: '/reward/file/getFileInfo',
+    method: 'get',
+    params: {applyId:query}
+  })
+}

src/components/CustomTable/CustomTable.vue

@@ -0,0 +1,112 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd(applyType)"
+          v-hasPermi="['system:notice:add']"
+        >申请</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+<!--    表格部分-->
+    <el-table v-loading="loading" :row-selection="true" :data="tableData" @select="handleSelectionChange">
+      <!-- Table Columns -->
+      <el-table-column
+        type="selection"
+        width="55">
+      </el-table-column>
+      <el-table-column v-for="(column, index) in columns" :key="index" :label="column.label" :prop="column.prop" :align="column.align" :width="column.width">
+        <template v-if="column.type === 'date'" v-slot:default="scope">
+          <span>{{ parseTime(scope.row[column.prop], '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+        <template v-else-if="column.slotName === 'customSlotName'" v-slot:default="scope">
+          <dict-tag :options="dict.type.rew_apply_status" :value="scope.row[column.prop]"/>
+        </template>
+        <template v-else  v-slot:default="scope">
+          <span>{{ scope.row[column.prop] }}</span>
+        </template>
+      </el-table-column>
+
+      <!-- Actions Column -->
+      <el-table-column v-if="actions.length > 0" label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button v-for="(action, index) in actions" :key="index" size="mini" type="text" :icon="action.icon" @click="action.handler(scope.row)" v-hasPermi="action.permissions">{{ action.text }}</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+
+</template>
+
+<script>
+import {parseTime} from "@/utils/ruoyi";
+
+export default {
+  dicts: ['rew_apply_status'],
+  props: {
+    columns: {
+      type: Array,
+      required: true
+    },
+    tableData: {
+      type: Array,
+      required: true
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    actions: {
+      type: Array,
+      default: () => []
+    },
+    // 查询参数
+    queryParams:{
+      type:Object,
+      default:()=>{}
+    },
+    //显示搜索条件
+    showSearch:{
+      type: Boolean,
+      default: true
+    },
+    applyType:{
+      type:String,
+      default:'',
+    }
+  },
+  data(){
+    return {
+
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    parseTime,
+    //父组件搜索方法
+    getList(query){
+      this.$emit('getList', query);
+    },
+    //父组件搜索方法
+    handleAdd(applyType){
+      this.$emit('handleAdd', applyType);
+    },
+    //父组件搜索方法
+    handleQuery(query){
+      this.$emit('handleQuery', query);
+    },
+    resetQuery(query){
+      this.$emit('resetQuery', query);
+    },
+    handleSelectionChange(selection) {
+      this.$emit('handleSelectionChange', selection);
+    },
+  }
+}
+</script>

src/store/getters.js

@@ -3,6 +3,8 @@ const getters = {
   size: state => state.app.size,
   device: state => state.app.device,
   dict: state => state.dict.dict,
+  applyType:state => state.apply.applyType,
+  applyId:state => state.apply.applyId,
   visitedViews: state => state.tagsView.visitedViews,
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,

src/store/index.js

@@ -3,6 +3,7 @@ import Vuex from 'vuex'
 import app from './modules/app'
 import dict from './modules/dict'
 import user from './modules/user'
+import apply from './modules/apply'
 import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
@@ -15,6 +16,7 @@ const store = new Vuex.Store({
     app,
     dict,
     user,
+    apply,
     tagsView,
     permission,
     settings

src/store/modules/apply.js

@@ -0,0 +1,36 @@
+const state = {
+  applyType:'',
+  applyId:''
+}
+const mutations = {
+  SET_APPLYTYPE: (state, { key, value }) => {
+    if (key !== null && key !== "") {
+      state.applyType = value
+    }
+  },
+  SET_APPLYID: (state, { key, value }) => {
+    if (key !== null && key !== "") {
+      state.applyId = value
+    }
+  }
+}
+
+const actions = {
+  // 设置字典
+  setApplyType({ commit }, data) {
+    commit('SET_APPLYTYPE', data)
+  },
+  // 设置字典
+  setApplyId({ commit }, data) {
+    localStorage.setItem('applyId', data.value)
+    commit('SET_APPLYID', data)
+  },
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+

src/views/reward/apply/index.vue

@@ -1,26 +1,27 @@
 <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="公告标题" prop="noticeTitle">
+      <el-form-item label="奖项名称" prop="applyName">
         <el-input
-          v-model="queryParams.noticeTitle"
-          placeholder="请输入公告标题"
+          v-model="queryParams.applyName"
+          placeholder="请输入奖项名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="操作人员" prop="createBy">
+      <el-form-item label="创建者" prop="createBy">
         <el-input
           v-model="queryParams.createBy"
-          placeholder="请输入操作人员"
+          placeholder="请输入创建者"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类型" prop="noticeType">
-        <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
+      <el-form-item label="状态" prop="applyStatus">
+        <el-select v-model="queryParams.applyStatus" placeholder="状态" clearable>
           <el-option
-            v-for="dict in dict.type.sys_notice_type"
+            v-for="dict in dict.type.rew_apply_status"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -32,73 +33,20 @@
         <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:notice:add']"
-        >申请</el-button>
-      </el-col>
-
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column
-        label="公告标题"
-        align="center"
-        prop="noticeTitle"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="公告类型" align="center" prop="noticeType" width="150">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建者" align="center" prop="createBy" width="150" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="handleView(scope.row)"
-              v-hasPermi="['system:notice:edit']"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:notice:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:notice:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
+    <custom-table
+      :columns="tableColumns"
+      :tableData="noticeList"
+      :loading="loading"
+      :actions="tableActions"
+      :query-params="queryParams"
+      :apply-type="applyParam.applyType"
+      @handleQuery="handleQuery"
+      @resetQuery="resetQuery"
+      @handleView="handleView"
+      @handleAdd="handleAdd"
+      @getList="getList"
+      @handleSelectionChange="handleSelectionChange"
+    ></custom-table>
     <pagination
       v-show="total>0"
       :total="total"
@@ -107,47 +55,61 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <!-- 添加或查看公告对话框 -->
+    <el-dialog :title="title" :fullscreen="true" center :visible.sync="open" top="0" width="100%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="公告标题" prop="noticeTitle">
-              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
+          <el-col :span="24">
+            <el-form-item label="是否获得过奖" prop="isReward">
+              <el-radio-group :disabled="isReadOnly" v-model="form.isReward">
+                <el-radio :label="0">是</el-radio>
+                <el-radio :label="1">否</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="公告类型" prop="noticeType">
-              <el-select v-model="form.noticeType" placeholder="请选择公告类型">
-                <el-option
-                  v-for="dict in dict.type.sys_notice_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
+          <el-col :span="24">
+            <el-form-item>
+              <Update
+                :applyId="applyId"
+                :table-data="fileData"
+              >
+              </Update>
             </el-form-item>
           </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" v-if="isView === false" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 修改公告对话框 -->
+    <el-dialog :title="title" :fullscreen="true" center :visible.sync="editOpen" top="0" width="100%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-row>
           <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_notice_status"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
+            <el-form-item label="是否获得过奖" prop="isReward">
+              <el-radio-group :disabled="isReadOnly" v-model="form.isReward">
+                <el-radio :label="0">是</el-radio>
+                <el-radio :label="1">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="内容">
-              <editor v-model="form.noticeContent" :min-height="192"/>
+            <el-form-item>
+              <Update
+                :applyId="applyId"
+                :dialog-type="dialogType"
+                :table-data="fileData"
+                ref="childComponent"
+              >
+              </Update>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" v-if="isView === false" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -155,13 +117,110 @@
 </template>
 
 <script>
-import { listApply, getNotice, delNotice, addNotice, updateNotice } from "@/api/reward/apply";
-
+import {
+  listApply,
+  getDetail,
+  getApplyId,
+  updateApply,
+  delApply, listFile
+} from "@/api/reward/apply";
+import CustomTable from "@/components/CustomTable/CustomTable.vue";
+import Update from './update.vue'
 export default {
-  name: "Notice",
-  dicts: ['sys_notice_status', 'sys_notice_type'],
+  name: "apply",
+  components: {CustomTable,Update},
+  dicts: ['rew_apply_status'],
   data() {
     return {
+      dialogType:'edit',
+      //列数据
+      tableColumns: [
+        { label: '创建者', prop: 'createBy', align: 'center' },
+        { label: '奖项名称', prop: 'applyName', align: 'center', showOverflowTooltip: true },
+        { label: '状态', prop: 'applyStatus', align: 'center',slotName: 'customSlotName' },
+        { label: '创建时间', prop: 'createTime', align: 'center' },
+        { label: '提交时间', prop: 'appTime', align: 'center',type:'date' },
+      ],
+      //操作列
+      tableActions: [
+        { text: '查看', icon: 'el-icon-view', handler: this.handleView, permissions: ['system:notice:edit'] },
+        { text: '修改', icon: 'el-icon-edit', handler: this.handleUpdate, permissions: ['system:notice:edit'],type:'hidden' },
+        { text: '删除', icon: 'el-icon-delete', handler: this.handleDelete, permissions: ['system:notice:remove'],type:'hidden' }
+      ],
+      //文件上传配置项
+      fileData:[
+        {
+          name: '办学方向',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode:'rew_excellent_category_1',
+        },
+        {
+          name: '弘扬践行黄炎培职业教育思想',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode:'rew_excellent_category_2',
+        },
+        {
+          name: '办学模式',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode:'rew_excellent_category_3',
+        },
+        {
+          name: '专业建设',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode:'rew_excellent_category_4',
+        },
+        {
+          name: '课程开发与教学改革',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode:'rew_excellent_category_5',
+        },
+        {
+          name: '师资队伍建设',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode:'rew_excellent_category_6',
+        },
+        {
+          name: '信息化建设',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode:'rew_excellent_category_7',
+        },
+        {
+          name: '办学质量',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode:'rew_excellent_category_8',
+        },
+        {
+          name: '社会服务',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode:'rew_excellent_category_9',
+        },
+        {
+          name: '创新增量',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode:'rew_excellent_category_10',
+        }
+
+      ],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -176,39 +235,66 @@ export default {
       total: 0,
       // 公告表格数据
       noticeList: [],
+      isReadOnly:false,
+      isView:false,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      editOpen:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        noticeTitle: undefined,
+        applyName: undefined,
         createBy: undefined,
-        status: undefined
+        applyStatus: undefined,
       },
       // 表单参数
       form:{},
       // 表单校验
       rules: {
-        noticeTitle: [
-          { required: true, message: "公告标题不能为空", trigger: "blur" }
+        applyName: [
+          { required: true, message: "奖项名称不能为空", trigger: "blur" }
         ],
-        noticeType: [
-          { required: true, message: "公告类型不能为空", trigger: "change" }
+        isReward: [
+          { required: true, message: "请选择", trigger: "change" }
         ]
-      }
+      },
+      applyParam:{
+        applyType:''
+      },
+      applyId:''
     };
   },
   created() {
-    this.getList();
+
+  },
+  mounted() {
+    if(this.$route.path.includes('reward') === true){
+      this.$store.dispatch('apply/setApplyType', { key: 'applyType', value: 'rew_excellent_category' });
+      this.applyParam.applyType = this.$store.state.apply.applyType;
+      this.queryParams.applyType = this.$store.state.apply.applyType;
+    }
+    this.getList('mounted');
   },
   methods: {
     /** 查询公告列表 */
-    getList() {
+    getList(item) {
       this.loading = true;
-      listApply(this.queryParams).then(response => {
+      let queryObj = {
+        pageNum: 1,
+        pageSize: 10,
+        createId:null,
+        applyStatus:'0,1,3',
+        applyType: this.applyParam.applyType
+      }
+      this.$store.dispatch('GetInfo').then((res) => {
+        if (res.user.userId !== '1'){
+          queryObj.createId =  res.user.userId
+        }
+      });
+      listApply(item ==='mounted' ? queryObj:this.queryParams).then(response => {
         this.noticeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -217,16 +303,14 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.editOpen = false
       this.reset();
     },
     // 表单重置
     reset() {
       this.form = {
-        noticeId: undefined,
-        noticeTitle: undefined,
-        noticeType: undefined,
-        noticeContent: undefined,
-        status: "0"
+        // applyName: undefined,
+        isReward: undefined,
       };
       this.resetForm("form");
     },
@@ -237,45 +321,94 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      // 查询参数
+      this.queryParams = {
+        pageNum: 1,
+          pageSize: 10,
+          applyName: undefined,
+          createBy: undefined,
+          applyStatus: undefined
+      };
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.noticeId)
+      this.ids = selection.map(item => item.applyId)
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
+    /**查看按钮 */
+    handleView(row){
+      this.open = true;
+      this.title = "查看奖项";
+      const applyId = row.applyId || this.ids
+      getDetail(applyId).then(response => {
+        this.form = response.data;
+        console.log(this.form)
+        this.open = true;
+        this.isReadOnly = true
+        this.isView = true
+      });
+    },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(applyType) {
       this.reset();
+      this.isView=false;
       this.open = true;
-      this.title = "添加公告";
+      this.title = "添加奖项";
+      console.log(this.applyParam)
+      if(this.noticeList.length === 0){
+        getApplyId(this.applyParam).then(response => {
+          this.$store.dispatch('apply/setApplyId', { key: 'applyId', value: response.data.applyId });
+          this.applyId = localStorage.getItem('applyId')
+          this.getList()
+        });
+      }
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const noticeId = row.noticeId || this.ids
-      getNotice(noticeId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改公告";
+      this.isView=false;
+      this.applyId = row.applyId
+      const applyId = row.applyId || this.ids
+      getDetail(applyId).then(response => {
+        this.form.isReward = response.data.isReward;
+        this.editOpen = true;
+        this.title = "修改奖项";
+      });
+      this.getFileList(row.applyId)
+    },
+    getFileList(applyId){
+      listFile(applyId).then((res) => {
+        if (res.code === 200) {
+          res.data.forEach((item) => {
+            let index = this.fileData.findIndex(i => i.fileCode === item.fileCode);
+            if (index !== -1) {
+              this.fileData[index].childrenList = []
+              this.fileData[index].childrenList.push({
+                name: item.fileName,
+                url: item.filePath,
+                state:item.fileState,
+                fileId:item.fileId,
+                fileCode:item.fileCode,
+              });
+            }
+
           });
+        }
+      })
     },
     /** 提交按钮 */
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.noticeId != undefined) {
-            updateNotice(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addNotice(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+          this.form.applyId = this.applyId
+          if (this.form.applyId !== '') {
+            updateApply(this.form).then(response => {
+              this.$modal.msgSuccess("保存成功");
               this.open = false;
+              this.editOpen = false
               this.getList();
             });
           }
@@ -284,14 +417,36 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const noticeIds = row.noticeId || this.ids
-      this.$modal.confirm('是否确认删除公告？').then(function() {
-        return delNotice(noticeIds);
+      const applyId = row.applyId || this.ids
+      this.$modal.confirm('是否确认删除奖项？').then(function() {
+        return delApply(applyId);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
+        localStorage.removeItem('applyId');
       }).catch(() => {});
     }
   }
 };
 </script>
+<style scoped lang="scss">
+.fullscreen-dialog {
+  .el-dialog__wrapper {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 1000;
+    background-color: rgba(0, 0, 0, 0.5); /* 遮罩层透明度 */
+  }
+
+  .el-dialog {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    border: none;
+    border-radius: 0;
+  }
+}
+</style>

src/views/reward/apply/update.vue

@@ -0,0 +1,254 @@
+<template>
+  <el-table
+    :data="tableData"
+    style="width: 100%;height: 577px;overflow: auto;"
+    @expand-change="handleExpand"
+  >
+    <el-table-column type="expand">
+      <template v-slot:default="scope">
+        <el-table
+          class="down"
+          :data="scope.row.childrenList"
+          border
+          stripe
+          style="width: 100%;margin-top: 20px;"
+          :show-header="false"
+          ref="table"
+        >
+          <el-table-column prop="name" label="文件名称">
+            <template slot-scope="scope">
+              <el-link style="margin-right: auto;" :href="`${baseUrl}${scope.row.url}`" :underline="false" target="_blank">
+                <span class="el-icon-document"> {{ getFileName(scope.row.name) }} </span>
+              </el-link>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核状态">
+            <template slot-scope="scope" class="button-cell" >
+              {{ scope.row.state === '2' || scope.row.state === null ? '未审核' : '已审核' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button size="small" type="text" @click="downloadFile(scope.row.fileId,scope.row.name)">下载</el-button>
+              <el-button size="small" type="text" @click="deleteHandle(scope.row.fileId,scope)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </template>
+    </el-table-column>
+    <el-table-column label="文件名称" prop="name"></el-table-column>
+    <el-table-column label="上传文件">
+      <template v-slot:default="scope">
+        <el-upload
+          class="upload-demo"
+          ref="upload"
+          :action="uploadUrl + '?applyId=' + applyId + '&fileCode=' + scope.row.fileCode"
+          :headers="header"
+          :file-list="scope.row.childrenList"
+          :show-file-list="false"
+          :on-error="handleUploadError"
+          :on-success="uploadSuccess(scope.row)"
+        >
+          <el-button  size="small" type="primary">上传文件</el-button>
+        </el-upload>
+      </template>
+    </el-table-column>
+    <el-table-column label="上传状态" prop="status">
+      <template v-slot:default="scope">
+        {{ scope.row.childrenList.length === 0 ? '未上传' : '已上传' }}
+      </template>
+    </el-table-column>
+    <el-table-column label="操作">
+      <template v-slot:default="scope">
+        {{ scope.row.expanded ? '已展开' : '已收起' }}
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+import {getToken} from "@/utils/auth";
+import {Loading, Message} from "element-ui";
+import {blobValidate, tansParams} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import service from "@/utils/request";
+import {delFile, listFile} from "@/api/reward/apply";
+
+export default {
+  props:{
+    applyId:{
+      type:String,
+      default:'',
+      require:true,
+    },
+    dialogType:{
+      type:String,
+      default: '',
+    },
+    tableData:{
+      type:Array,
+      default:()=>[],
+      require:true,
+    }
+  },
+  data() {
+    return {
+      header:{ Authorization: "Bearer " + getToken() },
+      uploadUrl:process.env.VUE_APP_BASE_API + "/reward/file/upload",
+      baseUrl: process.env.VUE_APP_BASE_API,
+    }
+  },
+  mounted() {
+
+  },
+  methods:{
+    getToken,
+    // 上传失败
+    handleUploadError(err) {
+      this.$modal.msgError("上传文件失败，请重试");
+      this.$modal.closeLoading();
+    },
+    uploadSuccess(row) {
+      return (response, file) => {
+        if (response.code === 200) {
+          row.childrenList.push({
+            name: file.raw.name,
+            url: response.data.filePath,
+            state:response.data.fileState,
+            fileId:response.data.fileId,
+            fileCode:response.data.fileCode,
+          });
+        }
+      };
+    },
+    handleExpand(row, expandedRows) {
+      if (expandedRows.length) {
+        this.$set(row, 'expanded', true);
+      } else {
+        this.$set(row, 'expanded', false);
+      }
+    },
+    // 删除文件
+    handleDelete(index) {
+      this.fileList.splice(index, 1);
+      this.$emit("input", this.listToString(this.fileList));
+    },
+    // 获取文件名称
+    getFileName(name) {
+      // 如果是url那么取最后的名字 如果不是直接返回
+      if (name.lastIndexOf("/") > -1) {
+        return name.slice(name.lastIndexOf("/") + 1);
+      } else {
+        return name;
+      }
+    },
+    // 对象转成指定字符串分隔
+    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) : '';
+    },
+    downloadFile(fileId, fileName) {
+      let downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
+      // 构建请求URL，将参数作为查询字符串附加在URL中
+      const url = `/reward/file/download?fileId=${fileId}`;
+      return service.get(url, {
+        responseType: 'blob',
+      }).then(async (data) => {
+        const isBlob = blobValidate(data);
+        if (isBlob) {
+          const blob = new Blob([data])
+          saveAs(blob, fileName)
+        } else {
+          const resText = await data.text();
+          const rspObj = JSON.parse(resText);
+          const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+          Message.error(errMsg);
+        }
+        downloadLoadingInstance.close();
+      }).catch((r) => {
+        console.error(r)
+        Message.error('下载文件出现错误，请联系管理员！')
+        downloadLoadingInstance.close();
+      })
+    },
+    deleteHandle(fileId,scope) {
+      let index = this.tableData.findIndex(item => item.fileCode === scope.row.fileCode);
+      let findIndex = this.tableData[index].childrenList.findIndex(item => item.fileId === fileId)
+      this.$confirm(`确定删除该文件吗?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        delFile(fileId).then((res) => {
+          if (res.code === 200) {
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            if (findIndex !== -1) {
+              this.tableData[index].childrenList.splice(findIndex, 1);
+            }
+          } else {
+            this.$message.error(res.msg);
+          }
+        });
+      });
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.down{
+  ::v-deep .cell{
+    text-align: center;
+  }
+  ::v-deep .el-table_3_column_13{
+    .cell{
+      text-align: left;
+      margin-left: 0px;
+    }
+  }
+  ::v-deep .el-table_3_column_15{
+    .cell{
+      margin-left: -166px;
+    }
+  }
+  ::v-deep .el-table_3_column_14{
+    .cell{
+      margin-left: 110px;
+    }
+  }
+}
+.el\-upload\-list__item{
+  display: flex;
+  justify-content: space-around;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 100%;
+  ::v-deep .el-form-item__content{
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    .action{
+      width: 45%;
+      text-align: center;
+      box-sizing: border-box;
+      padding-left: 123px;
+    }
+  }
+}
+</style>