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

src/components/drawers/AddFaceteach.vue

@@ -313,7 +313,7 @@ import dayjs from "dayjs";
 import AssessmentList from "../drawers/ AssessmentList.vue";
 // import { toDate } from "../../api/method";、
 import {addTempTask} from "../../api/indexTaskadd";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
 
 export default {
   name: "AddFaceteach",

src/components/drawers/AddLive.vue

@@ -337,7 +337,7 @@ import dayjs from "dayjs";
 import { fileUp } from "../../api/indexEval";
 import AssessmentList from "../drawers/ AssessmentList.vue";
 import { debounce } from "lodash-es";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
 
 // import { useRouter } from "vue-router";
 function getBase64(img, callback) {

src/components/project/ProjectManagerNew.vue

@@ -7,7 +7,7 @@
                         "
       v-model:value="managerArray"
       :placeholder="placeholder"
-      :filterOption="true"
+      :filterOption="false"
       style="width: 100%"
       :options="options"
       allowClear
@@ -16,6 +16,7 @@
       :disabled="disabled"
       @popupScroll="memberScroll"
       @search="searchMember"
+      :open="isOpen"
       @change="change"
   >
     <template v-if="loading" #notFoundContent>
@@ -27,7 +28,6 @@
 import {computed, defineEmits, defineProps, onMounted, ref, watch} from "vue";
 import {scrollLoad, throttle} from "@/api/method";
 import * as api1 from "@/api/index1";
-import {useStore} from "vuex";
 
 const props = defineProps({
   value: {
@@ -42,15 +42,15 @@ const props = defineProps({
   placeholder: String,
   mode: String
 })
-const store = useStore();
 
-const managerArray = computed(() => {
-  return props.mode === 'select' ? props.value : props.value.split(',')
-})
+
+const options = ref([])
+
+const managerArray = computed(() => props.mode === 'select' ? props.value : (props.value ? props.value.split(',') : []))
 
 const emit = defineEmits({})
 
-const options = ref([])
+const isOpen = ref(false)
 
 const memberParam = ref({keyWord: '', pageNo: 1, pageSize: 10})
 const loading = ref(false)
@@ -58,44 +58,45 @@ const loading = ref(false)
 
 watch(() => memberParam.value.keyWord, throttle(getSearchMember, 500))
 watch(() => memberParam.value.pageNo, throttle(getPageMember, 500))
+watch(props, init)
+
+function init() {
+  props.value && (options.value = props.value.split(',').map((e, i) => ({
+    value: e,
+    label: props.name.split(',')[i]
+  })))
+}
 
 onMounted(() => {
   console.log('onMounted')
-  const memberOptions = store.state.memberInitInfo.map(e => ({
-    label: e.realName,
-    value: e.id
-  }))
-  if (props.value) {
-    options.value = [...(props.value + '').split(',').map((value, i) => ({
-      label: (props.name + '').split(',')[i],
-      value
-    })), ...memberOptions]
-  } else options.value = memberOptions
+  init()
 })
 
 function getSearchMember() {
-  loading.value = true
-  options.value = []
+  console.log('getSearchMember')
+  options.value && options.value.length && (options.value = [])
   getMemberData()
 }
 
 function getPageMember() {
-  loading.value = true
+  console.log('getPageMember')
   getMemberData()
 }
 
 
 function getMemberData() {
+  isOpen.value = true
+  loading.value = true
   api1.getMemberInfo(memberParam.value).then((res) => {
+    if (!res.data.data.rows || !res.data.data.rows.length) {
+      isOpen.value = false
+      return;
+    }
     const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({
       label: e.realName,
       value: e.id
     }));
-    if (memberParam.value.pageNo === 1 && props.value) {
-      const arrManagerId = (props.value + '').split(',')
-      const arrManager = props.name.split(',')
-      options.value = [...arrManager.map((e, i) => ({label: e, value: arrManagerId[i]})), ...list]
-    } else options.value.push(...list)
+    memberParam.value.pageNo === 1 && props.value ? (options.value = list) : options.value.push(...list)
     loading.value = false
   });
 }
@@ -109,17 +110,28 @@ const memberScroll = (e) => {
 
 //搜索学员
 const searchMember = (keyWord) => {
+  console.log('searchMember', keyWord)
+  options.value = []
+  isOpen.value = true
   keyWord && (memberParam.value = {keyWord, pageNo: 1, pageSize: 10});
 };
 
 function change(e, l) {
   console.log('change', l)
+  isOpen.value = false
   if (Array.isArray(l)) {
-    emit('update:value', l.map(t => t.value).join(','))
+    // const selectIds = l.filter(t => t.value).map(t => t.value).join(',')
+    // const arr = props.value ? props.value.split(',').filter(e => !selectIds.includes(e)).map((e, i) => ({
+    //   value: e,
+    //   name: props.name.split(',')[i]
+    // })) : []
+    // l.push(...arr)
+    // l=l.filter(t => t.label)
     emit('update:name', l.map(t => t.label).join(','))
+    emit('update:value', l.map(t => t.value).join(','))
   } else {
-    emit('update:value', l.value)
     emit('update:name', l.label)
+    emit('update:value', l.value)
   }
 }
 

src/views/courselibrary/CoursewareManage.vue

@@ -3097,7 +3097,7 @@ import * as api1 from "../../api/index1";
 
 import "@wangeditor/editor/dist/css/style.css";
 import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
 
 import SeeModal from "./components/seeModal.vue";
 

src/views/examine/CourseReviewed.vue

@@ -59,6 +59,45 @@
         </div>
       </div>
     </div>
+     <!-- 审核日志弹窗 -->
+     <a-modal
+        v-model:visible="projAuditModal"
+        :footer="null"
+        :closable="closeBack"
+        wrapClassName="projAuditModal"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon"></div>
+              <span>审核记录</span>
+              <!-- <div class="close_exit" @click="closeProjAuditModal"></div> -->
+            </div>
+            <div class="body">
+              <a-table
+                  style="width: 90%"
+                  :columns="columnsAudit"
+                  :data-source="tableDataAudit"
+                  :loading="tableDataTotalAudit === -1 ? true : false"
+                  expandRowByClick="true"
+                  :scroll="{ y: 150 }"
+                  @expand="expandTable"
+                  :pagination="false"
+              />
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1" @click="closeProjAuditModal">
+                <div class="btnText">取消</div>
+              </div>
+              <div class="del_btn btn2" @click="closeProjAuditModal">
+                <div class="btnText">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
   </div>
 </template>
 <script>
@@ -132,15 +171,19 @@ export default {
           key: "msg",
           align: "center",
         },
-        // {
-        //   title: "操作",
-        //   dataIndex: "opt",
-        //   key: "opt",
-        //   align: "center",
-        //   customRender: () => {
-        //     return <div style="color:#387DF7">审核日志</div>;
-        //   },
-        // },
+        {
+          title: "操作",
+          dataIndex: "opt",
+          key: "opt",
+          align: "center",
+          customRender: (value) => {
+            return <div 
+            style="color:#387DF7;cursor:pointer;" 
+            onClick={() => {
+                      showProjAuditModal(value.record.auditList);
+                    }}>审核日志</div>;
+          },
+        },
       ],
       tableData1: [
         // {
@@ -154,6 +197,9 @@ export default {
         //   msg: "-",
         // },
       ],
+      //审核记录的数据
+      tableDataAudit: [],
+      projAuditModal: false,
     });
     const getList = () => {
       let objn = {
@@ -227,12 +273,25 @@ export default {
       //获取分类列表
       state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode }))
     });
+
+    // 显示审核
+    const showProjAuditModal = (data) => {
+      state.tableDataAudit = data
+      state.projAuditModal = true;
+    };
+
+    const closeProjAuditModal = () => {
+      state.projAuditModal = false;
+    };
+
     return {
       ...toRefs(state),
       getList,
       setTableData,
       reset,
       changePagination,
+      showProjAuditModal,
+      closeProjAuditModal
     };
   },
 };

