Merge branch 'feature/jipeihong' into 'master'

Feature/jipeihong See merge request !11

Merge branch 'feature/jipeihong' into 'master'
Feature/jipeihong See merge request !11
季培红
2 parents 752ceca1 a8523191
Showing 9 changed files with 199 additions and 14 deletions
atdd/ATDDCase.py
atdd/PcPost.py
tests/Staff_Management/AdminSettings/Staff_attribute/test_add_Attribute.py
tests/Staff_Management/Organization/public_org.py
tests/Staff_Management/Organization/test_add_org.py
tests/Staff_Management/Organization/test_changeOrder.py
tests/Staff_Management/Organization/test_DepartmentMember.py → tests/Staff_Management/Organization/test_departmentMember.py
tests/Staff_Management/Organization/test_search_org.py
tests/Staff_Management/Organization/tets_edit_org.py
@@ -18,7 +18,7 @@ class ATDDCase(unittest.TestCase):
     mobile = '17321009308'
-    psw = '123456'
+    psw = '222222'
     jipeihong_uid = '755DE0550A69039F0BA12102F4A4F8E1' # 季培红的UID
     cert = ('1_vchangyi.com_bundle.crt', '2_vchangyi.com.key')
@@ -10,7 +10,7 @@ class PcPost(ATDDCase):
         result = data['result']
         if isinstance(result, list):
-            user = result[1]
+            user = result[0]
             if len(result) > 1:
                 print("选择企业：", user['enterpriseInfo']['epName'])
