From f409a5ea59614945ecd7196e2255ef61bbb8ec3c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 19:15:01 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/system/modules/WorkshopModal.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/views/system/modules/WorkshopModal.vue b/src/views/system/modules/WorkshopModal.vue
index 364a8fa..0164db1 100644
--- a/src/views/system/modules/WorkshopModal.vue
+++ b/src/views/system/modules/WorkshopModal.vue
@@ -18,6 +18,9 @@
<a-form-model-item label="杞﹂棿鑳屾櫙鍥�" required prop="backgroundImage">
<j-image-upload class="avatar-uploader" text="涓婁紶" v-model="model.backgroundImage"></j-image-upload>
</a-form-model-item>
+ <a-form-model-item label="璁惧缂栧彿棰滆壊">
+ <a-input type="color" v-model="model.equipmentIdColor"></a-input>
+ </a-form-model-item>
</a-form-model>
</a-spin>
</a-modal>
@@ -28,6 +31,7 @@
export default {
name: 'WorkshopModal',
+ components: {},
data() {
return {
title: '鎿嶄綔',
@@ -49,7 +53,7 @@
{ min: 0, max: 64, message: '闀垮害涓嶈秴杩� 64 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateRoleCode }
],
- backgroundImage:[
+ backgroundImage: [
{ required: true, message: '璇蜂笂浼犺溅闂磋儗鏅浘!' }
]
}
--
Gitblit v1.9.3