Merge branch 'dev-saas-phrase2.1-0522' into 'release'

CME菜单控制   code reviewer：张平

CME菜单控制   code reviewer：张平

See merge request !157

src/components/education/custom/course-list.vue

@@ -195,11 +195,13 @@ export default {
         height: 14px;
       }
       .num {
+        cursor: pointer;
         margin-right: 30px;
       }
       .cart-wrapper {
         position: relative;
         .cart {
+          cursor: pointer;
           position: relative;
           .count {
             position: absolute;

src/components/education/custom/custom-baseinfo.vue

@@ -73,8 +73,8 @@
                 size="small"
                 type="datetime"
                 placeholder="请选择开始时间"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy/MM/dd HH:mm:ss"
+                format="yyyy/MM/dd HH:mm:ss"
                 :picker-options="pickerOptions0"
                 style="width: 100%;"
                 :disabled="formData.status4Flag == 1 || isPreview==1"
@@ -89,8 +89,8 @@
                 size="small"
                 type="datetime"
                 placeholder="请选择结束时间"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy/MM/dd HH:mm:ss"
+                format="yyyy/MM/dd HH:mm:ss"
                 :picker-options="pickerOptions1"
                 default-time="00:00:00"
                 style="width: 100%;"
@@ -416,8 +416,8 @@ export default {
 
     // 设置已有的基本信息
     setBaseMessage(data) {
-      // data.projectData.projectBegintime = convertTime(data.projectData.projectBegintime);
-      // data.projectData.projectEndtime = convertTime(data.projectData.projectEndtime);
+      data.projectData.projectBegintime = convertTime(data.projectData.projectBegintime);
+      data.projectData.projectEndtime = convertTime(data.projectData.projectEndtime);
 
       vm.formData = Object.assign(vm.formData, data.projectData);
       vm.formData.attachmentUrl1 = data.attachmentData[0].attachmentUrl;
@@ -425,8 +425,8 @@ export default {
       vm.formData.attachmentMore1 = Object.assign( vm.formData.attachmentMore1, data.attachmentData[0]);
       // 暂存为1   下一步为3
       vm.formData.projectType = vm.formData.projectType == 0 ? 4 : vm.formData.projectType;
-      // vm.formData.projectBegintime = vm.formData.projectBegintime ? new Date(vm.formData.projectBegintime) : "";
-      // vm.formData.projectEndtime = vm.formData.projectBegintime ? new Date(vm.formData.projectEndtime) : "";
+      vm.formData.projectBegintime = vm.formData.projectBegintime ? new Date(vm.formData.projectBegintime) : "";
+      vm.formData.projectEndtime = vm.formData.projectBegintime ? new Date(vm.formData.projectEndtime) : "";
       if (data.attachmentData[1]) {
         let attachmentUrl2 = data.attachmentData[1].attachmentUrl;
         vm.selectedAttachUrl(attachmentUrl2, 2, false);
@@ -609,14 +609,14 @@ export default {
         }
       }
 
-      // vm.formData.projectBegintime = convertTime(
-      //   vm.formData.projectBegintime,
-      //   false
-      // );
-      // vm.formData.projectEndtime = convertTime(
-      //   vm.formData.projectEndtime,
-      //   false
-      // );
+      vm.formData.projectBegintime = convertTime(
+        vm.formData.projectBegintime,
+        false
+      );
+      vm.formData.projectEndtime = convertTime(
+        vm.formData.projectEndtime,
+        false
+      );
       if (status) {
         vm.formData.projectStatus = status;
       }

src/components/education/custom/shopping-cart.vue

@@ -76,6 +76,7 @@ export default {
     color: #000000;
     background: #f9f9f9;
     img {
+      cursor: pointer;
       width: 15px;
       height: 15px;
     }

src/components/education/custom/sorted-cart.vue

@@ -209,6 +209,7 @@ export default {
         }
       }
       .handler {
+        cursor: pointer;
         width: 35px;
         img {
           // cursor: pointer;

src/views/layout/slidebar.vue

@@ -159,28 +159,28 @@
           //     }
           //   ]
           // },
-          {
-            title: 'CME',
-            icon: 'el-icon-reading',
-            index: 'credit-manage',
-            subs: [
-              {
-                title: '学分管理列表',
-                icon: 'el-icon-document',
-                index: 'credit-manage'
-              },
-              {
-                title: '审核权限管理',
-                icon: 'el-icon-document',
-                index: 'review-access-manage'
-              },
-              {
-                title: '学分发放管理',
-                icon: 'el-icon-document',
-                index: 'credit-send-manage'
-              },
-            ]
-          },         
+          // {
+          //   title: 'CME',
+          //   icon: 'el-icon-reading',
+          //   index: 'credit-manage',
+          //   subs: [
+          //     {
+          //       title: '学分管理列表',
+          //       icon: 'el-icon-document',
+          //       index: 'credit-manage'
+          //     },
+          //     {
+          //       title: '审核权限管理',
+          //       icon: 'el-icon-document',
+          //       index: 'review-access-manage'
+          //     },
+          //     {
+          //       title: '学分发放管理',
+          //       icon: 'el-icon-document',
+          //       index: 'credit-send-manage'
+          //     },
+          //   ]
+          // },         
         ],
         outsideItems: [  // 外部用户 路由
           {
@@ -305,11 +305,34 @@
             }
           ]
         }
+        const cme =  {
+          title: 'CME',
+          icon: 'el-icon-reading',
+          index: 'credit-manage',
+          subs: [
+            {
+              title: '学分管理列表',
+              icon: 'el-icon-document',
+              index: 'credit-manage'
+            },
+            {
+              title: '审核权限管理',
+              icon: 'el-icon-document',
+              index: 'review-access-manage'
+            },
+            {
+              title: '学分发放管理',
+              icon: 'el-icon-document',
+              index: 'credit-send-manage'
+            },
+          ]
+        }
         
         vm.items[1].subs.push(itemComponent);
         vm.items[1].subs.push(templateManager);
         vm.items[1].subs.push(followSider);
         vm.items.push(eduRole);
+        vm.items.push(cme);
       },
       goToMessageSendPage(checkAuth) {
         if(checkAuth){