Merge branch 'compulsory_professional_skills' into compulsory_professional_skills_copy

src/components/growthpath/GrowthFaceTaskManage.vue

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

src/components/growthpath/GrowthOnlineManage.vue

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

src/components/growthpath/StudentManage.vue

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

src/views/growthpath/EditingTasks.vue

@@ -131,7 +131,7 @@
                     />
                     <div style="margin-top: 2px; margin-left: 8px">类型</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
@@ -176,7 +176,7 @@
                   </div>
                   <div
                     style="
-                      width: 120px;
+                      width: 400px;
                       text-align: center;
                       overflow: hidden;
                       text-overflow: ellipsis;