WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改已知bug

Browse Source
This commit is contained in:
qq787203167
2022-06-01 17:17:37 +08:00
parent 2be42fd7ff
commit d1f9d50643
2 changed files with 103 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/addModel.vue
+13 -1
View File
@@ -300,6 +300,18 @@
required: true,
message: this.$t('StudioEngineer') + this.$t('cannotEmpty'),
trigger: 'change'
},
{
max: 100,
message: this.$t('StudioEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'change'
}
],
certificationEngineerName: [
{
max: 100,
message: this.$t('certifiedEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'change'
}
]
},
@@ -402,7 +414,7 @@
this.formInline.vehiclePlatform = content[0].vehiclePlatform || ''
this.yearNameDataList = content[0].yearNameDataList || []
this.formInline.digitalPlatform = content[0].digitalPlatform || ''
this.formInline = {...this.formInline}
this.formInline = { ...this.formInline }
}
}
}
jero-web/src/views/projectManagement/projectLibrary/index.vue
+90 -75
View File
@@ -2,93 +2,94 @@
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('entryName')">
<span>{{$t('entryName')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
v-model="queryParam.projectName"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('targetMarket')">
<span>{{$t('targetMarket')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.targetMarket"
:placeholder="$t('PleaseSelect')+$t('targetMarket')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('projectStatus')">
<span>{{$t('projectStatus')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.projectStatus"
:placeholder="$t('PleaseSelect')+$t('projectStatus')"
:type="'select'"
:triggerChange="false" :dictCode="'project_status'"/>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('StudioEngineer')">
<span>{{$t('StudioEngineer')}}</span>
<div class="title-text" :title="$t('entryName')">
<span>{{$t('entryName')}}</span>
</div>
<PersonnelSelection class="box-input"
:query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"
:isInput="true"
:personneQuery="queryParam"
@change="PersonnelSelectionChange"
v-model="queryParam.studioEngineerName"/>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
v-model="queryParam.projectName"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('certifiedEngineer')">
<span>{{$t('certifiedEngineer')}}</span>
<div class="title-text" :title="$t('targetMarket')">
<span>{{$t('targetMarket')}}</span>
</div>
<PersonnelSelection :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
:isInput="true"
class="box-input"
:personneQuery="queryParam"
@change="PersonnelSelectionChange"
v-model="queryParam.certificationEngineerName"/>
<j-dict-select-tag class="box-input" v-model="queryParam.targetMarket"
:placeholder="$t('PleaseSelect')+$t('targetMarket')"
:type="'select'"
:triggerChange="false" :dictCode="'region'"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('ModelPlatform')">
<span>{{$t('ModelPlatform')}}</span>
<div class="title-text" :title="$t('projectStatus')">
<span>{{$t('projectStatus')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"
v-model="queryParam.vehiclePlatform"></a-input>
<!-- <j-dict-select-tag class="box-input" v-model="queryParam.vehiclePlatform"-->
<!-- :placeholder="$t('PleaseSelect')+$t('ModelPlatform')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'vehicle_platform'"/>-->
<j-dict-select-tag class="box-input" v-model="queryParam.projectStatus"
:placeholder="$t('PleaseSelect')+$t('projectStatus')"
:type="'select'"
:triggerChange="false" :dictCode="'project_status'"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('DigitalPlatform')">
<span>{{$t('DigitalPlatform')}}</span>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('StudioEngineer')">
<span>{{$t('StudioEngineer')}}</span>
</div>
<PersonnelSelection class="box-input"
:query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"
:isInput="true"
:personneQuery="queryParam"
@change="PersonnelSelectionChange"
v-model="queryParam.studioEngineerName"/>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('DigitalPlatform')"
v-model="queryParam.digitalPlatform"></a-input>
<!-- <j-dict-select-tag class="box-input" v-model="queryParam.digitalPlatform"-->
<!-- :placeholder="$t('PleaseSelect')+$t('DigitalPlatform')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'digital_platform'"/>-->
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('certifiedEngineer')">
<span>{{$t('certifiedEngineer')}}</span>
</div>
<PersonnelSelection
:query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
:isInput="true"
class="box-input"
:personneQuery="queryParam"
@change="PersonnelSelectionChange"
v-model="queryParam.certificationEngineerName"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('ModelPlatform')">
<span>{{$t('ModelPlatform')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ModelPlatform')"
v-model="queryParam.vehiclePlatform"></a-input>
<!-- <j-dict-select-tag class="box-input" v-model="queryParam.vehiclePlatform"-->
<!-- :placeholder="$t('PleaseSelect')+$t('ModelPlatform')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'vehicle_platform'"/>-->
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('DigitalPlatform')">
<span>{{$t('DigitalPlatform')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('DigitalPlatform')"
v-model="queryParam.digitalPlatform"></a-input>
<!-- <j-dict-select-tag class="box-input" v-model="queryParam.digitalPlatform"-->
<!-- :placeholder="$t('PleaseSelect')+$t('DigitalPlatform')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'digital_platform'"/>-->
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
@@ -98,7 +99,7 @@
</a>
</a-col>
</span>
</a-row>
</a-row>
</a-form>
</div>
<div class="table-operator">
@@ -117,7 +118,7 @@
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: true}"
:scroll="{x: '100%'}"
rowKey="id"
:data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -129,7 +130,7 @@
<span slot="operation" slot-scope="text,record">
<!-- <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>-->
<a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
<!-- <a class="text-operation" @click="entryNameClick(record)">{{$t('see')}}</a>-->
<!-- <a class="text-operation" @click="entryNameClick(record)">{{$t('see')}}</a>-->
</span>
</a-table>
</div>
@@ -185,36 +186,50 @@
title: this.$t('entryName'),
align: 'center',
dataIndex: 'projectName',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'projectName' }
},
{
title: this.$t('targetMarket'),
width: 180,
ellipsis: true,
align: 'center',
dataIndex: 'targetMarket_dictText'
},
{
title: this.$t('projectStatus'),
align: 'center',
width: 180,
ellipsis: true,
dataIndex: 'projectStatus_dictText'
},
{
title: this.$t('StudioEngineer'),
align: 'center',
width: 180,
ellipsis: true,
dataIndex: 'studioEngineerName'
},
{
title: this.$t('certifiedEngineer'),
align: 'center',
width: 180,
ellipsis: true,
dataIndex: 'certificationEngineerName'
},
{
title: this.$t('ModelPlatform'),
align: 'center',
width: 180,
ellipsis: true,
dataIndex: 'vehiclePlatform'
},
{
title: this.$t('DigitalPlatform'),
align: 'center',
width: 180,
ellipsis: true,
dataIndex: 'digitalPlatform'
},
{
@@ -441,7 +456,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
z-index: 100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;