From bf5315d30654f18d4bdec7fcb3cfe043c9507582 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 16 四月 2021 11:34:39 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index fca5538..969dba8 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -232,8 +232,8 @@
<el-form-item label="${comment}" prop="${field}">
<el-date-picker clearable size="small"
v-model="form.${field}"
- type="date"
- value-format="yyyy-MM-dd"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨${comment}">
</el-date-picker>
</el-form-item>
@@ -470,7 +470,7 @@
handleAdd(row) {
this.reset();
this.getTreeselect();
- if (row != null && row.dkAreaCode) {
+ if (row != null && row.${treeCode}) {
this.form.${treeParentCode} = row.${treeCode};
} else {
this.form.${treeParentCode} = 0;
--
Gitblit v1.9.3