From 3457909638c660c0cfcb521b6104ab64c679b914 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 19 九月 2023 16:23:16 +0800
Subject: [PATCH] 修改页面左右展示比例
---
src/views/eam/modules/equipment/EquipmentModel.vue | 104 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 38 deletions(-)
diff --git a/src/views/eam/modules/equipment/EquipmentModel.vue b/src/views/eam/modules/equipment/EquipmentModel.vue
index 6cb5f72..50a1c72 100644
--- a/src/views/eam/modules/equipment/EquipmentModel.vue
+++ b/src/views/eam/modules/equipment/EquipmentModel.vue
@@ -215,14 +215,22 @@
placeholder="璇疯緭鍏ユ墍鏈夌粍缁�"
v-decorator="['affiliationId', validatorRules.affiliationId]"
/> -->
- <a-select
+ <!-- <a-select
:placeholder="disableSubmit?'':'璇烽�夋嫨鎵�鏈夌粍缁�'"
:options="this.departs"
style="width: 100%"
:disabled="disableSubmit"
v-decorator="['affiliationId', validatorRules.affiliationId]"
- />
+ /> -->
<!-- @change="(e)=>handle1Change(e)" -->
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨绠＄悊缁勭粐"
+ tree-default-expand-all
+ v-decorator="['affiliationId', validatorRules.affiliationId]"
+ />
</a-form-item>
</a-col>
<a-col :span="24 / 3">
@@ -249,14 +257,22 @@
placeholder="璇疯緭鍏ョ鐞嗙粍缁�"
v-decorator="['manageId', validatorRules.manageId]"
/> -->
- <a-select
+ <!-- <a-select
:placeholder="disableSubmit?'':'璇烽�夋嫨绠＄悊缁勭粐'"
:options="this.departs"
style="width: 100%"
:disabled="disableSubmit"
v-decorator="['manageId', validatorRules.manageId]"
- />
+ /> -->
<!-- @change="(e)=>handle3Change(e)" -->
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨绠＄悊缁勭粐"
+ tree-default-expand-all
+ v-decorator="['manageId', validatorRules.manageId]"
+ />
</a-form-item>
</a-col>
<a-col :span="24 / 3">
@@ -299,23 +315,23 @@
:wrapperCol="wrapperCol"
label="浣跨敤閮ㄩ棬"
>
- <!-- <j-dict-select-tag
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤缁勭粐'"
- :triggerChange="true"
- dictCode="sys_depart,depart_name,id,version = '7' and del_flag!='1'"
+ <a-tree-select
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨閮ㄩ棬"
+ tree-default-expand-all
v-decorator="['useId', validatorRules.useId]"
- /> -->
- <a-select
+ />
+ <!-- <a-select
:placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤閮ㄩ棬'"
:options="this.departs"
style="width: 100%"
:disabled="disableSubmit"
v-decorator="['useId', validatorRules.useId]"
- />
- <!-- @change="(e)=>handle2Change(e)" -->
+ /> -->
</a-form-item>
+
</a-col>
<a-col :span="24 / 3">
@@ -330,7 +346,7 @@
:placeholder="disableSubmit?'':'璇烽�夋嫨璐ｄ换鐝粍'"
:triggerChange="true"
dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
- v-decorator="['teamId', validatorRules.teamId]"
+ v-decorator="['teamId', {}]"
/>
</a-form-item>
</a-col>
@@ -350,9 +366,8 @@
/>
</a-form-item>
</a-col>
-
</a-row>
- <a-row style="width: 100%">
+ <!-- <a-row style="width: 100%">
<a-col :span="24 / 3">
<a-form-item
:labelCol="labelCol"
@@ -400,9 +415,9 @@
/>
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row style="width: 100%">
- <a-col :span="24 / 3 ">
+ <!-- <a-col :span="24 / 3 ">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -435,7 +450,7 @@
v-decorator="['processParametersTemplateName', validatorRules.processParametersTemplateName]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="24 / 3">
<a-form-item
:labelCol="labelCol"
@@ -452,9 +467,6 @@
/>
</a-form-item>
</a-col>
- </a-row>
- <a-row style="width: 100%">
-
<a-col :span="24 / 3">
<a-form-item
:labelCol="labelCol"
@@ -489,6 +501,9 @@
/>
</a-form-item>
</a-col>
+ </a-row>
+ <a-row style="width: 100%">
+
</a-row>
<a-row :gutter="24">
@@ -553,7 +568,6 @@
鍏抽棴
</a-button>
<a-button
- hidden
v-if="!this.model.id"
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@@ -610,6 +624,7 @@
precisionParametersTemplateId: '',
equipmentPhoto: '',
departs: [],
+ treeData: [],
model: {},
headers: {},
labelCol: {
@@ -662,6 +677,7 @@
add: "/eam/equipment/add",
edit: "/eam/equipment/edit",
getSysDeparts: "/eam/equipment/getSysDeparts",
+ loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
},
//鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴��
alterFlag: "",
@@ -669,6 +685,7 @@
},
created() {
this.getSysDeparts()
+
},
methods: {
moment,
@@ -683,6 +700,7 @@
this.visible = true;
this.disableSubmit = false;
this.fileList = [];
+ this.initOptions();
this.precisionParametersTemplateId = record.precisionParametersTemplateId
this.processParametersTemplateId = record.processParametersTemplateId
this.$nextTick(() => {
@@ -714,7 +732,7 @@
'remark'));
this.form.setFieldsValue({ leaveFactoryDate: this.model.leaveFactoryDate ? moment(this.model.leaveFactoryDate, 'YYYY-MM-DD') : null });
this.form.setFieldsValue({ acceptanceCheckDate: this.model.acceptanceCheckDate ? moment(this.model.acceptanceCheckDate, 'YYYY-MM-DD') : null });
- this.form.setFieldsValue({ lastVerificationDate: this.model.lastVerificationDate ? moment(this.model.lastVerificationDate, 'YYYY-MM-DD') : null })
+ // this.form.setFieldsValue({ lastVerificationDate: this.model.lastVerificationDate ? moment(this.model.lastVerificationDate, 'YYYY-MM-DD') : null })
});
if (record.id) {
this.codeDisable = true;
@@ -765,17 +783,17 @@
// formData.equipmentPhoto = this.equipmentPhoto
formData.leaveFactoryDate = formData.leaveFactoryDate ? formData.leaveFactoryDate.format('YYYY-MM-DD') : null;
formData.acceptanceCheckDate = formData.acceptanceCheckDate ? formData.acceptanceCheckDate.format('YYYY-MM-DD') : null;
- formData.lastVerificationDate = formData.lastVerificationDate ? formData.lastVerificationDate.format('YYYY-MM-DD') : null;
+ // formData.lastVerificationDate = formData.lastVerificationDate ? formData.lastVerificationDate.format('YYYY-MM-DD') : null;
if (that.model.precisionParameters != "1") {
formData.precisionParametersTemplateId = "";
} else {
formData.precisionParametersTemplateId = this.precisionParametersTemplateId;
}
- if (that.model.processParameters != "1") {
- formData.processParametersTemplateId = "";
- } else {
- formData.processParametersTemplateId = this.processParametersTemplateId;
- }
+ // if (that.model.processParameters != "1") {
+ // formData.processParametersTemplateId = "";
+ // } else {
+ // formData.processParametersTemplateId = this.processParametersTemplateId;
+ // }
let obj;
if (!this.model.id) {
formData.equipmentCategoryId = this.equipmentCategoryId
@@ -855,13 +873,13 @@
this.model.precisionParameters = '1'
}
},
- handle3Switch(verification) {
- if ('1' == verification) {
- this.model.verification = '0'
- } else {
- this.model.verification = '1'
- }
- },
+ // handle3Switch(verification) {
+ // if ('1' == verification) {
+ // this.model.verification = '0'
+ // } else {
+ // this.model.verification = '1'
+ // }
+ // },
getSysDeparts() {
getAction(this.url.getSysDeparts).then((res) => {
@@ -937,6 +955,16 @@
}
},
+ initOptions() {
+ getAction(this.url.loadOptions).then(res => {
+ if (res.success) {
+ this.treeData = res.result
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
+
onSearchProcessParametersTemplate() {
this.$refs.ProcessParametersTemplateList.list();
--
Gitblit v1.9.3