Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetTable.jsp =================================================================== diff -u -r32732 -r32851 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetTable.jsp (.../chargeSetTable.jsp) (revision 32732) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetTable.jsp (.../chargeSetTable.jsp) (revision 32851) @@ -46,8 +46,17 @@ width: 100px; height: 20px; } + #chargeSetMain table .bodyTd .button { + width: 18px; + height: 18px; + background: #8DCC6A; + color: #fff; + border: none; + cursor: pointer; + } #chargeSetMain table .bodyTd .num { - width: 70px; + width: 25px; + margin: 0 5px; } .checkbox { display: inline-block; Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetForm.js =================================================================== diff -u -r32742 -r32851 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetForm.js (.../chargeSetForm.js) (revision 32742) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetForm.js (.../chargeSetForm.js) (revision 32851) @@ -24,12 +24,26 @@ updateSum(index); } -//更新数量 -function updateNum(index, k) { +//减少数量 +function reduceNum(index, k) { var num = $('.num_' + index + '_' + k).val(); + num--; + updateNum(index, k, num) +} + +//添加数量 +function addNum(index, k) { + var num = $('.num_' + index + '_' + k).val(); + num++; + updateNum(index, k, num) +} + +//更新数量 +function updateNum(index, k, newNum) { + var num = (newNum == undefined) ? $('.num_' + index + '_' + k).val() : newNum; var currentPrice = $('.currentPrice_' + index + '_' + k).text(); var n = 0; - if (isNaN(num) || num == '') { + if (isNaN(num) || num === '') { n = 0; $('.num_' + index + '_' + k).val(''); } else { @@ -197,7 +211,11 @@ amount = specificationList[k].amount; numbers += amount; } - html += '
'; + html += ''; + html += ''; + html += ''; + html += ''; + html += '
'; } for (var z = 0; z < fixedModeList.length; z++) { var fixedAmount = 0; @@ -213,7 +231,7 @@ html += ''; } } - html += '' + numbers + '
' + html += '' + numbers + '
' html += ''; return html; } @@ -255,6 +273,7 @@ function save(chargeSetWin, grid) { var trLen = $('#chargeSetTable').find('tr').length; var foreignTousseChargeInfos = []; + var modeIsNull = true; for (var i = 0; i < trLen - 1; i++) { var supplierName = $('.supplierName_' + i).text(); var totalPrice = $('.sumPrices_' + i).text(); @@ -323,7 +342,7 @@ foreignTousseChargeModeRate: toFloat(chargeRate), fixedTotalPrice: 0, foreignTousseChargeModeName: chargeName, - foreignTousseChargeModeID:parseInt(chargeId), + foreignTousseChargeModeID: parseInt(chargeId), chargeSettingSpecItems: chargeSettingSpecItems } chargeSettingModeItems.push(obj); @@ -338,7 +357,14 @@ chargeSettingModeItems: chargeSettingModeItems } foreignTousseChargeInfos.push(obj); + if (chargeSettingModeItems.length > 0) { + modeIsNull = false; + } } + if (modeIsNull) { + showResult('规格和系数不能为空!'); + return + } $.ajax({ type: 'post', dataType: 'json', @@ -404,7 +430,11 @@ foreignTousseChargeModeRate = chargeSettingModeItems[k].foreignTousseChargeModeRate; } } - foreignTousseChargeModeRate = (foreignTousseChargeModeRate == 0) ? chargeModeList[0].rate : foreignTousseChargeModeRate; + var rate = 0; + if (chargeModeList.length > 0) { + rate = chargeModeList[0].rate; + } + foreignTousseChargeModeRate = (foreignTousseChargeModeRate == 0) ? rate : foreignTousseChargeModeRate; specificationListArray[i] = specificationList; fixedModeListArray[i] = fixedModeList; html += '