页面修改

src/api/teacher/index.js

@@ -131,7 +131,18 @@ export function GetPaperPage(data) {
   })
 }
 
- 
+ /**
+ * 获取试卷分页列表
+ * @param {JSON参数} data
+ */
+export function submitApproval(data) {
+  return request({
+    url: '/Exam/SubmitApproval',
+    method: 'post',
+    data
+  })
+}
+
 
 /**
  * 根据编号获取试卷题目
@@ -169,6 +180,18 @@ export function savePaperFolderInfo(data) {
   })
 }
 
+/**
+ * 批量设置开放状态
+ * @param {JSON参数} data
+ */
+export function batchSetIsOpen(data) {
+  return request({
+    url: '/Exam/BatchSetIsOpen',
+    method: 'post',
+    data
+  })
+}
+
 /**
  * 智能组卷根据模板生成试卷
  * @param {JSON参数} data

src/components/exam/setopen-form.vue

+<template>
+  <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
+    <q-card style="width: 500px;max-width:500px;">
+      <q-card-section>
+        <div class="text-h6">{{optionTitle}}</div>
+      </q-card-section>
+      <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
+        <div class="row wrap">
+          <q-radio v-model="objOption.IsOpen" :val="1" label="私有" />
+          <q-radio v-model="objOption.IsOpen" :val="2" label="公开" />
+        </div>
+      </q-card-section>
+      <q-separator />
+      <q-card-actions align="right" class="bg-white">
+        <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
+        <q-btn label="立即提交" color="accent" class="q-px-md" style="font-weight:400 !important" :loading="saveLoading"
+          @click="setIsOpenInfo" />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script>
+  import {
+    GetPaper,
+    batchSetIsOpen
+  } from '../../api/teacher/index'
+  export default {
+    props: {
+      saveObj: {
+        type: Object,
+        default: null
+      },
+
+    },
+    data() {
+      return {
+        persistent: true,
+        optionTitle: "", //标题
+        objOption: {
+          PaperIds: [],
+          IsOpen: 1, //开放状态
+        },
+        saveLoading: false
+      }
+    },
+    created() {
+
+    },
+    mounted() {
+      this.initObj()
+    },
+    methods: {
+      initObj() {
+        if (this.saveObj) {
+          this.objOption.PaperIds.push(this.saveObj.PaperId);
+          this.objOption.IsOpen=this.saveObj.IsOpen;
+        }
+        this.optionTitle = "修改试卷开放权限"
+      },
+      closeSaveForm() {
+        this.$emit('close')
+        this.persistent = false
+      },
+      setIsOpenInfo() {
+        this.saveLoading = true;
+        batchSetIsOpen(this.objOption).then(res => {
+          this.saveLoading = false
+          this.$q.notify({
+            icon: 'iconfont icon-chenggong',
+            color: 'accent',
+            timeout: 2000,
+            message: '数据保存成功！',
+            position: 'top'
+          })
+          this.$emit("success")
+          this.closeSaveForm()
+        }).catch(() => {
+          this.saveLoading = false
+        })
+      },
+    },
+  }
+
+</script>
+<style>
+</style>

src/pages/exam/examPaper.vue

@@ -182,6 +182,10 @@
         <el-table-column prop="ExamineStatusStr" label="审核状态">
           <template slot-scope="scope">
             {{ scope.row.ExamineStatusStr }}
+            <template v-if="scope.row.ExamineRemark">
+              <q-tooltip :offset="[10, 10]">驳回原因：{{ scope.row.ExamineRemark }}
+              </q-tooltip>
+            </template>
           </template>
         </el-table-column>
         <el-table-column label="操作" width="180">
@@ -192,12 +196,18 @@
             </template>
             <template v-if="scope.row.PaperType==2">
               <q-btn flat size="xs" color="primary" style="font-weight:400" @click="goExameEdit(scope.row)" label="编辑"
-                v-if="currentUserInfo.Id==scope.row.CreateBy" />
+                v-if="currentUserInfo.Id==scope.row.CreateBy &&(scope.row.ExamineStatus==0||scope.row.ExamineStatus==3||scope.row.ExamineStatus==4)" />
             </template>
             <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left: 10px">
               <q-list>
+                <q-item clickable v-close-popup @click="submitAudit(scope.row)"
+                  v-if="scope.row.PaperType==2&&currentUserInfo.Id==scope.row.CreateBy &&(scope.row.ExamineStatus==0||scope.row.ExamineStatus==3||scope.row.ExamineStatus==4) ">
+                  <q-item-section>
+                    <q-item-label>{{scope.row.ExamineStatus==0?'提交审核':"重新提交审核"}}</q-item-label>
+                  </q-item-section>
+                </q-item>
                 <q-item clickable v-close-popup @click="publishExam(scope.row)"
-                  v-if="scope.row.PaperType==2 &&currentUserInfo.Id==scope.row.CreateBy">
+                  v-if="scope.row.PaperType==2 &&currentUserInfo.Id==scope.row.CreateBy&&scope.row.ExamineStatus==2">
                   <q-item-section>
                     <q-item-label>发布考试</q-item-label>
                   </q-item-section>
@@ -212,6 +222,12 @@
                   <q-item-section>
                     <q-item-label>移动到</q-item-label>
                   </q-item-section>
+                </q-item>
+                  <q-item clickable v-close-popup @click="showOpenForm(scope.row)"
+                  v-if="currentUserInfo.Id==scope.row.CreateBy">
+                  <q-item-section>
+                    <q-item-label>设置访问权限</q-item-label>
+                  </q-item-section>
                 </q-item>
                 <q-item clickable v-close-popup @click="copyPaperInfo(scope.row)" v-if="scope.row.PaperType==2">
                   <q-item-section>
@@ -238,21 +254,26 @@
     <movefolderForm v-if="isShowMoveFolder" :saveObj="examObj" :Ids="MoveIds"  @close="closeExamForm"
        @success="refreshPage">
     </movefolderForm>
+    <setopenForm v-if="isShowSetOpenFolder" :saveObj="examObj"  @close="closeExamForm"  @success="refreshPage">
+    </setopenForm>
   </div>
 </template>
 <script>
   import paperfolderForm from '../../components/exam/paperfolder-form'
   import movefolderForm from '../../components/exam/movefolder-form'
+  import setopenForm from '../../components/exam/setopen-form'
   import {
     GetPaperPage,
     deletePaperInfo,
-    copyPaperInfo
+    copyPaperInfo,
+    submitApproval
   } from '../../api/teacher/index';
   //获取校区列表
   export default {
     components: {
       paperfolderForm,
       movefolderForm,
+      setopenForm
     },
     meta: {
       title: "考试管理"
@@ -272,6 +293,7 @@
         dataList: [],
         isShowExamFolder: false, //是否显示新增文件夹
         isShowMoveFolder: false, //是否显示
+        isShowSetOpenFolder: false, //是否显示设置权限
         examObj: {}, //弹窗对象
         navList: [], //导航列表
         IsCreateFolder: false, //是否试卷创建文件夹权限
@@ -292,12 +314,28 @@
           this.IsCreatePaper = true;
         }
       })
-
     },
     mounted() {
       this.getList();
     },
     methods: {
+      //提交审核，重新提交审核
+      submitAudit(item) {
+        submitApproval({
+          PaperId: item.PaperId
+        }).then(res => {
+          if (res.Code == 1) {
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: '操作成功!',
+              position: 'top'
+            })
+            this.refreshPage();
+          }
+        })
+      },
       //全选
       handleSelectionChange(val) {
         this.multipleSelection = val;
@@ -377,10 +415,16 @@
         this.examObj = obj;
         this.isShowExamFolder = true;
       },
+      //实在开放权限
+      showOpenForm(obj) {
+        this.examObj = obj;
+        this.isShowSetOpenFolder = true;
+      },
       //关闭弹窗
       closeExamForm() {
         this.isShowExamFolder = false;
         this.isShowMoveFolder = false;
+        this.isShowSetOpenFolder = false;
       },
       //发布考试
       publishExam(item) {