sizeHead

jimxim · Dec 9, 2016 · 1fa16d1 · 1fa16d1
1 parent 2476f92
commit 1fa16d1
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 23 deletions.
diff --git a/all.js b/all.js
@@ -59,6 +59,8 @@
 #import "testcase/shopOut/shopOut.js"
 #import "testcase/shopOut/shopOutFields.js"
 
+#import "testcase/sizeHead/sizeHead.js"
+
 #import "testcase/statisticAnalysis/saProfit.js"
 #import "testcase/statisticAnalysis/saSynthesis.js"
 #import "testcase/statisticAnalysis/statisticAnalysis.js"

diff --git a/lib/commonInc.js b/lib/commonInc.js
@@ -57,7 +57,7 @@ function compareQR(title, type, order, pageInfoView, dataView, firstTitle,
                     b = valuePre >= value;
                 }
                 ret = ret && b;
-                 // logDebug(valuePre + "<= " + value + "," + b);       
+                // logDebug(valuePre + "<= " + value + "," + b);
             }
             valuePre = value;
         }
@@ -468,9 +468,19 @@ function setMultiChoiceValue(view, f) {
     // for (var i = 0; i < valueBtnIndexes.length; i++) {
     // tapButton(getPopView(), valueBtnIndexes[i]);
     // }
-    var valueArr = f.value.split(",");
+    var str = f.value;
     var view1 = getPopView(window, -1);
-    var a1 = view1.elements();
+    tapCheckBox(view1, str)
+    tapButton(getPop(window, -1), OK);
+}
+/**
+ * 点击checkBox
+ * @param view
+ * @param str eg:"花色,黑色"
+ */
+function tapCheckBox(view, str) {
+    var valueArr = str.split(",");
+    var a1 = view.elements();
     for (var j = 0; j < valueArr.length; j++) {
         var val = valueArr[j];
         var btnNum = -1, textNum = -1;
@@ -481,16 +491,15 @@ function setMultiChoiceValue(view, f) {
             }
             if (isUIAStaticText(e)) {
                 textNum++;
-                var v = getStaticTextValue(view1, textNum);
+                var v = getStaticTextValue(view, textNum);
                 if (v == val) {
                     break;
                 }
             }
         }
         // logDebug("val=" + val + " btnNum=" + btnNum);
-        tapButtonScroll(view1, btnNum);
+        tapButtonScroll(view, btnNum);
     }
-    tapButton(getPop(window, -1), OK);
 }
 /**
  * 点击单选按钮

diff --git a/lib/sales.js b/lib/sales.js
@@ -228,8 +228,10 @@ function editSalesBillDetSizehead(o) {
         var f = new TField("货品", TF_AC, start + 0, d["货品"], -1, 0);
         setTFieldsValue(view1, [ f ]);
 
-        var popView = getPopView();
-        tapButton(popView, d["颜色"]);
+        var popView = getPopView(window, -1);
+        tapCheckBox(popView, d["颜色"]);// 自动弹窗
+        tapButton(getPop(window, -1), OK);
+        // tapButton(popView, d["颜色"]);// 双击后出现颜色选择页面，单选
 
         var fields = [];
         var cmObj = d["尺码"];
@@ -906,6 +908,7 @@ function getDetSizheadTitle() {
         }
 
     }
+    debugObject(ret, "ret");
     return ret;
 }
 

diff --git a/run/run_suite1.sh b/run/run_suite1.sh
@@ -47,9 +47,9 @@ js_func="$js_func login008Rights login009Rights"
 #js_func="$js_func loginWarehouse001 "
 
 #slh5062 在sales/sales.js中 3个一组
-js_func="$js_func ts170557_000_1 ts170557_004_1 ts170557_005_1 ts170557_000_2 ts170557_004_2 ts170557_005_2"
-js_func="$js_func ts170557_000_3 ts170557_004_3 ts170557_005_3 ts170557_000_4 ts170557_004_4 ts170557_005_4"
-js_func="$js_func ts170557_000_5 ts170557_004_5 ts170557_005_5 ts170557_000_6 ts170557_004_6 ts170557_005_6"                 
+#js_func="$js_func ts170557_000_1 ts170557_004_1 ts170557_005_1 ts170557_000_2 ts170557_004_2 ts170557_005_2"
+#js_func="$js_func ts170557_000_3 ts170557_004_3 ts170557_005_3 ts170557_000_4 ts170557_004_4 ts170557_005_4"
+#js_func="$js_func ts170557_000_5 ts170557_004_5 ts170557_005_5 ts170557_000_6 ts170557_004_6 ts170557_005_6"                 
 
 SIMULATOR_NAME_OR_DEVICE_UDID="iPad Air 2 (9.2)"
 

diff --git a/suite1.js b/suite1.js
@@ -19,8 +19,8 @@ function test000All() {
  var caseName="测试用例";
 // TITLE_SXE = getTitleSXE();//新综合汇总 列表标题
 // testCheckMenuAll();//菜单检查，跑用例前先跑一遍
-// run(caseName, "test110001");//
- run(caseName, "onlyTest");//
+ run(caseName, "testEditBillSizeHead");//
+// run(caseName, "onlyTest");//
 }
 function onlyTest(){
 // delay();

diff --git a/testcase/goods/goods.js b/testcase/goods/goods.js
@@ -5,6 +5,10 @@
  */
 function setGoodsParams001() {
     var qo, o, ret = true;
+    qo = { "备注" : "开单是否显示尺码头部的界面" };
+    o = { "新值" : "0", "数值" : [ "默认不支持", "in" ] };
+    ret = isAnd(ret, setGlobalParam(qo, o));
+
     qo = { "备注" : "是否需要颜色尺码" };
     o = { "新值" : "1", "数值" : [ "均色均码", "in" ] };
     ret = isAnd(ret, setGlobalParam(qo, o));
@@ -34,10 +38,6 @@ function setGoodsParams001() {
     o = { "新值" : "0", "数值" : [ "老模式", "in" ] };
     ret = isAnd(ret, setGlobalParam(qo, o));
 
-    qo = { "备注" : "开单是否显示尺码头部的界面" };
-    o = { "新值" : "0", "数值" : [ "默认不支持", "in" ] };
-    ret = isAnd(ret, setGlobalParam(qo, o));
-
     qo = { "备注" : "调拨是否启用密码验证" };
     o = { "新值" : "0", "数值" : [ "不启用", "in" ] };
     ret = isAnd(ret, setGlobalParam(qo, o));
@@ -1537,7 +1537,7 @@ function ts100033Field(key1, key2, key3) {
     }
     delay();// 防止无法触发返回按钮
     tapReturn();
-
+   
     tapMenu2("货品查询");
     var qKeys = { "款号名称" : key1["名称"] };// 110026是自动生成款号
     var qFields = queryGoodsFields(qKeys);

diff --git a/testcase/goods/goodsFields.js b/testcase/goods/goodsFields.js
@@ -500,7 +500,7 @@ function getEditGoodsIndex2(idx) {
     }
     return idx;
 }
-function editGoodsField(key, show,texts) {
+function editGoodsField(key, show, texts) {
     if (isUndefined(key)) {
         return;
     }
@@ -1484,18 +1484,21 @@ function getSizeSort(type) {
     case "M":
         f = "02";
         break;
-    case "均码":
+    case "L":
         f = "03";
         break;
-    case "L":
+    case "XL":
         f = "04";
         break;
-    case "XL":
+    case "2XL":
         f = "05";
         break;
-    case "2XL":
+    case "3XL":
         f = "06";
         break;
+    case "4XL":
+        f = "07";
+        break;
     default:
         logWarn("未知尺码＝" + type);
         f = "99";

diff --git a/testcase/sizeHead/sizeHead.js b/testcase/sizeHead/sizeHead.js
@@ -0,0 +1,49 @@
+//LuXingXin <52619481 at qq.com> 20161209
+//尺码头部 衣服尺码 S M L XL 2XL 3XL 4XL
+// agc001 花色 黑色 白色 S M L XL 2XL
+//002 004
+
+/**
+ * 尺码表头 省代 开单2
+ */
+function setSizeHeadParams001() {
+    var qo, o, ret = true;
+    qo = { "备注" : "是否需要颜色尺码" };
+    o = { "新值" : "1", "数值" : [ "均色均码", "in" ] };
+    ret = isAnd(ret, setGlobalParam(qo, o));
+
+    qo = { "备注" : "开单是否显示多种小票格式打印的界面" };
+    o = { "新值" : "0", "数值" : [ "默认不支持" ] };
+    ret = isAnd(ret, setGlobalParam(qo, o));
+
+    qo = { "备注" : "开单是否显示尺码头部的界面" };
+    o = { "新值" : "1", "数值" : [ "只限于多个尺码", "in" ] };
+    ret = isAnd(ret, setGlobalParam(qo, o));// 设置后必须重启SLH
+
+    qo = { "备注" : "开单模式" };
+    o = { "新值" : "2", "数值" : [ "现金+刷卡+代收+汇款", "in" ] };
+    ret = isAnd(ret, setGlobalParam(qo, o));
+
+    qo = { "备注" : "价格模式" };
+    o = { "新值" : "0", "数值" : [ "统一的价格体系", "in" ] };
+    ret = isAnd(ret, setGlobalParam(qo, o));
+
+    qo = { "备注" : "货品建款的价格模式" };
+    o = { "新值" : "1", "数值" : [ "省代价格模式", "in" ] };
+    ret = isAnd(ret, setGlobalParam(qo, o));// 统一的价格体系才能切省代模式
+    return ret;
+}
+
+function testSizeHead001() {
+
+}
+
+function testEditBillSizeHead() {
+    colorSize = "head";
+    tapMenu("销售开单", ADDBILL);
+    var o = { "明细" : [
+            { "货品" : "agc001", "颜色" : "白色", "尺码" : { "L" : 2, "XL" : 3 } },
+            { "货品" : "agc001", "颜色" : "黑色", "尺码" : { "S" : 1 } } ] };
+    editSalesBill(o, colorSize);
+    return true;
+}