Merge branch 'compulsory_professional_skills' into test20250220

src/components/growthpath/StudentSeeStu.vue

@@ -120,7 +120,7 @@
                 </div>
               </div>
             </template>
-            <template #action="{ record }">
+            <!-- <template #action="{ record }">
               <template
                 v-if="
                   record.completionStatus == 2 && checkMenu('growthStudentMarkComplete')
@@ -133,7 +133,7 @@
               <template v-else>
                 <div>--</div>
               </template>
-            </template>
+            </template> -->
           </a-table>
         </div>
       </div>
@@ -171,7 +171,7 @@ export default {
         title: "类型",
         dataIndex: "courseType",
         key: "courseType",
-        width: 80,
+        width: 120,
         align: "center",
         ellipsis: true,
         slots: { customRender: "courseType" },
@@ -180,7 +180,6 @@ export default {
         title: "任务名称",
         dataIndex: "taskName",
         key: "taskName",
-        width: 80,
         align: "center",
         ellipsis: true,
       },
@@ -188,9 +187,9 @@ export default {
         title: "必修/选修",
         dataIndex: "taskType",
         key: "taskType",
-        width: 30,
         align: "center",
         ellipsis: true,
+        width: 120,
         customRender: ({ record: { taskType } }) =>
           ({
             1: "必修",
@@ -201,23 +200,23 @@ export default {
         title: "开始时间",
         dataIndex: "startTime",
         key: "startTime",
-        width: 50,
         align: "center",
+        width: 200,
         ellipsis: true,
       },
       {
         title: "完成时间",
         dataIndex: "finishTime",
         key: "finishTime",
-        width: 50,
         align: "center",
+        width: 200,
       },
       {
         title: "任务状态",
         dataIndex: "completionStatus",
         key: "completionStatus",
-        width: 30,
         align: "center",
+        width: 120,
         customRender: ({ record: { completionStatus } }) =>
           ({
             2: "进行中",
@@ -225,14 +224,14 @@ export default {
             0: "未开始",
           }[completionStatus]),
       },
-      {
+      // {
-        title: "操作",
+      //   title: "操作",
-        dataIndex: "operation",
+      //   dataIndex: "operation",
-        key: "operation",
+      //   key: "operation",
-        width: 50,
+      //   width: 50,
-        align: "center",
+      //   align: "center",
-        slots: { customRender: "action" },
+      //   slots: { customRender: "action" },
-      },
+      // },
     ]);
     const formData = ref()
     const openDrawer = (row) => {

src/views/growthpath/GrowthPath.vue

@@ -93,6 +93,11 @@
               <a-dropdown
                 :getPopupContainer="(triggerNode) => triggerNode.parentNode"
                 :trigger="['click']"
+                v-if="
+                  (record.isPublished && checkMenu('growthRevoke')) ||
+                  checkMenu('growthModifyDiscipline') ||
+                  (record.dataSource === '2' && checkMenu('growthDelete'))
+                "
               >
                 <a class="ant-dropdown-link" @click.prevent>
                   更多
@@ -110,10 +115,7 @@
                     </a-menu-item>
                     <a-menu-item
                       key="3"
-                      v-if="
+                      v-if="checkMenu('growthModifyDiscipline')"
-                        record.isPublished &&
-                        checkMenu('growthModifyDiscipline')
-                      "
                     >
                       <a-button type="link" @click="updateList(record)">
                         修改记录
@@ -501,18 +503,17 @@ export default {
         ok: () => {
           published({
             growId: item.id,
-          })
+          }).then((res) => {
-            .then((res) => {
+            if (res.data.code == 200) {
-              if (res.data.code == 200) {
+              message.success("发布成功");
-                message.success("发布成功");
+              listDatas();
-                listDatas();
+            } else {
-              } else {
+              message.error(err.data.msg);
-                message.error(err.data.msg);
+            }
-              }
+          });
-            })
+          // .catch((err) => {
-            // .catch((err) => {
+          //   message.error(err.data.msg);
-            //   message.error(err.data.msg);
+          // });
-            // });
         },
       });
     };