评分提交

src/api/reward/score.js

@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询公告列表
+export function listScore(query) {
+  return request({
+    url: '/reward/score/list',
+    method: 'get',
+    params: query
+  })
+}
+//查询详细
+export function getScoreInfo(query) {
+  return request({
+    url: '/reward/score/getScoreInfo/',
+    method: 'get',
+    params:{
+      applyId:query
+    }
+  })
+}
+//查询详细
+export function getDetail(query) {
+  return request({
+    url: '/reward/apply/detail/' + query,
+    method: 'get'
+  })
+}
+// 修改
+export function scoreSave(data) {
+  return request({
+    url: '/reward/score/save',
+    method: 'post',
+    data: data
+  })
+}
+//材料校验
+export function checkFile(applyId ){
+  return request({
+    url: '/reward/file/checkFile/'+applyId,
+    method: 'get',
+  })
+}
+//审核提交
+export function approved(applyId){
+  return request({
+    url: '/reward/audit/approved/'+ applyId,
+    method: 'get',
+  })
+}
+//退回
+export function applyBack(applyId,applyMsg){
+  return request({
+    url: '/reward/audit/applyBack',
+    method: 'get',
+    params:{
+      applyId:applyId,
+      applyMsg:applyMsg
+    }
+  })
+}

src/components/AllTypeFile/update.vue

@@ -1,4 +1,5 @@
 <template>
+<div>
   <el-table
     :data="tableData"
     style="width: 100%;height: 681px;overflow: auto;"
@@ -68,6 +69,11 @@
       </template>
     </el-table-column>
   </el-table>
+
+    <!-- 其他内容 -->
+    <slot name="tableSlot"></slot>
+    <!-- 其他内容 -->
+</div>
 </template>
 
 <script>

src/components/CustomTable/CustomTable.vue

@@ -9,6 +9,9 @@
         <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-if="column.slotName === 'scoreStatus'" v-slot:default="scope">
+          <el-tag v-for="(item,index) in scoreStatus" :key="index" :type="item.type" v-if="item.dictValue === scope.row.scoreStatus">{{item.dictLabel}}</el-tag>
+        </template>
         <template v-else  v-slot:default="scope">
           <span>{{ scope.row[column.prop] }}</span>
         </template>
