-- 审核bug

src/views/examine/CourseReviewed.vue

@@ -15,34 +15,33 @@
           <div class="inpbox">
             <div class="inpbox1">
               <a-select
-                v-model:value="valueproj"
+                  v-model:value="valueproj"
-                placeholder="请选择内容分类"
+                  value-key="value"
-                @change="handleChangeproj"
+                  :options="[{label:'请选择内容分类',value:''},...calssifyList]"
-                :options="optionsproj"
               />
             </div>
             <div class="inpbox1">
               <a-input
-                v-model:value="valuecreater"
+                  v-model:value="valuecreater"
-                style="
+                  style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                placeholder="请输入创建人"
+                  placeholder="请输入创建人"
               />
             </div>
             <div class="inpbox1">
               <a-input
-                v-model:value="valuename"
+                  v-model:value="valuename"
-                style="
+                  style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                placeholder="请输入名称"
+                  placeholder="请输入名称"
               />
             </div>
           </div>
@@ -61,26 +60,26 @@
       <div class="tmpl_body">
         <div class="tmpl_tabbox">
           <a-table
-            :columns="columns1"
+              :columns="columns1"
-            :data-source="tableData1"
+              :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
+              :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
+              expandRowByClick="true"
-            @expand="expandTable"
+              @expand="expandTable"
-            :scroll="{ x: 1300 }"
+              :scroll="{ x: 1300 }"
-            :pagination="false"
+              :pagination="false"
           />
         </div>
         <div class="tableBox">
           <div class="pa">
             <a-pagination
-              v-if="total > 10"
+                v-if="total > 10"
-              showSizeChanger="true"
+                showSizeChanger="true"
-              show-quick-jumper
+                show-quick-jumper
-              :pageSize="pageSize"
+                :pageSize="pageSize"
-              v-model:current="currentPage"
+                v-model:current="currentPage"
-              :total="total"
+                :total="total"
-              class="pagination"
+                class="pagination"
-              @change="changePagination"
+                @change="changePagination"
             />
           </div>
         </div>
