不再使用项目类型、任务类型、报告类型的枚举

src/components/cheat/ProjectAdd.vue

@@ -39,15 +39,10 @@
             </el-form-item>
             <el-form-item label="服务类型" prop="type">
               <el-checkbox-group v-if="isModifyMode" v-model="project.type">
-                <el-checkbox label="0" name="type">{{serviceType[0]}}</el-checkbox>
-                <el-checkbox label="1" name="type">{{serviceType[1]}}</el-checkbox>
-                <el-checkbox label="2" name="type">{{serviceType[2]}}</el-checkbox>
-                <el-checkbox label="3" name="type">{{serviceType[3]}}</el-checkbox>
-                <el-checkbox label="4" name="type">{{serviceType[4]}}</el-checkbox>
-                <el-checkbox label="5" name="type">{{serviceType[5]}}</el-checkbox>
-                <el-checkbox label="6" name="type">{{serviceType[6]}}</el-checkbox>
+            <span v-for="(item,index) in serviceType" :key="index">
+              <el-checkbox :label="item" name="type">{{item}}&nbsp;&nbsp;&nbsp;&nbsp;</el-checkbox>
+            </span>
               </el-checkbox-group>
-              <!--<span v-if="!isModifyMode" class="badge" v-for="item in project.type">{{serviceType[item]}}</span>-->
             </el-form-item>
             <el-form-item prop="file" label="项目需求文档">
               <el-upload
@@ -228,9 +223,9 @@
 <script>
 import Http from '@/js/http.js'
 import Apis from '@/js/api.js'
-import ServiceType from '@/constants/enum/service-type.js'
 import PlatformType from '@/constants/enum/platform-type.js'
 import {notify} from '@/constants/index'
+import {getAllServiceTypes} from '@/js/index'
 
 export default {
   name: 'ProjectAdd',
@@ -239,7 +234,7 @@ export default {
       userId: 0,
       dialogVisible: false,
       isModifyMode: true,
-      serviceType: ServiceType,
+      serviceType: [],
       platform: PlatformType,
       isFormSubmit: true,
       downloadFile: '123.xls',
@@ -422,7 +417,15 @@ export default {
       }]
     }
   },
+  mounted () {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
   methods: {
+    init () {
+      this.setServiceType()
+    },
     //加载数据
     loadData: function () {
     },
@@ -542,6 +545,9 @@ export default {
       this.dialogVisible = false
       this.resetForm()
     },
+    setServiceType () {
+      this.serviceType = getAllServiceTypes()
+    }
   },
   created: function () {
   }

src/components/project/Project.vue

@@ -64,7 +64,7 @@
         </el-form-item>
 
         <el-form-item label="服务类型" prop="type">
-          <el-checkbox-group v-if="isModifyMode" v-model="project.type" >
+          <el-checkbox-group v-if="isModifyMode" v-model="project.type">
             <span v-for="(item,index) in serviceType" :key="index">
               <el-checkbox :label="item" name="type">{{item}}</el-checkbox>
             </span>
@@ -293,9 +293,8 @@ import Apis from '@/js/api.js'
 import ResourceType from '@/constants/enum/resource-type'
 import provincecity from '@/components/commons/ProvinceCity'
 import provinceCityJSON from '@/constants/provinceCity.json'
-import ServiceType from '@/constants/enum/service-type'
 import {notify} from '@/constants/index'
-import {getAllAbilities} from '@/js/index'
+import {getAllServiceTypes} from '@/js/index'
 
 export default {
   name: 'Project',
@@ -669,7 +668,7 @@ export default {
       })
     },
     setServiceType () {
-      this.serviceType = getAllAbilities()
+      this.serviceType = getAllServiceTypes()
     }
   }
 }

src/components/project/ProjectCreate.vue

@@ -152,7 +152,7 @@ import provincecity from '@/components/commons/ProvinceCity'
 import provinceCityJSON from '@/constants/provinceCity.json'
 import ResourceType from '@/constants/enum/resource-type'
 import {notify} from '@/constants/index'
-import {getAllAbilities} from '@/js/index'
+import {getAllServiceTypes} from '@/js/index'
 
 export default {
   name: 'ProjectCreate',
@@ -442,7 +442,7 @@ export default {
       })
     },
     setServiceType () {
-      this.serviceType = getAllAbilities()
+      this.serviceType = getAllServiceTypes()
     }
   }
 }

src/components/task/Task.vue

@@ -133,7 +133,7 @@ import ReportList from '@/components/report/ReportList'
 import Http from '@/js/http.js'
 import Apis from '@/js/api.js'
 import {notify} from '@/constants/index'
-import {getAllAbilities} from '@/js/index'
+import {getAllServiceTypes} from '@/js/index'
 
 export default {
   name: 'Task',
@@ -423,7 +423,7 @@ export default {
       })
     },
     setServiceType () {
-      this.serviceType = getAllAbilities()
+      this.serviceType = getAllServiceTypes()
     }
   },
   // created () {

src/components/task/TaskCreate.vue

@@ -104,7 +104,7 @@ import Http from '@/js/http.js'
 import Apis from '@/js/api.js'
 import ResourceType from '@/constants/enum/resource-type.js'
 import {notify} from '@/constants/index'
-import {getAllAbilities} from '@/js/index'
+import {getAllServiceTypes} from '@/js/index'
 
 export default {
   name: 'Task',
@@ -344,7 +344,7 @@ export default {
       })
     },
     setServiceType () {
-      this.serviceType = getAllAbilities()
+      this.serviceType = getAllServiceTypes()
     }
   }
 }