Merge branch 'compulsory_professional_skills' into compulsory_professional_skills_copy

This commit is contained in:
gengxin
2025-02-27 14:03:50 +08:00
4 changed files with 19 additions and 7 deletions

View File

@@ -165,9 +165,9 @@
/> />
</div> </div>
</div> </div>
<div class="btnn"> <!-- <div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button> <button class="btn1" @click="closeDrawer">取消</button>
</div> </div> -->
</template> </template>
<template v-if="step == 2"> <template v-if="step == 2">

View File

@@ -371,6 +371,7 @@ export default {
dataIndex: "finishTime", dataIndex: "finishTime",
key: "finishTime", key: "finishTime",
align: "center", align: "center",
width: 150,
ellipsis: true, ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -620,7 +621,7 @@ export default {
}; };
</script> </script>
<style lang="scss" > <style lang="scss">
.drawerStyle { .drawerStyle {
.ant-drawer-content-wrapper { .ant-drawer-content-wrapper {
max-width: 1200px; max-width: 1200px;

View File

@@ -6,13 +6,15 @@
style="padding-left: 20px; margin-right: 0px" style="padding-left: 20px; margin-right: 0px"
> >
<a-col> <a-col>
<a-form-item title="Band职级" style="width: 193px"> <a-form-item style="width: 193px">
<div class="select in"> <div class="select in">
<a-select <a-select
v-model:value="tableParam.organizationId" v-model:value="tableParam.organizationId"
placeholder="请选择归属组织" placeholder="请选择归属组织"
:options="organizationOption" :options="organizationOption"
:filterOption="filterOption"
allowClear allowClear
showSearch
></a-select> ></a-select>
</div> </div>
</a-form-item> </a-form-item>
@@ -51,6 +53,8 @@
placeholder="请选择Band职级" placeholder="请选择Band职级"
:options="bandOption" :options="bandOption"
allowClear allowClear
:filterOption="filterOption"
showSearch
></a-select> ></a-select>
</div> </div>
</a-form-item> </a-form-item>
@@ -388,12 +392,14 @@ const officeSelectChange = () => {
}); });
}); });
}; };
const filterOption = (input, option) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
};
const getBandListData = () => { const getBandListData = () => {
getBandList({ getBandList({
growthId: props.growId, growthId: props.growId,
}).then((res) => { }).then((res) => {
// 清空筛选band职级的值 // 清空筛选band职级的值
tableParam.value.bandCode = null;
bandOption.value = res.data.data.map((item) => { bandOption.value = res.data.data.map((item) => {
return { return {
value: item.bandCode, value: item.bandCode,
@@ -762,6 +768,11 @@ defineExpose({ getStuList, startLoading });
::v-deep .ant-tooltip-inner { ::v-deep .ant-tooltip-inner {
color: #000 !important; color: #000 !important;
} }
::v-deep .ant-select-selector {
display: flex;
align-items: center;
}
::v-deep .ant-pagination-total-text { ::v-deep .ant-pagination-total-text {
color: #818a92; color: #818a92;
} }

View File

@@ -131,7 +131,7 @@
/> />
<div style="margin-top: 2px; margin-left: 8px">类型</div> <div style="margin-top: 2px; margin-left: 8px">类型</div>
</div> </div>
<div style="width: 120px; text-align: center">名称</div> <div style="width: 400px; text-align: center">名称</div>
<div style="width: 87px; text-align: center">时长</div> <div style="width: 87px; text-align: center">时长</div>
<div style="width: 87px; text-align: center">状态</div> <div style="width: 87px; text-align: center">状态</div>
<div <div
@@ -176,7 +176,7 @@
</div> </div>
<div <div
style=" style="
width: 120px; width: 400px;
text-align: center; text-align: center;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;