feat:增加待审核项目修改记录页面

.env

@@ -1,7 +1,7 @@
  # 本项目基础url
 VUE_APP_BASE=/manage
 # api项目基础url
-VUE_APP_BASE_API=/manage
+VUE_APP_BASE_API=/manageApi
 #文件路径
 VUE_APP_FILE_PATH=/upload/
 # 代理url 本地调试，不可以用在其他地方

src/components/drawers/ProjectAudit.vue

@@ -1,11 +1,19 @@
 <template>
-  <a-drawer :visible="ProjAuditvisible" class="drawerStyle ProjectAudit" placement="right" width="60%"
+  <a-drawer
-            @after-visible-change="afterVisibleChange">
+    :visible="ProjAuditvisible"
+    class="drawerStyle ProjectAudit"
+    placement="right"
+    width="60%"
+    @after-visible-change="afterVisibleChange"
+  >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">审核项目</div>
-        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+        <img
-             @click="closeDrawer"/>
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
       </div>
       <div class="main" style="padding-right: 10px">
         <a-tabs v-model:activeKey="activeSetKey">
@@ -21,37 +29,55 @@
                 <div class="set_content">
                   <div class="setc_name"><span>封面图：</span></div>
                   <div class="setc_main">
-                    <img style="width: 151px; height: 84px" :src="projectInfo.picUrl" alt=""/>
+                    <img
+                      style="width: 151px; height: 84px"
+                      :src="projectInfo.picUrl"
+                      alt=""
+                    />
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>项目时间：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ projectInfo.beginTime }} ～ {{ projectInfo.endTime }}</span>
+                    <span style="color: #999999"
+                      >{{ projectInfo.beginTime }} ～
+                      {{ projectInfo.endTime }}</span
+                    >
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>项目经理：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ projectInfo.manager }}</span>
+                    <span style="color: #999999">{{
+                      projectInfo.manager
+                    }}</span>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>资源归属：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ (projectInfo.sourceBelongFullName || '')+projectInfo.sourceBelongName }}</span>
+                    <span style="color: #999999">{{
+                      (projectInfo.sourceBelongFullName || "") +
+                      projectInfo.sourceBelongName
+                    }}</span>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>项目级别：</span></div>
                   <div class="setc_main">
-                    <ProjectLevel v-model:value="projectInfo.level" :tag="true"></ProjectLevel>
+                    <ProjectLevel
+                      v-model:value="projectInfo.level"
+                      :tag="true"
+                    ></ProjectLevel>
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>培训体系：</span></div>
                   <div class="setc_main">
-                    <TrainClass v-model:value="projectInfo.systemId" :tag="true"></TrainClass>
+                    <TrainClass
+                      v-model:value="projectInfo.systemId"
+                      :tag="true"
+                    ></TrainClass>
                   </div>
                 </div>
                 <div class="set_content">
@@ -63,9 +89,14 @@
                       :unCheckedValue="0"
                       :disabled="true"
                       ><span
-                        style="width: 100%;color: rgba(109, 117, 132, 1);font-size: 14px;"
+                        style="
+                          width: 100%;
+                          color: rgba(109, 117, 132, 1);
+                          font-size: 14px;
+                        "
                         >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                    ></a-switch>
+                      ></a-switch
+                    >
                   </div>
                 </div>
                 <div class="set_content" v-if="projectInfo.boeFlag">
@@ -79,7 +110,7 @@
                     ></a-switch>
                   </div>
                 </div>
-                <div class="set_content" v-if="projectInfo.remark ">
+                <div class="set_content" v-if="projectInfo.remark">
                   <div class="setc_name"><span>项目说明：</span></div>
                   <div class="setc_main">
                     <span style="color: #999999">{{ projectInfo.remark }}</span>
@@ -94,7 +125,70 @@
               </button>
             </div>
           </a-tab-pane>
