diff --git a/lib/sales.js b/lib/sales.js index d7bbd1d..2edda1d 100644 --- a/lib/sales.js +++ b/lib/sales.js @@ -888,11 +888,12 @@ function getDetSizheadTitle() { var width = texts[i].rect().size.width; if (width > 5) { var title = texts[i].name(); - logDebug("i=" + i + " title=" + title + " colIndex=" + colIndex); + // logDebug("i=" + i + " title=" + title + " colIndex=" + colIndex); if (!isNull(title) && isDefined(title)) { ret[title] = colIndex; } else { - ret[title] = "cm" + colIndex; + title = "cm" + colIndex; + ret[title] = colIndex; } temp[title] = colIndex; diff --git a/suite1.js b/suite1.js index cc69b0f..b8e9d5c 100644 --- a/suite1.js +++ b/suite1.js @@ -15,23 +15,23 @@ // #import "/Users/dlsoft_dev_4/Documents/slh_test/suite1.js" // 总经理 function test000All() { - colorSize = "head"; +// colorSize = "head"; debug = true; // ipadVer = "7.27";// var caseName="测试用例"; // TITLE_SXE = getTitleSXE();//新综合汇总 列表标题 // testCheckMenuAll();//菜单检查,跑用例前先跑一遍 -// run(caseName, "test220064");// - run(caseName, "onlyTest");// + run(caseName, "ts160073_74");// test160114 +// run(caseName, "onlyTest");// } function onlyTest(){ // delay(); -// UIATarget.localTarget().logElsementTree(); +// UIATarget.localTarget().logElementTree(); // UIATarget.localTarget().deactivateAppForDuration(10); // target.flickFromTo({ x:515, y:238 }, {x:515, y:197}) // delay(); try{ - getBillDetCSGoodsFieldIndex(); + }catch(e){ logWarn(e); } diff --git a/testcase/goods/goodsInc.js b/testcase/goods/goodsInc.js index adacb8a..2645466 100644 --- a/testcase/goods/goodsInc.js +++ b/testcase/goods/goodsInc.js @@ -469,7 +469,7 @@ function getQRDet(view, o) { var data = []; var texts = getTextFields(view); var y = 0, yPro = 0; - var hidden = "";// 隐藏的文本下标 标题隐藏和对应文本隐藏不一定都是取得到,分开取 + var hidden = [];// 隐藏的文本下标 标题隐藏和对应文本隐藏不一定都是取得到,分开取 for (var i = 0; i < texts.length; i++) { yPre = y; y = getY(texts[i]); @@ -478,7 +478,7 @@ function getQRDet(view, o) { } var w = texts[i].rect().size.width; if (w < 5) { - hidden += i + "," + hidden.push(i); } tfNum++; } @@ -487,12 +487,9 @@ function getQRDet(view, o) { // 根据货品栏判断行是否取值 有地方使用了这个验证或判断行数,不好修改 161220 if (texts[tfNum * j].value() != "") { var data1 = {}; - var ignore = 0; for (var i = 0; i < tfNum; i++) { - if (isInArray(hidden, i)) { - ignore++; - } else { - var index = tfNum * j + i - ignore; + if (!isIn(hidden, i)) { + var index = tfNum * j + i; var v = texts[index].value(); for ( var t in titles) { if (titles[t] == i) { @@ -704,8 +701,8 @@ function getSalesBillDetTfObject() { title = "cm" + tfNum;// 尺码头部 补全第一行尺码 } ret[title] = tfNum; - tfNum++; } + tfNum++; } ret["明细输入框个数"] = tfNum - ignore; debugObject(ret, "titles"); diff --git a/testcase/salesOrder/salesOrder.js b/testcase/salesOrder/salesOrder.js index babb29e..015bb35 100644 --- a/testcase/salesOrder/salesOrder.js +++ b/testcase/salesOrder/salesOrder.js @@ -598,7 +598,7 @@ function test160006() { tapButton(window, QUERY); qr = getQR(); - var ret = isEqualObject(qr.data[0], jo2); + var ret = isEqualObject2(qr.data[0], jo2, 1);// 操作日期的1分钟误差 tapLine(); qr = getQRDet(); @@ -1791,7 +1791,7 @@ function test160072() { } function ts160073_74() { - var addDet = {}; + var addDet = {}, alertMsgs = []; switch (colorSize) { case "no": addDet = { "明细" : [ { "货品" : "3035", "数量" : 10 } ] }; diff --git a/testcase/sizeHead/sizeHead.js b/testcase/sizeHead/sizeHead.js index 93b10ef..b0ac845 100644 --- a/testcase/sizeHead/sizeHead.js +++ b/testcase/sizeHead/sizeHead.js @@ -118,6 +118,7 @@ function testSizeHead002_shop1() { run("【采购订货+省代+参数2】采购订货,检查款号下拉表显示的价格", "test220058"); run("【销售开单+省代+参数2】销售开单-按订货开单,有吊牌这一列,且款号的吊牌价正确,正确开单", "test220060"); run("【销售开单+省代+参数2】检查销售开单有吊牌这一列,款号的吊牌价正确,正确开单打印", "test220062"); + run("【销售开单-开单】数量输入快速复制功能", "test220064"); } function testSizeHeadCheck() { @@ -983,13 +984,13 @@ function test220064Field(menu) { tf.doubleTap(); var titles = getDetSizheadTitle(); var view = getScrollView(-1), ret = true; - var str = getTFEnabledState(view, titles["颜色"] + 1, titles["col12"]); - logDebug("s="+(titles["颜色"] + 1)+" col12="+titles["col12"]); + var str = getTFEnabledState(view, titles["颜色"] + 1, titles["cm12"]); + logDebug("s=" + (titles["颜色"] + 1) + " cm12=" + titles["cm12"]); for (var i = 0; i < str.length; i++) { var able = str[i], ok; var v = getTextFieldValue(view, titles["颜色"] + 1 + i); if (able == "1") { - ok = v == 5; + ok = v == 1; } else { ok = v == ""; } @@ -1004,6 +1005,10 @@ function test220064Field(menu) { } return ret; } +// 放zy那 +function test220065() { + tapMenu("盘点管理", "新增盘点+"); +} function testEditBillSizeHead() { var colorSize = "head"; // tapMenu("销售开单", ADDBILL);