Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r39040 -r39132
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 39040)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 39132)
@@ -11,6 +11,7 @@
var lastSelectTaskId;
var sterilizerTypeStore;
var waitPackingJsonObj;
+var packingTousseBtnClick_mask = null;
//XJJQZYY-120：配置项改进为可配置为必填、选填
//检查人
@@ -79,7 +80,6 @@
var curSelMaterialId = null;
//显示所有配包注意事项
var noteGrid;
-
//判断是否ie和ie7
var isIE6OrIE7 = top.Ext4.isIE6 || top.Ext4.isIE7;
var filterDepartmentsWithoutToussesStore = new Ext4.data.Store({
@@ -174,6 +174,109 @@
websocketCallBacks(barcodes);
}
+function onPackingTousseBtnClickComplete() {
+ Ext4.getCmp('save_print').enable();
+ Ext4.getCmp('save_print2').enable();
+ Ext4.getCmp('packingLableBtn').enable();
+
+ if (packingTousseBtnClick_mask != null) {
+ packingTousseBtnClick_mask.destroy();
+ packingTousseBtnClick_mask = null;
+ }
+ // 根据装配组的配置来设置光标
+ if (taskGroupObj && taskGroupObj.cursorFieldAfterPacking && taskGroupObj.cursorFieldAfterPacking == '标识牌条码') {
+ Ext4.getCmp('scanIdCardBarcode').focus('', 10);
+ } else {
+ Ext4.getCmp('basketBarcodeInput').focus('', 10);
+ }
+
+}
+
+//ZSWY-246：显示配包注意事项
+function showTousseDefinitionNote(tousseName, tousseID){
+ var buttons = Ext4.MessageBox.YESNO;
+ if(sstsConfig.showTousseNoteOnClickTousse == 2){
+ buttons = Ext4.MessageBox.YES;
+ }
+ Ext4.MessageBox.show({
+ title: '配包注意事项',
+ msg: tousseName + " 含有配包注意事项，是否查看?",
+ width: 300,
+ buttons: buttons,
+ fn: function (btn) {
+ if (btn == 'yes') {
+ previewWangEditor('【' + tousseName + '】', tousseID);
+ saveTousseNoteViewRecord(tousseID);
+ }
+ },
+ icon: Ext4.MessageBox.QUESTION
+ });
+}
+
+//ZSWY-246：加载配包注意事项
+function loadLoginUserUnViewedTousseDefinitionNote(ids,isPacking){
+ Ext4.Ajax.request({
+ url: WWWROOT + "/disinfectSystem/baseData/tousseDefinitionAction!loadLoginUserUnViewedTousseDefinitionNote.do",
+ method: "post",
+ async:false,
+ params: { "ids": ids },
+ success: function (response) {
+ var result = Ext4.decode(response.responseText);
+ if(result.success){
+ if(result.data.length > 1){
+ showAllNoteWindow(result.data);
+ if(isPacking){
+ onPackingTousseBtnClickComplete();
+ return false
+ }
+ }else if(result.data.length == 1){
+ var tousseName = result.data[0].tousseName;
+ var tousseID = result.data[0].tousseID;
+ showTousseDefinitionNote(tousseName, tousseID)
+ if(isPacking){
+ onPackingTousseBtnClickComplete();
+ return false
+ }
+ }
+ }else {
+ showResult(result.message);
+ onPackingTousseBtnClickComplete();
+ return false
+ }
+ }
+ });
+}
+
+//ZSWY-246：查看配包注意事项
+function saveTousseNoteViewRecord(id,showMsg){
+ Ext4.Ajax.request({
+ url: WWWROOT + "/disinfectSystem/baseData/tousseDefinitionAction!saveTousseNoteViewRecord.do",
+ method: "post",
+ params: { "tousseDefinitionId": id },
+ success: function (response) {
+ var result = Ext4.decode(response.responseText);
+ if(result.success){
+ if(showMsg){
+ for (var i = 0; i < noteGrid.getStore().getCount(); i++) {
+ var rows = noteGrid.getStore().getAt(i);
+ if (rows.data.tousseID == id) {
+ var rows = noteGrid.getStore().getAt(i);
+ noteGrid.getStore().remove(rows)
+ previewWangEditor('【' + rows.data.tousseName + '】', id);
+ break;
+ }
+ }
+ if (noteGrid.getStore().getCount() == 0) {
+ top.Ext.getCmp('noteWindow').close();
+ }
+ }
+ }else {
+ showResult(result.message);
+ }
+ }
+ });
+}
+
function reflushWaitPackingTreeGrid() {
var tabTitle = parent.currentActiveTabTitle;
var taskGroup = getURLParameter("taskGroup", "") + "装配";
@@ -1073,22 +1176,25 @@
if (rootNode != null) {
var count = 0;
var noteData = [];
+ var tousseIDArray = [];
Ext4.each(rootNode.childNodes, function (pNode) {
pNode.set('checked', checked);
if (checked) {
count++
- if (sstsConfig.showTousseNoteOnClickTousse) {
+ if (sstsConfig.showTousseNoteOnClickTousse == true || sstsConfig.showTousseNoteOnClickTousse == 1) {
var tousseName = pNode.get('tousseName');
var note = pNode.get('note');
var tousseID = pNode.get('tousseID');
if (!Ext.isEmpty(note) && newChecked) {
noteData.push({
tousseID: tousseID,
tousseName: tousseName,
- note: note,
- status: 0
+ note: note
})
}
+ }else if(sstsConfig.showTousseNoteOnClickTousse == 2){
+ var tousseID = pNode.get('tousseID');
+ tousseIDArray.push(tousseID)
}
} else {
count = 0
@@ -1108,12 +1214,24 @@
Ext4.getCmp('sterilingType').disable();
Ext4.getCmp('packageType').disable();
}
- if (noteData.length > 0) {
- showAllNoteWindow(noteData);
+ if (noteData.length > 1 || tousseIDArray.length > 1) {
+ if(sstsConfig.showTousseNoteOnClickTousse == 2){
+ loadLoginUserUnViewedTousseDefinitionNote(tousseIDArray.join(';'));
+ }else {
+ showAllNoteWindow(noteData);
+ }
+ }else if (noteData.length == 1 || tousseIDArray.length == 1) {
+ if(sstsConfig.showTousseNoteOnClickTousse == 2){
+ var tousseID = tousseIDArray[0];
+ loadLoginUserUnViewedTousseDefinitionNote(tousseID);
+ }else {
+ var tousseName = noteData[0].tousseName;
+ var tousseID = noteData[0].tousseID;
+ showTousseDefinitionNote(tousseName, tousseID);
+ }
}
}
-
Ext4.getCmp('basketTreeGrid').getView().refresh();
}
@@ -1135,11 +1253,15 @@
}
function checkNoteWin(tousseID) {
- removeAndInsertItem(tousseID, 1);
+ if(sstsConfig.showTousseNoteOnClickTousse == 2){
+ saveTousseNoteViewRecord(tousseID,true);
+ }else {
+ removeAndInsertItem(tousseID, 2);
+ }
}
function skipNote(tousseID) {
- removeAndInsertItem(tousseID, 2);
+ removeAndInsertItem(tousseID, 3);
}
function removeAndInsertItem(tousseID, status) {
@@ -1163,15 +1285,15 @@
});
noteGrid.getStore().remove(rows)
noteGrid.getStore().insert(i, record);
- if (status == 1) {
+ if (status == 2) {
previewWangEditor('【' + rows.data.tousseName + '】', tousseID);
}
break;
}
}
for (var i = 0; i < noteGrid.getStore().getCount(); i++) {
var rows = noteGrid.getStore().getAt(i);
- if (rows.data.status == 0) {
+ if (rows.data.status == 1) {
sum++;
}
}
@@ -1181,7 +1303,11 @@
}
function renderButton(v, p, record) {
- return "查看 | 跳过";
+ if(sstsConfig.showTousseNoteOnClickTousse == 2){
+ return "查看";
+ }else {
+ return "查看 | 跳过";
+ }
}
function showAllNoteWindow(data) {
@@ -1199,9 +1325,9 @@
columns: [
{
header: "名称", width: 300, dataIndex: 'tousseName', renderer: function (v, p, record) {
- if (record.get('status') == 1) {
+ if (record.get('status') == 2) {
return v + '(已查看)';
- } else if (record.get('status') == 2) {
+ } else if (record.get('status') == 3) {
return v + '(已跳过)';
} else {
return v;
@@ -1223,7 +1349,7 @@
draggable: true,
modal: true,
closeAction: 'close',
- closable: false,
+ closable: sstsConfig.showTousseNoteOnClickTousse == 2 ? true : false,
items: [noteGrid]
});
noteWindow.show();
@@ -2629,6 +2755,7 @@
if (ret.note && ret.note !== '') {
setTimeout(function () {
previewWangEditor('【' + ret.packageName + '】', td_id);
+ saveTousseNoteViewRecord(td_id);
myMask.hide();
}, 1000);
} else {
@@ -4507,7 +4634,9 @@
afterrender: function (obj) {
obj.getEl().dom.onclick = function () {
var checked = Ext4.getCmp('checkAllTaskNode').getValue();
- checkedAllNode(checked);
+ if(sstsConfig.showTousseNoteOnClickTousse == 1 || sstsConfig.showTousseNoteOnClickTousse == 2 || sstsConfig.showTousseNoteOnClickTousse == true){
+ checkedAllNode(checked);
+ }
var rootNode = Ext4.getCmp('basketTreeGrid').getRootNode();
if(rootNode.childNodes.length > 0 && checked){
itemClickFunction(rootNode.childNodes[0], 'basketTreeGrid', 0);
@@ -4978,19 +5107,21 @@
if (!sstsConfig.showTousseNoteOnClickTousse) {
return;
}
+ var tousseID = node.get('tousseID');
var tousseName = node.get('tousseName');
var note = node.get('note');
var checked = node.get('checked');
if (idCard) {
checked = true;
}
- if (!Ext.isEmpty(note) && checked) {
- var tousseID = node.get('tousseID');
- Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项，是否查看?", function (btn) {
- if (btn == 'yes') {
- previewWangEditor('【' + tousseName + '】', tousseID);
- }
- });
+ if(sstsConfig.showTousseNoteOnClickTousse == 2){
+ if (checked) {
+ loadLoginUserUnViewedTousseDefinitionNote(tousseID);
+ }
+ }else {
+ if (!Ext.isEmpty(note) && checked) {
+ showTousseDefinitionNote(tousseName, tousseID);
+ }
}
}
function getSelAmount() {
@@ -5590,7 +5721,6 @@
packingTousseBtnClick_mask = null;
}
}
- var packingTousseBtnClick_mask = null;
function processActionBarcode(field) {
var barcode = field.getValue();
@@ -5814,6 +5944,24 @@
return;
}
}
+ if(sstsConfig.showTousseNoteOnClickTousse == 2){
+ var tousseIDArray = []
+ for (var i = 0; i < dest.length; i++) {
+ var pNode = dest[i];;
+ var tousseID = pNode.get('tousseID');
+ tousseIDArray.push(tousseID)
+ }
+ if (tousseIDArray.length > 1) {
+ if(!loadLoginUserUnViewedTousseDefinitionNote(tousseIDArray.join(';'),true)){
+ return
+ }
+ }else if (tousseIDArray.length == 1) {
+ var tousseID = tousseIDArray[0];
+ if(!loadLoginUserUnViewedTousseDefinitionNote(tousseID,true)){
+ return
+ }
+ }
+ }
var params = [];
var packedPhotographed1 = true;
var packedPhotographed2 = true;