From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/system/modules/WorkshopModal.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/system/modules/WorkshopModal.vue b/src/views/system/modules/WorkshopModal.vue
index 5c74232..0164db1 100644
--- a/src/views/system/modules/WorkshopModal.vue
+++ b/src/views/system/modules/WorkshopModal.vue
@@ -12,14 +12,14 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" v-bind="layout" :model="model" :rules="validatorRules">
- <a-form-model-item label="杞﹂棿缂栧彿" required prop="id">
- <a-input v-model="model.id" :disabled="isEdit" placeholder="璇疯緭鍏ヨ溅闂寸紪鍙�"/>
- </a-form-model-item>
<a-form-model-item label="杞﹂棿鍚嶇О" required prop="workshopName">
<a-input v-model="model.workshopName" placeholder="璇疯緭鍏ヨ溅闂村悕绉�"/>
</a-form-model-item>
<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>
@@ -31,6 +31,7 @@
export default {
name: 'WorkshopModal',
+ components: {},
data() {
return {
title: '鎿嶄綔',
@@ -52,7 +53,7 @@
{ min: 0, max: 64, message: '闀垮害涓嶈秴杩� 64 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateRoleCode }
],
- backgroundImage:[
+ backgroundImage: [
{ required: true, message: '璇蜂笂浼犺溅闂磋儗鏅浘!' }
]
}
--
Gitblit v1.9.3