-          <!-- <a-tab-pane key="2" tab="修改记录"></a-tab-pane> -->
+          <a-tab-pane key="2" tab="修改记录" class="record">
+            <div
+              class="tableBox"
+              v-if="showRecord"
+              style="
+                margin-top: 22px;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                margin-bottom: 20px;
+              "
+            >
+              <a-table
+                style="border: 1px solid #f2f6fe"
+                :columns="columns"
+                :data-source="tableData"
+                :loading="tableDataTotal === -1 ? true : false"
+                :scroll="{ x: 900 }"
+                :pagination="false"
+              >
+                <template #expandedRowRender="{ record }">
+                  <div class="reworkTitle">
+                    <div style="width: 20%; text-align: center">内容</div>
+                    <div style="width: 40%; text-align: center">修改前</div>
+                    <div style="width: 40%; text-align: center">修改后</div>
+                  </div>
+                  <div
+                    v-for="(elem, index) in record.data"
+                    :key="index"
+                    class="reworkCon"
+                  >
+                    <div style="width: 20%; text-align: center">
+                      {{ elem.content }}
+                    </div>
+                    <div style="width: 40%; text-align: center">
+                      {{ elem.before }}
+                    </div>
+                    <div style="width: 40%; text-align: center">
+                      {{ elem.after }}
+                    </div>
+                  </div>
+                </template>
+              </a-table>
+              <div class="pa" style="margin-top: 20px">
+                <a-pagination
+                  v-if="tableDataTotal > 10"
+                  :showSizeChanger="false"
+                  showQuickJumper="true"
+                  hideOnSinglePage="true"
+                  :pageSize="pageSize"
+                  :current="currentPage"
+                  :total="tableDataTotal"
+                  class="pagination"
+                  @change="handelChangePage"
+                />
+              </div>
+            </div>
+
+            <div class="detaile">
+              <button class="debtn" @click="changeRe">
+                详情{{ showDetail ? "折叠" : "展开" }}
+              </button>
+            </div>
+          </a-tab-pane>
         </a-tabs>
         <div class="audit">
           <div class="set_content">
@@ -107,31 +201,35 @@
             </div>
           </div>
           <div class="set_content">
-            <div class="sign" style="position:relative;left:70px;top:-3px;">
+            <div class="sign" style="position: relative; left: 70px; top: -3px">
-              <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
+              <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
             </div>
             <div class="setc_name"><span>审核意见：</span></div>
             <div class="setc_main">
-              <a-textarea v-model:value="valueSuggest" :rows="4"  show-count
+              <a-textarea
-                  :maxlength="20"/>
+                v-model:value="valueSuggest"
+                :rows="4"
+                show-count
+                :maxlength="20"
+              />
             </div>
           </div>
         </div>
-        <div class="detaile">
-          <button class="can" @click="closeDrawer">取消</button>
-          <button class="debtn" @click="subMit">提交</button>
       </div>
+      <div class="btnn">
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 
 <script>
