Merge branch 'dev-mvp-20200331' of...

Merge branch 'dev-mvp-20200331' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-mvp-20200331

src/utils/mock.js

@@ -121,7 +121,7 @@ let buttonStatusIn = [
     //待审核、审批中
     { L1: "46", L2: "78", L3: "A" },
     //已上架
-    { L1: "5", L2: "5", L3: "A" },
+    { L1: "05", L2: "05", L3: "A" },
     //已下架
     { L1: "039", L2: "039", L3: "A" },
     //已拒绝/未上架
@@ -136,7 +136,7 @@ let buttonStatusOut = [
     //待审核、审批中
     { L1: "46", L2: "78", L3: "A" },
     //已上架
-    { L1: "05", L2: "05", L3: "A" },
+    { L1: "5", L2: "5", L3: "A" },
     //已下架
     { L1: "039", L2: "039", L3: "A" },
     //已拒绝/未上架

src/views/education/item-manager.vue

@@ -139,7 +139,7 @@
               size="small"
             >发布</el-button>
             <el-button
-              @click="changeStatus(scope.row,4)"
+              @click="changeStatusForSP(scope.row,4)"
               v-show="showButton(scope.row,4)"
               type="primary"
               size="small"
@@ -164,7 +164,7 @@
               size="small"
             >取消审核</el-button>
             <el-button
-              @click="changeStatus(scope.row,6)"
+              @click="changeStatusForSP(scope.row,6)"
               v-show="showButton(scope.row,6)"
               type="primary"
               size="small"
@@ -281,6 +281,22 @@
           <el-button type="primary" @click="hideDeleteFrom">取 消</el-button>
         </span>
       </el-dialog>
+
+      <!-- 修改状态 -->
+      <el-dialog
+        :title="changeStatusConfig.title"
+        :show-close=false
+        :visible.sync="changeStatusVisible"
+        :close-on-click-modal="false"
+        width="600px"
+        center>
+        <p style="text-align: center;">{{changeStatusConfig.message}}</p>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="changeStatusVisible=false">取 消</el-button>
+          <el-button type="primary" @click="changeStatusPre">确 认</el-button>
+        </span>
+      </el-dialog>    
+    
     </div>
   </div>
 </template>
@@ -299,6 +315,14 @@ export default {
   },
   data() {
     return {
+      changeStatusVisible: false,
+      currentRow: null,
+      currentType: 4,
+      changeStatusConfig: {
+        title: '确认通过该项目模版审核吗？',
+        message: '下架后，用户新建项目则无法看到该模版',
+      },
+
       idValue: '',
       curmbFirst: "教培项目",
       curmbSecond: "项目管理",
@@ -315,6 +339,10 @@ export default {
       cmeBtnText: '', 
       currentRow: {},
       optionStatus: [
+        {
+          value: "",
+          label: "全部"
+        },        
         {
           value: 1,
           label: "草稿"
@@ -537,6 +565,8 @@ export default {
     getProjectList() {
       let req = {};
       req = this.formInline;
+      this.formInline.projectBegintime = !this.formInline.projectBegintime ? "" : this.formInline.projectBegintime;
+      this.formInline.projectEndtime = !this.formInline.projectEndtime ? "" : this.formInline.projectEndtime;
       openLoading(vm);
       vm.GET("portal/portalInfo/getProjectList", req).then(res => {
         closeLoading(vm);
@@ -617,6 +647,26 @@ export default {
       return text;
       // return true / false; 
     },
+
+    changeStatusPre() {
+      this.changeStatus(this.currentRow, this.currentType);
+      this.changeStatusVisible = false;
+    },
+
+    // 
+    changeStatusForSP(row, type) {
+      this.currentRow = row;
+      this.currentType = type;
+      if(type == 4) {
+        this.changeStatusConfig.title = '确认通过该项目审核吗？';
+        this.changeStatusConfig.message = '审核通过后，该项目范围内的学员可在云鹊医App进行培训学习';
+      } else if(type == 6) {
+        this.changeStatusConfig.title = '确认要拒绝该项目吗？';
+        this.changeStatusConfig.message = '拒绝后该项目将从列表中消失';
+      }
+      this.changeStatusVisible = true;
+    },
+
     //改变状态
     changeStatus(row, type) {
       let projectId = row.id;
@@ -638,49 +688,14 @@ export default {
           warnType: 1
         };
         vm.GET("portal/portalCheck/remindPortalCheck", req).then(res => {
-          vm.$message.info(res.message);
-          vm.getProjectList();
           if (res.code == "000000") {
             console.log(res);
-            //vm.getProjectList();
+            vm.getProjectList();
+          } else {
+            vm.$message.info(res.message);
           }
         });
       } else {
-        // if (type === 8) {
-        //   //取消审批值对应2
-        //   type = 2;
-        //   let req = {
-        //     portalProjectId: projectId,
-        //     warnType: 5
-        //   };
-        //   vm.GET("portal/portalCheck/remindPortalCheck", req).then(res => {
-        //     vm.$message.info(res.message);
-        //     if (res.code == "000000") {
-        //       console.log(res);
-        //       vm.getProjectList();
-        //     }
-        //   });
-        // }
-        // if (type == 4 || type == 6) {
-        //   //发送消息
-        //   let warnType = "";
-        //   if (type == 4) {
-        //     warnType = 3;
-        //   } else if (type == 6) {
-        //     warnType = 4;
-        //   }
-        //   let req = {
-        //     portalProjectId: projectId,
-        //     warnType: warnType
-        //   };
-        //   vm.GET("portal/portalCheck/remindPortalCheck", req).then(res => {
-        //     vm.$message.info(res.message);
-        //     if (res.code == "000000") {
-        //       console.log(res);
-        //       vm.getProjectList();
-        //     }
-        //   });
-        // }
         let req = {
           projectId: projectId,
           changeStatus: vm.getType(type)

src/views/learning/item-list.vue

@@ -3,7 +3,7 @@
     <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird"></bread-crumb>
     <div class="component-content screenSet" id="screenSet">
       <div v-if="staticData == 1" class="item-form">
-        <div class="form-title">查询条件2333</div>
+        <div class="form-title">查询条件</div>
         <div class="form-p">
           <p>
             <span>选择地区</span>