@@ -64,7 +67,18 @@ export default {
   },
   data(){
     return {
-
+      scoreStatus:[
+        {
+          dictLabel:"未评分",
+          dictValue:0,
+          type:"danger"
+        },
+        {
+          dictLabel:"已评分",
+          dictValue:1,
+          type:"success",
+        }
+      ]
     }
   },
   mounted() {

src/views/reward/score/index.vue

@@ -1,118 +1,43 @@
 <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"
+          v-model="queryParams.applyName"
-          placeholder="请输入公告标题"
+          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-option
-            v-for="dict in dict.type.sys_notice_type"
-            :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>
+    <custom-table
+      :columns="tableColumns"
+      :tableData="noticeList"
+      :loading="loading"
+      :actions="tableActions"
+      :query-params="queryParams"
+      :apply-type="applyParam.applyType"
+      @handleQuery="handleQuery"
+      @resetQuery="resetQuery"
+      @handleView="handleView"
+      @getList="getList"
+      @handleSelectionChange="handleSelectionChange"
+    >
 
-    <el-row :gutter="10" class="mb8">
+    </custom-table>
-      <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>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:notice:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:notice:remove']"
-        >删除</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-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>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -120,48 +45,71 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    <!-- 修改查看对话框 -->
-    <!-- 添加或修改公告对话框 -->
+    <el-dialog :title="title" :fullscreen="true" center :visible.sync="editOpen" top="0" width="100%" append-to-body>
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="公告标题" prop="noticeTitle">
-              <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
-            </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-form-item>
-          </el-col>
           <el-col :span="24">
-            <el-form-item label="状态">
+            <el-form-item label="是否获得过奖" prop="isReward">
-              <el-radio-group v-model="form.status">
+              <el-radio-group :disabled="isReadOnly" v-model="form.isReward">
-                <el-radio
+                <el-radio :label="0">是</el-radio>
-                  v-for="dict in dict.type.sys_notice_status"
+                <el-radio :label="1">否</el-radio>
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="内容">
+            <el-form-item>
-              <editor v-model="form.noticeContent" :min-height="192"/>
+              <Update
+                :applyId="applyId"
+                :dialog-type="dialogType"
+                :table-data="fileData"
+                :isShowButton="isShowButton"
+                :isShowUploadButton="isShowUploadButton"
+                :template-type="templateType"
+                ref="childComponent"
+              >
+                <template v-slot:tableSlot v-if="isView === true">
+                  <div v-if="avgScore !== null">
+                    平均分：{{avgScore}}
+                  </div>
+                  <el-table
+                    :data="scoreData"
+                    style="width: 100%">
+                    <el-table-column
+                      prop="createBy"
+                      label="评分人">
+                    </el-table-column>
+                    <el-table-column
+                      prop="createTime"
+                      label="评分时间">
+                    </el-table-column>
+                    <el-table-column
+                      prop="score"
+                      label="分数">
+                    </el-table-column>
+                    <!-- 其他列 -->
+                  </el-table>
+                </template>
+              </Update>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isView === false" >
+          <el-col :span="12">
+            <el-form-item label="评分" prop="score">
+              <el-input
+                type="text"
+                v-model="form.score"
+                placeholder="请进行评分"
+                clearable
+                oninput="this.value = this.value.replace(/[^0-9]/g, '');"
+              />
             </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="submitAduit">提交</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -169,13 +117,125 @@
 </template>
 
 <script>
-import { listApply, getNotice, delNotice, addNotice, updateNotice } from "@/api/reward/apply";
+import {
+  getDetail,
+  applyBack, listScore, getScoreInfo, scoreSave
+} from "@/api/reward/score";
+import CustomTable from "@/components/CustomTable/CustomTable.vue";
+import Update from '@/components/AllTypeFile/update.vue'
 
 export default {
-  name: "Notice",
+  name: "score",
-  dicts: ['sys_notice_status', 'sys_notice_type'],
+  components: {CustomTable, Update},
+  dicts: ['rew_apply_status'],
   data() {
     return {
+      scoreData:[],
+      avgScore:null,
+      templateType:'aduit',
+      dialogType: 'edit',
+      isShowUploadButton:false,
+      //列数据
+      tableColumns: [
+        {label: '创建者', prop: 'createBy', align: 'center'},
+        {label: '奖项名称', prop: 'applyName', align: 'center', showOverflowTooltip: true},
+        {label: '状态', prop: 'scoreStatus', align: 'center', slotName: 'scoreStatus'},
+        {label: '创建时间', prop: 'createTime', align: 'center'},
+        {label: '提交时间', prop: 'appTime', align: 'center', type: 'date'},
+      ],
+      //操作列
+      tableActions: [
+        {text: '查看', icon: 'el-icon-view', handler: this.handleView,},
+        {text: '评分', icon: 'el-icon-edit', handler: this.handleUpdate,},
+      ],
+      //文件上传配置项
+      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',
+        },
+        {
+          name: '盖章后的申报表',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode: 'rew_excellent_category_11',
+        },
+        {
+          name: '综述材料',
+          status: '',
+          expanded: false,
+          childrenList: [],
+          fileCode: 'rew_excellent_category_12',
+        },
+
+      ],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -190,39 +250,74 @@ export default {
       total: 0,
       // 公告表格数据
       noticeList: [],
+      isReadOnly: false,
+      isShowButton: true,
+      isView: false,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      editOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        noticeTitle: undefined,
+        applyName: undefined,
-        createBy: undefined,
+        applyStatus: '2,4',
-        status: undefined
+        applyType:undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        noticeTitle: [
+        applyName: [
-          { required: true, message: "公告标题不能为空", trigger: "blur" }
+          {required: true, message: "奖项名称不能为空", trigger: "blur"}
         ],
-        noticeType: [
+        isReward: [
-          { required: true, message: "公告类型不能为空", trigger: "change" }
+          {required: true, message: "请选择", trigger: "change"}
+        ],
+        score:[
+          {required: true, message: "请进行评分", trigger: "blur"}
         ]
-      }
+      },
+      applyParam: {
+        applyType: ''
+      },
+      applyId: '',
+      scoreId:null
     };
   },
   created() {
-    this.getList();
+
+  },
+  mounted() {
+    this.$store.dispatch('GetInfo').then((res) => {
+      if (res.user.userId === 1){
+        let ratingIndex = this.tableActions.findIndex(action => action.text === '评分');
+        if (ratingIndex !== -1) {
+          // 使用 splice 方法将评分项从数组中删除
+          this.tableActions.splice(ratingIndex, 1);
+        }
+      }
+    })
+    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,
+        applyStatus: '2,4',
+        applyType: this.applyParam.applyType
+      }
+      listScore(item === 'mounted' ? queryObj : this.queryParams).then(response => {
         this.noticeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -231,16 +326,15 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.editOpen = false
       this.reset();
     },
     // 表单重置
     reset() {
       this.form = {
-        noticeId: undefined,
+        // applyName: undefined,
-        noticeTitle: undefined,
+        isReward: undefined,
-        noticeType: undefined,
+        score:undefined
-        noticeContent: undefined,
-        status: "0"
       };
       this.resetForm("form");
     },
@@ -251,61 +345,180 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      // 查询参数
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        applyName: undefined,
+        applyStatus: '2,4'
+      };
       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.single = selection.length != 1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
+    /**查看按钮 */
-    handleAdd() {
+    handleView(row) {
-      this.reset();
+      this.editOpen = true;
-      this.open = true;
+      this.title = "查看奖项";
-      this.title = "添加公告";
+      const applyId = row.applyId || this.ids
+      this.isShowButton = false
+      this.isReadOnly = true
+      this.isView = true
+      getDetail(applyId).then(response => {
+        this.form = response.data;
+        console.log(this.form)
+        this.fileData.forEach((item) => {
+          item.childrenList = []
+        })
+        if (response.code === 200) {
+          response.data.fileRelationVOList.forEach((item) => {
+            let index = this.fileData.findIndex(i => i.fileCode === item.fileCode);
+            if (index !== -1) {
+              this.fileData[index].childrenList.push({
+                name: item.fileName,
+                fileName: item.realName,
+                url: item.filePath,
+                state: item.fileState,
+                fileId: item.fileId,
+                fileCode: item.fileCode,
+              });
+            }
+          });
+        }
+        this.getScoreInfo(row)
+      });
+    },
+    getScoreInfo(row){
+      getScoreInfo(row.applyId).then((res)=>{
+        this.scoreId = res.data.rewScoreInfos[0].scoreId
+        this.form.score = res.data.rewScoreInfos[0].score
+        this.scoreData = res.data.rewScoreInfos
+        this.avgScore = res.data.avgScore
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const noticeId = row.noticeId || this.ids
+      this.isView = false;
-      getNotice(noticeId).then(response => {
+      this.applyId = row.applyId
-        this.form = response.data;
+      this.isReadOnly = true
-        this.open = true;
+      this.isShowButton = true
-        this.title = "修改公告";
+      this.isShowUploadButton = false
+      const applyId = row.applyId || this.ids
+      getDetail(applyId).then(response => {
+        this.form.isReward = response.data.isReward;
+        this.editOpen = true;
+        this.title = "修改奖项";
+        this.fileData.forEach((item) => {
+          item.childrenList = []
+        })
+        if (response.code === 200) {
+          response.data.fileRelationVOList.forEach((item) => {
+            let index = this.fileData.findIndex(i => i.fileCode === item.fileCode);
+            if (index !== -1) {
+              this.fileData[index].childrenList.push({
+                name: item.fileName,
+                fileName: item.realName,
+                url: item.filePath,
+                state: item.fileState,
+                fileId: item.fileId,
+                fileCode: item.fileCode,
+              });
+            }
+
+          });
+        }
+        this.getScoreInfo(row)
       });
     },
-    /** 提交按钮 */
+    submitAduit(){
-    submitForm: function() {
+      let saveParams = {
+        applyId: this.applyId,
+        score: this.form.score,
+        scoreId: this.scoreId
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.noticeId != undefined) {
+          scoreSave(saveParams).then(response => {
-            updateNotice(this.form).then(response => {
+            this.$modal.msgSuccess("保存成功");
-              this.$modal.msgSuccess("修改成功");
+            this.editOpen = false
-              this.open = false;
+            this.getList();
-              this.getList();
+          });
-            });
-          } else {
-            addNotice(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
         }
       });
+      // scoreSave().then(resp => {
+      //   if (resp.code === 200){
+      //     this.$modal.msgSuccess(res.msg)
+      //     this.editOpen = false
+      //     this.getList('mounted')
+      //   }
+      // })
+    },
+    callback(){
+      this.$prompt('请输入退回意见', '退回意见', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+      }).then(({ value }) => {
+        applyBack(this.applyId, value).then(res => {
+          if (res.code === 200){
+            this.$modal.msgSuccess(res.msg)
+            this.editOpen = false
+            this.getList('mounted')
+          }else{
+            this.$modal.msgSuccess(res.msg)
+          }
+        })
+      }).catch(() => {
+
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const noticeIds = row.noticeId || this.ids
+      const applyId = row.applyId || this.ids
-      this.$modal.confirm('是否确认删除公告？').then(function() {
+      this.$modal.confirm('是否确认删除奖项？').then(function () {
-        return delNotice(noticeIds);
+        return delApply(applyId);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        localStorage.removeItem('applyId');
+      }).catch(() => {
+      });
     }
   }
 };
 </script>
+<style scoped lang="scss">
+::v-deep .el-dialog--center .el-dialog__body {
+  padding-bottom: 0;
+}
+
+::v-deep .el-dialog__footer {
+  padding: 0;
+}
+
+.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>