From d6803b83a827a62fa29737c31104c3ee9bc194d8 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 08 四月 2024 10:18:41 +0800
Subject: [PATCH] 1、全局菜单栏新增点击父级菜单标题后在导航栏展开父级所有下一级菜单功能 2、登录页面按照新需求调整整体布局及样式 3、优化首页看板页面图表视图
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 204728d..c2eeeaf 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -117,8 +117,6 @@
:wrapperCol="wrapperCol"
prop="useId"
>
-
-
<j-dict-select-tag
allow-clear
@@ -136,8 +134,8 @@
<a-form-model-item
label="鏄惁鐢熶骇绾胯澶�"
:labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="isLineEquip"
+ :wrapperCol="wrapperCol"
+ prop="isLineEquip"
>
<j-dict-select-tag
allow-clear
@@ -153,8 +151,8 @@
<a-form-model-item
label="鏄惁鐢熶骇绾�"
:labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="isLine"
+ :wrapperCol="wrapperCol"
+ prop="isLine"
>
<j-dict-select-tag
allow-clear
@@ -1063,10 +1061,10 @@
{ required: true, message: '璇烽�夋嫨璁惧鐘舵��!' },
],
workCenterId: [
- { required: true, message: '璇烽�夋嫨涓績!' },
+ { required: false, message: '璇烽�夋嫨涓績!' },
],
factoryModelId: [
- { required: true, message: '璇烽�夋嫨宸ュ尯!' },
+ { required: false, message: '璇烽�夋嫨宸ュ尯!' },
],
warrantyStart: [
{ required: true, message: '璇烽�夋嫨寮�濮嬫棩鏈�!' },
@@ -1087,7 +1085,7 @@
{ required: true, message: '璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈�!' },
],
areaId: [
- { required: true, message: '璇烽�夋嫨宸ユ!' },
+ { required: false, message: '璇烽�夋嫨宸ユ!' },
],
},
url: {
@@ -1340,7 +1338,7 @@
var nextTechnologyStatusQualificationTime = moment(acceptanceCheckDate).add(checkPeriod, 'days').format('YYYY-MM-DD');
this.model.nextTechnologyStatusQualificationTime = nextTechnologyStatusQualificationTime;
this.model = Object.assign({}, this.model);
- }else{
+ } else {
this.model.nextTechnologyStatusQualificationTime = '';
this.model = Object.assign({}, this.model);
}
--
Gitblit v1.9.3