待审批 审批中

src/utils/filter.js

@@ -127,17 +127,22 @@ const vueFilter = {
   },
   //项目管理
   statusProject: (value) => {
-    if(value == 1) {
+    //console.log(value)
+    if(value[0] == 1) {
         return '草稿'
-    }else if(value == 2) {
+    }else if(value[0] == 2) {
         return '未上架'
-    }else if(value == 3) {
-        return '审批中'
-    }else if(value == 4) {
+    }else if(value[0] == 3) {
+        if(value[1] == 1) {
+            return '待审批'
+        } else {
+            return '审批中'
+        }
+    }else if(value[0] == 4) {
         return '已上架'
-    }else if(value == 5) {
+    }else if(value[0] == 5) {
         return '已下架'
-    }else {
+    }else if(value[0] == 6) {
         return '已拒绝'
     }
   },

src/views/education/add-manager.vue

@@ -705,7 +705,7 @@ export default {
     this.changeOnStep(this.active);
     this.getComponentInfo();
     this.idTypeValue = vm.idType;
-
+    //console.log('this.idType:'+vm.idType);
     if (vm.idType == 2) {
       this.activeName = "second";
     }

src/views/education/item-manager.vue

@@ -89,7 +89,7 @@
         <el-table-column prop="projectEndtime" label="项目结束时间" align="center"></el-table-column>
         <el-table-column prop="projectStatus" label="状态" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.projectStatus | statusProject }}</span>
+            <span>{{ [scope.row.projectStatus , idType] | statusProject }}</span>
           </template>
         </el-table-column>
         <el-table-column fixed="right" label="操作" min-width="200" align="center">
@@ -181,9 +181,11 @@
 <script>
 import BreadCrumb from "../../components/breadcrumb.vue";
 import { create } from "domain";
+import { mapGetters } from 'vuex'
 import { returnData } from "../mock";
 import { openLoading, closeLoading } from "../../utils/utils";
 import * as commonUtil from "../../utils/utils";
+import { setTimeout } from 'timers';
 let vm = null;
 export default {
   components: {
@@ -191,6 +193,7 @@ export default {
   },
   data() {
     return {
+      idValue: '',
       curmbFirst: "教培项目",
       curmbSecond: "项目管理",
       searchParam: {
@@ -258,9 +261,15 @@ export default {
       }
     };
   },
+  computed: {
+    ...mapGetters(["_token", "idType"])
+  },
   created() {
     vm = this;
-    this.getProjectList();
+    console.log('this.idType:'+this.idType);
+    this.$nextTick(function() {;
+      this.getProjectList();
+    });
   },
   // 挂载到Dom完成时
   mounted: function() {
@@ -279,6 +288,7 @@ export default {
         closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.data;
+          //console.log(vm.tableData);
           vm.totalRows = res.data.totalRows;
         }
       });