diff --git a/WebRoot/Excel/1D9A60A0-5364-4E98-A81F-7FA959E6463B.docx b/WebRoot/Excel/1D9A60A0-5364-4E98-A81F-7FA959E6463B.docx
new file mode 100644
index 00000000..9f8f0eda
Binary files /dev/null and b/WebRoot/Excel/1D9A60A0-5364-4E98-A81F-7FA959E6463B.docx differ
diff --git a/WebRoot/Excel/2A1FC66F-4EA1-4811-B766-90E3A0EF58B8.jpg b/WebRoot/Excel/2A1FC66F-4EA1-4811-B766-90E3A0EF58B8.jpg
new file mode 100644
index 00000000..87e542d4
Binary files /dev/null and b/WebRoot/Excel/2A1FC66F-4EA1-4811-B766-90E3A0EF58B8.jpg differ
diff --git a/WebRoot/Excel/D3D733AD-10C7-4FD3-812A-BFFD72064201.docx b/WebRoot/Excel/D3D733AD-10C7-4FD3-812A-BFFD72064201.docx
new file mode 100644
index 00000000..9f8f0eda
Binary files /dev/null and b/WebRoot/Excel/D3D733AD-10C7-4FD3-812A-BFFD72064201.docx differ
diff --git a/WebRoot/view/tb/form/ayq/modules/formDesignerView.js b/WebRoot/view/tb/form/ayq/modules/formDesignerView.js
index cf8ddc6d..94cff695 100644
--- a/WebRoot/view/tb/form/ayq/modules/formDesignerView.js
+++ b/WebRoot/view/tb/form/ayq/modules/formDesignerView.js
@@ -4727,9 +4727,14 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
                 });
             });
 
+            $(document).on('keydown', 'input', function(e) {                
+                if (e.which == 13) {
+                    e.preventDefault();
+                }
+            });
+
             $("#formSave").on('click', function () {
-                if (options.data.length > 0) {
-                    console.log(JSON.stringify(options.data));
+                if (options.data.length > 0) {                    
                     window.localStorage.setItem('form_json', JSON.stringify(options.data));
                     layer.open({
                         type: 2,
diff --git a/WebRoot/view/tb/form/ayq/modules/staticField.js b/WebRoot/view/tb/form/ayq/modules/staticField.js
index 8ff0b973..3eb58549 100644
--- a/WebRoot/view/tb/form/ayq/modules/staticField.js
+++ b/WebRoot/view/tb/form/ayq/modules/staticField.js
@@ -104,7 +104,6 @@ layui.define(['layer'], function (exports) {
         fieldTypes: [{ text: '文本', value: "1" }
             , { text: '数值', value: '2' }
             , { text: '小数', value: '3' }
-            , { text: '日期', value: '4' }
         ],
         expressions: [{ text: '默认', value: "" }
             , { text: '数字', value: 'number' }
diff --git a/WebRoot/view/tb/form/ayq/modules/staticFieldView.js b/WebRoot/view/tb/form/ayq/modules/staticFieldView.js
index 2377b86d..545168ca 100644
--- a/WebRoot/view/tb/form/ayq/modules/staticFieldView.js
+++ b/WebRoot/view/tb/form/ayq/modules/staticFieldView.js
@@ -104,7 +104,6 @@ layui.define(['layer'], function (exports) {
         fieldTypes: [{ text: '文本', value: "1" }
             , { text: '数值', value: '2' }
             , { text: '小数', value: '3' }
-            , { text: '日期', value: '4' }
         ],
         expressions: [{ text: '默认', value: "" }
             , { text: '数字', value: 'number' }
diff --git a/WebRoot/view/tb/form/view.html b/WebRoot/view/tb/form/view.html
index 758c0a9d..5457a493 100644
--- a/WebRoot/view/tb/form/view.html
+++ b/WebRoot/view/tb/form/view.html
@@ -252,13 +252,12 @@
                   $('#uploader-list-' + res.data[i].input_id).append(
                     '<div id="' + res.data[i].file_id + '" class="file-iteme">' +
                     '<a href="/QingLong/Excel/' + res.data[i].file_id + '.' + res.data[i].suffix + '" target="_blank"><img style="width: 100px;height: 100px;" src=/QingLong/Excel/' + res.data[i].file_id + '.' + res.data[i].suffix + '></a>' +
+                    // '<a href="javascript:void(0)" onclick="testabc()"><img style="width: 100px;height: 100px;" src=/QingLong/Excel/' + res.data[i].file_id + '.' + res.data[i].suffix + '></a>' +
                     '</div>'
                   );
                 }
-
               }
             }
-
           }
         });
 
@@ -266,7 +265,21 @@
           window.location = '/QingLong/collect/getFormJobFile?file_id=' + file_id;
         }
 
-
+        window.testabc = function (image_id) {
+          layer.photos({
+            photos: {
+              "title": "Photos Demo",
+              "start": 0,
+              "data": [
+                {
+                  "alt": "layer",
+                  "pid": 1,
+                  "src": "/QingLong/Excel/" + image_id + ".jpg",
+                }
+              ]
+            }
+          });
+        }
 
         //监听提交
         form.on('submit(demo1)', function (data) {
@@ -363,7 +376,7 @@
 
 
     function getSubmitData() {
-      var data = $('#testdemo').form[0].serialize();      
+      var data = $('#testdemo').form[0].serialize();
       return data;
     }