+from atdd.PcPost import PcPost
+import random
+
+# 新增员工属性
+
+class AddAttribute(PcPost):
+
+    interfaceUrl = "/contact/Apicp/Attribute/Save"
+
+    # 0~10000的随机整数
+    x = random.randint(0, 10000)
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 新增单行文本属性
+    def test_add_text(self):
+        data = {
+            "attr_name": "单行文本"+str(self.x),
+            "position": 0,
+            "type": 1,  #类型为单行文本
+            "order": 0,
+            "is_system": 0,
+            "is_open_cp": 1,
+            "is_open_cp_edit": 0,
+            "is_open": 1,
+            "is_open_edit": 0,
+            "is_required_cp": 0,
+            "is_required_cp_edit": 0,
+            "is_required": 0,
+            "is_required_edit": 0,
+            "is_show": 1,
+            "is_show_edit": 0
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        return result
+
+    # 新增多行文本
+    def test_add_MultilineText(self):
+        data = {
+            "attr_name": "多行文本" + str(self.x),
+            "position": 0,
+            "type": 2, #类型为多行文本
+            "order": 0,
+            "is_system": 0,
+            "is_open_cp": 1,
+            "is_open_cp_edit": 0,
+            "is_open": 1,
+            "is_open_edit": 0,
+            "is_required_cp": 0,
+            "is_required_cp_edit": 0,
+            "is_required": 0,
+            "is_required_edit": 0,
+            "is_show": 1,
+            "is_show_edit": 0
+        }
+        result = self.PcPost(self.interfaceUrl, data)
+        return result
+
+    # 新增日期
+    def test_add_Date(self):
+        data = {
+            "attr_name": "日期" + str(self.x),
+            "position": 0,
+            "type": 4,  # 类型为日期
+            "order": 0,
+            "is_system": 0,
+            "is_open_cp": 1,
+            "is_open_cp_edit": 0,
+            "is_open": 1,
+            "is_open_edit": 0,
+            "is_required_cp": 0,
+            "is_required_cp_edit": 0,
+            "is_required": 0,
+            "is_required_edit": 0,
+            "is_show": 1,
+            "is_show_edit": 0
+        }
+        result = self.PcPost(self.interfaceUrl, data)
+        return result
+
+    # 新建单选
+    def test_add_singleSelect(self):
+        data = {
+            "option[0][name]": "漂亮",
+            "option[0][value]": 0,
+            "option[1][name]": "可爱",
+            "option[1][value]": 1,
+            "option[2][name]": "任性",
+            "option[2][value]": 2,
+            "option[3][name]": "有钱",
+            "option[3][value]": 3,
+            "attr_name": "单选" + str(self.x),
+            "position": 0,
+            "type": 7,  # 类型为单选
+            "order": 0,
+            "is_system": 0,
+            "is_open_cp": 1,
+            "is_open_cp_edit": 0,
+            "is_open": 1,
+            "is_open_edit": 0,
+            "is_required_cp": 0,
+            "is_required_cp_edit": 0,
+            "is_required": 0,
+            "is_required_edit": 0,
+            "is_show": 1,
+            "is_show_edit": 0
+        }
+        result = self.PcPost(self.interfaceUrl, data)
+        return result
+
+    # 新建多选
+    def test_add_multiSelect(self):
+        data = {
+            "option[0][name]": "漂亮",
+            "option[0][value]": 0,
+            "option[1][name]": "可爱",
+            "option[1][value]": 1,
+            "option[2][name]": "任性",
+            "option[2][value]": 2,
+            "option[3][name]": "有钱",
+            "option[3][value]": 3,
+            "attr_name": "多选" + str(self.x),
+            "position": 0,
+            "type": 8,  # 类型为多选
+            "order": 0,
+            "is_system": 0,
+            "is_open_cp": 1,
+            "is_open_cp_edit": 0,
+            "is_open": 1,
+            "is_open_edit": 0,
+            "is_required_cp": 0,
+            "is_required_cp_edit": 0,
+            "is_required": 0,
+            "is_required_edit": 0,
+            "is_show": 1,
+            "is_show_edit": 0
+        }
+        result = self.PcPost(self.interfaceUrl, data)
+        return result
 from atdd.PcPost import PcPost
+import random
 class PulbicOrg(PcPost):
     url_ListChildren = "/Contact/Apicp/Department/ListChildren"
@@ -38,8 +39,9 @@ class PulbicOrg(PcPost):
         user_total = result['result']['list'][0]['user_total']
         return user_total
-
-
-
-
-
+    # 随机取一个部门，返回部门ID
+    def get_random_dptId(self):
+        top_Id = self.get_top_org()
+        dpId_all = self.get_all_dpId(top_Id)  # 所有部门的dpId
+        x = random.randint(0, len(dpId_all) - 1)  # 在所有部门中随机取一个部门
+        return dpId_all[x]
 \ No newline at end of file
@@ -14,7 +14,7 @@ class AddOrg(PcPost):
     # 添加非门店
     def test_add_org(self):
-        x = random.randint(0,1000)
+        x = random.randint(0,10000)
         top_dpId = PulbicOrg().get_top_org()
         data = {
             "department_id": None,
+from atdd.PcPost import PcPost
+from tests.Staff_Management.Organization.public_org import PulbicOrg
+
+class ChangeOrder(PcPost):
+
+    interfaceUrl = "/Contact/Apicp/Department/ChangeOrder"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    def test_changeOrder(self):
+        # 随机取一个部门
+        dptId = PulbicOrg().get_random_dptId()
+        data = {
+            "department_id": dptId,
+            "order":12
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+        return result
+
 from atdd.PcPost import PcPost
 from tests.Staff_Management.Organization.public_org import PulbicOrg
-import random
+
 # 点击组织，跳转至人员列表页面，即查询该组织下的人员情况
 class DepartmentMember(PcPost):
@@ -11,11 +11,10 @@ class DepartmentMember(PcPost):
         self.do_login(self.host, self.mobile, self.psw, self.domain)
     def test_departmentMember(self):
-        top_Id = PulbicOrg().get_top_org()
-        dpId_all = PulbicOrg().get_all_dpId(top_Id)  # 所有部门的dpId
-        x = random.randint(0, len(dpId_all) - 1)  # 在所有部门中随机取一个部门
+        # 随机取一个部门ID
+        dptId = PulbicOrg().get_random_dptId()
         data = {
-            "department_id[0]": dpId_all[x]
+            "department_id[0]": dptId
         }
         result = self.PcPost(self.interfaceUrl,data)
         print(result)
 \ No newline at end of file
@@ -14,7 +14,7 @@ class SearchOrg(PcPost):
     # 搜索存在的组织
     def test_search_org(self):
         data = {
-            "keyword": 123
+            "keyword": '小仙女'
         }
         result = self.PcPost(self.interfaceUrl,data)
         print(result)
+from atdd.PcPost import PcPost
+from tests.Staff_Management.Organization.public_org import PulbicOrg
+
+
+# 编辑组织
+class EditOrg(PcPost):
+
+    interfaceUrl = "/contact/Apicp/Department/EditQuery"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    def test_edit_query(self):
+        # 随机取一个部门ID
+        dptId = PulbicOrg().get_random_dptId()
+
+        data = {
+            "department_id": dptId
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+        return result
+