Explorar el Código

feat(销售订单): 添加新的机构列表查询接口并更新调用逻辑

liujt hace 4 meses
padre
commit
b0a8d57084

+ 12 - 0
src/api/system/organization/index.js

@@ -11,6 +11,18 @@ export async function listOrganizations (params) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+/**
+
+- 查询机构列表
+- @param params 查询条件
+*/
+export async function listOrganizationsNew (data) {
+  const res = await request.post('/main/group/v2/getGroupList', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
 /**
  * 查询人员列表

+ 4 - 2
src/views/saleManage/saleOrder/components/addDialog.vue

@@ -634,7 +634,7 @@
   import projectListDialog from './projectListDialog.vue';
 
   import paymentList from './paymentList.vue';
-  import { listOrganizations } from '@/api/system/organization';
+  import { listOrganizations, listOrganizationsNew } from '@/api/system/organization';
   import { copyObj } from '@/utils/util';
   import { enterprisePage } from '@/api/contractManage/contractBook';
   // import fileMain from '@/components/addDoc/index.vue';
@@ -956,7 +956,9 @@
       },
       // 获取公司数据
       getGroupAll() {
-        listOrganizations().then((list) => {
+        const apiRequest = this.clientEnvironmentId == 6 ? listOrganizationsNew({deptIds: ['1998632792148717569', '1998632872721297409']}) : listOrganizations();
+        apiRequest.then((list) => {
+          console.log('listOrganizations', list);
           this.groupData = list;
           this.groupTreeData = this.$util.toTreeData({
             data: list,

+ 4 - 2
src/views/saleManage/saleOrder/components/addDialogNew.vue

@@ -749,7 +749,7 @@
   import projectListDialog from './projectListDialog.vue';
 
   import paymentList from './paymentList.vue';
-  import { listOrganizations } from '@/api/system/organization';
+  import { listOrganizations, listOrganizationsNew } from '@/api/system/organization';
   import { copyObj } from '@/utils/util';
   import { enterprisePage } from '@/api/contractManage/contractBook';
   // import fileMain from '@/components/addDoc/index.vue';
@@ -1088,7 +1088,9 @@
       },
       // 获取公司数据
       getGroupAll() {
-        listOrganizations().then((list) => {
+        const apiRequest = this.clientEnvironmentId == 6 ? listOrganizationsNew({deptIds: ['1998632792148717569', '1998632872721297409']}) : listOrganizations();
+        apiRequest.then((list) => {
+          console.log('listOrganizations', list);
           this.groupData = list;
           this.groupTreeData = this.$util.toTreeData({
             data: list,