'commit'

WebRoot/view/tb/form/ayq/modules/formDesigner.js

@@ -1573,8 +1573,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
                  * @param {object} json 变更后的json属性
                  * @param {object} that 实例对象
                  * */
-                update: function (json, that) {
+                update: function (json, that) {                    
-                    console.log(json);
                     var _required = json.required ? 'required' : '';
                     var $block = $('#' + json.id + ' .layui-input-block');
                     var $label = $('#' + json.id + ' .layui-form-label');
@@ -2080,9 +2079,9 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
                     _html += '<label class="layui-form-label {0}"><span style="color:red;">{2}</span>{1}:</label>'.format(json.required ? 'layui-form-required' : '', json.label, json.required ? '*' : '');
                     _html += '<div class="layui-input-block">';
                     _html += '<div class="layui-upload">';
-                    _html += '<button type="button" class="layui-btn layui-btn-normal" id="{0}">选择多文件</button> '.format(json.tag + json.id);
+                    _html += '<button type="button" class="layui-btn" id="{0}">选择文件</button> '.format(json.tag + json.id);
                     _html += ' <div class="layui-upload-list" style="max-width: 1000px;"><table class="layui-table">';
-                    _html += '<colgroup><col><col width="150"><col width="260"><col width="150"></colgroup>';
+                    _html += '<colgroup><col><col width="100"><col width="150"><col width="100"></colgroup>';
                     _html += '<thead><tr><th>文件名</th><th>大小</th><th>上传进度</th><th>操作</th></tr></thead>';
                     _html += '<tbody id="list-{0}"></tbody></table></div>'.format(json.id);
                     _html += '<button type="button" class="layui-btn" id="listAction-{0}">开始上传</button>'.format(json.id);
@@ -4708,8 +4707,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
                 layer.msg('导入成功');
             });
             //注册导出数据
