From ca07742dda2394c90b79e98c9fd5206823063b8d Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Tue, 6 Dec 2022 16:54:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=B7=B2=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=8F=8A=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examine/CourseReviewed.vue    | 77 ++++++++++++++++++++++---
 src/views/examine/ProjectReviewed.vue   |  4 +-
 src/views/learningpath/LearningPath.vue |  1 +
 3 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 3eaf1ade..0f619b9f 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -59,6 +59,45 @@
         </div>
       </div>
     </div>
+     <!-- 审核日志弹窗 -->
+     <a-modal
+        v-model:visible="projAuditModal"
+        :footer="null"
+        :closable="closeBack"
+        wrapClassName="projAuditModal"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon"></div>
+              <span>审核记录</span>
+              <!-- <div class="close_exit" @click="closeProjAuditModal"></div> -->
+            </div>
+            <div class="body">
+              <a-table
+                  style="width: 90%"
+                  :columns="columnsAudit"
+                  :data-source="tableDataAudit"
+                  :loading="tableDataTotalAudit === -1 ? true : false"
+                  expandRowByClick="true"
+                  :scroll="{ y: 150 }"
+                  @expand="expandTable"
+                  :pagination="false"
+              />
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1" @click="closeProjAuditModal">
+                <div class="btnText">取消</div>
+              </div>
+              <div class="del_btn btn2" @click="closeProjAuditModal">
+                <div class="btnText">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
   </div>
 </template>
 <script>
@@ -132,15 +171,19 @@ export default {
           key: "msg",
           align: "center",
         },
-        // {
-        //   title: "操作",
-        //   dataIndex: "opt",
-        //   key: "opt",
-        //   align: "center",
-        //   customRender: () => {
-        //     return <div style="color:#387DF7">审核日志</div>;
-        //   },
-        // },
+        {
+          title: "操作",
+          dataIndex: "opt",
+          key: "opt",
+          align: "center",
+          customRender: (value) => {
+            return <div 
+            style="color:#387DF7;cursor:pointer;" 
+            onClick={() => {
+                      showProjAuditModal(value.record.auditList);
+                    }}>审核日志</div>;
+          },
+        },
       ],
       tableData1: [
         // {
@@ -154,6 +197,9 @@ export default {
         //   msg: "-",
         // },
       ],
+      //审核记录的数据
+      tableDataAudit: [],
+      projAuditModal: false,
     });
     const getList = () => {
       let objn = {
@@ -227,12 +273,25 @@ export default {
       //获取分类列表
       state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode }))
     });
+
+    // 显示审核
+    const showProjAuditModal = (data) => {
+      state.tableDataAudit = data
+      state.projAuditModal = true;
+    };
+
+    const closeProjAuditModal = () => {
+      state.projAuditModal = false;
+    };
+
     return {
       ...toRefs(state),
       getList,
       setTableData,
       reset,
       changePagination,
+      showProjAuditModal,
+      closeProjAuditModal
     };
   },
 };
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index fc8c5776..477f1aad 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -201,7 +201,7 @@ export default {
           dataIndex: "status",
           key: "status",
           align: "center",
-          customRender: ({record: {status}}) => <div>{{2: '审核通过', 3: '审核拒绝'}[status]}</div>,
+          customRender: ({record: {status}}) => <div>{status==-2?'未通过':'已通过'}</div>,
         },
         {
           title: "创建人",
@@ -531,7 +531,7 @@ export default {
       .tmplh_btn {
         display: flex;
         // margin-left: 38px;
-        margin-top: 32px;
+        margin-top: 52px;
 
         .btn {
           padding: 0px 26px 0px 26px;
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index dfad713f..0d565ce2 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -1057,6 +1057,7 @@ export default {
         array.push(obj);
       });
       state.tableData = array;
+      console.log(array,tableData)
     };
 
     const tableDataFunc = () => {