org

季培红
1 parent 57515b13
Showing 5 changed files with 56 additions and 11 deletions
tests/Staff_Management/Organization/public_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
 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
+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
+