-            $('.exportJson').on('click', function () {
+            $('.exportJson').on('click', function () {                
-                console.log(JSON.stringify(options.data));
                 document.getElementById('generate-code-view').value = JSON.stringify(options.data, null, 4);
 
                 layer.open({
@@ -4884,8 +4882,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
                     that.components[item.tag].update(item, that);
                     continue;
                 }
-                var item = that.findJsonItem(options.data, key);
+                var item = that.findJsonItem(options.data, key);                
-                console.log(item);
                 if (item === undefined) {
                     continue;
                 }
@@ -4926,7 +4923,9 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
             //获取表单区域所有值
             // var json = form.val(that.config.formId);
 
-            var json = form.val();            
+            var json = form.val();
+
+            
 
             for (let key in iceEditorObjects) {
                 json[key] = iceEditorObjects[key].getHTML();
@@ -5005,8 +5004,8 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele
                     , options = that.config;
                 options.elem = $(options.elem);
                 options.id = options.id || options.elem.attr('id') || that.index;
-                // options.elem.html('<form  class="layui-form  layui-form-pane mainBox" style="height:100%;" id="{0}" lay-filter="{0}"></form>'.format(options.formId));
+                options.elem.html('<form  class="layui-form  layui-form-pane" style="height:100%;" id="{0}" lay-filter="{0}"></form>'.format(options.formId));
-                options.elem.html('<div class="layui-form-pane mainBox" id="{0}"></div>'.format(options.formId));
+                // options.elem.html('<div class="layui-form-pane mainBox" id="{0}"></div>'.format(options.formId));
                 that.renderViewForm();
             } else {
                 var elem = $('#formDesignerForm');

WebRoot/view/tb/form/ayq/modules/staticField.js

@@ -222,14 +222,14 @@ layui.define(['layer'], function (exports) {
             '        </div>\n' +
             '    </div>\n' +
             '</div>',
-        // formDefaultButton: '<div class="layui-form-item">\n' +
+        formDefaultButton: '<div class="layui-form-item">\n' +
-        //     '    <div class="layui-input-block">\n' +
+            '    <div class="layui-input-block">\n' +
-        //     '        <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">提交</button>\n' +
+            '        <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">提交</button>\n' +
-        //     '        <button type="reset" class="layui-btn layui-btn-primary">重置</button>\n' +
+            '        <button type="reset" class="layui-btn layui-btn-primary">重置</button>\n' +
-        //     '    </div>\n' +
+            '    </div>\n' +
-        //     '</div>',
+            '</div>',
         
-        formDefaultButton: '',
+        // formDefaultButton: '',
         // formDefaultButton: ' <div class="bottom">\n' +
         //     '<div class="button-container">\n' +
         //     '    <button type="submit" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="demo1">\n' +

WebRoot/view/tb/form/report.html

@@ -39,20 +39,20 @@
 </head>
 
 <body>
-  <form class="layui-form" action="">
+  <!-- <form class="layui-form" action=""> -->
-    <div id="testdemo">
+  <div id="testdemo" style="margin: 10px 10px;">
 
-    </div>
+  </div>
-    <div class="bottom">
+  <!-- <div class="bottom">
       <div class="button-container">
         <button type="submit" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="demo1">
           <i class="layui-icon layui-icon-ok"></i>
           提交
         </button>
       </div>
-    </div>
+    </div> -->
 
-  </form>
+  <!-- </form> -->
 
   <script type="text/javascript" src="./layui/layui.js"></script>
   <script type="text/javascript" src="./ayq/modules/Sortable/Sortable.js"> </script>
@@ -136,7 +136,8 @@
               upload.render({
                 elem: '#' + filesData[i].select
                 , elemList: $('#list-' + filesData[i].select.substring(4)) //列表元素对象
-                , url: 'https://httpbin.org/post'
+                , url: '/QingLong/collect/uploadFile'
+                , data: { job_id: jobId, input_id: filesData[i].select.substring(4) }
                 , accept: 'file'
                 , multiple: true
                 , number: 3
@@ -145,7 +146,7 @@
                 , choose: function (obj) {
                   var that = this;
                   var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
-                  console.log(obj);
+                  console.log(that);
                   //读取本地文件
                   obj.preview(function (index, file, result) {
                     var tr = $(['<tr id="upload-' + index + '">'
@@ -204,9 +205,43 @@
           }
         });
 
+
+        //获取表单数据
+        $.ajax({
+          url: "/QingLong/collect/getFormFillJob?job_id=" + jobId,
+          async: false,
+          type: 'GET',
+          dataType: "json",
+          success: function (res) {
+            render.setFormData(res);
+          }
+        });
+
+        //获取图片和文件数据
+        $.ajax({
+          url: "/QingLong/collect/getJobUploadList?job_id=" + jobId,
+          async: false,
+          type: 'GET',
+          success: function (res) {
+            if (res.data.length > 0) {
+              for (var i = 0; i < res.data.length; i++) {
+                $('#uploader-list-' + res.data[i].input_id).append(
+                  '<div id="" class="file-iteme">' +
+                  '<div class="handle"><i class="layui-icon layui-icon-delete"></i></div>' +
+                  '<img style="width: 100px;height: 100px;" src=/QingLong/Excel/' + res.data[i].file_id + '.' + res.data[i].suffix + '>' +
+                  '</div>'
+                );
+                console.log(res.data[i]);
+              }
+            }
+
+          }
+        });
+
+
         //监听提交
         form.on('submit(demo1)', function (data) {
-          var json = render.getFormData();          
+          var json = render.getFormData();
           $.ajax({
             url: '/QingLong/collect/saveFormJob',
             type: 'post',

WebRoot/view/tb/school/task_list.html

@@ -123,7 +123,7 @@
                         title: '填报',
                         offset: 'r',
                         anim: 'slideLeft',
-                        area: ['650px', '100%'],
+                        area: ['750px', '100%'],
                         shade: 0.1,
                         shadeClose: true,
                         content: "../form/report.html?job_id=" + obj.data.job_id