From 4ef0342708910d02453fdcfae2148eadbf6d7004 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 05 六月 2024 11:34:21 +0800
Subject: [PATCH] 1、设备综合效率分析页面表格列属性ellipsis开启后内容若超出盒子宽度则出现与表头错位现象，而无法实现ellipsis开启后内容超出单元格则省略功能，现采取增加列宽度方式且关闭ellipsis属性功能方法解决问题 2、设备综合效率分析页面调整计算表格垂直滚动条方法以试图解决项目服务器上无法正常显示水平滚动条问题
---
src/views/eam/modules/line/EquipmentOfLineForm.vue | 98 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/modules/line/EquipmentOfLineForm.vue b/src/views/eam/modules/line/EquipmentOfLineForm.vue
index fcbd6a2..27122d3 100644
--- a/src/views/eam/modules/line/EquipmentOfLineForm.vue
+++ b/src/views/eam/modules/line/EquipmentOfLineForm.vue
@@ -49,6 +49,85 @@
></a-input>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="浣跨敤閮ㄩ棬"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="useId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
+ :triggerChange="true"
+ dictCode="sys_depart,depart_name,id,del_flag!='1'"
+ v-model="model.useId"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="6">
+ <a-form-model-item
+ label="缁存姢閮ㄩ棬"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="manageId"
+ >
+ <!-- <a-tree-select
+ :disabled="formDisabled"
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
+ tree-default-expand-all
+ v-model="model.manageId"
+ /> -->
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
+ :triggerChange="true"
+ dictCode="sys_depart,depart_name,id,del_flag!='1'"
+ v-model="model.manageId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="teamId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨璐ｄ换鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
+ v-model="model.teamId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="宸ュ尯"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="factoryModelId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨宸ュ尯"
+ :triggerChange="true"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="model.factoryModelId"
+ />
+ </a-form-model-item>
+ </a-col>
</a-row>
</a-form-model>
</j-form-container>
@@ -65,7 +144,6 @@
:disabled="formDisabled"
:rowNumber="true"
:rowSelection="true"
- :bordered="true"
:alwaysEdit="true"
:toolbar="true"
@valueChange="changeDate"
@@ -125,11 +203,11 @@
},
labelCol: {
xs: { span: 24 },
- sm: { span: 5 },
+ sm: { span: 11 },
},
wrapperCol: {
xs: { span: 24 },
- sm: { span: 16 },
+ sm: { span: 13 },
},
model:{
},
@@ -145,7 +223,19 @@
],
equipmentCategoryId:[
{ required: true, message: '璇疯緭鍏ュ垎绫�!' }
- ]
+ ],
+ manageId: [
+ { required: true, message: '璇烽�夋嫨缁存姢閮ㄩ棬!' },
+ ],
+ useId: [
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
+ ],
+ factoryModelId: [
+ { required: true, message: '璇烽�夋嫨宸ュ尯!' },
+ ],
+ teamId: [
+ { required: true, message: '璇烽�夋嫨璐ｄ换鐝粍!' },
+ ],
},
refKeys: ['equipmentOfLineTable', ],
tableKeys:['equipmentOfLineTable', ],
--
Gitblit v1.9.3