Merge remote-tracking branch 'yx/250507-bugfix-shl'

src/components/project/LookInsideLecturer.vue

@@ -409,6 +409,13 @@ export default {
         key: 'updateName',
         ellipsis: true, align: "center",
         width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              { value.record.updateName || '-' }
+            </div>
+          )
+        }
       },
     ])
     //晋级记录列表数据

src/components/project/SearchTeacher.vue

@@ -12,7 +12,7 @@
               :disabled="disabled"
               v-model:value="selectData"
               style="width: 100%"
-              placeholder="请查询姓名或工号"
+              :placeholder="placeholder"
               :options="isOpen?options:selectOptions"
               :filter-option="false"
               showSearch
@@ -117,6 +117,10 @@ const props = defineProps({
   lecturer: {
     type: Boolean,
     default: false,
+  },
+  placeholder: {
+    type: String,
+    default: '请查询姓名或工号'
   }
 })
 const emit = defineEmits(['update:value','update:lable','update:system','update:level','update:newlable','update:orgId','update:id','update:payrollPlaceCode','update:payrollPlaceName'])

src/views/lecturer/InsideLecturer.vue

@@ -90,7 +90,7 @@
             </template>
             <template v-if="column.key === 'operation'">
               <a-space>
-                <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
+                <a-button v-if="record.certStatus == '1'" type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
 
                 <a-button
                   v-if="(record.isPermission === 'true' || record.isSuperPermission === 'true') && checkMenu('lecturerEdit')"
@@ -103,8 +103,6 @@
                   type="link" @click="() => handleOperate(record, String(record.courseform))">启用</a-button>
                 <a-button v-if="record.isSuperPermission === 'true' && checkMenu('lecturerDel')" type="link"
                   @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
-                <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))"  
-                   v-if="lecturerAdmin('Lecturer-admin')">删除</a-button> -->
               </a-space>
             </template>
           </template>
@@ -175,7 +173,7 @@
                   <!-- TODO GX01 -->
                   <SearchTeacher @tlevel="teacherTlevel" :lecturer="true" :disabled="!!id"
                     v-model:value="formParam.name" v-model:lable="formParam.orgNames" v-model:orgId="formParam.orgId"
-                    v-model:id="formParam.id" v-model:system="tSystemNames" v-model:level="formParam.tlevelId">
+                    v-model:id="formParam.id" v-model:system="tSystemNames" v-model:level="formParam.tlevelId"  placeholder="请查询姓名或工号(只可查询非讲师人员)">
                   </SearchTeacher>
                 </a-form-item>
               </a-col>

src/views/lecturer/OrganizationApproval.vue

@@ -27,7 +27,7 @@
             <a-select-option :value="0">全部</a-select-option>
             <a-select-option :value="1">待提交</a-select-option>
             <a-select-option :value="2">审核中</a-select-option>
-            <!-- <a-select-option :value="3">已完成</a-select-option> -->
+            <a-select-option :value="3">已完成</a-select-option>
             <a-select-option :value="4">审核失败</a-select-option>
             <!-- <a-select-option :value="5">撤回</a-select-option> -->
             </a-select>
@@ -769,9 +769,12 @@ export default {
       state.tableLoading = true;
       let objA = { 
         status: status?status:state.searchParam.status,
+        name: state.searchParam.name,
+        leaderName: state.searchParam.leaderName,
+        isParent: state.searchParam.isParent,
         //TODO GX03 
         //审批未通过意外的数据
-        approvalType:1,
+        // approvalType:1,
         moduleType:1,
       };
       console.log("执行 gx getTableDate objA",objA);

src/views/lecturer/OrganizationList.vue

@@ -25,6 +25,22 @@
           />
         </div>
       </a-form-item>
+      <a-form-item class="select">
+        <a-select
+            v-model:value="searchParam.id"
+            style="width: 200px"
+            allowClear
+            showSearch
+            :filter-option="false"
+            @change="handleOrgChange"
+            @search="handleOrgSearch"
+            placeholder="请选择所有根节点列表"
+        >
+          <a-select-option v-for="item in filterOrgListSearch" :key="item.value" :value="item.value">
+            {{ item.label }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
       <a-form-item class="select">
         <div>
           <a-input
@@ -488,7 +504,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch } from "vue";
+import {reactive, toRefs, ref, watch, onMounted} from "vue";
 import { FolderAddOutlined } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
 import dialog from "@/utils/dialog";
@@ -497,13 +513,14 @@ import {
   queryTrainOrg,
   deleteTrainOrg,
   addReviewer,
-  updateTrainOrg,
+  updateTrainOrg, queryTrainOrgPor,
 } from "../../api/organization";
 import AddOrgContent from "../../components/project/AddOrgContent.vue";
 import * as lecturer from "../../api/Lecturer.js";
 import lockLecturer from "@/components/project/lockLecturer";
 import AddApprover from "@/components/project/AddApprover";
 import { checkMenu } from "@/utils/utils";
+import {getParentAapprovallist} from "@/api/lecturerFeeManagement";
 export default {
   name: "organizationList",
   components: {
@@ -537,6 +554,7 @@ export default {
         leaderName: null,
         status: null,
         approvalType: null,
+        id: null,
         pageNo: "1",
         pageSize: "10",
       },
@@ -560,6 +578,7 @@ export default {
         affiliationOrgLists: [],
         locking: 1,
       },
+      filterOrgListSearch: [],
     });
     const PlaceOfPayList = ref([
       { value: "1", label: "一级审批" },
@@ -1176,6 +1195,50 @@ export default {
       { label: "根节点", value: "0" },
       { label: "子节点", value: "1" },
     ]);
+
+    onMounted(() => {
+      orgLists()
+    })
+    const orgLists = () => {
+      const obj = {
+        pageNo: 1,
+        pageSize: 10000,
+        moduleType: 0,
+        isParent: 0
+      }
+      getParentAapprovallist(obj).then((res) => {
+        state.orgList = res.data.data?.map(item => {
+          return {
+            label: item.affiliationName,
+            value: item.id
+          }
+        })
+        state.orgListSearch = res.data.data?.map(item => {
+          state.orgInput = item.affiliationName;
+          return {
+            label: item.affiliationName,
+            value: item.id
+          }
+        })
+
+        state.filterOrgListSearch = state.orgListSearch
+      })
+    }
+
+    const handleOrgSearch = (value) => {
+      console.log("handleOrgSearch value： ",value)
+      //克隆数据
+      let temp = JSON.parse(JSON.stringify(state.orgListSearch));
+      //选择数据
+      state.filterOrgListSearch = temp.filter(item => item.label.includes(value))
+    }
+
+    const handleOrgChange = (value) => {
+      if(value == undefined || value == null){
+        state.filterOrgListSearch = state.orgListSearch;
+      }
+    }
+
     //回车
     const enterPressHadlerSearch = (e) => {
       if (e.keyCode === 13) {
@@ -1186,6 +1249,9 @@ export default {
       ...toRefs(state),
       enterPressHadlerSearch,
       TrainOrglist,
+      orgLists,
+      handleOrgSearch,
+      handleOrgChange,
       rules,
       formRef,
       columns,