'commit'

WebRoot/view/tb/org/fields_set.html

@@ -66,7 +66,7 @@
                         {{#  layui.each(d, function(index, item){ }}
                             <li lay-options="{ id: '{{item.sheet_index}}',table_name:'{{item.table_name}}' }" class="{{ index == 0 ? 'layui-menu-item-checked' : '' }}" >
                                 <div class="layui-menu-body-title">
-                                    <a href="javascript:;">{{item.sheet_index}}. {{item.sheet_name}}</a>
+                                    <a href="javascript:;">{{item.number}}. {{item.sheet_name}}</a>
                                    
                                         <i id="ico{{item.sheet_index}}" class="layui-icon layui-icon-ok-circle {{ item.is_check == 0 ? 'dh_ico' : '' }}"
                                             style="font-size: 18px; color: #04B543;margin-top: -10px;" ></i>
@@ -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);