liqk 4 rokov pred
rodič
commit
bbf109038f

+ 1 - 0
TEAMModelOS/ClientApp/src/locale/lang/en-US/system.js

@@ -3,6 +3,7 @@ export default {
     title:'TEAM Model Cloud',
     loading:'加载中',
     authErr:'权限不足!',
+    development:'功能正在开发中',
     menu:{
         school:'学校',
         private:'个人',

+ 1 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/system.js

@@ -3,6 +3,7 @@ export default {
     title:'醍摩豆云平台',
     loading:'加载中',
     authErr:'权限不足!',
+    development:'功能正在开发中',
     menu:{
         school:'学校',
         private:'个人',

+ 1 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/system.js

@@ -3,6 +3,7 @@ export default {
     title:'醍摩豆雲平台',
     loading: '加載中',
     authErr:'權限不足! ',
+    development:'功能正在開發中',
     menu: {
         school: '學校',
         private: '個人',

+ 2 - 2
TEAMModelOS/ClientApp/src/view/newcourse/CoursePlan.vue

@@ -3,7 +3,7 @@
         <div class="course-table-header">
             <BasePdSelect @pd-change="filterByPeriod"></BasePdSelect>
             <div class="action-btn-wrap">
-                <span v-if="$access.can('admin.*|course-upd')" @click="showImportCus()" class="action-btn">
+                <span v-if="$access.can('admin.*|course-upd')" @click="showImportCus()" class="action-btn" style="color:#808080;cursor: not-allowed;">
                     <Icon custom="iconfont icon-upload" size="16" />
                     <span>{{$t('cusMgt.importLabel')}}</span>
                 </span>
@@ -251,7 +251,7 @@ export default {
         showImportCus() {
             // this.importCusStatus = true
             // this.moreClass = false
-            this.$Message.warning('功能正在开发中')
+            this.$Message.warning(this.$t('system.development'))
         },
         //确认导入课程
         importCus() {

+ 3 - 2
TEAMModelOS/ClientApp/src/view/newcourse/NewCusMgt.vue

@@ -31,7 +31,7 @@
                         <Icon class="action-btn-icon" v-if="$access.can('admin.*|course-upd')" type="md-add" @click="showAddCourse(0)" />
                         <Icon class="action-btn-icon" type="ios-search" @click="isSearch = true" />
                     </div>
-                    <Input v-else icon="ios-close" v-model="keyWord" :placeholder="$t('cusMgt.searchHolder')" @on-click="closeSearch" size="small" style="float:right;width: 150px;" @on-change="searchCourse" />
+                    <Input v-else icon="ios-close" v-model="keyWord" :placeholder="$t('cusMgt.searchHolder')" @on-click="closeSearch" style="float:right;width: 200px;" @on-change="searchCourse" />
                 </div>
                 <div class="cus-list-content">
                     <vuescroll>
@@ -1021,7 +1021,8 @@ export default {
         //关键字搜索课程
         searchCourse() {
             this.courseListShow = this.courseList.filter((item, index) => {
-                return item.name.indexOf(this.keyWord) != -1
+                // return item.name.indexOf(this.keyWord) != -1
+                return JSON.stringify(item).includes(this.keyWord) && item.period.id == this.filterPeriod
             })
         },
         //获取课程列表