From 5fb6a22802318375b003c0319287553673878690 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 24 十一月 2023 17:57:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/WorkshopSignageManagement.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/views/system/WorkshopSignageManagement.vue b/src/views/system/WorkshopSignageManagement.vue
index 1572098..b82332f 100644
--- a/src/views/system/WorkshopSignageManagement.vue
+++ b/src/views/system/WorkshopSignageManagement.vue
@@ -82,7 +82,7 @@
<a-form layout="inline">
<a-row :gutter="24">
<a-col :md="12" :sm="12">
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input placeholder="" v-model="queryParam2.equipmentId"></a-input>
</a-form-item>
</a-col>
@@ -230,6 +230,11 @@
scopedSlots: { customRender: 'backgroundImage' },
},
{
+ title: '璁惧缂栧彿棰滆壊',
+ dataIndex: 'equipmentIdColor',
+ align: 'center',
+ },
+ {
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
@@ -238,7 +243,7 @@
],
columns2: [
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentId',
width: 120,
@@ -453,6 +458,7 @@
this.$refs.selectUserModal.visible = true
this.$refs.selectUserModal.selectedRowKeys = []
this.$refs.selectUserModal.selectedRows = []
+ this.$refs.selectUserModal.checkedKeys = []
}
},
--
Gitblit v1.9.3