Merge branch 'master_zyh' of United_Software/k_online_ui into master

src/views/Report/src/components/ReportSchedule/src/ReportSchedule.vue

@@ -109,7 +109,7 @@ const handleSave = () => {
 <template>
   <div v-vloading="loading">
     <div class="Title">
-      <span>Schedule Configuration - Shipment Status Report</span>
+      <span>Schedule Configuration - {{ pageData.reportName }}</span>
       <el-button @click="handleSave" class="el-button--main save_button"
         ><span class="font_family icon-icon_save_b icon_dark" style="margin-right: 5px"></span
         >Save</el-button

src/views/TemplateManagement/src/TemplateManagement.vue

@@ -281,8 +281,3 @@ onUnmounted(() => {
   overflow: hidden;
 }
 </style>
-<style lang="scss">
-.el-select__selection {
-  max-width: 450px;
-}
-</style>