Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/views/examine/CourseReviewed.vue

@@ -65,7 +65,7 @@
           <a-table
             :columns="columns1"
             :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
+            :loading="loading"
             expandRowByClick="true"
             @expand="expandTable"
             :scroll="{ x: 1300 }"
@@ -203,9 +203,7 @@ export default {
           title: "内容分类",
           dataIndex: "content",
           key: "content",
-          align: "center",
-          customRender: ({ text }) =>
-            state.calssifyList.find((e) => e.value == text)?.label,
+          align: "center"
         },
         {
           title: "审核状态",
@@ -245,7 +243,7 @@ export default {
                 style="color:#387DF7;cursor:pointer;"
                 onClick={() => {
                   console.log(value);
-                  showProjAuditModal(value.record.auditLogDtoList);
+                  showProjAuditModal(value.record.auditLogDtoList.length!==0?value.record.auditLogDtoList.slice(0,1):[]);
                 }}
               >
                 审核日志
@@ -269,8 +267,149 @@ export default {
       //审核记录的数据
       tableDataAudit: [],
       projAuditModal: false,
+      loading:false,
+      // 课程三级分类
+      options2222:[
+        {
+          title: '领导力',
+          value: '100',
+          selectable:false,
+          children: [
+            {
+              title: '领导业务',
+              value: '1001',
+            },
+            {
+              title: '领导团队',
+              value: '1002',
+            },
+            {
+              title: '领导自我',
+              value: '1003',
+            },
+          ],
+        },
+        {
+          title: '专业力',
+          value: '200',
+          selectable:false,
+          children: [
+            {
+              title: '研发',
+              value: '2001',
+            },
+            {
+              title: '产品和解决方案',
+              value: '2002',
+            },
+            {
+              title: '生产技术与制造',
+              value: '2003',
+            },
+            {
+              title: '供应链',
+              value: '2004',
+            },
+            {
+              title: '营销',
+              value: '2005',
+            },
+            {
+              title: '品质',
+              value: '2006',
+            },
+            {
+              title: '战略与企划',
+              value: '2007',
+            },
+            {
+              title: '流程管理',
+              value: '2008',
+            },
+            {
+              title: '业绩管理',
+              value: '2009',
+            },
+            {
+              title: '项目管理',
+              value: '20010',
+            },
+            {
+              title: '信息技术',
+              value: '20011',
+            },
+            {
+              title: '环境与安全',
+              value: '20012',
+            },
+            {
+              title: '人力资源',
+              value: '20013',
+            },
+            {
+              title: '企业文化',
+              value: '20014',
+            },
+            {
+              title: '品牌',
+              value: '20015',
+            },
+            {
+              title: '财务',
+              value: '20016',
+            },
+            {
+              title: '法务',
+              value: '20017',
+            },
+            {
+              title: '行政',
+              value: '20018',
+            },
+            {
+              title: '医工',
+              value: '20019',
+            }
+          ],
+        },
+        {
+          title: '通用力',
+          value: '300',
+          selectable:false,
+          children: [
+            {
+              title: '职业操守与道德',
+              value: '3001',
+            },
+            {
+              title: '职业素养与技能',
+              value: '3002',
+            },
+            {
+              title: '规章制度',
+              value: '3003',
+            },
+          ], 
+        }
+      ],
     });
+
+   // 课程三级分类回显
+   const sHX = (data) => {
+      let str = '-'
+      let sdata = state.options2222
+      for(let i =0; i<sdata.length;i++){
+          for(let j=0;j<sdata[i].children.length;j++){
+            if (String(sdata[i].children[j].value) === String(data)) {
+               str = sdata[i].children[j].title;
+            }
+          }
+      }
+      return str
+    }
+
     const getList = () => {
+      state.loading=true
       let objn = {
         auditStatus: 0,
         categoryId: Number(state.valueproj),
@@ -285,6 +424,7 @@ export default {
           console.log("获取已审核课程成功", res.data.data);
           state.total = res.data.data.total;
           setTableData(res.data.data.rows);
+          state.loading=false
         })
         .catch((err) => {
           console.log("获取已审核课程失败", err);
@@ -302,7 +442,7 @@ export default {
           number: n + 1 + (state.currentPage - 1) * 10,
           name: item.name || "- ",
           type: item.type == 1 ? "线上" : "线下",
-          content: item.categoryId,
+          content: sHX(item.categoryId),
           status:
             item.auditStatus == 0
               ? "未提交"