From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue b/src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue
index b7191fc..922bbe8 100644
--- a/src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue
+++ b/src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue
@@ -15,11 +15,17 @@
:wrapperCol="wrapperCol"
prop="controlSystemType"
>
- <j-dict-select-tag
- type="list"
+ <!--<j-dict-select-tag-->
+ <!--type="list"-->
+ <!--v-model="model.controlSystemType"-->
+ <!--dictCode="mdc_driveType"-->
+ <!--placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"-->
+ <!--/>-->
+ <a-auto-complete
v-model="model.controlSystemType"
- dictCode="mdc_driveType"
+ :data-source="driveTypeList"
placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"
+ :filter-option="filterOption"
/>
</a-form-model-item>
</a-col>
@@ -104,6 +110,9 @@
type: Boolean,
default: false,
required: false
+ },
+ driveTypeList:{
+ type:Object
}
},
data() {
@@ -181,7 +190,7 @@
httpAction(httpurl, this.model, method).then((res) => {
if (res.success) {
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
--
Gitblit v1.9.3