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/baseConfig/ccapProjectManage/index.vue

 <template>
   <div class="app-container">
-    <el-form v-model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="70px">
-      <el-form-item label="事业部:" prop="status">
+    <el-form v-model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" >
+      <el-form-item :label="`${cn.BusinessUnit}/${en.BusinessUnit}`" prop="status">
         <el-select
             v-model="queryParams.businessUnitId"
             placeholder="请选择"
@@ -16,32 +16,85 @@
         </el-select>
       </el-form-item>
       <el-form-item >
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button type="primary" class="btn-A"  @click="handleQuery">{{cn.handleQuery}}/{{en.handleQuery}}</el-button>
+        <el-button class="btn-B"   @click="resetQuery">{{cn.resetQuery}}/{{en.resetQuery}}</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 type="index"  align="center" label="序号" width="100">
+        <template #header>
+          <div style="display: flex;flex-direction: column">
+            <div>{{cn.serialNumber}}</div>
+            <div>{{en.serialNumber}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="事业部" align="center" prop="applicableBrand" >
+        <template #header>
+          <div style="display: flex;flex-direction: column">
+            <div>{{cn.businessUnit}}</div>
+            <div>{{en.businessUnit}}</div>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="项目情况" align="center" prop="listCode" >
+        <template #header>
+          <div style="display: flex;flex-direction: column">
+            <div>{{cn.projectSituation}}</div>
+            <div>{{en.projectSituation}}</div>
+          </div>
+        </template>
         <template #default="scope">
           <span @click="projectView(scope.row)" style="text-decoration: underline;text-decoration-color: #2f9bfe;color: #2f9bfe;cursor: pointer">共{{scope.row.relatedCount}}个</span>
         </template>
       </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" width="180" >
+      <el-table-column label="创建人" align="center" prop="createUserName" >
+        <template #header>
+          <div style="display: flex;flex-direction: column">
+            <div>{{cn.creator}}</div>
+            <div>{{en.creator}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" >
+        <template #header>
+          <div style="display: flex;flex-direction: column">
+            <div>{{cn.creationTime}}</div>
+            <div>{{en.creationTime}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateUserName" >
+        <template #header>
+          <div style="display: flex;flex-direction: column">
+            <div>{{cn.updater}}</div>
+            <div>{{en.updater}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新时间" align="center" prop="updateTime" >
+        <template #header>
+          <div style="display: flex;flex-direction: column">
+            <div>{{cn.updateTime}}</div>
+            <div>{{en.updateTime}}</div>
+          </div>
+        </template>
       </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
+      <el-table-column label="操作" align="center"  width="550">
+        <template #header>
+          <div style="display: flex;flex-direction: column">
+            <div>{{cn.operation}}</div>
+            <div>{{en.operation}}</div>
+          </div>
+        </template>
+        <template #default="scope" >
           <div style="display: flex;align-items: flex-start">
-            <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>
-            <el-button type="text" v-if="scope.row.id === adminId" @click="addBusiness(scope.row)">添加事业部</el-button>
-            <el-button type="text" style="color: rgb(244,93,93)" v-else="scope.row.id === adminId" @click="tableDel(scope.row)">删除</el-button>
+            <el-button type="text" style="color: rgb(0,0,255)"  @click="handleMaintain(scope.row)">{{cn.handleMaintain}}/{{en.handleMaintain}}</el-button>
+            <el-button type="text" style="color: rgb(255,153,0)" v-if="scope.row.id === adminId" @click="copeAdd(scope.row)">{{cn.copeAdd}}/{{en.copeAdd}}</el-button>
+            <el-button type="text" v-if="scope.row.id === adminId" @click="addBusiness(scope.row)">{{cn.addBusiness}}/{{en.addBusiness}}</el-button>
+            <el-button type="text" style="color: rgb(244,93,93)" v-else="scope.row.id === adminId" @click="tableDel(scope.row)">{{cn.tableDel}}/{{en.tableDel}}</el-button>
           </div>
         </template>
       </el-table-column>
@@ -65,11 +118,11 @@
       <template #default>
         <div style="display: flex;justify-content: space-between">
           <el-form class="drawer-form" v-model="drawerQueryParams" ref="drawerQueryRef" :inline="true" v-show="showSearch" >
-            <el-form-item label="项目:" prop="project">
+            <el-form-item :label="`${cn.project}/${en.project}`" prop="project">
               <el-input v-model="drawerQueryParams.project" style="width: 110px" placeholder="请输入"/>
             </el-form-item>
 
-            <el-form-item label="分组:" prop="groupName">
+            <el-form-item :label="`${cn.group}/${en.group}`"  prop="groupName">
               <el-select
                   v-model="drawerQueryParams.groupName"
                   placeholder="请选择"
@@ -84,27 +137,55 @@
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary"  @click="drawerHandleQuery">查询</el-button>
-              <el-button  @click="drawerResetQuery">重置</el-button>
+              <el-button type="primary" class="btn-A"  @click="drawerHandleQuery">{{cn.drawerHandleQuery}}/{{en.drawerHandleQuery}}</el-button>
+              <el-button  @click="drawerResetQuery" class="btn-B">{{cn.drawerResetQuery}}/{{en.drawerResetQuery}}</el-button>
+            </el-form-item>
+
+            <el-form-item  v-if="!isDrawer && drawerQueryParams.id === adminId">
+              <el-button type="primary" plain @click="handleAdd">{{cn.handleAdd}}/{{en.handleAdd}}</el-button>
+              <el-button type="danger" plain  @click="piliangDel">{{cn.piliangDel}}/{{en.piliangDel}}</el-button>
             </el-form-item>
           </el-form>
 
-          <div class="top-btn" v-if="!isDrawer && drawerQueryParams.id === adminId" >
-            <el-button type="primary" plain @click="handleAdd">新增</el-button>
-            <el-button type="danger" plain  @click="piliangDel">批量删除</el-button>
-          </div>
         </div>
 
         <el-table border style="margin-top: 10px" :data="drawer2TableList"  @selection-change="handleSelectionChange">
           <el-table-column type="selection"  width="55" align="center" v-if="!isDrawer"/>
-          <el-table-column type="index" width="55" align="center" label="序号"/>
-          <el-table-column label="项目" align="center" prop="project" width="300"/>
-          <el-table-column label="分组" align="center" prop="groupName" />
+          <el-table-column type="index" width="100" align="center" label="序号"  >
+            <template #header>
+              <div style="display: flex;flex-direction: column">
+                <div>{{cn.serialNumber}}</div>
+                <div>{{en.serialNumber}}</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目" align="center" prop="project">
+            <template #header>
+              <div style="display: flex;flex-direction: column">
+                <div>{{cn.project}}</div>
+                <div>{{en.project}}</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="分组" align="center" prop="groupName" >
+            <template #header>
+              <div style="display: flex;flex-direction: column">
+                <div>{{cn.group}}</div>
+                <div>{{en.group}}</div>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" v-if="!isDrawer">
+            <template #header>
+              <div style="display: flex;flex-direction: column">
+                <div>{{cn.operation}}</div>
+                <div>{{en.operation}}</div>
+              </div>
+            </template>
             <template #default="scope" align="center">
               <div >
-                <el-button type="text" style="color: rgb(0,0,255)"  @click="handleDrawerEdit(scope.row)">编辑</el-button>
-                <el-button v-if="drawerQueryParams.id === adminId" type="text" style="color: rgb(244,93,93)"  @click="handleDrawerDel(scope.row)">删除</el-button>
+                <el-button type="text" style="color: rgb(0,0,255)"  @click="handleDrawerEdit(scope.row)">{{cn.handleDrawerEdit}}/{{en.handleDrawerEdit}}</el-button>
+                <el-button v-if="drawerQueryParams.id === adminId" type="text" style="color: rgb(244,93,93)"  @click="handleDrawerDel(scope.row)">{{cn.handleDrawerDel}}/{{en.handleDrawerDel}}</el-button>
               </div>
             </template>
           </el-table-column>
@@ -112,8 +193,8 @@
       </template>
       <template #footer>
         <div style="flex: auto">
-          <el-button @click="cancelClick">取消</el-button>
-          <el-button type="primary" @click="confirmClick">保存</el-button>
+          <el-button class="btn-B" @click="cancelClick">取消</el-button>
+          <el-button class="btn-A" type="primary" @click="confirmClick">保存</el-button>
         </div>
       </template>
     </el-drawer>
@@ -127,11 +208,11 @@
     >
       <div style="width: 85%;margin-left: 7.5%">
         <el-form :rules="dialogRules" :model="dialogForm" ref="dialogQueryRef"  >
-          <el-form-item label="项目:" :prop="drawerQueryParams.id === adminId ?'project':''"  >
+          <el-form-item :label="`${cn.project}/${en.project}`" :prop="drawerQueryParams.id === adminId ?'project':''"  >
             <el-input :disabled="!(drawerQueryParams.id === adminId)" v-model="dialogForm.project" placeholder="请输入"/>
           </el-form-item>
 
-          <el-form-item label="分组:" prop="groupName" >
+          <el-form-item :label="`${cn.group}/${en.group}`" prop="groupName" >
             <el-select
                 v-model="dialogForm.groupName"
                 placeholder="请选择"
@@ -149,8 +230,8 @@
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="dialogCencal">取消</el-button>
-          <el-button type="primary" @click="dialogSave(dialogForm)">
+          <el-button class="btn-B" @click="dialogCencal">取消</el-button>
+          <el-button class="btn-A" type="primary" @click="dialogSave(dialogForm)">
             保存
           </el-button>
         </div>
@@ -187,8 +268,8 @@
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="dialog2Cancel">取消</el-button>
-          <el-button type="primary" @click="dialog2Sure">
+          <el-button class="btn-B"  @click="dialog2Cancel">取消</el-button>
+          <el-button class="btn-A" type="primary" @click="dialog2Sure">
             确定
           </el-button>
         </div>
@@ -198,6 +279,9 @@
 </template>
 
 <script setup>
+import cn from '../../../../locales/controlPlan/baseConfig/ccapProjectManage/cn.json';
+import en from '../../../../locales/controlPlan/baseConfig/ccapProjectManage/en.json';
+
 import { ElMessage,ElMessageBox  } from 'element-plus'
 import { ref, getCurrentInstance } from 'vue';
 import {
@@ -417,7 +501,7 @@ function projectView(row){
 
 function handleDrawerEdit(row){
   dialogVisible.value = true;
-  addTitle.value = '编辑';
+  addTitle.value = cn.edit + '/' +en.edit;
   dialogForm.value.projectStatusId = drawerQueryParams.value.id;
   dialogForm.value.id = row.id
   dialogForm.value.groupName = row.groupName
@@ -433,7 +517,7 @@ function getBusinessList() {
 //抽屉里面点击了新增按钮
 function handleAdd() {
   dialogVisible.value = true;
-  addTitle.value = '新增';
+  addTitle.value = cn.add + '/' +en.add;
   dialogForm.value.projectStatusId = drawerQueryParams.value.id;
 }
 
@@ -441,8 +525,9 @@ function handleAdd() {
 function dialogSave() {
   dialogQueryRef.value.validate((valid)=>{
     if (valid) {
+      let t = cn.add + '/' +en.add
       //判断是新增还是保存
-      if(addTitle.value === '新增'){
+      if(addTitle.value === t){
         inserTableData(dialogForm.value).then(res=>{
           if(res.code === 200) {
             ElMessage.success("新增成功")
@@ -604,17 +689,26 @@ getBusinessList();
   margin-left: 5px;
 }
 
-:deep(.top-btn .el-button + .el-button) {
-  margin-left: 5px;
-}
+
 
 :deep(.el-drawer__header) {
   margin-bottom: 0;
   padding-bottom: 20px;
   background-color: rgb(245, 245, 245);
 }
-
+:deep(.el-pagination) {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  margin-top: 24px;
+}
+:deep(.el-pagination.is-background .el-pager li.is-active){
+  background-color: #0154FB;
+}
 :deep(.el-dialog) {
   margin-top: 17% !important;
 }
+el-button{
+  width: auto;
+}
 </style>

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>