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

src/locales/controlPlan/baseConfig/ccapProjectManage/cn.json

+{
+  "serialNumber": "序号",
+  "businessUnit": "事业部",
+  "projectSituation": "项目情况",
+  "creator": "创建人",
+  "creationTime": "创建时间",
+  "updater": "更新人",
+  "updateTime": "更新时间",
+  "operation": "操作",
+  "BusinessUnit": "事业部",
+  "handleQuery": "搜索",
+  "resetQuery": "重置",
+  "project":"项目",
+  "group":"分组",
+  "handleMaintain": "维护项目",
+  "copeAdd": "复制新增",
+  "addBusiness": "添加事业部",
+  "tableDel": "删除",
+  "drawerHandleQuery": "查询",
+  "drawerResetQuery": "重置",
+  "handleAdd": "新增",
+  "piliangDel": "批量删除",
+  "handleDrawerEdit": "编辑",
+  "handleDrawerDel": "删除",
+  "add": "新增",
+  "edit": "编辑",
+  "cancelClick": "取消",
+  "confirmClick": "保存",
+  "dialogCencal": "取消",
+  "dialogSave": "保存",
+  "dialog2Cancel": "取消",
+  "dialog2Sure": "确定"
+}

src/locales/controlPlan/baseConfig/ccapProjectManage/en.json

+{
+  "serialNumber": "Serial Number",
+  "businessUnit": "Business Unit",
+  "projectSituation": "Project Situation",
+  "creator": "Creator",
+  "creationTime": "Creation Time",
+  "updater": "Updater",
+  "updateTime": "Update Time",
+  "operation": "Operation",
+  "project":"project",
+  "group":"group",
+  "add": "add",
+  "edit": "edit",
+  "BusinessUnit": "Business Unit",
+  "handleQuery": "Search",
+  "resetQuery": "Reset",
+  "handleMaintain": "Maintain Project",
+  "copeAdd": "Copy and Add",
+  "addBusiness": "Add Business Unit",
+  "tableDel": "Delete",
+  "drawerHandleQuery": "Query",
+  "drawerResetQuery": "Reset",
+  "handleAdd": "Add",
+  "piliangDel": "Batch Delete",
+  "handleDrawerEdit": "Edit",
+  "handleDrawerDel": "Delete",
+  "cancelClick": "Cancel",
+  "confirmClick": "Save",
+  "dialogCencal": "Cancel",
+  "dialogSave": "Save",
+  "dialog2Cancel": "Cancel",
+  "dialog2Sure": "Confirm"
+}

src/views/controlPlan/controlPlanNotice/notificationManagement/index.vue

