|
|
@@ -349,7 +349,6 @@ function removelisttable(area, time) {
|
|
|
myDataGrid.dataSource.data = null;
|
|
|
myDataGrid.setDataSource(selectedData);
|
|
|
myDataGrid.setPager(1, selectedData.array.length, selectedData.array.length);
|
|
|
-
|
|
|
myDataGrid.render();
|
|
|
|
|
|
reloadtableData();
|
|
|
@@ -431,6 +430,14 @@ function selectedall(sender) {
|
|
|
|
|
|
id = trim(id);
|
|
|
var btn = '<button class="btn btn-primary" type="button" onclick="removeListItem(this)" id="delete_' + id + '">删除</button>';
|
|
|
+ var isin = false;
|
|
|
+ for (var p in selectedData.array) {
|
|
|
+ if (selectedData.array[p].time == ctime.format("YYYY-MM-DD") && selectedData.array[p].deptInfo.id == dept_info.id && selectedData.array[p].areaInfo.id == datatemp.data[i].id) {
|
|
|
+ isin = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (isin) continue;
|
|
|
selectedData.array.push({ "time": ctime.format("YYYY-MM-DD"), "dept_name": dept_info.name, "area_name": datatemp.data[i].name, "option": btn, areaInfo: datatemp.data[i], deptInfo: dept_info });
|
|
|
|
|
|
}
|