diff --git a/WebRoot/Excel/9dba0aa6-10be-40b6-81cc-291184e46a11.xlsx b/WebRoot/Excel/9dba0aa6-10be-40b6-81cc-291184e46a11.xlsx new file mode 100644 index 00000000..6b6ca485 Binary files /dev/null and b/WebRoot/Excel/9dba0aa6-10be-40b6-81cc-291184e46a11.xlsx differ diff --git a/WebRoot/Excel/be4f5283-17a6-4e13-ad23-23ba134fc15c.xlsx b/WebRoot/Excel/be4f5283-17a6-4e13-ad23-23ba134fc15c.xlsx new file mode 100644 index 00000000..1505783c Binary files /dev/null and b/WebRoot/Excel/be4f5283-17a6-4e13-ad23-23ba134fc15c.xlsx differ diff --git a/WebRoot/Excel/fdea2bd3-91ba-464d-b56f-3a2f20e1065c.xlsx b/WebRoot/Excel/fdea2bd3-91ba-464d-b56f-3a2f20e1065c.xlsx new file mode 100644 index 00000000..1505783c Binary files /dev/null and b/WebRoot/Excel/fdea2bd3-91ba-464d-b56f-3a2f20e1065c.xlsx differ diff --git a/WebRoot/view/tb/org/fields_set.html b/WebRoot/view/tb/org/fields_set.html index 783cef5c..4327db5c 100644 --- a/WebRoot/view/tb/org/fields_set.html +++ b/WebRoot/view/tb/org/fields_set.html @@ -186,6 +186,7 @@ var value = this.value; var data = table.getRowData(options.id, this); data.data_type_id = value; + $('#ico' + initSheetIndex).addClass('dh_ico'); }); form.on('switch(requiredSwitch)', function (obj) { @@ -195,6 +196,7 @@ } else { data.allow_blank = 1; } + $('#ico' + initSheetIndex).addClass('dh_ico'); }); } }); @@ -276,24 +278,26 @@ //监听单元格编辑 table.on('edit(setField)', function (obj) { - var field = obj.field; - - var regex = /^[a-z][a-z0-9]{0,31}$/; - 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); - console.log('变量值符合正则表达式'); - cellElem.css('color', ''); - } else { - if (!errArr.includes(obj.index)) { - errArr.push(obj.index); - } - console.log('变量值不符合正则表达式'); - cellElem.css('color', 'red'); - } - - console.log('修改的字段为' + obj.field + '
' + '修改的值为' + obj.value + '
' + JSON.stringify(obj.data)); + + $('#ico' + initSheetIndex).addClass('dh_ico'); + // var field = obj.field; + + // var regex = /^[a-z][a-z0-9]{0,31}$/; + // 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); + // console.log('变量值符合正则表达式'); + // cellElem.css('color', ''); + // } else { + // if (!errArr.includes(obj.index)) { + // errArr.push(obj.index); + // } + // console.log('变量值不符合正则表达式'); + // cellElem.css('color', 'red'); + // } + + // console.log('修改的字段为' + obj.field + '
' + '修改的值为' + obj.value + '
' + JSON.stringify(obj.data)); }); //菜单的点击事件 diff --git a/WebRoot/view/tb/org/task_list.html b/WebRoot/view/tb/org/task_list.html index 74a05f65..61c0d886 100644 --- a/WebRoot/view/tb/org/task_list.html +++ b/WebRoot/view/tb/org/task_list.html @@ -74,7 +74,7 @@ - {{# } }} + {{# } }} {{# if(d.publish_state === 1){ }} @@ -164,13 +164,23 @@ }); window.publish = function (obj) { - layer.open({ - type: 2, - title: '发布任务', - shade: 0.1, - area: ['860px', '730px'], - content: './publish.html?job_id=' + obj.data.job_id - }); + if (obj.data.already_check_sheet === obj.data.all_sheet) { + layer.open({ + type: 2, + title: '发布任务', + shade: 0.1, + area: ['860px', '730px'], + content: './publish.html?job_id=' + obj.data.job_id + }); + + } + else { + layer.msg('该任务有未确认的Sheet表,请在修改中进行确认!', { + icon: 3, + time: 3000 + }); + } + } window.update = function (obj) { @@ -257,7 +267,7 @@ area: ['450px', '250px'], content: './format_select.html' }); - } + } window.refresh = function (param) { table.reload('data-table');