src/views/examine/ProjectReviewed.vue

@@ -201,7 +201,7 @@ export default {
           dataIndex: "status",
           key: "status",
           align: "center",
-          customRender: ({record: {status}}) => <div>{{2: '审核通过', 3: '审核拒绝'}[status]}</div>,
+          customRender: ({record: {status}}) => <div>{status==-2?'未通过':'已通过'}</div>,
         },
         {
           title: "创建人",
@@ -531,7 +531,7 @@ export default {
       .tmplh_btn {
         display: flex;
         // margin-left: 38px;
-        margin-top: 32px;
+        margin-top: 52px;
 
         .btn {
           padding: 0px 26px 0px 26px;

src/views/learningpath/LearningPath.vue

@@ -1057,6 +1057,7 @@ export default {
         array.push(obj);
       });
       state.tableData = array;
+      console.log(array,tableData)
     };
 
     const tableDataFunc = () => {

src/views/projectcenter/ProjectAdd.vue

@@ -324,7 +324,7 @@ import { useStore } from "vuex";
 import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import { scrollLoad } from "@/api/method";
 

src/views/projectcenter/ProjectManage.vue

@@ -806,7 +806,7 @@ import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import * as api from "../../api/index";
 import * as api1 from "../../api/index1";
 import {storage} from "../../api/storage";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
 import ProjectClass from "@/components/project/ProjectClass";
 import OrgClass from "@/components/project/OrgClass";
 import dayjs from "dayjs";

src/views/projectcenter/TaskPage.vue

@@ -1832,7 +1832,7 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 import { useStore } from "vuex";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import TrainClass from "@/components/project/TrainClass";
-import ProjectManager from "@/components/project/ProjectManager";
+import ProjectManager from "@/components/project/ProjectManagerNew";
 export default {
   name: "taskPage",
   components: {