Bläddra i källkod

git-svn-id: https://192.168.57.71/svn/jsgkj@1557 931142cf-59ea-a443-aa0e-51397b428577

ld_lixh 8 år sedan
förälder
incheckning
e22953f9f8

+ 1 - 1
gkaqv2/trunk/modules/web/src/main/webapp/static/css/common/main.css

@@ -329,4 +329,4 @@ input[type=radio], input[type=checkbox] {
 .page-content-grid {
   padding:0px 8px 0px 8px;
   margin:0px auto;
-}
+}

+ 6 - 5
gkaqv2/trunk/modules/web/src/main/webapp/static/jquery-easyui-1.5/themes/default/easyui.css

@@ -59,7 +59,7 @@
   display: inline-block;
   width: 16px;
   height: 16px;
-  opacity: 0.6;
+  opacity: 0.4;
   filter: alpha(opacity=60);
   margin: 0 0 0 2px;
   vertical-align: top;
@@ -130,7 +130,7 @@
   font-weight: bold;
   color: #0E2D5F;
   height: 16px;
-  line-height: 16px;
+  line-height: 35px;
 }
 .panel-footer {
   border: 1px solid #95B8E7;
@@ -190,6 +190,7 @@
 .window .window-header {
   background: transparent;
   padding: 0px 0px 6px 0px;
+  height: 35px;
 }
 .window .window-body {
   border-width: 1px;
@@ -252,16 +253,16 @@
 }
 .window,
 .window .window-body {
-  border-color: #95B8E7;
+      border-color: rgba(149, 184, 231, 0);
 }
 .window {
-  background-color: #E0ECFF;
+  /* background-color: #E0ECFF;
   background: -webkit-linear-gradient(top,#EFF5FF 0,#E0ECFF 20%);
   background: -moz-linear-gradient(top,#EFF5FF 0,#E0ECFF 20%);
   background: -o-linear-gradient(top,#EFF5FF 0,#E0ECFF 20%);
   background: linear-gradient(to bottom,#EFF5FF 0,#E0ECFF 20%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#EFF5FF,endColorstr=#E0ECFF,GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#EFF5FF,endColorstr=#E0ECFF,GradientType=0); */
 }
 .window-proxy {
   border: 1px dashed #95B8E7;

+ 96 - 0
gkaqv2/trunk/modules/web/src/main/webapp/static/js/common/bootstrap-table/bootstrap-table.css

@@ -0,0 +1,96 @@
+.table {
+	margin-bottom: 0;
+	border-bottom: 1px solid #dddddd;
+	border-collapse: separate;
+	*border-collapse: collapse;
+}
+
+.fixed-table-container {
+	position: relative;
+	padding-top: 38px;
+	border: 1px solid #dddddd;
+	border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+}
+
+.fixed-table-header {
+	height: 38px;
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	border-bottom: 1px solid #dddddd;
+	border-radius: 4px 4px 0 0;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+}
+
+.fixed-table-body {
+	overflow-x: hidden;
+	overflow-y: auto;
+	height: 100%;
+}
+
+.fixed-table-body table {
+	width: 100%;
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+
+.fixed-table-body thead th {
+	height: 0;
+	padding: 0;
+	margin: 0;
+	border: none;
+}
+
+.fixed-table-body thead th .th-inner {
+	position: absolute;
+	top: 0;
+	padding: 8px;
+	line-height: 22px;
+	vertical-align: top;
+	border-left: 1px solid #dddddd;
+}
+
+.fixed-table-body thead th:first-child .th-inner {
+	border-left: none;
+	border-top-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+}
+
+.fixed-table-body tbody td {
+	border-left: 1px solid #dddddd;
+}
+
+.fixed-table-body tbody td:first-child {
+	border-left: none;
+}
+
+.fixed-table-body .checkbox {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.fixed-table-pagination .pagination-info {
+    line-height: 34px;
+}
+
+.fixed-table-pagination .page-list {
+    float: right;
+    margin-right: 10px;
+}
+
+.fixed-table-pagination li.disabled a {
+    pointer-events: none;
+    cursor: default;
+}
+
+/* support bootstrap 3 */
+.table thead>tr>th {
+	padding: 0;
+	margin: 0;
+	border: none;
+}

+ 583 - 0
gkaqv2/trunk/modules/web/src/main/webapp/static/js/common/bootstrap-table/bootstrap-table.js

@@ -0,0 +1,583 @@
+/**
+ * @author zhixin wen <wenzhixin2010@gmail.com>
+ * version: 1.0.1
+ */
+
+!function ($) {
+
+    'use strict';
+
+    // TOOLS DEFINITION
+    // ======================
+
+    // it only does '%s', and return '' when arguments are undefined
+    var sprintf = function(str) {
+        var args = arguments,
+            flag = true,
+            i = 1;
+
+        str = str.replace(/%s/g, function() {
+            var arg = args[i++];
+
+            if (typeof arg === 'undefined') {
+                flag = false;
+                return '';
+            }
+            return arg;
+        });
+        if (flag) {
+            return str;
+        }
+        return '';
+    };
+
+    // BOOTSTRAP TABLE CLASS DEFINITION
+    // ======================
+
+    var BootstrapTable = function(el, options) {
+        this.options = options;
+        this.$el = $(el);
+        this.$el_ = this.$el.clone();
+
+        this.init();
+    };
+
+    BootstrapTable.DEFAULTS = {
+        classes: 'table table-hover',
+        height: undefined,
+        undefinedText: '-',
+        sortName: undefined,
+        sortOrder: 'asc',
+        striped: false,
+        columns: [],
+        data: [],
+        method: 'get',
+        url: undefined,
+        queryParams: {},
+        pagination: false,
+        sidePagination: 'client', // client or server
+        totalRows: 0, // server side need to set
+        pageNumber: 1,
+        pageSize: 10,
+        pageList: [10, 20, 30, 40, 50],
+
+        onClickRow: function(item) {return false;},
+        onSort: function(name, order) {return false;},
+        onCheck: function(row) {return false;},
+        onUncheck: function(row) {return false;},
+        onCheckAll: function(rows) {return false;},
+        onUncheckAll: function(rows) {return false;}
+    };
+
+    BootstrapTable.prototype.init = function() {
+        this.initContainer();
+        this.initHeader();
+        this.initData();
+        this.initPagination();
+        this.initBody();
+        this.initServer();
+    };
+
+    BootstrapTable.prototype.initContainer = function() {
+        this.$container = $([
+            '<div class="fixed-table-container">',
+                '<div class="fixed-table-header"></div>',
+                '<div class="fixed-table-body"></div>',
+                '<div class="fixed-table-pagination"></div>',
+            '</div>'].join(''));
+        this.$container.insertAfter(this.$el);
+        this.$container.find('.fixed-table-body').append(this.$el);
+        this.$container.after('<div class="clearfix"></div>');
+
+        if (this.options.height) {
+            this.$container.css('height', this.options.height + 'px');
+        }
+        this.$el.addClass(this.options.classes);
+        if (this.options.striped) {
+            this.$el.addClass('table-striped');
+        }
+    };
+
+    BootstrapTable.prototype.initHeader = function() {
+        var that = this,
+            columns = [],
+            html = [];
+
+        this.$header = this.$el.find('thead');
+        if (!this.$header.length) {
+            this.$header = $('<thead></thead>').appendTo(this.$el);
+        }
+        if (!this.$header.find('tr').length) {
+            this.$header.append('<tr></tr>');
+        }
+        this.$header.find('th').each(function() {
+            var column = $.extend({}, {
+                title: $(this).text()
+            }, $(this).data());
+
+            columns.push(column);
+        });
+        this.options.columns = $.extend(columns, this.options.columns);
+
+        this.header = {
+            fields: [],
+            styles: [],
+            formatters: [],
+            sorters: []
+        };
+        $.each(this.options.columns, function(i, column) {
+            var text = '',
+                style = sprintf('text-align: %s; ', column.align) + sprintf('vertical-align: %s; ', column.valign),
+                order = that.options.sortOrder || column.order || 'asc';
+
+            that.header.fields.push(column.field);
+            that.header.styles.push(style);
+            that.header.formatters.push(column.formatter);
+            that.header.sorters.push(column.sorter);
+
+            style = sprintf('width: %spx; ', column.checkbox || column.radio ? 36 : column.width);
+            style += column.sortable ? 'cursor: pointer; ' : '';
+
+            html.push('<th' + sprintf(' style="%s"', style) + '>');
+            html.push('<div class="th-inner">');
+
+            text = column.title;
+            if (that.options.sortName === column.field && column.sortable) {
+                text += that.getCaretHtml();
+            }
+
+            if (column.checkbox) {
+                text = '<input name="btSelectAll" type="checkbox" class="checkbox" />';
+                that.header.stateField = column.field;
+            }
+            if (column.radio) {
+                text = '';
+                that.header.stateField = column.field;
+            }
+
+            html.push(text);
+            html.push('</div>');
+            html.push('</th>');
+        });
+
+        this.$header.find('tr').html(html.join(''));
+        this.$header.find('th').each(function(i) {
+            $(this).data(columns[i]);
+
+            if (columns[i].sortable) {
+                $(this).click($.proxy(that.onSort, that));
+            }
+        });
+        this.$selectAll = this.$header.find('[name="btSelectAll"]');
+        this.$selectAll.off('click').on('click', function() {
+            var checked = $(this).prop('checked');
+            that[checked ? 'checkAll' : 'uncheckAll']();
+        });
+    };
+
+    BootstrapTable.prototype.initData = function(data, append) {
+        if (append) {
+            this.data = this.data.concat(data);
+        } else {
+            this.data = data || this.options.data;
+        }
+
+        this.initSort();
+    };
+
+    BootstrapTable.prototype.initSort = function() {
+        var name = this.options.sortName,
+            order = this.options.sortOrder === 'desc' ? -1 : 1,
+            index = $.inArray(this.options.sortName, this.header.fields);
+
+        if (index !== -1) {
+            var sorter = this.header.sorters[index];
+            this.data.sort(function(a, b) {
+                if (typeof sorter === 'function') {
+                    return order * sorter(a[name], b[name]);
+                }
+                if (typeof sorter === 'string') {
+                    return order * eval(sorter + '(a[name], b[name])'); // eval ?
+                }
+                if (a[name] === b[name]) {
+                    return 0;
+                }
+                if (a[name] < b[name]) {
+                    return order * -1;
+                }
+                return order;
+            });
+        }
+    };
+
+    BootstrapTable.prototype.onSort = function(event) {
+        var $this = $(event.currentTarget);
+
+        this.$header.find('span.order').remove();
+        this.options.sortName = $this.data('field');
+        this.options.sortOrder = $this.data('order') === 'asc' ? 'desc' : 'asc';
+        this.options.onSort(this.options.sortName, this.options.sortOrder);
+
+        $this.data('order', this.options.sortOrder);
+        $this.find('.th-inner').append(this.getCaretHtml());
+
+        this.initSort();
+        this.initBody();
+    };
+
+    BootstrapTable.prototype.initPagination = function() {
+        if (!this.options.pagination) {
+            return;
+        }
+
+        this.$pagination = this.$container.find('.fixed-table-pagination');
+
+        if (this.options.sidePagination === 'client') {
+            this.options.totalRows = this.data.length;
+        }
+        this.updatePagination();
+    };
+
+    BootstrapTable.prototype.updatePagination = function() {
+        var that = this,
+            html = [],
+            i, from, to,
+            $pageList,
+            $first, $pre,
+            $next, $last,
+            $number;
+
+        this.totalPages = 0;
+        if (this.options.totalRows) {
+            this.totalPages = ~~((this.options.totalRows - 1) / this.options.pageSize) + 1;
+        }
+        if (this.totalPages > 0 && this.options.pageNumber > this.totalPages) {
+            this.options.pageNumber = this.totalPages;
+        }
+        this.pageFrom = (this.options.pageNumber - 1) * this.options.pageSize + 1;
+        this.pageTo = this.options.pageNumber * this.options.pageSize;
+        if (this.pageTo > this.options.totalRows) {
+            this.pageTo = this.options.totalRows;
+        }
+        html.push(
+            '<div class="pull-left pagination">',
+                '<div class="pagination-info">',
+                    sprintf('Showing %s to %s of %s rows', this.pageFrom, this.pageTo, this.options.totalRows),
+                '</div>',
+            '</div>',
+            '<div class="pull-right">',
+                '<ul class="pagination">',
+                    '<li class="page-first"><a href="javascript:void(0)">&lt;&lt;</a></li>',
+                    '<li class="page-pre"><a href="javascript:void(0)">&lt;</a></li>');
+
+        if (this.totalPages < 5) {
+            from = 1;
+            to = this.totalPages;
+        } else {
+            from = this.options.pageNumber - 2;
+            to = from + 4;
+            if (from < 1) {
+                from = 1;
+                to = 5;
+            }
+            if (to > this.totalPages) {
+                to = this.totalPages;
+                from = to - 4;
+            }
+        }
+        for (i = from; i <= to; i++) {
+            html.push('<li class="page-number' + (i === this.options.pageNumber ? ' active' : '') + '">',
+                '<a href="javascript:void(0)">', i ,'</a>',
+                '</li>');
+        }
+
+        html.push(
+                    '<li class="page-next"><a href="javascript:void(0)">&gt;</a></li>',
+                    '<li class="page-last"><a href="javascript:void(0)">&gt;&gt;</a></li>',
+                '</ul>',
+            '</div>');
+
+        html.push(
+            '<div class="pagination btn-group dropup page-list">',
+                '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
+                    this.options.pageSize,
+                    ' <span class="caret"></span>',
+                '</button>',
+                '<ul class="dropdown-menu" role="menu">');
+        $.each(this.options.pageList, function(i, page) {
+            var active = page === that.options.pageSize ? ' class="active"' : '';
+            html.push(sprintf('<li%s><a href="javascript:void(0)">%s</a></li>', active, page));
+        });
+        html.push(
+                '</ul>',
+            '</div>');
+
+        this.$pagination.html(html.join(''));
+
+        $pageList = this.$pagination.find('.page-list a');
+        $first = this.$pagination.find('.page-first');
+        $pre = this.$pagination.find('.page-pre');
+        $next = this.$pagination.find('.page-next');
+        $last = this.$pagination.find('.page-last');
+        $number = this.$pagination.find('.page-number');
+
+        if (this.options.pageNumber <= 1) {
+            $first.addClass('disabled');
+            $pre.addClass('disabled');
+        }
+        if (this.options.pageNumber >= this.totalPages) {
+            $next.addClass('disabled');
+            $last.addClass('disabled');
+        }
+        $pageList.off('click').on('click', $.proxy(this.onPageListChange, this));
+        $first.off('click').on('click', $.proxy(this.onPageFirst, this));
+        $pre.off('click').on('click', $.proxy(this.onPagePre, this));
+        $next.off('click').on('click', $.proxy(this.onPageNext, this));
+        $last.off('click').on('click', $.proxy(this.onPageLast, this));
+        $number.off('click').on('click', $.proxy(this.onPageNumber, this));
+    };
+
+    BootstrapTable.prototype.onPageListChange = function(event) {
+        this.options.pageSize = +$(event.currentTarget).text();
+        this.updatePagination();
+        this.initBody();
+    };
+
+    BootstrapTable.prototype.onPageFirst = function() {
+        this.options.pageNumber = 1;
+        this.updatePagination();
+        this.initBody();
+    };
+
+    BootstrapTable.prototype.onPagePre = function() {
+        this.options.pageNumber--;
+        this.updatePagination();
+        this.initBody();
+    };
+
+    BootstrapTable.prototype.onPageNext = function() {
+        this.options.pageNumber++;
+        this.updatePagination();
+        this.initBody();
+    };
+
+    BootstrapTable.prototype.onPageLast = function() {
+        this.options.pageNumber = this.totalPages;
+        this.updatePagination();
+        this.initBody();
+    };
+
+    BootstrapTable.prototype.onPageNumber = function(event) {
+        this.options.pageNumber = +$(event.currentTarget).text();
+        this.updatePagination();
+        this.initBody();
+    };
+
+    BootstrapTable.prototype.initBody = function() {
+        var that = this,
+            html = [];
+
+        this.$body = this.$el.find('tbody');
+        if (!this.$body.length) {
+            this.$body = $('<tbody></tbody>').appendTo(this.$el);
+        }
+
+        if (!this.options.pagination) {
+            this.pageFrom = 1;
+            this.pageTo = this.data.length;
+        }
+
+        for (var i = this.pageFrom - 1; i < this.pageTo; i++) {
+            var item = this.data[i];
+
+            html.push('<tr' + ' data-index="' + i + '">');
+
+            $.each(that.header.fields, function(j, field) {
+                var text = '',
+                    value = item[field],
+                    type = '';
+
+                if (typeof that.header.formatters[j] === 'function') {
+                    value = that.header.formatters[j](value, item);
+                }
+
+                text = ['<td' + sprintf(' style="%s"', that.header.styles[j]) + '>',
+                    typeof value === 'undefined' ? that.options.undefinedText : value,
+                    '</td>'].join('');
+
+                if (that.options.columns[j].checkbox || that.options.columns[j].radio) {
+                    type = that.options.columns[j].checkbox ? 'checkbox' : type;
+                    type = that.options.columns[j].radio ? 'radio' : type;
+
+                    text = ['<td>',
+                        '<input name="btSelectItem" class="checkbox" data-index="' + i + '"' +
+                            sprintf(' type="%s"', type) +
+                            sprintf(' checked="%s"', value ? 'checked' : undefined) + ' />',
+                        '</td>'].join('');
+                }
+                html.push(text);
+            });
+
+            html.push('</tr>');
+        }
+
+        this.$body.html(html.join(''));
+
+        this.$body.find('tr').off('click').on('click', function() {
+            that.options.onClickRow(that.data[$(this).data('index')]);
+        });
+
+        this.$selectItem = this.$body.find('[name="btSelectItem"]');
+        this.$selectItem.off('click').on('click', function() {
+            var checkAll = that.data.length === that.$selectItem.filter(':checked').length;
+            that.$selectAll.prop('checked', checkAll);
+            that.data[$(this).data('index')][that.header.stateField] = $(this).prop('checked');
+        });
+        this.resetView();
+    };
+
+    BootstrapTable.prototype.initServer = function() {
+        var that = this;
+
+        if (!this.options.url) {
+            return;
+        }
+        $.ajax({
+            type: this.options.method,
+            url: this.options.url,
+            data: this.options.queryParams,
+            contentType: 'application/json',
+            dataType: 'json',
+            success: function(data) {
+                that.load(data);
+            }
+        });
+    };
+
+    BootstrapTable.prototype.getCaretHtml = function() {
+        return ['<span class="order' + (this.options.sortOrder === 'desc' ? '' : ' dropup') + '">',
+                '<span class="caret" style="margin: 10px 5px;"></span>',
+            '</span>'].join('');
+    };
+
+    BootstrapTable.prototype.resetView = function() {
+        var header = this.header;
+
+        this.$header.find('.th-inner').each(function(i) {
+            $(this).attr('style', header.styles[i])
+                .css('width', ($(this).parent().width()) + 'px'); // padding: 8px
+        });
+    };
+
+    BootstrapTable.prototype.updateRows = function(checked) {
+        var that = this;
+
+        $.each(this.data, function(i, row) {
+            row[that.header.stateField] = checked;
+        });
+    };
+
+    // PUBLIC FUNCTION DEFINITION
+    // =======================
+
+    BootstrapTable.prototype.load = function(data) {
+        this.initData(data);
+        this.initPagination();
+        this.initBody();
+    };
+
+    BootstrapTable.prototype.append = function(data) {
+        this.initData(data, true);
+        this.initBody();
+    };
+
+    BootstrapTable.prototype.mergeCells = function(options) {
+        var row = options.index,
+            col = $.inArray(options.field, this.header.fields),
+            rowspan = options.rowspan || 1,
+            colspan = options.colspan || 1,
+            i, j,
+            $tr = this.$body.find('tr'),
+            $td = $tr.eq(row).find('td').eq(col);
+
+        if (row < 0 || col < 0 || row >= this.data.length) {
+            return;
+        }
+
+        for (i = row; i < row + rowspan; i++) {
+            for (j = col; j < col + colspan; j++) {
+                $tr.eq(i).find('td').eq(j).hide();
+            }
+        }
+
+        $td.attr('rowspan', rowspan).attr('colspan', colspan).show();
+    };
+
+    BootstrapTable.prototype.getSelections = function() {
+        var that = this;
+
+        return $.grep(this.data, function(row) {
+            return row[that.header.stateField];
+        });
+    };
+
+    BootstrapTable.prototype.checkAll = function() {
+        this.$selectAll.prop('checked', true);
+        this.$selectItem.prop('checked', true);
+        this.updateRows(true);
+    };
+
+    BootstrapTable.prototype.uncheckAll = function() {
+        this.$selectAll.prop('checked', false);
+        this.$selectItem.prop('checked', false);
+        this.updateRows(false);
+    };
+
+    BootstrapTable.prototype.destroy = function() {
+        this.$container.replaceWith(this.$el_);
+        return this.$el_;
+    };
+
+
+    // BOOTSTRAP TABLE PLUGIN DEFINITION
+    // =======================
+
+    $.fn.bootstrapTable = function(option, _relatedTarget) {
+        var allowedMethods = [
+                'getSelections',
+                'load', 'append', 'mergeCells',
+                'checkAll', 'uncheckAll',
+                'destroy'
+            ],
+            value;
+
+        this.each(function() {
+            var $this = $(this),
+                data = $this.data('bootstrap.table'),
+                options = $.extend({}, BootstrapTable.DEFAULTS, $this.data(), typeof option === 'object' && option);
+
+            if (!data) {
+                $this.data('bootstrap.table', (data = new BootstrapTable(this, options)));
+            }
+
+            if (typeof option === 'string') {
+                if ($.inArray(option, allowedMethods) < 0) {
+                    throw "Unknown method: " + option;
+                }
+                value = data[option](_relatedTarget);
+            }
+        });
+
+        return value ? value : this;
+    };
+
+    $.fn.bootstrapTable.Constructor = BootstrapTable;
+
+    // BOOTSTRAP TABLE INIT
+    // =======================
+
+    $(function() {
+        $('[data-toggle="table"]').bootstrapTable();
+    });
+
+}(jQuery);

+ 5 - 1
gkaqv2/trunk/modules/web/src/main/webapp/static/js/gksssb/GksssbInfo.js

@@ -4,6 +4,9 @@
  */
 jQuery(function($) {
 	// 初始化Grid
+	$("#yxq").datetimepicker({
+		format:"Y-m-d"
+	});
 });
 /**
  * 数据处理
@@ -25,9 +28,10 @@ function gksssbInfoInit (data) {
 	$("#sl").val(data.sl);
 	$("#sldw").val(data.sldw);
 	$("#ssggxh").val(data.ggxh);
-	$("#yxq").datetimebox("setValue",formatterDateNotsfm(new Date(data.yxq)));
+	$("#yxq").val(formatterDateNotsfm(new Date(data.yxq)));
 	$("#sscfcs").val(data.cfcs);
 	$("#bz").val(data.bz);
+	$('#zstbl').datagrid('loadData',{total:0,rows:[]}); //附件列表
 }
 /**
  * 附件列表初始化

+ 42 - 2
gkaqv2/trunk/modules/web/src/main/webapp/static/js/gksssb/GksssbLook.js

@@ -18,6 +18,7 @@ function gksssbCkInfoInit (data) {
 	$("#cktbr").val(data.tbr);
 	$("#cklxdh").val(data.lxdh);
 	
+	
 }
 /**
  * 加载查看列表
@@ -36,10 +37,10 @@ function getLookInfo (qymc) {
 						yxq:data[i].yxq,
 						yjfl:data[i].yjfl,
 						ejfl:data[i].ejfl,
-						id:"<a href='getfile("+data[i].id+")'>查看附件</a>",
+						id:"<a href='javascript:getfile("+data[i].id+")'>查看附件</a>",
 						cfcs:data[i].cfcs,
 						bz:data[i].bz
-						}
+						};
 				$("#sssbList").datagrid('insertRow',{
 					row:gridData
 				});
@@ -117,6 +118,45 @@ function getCkJyrInfo (val) {
 		}
 	});
 }
+function getfile (id) {
+	$("#fileUp").window("open");
+	$("#sssbzstbl").datagrid('insertRow',{
+		index:0,
+		row:{
+			zs:"1",
+			ope:"2",
+			fjid:"3",
+			zsnr:"4"
+		}
+	});
+/*	gkSsSbZsInint(id);*/
+} 
+/**
+ * 附件列表初始化
+ */
+function gkSsSbZsInint (ssid) {
+//	$('#zstbl').datagrid("loadData",{ total: 0, rows: [] });
+	$.ajax({
+		type:"POST",
+		url: basePath+"/gksssb/gksssbZsInit",
+		data:{"ssid":ssid},
+		success:function (data) {
+			if (data != null && data.length > 0) {
+				var ope = "<a onclick='fileDow()'>下载</a>";
+				for ( var i = 0; i < data.length; i++) {
+					gridData={zs:data[i].wjm,
+		      				  ope:ope,
+		      				  fjid:data[i].id,
+		      				  zsnr:data[i].wjnr};
+					alert(1);
+					console.log(gridData);
+					
+				}
+			}
+		}
+	});
+}
+
 formatterDate = function (date) {
 	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
 	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"

+ 39 - 23
gkaqv2/trunk/modules/web/src/main/webapp/static/js/gksssb/index.js

@@ -91,7 +91,16 @@ function initGrid() {
 			width: '100px',
             align:'center',
 			text : '所在港区'
-		}]
+		},{
+        	key : 'id',
+        	width: '30px',
+        	align : "center",
+        	text : '操作',
+        	template: function(operation, rowObject){  
+                //operation:当前key所对应的单条数据;rowObject:单个一行完整数据
+                return '<a class="operation" href="javascript:getJyrGksssbLookInfo(\''+rowObject['id']+'\');">查看</a>';
+            }
+        }]
 	,pagingBefore:function(query){}
     ,pagingAfter: function(query){}
     ,sortingBefore:function(query){}
@@ -104,28 +113,34 @@ function initGrid() {
 	//    console.log('init方法回调query参数', query);
 	});
 };
