Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r41344 -r41400 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 41344) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 41400) @@ -239,6 +239,9 @@ }else if(msg.basket != null){ var isBasketLoaded = false; var currentNode; + //GDSKQYY-30：篮筐颜色 + var containerColorCode = msg.containerColorCode; + msg.basket.containerColorCode = containerColorCode; var basketItem = msg.basket; $("#basketsUl li").each(function(){ var hide = $(this).find('input'); @@ -261,7 +264,16 @@ if(showBasketLoadMaterialAmount == true){ imageButton = ''; } - var basketElement = '
  • '; + + var basketElement = ''; + var containerColorCode = basketItem.containerColorCode || ''; + var containerFontColor = setFontColor(containerColorCode) + if(containerColorCode !== ''){ + var containerFontColor = setFontColor(containerColorCode) + basketElement += '
  • '; + }else { + basketElement += '
  • '; + } basketElement += ''; basketElement += ''; basketElement += '删除'; @@ -1354,13 +1366,19 @@ offset : [offsetTop+'px',''] }); } -function userContainer(that,sumAmount,basketName,basketBarcode,classifyBasketId,type){ +function userContainer(that,sumAmount,basketName,basketBarcode,classifyBasketId,type,containerColorCode){ var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount; var imageButton = ''; if(showBasketLoadMaterialAmount == true){ imageButton = ''; } - var basketElement = '
  • '; + var basketElement = ''; + if(containerColorCode !== ''){ + var containerFontColor = setFontColor(containerColorCode) + basketElement += '
  • '; + }else { + basketElement += '
  • '; + } basketElement += ''; basketElement += ''; basketElement += '删除'; @@ -1410,11 +1428,18 @@ sumAmount+= parseInt(amount); text += name+'*'+amount+'，'; } - - var basketElement = '
  • '; + var containerColorCode = result[i].containerColorCode || ''; + var containerFontColor = setFontColor(containerColorCode) + + var basketElement = ''; + if(containerColorCode !== ''){ + basketElement += '
  • '; + }else { + basketElement += '
  • '; + } basketElement += ''; basketElement += ''; - basketElement += '使用'; + basketElement += '使用'; basketElement += ''; basketElement += ''; @@ -1440,7 +1465,7 @@ var amountStyle = (result[i].percentage == 1)?'color:red':''; - basketElement += '' + (containerName) + '' + ''+imageButton+''; + basketElement += '' + (containerName) + '' + ''+imageButton+''; basketElement += '' + sumAmount + ''; basketElement += '
    '+sumText+'
    '; basketElement += '
    • '; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r41066 -r41400 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 41066) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 41400) @@ -282,6 +282,8 @@ var containerName = result[i].containerName; var id = result[i].id; var washClassifyType = result[i].washClassifyType; + var containerColorCode = result[i].containerColorCode || ''; + var containerFontColor = setFontColor(containerColorCode) var sumAmount = 0; var text = ''; var sumText = ''; @@ -294,10 +296,15 @@ sumAmount += parseInt(amount); text += name + '*' + amount + '，'; } - var basketElement = '
  • '; - basketElement += ''; + var basketElement = ''; + if (containerColorCode !== '') { + basketElement += '
  • '; + } else { + basketElement += '
  • '; + } + basketElement += ''; basketElement += ''; - basketElement += '使用'; + basketElement += '使用'; basketElement += ''; basketElement += ''; @@ -323,7 +330,7 @@ var amountStyle = (result[i].percentage == 1) ? 'color:red' : ''; - basketElement += '' + (containerName) + '' + imageButton + ''; + basketElement += '' + (containerName) + '' + imageButton + ''; basketElement += '' + sumAmount + ''; basketElement += '
    ' + sumText + '
    '; basketElement += '
    • '; @@ -2057,30 +2064,36 @@ } // 清洗装载的篮筐点击使用按钮 -function userContainer(that, user, basketName, basketBarcode, classifyBasketId, washClassifyType) { +function userContainer(that, user, basketName, basketBarcode, classifyBasketId, washClassifyType, containerColorCode) { if (event && event.preventDefault) { event.preventDefault(); } else {//IE中阻止函数器默认动作的方式 window.event.returnValue = false; } if (user == 1) { var sumCount = $(that).parent().parent().find('.totalAmount').text(); - createBasketUiElement(basketBarcode, classifyBasketId, basketName, washClassifyType, undefined, false, parseInt(sumCount)); + createBasketUiElement(basketBarcode, classifyBasketId, basketName, washClassifyType, undefined, false, parseInt(sumCount), '', containerColorCode); $(that).parent().parent().remove(); } else if (user == 2) { var sumCount = $(that).find('.totalAmount').text(); - createBasketUiElement(basketBarcode, classifyBasketId, basketName, washClassifyType, undefined, false, parseInt(sumCount)); + createBasketUiElement(basketBarcode, classifyBasketId, basketName, washClassifyType, undefined, false, parseInt(sumCount), '', containerColorCode); $(that).remove(); } else { var sumCount = $(that).parent().find('.totalAmount').text(); - createBasketUiElement(basketBarcode, classifyBasketId, basketName, washClassifyType, undefined, false, parseInt(sumCount)); + createBasketUiElement(basketBarcode, classifyBasketId, basketName, washClassifyType, undefined, false, parseInt(sumCount), '', containerColorCode); $(that).parent().remove(); } } // 创建篮筐 -function createBasketUiElement(basketBarcode, classifyBasketId, basketName, washClassifyType, sequence, isIdCard, sumCount, basketSize) { - var basketElement = '
  • '; +function createBasketUiElement(basketBarcode, classifyBasketId, basketName, washClassifyType, sequence, isIdCard, sumCount, basketSize, containerColorCode) { + var basketElement = ''; + if (containerColorCode && containerColorCode !== '') { + var containerFontColor = setFontColor(containerColorCode) + basketElement += '
  • '; + } else { + basketElement += '
  • '; + } basketElement += ''; basketElement += ''; basketElement += '删除'; @@ -2162,7 +2175,7 @@ var hide = $(this).find('input'); var item = eval('(' + hide.val() + ')'); if (item.barcode == basketItem.containerBarcode) { - userContainer(this, 2, basketItem.containerName, basketItem.containerBarcode, basketItem.id, basketItem.washClassifyType); + userContainer(this, 2, basketItem.containerName, basketItem.containerBarcode, basketItem.id, basketItem.washClassifyType, basketItem.containerColorCode); return false; } }); @@ -2187,7 +2200,7 @@ $("#basketsUl").prepend(currentNode); // toggleItems(currentNode.find('span')[1]); } else { - createBasketUiElement(basketItem.containerBarcode, basketItem.id, basketItem.containerName, basketItem.washClassifyType, undefined, isIdCard); + createBasketUiElement(basketItem.containerBarcode, basketItem.id, basketItem.containerName, basketItem.washClassifyType, undefined, isIdCard, '', '', basketItem.containerColorCode); } if (saveBasketsArr.indexOf(basketItem.containerBarcode) == -1 && isSave) { saveBasketsArr.push(basketItem.containerBarcode); @@ -2689,10 +2702,13 @@ } // 没有完成装配的篮筐要确认是否用于回收 var containerStatus = msg.containerStatus; + //GDSKQYY-30：篮筐颜色 + var containerColorCode = msg.containerColorCode; + msg.basket.containerColorCode = containerColorCode; if (containerStatus == "清洗完成" || containerStatus == "清洗中") { loadDialogConfirm(msg, isSave); } else { - addBasketElement(msg.basket, false, isSave); + addBasketElement(msg.basket, false); loadNextBindingBasket(); } } else if (msg.tousseInstance != null) { @@ -4661,16 +4677,16 @@ break; } } - if(!has){ + if (!has) { existItem.count += record.count; - }else { + } else { existItem.count = record.count; } existItem.mainBindGoodIdArr.push({ goodId: params.goodId, count: record.count }); - }else { + } else { existItem.count = record.count; existItem.mainBindGoodIdArr.push({ goodId: params.goodId, @@ -8662,9 +8678,9 @@ } var enableSNCodeTime = null; -function enableSNCode(){ +function enableSNCode() { enableSNCodeTime = setInterval(function () { - if(snText !== ''){ + if (snText !== '') { loadBarcodeDevice(snText); } }, 2000); @@ -8675,7 +8691,7 @@ title: '摄像头OCR识别', modal: false, open: function () { - setTimeout(function(){ + setTimeout(function () { document.getElementById('snIframe').contentWindow.document.getElementById('click').click(); }, 1000); }, @@ -8689,9 +8705,9 @@ //ZSYKEQ-8：识别器械SN序列号 var snText = ''; function returnSNCode(text) { - if(text && text !== ''){ + if (text && text !== '') { snText = text; - }else { + } else { snText = ''; } } @@ -8728,7 +8744,7 @@ } //ZSYKEQ-8：识别器械SN序列号 - if(sstsConfig.enableSNRecognition){ + if (sstsConfig.enableSNRecognition) { $("#enableSNCode").show(); } if (sstsConfig.isShowTaskGroupOfRecyclingModule) { Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r41183 -r41400 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 41183) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 41400) @@ -5694,4 +5694,58 @@ tDate = '0' + tDate; } return tYear + "-" + tMonth + "-" + tDate + ' '; +} + +//GDSKQYY-30：字体颜色 +function setFontColor(colorCode){ + var fontColor = ''; + if (colorCode == "#ff0000") { + fontColor = '#fff' + } else if (colorCode == "#ff3300") { + fontColor = '#fff' + } else if (colorCode == "#ff6600") { + fontColor = '#fff' + } else if (colorCode == "#ff9900") { + fontColor = '#fff' + } else if (colorCode == "#0000ff") { + fontColor = '#fff' + } else if (colorCode == "#6600ff") { + fontColor = '#fff' + } else if (colorCode == "#ff00ff") { + fontColor = '#fff' + } else if (colorCode == "#ff0066") { + fontColor = '#fff' + } + return fontColor; +} + +//GDSKQYY-30：颜色名称 +function setColorName(colorCode){ + var colorName = ''; + if (colorCode == "#ff0000") { + colorName = '红' + } else if (colorCode == "#ff3300") { + colorName = '橙红' + } else if (colorCode == "#ff6600") { + colorName = '橙' + } else if (colorCode == "#ff9900") { + colorName = '橙黄' + } else if (colorCode == "#ffff00") { + colorName = '黄' + } else if (colorCode == "#99ff00") { + colorName = '黄绿' + } else if (colorCode == "#00ff00") { + colorName = '绿' + } else if (colorCode == "#00ffff") { + colorName = '蓝绿' + } else if (colorCode == "#0000ff") { + colorName = '蓝' + } else if (colorCode == "#6600ff") { + colorName = '蓝紫' + } else if (colorCode == "#ff00ff") { + colorName = '紫' + } else if (colorCode == "#ff0066") { + colorName = '紫红' + } + return colorName; } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js =================================================================== diff -u -r41010 -r41400 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js (.../expressRecycleForTouchScreen.js) (revision 41010) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js (.../expressRecycleForTouchScreen.js) (revision 41400) @@ -505,7 +505,14 @@ if (showBasketLoadMaterialAmount == true) { imageButton = ''; } - var basketElement = '
  • '; + var containerColorCode = basketItem.containerColorCode || ''; + var containerFontColor = setFontColor(containerColorCode) + var basketElement = ''; + if(containerColorCode !== ''){ + basketElement += '
  • '; + }else { + basketElement += '
  • '; + } basketElement += ''; basketElement += ''; basketElement += '删除'; @@ -545,6 +552,9 @@ } else if (msg.basket != null) { //不装配的篮筐不能回收扫描 var containerStatus = msg.basketStatus; + //GDSKQYY-30：篮筐颜色 + var containerColorCode = msg.containerColorCode; + msg.basket.containerColorCode = containerColorCode; if (containerStatus == "清洗完成" || containerStatus == "清洗中") { $("#dialogConfirm").dialog({ resizable: false, @@ -1751,7 +1761,7 @@ return encoded; } -function userContainer(that, user, basketName, basketBarcode, classifyBasketId) { +function userContainer(that, user, basketName, basketBarcode, classifyBasketId, containerColorCode) { if (event && event.preventDefault) { event.preventDefault(); } else {//IE中阻止函数器默认动作的方式 @@ -1765,6 +1775,7 @@ id: classifyBasketId, containerName: basketName, washClassifyType: '', + containerColorCode: containerColorCode, sumCount: parseInt(sumCount) } } @@ -1778,6 +1789,7 @@ id: classifyBasketId, containerName: basketName, washClassifyType: '', + containerColorCode: containerColorCode, sumCount: parseInt(sumCount) } } @@ -1842,16 +1854,23 @@ var sumAmount = 0; var text = ''; var sumText = ''; + var containerColorCode = result[i].containerColorCode || ''; + var containerFontColor = setFontColor(containerColorCode) for (var j = 0; j < result[i].classifiedItems.length; j++) { var name = result[i].classifiedItems[j].name; var amount = result[i].classifiedItems[j].amount; sumAmount += parseInt(amount); text += name + '*' + amount + '，'; } - var basketElement = '
  • '; + var basketElement = ''; + if(containerColorCode !== ''){ + basketElement += '
  • '; + }else { + basketElement += '
  • '; + } basketElement += ''; basketElement += ''; - basketElement += '使用'; + basketElement += '使用'; basketElement += ''; basketElement += ''; @@ -1877,7 +1896,7 @@ var amountStyle = (result[i].percentage == 1) ? 'color:red' : ''; - basketElement += '' + (containerName) + '' + imageButton + ''; + basketElement += '' + (containerName) + '' + imageButton + ''; basketElement += '' + sumAmount + ''; basketElement += '
    ' + sumText + '
    '; basketElement += '
    • '; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js =================================================================== diff -u -r40658 -r41400 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js (.../containerForm.js) (revision 40658) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js (.../containerForm.js) (revision 41400) @@ -48,6 +48,24 @@ } } }); + var containerColorStoreData = [ + ["
    红
    ", "红,#ff0000"], + ["
    橙红
    ", "橙红,#ff3300"], + ["
    橙
    ", "橙,#ff6600"], + ["
    橙黄
    ", "橙黄,#ff9900"], + ["
    黄
    ", "黄,#ffff00"], + ["
    黄绿
    ", "黄绿,#99ff00"], + ["
    绿
    ", "绿,#00ff00"], + ["
    蓝绿
    ", "蓝绿,#00ffff"], + ["
    蓝
    ", "蓝,#0000ff"], + ["
    蓝紫
    ", "蓝紫,#6600ff"], + ["
    紫
    ", "紫,#ff00ff"], + ["
    紫红
    ", "紫红,#ff0066"] + ] + var containerColorStore = new top.Ext.data.SimpleStore({ + data: containerColorStoreData, + fields: ['text', 'value'] + }); formObj = new top.Ext.FormPanel({ id: 'containerForm', frame: true, @@ -181,7 +199,7 @@ }, { columnWidth: 0.5, layout: 'form', - labelWidth: 80, + labelWidth: 100, items: [{ xtype: 'combo', fieldLabel: '清洗分类类型', @@ -226,6 +244,53 @@ } }] }, { + columnWidth: 0.5, + layout: 'form', + labelWidth: 80, + items: [{ + xtype: 'hidden', + id: 'colorCode', + name: 'colorCode' + },{ + xtype: 'combo', + labelWidth: 80, + fieldLabel: "篮筐颜色", + id: 'colorName', + name: 'colorName', + minChars: 0, + valueField: 'value', + displayField: 'text', + value: '', + mode: 'local', + store: containerColorStore, + forceSelection: true, + lazyInit: false, + triggerAction: 'all', + hideTrigger: false, + typeAhead: false, + selectOnFocus: true, + allowBlank: true, + editable: false, + anchor: '95%', + listeners: { + 'select': function (combo, records, eOpts) { + var value = combo.getValue(); + var tempColorValue = value.split(",")[0]; + var colorCode = value.split(",")[1]; + top.Ext.getCmp('colorCode').setValue(colorCode); + combo.setRawValue(tempColorValue); + combo.el.dom.style.background = colorCode; + }, + 'blur': function (combo) { + if (combo.getValue() !== '' && combo.getValue() !== null) { + var colorName = combo.getValue().split(",")[0]; + combo.setRawValue(colorName); + } + return false; + } + } + }] + }, { columnWidth: 1, layout: 'form', labelWidth: 80, @@ -350,6 +415,10 @@ top.Ext.getCmp('cleaningContainerIds').setValue(containerIdArr.join(';')); top.Ext.getCmp('cleaningContainerNames').setValue(containerNameArr.join(';')); } + if(action.result.data.colorCode !== ''){ + top.Ext.getCmp('colorName').el.dom.style.background = action.result.data.colorCode; + top.Ext.getCmp('colorName').setValue(setColorName(action.result.data.colorCode)) + } } }, failure: function (form, action) {