From 05757da5eec9894f6a288fcdff3990dbc73b1881 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 22 May 2024 12:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InstructorCertification.vue               |  2 +
 .../gratefulteacher/LecturerManagement.vue    | 41 ++++++++++++++-----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/views/gratefulteacher/InstructorCertification.vue b/src/views/gratefulteacher/InstructorCertification.vue
index 7216bd26..64b245da 100644
--- a/src/views/gratefulteacher/InstructorCertification.vue
+++ b/src/views/gratefulteacher/InstructorCertification.vue
@@ -272,6 +272,7 @@ const searchValue = ref('')
 //搜索功能
 const Administrator= ref(1)
 const search = async()=>{
+  current1.value = 1
   loading.value = true
 if(uploadAdmin('examine-admin')){
   Administrator.value = 0
@@ -290,6 +291,7 @@ console.log(999);
 }
 //重置
 const handleRest = ()=>{
+  current1.value = 1
   searchValue.value = null
   getlist()
 
diff --git a/src/views/gratefulteacher/LecturerManagement.vue b/src/views/gratefulteacher/LecturerManagement.vue
index d9a9bc56..6e227779 100644
--- a/src/views/gratefulteacher/LecturerManagement.vue
+++ b/src/views/gratefulteacher/LecturerManagement.vue
@@ -155,27 +155,32 @@ const ViewReviewcolumns = reactive([
     title: '序号',
     key: 'name',
     dataIndex: 'name',
+    fixed: 'left',
   },
   {
     title: '姓名',
     key: '姓名',
     dataIndex: '姓名',
+    fixed: 'left',
   },
   {
     title: '工号',
     key: '工号',
     dataIndex: '工号',
+    fixed: 'left',
   },
   {
     title: '认证结果',
     key: '认证结果',
     dataIndex: '认证结果',
+    fixed: 'left',
   },
 
   {
     title: '平均分',
     key: '平均分',
     dataIndex: '平均分',
+    fixed: 'right',
   },
 ]);
 const ViewReviewdata = ref([])
@@ -268,12 +273,13 @@ function timeChangeEnd(timeStr) {
   formState.time = timeStr
   // formData.value.endTime = timeStr;
 }
+const pageSizeSele = ref(15)
 //添加讲师
 const addTeacherList = async (id) => {
 
   const res = await addTeacher({
     "examineId": route.query.id,
-    "pageSize": 15,
+    "pageSize": pageSizeSele.value,
     "pageNo": teacherCurrent1.value,
     "teacherSearch": "",
     reviewId: id,
@@ -340,14 +346,21 @@ const arrayLists = ref([])
 const remould = () => {
   let keys = Object.keys(ViewReList.value);
   arrayLists.value = keys.filter(key => Array.isArray(ViewReList.value[key]));
+  ViewReviewcolumns.splice(4)
+  ViewReviewcolumns.push({
+    title: '平均分',
+    key: '平均分',
+    dataIndex: '平均分',
+    fixed: 'right',
+  })
   if(arrayLists.value.length!=0){
-    ViewReviewcolumns.splice(3)
     arrayLists.value.forEach(arrayKey => {
       if (!ViewReviewcolumns.some(column => column.key === arrayKey)) {
         ViewReviewcolumns.push({
           title: arrayKey,
           key: arrayKey,
           dataIndex: arrayKey,
+          fixed: arrayKey=='认证结果'?'left':arrayKey=='平均分'?'right':'',
         });
         const averageScoreColumn = ViewReviewcolumns.find(column => column.title == "平均分");
         if (averageScoreColumn) {
@@ -355,6 +368,12 @@ const remould = () => {
           ViewReviewcolumns.splice(index, 1);
           ViewReviewcolumns.push(averageScoreColumn);
         }
+        const averageScore = ViewReviewcolumns.find(column => column.title === "认证结果");
+        if (averageScore) {
+          const index = ViewReviewcolumns.indexOf(averageScore);
+          ViewReviewcolumns.splice(index, 1);
+          ViewReviewcolumns.splice(3, 0, averageScore);
+        }
       }
     });
 
@@ -369,6 +388,7 @@ const remould = () => {
       }
       ViewReviewdata.value.push(obj);
     }
+    console.log(ViewReviewdata.value,'ViewReviewdata.value')
   }
 }
 //评审按钮显示
@@ -413,6 +433,7 @@ const onChangeReview = (pageNo, pageSize) => {
 const reviewValue = ref('')
 //重置评审
 const resetReview = () => {
+  ReviewPageNo.value = 1
   reviewValue.value=''
   getReviewList()
 }
@@ -423,7 +444,7 @@ const searchReview = async () => {
 
   //   }
   // console.log(reviewValue.value.trim().length);
-
+  ReviewPageNo.value = 1
   const res = await getReview({
     examineId:route.query.id,
     pageNo: ReviewPageNo.value,
@@ -842,11 +863,11 @@ const show= async (record)=>{
 const returnPage = (record) => {
   console.log(record,'record')
   dialog({
-    content: "确定退回初稿吗？",
+    content: record.endStatus==0?'确定退回终稿吗？':"确定退回初稿吗？",
     ok:()=>{
       backDraft({
         teacherId:record.teacherId,
-        version:0
+        version:record.endStatus==0?1:0
       }).then(res=>{
         message.success('退回成功')
         getTeacher()
@@ -1029,8 +1050,8 @@ const vwtext = ref(null)
           <a  style="margin-right: 7px;" @click="show(record)">
           查看
           </a>
-          <a v-if="record.draftStatus == 0&&uploadAdmin('examine-admin')" style="margin-right: 7px;" @click="returnPage(record)">
-          退回初稿
+          <a v-if="(record.draftStatus == 0||record.endStatus==0)&&uploadAdmin('examine-admin')&&record.endStatus!=2" style="margin-right: 7px;" @click="returnPage(record)">
+          {{record.endStatus==0?'退回终稿':'退回初稿'}}
           </a>
           <a v-if="route.query.isView!=0" style="color: #de2139" @click="handleOper(record, 'del')">删除</a>
         </span>
@@ -1077,7 +1098,7 @@ const vwtext = ref(null)
         </span>
       </template>   <template v-else-if="column.key === 'endStatus'">
         <span>
-        {{ text===1?'未开始':(text===2?'进行中':'已完成') }}
+        {{ text===1?'未开始':(text===2?'已退回':'已完成') }}
         </span>
       </template>
       <template v-else-if="column.key === 'reviewResult'">
@@ -1200,7 +1221,7 @@ const vwtext = ref(null)
 
               <!-- 查看评审 -->
               <a-drawer v-model:visible="ViewReviewShow" class="custom-class" :closable="false" placement="right"
-                width="726px">
+                width="80%">
                 <div class="header" style="margin-bottom: 20px;">
                   <div class="headerTitle">查看评审</div>
                   <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@@ -1300,7 +1321,7 @@ const vwtext = ref(null)
                 </a-table>
               </div>
               <div style="width: 100%;text-align: center;margin-top: 19px;">
-              <a-pagination  v-model:current="teacherCurrent1" show-quick-jumper :total="teacherTotal"
+              <a-pagination  v-model:pageSize="pageSizeSele" v-model:current="teacherCurrent1" show-quick-jumper :total="teacherTotal"
                 @change="onChange3" />
               </div>
               <a-form-item>