+<template>
+  <div class="app-container">
+    <el-form v-model="queryParams" ref="queryRef" :inline="true">
+      <el-form-item label="通知单编号:" prop="status">
+        <el-input placeholder="请输入" v-model="queryParams.number" style="width: 120px" />
+      </el-form-item>
+      <el-form-item label="认证机构:" prop="status">
+        <el-select
+            v-model="queryParams.businessUnitId"
+            placeholder="请选择"
+            clearable
+            style="width: 120px"
+        >
+          <el-option
+              v-for="dict in 4"
+              :label="dict"
+              :value="dict"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="事业部:" prop="status">
+        <el-select
+            v-model="queryParams.businessUnitId"
+            placeholder="请选择"
+            clearable
+            style="width: 120px"
+        >
+          <el-option
+              v-for="dict in 4"
+              :label="dict"
+              :value="dict"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车型代码:" prop="status">
+        <el-select
+            v-model="queryParams.businessUnitId"
+            placeholder="请选择"
+            clearable
+            style="width: 120px"
+        >
+          <el-option
+              v-for="dict in 4"
+              :label="dict"
+              :value="dict"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车型系列:" prop="status">
+        <el-select
+            v-model="queryParams.businessUnitId"
+            placeholder="请选择"
+            clearable
+            style="width: 120px"
+        >
+          <el-option
+              v-for="dict in 4"
+              :label="dict"
+              :value="dict"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="生产地址:" prop="status">
+        <el-input placeholder="请输入" v-model="queryParams.number" style="width: 120px" />
+      </el-form-item>
+      <el-form-item label="车型公告号:" prop="status">
+        <el-input placeholder="请输入" v-model="queryParams.number" style="width: 120px" />
+      </el-form-item>
+      <el-form-item label="变更类型:" prop="status">
+        <el-select
+            v-model="queryParams.businessUnitId"
+            placeholder="请选择"
+            clearable
+            style="width: 120px"
+        >
+          <el-option
+              v-for="dict in 4"
+              :label="dict"
+              :value="dict"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="认证负责人:" prop="status">
+        <el-input placeholder="请输入" v-model="queryParams.number" style="width: 120px" />
+      </el-form-item>
+      <el-form-item label="创建人:" prop="status">
+        <el-input placeholder="请输入" v-model="queryParams.number" style="width: 120px" />
+      </el-form-item>
+      <el-form-item label="批准人:" prop="status">
+        <el-input placeholder="请输入" v-model="queryParams.number" style="width: 120px" />
+      </el-form-item>
+      <el-form-item label="通知单状态:" prop="status">
+        <el-select
+            v-model="queryParams.businessUnitId"
+            placeholder="请选择"
+            clearable
+            style="width: 120px"
+        >
+          <el-option
+              v-for="dict in 4"
+              :label="dict"
+              :value="dict"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item class="button-container" style="position: relative;">
+        <el-button type="primary" @click="handleQuery">查询</el-button>
+        <el-button @click="resetQuery">重置</el-button>
+        <el-button style="position: absolute; right: 0;" plain>新增</el-button>
+      </el-form-item>
+    </el-form>
+
+
+    <el-table  :data="tableList">
+      <el-table-column type="index" width="55" align="center" label="序号"/>
+      <el-table-column label="序号" align="center" prop="applicableBrand" />
+      <el-table-column label="通知单编号" align="center" prop="listCode" >
+
+      </el-table-column>
+      <el-table-column label="认证机构" align="center" prop="createUserName" />
+      <el-table-column label="事业部" align="center" prop="createTime" />
+      <el-table-column label="品牌" align="center" prop="updateUserName" />
+      <el-table-column label="车型代码" align="center" prop="updateTime"  />
+      <el-table-column label="车型系列" align="center" prop="updateTime"  />
+      <el-table-column label="车型代码" align="center" prop="updateTime"  />
+      <el-table-column label="生产地址" align="center" prop="updateTime"  />
+      <el-table-column label="车型公告号" align="center" prop="updateTime"  />
+      <el-table-column label="变更类型" align="center" prop="updateTime"  />
+      <el-table-column label="认证负责人" align="center" prop="updateTime"  />
+      <el-table-column label="批注日期" align="center" prop="updateTime"  />
+      <el-table-column label="通知单状态" align="center" prop="updateTime"  />
+      <el-table-column label="创建人" align="center" prop="updateTime"  />
+      <el-table-column label="批准人" align="center" prop="updateTime"  />
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+            <el-button type="text" style="color: rgb(0,0,255)"  @click="handleMaintain(scope.row)">维护项目</el-button>
+            <el-button type="text" style="color: rgb(255,153,0)" v-if="scope.row.id === adminId" @click="copeAdd(scope.row)">复制新增</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script setup>
+import { ref } from "vue";
+const tableList =ref([])
+
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  businessUnitId: null,
+  number: ""
+});
+</script>
+
+
+<style scoped lang="scss">
+:deep(.el-form--inline .el-form-item) {
+  margin-right: 5px;
+}
+
+.button-container {
+  width: 50%;
+
+}
+</style>

src/views/system/domesticBrand/index.vue

+<template>
+    <div class="app-container">
+      国内
+    </div>
+</template>
+<script setup>
+
+</script>
+<style scoped lang="scss">
+
+</style>