From 598e5c1d72e2176cc8d280e0726ac8eef323516e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 21 十一月 2023 15:43:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index 4a2268f..a16aa3c 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -3,7 +3,7 @@
:title="title"
:maskClosable="true"
:width="drawerWidth"
- @cancel="handleCancel"
+ @cancel="visible=false"
:visible="visible"
:footer="null"
style="height: 100%;overflow: auto;padding-bottom: 53px;">
@@ -55,9 +55,6 @@
<a-col :span="12">
<a-form-model-item label="杞﹂棿鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!productionDisabled" ref="selectedProduction" prop="selectedProduction">
<!--<j-select-equipment-production v-decorator="['selectedProduction',{rules:[{required:true,message:'璇烽�夋嫨杞﹂棿!'}]}]" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>-->
-
-
-
<j-select-equipment-production :disabled="disableSubmit" v-model="model.selectedProduction" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>
</a-form-model-item>
@@ -147,7 +144,7 @@
<div class="drawer-bootom-button" v-show="!disableSubmit">
- <a-popconfirm title="纭畾鏀惧純鎿嶄綔锛�" @confirm="handleCancel" okText="纭畾" cancelText="鍙栨秷">
+ <a-popconfirm title="纭畾鏀惧純鎿嶄綔锛�" @confirm="close" okText="纭畾" cancelText="鍙栨秷">
<a-button style="margin-right: .8rem">鍙栨秷</a-button>
</a-popconfirm>
<a-button @click="handleSubmit" type="primary" :loading="confirmLoading">鎻愪氦</a-button>
@@ -549,9 +546,7 @@
// }
// })
// },
- handleCancel () {
- this.close()
- },
+
// validatequipmentId(rule, value, callback){
// if(!value){
// callback()
--
Gitblit v1.9.3