From b606e6af4a635dd9009f5414cb3d45e5d514749a Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 十二月 2023 13:25:45 +0800
Subject: [PATCH] 优化退出登录触发条件
---
src/views/eam/modules/equipment/EquipmentModel.vue | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/views/eam/modules/equipment/EquipmentModel.vue b/src/views/eam/modules/equipment/EquipmentModel.vue
index 726a235..cdf2ad2 100644
--- a/src/views/eam/modules/equipment/EquipmentModel.vue
+++ b/src/views/eam/modules/equipment/EquipmentModel.vue
@@ -20,7 +20,7 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="璁惧缂栫爜"
+ label="缁熶竴缂栫爜"
>
<a-input
placeholder="灏嗙敱绯荤粺鐢熸垚"
@@ -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">
@@ -338,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>
@@ -358,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"
@@ -408,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"
@@ -443,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"
@@ -460,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"
@@ -497,6 +501,9 @@
/>
</a-form-item>
</a-col>
+ </a-row>
+ <a-row style="width: 100%">
+
</a-row>
<a-row :gutter="24">
@@ -725,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;
@@ -776,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
@@ -866,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) => {
--
Gitblit v1.9.3