-/*$.ajax({
-	type : 'POST',
-	dataType : "json",
-	data : {"id":id},
-	url : basePath + '/gksssb/initEdit',//请求的路径				
-	success : function(data) {
-		$("#gksssbLookwin").window({title:"查看"});
-		$("#gksssbLookwin").window("open");
-		
-		$("#gksssbLookform").form("reset");//重置表单数据
-		gksssbCkInfoInit(data);
-		$("#gksssbLookform").find("input").attr("disabled","true");//禁用表单元素input
-		$("#gksssbLookform").find("select").attr("disabled","true");//禁用表单元素select
-		$("#gksssbLookform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
-		$("#gksssbLookform").find("textarea").attr("disabled","true");//禁用表单元素select
-		getLookInfo (data.qymc);
-		
-	},
-	error: function (XMLHttpRequest, textStatus, errorThrown) {
-		alert("error");
-    }
-});*/
+
+/**
+ * 查看详细
+ * @param id
+ */
+function getJyrGksssbLookInfo (id) {
+	$.ajax({
+		type : 'POST',
+		dataType : "json",
+		data : {"id":id},
+		url : basePath + '/gksssb/initEdit',//请求的路径				
+		success : function(data) {
+			$("#gksssbLookwin").window({title:"查看"});
+			$("#gksssbLookwin").window("open");
+			$("#gksssbLookform").form("reset");//重置表单数据
+			gksssbCkInfoInit(data);
+			$("#gksssbLookform").find("input").attr("disabled","true");//禁用表单元素input
+			$("#gksssbLookform").find("select").attr("disabled","true");//禁用表单元素select
+			$("#gksssbLookform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
+			$("#gksssbLookform").find("textarea").attr("disabled","true");//禁用表单元素select
+			getLookInfo (data.qymc);
+			
+		},
+		error: function (XMLHttpRequest, textStatus, errorThrown) {
+			alert("error");
+	    }
+	});
+}
 /**
  * 选择所在地时联动港口信息
  */
@@ -225,6 +240,7 @@ function addJyrUserInfo () {
 	getyjfl('');
 	getejfl('');
 	getJyrSelect('','');
+	$('#zstbl').datagrid('loadData',{total:0,rows:[]}); //附件列表
 }
 /**
  * 删除经营管理制度信息

+ 12 - 3
gkaqv2/trunk/modules/web/src/main/webapp/static/js/glzd/GlzdInfo.js

@@ -4,6 +4,15 @@
  */
 jQuery(function($) {
 	// 初始化Grid
+	$("#fbrq").datetimepicker({
+		format:"Y-m-d"
+	});
+	$("#xdrq").datetimepicker({
+		format:"Y-m-d"
+	});
+	$("#txsj").datetimepicker({
+		format:"Y-m-d"
+	});
 });
 /**
  * 数据处理
@@ -20,10 +29,10 @@ function JyrGlzdInfoInit (data) {
 	$("#jyrzdmc").val(data.zdmc);
 	$("#zdwh").val(data.zdwh);
 	
-	$("#xdrq").datetimebox("setValue",formatterDateNotsfm(new Date(data.xdrq)));
-	$("#fbrq").datetimebox("setValue",formatterDateNotsfm(new Date(data.fbrq)));
+	$("#xdrq").val(formatterDateNotsfm(new Date(data.xdrq)));
+	$("#fbrq").val(formatterDateNotsfm(new Date(data.fbrq)));
 	$("#tbr").val(data.tbr);
-	$("#txsj").datetimebox("setValue",formatterDateNotsfm(new Date(data.txsj)));
+	$("#txsj").val(formatterDateNotsfm(new Date(data.txsj)));
 	$("#lxr").val(data.lxr);
 	$("#lxdh").val(data.lxdh);
 }

+ 57 - 9
gkaqv2/trunk/modules/web/src/main/webapp/static/js/glzd/index.js

@@ -5,6 +5,12 @@ var grid_selector = "#grid-table";
 var scouce;
 var jyrInfo;
 jQuery(function($) {
+	$("#xdrqk").datetimepicker({
+		format:"Y-m-d"
+	});
+	$("#xdrqj").datetimepicker({
+		format:"Y-m-d"
+	});
 	// 初始化Grid
 	initGrid();
 	getgq();
@@ -20,11 +26,6 @@ function initGrid() {
     	ajax_url : basePath + '/glzd/list',
     	ajax_type : "POST", //提交方式
 		columnData: [{
-			key : 'id',
-			width: '100px',
-            align:'center',
-			text:'id'
-		},{
 			key : 'zdmc',
 			width: '100px',
             align:'center',
@@ -84,7 +85,16 @@ function initGrid() {
 			width: '100px',
             align:'center',
 			text : '所在港区'
-		}]
+		},{
+        	key : 'id',
+        	width: '30px',
+        	align : "center",
+        	text : '操作',
+        	template: function(operation, rowObject){  
+                //operation:当前key所对应的单条数据;rowObject:单个一行完整数据
+                return '<a class="operation" href="javascript:getJyrGlzdLookInfo(\''+rowObject['id']+'\');">查看</a>';
+            }
+        }]
     ,pagingBefore:function(query){}
     ,pagingAfter: function(query){}
     ,sortingBefore:function(query){}
@@ -97,6 +107,33 @@ function initGrid() {
 	//    console.log('init方法回调query参数', query);
 	});
 };
+/**
+ * 查看
+ * @param id
+ */
+function getJyrGlzdLookInfo (id) {
+	 $.ajax({
+			type : 'POST',
+			dataType : "json",
+			data : {"id":id},
+			url : basePath + '/glzd/initEdit',//请求的路径				
+			success : function(data) {
+				$("#jyrGlzdwin").window({title:"编辑"});
+				$("#jyrGlzdwin").window("open");
+				$("#jyrGlzdInfoform").form("reset");//重置表单数据
+				$("#jyrGlzdInfoform").find("input").attr("disabled","true");//禁用表单元素input
+				$("#jyrGlzdInfoform").find("select").attr("disabled","true");//禁用表单元素select
+				$("#jyrGlzdInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
+				$("#jyrGlzdInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
+				$("#tab-tools").attr("hidden",true);
+				$("#jyrGlzdInfoform").find("#tab-tools").attr("hidden",true);
+				JyrGlzdInfoInit(data);
+				glzdZsInint(data.id,"2");
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+	        }
+		});
+}
 
 /**
  * 选择所在地时联动港口信息
@@ -148,8 +185,8 @@ function searchRecord () {
 	var ssgq = $("#ssgq").val();
 	var jyr = $("#gkjyr").val();
 	var zdfl = $("#zdfl").val();
-	var xdrqk = $("#xdrqk").datetimebox("getValue");
-	var xdrqj = $("#xdrqj").datetimebox("getValue");
+	var xdrqk = $("#xdrqk").val();
+	var xdrqj = $("#xdrqj").val();
 	var zdmc = $("#zdmc").val();
 	// 定义查询参数
     var obj = {"szd":szd,"gqmc":ssgq,"gkjyr":jyr,"zdfl":zdfl,"xdrq":xdrqk,"fbrq":xdrqj,"zdmc":zdmc};
@@ -178,6 +215,8 @@ function editInfo() {
 				$("#jyrGlzdwin").window({title:"编辑"});
 				$("#jyrGlzdwin").window("open");
 				$("#jyrGlzdInfoform").form("reset");//重置表单数据
+				formQY();
+				$('#zstbl').datagrid('loadData',{total:0,rows:[]}); //附件列表
 				JyrGlzdInfoInit(data);
 				glzdZsInint(data.id,"1");
 			},
@@ -193,6 +232,8 @@ function addJyrUserInfo () {
 	$("#jyrGlzdwin").window({title:"新增"});
 	$("#jyrGlzdwin").window("open");
 	comClearFormData("#jyrGlzdInfoform");
+	formQY();
+	$('#zstbl').datagrid('loadData',{total:0,rows:[]}); //附件列表
 	getSzd('');
 	getInfo('','');
 	getjyrzdfl('');
@@ -224,7 +265,14 @@ function delInfo () {
 		layer.alert("请选择记录");
 	}
 }
-
+function formQY () {
+	$("#jyrGlzdInfoform").find("input").removeAttr("disabled");//禁用表单元素input
+	$("#jyrGlzdInfoform").find("select").removeAttr("disabled");//禁用表单元素select
+	$("#jyrGlzdInfoform .easyui-datetimebox").datetimebox({ disabled: false });//禁用表单元素日期控件
+	$("#jyrGlzdInfoform").find("textarea").removeAttr("disabled");//禁用表单元素select
+	$("#tab-tools").removeAttr("hidden");
+	$("#jyrGlzdInfoform").find("#tab-tools").removeAttr("hidden");
+}
 formatterDateNotsfm = function (date) {
 	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
 	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"

+ 28 - 10
gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/JyrInfo.js

@@ -7,6 +7,18 @@ var zywxhwpm ='';
  */
 jQuery(function($) {
 	// 初始化Grid
+	$("#fzrq").datetimepicker({
+		format:"Y-m-d"
+	});
+	$("#bafzrq").datetimepicker({
+		format:"Y-m-d"
+	});
+	$("#fzyxq").datetimepicker({
+		format:"Y-m-d"
+	});
+	$("#bayxq").datetimepicker({
+		format:"Y-m-d"
+	});
 });
 
 /**
@@ -44,10 +56,15 @@ function manageInfo (data) {
 	$("#yzbm").val(data[0].yzbm);
 	$("#gkjyr2").val(data[0].gkjyr);
 	//设置日起
-	$("#fzrq").datetimebox("setValue",formatDate(new Date(data[0].fzrq)));
+	/*$("#fzrq").datetimebox("setValue",formatDate(new Date(data[0].fzrq)));
 	$("#bafzrq").datetimebox("setValue",formatDate(new Date(data[0].bafzrq)));
 	$("#bayxq").datetimebox("setValue",formatDate(new Date(data[0].bayxq)));
-	$("#fzyxq").datetimebox("setValue",formatDate(new Date(data[0].fzyxq)));
+	$("#fzyxq").datetimebox("setValue",formatDate(new Date(data[0].fzyxq)));*/
+	
+	$("#fzrq").val(formatDate(new Date(data[0].fzrq)));
+	$("#bafzrq").val(formatDate(new Date(data[0].bafzrq)));
+	$("#bayxq").val(formatDate(new Date(data[0].bayxq)));
+	$("#fzyxq").val(formatDate(new Date(data[0].fzyxq)));
 	//设置input
 	$("#bgdz").val(data[0].bgdz);
 	$("#fzjg").val(data[0].fzjg);
@@ -349,16 +366,12 @@ function editJyr () {
 	//检查选中项
 	getshenpi ();
 	getqylb ();
-	//赋值
-	var time = $("#fzrq").datetimebox('getValue');
-	$("#rq").val(time);
-	var time2 = $("#bafzrq").datetimebox('getValue');
-	$("#rq2").val(time2);
 	$.ajax({
 		type : "post",
 		url : basePath + "/jyr/save",
 		data : $('#jyrInfoform').serialize(),
 		success : function(data) {
+			console.log(data);
             // 成功删除后刷新页面
             if (data && data.success == true) {
             	var ssid = data.attrs.ssid;
@@ -390,7 +403,7 @@ function eiditRyzs (ssid) {
 				success:function (data){
 					// 成功删除后刷新页面
 		            if (data && data.success == true) {
-		            	var wjnr = data.attrs.zsnr
+		            	var wjnr = data.attrs.zsnr;
 		            	//判断文件内容id是否有值,若没有值,说明filename为空,数据在库中,不用操作数据库,则关联的表数据也不用操作
 		            	if (wjnr !=null && wjnr != ""){
 			            	var value = {"wjm":wjm,
@@ -401,6 +414,10 @@ function eiditRyzs (ssid) {
 				            			"wjhzm":wjhzm,
 				            			"ssid":ssid};
 			            	editFJInfo(value);
+		            	}else {
+		            		ayer.alert("数据已成功保存!");
+		            		hideModelDialog("#jyrwin");
+			                window.parent.searchRecord();
 		            	}
 		            } else {
 		            	zsnr = null;
@@ -424,6 +441,7 @@ function editFJInfo (data) {
 			success:function (data) {
 				// 成功删除后刷新页面
 	            if (data && data.success == true) {
+	            	
 	                layer.alert("数据已成功保存!");
 	                $("#jyrwin").window("close");
 	                window.parent.searchRecord();
@@ -434,8 +452,8 @@ function editFJInfo (data) {
 		});
 }
 function clickfile() {
-//	$("#fileUp").window('open');//打开弹窗
-	showModelDialog("fileUp", "选择文件");
+	$("#fileUp").window('open');//打开弹窗
+//	showModelDialog("fileUp", "选择文件");
 	zsInint($("#id").val(),"1");
 }
 

+ 10 - 5
gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/index.js

@@ -7,12 +7,8 @@ var jyrInfo;
 jQuery(function($) {
 	// 初始化Grid
 	initJyrGrid();
-//	$("#jyrwin").window("close");
-//	$("#win").window("close");
-//	$("#jyrinfo").window("close");
 	getgq();
 	xzqhSelect();
-	
 });
 /**
  * 初始化Grid
@@ -282,6 +278,7 @@ function editInfo() {
 				showModelDialog("jyrwin", "编辑");
 				$("#jyrInfoform").form("reset");//重置表单数据
 				$("#tab-tools").removeAttr("hidden");
+				formQY();
 				manageInfo(data);
 				$("#tt").tabs("disableTab",1);
 				$("#tt").tabs("disableTab",2);
@@ -301,7 +298,8 @@ function editInfo() {
 function addJyrInfo() {
 	$("#tt").tabs("select",0);
 	showModelDialog("jyrwin", "新增");
-	
+	$("#tab-tools").removeAttr("hidden");
+	formQY();
 	$("#szd2").removeAttr("disabled");
 	$("#tt").tabs("disableTab","泊位信息");
 	$("#tt").tabs("disableTab","堆场信息");
@@ -400,6 +398,13 @@ function xzqhSelect() {
  });
 }
 
+function formQY () {
+	$("#jyrInfoform").find("input").removeAttr("disabled");//禁用表单元素input
+	$("#jyrInfoform").find("select").removeAttr("disabled");//禁用表单元素select
+	$("#jyrInfoform .easyui-datetimebox").datetimebox({ disabled: false });//禁用表单元素日期控件
+	$("#jyrInfoform").find("textarea").removeAttr("disabled");//禁用表单元素select
+}
+
 function printInfo () {
 	location.href = basePath + '/jyr/printJyrInfo';
 }

+ 12 - 5
gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyrUser/JyrUserInfo.js

@@ -24,15 +24,19 @@ function JyrUserInfoInit (data) {
 	$("#userzwhzc").val(data.zwhzc);
 	$("#lxdh").val(data.lxdh);
 	$("#bz").val(data.bz);
-	$('#zstbl').datagrid('loadData',{total:0,rows:[]}); 
+	$('#zstbl').datagrid('loadData',{total:0,rows:[]}); //附件列表
 }
 /**
  * 上传文件列表的数据初始化加载
  * @param data
  */
-function ryzsbInfoInit (data) {
+function ryzsbInfoInit (data,opn) {
+	var manage = '<a onclick="eiditUserFile()">编辑</a>&nbsp;&nbsp;<a onclick="deleteUserFile()">删除</a>&nbsp;&nbsp;<a onclick="fileDow()">下载</a>';
+	if (opn == "1") {
+		//查看
+		manage = '<a onclick="fileDow()">下载</a>';
+	}
 	for ( var i = 0; i < data.length; i++) {
-		var manage = '<a onclick="eiditUserFile()">编辑</a>&nbsp;&nbsp;<a onclick="deleteUserFile()">删除</a>&nbsp;&nbsp;<a onclick="fileDow()">下载</a>';
 		gridData = {zsid:data[i].id,
 					zsmc:data[i].zsmc,
 					zszl:data[i].zszl,
@@ -45,7 +49,7 @@ function ryzsbInfoInit (data) {
 					index:i,
 					filename:''
 					};
-		insertJyrUserZs();
+		insertJyrUserZs(gridData);
 	}
 }
 /**
@@ -236,8 +240,11 @@ function eiditRyzs () {
 		            		zsnr = rows[i].zsnr;
 		            	}
 		            	//还差文件大小和后缀名
+		            	
 						var fjb = {"wjm":wjm,"id":fjid,"szd":$("#jyrszd").val(),"wjnr":zsnr,"wjdx":wjdx,"wjhzm":wjhzm,"ssid":id,"filename":fileName};
 						var ryzsData = {"ryid":$("#userzjhm").val(),"zsmc":zsmc,"zszl":zszl,"zsbh":zsbh,"yxq":yxq,"zsnr":zsnr,"szd":$("#jyrszd").val(),"id":id};
+						console.log(fjb);
+						console.log(ryzsData);
 						editRyzsInfo(ryzsData,fjb);
 		            } else {
 		            	zsnr = null;
@@ -318,7 +325,7 @@ function addJyrUserZS () {
 /**
  * 增加经营人证书
  */
-function insertJyrUserZs () {
+function insertJyrUserZs (gridData) {
 	if (gridData != "" && gridData != null) {
 		$("#zstbl").datagrid('insertRow',{
 			row:gridData

+ 2 - 2
gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyrUser/JyrUserZsInfo.js

@@ -53,7 +53,7 @@ function saveUserZs () {
 	        					wjdx:size,
 	        					wjhzm:type
 	        					};
-	        		window.parent.insertJyrUserZs();
+	        		insertJyrUserZs();
 	        		$("#jyrUserZsinfo").window("close");
 	            } else {
 	                layer.alert("数据保存失败!");
@@ -74,7 +74,7 @@ function saveUserZs () {
 					fjbid:$("#fjbid").val(),
 					index:index,
 					};
-		window.parent.eiditJyrUserZs();
+		eiditJyrUserZs();
 		$("#jyrUserZsinfo").window("close");
 	}
 	  

+ 57 - 11
gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyrUser/index.js

@@ -22,11 +22,6 @@ function initGrid() {
     	ajax_url : basePath + '/jyrUser/list',
     	ajax_type : "POST", //提交方式
     	columnData: [{
-			key : 'id',
-			width: '100px',
-            align:'center',
-			text:'id'
-		},{
 			key : 'xm',
 			width: '100px',
             align:'center',
@@ -81,7 +76,16 @@ function initGrid() {
 			width: '100px',
             align:'center',
 			text : '备注'
-		}]
+		},{
+        	key : 'id',
+        	width: '30px',
+        	align : "center",
+        	text : '操作',
+        	template: function(operation, rowObject){  
+                //operation:当前key所对应的单条数据;rowObject:单个一行完整数据
+                return '<a class="operation" href="javascript:getJyrUserLookInfo(\''+rowObject['id']+'\');">查看</a>';
+            }
+        }]
     ,pagingBefore:function(query){}
     ,pagingAfter: function(query){}
     ,sortingBefore:function(query){}
@@ -94,7 +98,33 @@ function initGrid() {
 	//    console.log('init方法回调query参数', query);
 	});
 };
-
+/**
+ * 查看详细
+ * @param id
+ */
+function getJyrUserLookInfo (id) {
+		$.ajax({
+			type : 'POST',
+			dataType : "json",
+			data : {"id":id},
+			url : basePath + '/jyrUser/initEdit',//请求的路径				
+			success : function(data) {
+				$("#jyrUserwin").window({title:"查看"});
+				$("#jyrUserwin").window("open");
+				$("#jyrUserInfoform").form("reset");//重置表单数据
+				$("#jyrUserInfoform").find("input").attr("disabled","true");//禁用表单元素input
+				$("#jyrUserInfoform").find("select").attr("disabled","true");//禁用表单元素select
+				$("#jyrUserInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
+				$("#jyrUserInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
+				$("#tab-tools").attr("hidden",true);
+				$("#jyrUserInfoform").find("#tab-tools").attr("hidden",true);
+				initRyzsbEdit(data.sfzh,data,"1");
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				alert("error");
+	    }
+		});
+}
 /**
  * 下拉框绑定
  */
@@ -195,7 +225,7 @@ function editInfo() {
 			data : {"id":ids},
 			url : basePath + '/jyrUser/initEdit',//请求的路径				
 			success : function(data) {
-				initRyzsbEdit(data.sfzh,data);
+				initRyzsbEdit(data.sfzh,data,"2");
 				
 			},
 			error: function (XMLHttpRequest, textStatus, errorThrown) {
@@ -204,7 +234,7 @@ function editInfo() {
 	}
 }; 
 
-function initRyzsbEdit (id,souces) {
+function initRyzsbEdit (id,souces,opn) {
 	$.ajax({
 		type : 'POST',
 		dataType : "json",
@@ -213,9 +243,13 @@ function initRyzsbEdit (id,souces) {
 		success : function(data) {
 			$("#jyrUserwin").window({title:"编辑"});
 			$("#jyrUserwin").window("open");
+//			showModelDialog("jyrUserwin", "编辑");
+			if (opn != "1") {
+				formQY();
+			}
 			$("#jyrUserInfoform").form("reset");//重置表单数据
 			JyrUserInfoInit(souces);
-			ryzsbInfoInit(data);
+			ryzsbInfoInit(data,opn);
 		},
 		error: function (XMLHttpRequest, textStatus, errorThrown) {
         }
@@ -227,6 +261,8 @@ function initRyzsbEdit (id,souces) {
 function addJyrUserInfo () {
 	$("#jyrUserwin").window({title:"新增"});
 	$("#jyrUserwin").window("open");
+//	showModelDialog("jyrUserwin", "新增");
+	formQY();
 	comClearFormData("#jyrUserInfoform");
 }
 /**
@@ -257,8 +293,18 @@ function delInfo () {
 }
 
 function jyrUserTj() {
-	$("#jyrUserTjwin").window("open");
+//	$("#jyrUserTjwin").window("open");
+	showModelDialog("jyrUserTjwin", "新增");
 	getTjSzd();
 	getjyrUserTjRylx();
 	tj_initGrid();
+}
+
+function formQY () {
+	$("#jyrUserInfoform").find("input").removeAttr("disabled");//禁用表单元素input
+	$("#jyrUserInfoform").find("select").removeAttr("disabled");//禁用表单元素select
+	$("#jyrUserInfoform .easyui-datetimebox").datetimebox({ disabled: false });//禁用表单元素日期控件
+	$("#jyrUserInfoform").find("textarea").removeAttr("disabled");//禁用表单元素select
+	$("#tab-tools").removeAttr("hidden");
+	$("#jyrUserInfoform").find("#tab-tools").removeAttr("hidden");
 }