Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/controlPlan/baseConfig/ccapProjectManage/index.vue

src/api/CCAPProjectManagement/list.js

@@ -49,3 +49,18 @@ export function updateCcap(data) {
     data:data
   })
 }
+// 获取所有事业部（除了奇瑞，除了列表里面的出现的）
+export function getBusinessExclude() {
+  return request({
+    url: '/control/ccapProjectManagement/getBusinessExclude',
+    method: 'get'
+  })
+}
+// 添加事业部
+export function addBusinessUnit(data) {
+  return request({
+    url: '/control/ccapProjectManagement/addBusinessUnit',
+    method: 'post',
+    data:data
+  })
+}

src/locales/controlPlan/CCAPControlPlan/CCAPCompileTaskProcessing/cn.json

+{
+  "search": "搜索",
+  "reset": "重置"
+}

src/locales/controlPlan/CCAPControlPlan/CCAPCompileTaskProcessing/en.json

+{
+  "search": "search",
+  "reset": "reset"
+}

src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/cn.json

+{
+  "search": "搜索",
+  "reset": "重置"
+}

src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/en.json

+{
+  "search": "search",
+  "reset": "reset"
+}

src/views/controlPlan/CCAPControlPlan/CCAPCompileTaskProcessing/index.vue

+<script setup>
+
+</script>
+
+<template>
+CCAP编制任务处理
+</template>
+
+<style scoped lang="scss">
+
+</style>

src/views/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index.vue

+<script setup>
+
+</script>
+
+<template>
+<div>
+  CCAP控制计划管理页面
+</div>
+</template>
+
+<style scoped lang="scss">
+
+</style>