修改教师报告

src/components/CpdmLeave.vue

@@ -481,11 +481,27 @@ defineExpose({ open })
                             show-overflow-tooltip />
                         <el-table-column fixed="right" prop="auditStatus" label="审核状态" width="" align="center"
                             :formatter="auditStatusFormatter" />
-                        <el-table-column fixed="right" prop="auditResult" label="审核结果" width="" align="center"
-                            :formatter="auditResultFormatter" />
+                        <!-- :formatter="auditStatusFormatter" -->
+                        <el-table-column fixed="right" prop="auditResult" label="审核结果" width="" align="center">
+                            <template #default="scoped">
+                                <div style="display: flex;justify-content: center;align-items: center;"
+                                    v-show="scoped.row.auditResult == '1'">
+                                    <img style="width: 14px;" src="../assets/footer/pass.png" alt="">&nbsp;
+                                    <div>通过</div>
+
+                                </div>
+                                <div style="display: flex;justify-content: center;align-items: center;"
+                                    v-show="scoped.row.auditResult == '0'">
+                                    <img style="width: 14px;" src="../assets/footer/noPass.png" alt="">&nbsp;
+                                    <div>驳回</div>
+
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <!-- <el-table-column fixed="right" prop="auditResult" label="审核结果" width="" align="center"
+                            :formatter="auditResultFormatter" /> -->
                         <el-table-column fixed="right" label="操作" min-width="" align="center">
                             <template #default="scoped">
-
                                 <el-button v-show="scoped.row.auditResult == null" link type="primary" size="small"
                                     @click="editFun(scoped.row, false)">重新编辑</el-button>
                                 <el-button link type="primary" size="small" style="margin-left: 0px;"

src/components/CpmdHeader.vue

@@ -130,12 +130,12 @@ const leaveFun = () => {
                         <div class="update_pass" @click="updatePassFun">
                             修改密码
                         </div>
-                        <div class="exit_login" @click="exitFun">
-                            退出登录
-                        </div>
                         <div class="exit_login" @click="leaveFun">
                             我的请假
                         </div>
+                        <div class="exit_login" @click="exitFun">
+                            退出登录
+                        </div>
                     </div>
                 </transition>
 

src/components/CpmdQuestionnaire.vue

@@ -52,7 +52,16 @@ const questionList = ref<any>()
 const queryQuestion = async (planId: string) => {
     //
     questionList.value = [];
-    let list: any = await queryQuestionApi('0')
+    console.log(userInfo.userInfo.roleType)
+    let paramsNum = ''
+    if (userInfo.userInfo.roleType == '2') {
+        paramsNum = '1'
+    }
+    if (userInfo.userInfo.roleType == '1') {
+        paramsNum = '0'
+    }
+    //查询当前用户登录类型
+    let list: any = await queryQuestionApi(paramsNum)
     for (let i = 0; i < list.data.length; i++) {
         let obj = {
             quesId: list.data[i].id,