Skip to content

Q
qr-consistency-vue3
Commit 3672424d authored by qiyaxin's avatar qiyaxin
Browse files
Options

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

parents 825f3942 f6a82798
Show whitespace changes
Inline Side-by-side
Showing with 315 additions and 196 deletions
src/views/baseData/vehicleModelData/domesticModel.vue
View file @ 3672424d
...@@ -35,59 +35,54 @@ ...@@ -35,59 +35,54 @@
ref="queryRef" ref="queryRef"
:model="queryParams" :model="queryParams"
:inline="true" :inline="true"
label-width="96px" label-width="130px"
border
> >
<el-form-item label="动力类型" prop="powerType"> <el-form-item label="车型系列" prop="modelSeries">
<el-input <el-select
v-model="queryParams.powerType" v-model="queryParams.modelSeries"
placeholder="请输入" placeholder="请选择"
clearable clearable
style="width: 100px" style="width: 100px"
@keyup.enter="handleQuery" >
<el-option
v-for="dict in sys_manufacture"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="发动机型号" prop="engineModel"> <el-form-item label="动力类型" prop="powerType">
<el-input <el-input
v-model="queryParams.engineModel" v-model="queryParams.powerType"
placeholder="请输入" placeholder="请输入"
clearable clearable
style="width: 100px" style="width: 100px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="动力电池型号" prop="powerBatteryModel"> <el-form-item label="是否维护" prop="isMaintained">
<el-input <el-select
v-model="queryParams.powerBatteryModel" v-model="queryParams.isMaintained"
placeholder="请输入" placeholder="请选择"
clearable clearable
style="width: 100px" style="width: 100px"
@keyup.enter="handleQuery" >
/> <el-option
</el-form-item> v-for="item in vehicle_model_maintenance"
<el-form-item label="变速器型号" prop="transmissionModel"> :key="item.value"
<el-input :label="item.label"
v-model="queryParams.transmissionModel" :value="item.value"
placeholder="请输入"
clearable
style="width: 120px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="适用市场" prop="applicableMarket">
<el-input
v-model="queryParams.applicableMarket"
placeholder="请输入"
clearable
style="width: 120px"
@keyup.enter="handleQuery"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="事业部" prop="businessUnitId"> <el-form-item label="事业部" prop="businessUnitId">
<el-select <el-select
v-model="queryParams.businessUnitId" v-model="queryParams.businessUnitId"
placeholder="请选择" placeholder="请选择"
clearable clearable
style="width: 120px" style="width: 100px"
> >
<el-option <el-option
v-for="item in businessUnitOptions" v-for="item in businessUnitOptions"
...@@ -97,40 +92,52 @@ ...@@ -97,40 +92,52 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="整车认证证书" prop="vehicleCertificate">
<el-form-item label="发动机型号" prop="engineModel">
<el-input <el-input
v-model="queryParams.vehicleCertificate" v-model="queryParams.engineModel"
placeholder="请输入" placeholder="请输入"
clearable clearable
style="width: 100px" style="width: 100px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="单项证书" prop="singleCertificate"> <el-form-item label="认证申报生产地址" prop="productionAddress">
<el-input <el-input
v-model="queryParams.singleCertificate" v-model="queryParams.productionAddress"
placeholder="请输入" placeholder="请输入"
clearable clearable
style="width: 100px" style="width: 100px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="是否维护" prop="isMaintained"> <el-form-item label="制造工厂" prop="manufacturingPlant">
<el-select <el-input
v-model="queryParams.isMaintained" v-model="queryParams.manufacturingPlant"
placeholder="请选择" placeholder="请选择"
clearable clearable
style="width: 100px" style="width: 100px"
> @keyup.enter="handleQuery"
<el-option />
v-for="item in vehicle_model_maintenance" </el-form-item>
:key="item.value" <el-form-item label="CVN" prop="cvn">
:label="item.label" <el-input
:value="item.value" v-model="queryParams.cvn"
placeholder="请输入"
clearable
style="width: 100px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="CALID" prop="calid">
<el-input
v-model="queryParams.calid"
placeholder="请输入"
clearable
style="width: 100px"
@keyup.enter="handleQuery"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="btn-A" icon="Search" @click="handleQuery" <el-button class="btn-A" icon="Search" @click="handleQuery"
>搜索</el-button >搜索</el-button
...@@ -158,54 +165,41 @@ ...@@ -158,54 +165,41 @@
<div class="data-table"> <div class="data-table">
<el-table <el-table
v-loading="loading" v-loading="loading"
border
:data="modelList" :data="modelList"
style="width: 100%"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <!-- 固定左侧的选择列 -->
<el-table-column label="序号" align="center" width="80"> <el-table-column
type="selection"
width="55"
align="center"
fixed="left"
/>
<!-- 序号列（固定） -->
<el-table-column label="序号" align="center" width="80" fixed="left">
<template #default="scope"> <template #default="scope">
{{ scope.$index + 1 }} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="type" align="center" prop="type" />
<el-table-column label="车型代码" align="center" prop="modelCode" /> <!-- 可滚动的数据列 -->
<el-table-column label="动力类型" align="center" prop="powerType" />
<el-table-column
label="发动机型号"
align="center"
prop="engineModel"
/>
<el-table-column
label="动力电池型号"
align="center"
prop="powerBatteryModel"
/>
<el-table-column
label="变速器型号"
align="center"
prop="transmissionModel"
/>
<el-table-column
label="适用市场"
align="center"
prop="applicableMarket"
/>
<el-table-column <el-table-column
label="事业部" label="事业部"
align="center" align="center"
prop="businessUnitName" prop="businessUnitName"
/> />
<el-table-column label="品牌" align="center" prop="brand" /> <el-table-column label="车型代码" align="center" prop="modelCode" />
<el-table-column <el-table-column label="车型系列" align="center" prop="modelSeries" />
label="整车认证证书" <el-table-column label="动力类型" align="center" prop="powerType" />
align="center"
prop="vehicleCertificate"
/>
<el-table-column <el-table-column
label="单项证书" label="车型公告号"
align="center" align="center"
prop="singleCertificate" prop="modelAnnouncementNumber"
/> />
<el-table-column label="品牌" align="center" prop="brand" />
<el-table-column label="是否维护" align="center" prop="isMaintained"> <el-table-column label="是否维护" align="center" prop="isMaintained">
<template #default="scope"> <template #default="scope">
<dict-tag <dict-tag
...@@ -214,25 +208,39 @@ ...@@ -214,25 +208,39 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="今年累计产量" label="发动机型号"
align="center" align="center"
prop="yearlyProduction" prop="engineModel"
/> />
<el-table-column <el-table-column
label="制造工厂" label="车型代码今年累计产量"
align="center" align="center"
prop="manufacturingPlant" prop="modelCodeYearlyProduction"
/> />
<el-table-column <el-table-column
label="操作" label="车型公告号今年累计产量"
align="center" align="center"
class-name="small-padding fixed-width" prop="announcementYearlyProduction"
> />
<el-table-column label="CVN" align="center" prop="cvn" width="120" />
<el-table-column label="CALID" align="center" prop="calid" />
<el-table-column
label="认证申报生产地址"
align="center"
prop="productionAddress"
/>
<el-table-column
label="制造工厂"
align="center"
prop="manufacturingPlant"
width="150"
/>
<!-- 固定右侧的操作列 -->
<el-table-column label="操作" align="center" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button <el-button
v-hasPermi="['control:model:edit']"
link link
type="primary" type="primary"
icon="Edit" icon="Edit"
...@@ -256,6 +264,69 @@ ...@@ -256,6 +264,69 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 添加或修改国内车型对话框 -->
<el-dialog v-model="open" :title="title" width="500px" append-to-body>
<el-form ref="modelRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="车型代码" prop="modelCode">
<el-input
v-model="form.modelCode"
placeholder="请输入车型代码"
:disabled="isEditMode"
/>
</el-form-item>
<el-form-item label="车型系列" prop="modelSeries">
<el-input
v-model="form.modelSeries"
placeholder="请输入车型系列"
:disabled="isEditMode"
/>
</el-form-item>
<el-form-item label="车型公告号" prop="modelAnnouncementNumber">
<el-input
v-model="form.modelAnnouncementNumber"
placeholder="请输入车型公告号"
:disabled="isEditMode"
/>
</el-form-item>
<el-form-item label="是否维护" prop="isMaintained">
<el-radio-group v-model="form.isMaintained">
<el-radio
v-for="(item, index) in vehicle_model_maintenance"
:key="index"
:label="parseInt(item.value)"
:disabled="item.disabled"
>{{ item.label }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="生产地址" prop="productionAddress">
<el-input
v-model="form.productionAddress"
placeholder="请输入生产地址"
:disabled="isEditMode"
/>
</el-form-item>
<el-form-item label="制造工厂" prop="manufacturingPlant">
<el-checkbox-group v-model="selectedFactories">
<div style="display: flex; flex-wrap: wrap">
<div
v-for="(factory, index) in allFactories"
:key="index"
style="width: 33%; margin-bottom: 10px"
>
<el-checkbox :label="factory">{{ factory }}</el-checkbox>
</div>
</div>
</el-checkbox-group>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button class="btn-B" @click="cancel">取 消</el-button>
<el-button class="btn-A" @click="submitForm">保 存</el-button>
</div>
</template>
</el-dialog>
</template> </template>
<script setup> <script setup>
......
src/views/baseData/vehicleModelData/internationalModel.vue
View file @ 3672424d
...@@ -35,53 +35,59 @@ ...@@ -35,53 +35,59 @@
ref="queryRef" ref="queryRef"
:model="queryParams" :model="queryParams"
:inline="true" :inline="true"
label-width="130px" label-width="96px"
> >
<el-form-item label="车型系列" prop="modelSeries"> <el-form-item label="动力类型" prop="powerType">
<el-select <el-input
v-model="queryParams.modelSeries" v-model="queryParams.powerType"
placeholder="请选择" placeholder="请输入"
clearable clearable
style="width: 100px" style="width: 100px"
> @keyup.enter="handleQuery"
<el-option
v-for="dict in sys_manufacture"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="动力类型" prop="powerType"> <el-form-item label="发动机型号" prop="engineModel">
<el-input <el-input
v-model="queryParams.powerType" v-model="queryParams.engineModel"
placeholder="请输入" placeholder="请输入"
clearable clearable
style="width: 100px" style="width: 100px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="是否维护" prop="isMaintained"> <el-form-item label="动力电池型号" prop="powerBatteryModel">
<el-select <el-input
v-model="queryParams.isMaintained" v-model="queryParams.powerBatteryModel"
placeholder="请选择" placeholder="请输入"
clearable clearable
style="width: 100px" style="width: 100px"
> @keyup.enter="handleQuery"
<el-option />
v-for="item in vehicle_model_maintenance" </el-form-item>
:key="item.value" <el-form-item label="变速器型号" prop="transmissionModel">
:label="item.label" <el-input
:value="item.value" v-model="queryParams.transmissionModel"
placeholder="请输入"
clearable
style="width: 120px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="适用市场" prop="applicableMarket">
<el-input
v-model="queryParams.applicableMarket"
placeholder="请输入"
clearable
style="width: 120px"
@keyup.enter="handleQuery"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="事业部" prop="businessUnitId"> <el-form-item label="事业部" prop="businessUnitId">
<el-select <el-select
v-model="queryParams.businessUnitId" v-model="queryParams.businessUnitId"
placeholder="请选择" placeholder="请选择"
clearable clearable
style="width: 100px" style="width: 120px"
> >
<el-option <el-option
v-for="item in businessUnitOptions" v-for="item in businessUnitOptions"
...@@ -91,52 +97,40 @@ ...@@ -91,52 +97,40 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="整车认证证书" prop="vehicleCertificate">
<el-form-item label="发动机型号" prop="engineModel">
<el-input <el-input
v-model="queryParams.engineModel" v-model="queryParams.vehicleCertificate"
placeholder="请输入" placeholder="请输入"
clearable clearable
style="width: 100px" style="width: 100px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="认证申报生产地址" prop="productionAddress"> <el-form-item label="单项证书" prop="singleCertificate">
<el-input <el-input
v-model="queryParams.productionAddress" v-model="queryParams.singleCertificate"
placeholder="请输入" placeholder="请输入"
clearable clearable
style="width: 100px" style="width: 100px"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="制造工厂" prop="manufacturingPlant"> <el-form-item label="是否维护" prop="isMaintained">
<el-input <el-select
v-model="queryParams.manufacturingPlant" v-model="queryParams.isMaintained"
placeholder="请选择" placeholder="请选择"
clearable clearable
style="width: 100px" style="width: 100px"
@keyup.enter="handleQuery" >
/> <el-option
</el-form-item> v-for="item in vehicle_model_maintenance"
<el-form-item label="CVN" prop="cvn"> :key="item.value"
<el-input :label="item.label"
v-model="queryParams.cvn" :value="item.value"
placeholder="请输入"
clearable
style="width: 100px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="CALID" prop="calid">
<el-input
v-model="queryParams.calid"
placeholder="请输入"
clearable
style="width: 100px"
@keyup.enter="handleQuery"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="btn-A" icon="Search" @click="handleQuery" <el-button class="btn-A" icon="Search" @click="handleQuery"
>搜索</el-button >搜索</el-button
...@@ -164,90 +158,85 @@ ...@@ -164,90 +158,85 @@
<div class="data-table"> <div class="data-table">
<el-table <el-table
v-loading="loading" v-loading="loading"
border
:data="modelList" :data="modelList"
style="width: 100%" border
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<!-- 固定左侧的选择列 --> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column label="序号" align="center" width="80">
type="selection"
width="55"
align="center"
fixed="left"
/>
<!-- 序号列（固定） -->
<el-table-column label="序号" align="center" width="80" fixed="left">
<template #default="scope"> <template #default="scope">
{{ scope.$index + 1 }} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="type" align="center" prop="type" />
<!-- 可滚动的数据列 --> <el-table-column label="车型代码" align="center" prop="modelCode" />
<el-table-column label="动力类型" align="center" prop="powerType" />
<el-table-column <el-table-column
label="事业部" label="发动机型号"
align="center" align="center"
prop="businessUnitName" prop="engineModel"
/> />
<el-table-column label="车型代码" align="center" prop="modelCode" />
<el-table-column label="车型系列" align="center" prop="modelSeries" />
<el-table-column label="动力类型" align="center" prop="powerType" />
<el-table-column <el-table-column
label="车型公告号" label="动力电池型号"
align="center" align="center"
prop="modelAnnouncementNumber" prop="powerBatteryModel"
/> />
<el-table-column label="品牌" align="center" prop="brand" /> <el-table-column
<el-table-column label="是否维护" align="center" prop="isMaintained"> label="变速器型号"
<template #default="scope"> align="center"
<dict-tag prop="transmissionModel"
:options="vehicle_model_maintenance"
:value="scope.row.isMaintained"
/> />
</template>
</el-table-column>
<el-table-column <el-table-column
label="发动机型号" label="适用市场"
align="center" align="center"
prop="engineModel" prop="applicableMarket"
/> />
<el-table-column <el-table-column
label="车型代码今年累计产量" label="事业部"
align="center" align="center"
prop="modelCodeYearlyProduction" prop="businessUnitName"
/> />
<el-table-column label="品牌" align="center" prop="brand" />
<el-table-column <el-table-column
label="车型公告号今年累计产量" label="整车认证证书"
align="center" align="center"
prop="announcementYearlyProduction" prop="vehicleCertificate"
/> />
<el-table-column label="CVN" align="center" prop="cvn" width="120" />
<el-table-column label="CALID" align="center" prop="calid" />
<el-table-column <el-table-column
label="认证申报生产地址" label="单项证书"
align="center" align="center"
prop="productionAddress" prop="singleCertificate"
/>
<el-table-column label="是否维护" align="center" prop="isMaintained">
<template #default="scope">
<dict-tag
:options="vehicle_model_maintenance"
:value="scope.row.isMaintained"
/>
</template>
</el-table-column>
<el-table-column
label="今年累计产量"
align="center"
prop="yearlyProduction"
/> />
<el-table-column <el-table-column
label="制造工厂" label="制造工厂"
align="center" align="center"
prop="manufacturingPlant" prop="manufacturingPlant"
width="150"
/> />
<el-table-column
<!-- 固定右侧的操作列 --> label="操作"
<el-table-column label="操作" align="center" fixed="right"> align="center"
class-name="small-padding fixed-width"
>
<template #default="scope"> <template #default="scope">
<el-button <el-button
v-hasPermi="['control:model:edit']"
link link
type="primary" type="primary"
icon="Edit" icon="Edit"
:header-cell-style="{
position: 'sticky',
right: 0,
zIndex: 3,
}"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>补充信息</el-button >补充信息</el-button
> >
...@@ -268,6 +257,65 @@ ...@@ -268,6 +257,65 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 添加或修改国内车型对话框 -->
<el-dialog v-model="open" :title="title" width="500px" append-to-body>
<el-form ref="modelRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="TYPE" prop="type">
<el-input
v-model="form.type"
placeholder="请输入"
:disabled="isEditMode"
/>
</el-form-item>
<el-form-item label="车型代码" prop="modelCode">
<el-input
v-model="form.modelCode"
placeholder="请输入"
:disabled="isEditMode"
/>
</el-form-item>
<el-form-item label="动力类型" prop="powerType">
<el-input
v-model="form.powerType"
placeholder="请输入"
:disabled="isEditMode"
/>
</el-form-item>
<el-form-item label="是否维护" prop="isMaintained">
<el-radio-group v-model="form.isMaintained">
<el-radio
v-for="(item, index) in vehicle_model_maintenance"
:key="index"
:label="parseInt(item.value)"
:disabled="item.disabled"
>{{ item.label }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="制造工厂" prop="manufacturingPlant">
<el-checkbox-group v-model="selectedFactories">
<div style="display: flex; flex-wrap: wrap">
<div
v-for="(factory, index) in allFactories"
:key="index"
style="width: 33%; margin-bottom: 10px"
>
<el-checkbox :label="factory">{{ factory }}</el-checkbox>
</div>
</div>
</el-checkbox-group>
</el-form-item>
<el-form-item label="整车认证证书编号" prop="vehicleCertificate">
<el-input v-model="form.vehicleCertificate" placeholder="请输入" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>
</template> </template>
<script setup name="Model"> <script setup name="Model">
......
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