diff --git a/snowy-base/snowy-gen/src/main/resources/template/addForm.vue.vm b/snowy-base/snowy-gen/src/main/resources/template/addForm.vue.vm
index dc437d04..bed6ce00 100644
--- a/snowy-base/snowy-gen/src/main/resources/template/addForm.vue.vm
+++ b/snowy-base/snowy-gen/src/main/resources/template/addForm.vue.vm
@@ -96,9 +96,9 @@
 #end
 #if (${column.effectType} == "datepicker")
 #if (${column.whetherRequired} == "Y")
-          <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}',{rules: [{ required: true, message: '请选择${column.columnComment}！' }]}]" @change="onChange${column.javaName}"/>
+          <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}',{rules: [{ required: true, message: '请选择${column.columnComment}！' }]}]" @change="${column.javaName}OnChange"/>
 #else
-          <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}']" @change="onChange${column.javaName}"/>
+          <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}']" @change="${column.javaName}OnChange"/>
 #end
 #end
         </a-form-item>
@@ -162,14 +162,14 @@
         validateFields((errors, values) => {
           if (!errors) {
             for (const key in values) {
-              if (typeof (values[key]) === 'object') {
+              if (typeof (values[key]) === 'object' && values[key] != null) {
                 values[key] = JSON.stringify(values[key])
               }
             }
 #foreach ($column in $tableField)
 #if (${column.whetherAddUpdate} == "Y")
 #if (${column.effectType} == "datepicker")
-            values.${column.javaName} = this.${column.javaName}DateString
+            values.${column.javaName} = this.${column.javaName}DateString || null
 #end
 #end
 #end
@@ -193,13 +193,21 @@
 #foreach ($column in $tableField)
 #if (${column.whetherAddUpdate} == "Y")
 #if (${column.effectType} == "datepicker")
-      onChange${column.javaName}(date, dateString) {
+      ${column.javaName}OnChange(date, dateString) {
         this.${column.javaName}DateString = dateString
       },
 #end
 #end
 #end
       handleCancel () {
+#foreach ($column in $tableField)
+#if (${column.whetherAddUpdate} == "Y")
+#if (${column.effectType} == "datepicker")
+        this.${column.javaName}DateString =''
+        this.form.getFieldDecorator('${column.javaName}', { initialValue: null })
+#end
+#end
+#end
         this.form.resetFields()
         this.visible = false
       }
diff --git a/snowy-base/snowy-gen/src/main/resources/template/editForm.vue.vm b/snowy-base/snowy-gen/src/main/resources/template/editForm.vue.vm
index 6a36c328..0a5ff505 100644
--- a/snowy-base/snowy-gen/src/main/resources/template/editForm.vue.vm
+++ b/snowy-base/snowy-gen/src/main/resources/template/editForm.vue.vm
@@ -98,9 +98,9 @@
 #end
 #if (${column.effectType} == "datepicker")
 #if (${column.whetherRequired} == "Y")
-          <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}',{rules: [{ required: true, message: '请选择${column.columnComment}！' }]}]" @change="onChange${column.javaName}"/>
+          <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}',{rules: [{ required: true, message: '请选择${column.columnComment}！' }]}]" @change="${column.javaName}OnChange"/>
 #else
-          <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}']" @change="onChange${column.javaName}"/>
+          <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}']" @change="${column.javaName}OnChange"/>
 #end
 #end
         </a-form-item>
@@ -206,10 +206,10 @@
 #if (${column.whetherAddUpdate} == "Y")
 #if (${column.effectType} == "datepicker")
         // 时间单独处理
-        if (record.${column.javaName} != null) {
+        if (record.${column.javaName}) {
             this.form.getFieldDecorator('${column.javaName}', { initialValue: moment(record.${column.javaName}, 'YYYY-MM-DD') })
+            this.${column.javaName}DateString = moment(record.${column.javaName}).format('YYYY-MM-DD')
         }
-        this.${column.javaName}DateString = moment(record.${column.javaName}).format('YYYY-MM-DD')
 #end
 #end
 #end
@@ -220,14 +220,14 @@
         validateFields((errors, values) => {
           if (!errors) {
             for (const key in values) {
-              if (typeof (values[key]) === 'object') {
+              if (typeof (values[key]) === 'object' && values[key] != null) {
                 values[key] = JSON.stringify(values[key])
               }
             }
 #foreach ($column in $tableField)
 #if (${column.whetherAddUpdate} == "Y")
 #if (${column.effectType} == "datepicker")
-            values.${column.javaName} = this.${column.javaName}DateString
+            values.${column.javaName} = this.${column.javaName}DateString || null
 #end
 #end
 #end
@@ -251,13 +251,21 @@
 #foreach ($column in $tableField)
 #if (${column.whetherAddUpdate} == "Y")
 #if (${column.effectType} == "datepicker")
-      onChange${column.javaName}(date, dateString) {
+      ${column.javaName}OnChange(date, dateString) {
         this.${column.javaName}DateString = dateString
       },
 #end
 #end
 #end
       handleCancel () {
+#foreach ($column in $tableField)
+#if (${column.whetherAddUpdate} == "Y")
+#if (${column.effectType} == "datepicker")
+        this.${column.javaName}DateString =''
+        this.form.getFieldDecorator('${column.javaName}', { initialValue: null })
+#end
+#end
+#end
         this.form.resetFields()
         this.visible = false
       }
diff --git a/snowy-base/snowy-gen/src/main/resources/template/index.vue.vm b/snowy-base/snowy-gen/src/main/resources/template/index.vue.vm
index bcc85b2a..a030b896 100644
--- a/snowy-base/snowy-gen/src/main/resources/template/index.vue.vm
+++ b/snowy-base/snowy-gen/src/main/resources/template/index.vue.vm
@@ -124,7 +124,7 @@
 #foreach ($column in $tableField)
 #if(${column.whetherTable} == "Y")
 #if(${column.whetherRetract} == "Y" || ${column.effectType} == 'select' || ${column.effectType} == 'radio' || ${column.effectType} == 'checkbox')
-        <span slot="${column.javaName}scopedSlots" slot-scope="text">
+        <span slot="${column.javaName}ScopedSlots" slot-scope="text">
 #if(${column.whetherRetract} == "Y" && (${column.effectType} == 'select' || ${column.effectType} == 'radio' || ${column.effectType} == 'checkbox'))
           <ellipsis :length="10" tooltip>{{ '${column.dictTypeCode}' | dictType(text) }}</ellipsis>
 #else
@@ -210,7 +210,7 @@
             align: 'center',
 #if(${column.whetherRetract} == "Y" || ${column.effectType} == 'select' || ${column.effectType} == 'radio' || ${column.effectType} == 'checkbox')
             dataIndex: '${column.javaName}',
-            scopedSlots: { customRender: '${column.javaName}scopedSlots' }
+            scopedSlots: { customRender: '${column.javaName}ScopedSlots' }
 #else
             dataIndex: '${column.javaName}'
 #end