|
@@ -1235,6 +1235,16 @@ var gljOprObj = {
|
|
|
hasCom = this.hasComposition(node.data);
|
|
|
}
|
|
|
return hasCom|| node.data.isEstimate == 1;
|
|
|
+ },
|
|
|
+ locateZTree: function(ID) {
|
|
|
+ let zTree = $.fn.zTree.getZTreeObj("gljTree");
|
|
|
+ let node = null;
|
|
|
+ if (ID) node = zTree.getNodesByParam('ID', ID, null)[0]
|
|
|
+ if (!node) node = zTree.getNodeByTId('gljTree_1');
|
|
|
+ zTree.selectNode(node);
|
|
|
+ gljOprObj.gljCurTypeId = ID;
|
|
|
+ gljOprObj.filterLibGLJSheetData();
|
|
|
+ gljOprObj.showLibGLJSheetData();
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -1249,7 +1259,7 @@ $(function () {
|
|
|
gljOprObj.gljLibSheet.name('glj_lib');
|
|
|
}
|
|
|
gljOprObj.gljLibSheetData = gljOprObj.AllRecode;
|
|
|
- let selections = [],selectMap = {};
|
|
|
+ let gljClass = 0, selectMap = {};
|
|
|
if ($('#actionType').val() == 'add' || $('#actionType').val() == 'insert') {//插入,添加
|
|
|
gljOprObj.GLJSelection = [];
|
|
|
} else if($('#actionType').val() =='m_replace' || $('#actionType').val() == 'replace'){//替换、批量替换
|
|
@@ -1273,17 +1283,20 @@ $(function () {
|
|
|
let item_key = gljOprObj.getIndex(item, gljLibKeyArray);
|
|
|
if(selectMap[item_key]){
|
|
|
item.select = 1 ;
|
|
|
+ gljClass = item.gljClass;
|
|
|
}
|
|
|
}
|
|
|
- gljOprObj.showLibGLJSheetData();
|
|
|
+
|
|
|
//替换,焦点定位至当前选中人材机
|
|
|
if($('#actionType').val() =='m_replace' || $('#actionType').val() == 'replace'){
|
|
|
+ gljOprObj.locateZTree(gljClass);
|
|
|
let selected = gljOprObj.sheetData[gljContextMenu.selectedRow];
|
|
|
let index = _.findIndex(gljOprObj.gljLibSheetData, {code: selected.code});
|
|
|
gljOprObj.gljLibSheet.showRow(index, GC.Spread.Sheets.VerticalPosition.center);
|
|
|
gljOprObj.gljLibSheet.setActiveCell(index, 0);
|
|
|
gljOprObj.gljLibSpresd.focus(true);
|
|
|
}
|
|
|
+ else gljOprObj.showLibGLJSheetData();
|
|
|
});
|
|
|
|
|
|
$('#glj_tree_div').on('hidden.bs.modal', function () {
|
|
@@ -1302,16 +1315,21 @@ $(function () {
|
|
|
gljOprObj.showLibGLJSheetData();
|
|
|
}
|
|
|
})
|
|
|
- //工料机搜索
|
|
|
+/* //工料机搜索
|
|
|
$('#gljSearchKeyword').change(function () {
|
|
|
gljOprObj.filterLibGLJSheetData();
|
|
|
gljOprObj.showLibGLJSheetData();
|
|
|
});
|
|
|
- $('#gljSearchKeyword').bind('keypress', function (e) {
|
|
|
+ $('#gljSearchKeyword').bind('keypress', function (e) {
|
|
|
if(e.keyCode === 13){
|
|
|
+ alert('2');
|
|
|
$(this).blur();
|
|
|
return false;
|
|
|
}
|
|
|
+ });*/
|
|
|
+ $('#gljSearchKeyword').bind('keyup', function (e) {
|
|
|
+ gljOprObj.filterLibGLJSheetData();
|
|
|
+ gljOprObj.showLibGLJSheetData();
|
|
|
});
|
|
|
|
|
|
$('#glj_selected_conf').click(function () {
|
|
@@ -1443,3 +1461,4 @@ function compareRationGLJ(a, b) {
|
|
|
}
|
|
|
return false;
|
|
|
}
|
|
|
+
|