|
|
@@ -88,60 +88,15 @@
|
|
|
|
|
|
//搜索提交
|
|
|
function tbSearchSubmit() {
|
|
|
-
|
|
|
- //if ($('#ffMaster').form("validate")) {
|
|
|
- // $('#DataGridMaster').datagrid({
|
|
|
- // columns: []
|
|
|
- // });
|
|
|
- // $('#DataGridMaster').datagridLoad({
|
|
|
- // title: '',
|
|
|
- // idField: 'SID',
|
|
|
- // queryParams: $('#ffMaster').serializeJson(),
|
|
|
- // url: 'rpt.ashx?m=master&id=' + request('id'),
|
|
|
- // headerRows: 2,
|
|
|
- // pagination: false,
|
|
|
- // pageSize: 10,
|
|
|
- // onSelect: LoadDataGridDetail
|
|
|
- // });
|
|
|
- //}
|
|
|
-
|
|
|
- // if ($('#ffMaster').form("validate")) {
|
|
|
- // $('#DataGridMaster').datagridLoadRpt({
|
|
|
- // title: '',
|
|
|
- // idField: 'SID',
|
|
|
- // queryParams: $('#ffMaster').serializeJson(),
|
|
|
- // url: 'rpt.ashx?m=master&id=' + request('id'),
|
|
|
- // fixWidth: 80,
|
|
|
- // mergeWidth: 50,
|
|
|
- // splitChar: '_'
|
|
|
- // });
|
|
|
- // }
|
|
|
- if ($('#ffMaster').form("validate")) {
|
|
|
- if ($('#chkMonitor').checkbox('options').checked) {
|
|
|
- $('#DataGridMaster').datagridLoad({
|
|
|
- title: '',
|
|
|
- idField: 'SID',
|
|
|
- queryParams: $('#ffMaster').serializeJson(),
|
|
|
- url: 'rpt.ashx?m=jiezhauang&id=' + request('id'),
|
|
|
- fixWidth: 140,
|
|
|
- mergeWidth: 80,
|
|
|
- splitChar: '_'
|
|
|
- });
|
|
|
- t = 1
|
|
|
- }
|
|
|
- else {
|
|
|
- $('#DataGridMaster').datagridLoadRpt({
|
|
|
- title: '',
|
|
|
- idField: 'SID',
|
|
|
- queryParams: $('#ffMaster').serializeJson(),
|
|
|
- url: 'rpt.ashx?m=master&id=' + request('id'),
|
|
|
- fixWidth: 140,
|
|
|
- mergeWidth: 80,
|
|
|
- splitChar: '_'
|
|
|
- });
|
|
|
- t = 2
|
|
|
- }
|
|
|
- }
|
|
|
+ $('#DataGridMaster').datagridLoadRpt({
|
|
|
+ title: '',
|
|
|
+ idField: 'SID',
|
|
|
+ queryParams: $('#ffMaster').serializeJson(),
|
|
|
+ url: 'rpt.ashx?m=master&id=' + request('id'),
|
|
|
+ fixWidth: 140,
|
|
|
+ mergeWidth: 80,
|
|
|
+ splitChar: '_'
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
// 2021-6-11 dongyan 添加 结转数据开关 选择结转测试复选框 将除时间外的条件禁用
|
fenglinyong