update 先changeStatus 再remindPortalCheck

src/utils/fetch.js

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

src/views/education/item-manager.vue

@@ -360,28 +360,61 @@ export default {
           }
         });
       } else {
-        if (type === 8) {
-          //取消审批值对应2
-          type = 2;
+        // 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 = {
-            portalProjectId: projectId,
-            warnType: 5
+          projectId: projectId,
+          changeStatus: vm.getType(type)
         };
-          vm.GET("portal/portalCheck/remindPortalCheck", req).then(res => {
+        vm.POST("portal/portalInfo/changeStatus", req).then(res => {
           vm.$message.info(res.message);
           if (res.code == "000000") {
             console.log(res);
             vm.getProjectList();
-            }
-          });
-        }
-        if (type == 4 || type == 6) {
+
+            //changeStatus之后remindPortalCheck
+            if (type == 4 || type == 6 || type == 8) {
               //发送消息
               let warnType = "";
               if (type == 4) {
                 warnType = 3;
               } else if (type == 6) {
                 warnType = 4;
+              } else if (type == 8) {
+                warnType = 5;
               }
               let req = {
                 portalProjectId: projectId,
@@ -390,24 +423,21 @@ export default {
               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: type
-        };
-        vm.POST("portal/portalInfo/changeStatus", req).then(res => {
-          vm.$message.info(res.message);
-          if (res.code == "000000") {
-            console.log(res);
-            vm.getProjectList();
           }
         });
       }
     },
+    getType(value) {
+      let data = value;
+      if(data == 8) {
+        data = 2;
+      }
+      return data;
+    },
     //删除项目
     delItem(row) {
       let req = {};