feat:合并

src/components/drawers/ProjectAudit.vue

@@ -457,9 +457,10 @@ export default {
 
     //获取项目修改记录
     const getrecord = () => {
+      console.log("props.chooseProject", props.chooseProject);
       editRecord(props.chooseProject)
         .then((res) => {
-          console.log("获取修改记录", res);
+          console.log("获取修改记录2", res);
           if (res.data.code === 200) {
             state.tableData = res.data.data.records;
             // console.log("state.tableData", state.tableData);

src/components/student/TableStudent.vue

@@ -117,7 +117,7 @@
           导出学习信息
         </a-button>
       </a-col>
-      
+
       <a-col :span="1.5" v-if="type === 2">
         <a-button class="cus-btn white" @click="exportTaskStuRouter">
           导出学习信息
@@ -196,7 +196,7 @@
         :scroll="{ x: 1500 }"
         row-key="id"
         :row-selection="stuRowSelection"
-      > 
+      >
         <template #action="{ record }">
           <!--					<div style="display:flex;justify-content: center;align-items: center;">-->
           <!-- <div v-if="props.type == 1" @click="excellentStudent(record)"
@@ -218,7 +218,7 @@
             <a-col>
               <slot name="extension" v-bind:data="{ record }"></slot>
             </a-col>
-            <!-- 新加 换组 通过 拒绝
+            <!-- 新加 换组 通过 拒绝 -->
             <a-col v-if="type === 1">
               <div
                 style="
@@ -232,18 +232,29 @@
                 换组
               </div>
             </a-col>
--->         
+            <a-col v-if="type === 3 && record.status !== 0">
-            <a-col v-if="type === 3 && record.status!==0">
               <div
-                style=" color: #4ea6ff; font-size: 14px;text-align: center; margin-left: 10px; cursor: pointer; "
+                style="
+                  color: #4ea6ff;
+                  font-size: 14px;
+                  text-align: center;
+                  margin-left: 10px;
+                  cursor: pointer;
+                "
                 @click="updateStatus(0, record.id)"
               >
                 通过
               </div>
             </a-col>
-            <a-col v-if="type === 3 && record.status!==0">
+            <a-col v-if="type === 3 && record.status !== 0">
               <div
-                style=" color: #4ea6ff;font-size: 14px;text-align: center; margin-left: 10px;cursor: pointer; "
+                style="
+                  color: #4ea6ff;
+                  font-size: 14px;
+                  text-align: center;
+                  margin-left: 10px;
+                  cursor: pointer;
+                "
                 @click="updateStatus(2, record.id)"
               >
                 拒绝
@@ -252,7 +263,13 @@
             <a-col>
               <div
                 @click="del(record.id)"
-                style=" color: #4ea6ff;font-size: 14px;text-align: center; margin-left: 10px; cursor: pointer;"
+                style="
+                  color: #4ea6ff;
+                  font-size: 14px;
+                  text-align: center;
+                  margin-left: 10px;
+                  cursor: pointer;
+                "
               >
                 删除
               </div>
@@ -458,7 +475,7 @@ const tablecolumns = ref([
     className: "h",
     ellipsis: true,
     customRender: ({ record: { studentOrgName, studentDepartName } }) =>
-      (allDepartShow(studentOrgName, studentDepartName)),
+      allDepartShow(studentOrgName, studentDepartName),
   },
   {
     title: "加入方式",
@@ -468,7 +485,15 @@ const tablecolumns = ref([
     align: "center",
     customRender: ({ record: { source } }) =>
       // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]),
-      ({ 0: "手动加入", 1: "手动加入", 2: "手动加入", 3: "手动加入", 4: "报名", 5: "手动加入", 6: "手动加入"}[source]),
+      ({
+        0: "手动加入",
+        1: "手动加入",
+        2: "手动加入",
+        3: "手动加入",
+        4: "报名",
+        5: "手动加入",
+        6: "手动加入",
+      }[source]),
   },
   ...props.columns,
   {
@@ -481,10 +506,15 @@ const tablecolumns = ref([
   },
 ]);
 
-function allDepartShow(a,b) {
+function allDepartShow(a, b) {
-  let org = (a=="" || a == null || a == undefined) ? a = "" : a.slice(0,1) =='/' ? a.slice(1,a.length) : a;
+  let org =
-  let depart = (b=="" || b == null || b == undefined) ? b = "" : b;
+    a == "" || a == null || a == undefined
-  let allname = org == "" && depart == "" ? '-' : org + depart;
+      ? (a = "")
+      : a.slice(0, 1) == "/"
+      ? a.slice(1, a.length)
+      : a;
+  let depart = b == "" || b == null || b == undefined ? (b = "") : b;
+  let allname = org == "" && depart == "" ? "-" : org + depart;
   return allname;
 }
 
@@ -521,7 +551,7 @@ function exportTaskStu() {
     }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}`
   );
 }
- 
+
 function exportTaskStuRouter() {
   console.log("props.datasource", props);
   window.open(
@@ -943,8 +973,6 @@ const AddImpStuvisibleClose = (isget) => {
       background-image: url("@/assets/images/coursewareManage/export.png");
     }
   }
-
- 
 }
 /*.delete {
   z-index: 9999;

src/views/courselibrary/CoursewareManage.vue

@@ -2353,18 +2353,18 @@ import { useStore } from "vuex";
 
 //列表表格
 const columns1 = [
-  // {
+  {
-  //   title: "序号",
+    title: "课程编号",
-  //   width: 100,
+    width: 100,
-  //   dataIndex: "num",
+    dataIndex: "num",
-  //   key: "num",
+    key: "num",
-  //   align: "center",
+    align: "center",
-  //   customRender: ({ index, record }) => {
+    customRender: ({ index, record }) => {
-  //     const pageNum =
+      const pageNum =
-  //       Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+        Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
-  //     return index + 1 + pageNum;
+      return index + 1 + pageNum;
-  //   },
+    },
-  // },
+  },
   {
     title: "名称",
     width: 400,