Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qr-consistency-vue3
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘怀志
qr-consistency-vue3
Commits
5d3b2937
Commit
5d3b2937
authored
Apr 29, 2025
by
祁正
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(通知单内容维护和管理):列表排序
parent
69ef476c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
208 additions
and
36 deletions
+208
-36
index.vue
...ntrolPlan/controlPlanNotice/notificationContent/index.vue
+100
-19
index.vue
...olPlan/controlPlanNotice/notificationManagement/index.vue
+108
-17
No files found.
src/views/controlPlan/controlPlanNotice/notificationContent/index.vue
View file @
5d3b2937
...
@@ -109,56 +109,137 @@
...
@@ -109,56 +109,137 @@
</el-form>
</el-form>
<el-table
:data=
"tableList"
>
<el-table
:data=
"tableList"
:default-sort=
"
{prop: 'approvalDate', order: 'descending'}"
>
<el-table-column
type=
"index"
width=
"55"
align=
"center"
label=
"序号"
/>
<el-table-column
type=
"index"
width=
"55"
align=
"center"
label=
"序号"
/>
<el-table-column
label=
"通知单编号"
align=
"center"
prop=
"notificationNumber"
>
<el-table-column
label=
"通知单编号"
align=
"center"
prop=
"notificationNumber"
sortable
width=
"120"
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"认证机构"
align=
"center"
prop=
"certificationBody"
/>
<el-table-column
<el-table-column
label=
"事业部"
align=
"center"
prop=
"businessUnitName"
/>
label=
"认证机构"
<el-table-column
label=
"品牌"
align=
"center"
prop=
"brand"
/>
align=
"center"
<el-table-column
label=
"车型代码"
align=
"center"
prop=
"vehicleModelCode"
/>
prop=
"certificationBody"
<el-table-column
label=
"车型系列"
align=
"center"
prop=
"vehicleSeries"
>
sortable
:sort-method=
"(a, b) => a.certificationBody.localeCompare(b.certificationBody)"
/>
<el-table-column
label=
"事业部"
align=
"center"
prop=
"businessUnitName"
sortable
:sort-method=
"(a, b) => a.businessUnitName.localeCompare(b.businessUnitName)"
/>
<el-table-column
label=
"品牌"
align=
"center"
prop=
"brand"
sortable
:sort-method=
"(a, b) => a.brand.localeCompare(b.brand)"
/>
<el-table-column
label=
"车型代码"
align=
"center"
prop=
"vehicleModelCode"
sortable
/>
<el-table-column
label=
"车型系列"
align=
"center"
prop=
"vehicleSeries"
sortable
:sort-method=
"(a, b) => a.vehicleSeries.localeCompare(b.vehicleSeries)"
>
<template
#
default=
"scope"
>
<template
#
default=
"scope"
>
<dict-tag
:options=
"getDictList(scope.row.vehicleSeries)?vehicle_model_series_icar:vehicle_model_series"
:value=
"scope.row.vehicleSeries"
/>
<dict-tag
:options=
"getDictList(scope.row.vehicleSeries)?vehicle_model_series_icar:vehicle_model_series"
:value=
"scope.row.vehicleSeries"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"生产地址"
align=
"center"
prop=
"productionAddress"
width=
"150"
/>
<el-table-column
label=
"生产地址"
<el-table-column
label=
"变更类型"
align=
"center"
prop=
"changeType"
>
align=
"center"
prop=
"productionAddress"
width=
"150"
sortable
:sort-method=
"(a, b) => a.productionAddress.localeCompare(b.productionAddress)"
/>
<el-table-column
label=
"变更类型"
align=
"center"
prop=
"changeType"
sortable
:sort-method=
"(a, b) => a.changeType.localeCompare(b.changeType)"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<span>
{{
scope
.
row
.
vehicleAnnouncementNumber
||
'--'
}}
</span>
<span>
{{
scope
.
row
.
vehicleAnnouncementNumber
||
'--'
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"认证负责人"
align=
"center"
prop=
"certificationResponsiblePerson"
>
<el-table-column
label=
"认证负责人"
align=
"center"
prop=
"certificationResponsiblePerson"
sortable
:sort-method=
"(a, b) => a.certificationResponsiblePerson.split(',').length - b.certificationResponsiblePerson.split(',').length"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<span
>
共
{{
scope
.
row
.
certificationResponsiblePerson
.
split
(
','
).
length
}}
人
</span>
<span
>
共
{{
scope
.
row
.
certificationResponsiblePerson
.
split
(
','
).
length
}}
人
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"批准日期"
align=
"center"
prop=
"approvalDate"
>
<el-table-column
label=
"批准日期"
align=
"center"
prop=
"approvalDate"
sortable
:sort-method=
"(a, b) => new Date(b.approvalDate) - new Date(a.approvalDate)"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<span>
{{
scope
.
row
.
approvalDate
||
'--'
}}
</span>
<span>
{{
scope
.
row
.
approvalDate
||
'--'
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"我的维护状态"
align=
"center"
prop=
"notificationStatus"
width=
"120"
>
<el-table-column
label=
"我的维护状态"
align=
"center"
prop=
"notificationStatus"
width=
"120"
sortable
:sort-method=
"(a, b) => a.notificationStatus.localeCompare(b.notificationStatus)"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<dict-tag
:options=
"content_my_status"
:value=
"scope.row.certificationStatus"
/>
<dict-tag
:options=
"content_my_status"
:value=
"scope.row.certificationStatus"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"通知单状态"
align=
"center"
prop=
"notificationStatus"
>
<el-table-column
label=
"通知单状态"
align=
"center"
prop=
"notificationStatus"
sortable
:sort-method=
"(a, b) => a.notificationStatus.localeCompare(b.notificationStatus)"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<dict-tag
:options=
"notification_status"
:value=
"scope.row.notificationStatus"
/>
<dict-tag
:options=
"notification_status"
:value=
"scope.row.notificationStatus"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"创建人"
align=
"center"
prop=
"createUserName"
/>
<el-table-column
<el-table-column
label=
"批准人"
align=
"center"
prop=
"approvalUserName"
/>
label=
"创建人"
align=
"center"
prop=
"createUserName"
sortable
:sort-method=
"(a, b) => a.createUserName.localeCompare(b.createUserName)"
/>
<el-table-column
label=
"批准人"
align=
"center"
prop=
"approvalUserName"
sortable
:sort-method=
"(a, b) => a.approvalUserName.localeCompare(b.approvalUserName)"
/>
<el-table-column
label=
"操作"
align=
"center"
width=
"160"
>
<el-table-column
label=
"操作"
align=
"center"
width=
"160"
>
<
template
#
default=
"scope"
>
<
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(0,0,255)"
@
click=
"handleMaintain(scope.row)"
>
查看
</el-button>
<el-button
type=
"text"
style=
"color: rgb(0,0,255)"
@
click=
"changeRecords(scope.row)"
>
维护变更记录
</el-button>
<el-button
type=
"text"
style=
"color: rgb(0,0,255)"
@
click=
"changeRecords(scope.row)"
>
维护变更记录
</el-button>
<el-button
type=
"text"
style=
"color: rgb(255,153,0)"
@
click=
"copeAdd(scope.row)"
>
取消完成
</el-button>
<el-button
type=
"text"
style=
"color: rgb(255,153,0)"
@
click=
"copeAdd(scope.row)"
>
取消完成
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
...
src/views/controlPlan/controlPlanNotice/notificationManagement/index.vue
View file @
5d3b2937
...
@@ -112,48 +112,140 @@
...
@@ -112,48 +112,140 @@
</el-form>
</el-form>
<el-table
:data=
"tableList
"
>
<el-table
:data=
"tableList"
:default-sort=
"
{ prop: 'approvalDate', order: 'descending' }
">
<el-table-column
type=
"index"
width=
"55"
align=
"center"
label=
"序号"
/>
<el-table-column
type=
"index"
width=
"55"
align=
"center"
label=
"序号"
/>
<el-table-column
label=
"通知单编号"
align=
"center"
prop=
"notificationNumber"
>
<el-table-column
label=
"通知单编号"
align=
"center"
prop=
"notificationNumber"
sortable
:sort-method=
"(a, b) => a.notificationNumber.localeCompare(b.notificationNumber)"
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"认证机构"
align=
"center"
prop=
"certificationBody"
/>
<el-table-column
<el-table-column
label=
"事业部"
align=
"center"
prop=
"businessUnitName"
/>
label=
"认证机构"
<el-table-column
label=
"品牌"
align=
"center"
prop=
"brand"
/>
align=
"center"
<el-table-column
label=
"车型代码"
align=
"center"
prop=
"vehicleModelCode"
/>
prop=
"certificationBody"
<el-table-column
label=
"车型系列"
align=
"center"
prop=
"vehicleSeries"
>
sortable
:sort-method=
"(a, b) => a.certificationBody.localeCompare(b.certificationBody)"
/>
<el-table-column
label=
"事业部"
align=
"center"
prop=
"businessUnitName"
sortable
:sort-method=
"(a, b) => a.businessUnitName.localeCompare(b.businessUnitName)"
/>
<el-table-column
label=
"品牌"
align=
"center"
prop=
"brand"
sortable
:sort-method=
"(a, b) => a.brand.localeCompare(b.brand)"
/>
<el-table-column
label=
"车型代码"
align=
"center"
prop=
"vehicleModelCode"
sortable
:sort-method=
"(a, b) => a.vehicleModelCode.localeCompare(b.vehicleModelCode)"
/>
<el-table-column
label=
"车型系列"
align=
"center"
prop=
"vehicleSeries"
sortable
:sort-method=
"(a, b) => a.vehicleSeries.localeCompare(b.vehicleSeries)"
>
<template
#
default=
"scope"
>
<template
#
default=
"scope"
>
<dict-tag
:options=
"getDictList(scope.row.vehicleSeries)?vehicle_model_series_icar:vehicle_model_series"
:value=
"scope.row.vehicleSeries"
/>
<dict-tag
:options=
"getDictList(scope.row.vehicleSeries)?vehicle_model_series_icar:vehicle_model_series"
:value=
"scope.row.vehicleSeries"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"生产地址"
align=
"center"
prop=
"productionAddress"
width=
"150"
/>
<el-table-column
<el-table-column
label=
"车型公告号"
align=
"center"
prop=
"vehicleAnnouncementNumber"
>
label=
"生产地址"
align=
"center"
prop=
"productionAddress"
width=
"150"
sortable
:sort-method=
"(a, b) => a.productionAddress.localeCompare(b.productionAddress)"
/>
<el-table-column
label=
"车型公告号"
align=
"center"
prop=
"vehicleAnnouncementNumber"
sortable
:sort-method=
"(a, b) => a.vehicleAnnouncementNumber.localeCompare(b.vehicleAnnouncementNumber)"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<span>
{{
scope
.
row
.
vehicleAnnouncementNumber
||
'涉及0个'
}}
</span>
<span>
{{
scope
.
row
.
vehicleAnnouncementNumber
||
'涉及0个'
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"变更类型"
align=
"center"
prop=
"changeType"
>
<el-table-column
label=
"变更类型"
align=
"center"
prop=
"changeType"
sortable
:sort-method=
"(a, b) => a.changeType.localeCompare(b.changeType)"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<span>
{{
scope
.
row
.
vehicleAnnouncementNumber
||
'--'
}}
</span>
<span>
{{
scope
.
row
.
vehicleAnnouncementNumber
||
'--'
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"认证负责人"
align=
"center"
prop=
"certificationResponsiblePerson"
>
<el-table-column
label=
"认证负责人"
align=
"center"
prop=
"certificationResponsiblePerson"
sortable
:sort-method=
"(a, b) => {
const countA = a.certificationResponsiblePerson.split(',').length;
const countB = b.certificationResponsiblePerson.split(',').length;
return countA - countB;
}"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<span
class=
"renzheng"
>
共
{{
scope
.
row
.
certificationResponsiblePerson
.
split
(
','
).
length
}}
人
<el-icon
style=
"font-size: 16px;margin-left: 5px"
><EditPen
@
click=
"addPerson(scope.row)"
/></el-icon></span>
<span
class=
"renzheng"
>
共
{{
scope
.
row
.
certificationResponsiblePerson
.
split
(
','
).
length
}}
人
<el-icon
style=
"font-size: 16px;margin-left: 5px"
><EditPen
@
click=
"addPerson(scope.row)"
/></el-icon></span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"批准日期"
align=
"center"
prop=
"approvalDate"
>
<el-table-column
label=
"批准日期"
align=
"center"
prop=
"approvalDate"
sortable
:sort-method=
"(a, b) => {
const dateA = new Date(a.approvalDate);
const dateB = new Date(b.approvalDate);
return dateB - dateA;
}"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<span>
{{
scope
.
row
.
approvalDate
||
'--'
}}
</span>
<span>
{{
scope
.
row
.
approvalDate
||
'--'
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"通知单状态"
align=
"center"
prop=
"notificationStatus"
>
<el-table-column
label=
"通知单状态"
align=
"center"
prop=
"notificationStatus"
sortable
:sort-method=
"(a, b) => a.notificationStatus.localeCompare(b.notificationStatus)"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<dict-tag
:options=
"notification_status"
:value=
"scope.row.notificationStatus"
/>
<dict-tag
:options=
"notification_status"
:value=
"scope.row.notificationStatus"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"创建人"
align=
"center"
prop=
"createUserName"
/>
<el-table-column
<el-table-column
label=
"批准人"
align=
"center"
prop=
"approvalUserName"
/>
label=
"创建人"
align=
"center"
prop=
"createUserName"
sortable
:sort-method=
"(a, b) => a.createUserName.localeCompare(b.createUserName)"
/>
<el-table-column
label=
"批准人"
align=
"center"
prop=
"approvalUserName"
sortable
:sort-method=
"(a, b) => a.approvalUserName.localeCompare(b.approvalUserName)"
/>
<el-table-column
label=
"操作"
align=
"center"
width=
"140"
>
<el-table-column
label=
"操作"
align=
"center"
width=
"140"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
...
@@ -161,7 +253,6 @@
...
@@ -161,7 +253,6 @@
<el-button
type=
"text"
v-if=
"scope.row.notificationStatus === '1' || scope.row.notificationStatus === '4'"
style=
"color: rgb(255,54,54)"
@
click=
"delNotification(scope.row)"
>
删除
</el-button>
<el-button
type=
"text"
v-if=
"scope.row.notificationStatus === '1' || scope.row.notificationStatus === '4'"
style=
"color: rgb(255,54,54)"
@
click=
"delNotification(scope.row)"
>
删除
</el-button>
<el-button
type=
"text"
v-if=
"scope.row.notificationStatus === '2'"
style=
"color: rgb(255,153,0)"
@
click=
"copeAdd(scope.row)"
>
撤回
</el-button>
<el-button
type=
"text"
v-if=
"scope.row.notificationStatus === '2'"
style=
"color: rgb(255,153,0)"
@
click=
"copeAdd(scope.row)"
>
撤回
</el-button>
<el-button
type=
"text"
v-if=
"scope.row.notificationStatus === '3'"
style=
"color: rgb(255,153,0)"
@
click=
"copeAdd(scope.row)"
>
作废
</el-button>
<el-button
type=
"text"
v-if=
"scope.row.notificationStatus === '3'"
style=
"color: rgb(255,153,0)"
@
click=
"copeAdd(scope.row)"
>
作废
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment