head

jimxim · Jan 9, 2017 · a2301d7 · a2301d7
1 parent dd0777f
commit a2301d7
Show file tree

Hide file tree

Showing 6 changed files with 286 additions and 43 deletions.
diff --git a/lib/sales.js b/lib/sales.js
@@ -869,7 +869,7 @@ function getSalesBillDetTfNum(o, idx) {
             x = getX(tf);
             arrX.push(x);// 尺码表头显示库存时TF的Y轴处于第二行，改成用X轴判断
             // 新增的图片列中的图片目前找到的最大偏移量为5
-            if (isRepetitione(arrX)) {// yPre > 0 && !isAqualNum(y, yPre, 10)
+            if (isRepetition(arrX)) {// yPre > 0 && !isAqualNum(y, yPre, 10)
                 break;
             }
         }

diff --git a/suite1.js b/suite1.js
@@ -24,16 +24,16 @@ function test000All() {
 
 // run(caseName, "setSizeHeadParams_1");//
 
- run(caseName, "onlyTest");//
+// run(caseName, "test220130");//
 }   
 function onlyTest(){
- UIATarget.localTarget().logElementTree();
+// UIATarget.localTarget().logElementTree();
 // UIATarget.localTarget().deactivateAppForDuration(10);
 // target.flickFromTo({ x:515, y:238 }, {x:515, y:197})
 // delay();
    try{  
-       var det =getQRCustUnshipping();
-       debugObject(det.data[0]);
+       var json={"客户未发":{"客户":"zbs"},"修改明细":[{"尺码" : { "L" : 1, "XL" : 2 }}]};
+       editBillUnshipping(json);
 // query();
 // var arr=[];
 // return isEqualCounts(arr);

diff --git a/testcase/goods/goods.js b/testcase/goods/goods.js
@@ -140,6 +140,8 @@ function setGoodsParams001() {
     o = { "新值" : "1", "数值" : [ "部分客户需要打印给客户和仓库", "in" ] };// 打印选项 客户用/仓库用
     ret = isAnd(ret, setGlobalParam(qo, o));
 
+    ret = isAnd(ret, setSales_order_deliver_mode1());// 销售订单发货模式 按订货开单
+
     qo = { "备注" : "退货期限(天数),销售开单退货时验证是否已经超出期限" };
     o = { "数值" : 0 };
     setGlobalParam2(qo, o);

diff --git a/testcase/goods/goodsInc.js b/testcase/goods/goodsInc.js
@@ -460,11 +460,11 @@ function getDetSizheadTFIndex(titles) {
         var tf = texts[i];
         x = getX(tf);
         arrX.push(x);
-        if (isRepetitione(arrX)) {
+        if (isRepetition(arrX)) {
             break;
         }
         var t = getKeyByXy(titleX, x);
-        ret[t] = i;
+        ret[t] = i;// 根据X轴取标题 过滤掉隐藏的内容
     }
     ret["明细输入框个数"] = i--;
     debugObject(ret, "尺码表头显示尺码，tf下标为");
@@ -490,15 +490,11 @@ function getQRDet(view) {
     var data = [];
     for (var j = 0; j < total; j++) {
         var data1 = {};
-        for (var i = 0; i < tfNum; i++) {
-            for ( var t in titles_tf) {
-                if (titles_tf[t] == i) {
-                    var index = tfNum * j + i;
-                    var v = textFields[index].value();
-                    data1[t] = v;
-                    break;
-                }
-            }
+        for ( var t in titles_tf) {
+            var index = tfNum * j + titles_tf[t];
+            var tf = textFields[index];// titles_tf已经排除隐藏内容
+            var v = tf.value();
+            data1[t] = v;
         }
         data.push(data1);
     }
@@ -508,7 +504,7 @@ function getQRDet(view) {
     for (; stNum < staticTexts.length; stNum++) {
         var x = getX(staticTexts[stNum]);
         arrX.push(x);
-        if (isRepetitione(arrX)) {
+        if (isRepetition(arrX)) {
             stNum--;
             break;
         }
@@ -517,7 +513,7 @@ function getQRDet(view) {
         var titlesX = titles["标题坐标"];
         for (j = 0; j < total; j++) {
             var data1 = {};
-            for (i = 0; i < stNum; i++) {
+            for (var i = 0; i < stNum; i++) {
                 var index = stNum * j + i;
                 var x = getX(staticTexts[index]);
                 for ( var t in titlesX) {
@@ -810,9 +806,9 @@ function getSalesBillDetTitle1Index(texts, order) {
     if (isUndefined(texts)) {
         texts = getStaticTexts(window);
     }
-    if (isUndefined(order)) {
-        order = "asc";
-    }
+//    if (isUndefined(order)) {
+//        order = "asc";
+//    }
     var arr = [ "选", "图", "#" ];
     for (var i = 0; i < arr.length; i++) {
         var title1 = arr[i];
@@ -2711,7 +2707,7 @@ function getUnique(arr) {
  * @param arr
  * @returns {Boolean}
  */
-function isRepetitione(arr) {
+function isRepetition(arr) {
     var hash = {};
     for ( var i in arr) {
         if (hash[arr[i]]) {

diff --git a/testcase/purchase/purchase.js b/testcase/purchase/purchase.js
@@ -858,7 +858,7 @@ function test120031_120032() {
         }
     }
 
-    ret = isAnd(ret, isEqual(30, sub(a2, a1)), !isRepetitione(arr));// 判断是否有重复款号
+    ret = isAnd(ret, isEqual(30, sub(a2, a1)), !isRepetition(arr));// 判断是否有重复款号
     return ret;
 }
 function test120013_1() {