Merge remote-tracking branch 'origin/master'

admin-ui/app/whepi/scan/specialPersonnel.js

@@ -105,36 +105,36 @@ define(function (require) {
                                             );
                                         }
                                     },
-                                    {
-                                        text: '保存', iconCls: 'fa fa-pencil-square-o', onClick: function () {
-                                            var row = $grid1.rowData();
-                                            if (!row) {
-                                                $.yvan.msg('请选择一条要保存的数据');
-                                                return;
-                                            }
-                                            var startDateStr = row.startDateStr;
-                                            var endDateStr = row.endDateStr;
-                                            if (startDateStr > endDateStr) {
-                                                $.yvan.msg('开始时间必须小于等于结束时间');
-                                                return;
-                                            }
-                                            $.yvan.ajax({
-                                                url: api('/OutUser/updateOutUser'),
-                                                data: {
-                                                    tuId: row.tuId,
-                                                    startDate: row.startDateStr,
-                                                    endDate: row.endDateStr
-                                                },
-                                                method: 'post',
-                                                async: false,
-                                                success: function (data) {
-                                                    $.yvan.msg("操作成功");
-                                                    $grid1.reload();
-                                                    queryGrid1();
-                                                }
-                                            });
-                                        }
-                                    },
+                                    // {
+                                    //     text: '保存', iconCls: 'fa fa-pencil-square-o', onClick: function () {
+                                    //         var row = $grid1.rowData();
+                                    //         if (!row) {
+                                    //             $.yvan.msg('请选择一条要保存的数据');
+                                    //             return;
+                                    //         }
+                                    //         var startDateStr = row.startDateStr;
+                                    //         var endDateStr = row.endDateStr;
+                                    //         if (startDateStr > endDateStr) {
+                                    //             $.yvan.msg('开始时间必须小于等于结束时间');
+                                    //             return;
+                                    //         }
+                                    //         $.yvan.ajax({
+                                    //             url: api('/OutUser/updateOutUser'),
+                                    //             data: {
+                                    //                 tuId: row.tuId,
+                                    //                 startDate: row.startDateStr,
+                                    //                 endDate: row.endDateStr
+                                    //             },
+                                    //             method: 'post',
+                                    //             async: false,
+                                    //             success: function (data) {
+                                    //                 $.yvan.msg("操作成功");
+                                    //                 $grid1.reload();
+                                    //                 queryGrid1();
+                                    //             }
+                                    //         });
+                                    //     }
+                                    // },
                                     {
                                         text: '删除', iconCls: 'fa fa fa-pencil-square-o fa-lg', onClick: function () {
                                             var row = $grid1.checkedData();
@@ -186,6 +186,28 @@ define(function (require) {
                                                 required: true,
                                                 onChange: function (value) {
                                                     console.log(value)
+                                                    var row = $grid1.rowData();
+                                                    var startDateStr = row.startDateStr;
+                                                    var endDateStr = row.endDateStr;
+                                                    if (startDateStr > endDateStr) {
+                                                        $.yvan.msg('开始时间必须小于等于结束时间');
+                                                        return;
+                                                    } else {
+                                                        $.yvan.ajax({
+                                                            url: api('/OutUser/updateOutUser'),
+                                                            data: {
+                                                                tuId: row.tuId,
+                                                                startDate: row.startDateStr,
+                                                                endDate: row.endDateStr
+                                                            },
+                                                            method: 'post',
+                                                            async: false,
+                                                            success: function (data) {
+                                                                $.yvan.msg("操作成功");
+                                                                return;
+                                                            }
+                                                        });
+                                                    }
                                                 },
                                                 maxlength: 50
                                             }
@@ -194,8 +216,30 @@ define(function (require) {
                                             field: 'endDateStr', title: '结束时间', minWidth: 120, maxWidth: 200, align: 'left', editor: {
                                                 xtype: 'datebox',
                                                 required: true,
-                                                onChange: function (value) {
+                                                onChange: function (value, oldValue) {
                                                     console.log(value)
+                                                    var row = $grid1.rowData();
+                                                    var startDateStr = row.startDateStr;
+                                                    var endDateStr = row.endDateStr;
+                                                    if (startDateStr > endDateStr) {
+                                                        $.yvan.msg('开始时间必须小于等于结束时间');
+                                                        return;
+                                                    } else {
+                                                        $.yvan.ajax({
+                                                            url: api('/OutUser/updateOutUser'),
+                                                            data: {
+                                                                tuId: row.tuId,
+                                                                startDate: row.startDateStr,
+                                                                endDate: row.endDateStr
+                                                            },
+                                                            method: 'post',
+                                                            async: false,
+                                                            success: function (data) {
+                                                                $.yvan.msg("操作成功");
+                                                                return;
+                                                            }
+                                                        });
+                                                    }
                                                 },
                                                 maxlength: 50
                                             }

admin-ui/app/whepi/scan/specialPersonnelLY.js

@@ -105,36 +105,36 @@ define(function (require) {
                                             );
                                         }
                                     },
-                                    {
-                                        text: '保存', iconCls: 'fa fa-pencil-square-o', onClick: function () {
-                                            var row = $grid1.rowData();
-                                            if (!row) {
-                                                $.yvan.msg('请选择一条要保存的数据');
-                                                return;
-                                            }
-                                            var startDateStr = row.startDateStr;
-                                            var endDateStr = row.endDateStr;
-                                            if (startDateStr > endDateStr) {
-                                                $.yvan.msg('开始时间必须小于等于结束时间');
-                                                return;
-                                            }
-                                            $.yvan.ajax({
-                                                url: api('/OutUser/updateOutUser'),
-                                                data: {
-                                                    tuId: row.tuId,
-                                                    startDate: row.startDateStr,
-                                                    endDate: row.endDateStr
-                                                },
-                                                method: 'post',
-                                                async: false,
-                                                success: function (data) {
-                                                    $.yvan.msg("操作成功");
-                                                    $grid1.reload();
-                                                    queryGrid1();
-                                                }
-                                            });
-                                        }
-                                    },
+                                    // {
+                                    //     text: '保存', iconCls: 'fa fa-pencil-square-o', onClick: function () {
+                                    //         var row = $grid1.rowData();
+                                    //         if (!row) {
+                                    //             $.yvan.msg('请选择一条要保存的数据');
+                                    //             return;
+                                    //         }
+                                    //         var startDateStr = row.startDateStr;
+                                    //         var endDateStr = row.endDateStr;
+                                    //         if (startDateStr > endDateStr) {
+                                    //             $.yvan.msg('开始时间必须小于等于结束时间');
+                                    //             return;
+                                    //         }
+                                    //         $.yvan.ajax({
+                                    //             url: api('/OutUser/updateOutUser'),
+                                    //             data: {
+                                    //                 tuId: row.tuId,
+                                    //                 startDate: row.startDateStr,
+                                    //                 endDate: row.endDateStr
+                                    //             },
+                                    //             method: 'post',
+                                    //             async: false,
+                                    //             success: function (data) {
+                                    //                 $.yvan.msg("操作成功");
+                                    //                 $grid1.reload();
+                                    //                 queryGrid1();
+                                    //             }
+                                    //         });
+                                    //     }
+                                    // },
                                     {
                                         text: '删除', iconCls: 'fa fa fa-pencil-square-o fa-lg', onClick: function () {
                                             var row = $grid1.checkedData();
@@ -184,6 +184,28 @@ define(function (require) {
                                                 required: true,
                                                 onChange: function (value) {
                                                     console.log(value)
+                                                    var row = $grid1.rowData();
+                                                    var startDateStr = row.startDateStr;
+                                                    var endDateStr = row.endDateStr;
+                                                    if (startDateStr > endDateStr) {
+                                                        $.yvan.msg('开始时间必须小于等于结束时间');
+                                                        return;
+                                                    } else {
+                                                        $.yvan.ajax({
+                                                            url: api('/OutUser/updateOutUser'),
+                                                            data: {
+                                                                tuId: row.tuId,
+                                                                startDate: row.startDateStr,
+                                                                endDate: row.endDateStr
+                                                            },
+                                                            method: 'post',
+                                                            async: false,
+                                                            success: function (data) {
+                                                                $.yvan.msg("操作成功");
+                                                                return;
+                                                            }
+                                                        });
+                                                    }
                                                 },
                                                 maxlength: 50
                                             }
@@ -194,6 +216,28 @@ define(function (require) {
                                                 required: true,
                                                 onChange: function (value) {
                                                     console.log(value)
+                                                    var row = $grid1.rowData();
+                                                    var startDateStr = row.startDateStr;
+                                                    var endDateStr = row.endDateStr;
+                                                    if (startDateStr > endDateStr) {
+                                                        $.yvan.msg('开始时间必须小于等于结束时间');
+                                                        return;
+                                                    } else {
+                                                        $.yvan.ajax({
+                                                            url: api('/OutUser/updateOutUser'),
+                                                            data: {
+                                                                tuId: row.tuId,
+                                                                startDate: row.startDateStr,
+                                                                endDate: row.endDateStr
+                                                            },
+                                                            method: 'post',
+                                                            async: false,
+                                                            success: function (data) {
+                                                                $.yvan.msg("操作成功");
+                                                                return;
+                                                            }
+                                                        });
+                                                    }
                                                 },
                                                 maxlength: 50
                                             }