From 6c74bf912e251347714099a84585f825b32a1c08 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期一, 18 十二月 2023 17:52:05 +0800
Subject: [PATCH] Merge branch 'feature-001' of ssh://114.215.109.124:29418/supervision-vue into feature-001
---
src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue b/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue
index 5e4360a..ead76bf 100644
--- a/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue
+++ b/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue
@@ -1,6 +1,16 @@
<!-- 鍦烘櫙鍩烘湰淇℃伅缂栬緫 -->
<template>
+<<<<<<< HEAD
<FYForm :form-info="_formInfo" :rules="rules" @submit="submit" @cancel="cancel">
+=======
+ <FYForm
+ :form-info="_formInfo"
+ :rules="rules"
+ :useReset="true"
+ @submit="submit"
+ @cancel="cancel"
+ >
+>>>>>>> 356f54467f525f437f41271fb62f6be66f2ab1e5
<template #form-item="{ formObj }">
<el-form-item label="鍦烘櫙鍚嶇О" prop="name">
<el-input clearable show-word-limit v-model="formObj.name" placeholder="鍦烘櫙鍚嶇О" />
@@ -78,9 +88,9 @@
const emit = defineEmits(['onSubmit', 'onCancel'])
-const _formInfo = ref()
-const sceneTypes = reactive(enumScene(2, false))
-const locations = reactive(enumLocation(false))
+const _formInfo = ref({});
+const sceneTypes = reactive(enumScene(2, false));
+const locations = reactive(enumLocation(false));
const cascaderProps = reactive({
checkStrictly: true
})
--
Gitblit v1.9.3