-import {toRefs, reactive, onMounted} from "vue";
+import { toRefs, reactive, onMounted } from "vue";
-import {getTask} from "../../api/indexTaskadd";
+import { getTask } from "../../api/indexTaskadd";
-import {toDate} from "../../api/method";
+import { toDate } from "../../api/method";
-import {auditView} from "../../api/indexAudit";
+import { auditView } from "../../api/indexAudit";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 import * as api1 from "@/api/index1";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import TrainClass from "@/components/project/TrainClass";
@@ -161,8 +259,8 @@ export default {
     },
     finishdFun: {
       type: Function,
-      default: null
+      default: null,
-    }
+    },
   },
 
   setup(props, ctx) {
@@ -171,6 +269,7 @@ export default {
       checkedBOEU: false, //是否BOEU实施
       checkedSty: false, //同步学习记录
       showDetail: false,
+      showRecord: false, //修改记录
       valuePass: "1",
       valueSuggest: null,
       //基本信息
@@ -201,13 +300,102 @@ export default {
       attach: null,
       calssifyList: [],
       faceclassScene: [],
-      projectInfo: {}
+      projectInfo: {},
+
+      tableDataTotal: 20,
+      pageSize: 10,
+      currentPage: 1,
+      tableData: [
+        {
+          key: 1,
+          people: "张三",
+          time: "2023-01-13",
+          data: [
+            {
+              content: "项目归属",
+              before: "产品部",
+              after: "研发部",
+            },
+            {
+              content: "项目时间",
+              before: "2022-10-31 23:00～2022-11-10  23:00",
+              after: "2022-11-11 23:00～2022-11-30  23:00",
+            },
+          ],
+        },
+        {
+          key: 2,
+          people: "张三",
+          time: "2023-01-13",
+          data: [
+            {
+              content: "项目归属",
+              before: "产品部",
+              after: "研发部",
+            },
+            {
+              content: "项目时间",
+              before: "2022-10-31 23:00～2022-11-10  23:00",
+              after: "2022-11-11 23:00～2022-11-30  23:00",
+            },
+          ],
+        },
+      ],
+      columns: [
+        {
+          title: "修改人",
+          dataIndex: "people",
+          key: "people",
+          align: "center",
+          className: "h",
+          width: "40%",
+        },
+        {
+          title: "修改时间",
+          dataIndex: "time",
+          key: "time",
+          align: "center",
+          className: "h",
+          width: "40%",
+        },
+      ],
+
+      tableData2: [
+        {
+          key: 1,
+          people: "张三",
+          time: "2023-01-13",
+        },
+      ],
+      columns2: [
+        {
+          title: "内容",
+          dataIndex: "people",
+          key: "people",
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "修改前",
+          dataIndex: "time",
+          key: "time",
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "修改后",
+          dataIndex: "time",
+          key: "time",
+          align: "center",
+          className: "h",
+        },
+      ],
     });
 
     const closeDrawer = () => {
       ctx.emit("update:ProjAuditvisible", false);
-      console.log(props.finishdFun)
+      console.log(props.finishdFun);
-      props.finishdFun && props.finishdFun()
+      props.finishdFun && props.finishdFun();
       state.valueSuggest = null;
       state.valuePass = "1";
     };
@@ -283,10 +471,14 @@ export default {
     const changeDe = () => {
       state.showDetail = !state.showDetail;
     };
+    const changeRe = () => {
+      state.showRecord = !state.showRecord;
+    };
+
     const subMit = () => {
       if (!state.valueSuggest) {
         message.error(`请输入审核意见！`);
-        return
+        return;
       }
 
       auditView({
@@ -307,14 +499,23 @@ export default {
           message.warning("提交失败");
         });
     };
-    const getDictList = async (param) => api1.getDict({
+    const getDictList = async (param) =>
+      api1
+        .getDict({
           pageNo: 1,
           pageSize: 20,
-      setCode: param
+          setCode: param,
-    }).then((res) => res.data.data.rows)
+        })
+        .then((res) => res.data.data.rows);
     onMounted(async () => {
-      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({label: e.dictName, value: e.dictCode})) //内容
+      state.calssifyList = (await getDictList("faceclassClass")).map((e) => ({
-      state.faceclassScene = (await getDictList("faceclassScene")).map(e => ({label: e.dictName, value: e.dictCode})) //场景
+        label: e.dictName,
+        value: e.dictCode,
+      })); //内容
+      state.faceclassScene = (await getDictList("faceclassScene")).map((e) => ({
+        label: e.dictName,
+        value: e.dictCode,
+      })); //场景
     });
     return {
       ...toRefs(state),
@@ -322,6 +523,7 @@ export default {
       afterVisibleChange,
       getTaskInfo,
       changeDe,
+      changeRe,
       subMit,
     };
   },
@@ -486,6 +688,56 @@ export default {
           }
         }
       }
+      .record {
+        .reworkTitle {
+          height: 56px;
+          display: flex;
+          align-items: center;
+          background-color: #fafafa;
+        }
+        .reworkCon {
+          height: 56px;
+          display: flex;
+          align-items: center;
+          border-bottom: 1px solid #f0f6fc;
+          background-color: #fff;
+        }
+        .ant-table-thead > tr > th {
+          background: #f0f6fc;
+        }
+        tr.ant-table-expanded-row > td,
+        tr.ant-table-expanded-row:hover > td {
+          padding: 0px;
+        }
+      }
+    }
+    .btnn {
+      height: 72px;
+      width: 100%;
+      background-color: #fff;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+      .btn1 {
+        width: 100px;
+        height: 40px;
+        border: 1px solid #4ea6ff;
+        border-radius: 8px;
+        color: #4ea6ff;
+        background-color: #fff;
+        cursor: pointer;
+      }
+      .btn2 {
+        cursor: pointer;
+        width: 100px;
+        height: 40px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
     }
   }
 }

src/components/drawers/project/ProjectHomeWorkManage.vue

@@ -138,7 +138,7 @@
     v-model:searchTaskList="searchTaskList"
   />
   <!-- 查看作业抽屉 -->
-  <CKWork v-model:CWvisible="CWvisible" />
+  <CKWork v-model:CWvisible="CWvisible" :workId="projectTaskInfo?.courseId" />
   <!-- 查看答卷抽屉 -->
   <CQue v-model:CQvisible="CQvisible" />
 
@@ -441,12 +441,7 @@ export default {
                 justifyContent: "center",
               }}
             >
-              <a-button
+              <a-button class="operation" style="margin-right:10px;" disabled>
-                type="link"
-                class="operation"
-                style="cursor:pointer;margin-right:10px;"
-                disabled
-              >
                 查看
               </a-button>
             </div>