diff --git a/WebRoot/Excel/a7d69728-86bc-4fdf-a374-c88582801482.xlsx b/WebRoot/Excel/a7d69728-86bc-4fdf-a374-c88582801482.xlsx new file mode 100644 index 00000000..02fadf77 Binary files /dev/null and b/WebRoot/Excel/a7d69728-86bc-4fdf-a374-c88582801482.xlsx differ diff --git a/WebRoot/view/jrgl/xtgl/add.html b/WebRoot/view/jrgl/xtgl/add.html index 31de9a04..4798d91f 100644 --- a/WebRoot/view/jrgl/xtgl/add.html +++ b/WebRoot/view/jrgl/xtgl/add.html @@ -131,8 +131,7 @@ time: 2000 }); return false; - } - console.log(isIPorDomain(_ip)); + } ipArray.push(_ip); }); var ip = ipArray.join(','); diff --git a/WebRoot/view/tb/dis/publish_person.html b/WebRoot/view/tb/dis/publish_person.html index 58e4a925..49a982b2 100644 --- a/WebRoot/view/tb/dis/publish_person.html +++ b/WebRoot/view/tb/dis/publish_person.html @@ -312,9 +312,7 @@ publishData.groupIds = groupIds.join(","); publishData.deadline_time = data.field.deadline_time; publishData.memo = data.field.memo; - publishData.status_code = statusCode; - - console.log(publishData); + publishData.status_code = statusCode; $.ajax({ url: '/QingLong/collect/ForwardJob', diff --git a/WebRoot/view/tb/dis/task_list_y.html b/WebRoot/view/tb/dis/task_list_y.html index 46debe83..8c54902b 100644 --- a/WebRoot/view/tb/dis/task_list_y.html +++ b/WebRoot/view/tb/dis/task_list_y.html @@ -175,8 +175,7 @@ icon: 3, title: '提示' }, function (index) { - layer.close(index); - console.log(obj.data); + layer.close(index); $.ajax({ url: '/QingLong/collect/setForwardFinish', type: 'post', diff --git a/WebRoot/view/tb/exportPdf.html b/WebRoot/view/tb/exportPdf.html index 738d1146..75dccc71 100644 --- a/WebRoot/view/tb/exportPdf.html +++ b/WebRoot/view/tb/exportPdf.html @@ -36,9 +36,7 @@ $(document).attr("title", "查看"); - var data = { "url": _url }; - - console.log(data); + var data = { "url": _url }; var pdfTpl = pdfScript.innerHTML, pdfView = document.getElementById('pdfView'); diff --git a/WebRoot/view/tb/form/report.html b/WebRoot/view/tb/form/report.html index 981ab08e..985e3cc3 100644 --- a/WebRoot/view/tb/form/report.html +++ b/WebRoot/view/tb/form/report.html @@ -276,8 +276,7 @@ //监听提交 form.on('submit(demo1)', function (data) { - var json = render.getFormData(); - console.log(json); + var json = render.getFormData(); $.ajax({ url: '/QingLong/collect/saveFormJob', type: 'post', @@ -371,8 +370,7 @@ function getSubmitData() { - var data = $('#testdemo').form[0].serialize(); - console.log(data); + var data = $('#testdemo').form[0].serialize(); return data; } diff --git a/WebRoot/view/tb/form/report_p.html b/WebRoot/view/tb/form/report_p.html index 11d01217..71edf85a 100644 --- a/WebRoot/view/tb/form/report_p.html +++ b/WebRoot/view/tb/form/report_p.html @@ -301,8 +301,7 @@ //监听提交 form.on('submit(demo1)', function (data) { - var json = render.getFormData(); - console.log(json); + var json = render.getFormData(); $.ajax({ url: '/QingLong/collect/saveFormJob', type: 'post', @@ -396,8 +395,7 @@ function getSubmitData() { - var data = $('#testdemo').form[0].serialize(); - console.log(data); + var data = $('#testdemo').form[0].serialize(); return data; } diff --git a/WebRoot/view/tb/form/report_p_mobile.html b/WebRoot/view/tb/form/report_p_mobile.html index 961ddbb4..f6876416 100644 --- a/WebRoot/view/tb/form/report_p_mobile.html +++ b/WebRoot/view/tb/form/report_p_mobile.html @@ -309,8 +309,7 @@ //监听提交 form.on('submit(demo1)', function (data) { - var json = render.getFormData(); - console.log(json); + var json = render.getFormData(); $.ajax({ url: '/QingLong/collect/saveFormJob', type: 'post', @@ -403,8 +402,7 @@ function getSubmitData() { - var data = $('#testdemo').form[0].serialize(); - console.log(data); + var data = $('#testdemo').form[0].serialize(); return data; } diff --git a/WebRoot/view/tb/form/view.html b/WebRoot/view/tb/form/view.html index 1a405b1d..758c0a9d 100644 --- a/WebRoot/view/tb/form/view.html +++ b/WebRoot/view/tb/form/view.html @@ -363,8 +363,7 @@ function getSubmitData() { - var data = $('#testdemo').form[0].serialize(); - console.log(data); + var data = $('#testdemo').form[0].serialize(); return data; } diff --git a/WebRoot/view/tb/form/view_bureau.html b/WebRoot/view/tb/form/view_bureau.html index 9922cadf..167a8128 100644 --- a/WebRoot/view/tb/form/view_bureau.html +++ b/WebRoot/view/tb/form/view_bureau.html @@ -333,8 +333,7 @@ function getSubmitData() { - var data = $('#testdemo').form[0].serialize(); - console.log(data); + var data = $('#testdemo').form[0].serialize(); return data; } diff --git a/WebRoot/view/tb/form/view_mobile.html b/WebRoot/view/tb/form/view_mobile.html index ade3bd46..7879078a 100644 --- a/WebRoot/view/tb/form/view_mobile.html +++ b/WebRoot/view/tb/form/view_mobile.html @@ -372,8 +372,7 @@ function getSubmitData() { - var data = $('#testdemo').form[0].serialize(); - console.log(data); + var data = $('#testdemo').form[0].serialize(); return data; } diff --git a/WebRoot/view/tb/org/fields_set.html b/WebRoot/view/tb/org/fields_set.html index 51941a64..bb928dbb 100644 --- a/WebRoot/view/tb/org/fields_set.html +++ b/WebRoot/view/tb/org/fields_set.html @@ -66,7 +66,7 @@ {{# layui.each(d, function(index, item){ }}
  • - {{item.sheet_name}} + {{item.number}}. {{item.sheet_name}} @@ -133,6 +133,8 @@ var initSheetIndex = 0; + var saveFlag = true; + //获取sheet列表 $.ajax({ type: 'GET', @@ -230,6 +232,7 @@ success: function (result) { if (result.success) { $('#ico' + initSheetIndex).removeClass('dh_ico'); + saveFlag = true; layer.msg("确认成功！", { icon: 1, time: 1500 @@ -263,13 +266,20 @@ time: 1500, }); } else { - layer.open({ - type: 2, - title: '保存任务', - shade: 0.1, - area: ['450px', '230px'], - content: './save_excel.html?job_id=' + jobId - }); + if (!saveFlag) { + layer.msg('有未确认的sheet表，请确认后再保存！', { + icon: 2, + time: 1500, + }); + } else { + layer.open({ + type: 2, + title: '保存任务', + shade: 0.1, + area: ['450px', '230px'], + content: './save_excel.html?job_id=' + jobId + }); + } } } }); @@ -282,13 +292,15 @@ //监听单元格编辑 table.on('edit(setField)', function (obj) { + saveFlag = false; + $('#ico' + initSheetIndex).addClass('dh_ico'); var field = obj.field; if (field == "column_name") { var regex = /^(?![_0-9])[a-z0-9_]{2,32}$/i; - var cellElem = obj.tr.find('td[data-field="column_name"]'); + var cellElem = obj.tr.find('td[data-field="column_name"]'); if (regex.test(obj.value)) { var _index = errArr.indexOf(obj.index); errArr.splice(_index, 1); @@ -298,7 +310,7 @@ errArr.push(obj.index); } layer.msg('刚修改的字段名称不正确，请重新修改！', { - icon: 3, + icon: 2, time: 2000 }); cellElem.addClass('err_border'); diff --git a/WebRoot/view/tb/org/upload_excel.html b/WebRoot/view/tb/org/upload_excel.html index f338f3d3..b3529d5f 100644 --- a/WebRoot/view/tb/org/upload_excel.html +++ b/WebRoot/view/tb/org/upload_excel.html @@ -81,8 +81,7 @@ elem: '#upload-excel', url: '/QingLong/collect/uoloadTemplate', exts: 'xlsx', - done: function (res) { - console.log(res); + done: function (res) { layer.msg("上传成功！", { icon: 1, time: 1500 diff --git a/WebRoot/view/ywgl/bmwh/index.html b/WebRoot/view/ywgl/bmwh/index.html index bee79135..16943e3f 100644 --- a/WebRoot/view/ywgl/bmwh/index.html +++ b/WebRoot/view/ywgl/bmwh/index.html @@ -113,8 +113,7 @@ success: function (data) { if (data.code == 0) { for (var i = 0; i < data.data.length; i++) data.data[i].name = data.data[i].org_name; - var zNodes = data.data; - console.log(data.data); + var zNodes = data.data; $.fn.zTree.init($("#mytree"), setting1, zNodes); var treeObj = $.fn.zTree.getZTreeObj("mytree"); treeObj.expandAll(true); diff --git a/WebRoot/view/ywgl/jzwh/index.html b/WebRoot/view/ywgl/jzwh/index.html index 72280348..bc8099b4 100644 --- a/WebRoot/view/ywgl/jzwh/index.html +++ b/WebRoot/view/ywgl/jzwh/index.html @@ -185,8 +185,7 @@ success: function (res) { if (res.data.length > 0) { $('#add').prop('disabled', true); - } else { - console.log(111) + } else { $('#add').prop('disabled', false); } var classTpl = classScript.innerHTML; diff --git a/WebRoot/view/ywgl/rywh/index.html b/WebRoot/view/ywgl/rywh/index.html index 1fdb4740..6f3bc4aa 100644 --- a/WebRoot/view/ywgl/rywh/index.html +++ b/WebRoot/view/ywgl/rywh/index.html @@ -376,8 +376,7 @@ }); } - window.updateLoginName = function (obj) { - console.log(obj); + window.updateLoginName = function (obj) { layer.open({ type: 2, title: '修改登录名', diff --git a/WebRoot/view/ywgl/xswh/add.html b/WebRoot/view/ywgl/xswh/add.html index c66fe7e5..5cf2ac92 100644 --- a/WebRoot/view/ywgl/xswh/add.html +++ b/WebRoot/view/ywgl/xswh/add.html @@ -242,8 +242,7 @@ var year = idNumber.substring(6, 10); var month = idNumber.substring(10, 12); var day = idNumber.substring(12, 14); - var date = year + "-" + month + "-" + day; - console.log(date); + var date = year + "-" + month + "-" + day; if (date.length != 10) { date = ""; } diff --git a/WebRoot/view/ywgl/xswh/changeClass.html b/WebRoot/view/ywgl/xswh/changeClass.html index 17424ee2..c450cdea 100644 --- a/WebRoot/view/ywgl/xswh/changeClass.html +++ b/WebRoot/view/ywgl/xswh/changeClass.html @@ -135,8 +135,7 @@ success: function (res) { if (res.data.length > 0) { $('#add').prop('disabled', true); - } else { - console.log(111) + } else { $('#add').prop('disabled', false); } var classTpl = classScript.innerHTML; diff --git a/WebRoot/view/ywgl/xswh/index.html b/WebRoot/view/ywgl/xswh/index.html index c860144f..b68f79d3 100644 --- a/WebRoot/view/ywgl/xswh/index.html +++ b/WebRoot/view/ywgl/xswh/index.html @@ -223,8 +223,7 @@ success: function (res) { if (res.data.length > 0) { $('#add').prop('disabled', true); - } else { - console.log(111) + } else { $('#add').prop('disabled', false); } var classTpl = classScript.innerHTML;