@@ -89,23 +88,16 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
+import {reactive, toRefs, onMounted} from "vue";
-import { courseListView } from "../../api/indexAudit";
+import {courseListView} from "../../api/indexAudit";
+import * as api1 from "@/api/index1";
+
 export default {
   name: "CoursereViewed",
 
   setup() {
     const state = reactive({
-      optionsproj: [
+      calssifyList: [], //分类字典
-        {
-          value: "0",
-          label: "Jack",
-        },
-        {
-          value: "1",
-          label: "rose",
-        },
-      ],
       valueproj: "",
       valuecreater: "",
       valuename: "",
@@ -136,6 +128,7 @@ export default {
           dataIndex: "content",
           key: "content",
           align: "center",
+          customRender: ({text}) => state.calssifyList.find(e => e.value == text)?.label,
         },
         {
           title: "审核状态",
@@ -187,26 +180,27 @@ export default {
     const getList = () => {
       let objn = {
         auditStatus: 0,
-        // categoryId: 0,
+        categoryId: state.valueproj,
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
         pageSize: 10,
       };
       courseListView(objn)
-        .then((res) => {
+          .then((res) => {
-          console.log("获取已审核课程成功", res.data.data);
+            console.log("获取已审核课程成功", res.data.data);
-          let result = res.data.data.rows;
+            state.total = res.data.data.total;
-          state.total = res.data.data.total;
+            setTableData(res.data.data.rows);
-          if (res.data.data.total > 0) {
+          })
-            setTableData(result);
+          .catch((err) => {
-          }
+            console.log("获取已审核课程失败", err);
-        })
+          });
-        .catch((err) => {
-          console.log("获取已审核课程失败", err);
-        });
     };
     const setTableData = (table) => {
+      if(!table || !table.length){
+        state.tableData1 = []
+        return
+      }
       let data = table;
       let array = [];
       data.map((item) => {
@@ -216,15 +210,15 @@ export default {
           type: item.type == 1 ? "线上" : "线下",
           content: item.categoryId,
           status:
-            item.auditStatus == 0
+              item.auditStatus == 0
-              ? "未提交"
+                  ? "未提交"
-              : item.auditStatus == 1
+                  : item.auditStatus == 1
-              ? "提交待审核"
+                      ? "提交待审核"
-              : item.auditStatus == 2
+                      : item.auditStatus == 2
-              ? "通过"
+                          ? "通过"
-              : item.auditStatus == -1
+                          : item.auditStatus == -1
-              ? "拒绝"
+                              ? "拒绝"
-              : "-",
+                              : "-",
           creater: item.createName,
           time: "-",
           msg: item.description || "-",
@@ -234,27 +228,30 @@ export default {
       state.tableData1 = array;
     };
     const reset = () => {
-      (state.valueproj = null),
+      (state.valueproj = ''),
-        (state.valuecreater = null),
+          (state.valuecreater = null),
-        (state.valuename = null),
+          (state.valuename = null),
-        getList();
+          getList();
-    };
-    const handleChangeproj = (value, item) => {
-      console.log(value, item);
-      state.valueproj = item.value;
     };
     const changePagination = (pagina) => {
       state.currentPage = pagina;
       getList();
     };
-    onMounted(() => {
+    const getDictList = (param) => api1.getDict({
+      pageNo: 1,
+      pageSize: 20,
+      setCode: param
+    }).then((res) => res.data.data.rows)
+
+    onMounted(async () => {
       getList();
+      //获取分类列表
+      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({label: e.dictName, value: e.dictCode}))
     });
     return {
       ...toRefs(state),
       getList,
       setTableData,
-      handleChangeproj,
       reset,
       changePagination,
     };
@@ -264,8 +261,10 @@ export default {
 <style lang="scss">
 .coursereviewed {
   width: 100%;
+
   .tmpl {
     width: 100%;
+
     .tmpl_header {
       display: flex;
       flex-wrap: wrap;
@@ -274,33 +273,39 @@ export default {
 
       margin-left: 32px;
       margin-right: 32px;
+
       .tmplh_inp {
         .inpbox {
           display: flex;
           margin-top: 32px;
           flex-wrap: wrap;
+
           .inpbox1 {
             display: flex;
             justify-content: center;
             align-items: center;
             margin-right: 24px;
             margin-top: 10px;
+
             .ant-select-selector {
               border-radius: 8px;
               width: 270px;
               height: 40px;
               padding-top: 5px;
             }
+
             span {
               white-space: nowrap;
             }
           }
         }
       }
+
       .tmplh_btn {
         display: flex;
         // margin-left: 38px;
         margin-top: 42px;
+
         .btn {
           padding: 0px 26px 0px 26px;
           height: 38px;
@@ -311,72 +316,90 @@ export default {
           margin-right: 14px;
           cursor: pointer;
           flex-shrink: 0;
+
           .search {
             background-size: 100%;
           }
+
           .btnText {
             font-size: 14px;
             font-weight: 400;
             line-height: 36px;
             margin-left: 5px;
           }
+
           .btnText1 {
             color: rgb(255, 255, 255);
           }
+
           .btnText2 {
             color: rgba(64, 158, 255, 1);
           }
         }
+
         .btn1 {
           background: #409eff;
+
           .search {
             width: 15px;
             height: 17px;
             background-image: url("../../assets/images/courseManage/search0.png");
           }
         }
+
         .btn2 {
           background: #ffffff;
           border: 1px solid #388be1;
+
           .search {
             width: 16px;
             height: 18px;
             background-image: url("../../assets/images/courseManage/reset1.png");
           }
         }
+
         .btn1:hover {
           background: rgb(255, 255, 255);
           border: 1px solid #388be1;
+
           .search {
             background-image: url("../../assets/images/courseManage/search1.png");
           }
+
           .btnText {
             color: rgba(64, 158, 255, 1);
           }
         }
+
         .btn2:hover {
           background: rgba(64, 158, 255, 1);
+
           .search {
             background-image: url("../../assets/images/courseManage/reset0.png");
           }
+
           .btnText {
             color: #ffffff;
           }
         }
       }
     }
+
     .tmpl_body {
       padding: 0px 30px;
+
       .tmpl_tabbox {
         .operation {
           display: flex;
           justify-content: center;
           align-items: center;
           color: #4ea6ff;
+
           .nselect {
             justify-content: center;
             align-items: center;
             display: flex;
+
             .jc {
               margin-left: 20px;
               white-space: nowrap;
@@ -385,6 +408,7 @@ export default {
           }
         }
       }
+
       .pa {
         width: 100%;
         margin-top: 20px;

src/views/examine/ProjectReviewed.vue

@@ -57,14 +57,14 @@
                 @change="rankTimeChange"
               />
             </div>
-            <div class="inpbox1">
+<!--            <div class="inpbox1">-->
-              <a-select
+<!--              <a-select-->
-                v-model:value="valuestate"
+<!--                v-model:value="valuestate"-->
-                placeholder="请选择审核状态"
+<!--                placeholder="请选择审核状态"-->
-                @change="handleChangeproj"
+<!--                @change="handleChangeproj"-->
-                :options="optionsproj"
+<!--                :options="optionsproj"-->
-              />
+<!--              />-->
-            </div>
+<!--            </div>-->
           </div>
         </div>
         <div class="tmplh_btn">
@@ -193,8 +193,8 @@ export default {
 
         {
           title: "所属项目",
-          dataIndex: "belong",
+          dataIndex: "sourceBelongName",
-          key: "belong",
+          key: "sourceBelongName",
           align: "center",
           width: "10%",
         },
@@ -317,6 +317,7 @@ export default {
           name: item.name,
           belong: "",
           manager: item.manager || "-",
+          sourceBelongName: item.sourceBelongName,
           status:
             item.status == 0
               ? "草稿"
@@ -337,6 +338,7 @@ export default {
           number: item.projectId,
           name: item.name,
           belong: "",
+          sourceBelongName: item.sourceBelongName,
           manager: item.manager || "-",
           status:
             item.status == 0

src/views/examine/ProjectReviewedN.vue

@@ -154,8 +154,8 @@ export default {
 
         {
           title: "所属项目",
-          dataIndex: "belong",
+          dataIndex: "sourceBelongName",
-          key: "belong",
+          key: "sourceBelongName",
           align: "center",
           width: "11%",
         },
@@ -250,6 +250,7 @@ export default {
           number: item.projectId,
           name: item.name,
           belong: item.parentId,
+          sourceBelongName: item.sourceBelongName,
           manager: item.manager || "-",
           status:
             item.status == 0
@@ -277,6 +278,7 @@ export default {
           number: item.projectId,
           name: item.name,
           belong: item.parentId,
+          sourceBelongName: item.sourceBelongName,
           manager: item.manager || "-",
           status:
             item.status == 0

src/views/projectcenter/ProjectManage.vue

@@ -576,7 +576,7 @@
     <!-- 编辑多层项目弹窗 - end -->
     <!-- 创建多层子项目弹窗 -->
     <div>
-      <a-modal
+      <a-modalbe
         v-model:visible="doublesonpro"
         :title="null"
         @ok="closeModal3"
@@ -705,7 +705,7 @@
             >
           </div>
         </div>
-      </a-modal>
+      </a-modalbe>
     </div>
     <!-- 创建多层子项目弹窗 -->
     <!-- 编辑多层子项目弹窗 start-->