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/router/router.js

@@ -12,6 +12,7 @@ const addManager = r => require.ensure([], () => r(require('../views/education/a
 const editManager = r => require.ensure([], () => r(require('../views/education/edit-manager.vue')), 'edit-manager')
 const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role')
 const msgPush = r => require.ensure([], () => r(require('../views/msgpush/msg-push.vue')), 'msg-push')
+const editCme = r => require.ensure([], () => r(require('../views/education/edit-cme.vue')), 'edit-cme')
 
 import patientsRouters from './patients'
 import followRouters from './follow'
@@ -68,6 +69,9 @@ export default [{
         },{
             path: '/edit-manager',
             component: editManager
+        },{
+            path: '/edit-cme',
+            component: editCme
         },{
             path: '/item-component',
             component: itemComponent

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = '79F1EE431B084D4EAD261B60EDD1AF8B';
+      config.headers['token'] = '006EAC5D201B4547A27C842505F0E368';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/operation.js

@@ -752,4 +752,36 @@ export function learnTimeValue(value) {
     result = ""+parseInt(h)+"小时"+result; 
   } 
   return result; 
+}
+export function getProjectLevelList(data) {
+  let list = [];
+  for(let i = 0;i < data.length ; i++) {
+    let obj = {
+      value: data[i].id,
+      label: data[i].text,
+    }
+    list.push(obj);
+  }
+  return list;
+}
+export function getProjectLeaderList(data) {
+  let list = [];
+  for(let i = 0;i < data.length ; i++) {
+    let obj = {
+      value: data[i].id,
+      label: data[i].name,
+    }
+    list.push(obj);
+  }
+  return list;
+}
+export function getCreditList(data) {
+  let list = [];
+  for(let i = 0;i < data.length ; i++) {
+    let obj =  data[i];
+    obj.value = data[i].id;
+    obj.label = data[i].name;
+    list.push(obj);
+  }
+  return list;
 }
\ No newline at end of file

src/views/education/item-manager.vue

@@ -78,14 +78,16 @@
         <el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
         <el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column>
         <el-table-column prop="createdName" label="创建人" align="center"></el-table-column>
+        <el-table-column prop="projectLeader" label="项目负责人" align="center"></el-table-column>
+        <el-table-column prop="projectTypeValue" label="项目类型" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" width="100" align="center"></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="projectIntro"
           label="项目简介"
           align="center"
           min-width="100"
           show-overflow-tooltip
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column prop="projectBegintime" label="项目开始时间" min-width="90" align="center"></el-table-column>
         <el-table-column prop="projectEndtime" label="项目结束时间" min-width="90" align="center"></el-table-column>
         <el-table-column prop="projectStatus" label="状态" align="center">
@@ -93,7 +95,7 @@
             <span>{{ [scope.row.projectStatus , idType] | statusProject }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" min-width="300" align="center">
+        <el-table-column fixed="right" label="操作" min-width="360" align="center">
           <template slot-scope="scope">
             <el-button
               @click="changeStatus(scope.row,0)"
@@ -118,7 +120,7 @@
               v-show="showButton(scope.row,3)"
               type="primary"
               size="small"
-            >上架</el-button>
+            >发布</el-button>
             <el-button
               @click="changeStatus(scope.row,4)"
               v-show="showButton(scope.row,4)"
@@ -435,7 +437,8 @@ export default {
       this.$router.push("edit-manager");
     },
     toCmePage() {
-      console.log('跳转至 cme 新建项目')
+      console.log('跳转至 cme 新建项目');
+      this.$router.push("edit-cme");
     },
     toShield(row) {
       this.$router.push("item-shield?projectId="+row.id);
@@ -461,7 +464,7 @@ export default {
       } else if (status == 9 || status == 10) {  // 按钮显示 复审
         this.secondCheckVisible = true;
       } else if (status == 11) {  // 按钮显示 发布
-        
+        this.changeStatus(row,3)
       }
     },
     handleCheckLeft() {  // 左边通过
@@ -576,7 +579,11 @@ export default {
       if (type === 0) {
         this.updateItemManager(this.formInline)
         //编辑
-        this.$router.push("edit-manager?projectId=" + projectId +"&level="+level+'&pageNum='+this.formInline.pageNo);
+        if(row.projectType === 1) {
+          this.$router.push("edit-manager?projectId=" + projectId +"&level="+level+'&pageNum='+this.formInline.pageNo);
+        } else if(row.projectType === 2) {
+          this.$router.push("edit-cme?projectId=" + projectId +"&level="+level+'&pageNum='+this.formInline.pageNo);
+        }
       } else if (type === 7) {
         //提醒审核
         let req = {