';
+ }
var basketElement = '';
}
-
- basketElement += '' + (sequence&&sequence>0?(sequence+'.' + basketName):basketName) + '' + imageButton +'';
+ basketElement += '' + (sequence&&sequence>0?(sequence+'.' + basketName):basketName) +''+''+imageButton+'';
if(sumCount){
basketElement += '0/'+sumCount+'';
basketElement += '';
@@ -2549,7 +2546,6 @@
var hiddenjson = JSON.parse(hideStr);
var scanedGoodsArray = new Array();
-
$(this).find('dl').children().each(function(i,element){
if($(this).attr('type') == 'hidden'){
var itemJson = $(this).val();
@@ -6059,7 +6055,6 @@
}
if(record.classifyBaskets != null){
- console.log(record.classifyBaskets)
for(var i = 0 ; i< record.classifyBaskets.length ; i++){
var basket = record.classifyBaskets[i];
var washClassifyType = basket.washClassifyType;
@@ -6293,6 +6288,7 @@
var containerBarcode = result[i].containerBarcode;
var containerName = result[i].containerName;
var id = result[i].id;
+ var washClassifyType = result[i].washClassifyType;
var sumAmount = 0;
var text = '';
var sumText = '';
@@ -6305,7 +6301,7 @@
var basketElement = '';
+ }
var basketElement = '';
+ }
var basketElement = '';
+ }
basketInfo.sequence = sequence;
liElement.find('input:first').val(JSON.stringify(basketInfo))
var showName = sequence > 0?(sequence + '.' + basketInfo.containerName):basketInfo.containerName;
- liElement.find('div.basketName div:last').html(showName);
+ liElement.find('div.basketName div:last').html(showName+imageButton);
}
}
}
+/*
+ *IE8以下兼容document.getElementsByClassName
+ */
+function documentGetElementsByClassName(className) {
+ if (!document.getElementsByClassName) {
+ document.getElementsByClassName = function(className) {
+ var children = document.getElementsByTagName('*');
+ var elements = new Array();
+ for (var i = 0; i < children.length; i++) {
+ var child = children[i];
+ var classNames = child.className.split(' ');
+ for (var j = 0; j < classNames.length; j++) {
+ if (classNames[j] == className) {
+ elements.push(child);
+ break;
+ }
+ }
+ }
+ return elements;
+ };
-function userContainer(that,sumAmount,basketName,basketBarcode,classifyBasketId){
+ return document.getElementsByClassName(className);
+ } else {
+ return document.getElementsByClassName(className);
+ }
+}
+function basketLoadGoods(basketName,basketBarcode,classifyBasketId){
+ var width = 740;
+ var height = 400;
+ var designedTousseWidth = 980;
+ var designedTousseHeight = 700;
+ var designedWidth = 1920;
+ var designedHeight = 1080;
+ var actualWidth = window.screen.availWidth;
+ var actualHeight = window.screen.availHeight;
+ var offsetTop = 100;
+ var heightExtra = 10;
+ if(resolution == '1980'){
+ width = 1080;
+ height = 800;
+ }
+ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
+ var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
+
+ var bodyZoom = calculateZoomRatio(2600,1462,actualWidth,actualHeight);
+
+ width = size.width;
+ height = size.height;
+ offsetTop = offsetTop*zoomRatio;
+ layerIndex=layer.open({
+ type : 2,
+ title : ['['+basketName + '] 已装载物品列表',true],
+ content : 'basketLoadGoodsView.jsp?resolution=' + resolution + '&width=' + width + '&height=' + height + '&basketBarcode=' + basketBarcode + '&classifyBasketId=' + classifyBasketId,
+ area : [ width/bodyZoom*1 + 'px' , height/bodyZoom*1 +heightExtra + 'px'],
+ border : [5, 0.3, '#fff', true],
+ closeBtn : [2 , true],
+ offset : [offsetTop+'px',(2600-(width/bodyZoom*1))/2+'px']
+ });
+}
+function userContainer(that,sumAmount,basketName,basketBarcode,classifyBasketId,type){
+ var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
+ var imageButton = '';
+ if(showBasketLoadMaterialAmount == true){
+ imageButton = '';
+ }
var basketElement = '