Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

.env.development

@@ -15,7 +15,7 @@ ENV = 'development'
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 # VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-VUE_APP_BASE_API = 'http://localhost:8080'
+VUE_APP_BASE_API = 'http://10.87.10.55:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/resumption/evaluate/editDialog.vue → src/views/resumptionEvaluate/evaluate/editDialog.vue

@@ -135,7 +135,7 @@
 import dayjs from "dayjs";
 import { mapGetters } from "vuex";
 import * as api from "@/api/resumption/plan";
-import { statusOptions } from "./../../commonOption";
+
 import { findAllRole } from "@/api/system/role";
 import DialogSelect from "./addEvaluate.vue";
 import { addEvaluate, getEvaluateById ,editEvaluate} from "@/api/resumption/outsourcing.js";
@@ -166,7 +166,7 @@ export default {
         evaluateCycle: [{ required: true, message: "请选择评价周期" }],
         planStatus: [{ required: true, message: "请选择计划状态" }],
       },
-      statusOptions: statusOptions,
+     
     };
   },
   props: {