Merge branch 'dev-cme-20191227' of...

Merge branch 'dev-cme-20191227' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-cme-20191227

src/views/cme/apply-detail.vue

@@ -39,6 +39,7 @@
           action="#"
           accept=".xlsx"
           :limit="1"
+          :show-file-list="false"
           :on-exceed="handleExceed"
           :before-upload="uploadImport">
           <!-- <el-button size="small" type="primary">点击上传</el-button> -->
@@ -55,7 +56,7 @@
         class="table-list"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column align="center" prop="cmeIcCardNumber" label="IC卡号" show-overflow-tooltip width="200" ></el-table-column>
+        <el-table-column align="center" prop="cmeIcCardNumber" label="IC卡号" show-overflow-tooltip width="150" ></el-table-column>
         <el-table-column align="center" prop="name" label="姓名" show-overflow-tooltip width="150"></el-table-column>
         <el-table-column align="center" prop="card" label="身份证号" show-overflow-tooltip width="200"></el-table-column>
         <el-table-column align="center" prop="serialNo" label="课题编号" show-overflow-tooltip width="150"></el-table-column>
@@ -68,7 +69,7 @@
         <el-table-column align="center" prop="taskType" label="活动形式" show-overflow-tooltip width="150"></el-table-column>
         <el-table-column align="center" prop="department" label="所属学科" show-overflow-tooltip width="150"></el-table-column>
         <el-table-column align="center" prop="authName" label="授分单位" show-overflow-tooltip width="150"></el-table-column>
-        <el-table-column align="center" prop="taskTime" label="活动日期" show-overflow-tooltip width="150"></el-table-column>
+        <el-table-column align="center" prop="taskTime" label="活动日期" show-overflow-tooltip width="200"></el-table-column>
         <el-table-column align="center" label="学分状态" show-overflow-tooltip width="150">
           <template slot-scope="scope">
             {{ returnStatusText(scope.row.creditStatus) }}
@@ -217,6 +218,10 @@
         // debugger;
         let req = {};
         if (type == 'all') {  // all 全选  part 非全选
+          if (this.tableData.length < 1) {
+            this.$message.error('暂无可导出项');
+            return;
+          } 
           req = {
             cmeId: this.$route.query.id,
             idList: [],

src/views/education/create-component.vue

@@ -183,7 +183,7 @@
                                                                 <el-col :span="10" class="item-icon">
                                                                     <span class="require">*</span>
                                                                     <el-form-item label="关联考试">
-                                                                        <el-select placeholder="请选择" v-model="item3.content3" @change="handleExamTypeChange" size="small" :disabled="fieldDisabled(item)">
+                                                                        <el-select placeholder="请选择" v-model="item3.content3" @focus="examIDfocus(index,index1,index2,index3)" @change="handleExamTypeChange" size="small" :disabled="fieldDisabled(item)">
                                                                             <el-option
                                                                                 v-for="(examItem, examTypeIndex) in examTypeList"
                                                                                 :key="examTypeIndex"

src/views/layout/slidebar.vue

@@ -229,16 +229,19 @@
     methods: {
       getUserType() {
         // console.log('当前路由地址：', this.$route.path, typeof this.$route.path)
-        // let currentPath = this.$route.path;
+        let currentPath = this.$route.path || '';
         let req = {};
         console.log('cmeStore: ', this.$store.state.cmeStore.isOutsideUser)
         getUserTypeReq(req).then(res => {
           // debugger;
           this.isOutsideGetted = true;
           if (res.code == '000000') {
-            if (res.data.code == "yes") {  // 外部用户，只展示一个页面
+            if (res.data.code == "yes") {  // 外部用户，siderbar只展示一个：学分发放管理页面
               this.isOutsideUser = true;
               this.$store.dispatch('cmeStore/updateOutUserStatus', true);
+              if (currentPath && currentPath == '/apply-detail') {  // 申请明细页面 则刷新时不重定向
+                return;
+              }
               this.$router.replace({
                 path: '/credit-send-manage'
               });