Skip to content

Q
qr-consistency-vue3
Commit 38951b8c authored by 高滢's avatar 高滢
Browse files
Options

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

parents 61a7f05e b5c2b437
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2272 additions and 204 deletions
src/api/CCAPControlPlanManagement/CCAPControlPlanManagement.js 0 → 100644
View file @ 38951b8c
import request from '@/utils/request.js'
// 查询CCAP控制计划列表
export function getCCAPPlanList() {
return request({
url: '/control/ccapPlan/list',
method: 'get'
})
}
src/api/CCAPProjectManagement/list.js
View file @ 38951b8c
......@@ -83,3 +83,10 @@ export function coypAddCcapManager(data) {
data:data
})
}
// 删除主表
export function deletetable(id) {
return request({
url: '/control/ccapProjectManagement/deletetable/'+id,
method: 'DELETE'
})
}
src/api/system/basicdata/manufacturer.js
View file @ 38951b8c
......@@ -5,7 +5,7 @@ export function listManufacturer(query) {
return request({
url: '/control/manufacturer/list',
method: 'get',
params: query
params: query,
})
}
......@@ -13,7 +13,7 @@ export function listManufacturer(query) {
export function getManufacturer(id) {
return request({
url: '/control/manufacturer/' + id,
method: 'get'
method: 'get',
})
}
......@@ -22,7 +22,7 @@ export function addManufacturer(data) {
return request({
url: '/control/manufacturer',
method: 'post',
data: data
data: data,
})
}
......@@ -31,7 +31,7 @@ export function updateManufacturer(data) {
return request({
url: '/control/manufacturer',
method: 'put',
data: data
data: data,
})
}
......@@ -39,6 +39,13 @@ export function updateManufacturer(data) {
export function delManufacturer(id) {
return request({
url: '/control/manufacturer/' + id,
method: 'delete'
method: 'delete',
})
}
export function updateManufacturers() {
return request({
url: '/control/manufacturer/updateManufacturerData',
method: 'post',
})
}
src/assets/styles/btn.scss
View file @ 38951b8c
......@@ -43,6 +43,22 @@
color: #0148d6;
}
}
.btn-C{
width: auto;
height: 32px;
background: #ffffff;
color: #0154FB;
border: 1px solid #0154fb;
border-radius: 4px;
&:hover {
background: #dfe9fe;
color: #0154fb;
border: 1px solid #0154fb;
}
&:active {
color: #0148d6;
}
}
.blue-btn {
@include colorBtn($blue);
}
......
src/locales/baseData/criticalPartsList/BaseIntlPartTemplate/cn.json 0 → 100644
View file @ 38951b8c
{
"Cancel": "取消",
"Submit": "提交",
"Index":"序号",
"BusinessUnit": "事业部",
"CreatedBy": "创建人",
"CreateTime": "创建时间",
"UpdatedBy": "更新人",
"UpdateTime": "更新时间",
"Operations": "操作",
"MaintainTemplateContent": "维护模板内容",
"CopyandAdd": "复制新增",
"AddBusinessUnit": "添加事业部",
"Delete": "删除"
}
src/locales/baseData/criticalPartsList/BaseIntlPartTemplate/en.json 0 → 100644
View file @ 38951b8c
{
"Cancel": "Cancel",
"Submit": "Submit",
"Index":"Index",
"BusinessUnit": "Business Unit",
"CreatedBy": "Created By",
"CreateTime": "Create Time",
"UpdatedBy": "Updated By",
"UpdateTime": "Update Time",
"Operations": "Operations",
"MaintainTemplateContent": "Maintain Template Content",
"CopyandAdd": "Copy and Add",
"AddBusinessUnit": "Add Business Unit",
"Delete": "Delete"
}
src/locales/baseData/criticalPartsList/BaseIntlPartTemplateDetail/cn.json 0 → 100644
View file @ 38951b8c
{
"Search": "搜索",
"Reset": "重置",
"Cancel": "取消",
"Submit": "提交",
"Back": "返回",
"PleaseSelect": "请选择",
"BusinessUnit": "事业部",
"LastUpdatedBy": "最近更新人",
"KeyComponentName": "关键零部件名称",
"EnglishName": "英文名称",
"Remarks": "备注",
"ComponentCertificationMarkingRequirements": "零部件认证标记要求",
"ProfessionalDepartment": "专业部门",
"MassProductionUnitAfterP8": "P8后批量生产单位",
"ApplicableMarket": "适用市场",
"Index": "序号",
"Model": "型号",
"Manufacturer": "生产厂家",
"Manufacturer(English)": "生产厂家(英文)",
"ComponentCertificationNumber/RegistrationNumber": "零部件认证证书号/注册号",
"PartAssemblyNumber": "零件总成号",
"SortOrder": "排序",
"Edit": "编辑",
"EditPart": "编辑零件"
}
src/locales/baseData/criticalPartsList/BaseIntlPartTemplateDetail/en.json 0 → 100644
View file @ 38951b8c
{
"Search": "Search",
"Reset": "Reset",
"Cancel": "Cancel",
"Submit": "Submit",
"Back": "Back",
"Please Select": "Please Select",
"Business Unit": "Business Unit",
"Last Updated By": "Last Updated By",
"Key Component Name": "Key Component Name",
"English Name": "English Name",
"Remarks": "Remarks",
"Component Certification Marking Requirements": "Component Certification Marking Requirements",
"Professional Department": "Professional Department",
"Mass Production Unit After P8": "Mass Production Unit After P8",
"Applicable Market": "Applicable Market",
"Index": "Index",
"Model": "Model",
"Manufacturer": "Manufacturer",
"Manufacturer (English)": "Manufacturer (English)",
"Component Certification Number / Registration Number": "Component Certification Number / Registration Number",
"Part Assembly Number": "Part Assembly Number",
"Sort Order": "Sort Order",
"Edit": "Edit",
"Edit Part": "Edit Part"
}
src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/cn.json → src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history/cn.json
View file @ 38951b8c
......@@ -20,5 +20,6 @@
"keyProcessFormStatus": "关键工序……表单状态",
"COPTestAndChecklistFormStatus": "COP试验和检查表表单状态",
"operation": "操作",
"serialNumber": "序号"
"serialNumber": "序号",
"viewHistoricalControlPlan": "查看历史控制计划"
}
src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/en.json → src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history/en.json
View file @ 38951b8c
......@@ -20,5 +20,6 @@
"keyProcessFormStatus": "Key Process...Form Status",
"COPTestAndChecklistFormStatus": "COP Test and Checklist Form Status",
"operation": "Operation",
"serialNumber": "Ordinal"
"serialNumber": "Ordinal",
"viewHistoricalControlPlan": "View Historical Control Plan"
}
src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/cn.json 0 → 100644
View file @ 38951b8c
{
"search": "搜索",
"reset": "重置",
"pleaseChoose": "请选择",
"pleaseEnter": "请输入",
"businessDivision": "事业部",
"vehicleTypeCode": "车型代码",
"vehicleTypeSeries": "车型系列",
"versionNumber": "版本号",
"creator": "创建人",
"controlPlanStatus": "控制计划状态",
"controlPlanNumber": "控制计划编号",
"productionAddress": "生产地址",
"compilationDeadline": "编制截止日期",
"revisionDate": "修订日期",
"creationDate": "创建日期",
"productionPlant": "生产厂",
"productionSituation": "生产情况",
"keyPartsListFormStatus": "关键件清单表单状态",
"keyProcessFormStatus": "关键工序……表单状态",
"COPTestAndChecklistFormStatus": "COP试验和检查表表单状态",
"operation": "操作",
"serialNumber": "序号",
"viewHistoricalControlPlan": "查看历史控制计划"
}
src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/en.json 0 → 100644
View file @ 38951b8c
{
"search": "Search",
"reset": "Reset",
"pleaseChoose": "Please Choose",
"pleaseEnter": "Please Enter",
"businessDivision": "Business division",
"vehicleTypeCode": "Vehicle Type Code",
"vehicleTypeSeries": "Vehicle Type Series",
"versionNumber": "Version Number",
"creator": "Creator",
"controlPlanStatus": "Control Plan Status",
"controlPlanNumber": "Control Plan Number",
"productionAddress": "Production Address",
"compilationDeadline": "Compilation Deadline",
"revisionDate": "Revision Date",
"creationDate": "Creation Date",
"productionPlant": "Production Plant",
"productionSituation": "Production Situation",
"keyPartsListFormStatus": "Key Parts List Form Status",
"keyProcessFormStatus": "Key Process...Form Status",
"COPTestAndChecklistFormStatus": "COP Test and Checklist Form Status",
"operation": "Operation",
"serialNumber": "Ordinal",
"viewHistoricalControlPlan": "View Historical Control Plan"
}
src/views/baseData/criticalPartsList/BaseIntlPartTemplate/index.vue
View file @ 38951b8c
<template>
<div class="app-container">
<el-table v-loading="loading" :data="templateList">
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="序号" type="index" align="center" width="75">
<template #header>
<div>
<div>{{cn.Index}}</div>
<div>{{en.Index}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="事业部" prop="divisionCn" align="center">
<template #header>
<div>
<div>{{cn.BusinessUnit}}</div>
<div>{{en.BusinessUnit}}</div>
</div>
</template>
<template #default="scope">
{{Object.values(scope.row.divisionCn).join('、')}}
</template>
</el-table-column>
<el-table-column label="创建人" prop="createByName" align="center"/>
<el-table-column label="创建时间" prop="createTime" align="center"/>
<el-table-column label="更新人" prop="updateByName" align="center"/>
<el-table-column label="更新时间" prop="updateTime" align="center"/>
<el-table-column label="创建人" prop="createByName" align="center">
<template #header>
<div>
<div>{{cn.CreatedBy}}</div>
<div>{{en.CreatedBy}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime" align="center">
<template #header>
<div>
<div>{{cn.CreateTime}}</div>
<div>{{en.CreateTime}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="更新人" prop="updateByName" align="center">
<template #header>
<div>
<div>{{cn.UpdatedBy}}</div>
<div>{{en.UpdatedBy}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="更新时间" prop="updateTime" align="center">
<template #header>
<div>
<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" width="300">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="430">
<template #header>
<div>
<div>{{cn.Operations}}</div>
<div>{{en.Operations}}</div>
</div>
</template>
<template #default="scope">
<el-button link type="primary" @click="handleTemplateDetailView(scope.row)">维护模板内容</el-button>
<el-button link type="warning" @click="handleCopyAdd" v-show="scope.row.isDefault === 1">复制新增</el-button>
<el-button link type="primary" @click="handleAddDivision(scope.row)" v-show="scope.row.isDefault === 1">添加事业部</el-button>
<el-button link type="danger" @click="handleDelete(scope.row)" v-show="scope.row.isDefault === 0">删除</el-button>
<el-button link type="primary" @click="handleTemplateDetailView(scope.row)">
<div>
<div>{{cn.MaintainTemplateContent}}</div>
<div>{{en.MaintainTemplateContent}}</div>
</div>
</el-button>
<el-button link type="warning" @click="handleCopyAdd" v-show="scope.row.isDefault === 1">
<div>
<div>{{cn.CopyandAdd}}</div>
<div>{{en.CopyandAdd}}</div>
</div>
</el-button>
<el-button link type="primary" @click="handleAddDivision(scope.row)" v-show="scope.row.isDefault === 1">
<div>
<div>{{cn.AddBusinessUnit}}</div>
<div>{{en.AddBusinessUnit}}</div>
</div>
</el-button>
<el-button link type="danger" @click="handleDelete(scope.row)" v-show="scope.row.isDefault === 0">
<div>
<div>{{cn.Delete}}</div>
<div>{{en.Delete}}</div>
</div>
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -46,8 +113,18 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button class="btn-A" @click="cancel">
<div>
<div>{{cn.Cancel}}</div>
<div>{{en.Cancel}}</div>
</div>
</el-button>
<el-button class="btn-B" @click="submitForm">
<div>
<div>{{cn.Submit}}</div>
<div>{{en.Submit}}</div>
</div>
</el-button>
</div>
</template>
</el-dialog>
......@@ -68,8 +145,8 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button class="btn-A" @click="cancel">取消</el-button>
<el-button class="btn-B" @click="submitForm">提交</el-button>
</div>
</template>
</el-dialog>
......@@ -78,6 +155,8 @@
<script setup>
import { listTemplate, addTemplate, getAllUnit, delLogicTemplate, updateTemplate } from "@/api/BaseIntlPartTemplate/baseIntlPartTemplate.js";
import cn from "@/locales/baseData/criticalPartsList/BaseIntlPartTemplate/cn.json";
import en from "@/locales/baseData/criticalPartsList/BaseIntlPartTemplate/en.json";
const { proxy } = getCurrentInstance();
......@@ -128,7 +207,7 @@ function getDivisionList(data) {
// 维护模板内容
function handleTemplateDetailView(row) {
proxy.$router.push({ path: '/baseData/criticalPartsList/templateDetail', query: { id: row.id , divisionCn: row.divisionCn , isDefault: row.isDefault} })
proxy.$router.push({ path: '/baseData/criticalPartsList/BaseIntlPartTemplateDetail', query: { id: row.id , divisionCn: row.divisionCn , isDefault: row.isDefault} })
}
// 复制新增
......
src/views/baseData/vehicleModelData/domesticModel.vue 0 → 100644
View file @ 38951b8c
This diff is collapsed.
src/views/baseData/vehicleModelData/index.vue 0 → 100644
View file @ 38951b8c
<template>
<el-card>
<el-tabs v-model="activeName">
<el-tab-pane label="国内车型" name="domesticModel">
<domesticModel />
</el-tab-pane>
<el-tab-pane label="国际车型" name="internationalModel">
<internationalModel />
</el-tab-pane>
</el-tabs>
</el-card>
</template>
<script setup name="Parameter">
import domesticModel from './domesticModel.vue'
import internationalModel from './internationalModel.vue'
const { proxy } = getCurrentInstance()
const activeName = ref('domesticModel')
const info = ref({})
</script>
src/views/baseData/vehicleModelData/international/index.vue deleted 100644 → 0
View file @ 61a7f05e
<template>
国际车型
</template>
<script>
export default {
name: 'index',
}
</script>
<style scoped>
</style>
src/views/baseData/vehicleModelData/internationalModel.vue 0 → 100644
View file @ 38951b8c
This diff is collapsed.
src/views/carConsistency/filingParameter/history.vue
View file @ 38951b8c
......@@ -114,7 +114,7 @@
plain
@click="handleExport"
v-hasPermi="['control:library:export']"
>导出最新版本列表数据</el-button>
>导出历史数据列表数据</el-button>
<!-- 在el-table上添加v-if延迟渲染 -->
......@@ -360,9 +360,16 @@ function handleSelectionChange(selection) {
/** 导出按钮操作 */
function handleExport() {
const now = new Date();
const formattedTime = `${now.getFullYear()}`
+ `${String(now.getMonth()+1).padStart(2,'0')}`
+ `${String(now.getDate()).padStart(2,'0')}`
+ `${String(now.getHours()).padStart(2,'0')}`
+ `${String(now.getMinutes()).padStart(2,'0')}`
+ `${String(now.getSeconds()).padStart(2,'0')}`;
proxy.download('control/library/export', {
...queryParams.value
}, `library_${new Date().getTime()}.xlsx`)
}, `备案参数总表主列表信息-${formattedTime}.xlsx`)
}
function handleView(row) {
......@@ -372,7 +379,8 @@ function handleView(row) {
id: row.id,
modelCode: row.modelCode,
modelSeries: row.modelSeries,
announcementNumber: row.announcementNumber
announcementNumber: row.announcementNumber,
versionNumber: row.versionNumber
}
})
}
......
src/views/carConsistency/filingParameter/newAnnouncementVersion.vue
View file @ 38951b8c
......@@ -360,9 +360,16 @@ function handleSelectionChange(selection) {
/** 导出按钮操作 */
function handleExport() {
const now = new Date();
const formattedTime = `${now.getFullYear()}`
+ `${String(now.getMonth()+1).padStart(2,'0')}`
+ `${String(now.getDate()).padStart(2,'0')}`
+ `${String(now.getHours()).padStart(2,'0')}`
+ `${String(now.getMinutes()).padStart(2,'0')}`
+ `${String(now.getSeconds()).padStart(2,'0')}`;
proxy.download('control/library/export', {
...queryParams.value
}, `library_${new Date().getTime()}.xlsx`)
}, `备案参数总表主列表信息-${formattedTime}.xlsx`)
}
function handleView(row) {
......@@ -372,7 +379,8 @@ function handleView(row) {
id: row.id,
modelCode: row.modelCode,
modelSeries: row.modelSeries,
announcementNumber: row.announcementNumber
announcementNumber: row.announcementNumber,
versionNumber: row.versionNumber
}
})
}
......
src/views/carConsistency/filingParameter/parameterDetail.vue
View file @ 38951b8c
......@@ -73,6 +73,7 @@ import { useRoute } from 'vue-router';
const route = useRoute();
const { proxy } = getCurrentInstance();
const versionNumber = route.query.versionNumber
const modelCode = route.query.modelCode
const modelSeries = route.query.modelSeries
const announcementNumber = route.query.announcementNumber
......@@ -232,9 +233,21 @@ function handleDelete(row) {
/** 导出按钮操作 */
function handleExport() {
// 时间格式化处理
const now = new Date();
const formattedTime = [
now.getFullYear(),
String(now.getMonth()+1).padStart(2,'0'),
String(now.getDate()).padStart(2,'0'),
String(now.getHours()).padStart(2,'0'),
String(now.getMinutes()).padStart(2,'0'),
String(now.getSeconds()).padStart(2,'0')
].join('');
// 构造最终文件名
const filename = `${announcementNumber}-${versionNumber}-${formattedTime}.xlsx`;
proxy.download('control/parameter/export', {
...queryParams.value
}, `parameter_${new Date().getTime()}.xlsx`)
}, filename)
}
getList();
......
src/views/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history.vue 0 → 100644
View file @ 38951b8c
<template>
<div class="app-container">
<el-form v-model="queryParams" ref="queryRef" :inline="true" >
<!-- 事业部 -->
<el-form-item :label="`${cn.businessDivision}/${en.businessDivision}`" prop="status">
<el-select
v-model="queryParams"
:placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
clearable
style="width: 200px"
>
<el-option
v-for="dict in businessList"
:label="dict.businessUnitName"
:value="dict.id"
/>
</el-select>
</el-form-item>
<!-- 车型代码 -->
<el-form-item :label="`${cn.vehicleTypeCode}/${en.vehicleTypeCode}`" prop="status">
<el-select
v-model="queryParams"
:placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
clearable
style="width: 200px"
>
<el-option
v-for="dict in businessList"
:label="dict.businessUnitName"
:value="dict.id"
/>
</el-select>
</el-form-item>
<!-- 车型系列 -->
<el-form-item :label="`${cn.vehicleTypeSeries}/${en.vehicleTypeSeries}`" prop="status">
<el-select
v-model="queryParams"
:placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
clearable
style="width: 200px"
>
<el-option
v-for="dict in businessList"
:label="dict.businessUnitName"
:value="dict.id"
/>
</el-select>
</el-form-item>
<!-- 生产地址 -->
<el-form-item :label="`${cn.productionAddress}/${en.productionAddress}`" prop="templateCode">
<el-input
v-model="queryParams"
:placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
clearable
style="width: 200px"
/>
</el-form-item>
<!-- 版本号 -->
<el-form-item :label="`${cn.versionNumber}/${en.versionNumber}`" prop="templateCode">
<el-input
v-model="queryParams"
placeholder="A0-Z9"
clearable
disabled
style="width: 200px"
/>
</el-form-item>
<!-- 创建人 -->
<el-form-item :label="`${cn.creator}/${en.creator}`" prop="templateCode">
<el-input
v-model="queryParams"
:placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
clearable
style="width: 200px"
/>
</el-form-item>
<!-- 生产厂 -->
<el-form-item :label="`${cn.productionPlant}/${en.productionPlant}`" prop="templateCode">
<el-input
v-model="queryParams"
:placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
clearable
style="width: 200px"
/>
</el-form-item>
<!-- 搜索、重置 按钮 -->
<el-form-item>
<el-button style="width: 110px" class="btn-A" @click="handleQuery">{{cn.search}}/{{en.search}}</el-button>
<el-button style="width: 110px" class="btn-B" @click="resetQuery">{{cn.reset}}/{{en.reset}}</el-button>
</el-form-item>
</el-form>
<el-table :data="tableList">
<el-table-column fixed type="index" width="75" 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="控制计划编号" width="170" align="center" prop="controlPlanNumber" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.controlPlanNumber}}</div>
<div>{{en.controlPlanNumber}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="事业部" width="150" align="center" prop="businessUnitName" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.businessDivision}}</div>
<div>{{en.businessDivision}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="车型代码" width="150" align="center" prop="vehicleTypeCode" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.vehicleTypeCode}}</div>
<div>{{en.vehicleTypeCode}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="车型系列" width="150" align="center" prop="vehicleTypeSeries" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.vehicleTypeSeries}}</div>
<div>{{en.vehicleTypeSeries}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="版本号" width="150" align="center" prop="versionNumber" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.versionNumber}}</div>
<div>{{en.versionNumber}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="生产地址" width="150" align="center" prop="productionAddress" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.productionAddress}}</div>
<div>{{en.productionAddress}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="编制截止日期" width="170" align="center" prop="compilationDeadline" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.compilationDeadline}}</div>
<div>{{en.compilationDeadline}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="创建人" width="170" align="center" prop="createBy" >
<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="修订日期" width="170" align="center" prop="updateTime" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.revisionDate}}</div>
<div>{{en.revisionDate}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="创建日期" width="170" align="center" prop="createTime" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.creationDate}}</div>
<div>{{en.creationDate}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="生产厂" width="170" align="center" prop="productionFactory" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.productionPlant}}</div>
<div>{{en.productionPlant}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="生产情况" width="170" align="center" prop="productionStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.productionSituation}}</div>
<div>{{en.productionSituation}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="关键件清单表单状态" fixed="right" width="190" align="center" prop="keyPartsListTaskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.keyPartsListFormStatus}}</div>
<div>{{en.keyPartsListFormStatus}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="关键工序……表单状态" fixed="right" width="190" align="center" prop="keyProcessTaskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.keyProcessFormStatus}}</div>
<div>{{en.keyProcessFormStatus}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="COP试验和检查表表单状态" fixed="right" width="250" align="center" prop="copTestAndInspectionTaskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.COPTestAndChecklistFormStatus}}</div>
<div>{{en.COPTestAndChecklistFormStatus}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="控制计划状态" fixed="right" width="150" align="center" prop="controlPlanStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.controlPlanStatus}}</div>
<div>{{en.controlPlanStatus}}</div>
</div>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.operation}}</div>
<div>{{en.operation}}</div>
</div>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script setup>
import cn from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history/cn.json'
import en from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history/en.json'
</script>
<style scoped lang="scss">
</style>
src/views/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index.vue
View file @ 38951b8c
......@@ -50,8 +50,9 @@
<el-form-item :label="`${cn.versionNumber}/${en.versionNumber}`" prop="templateCode">
<el-input
v-model="queryParams.businessUnitId"
:placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
placeholder="A0-Z9"
clearable
disabled
style="width: 200px"
/>
</el-form-item>
......@@ -64,6 +65,21 @@
style="width: 200px"
/>
</el-form-item>
<!-- 控制计划状态 -->
<el-form-item :label="`${cn.controlPlanStatus}/${en.controlPlanStatus}`" prop="status">
<el-select
v-model="queryParams.businessUnitId"
:placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
clearable
style="width: 200px"
>
<el-option
v-for="dict in businessList"
:label="dict.businessUnitName"
:value="dict.id"
/>
</el-select>
</el-form-item>
<!-- 搜索、重置 按钮 -->
<el-form-item>
<el-button style="width: 110px" class="btn-A" @click="handleQuery">{{cn.search}}/{{en.search}}</el-button>
......@@ -71,7 +87,11 @@
</el-form-item>
</el-form>
<el-table :data="tableList">
<div class="button-container">
<el-button class="btn-C" @click="toHistory">{{cn.viewHistoricalControlPlan}}/{{en.viewHistoricalControlPlan}}</el-button>
</div>
<el-table :data="tableList">
<el-table-column fixed type="index" width="75" align="center" label="序号">
<template #header>
<div style="display: flex;flex-direction: column">
......@@ -80,7 +100,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="控制计划编号" width="170" align="center" prop="applicableBrand" >
<el-table-column label="控制计划编号" width="170" align="center" prop="controlPlanNumber" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.controlPlanNumber}}</div>
......@@ -88,7 +108,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="事业部" width="150" align="center" prop="businessDivision" >
<el-table-column label="事业部" width="150" align="center" prop="businessUnitName" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.businessDivision}}</div>
......@@ -136,7 +156,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="创建人" width="170" align="center" prop="creator" >
<el-table-column label="创建人" width="170" align="center" prop="createBy" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.creator}}</div>
......@@ -144,7 +164,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="修订日期" width="170" align="center" prop="revisionDate" >
<el-table-column label="修订日期" width="170" align="center" prop="updateTime" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.revisionDate}}</div>
......@@ -152,7 +172,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="创建日期" width="170" align="center" prop="creationDate" >
<el-table-column label="创建日期" width="170" align="center" prop="createTime" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.creationDate}}</div>
......@@ -160,7 +180,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="生产厂" width="170" align="center" prop="productionPlant" >
<el-table-column label="生产厂" width="170" align="center" prop="productionFactory" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.productionPlant}}</div>
......@@ -168,7 +188,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="生产情况" width="170" align="center" prop="productionSituation" >
<el-table-column label="生产情况" width="170" align="center" prop="productionStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.productionSituation}}</div>
......@@ -176,7 +196,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="关键件清单表单状态" fixed="right" width="190" align="center" prop="keyPartsListFormStatus" >
<el-table-column label="关键件清单表单状态" fixed="right" width="190" align="center" prop="keyPartsListTaskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.keyPartsListFormStatus}}</div>
......@@ -184,7 +204,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="关键工序……表单状态" fixed="right" width="190" align="center" prop="keyProcessFormStatus" >
<el-table-column label="关键工序……表单状态" fixed="right" width="190" align="center" prop="keyProcessTaskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.keyProcessFormStatus}}</div>
......@@ -192,7 +212,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="COP试验和检查表表单状态" fixed="right" width="250" align="center" prop="COPTestAndChecklistFormStatus" >
<el-table-column label="COP试验和检查表表单状态" fixed="right" width="250" align="center" prop="copTestAndInspectionTaskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.COPTestAndChecklistFormStatus}}</div>
......@@ -229,33 +249,59 @@
</template>
<script setup>
import {
getCCAPPlanList
} from "@/api/CCAPControlPlanManagement/CCAPControlPlanManagement.js";
import { ref } from 'vue'
// 中英文页面文字引入
import cn from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/cn.json';
import en from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/en.json';
import cn from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/cn.json';
import en from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/en.json';
import { useRouter } from 'vue-router'
const router = useRouter()
const { proxy } = getCurrentInstance();
const total = ref(0);
const tableList = ref([]);
const queryParams = ref({
pageNum: 1,
pageSize: 10,
businessUnitId: null
pageSize: 10
});
const businessList = ref([]);
const handleQuery = () => {
function toHistory() {
proxy.$router.push({ path: '/control/CCAPControlPlan/history' });
}
};
function handleQuery() {
}
const resetQuery = () => {
function resetQuery() {
}
};
const getList = () => {
function getList() {
getCCAPPlanList().then(res => {
tableList.value = res.rows
total.value = res.total
// console.log("列表",tableList.value)
});
}
getList()
};
</script>
<style scoped lang="scss">
.button-container {
display: flex;
justify-content: flex-end;
margin-bottom: 24px;
}
: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;
}
</style>
src/views/controlPlan/baseConfig/ccapProjectManage/index.vue
View file @ 38951b8c
......@@ -41,7 +41,7 @@
<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="handleView(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>
</div>
</template>
</el-table-column>
......@@ -89,7 +89,7 @@
</el-form-item>
</el-form>
<div class="top-btn" v-if="!isDrawer">
<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>
......@@ -104,7 +104,7 @@
<template #default="scope" align="center">
<div >
<el-button type="text" style="color: rgb(0,0,255)" @click="handleDrawerEdit(scope.row)">编辑</el-button>
<el-button type="text" style="color: rgb(244,93,93)" @click="handleDrawerDel(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>
</div>
</template>
</el-table-column>
......@@ -127,8 +127,8 @@
>
<div style="width: 85%;margin-left: 7.5%">
<el-form :rules="dialogRules" :model="dialogForm" ref="dialogQueryRef" >
<el-form-item label="项目:" prop="project" >
<el-input v-model="dialogForm.project" placeholder="请输入"/>
<el-form-item label="项目:" :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" >
......@@ -210,7 +210,8 @@ import {
getBusinessExclude,
addBusinessUnit,
getBusinessExclude2,
coypAddCcapManager
coypAddCcapManager,
deletetable
} from "@/api/CCAPProjectManagement/list";
const tableDialogForm = ref({
......@@ -298,6 +299,34 @@ function getDataProjectListById() {
drawer2TableList.value = res.data;
});
}
function tableDel(row){
console.log(row)
ElMessageBox.confirm(
'是否删除该数据？',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => {
deletetable(row.id).then(res=>{
if(res.code === 200){
ElMessage.success("删除成功")
getList()
dialogVisible.value = false;
}
})
})
.catch(() => {
})
}
function piliangDel(){
if(ids.value.length === 0) return ElMessage.warning("请先选择要删除的数据项")
ElMessageBox.confirm(
......
src/views/system/basicdata/manufacturer/index.vue
View file @ 38951b8c
......@@ -125,7 +125,12 @@
/>
<!-- 可滚动部分 -->
<el-table-column prop="manufacturingFactory" label="制造工厂" width="150">
<el-table-column
prop="manufacturingFactory"
label="制造工厂"
align="center"
width="150"
>
<template #default="{ row }">
{{ formatFactoryDisplay(row.manufacturingFactory) }}
</template>
......@@ -284,6 +289,7 @@ import {
delManufacturer,
addManufacturer,
updateManufacturer,
updateManufacturers,
} from '@/api/system/basicdata/manufacturer'
import { getAllFactoryName } from '@/api/system/factory'
import { formatFactories } from '@/utils/factoryFormatter'
......@@ -363,6 +369,19 @@ const { queryParams, form, rules } = toRefs(data)
// 所有可选的工厂列表
const allFactories = ref([])
const updateManufacturerData = async () => {
try {
const response = await updateManufacturers()
if (response.code === 200) {
proxy.$modal.msgSuccess(response.msg || '同步成功')
getList()
} else {
proxy.$modal.msgError(response.msg || '同步失败')
}
} catch (error) {
console.error('同步失败:', error)
}
}
// 获取工厂数据的方法
const fetchFactories = async () => {
try {
......@@ -523,6 +542,7 @@ function handleExport() {
}
onMounted(() => {
fetchFactories()
updateManufacturerData()
})
getList()
</script>
src/views/system/user/index.vue
View file @ 38951b8c
......@@ -42,9 +42,9 @@
/>
</el-form-item>
<!-- 事业部出来再改 -->
<el-form-item label="" prop="unitNames">
<el-form-item label="" prop="businessUnitName">
<el-input
v-model="queryParams.unitNames"
v-model="queryParams.businessUnitName"
placeholder="事业部"
clearable
style="width: 240px"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment