diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue
index 7fca576d..8b133fd9 100644
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -260,8 +260,8 @@
               </el-table-column>
               <el-table-column prop="status" label="状态">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.contentName.split('--')[1]=='考试'">{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span>
-                  <span v-else>{{scope.row.status == 9? '已完成':'未开始'}}</span>
+                  <!-- <span v-if="scope.row.contentName.split('--')[1]=='考试'">{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span> -->
+                  <span>{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="duration" label="进度">
@@ -286,6 +286,7 @@
           <el-select v-model="learningSituation.status" clearable placeholder="状态">
             <el-option label="未开始" :value="1"></el-option>
             <el-option label="已开始" :value="2"></el-option>
+            <el-option label="进行中" :value="3"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7259546c..0fb78964 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -41,10 +41,11 @@ const user = {
             sessionStorage.setItem("curIdentity", iden);
         },
         SET_UserInfo: (state, uinfo) => {
-            // 内部用户和外部用户测试用
-            uinfo.role = uinfo.departFullName.indexOf('京东方科技集团股份有限公司')!=-1?1:2
-            if(uinfo.name === '尹晓钦') uinfo.role = 2
-            console.log('uinfo::',uinfo)
+            // 内部用户和外部用户 测试外部企业ID：1811380709626150912  生产外部wyhgID：1811640937932288000
+            uinfo.role = uinfo.departId === "1811640937932288000"? 2 : 1;
+            // uinfo.role = uinfo.departFullName.indexOf('京东方科技集团股份有限公司')!=-1?1:2
+            //if(uinfo.name === '尹晓钦') uinfo.role = 2
+            // console.log('uinfo::',uinfo)
             state.info = uinfo
         },
         SET_PERMISSIONS: (state, permissions) => {