@cpzxrobot/sdk 1.1.52 → 1.1.54

package/dist/project_gateway.js

@@ -125,6 +125,15 @@ class ProjectGateway extends Object {
                         }
                     }, fileName);
                 });
+            },
+            approval: (id, agree, auditInfo) => {
+                return this.context.ready.then((axios) => {
+                    return axios.post(`/api/v2/coremde-sale/project/inquiry/approve`, {
+                        id,
+                        agree,
+                        auditInfo,
+                    });
+                });
             }
         };
     }

package/dist/user_gateway.js

@@ -117,10 +117,11 @@ class UserGateway extends Object {
             return axios.get(`/api/v2/coremde-sale/user/city/get?area_code=${area_code}`);
         });
     }
-    listByRole(companyId, role) {
-        return this.context.ready.then((axios) => {
-            return axios.get(`/api/v2/company/${companyId}/users?roleCode=${role}`);
-        });
+    async listByRole(role) {
+        var axios = await this.context.ready;
+        var factory = await this.context.user.getSelectedFarm();
+        //当前如果打开的是公司，则说明该应用支持在公司级别打开，则要求该应用应该有对应的公司级别的角色配置，所以并不需要查找公司下属工厂或工厂的对应公司，再去查找用户
+        return axios.get(`/api/v2/company/${factory.id}/users?roleCode=${role}`);
     }
     async mypermission() {
         var axios = await this.context.ready;
@@ -144,17 +145,25 @@ class UserGateway extends Object {
                     });
                 });
             },
-            list: (id, status) => {
+            list: (id, status, pageNo = undefined, pageSize = undefined) => {
                 return this.context.ready.then((axios) => {
                     return axios.post(`/api/v2/coremde-sale/approval/list`, {
                         status,
-                        userId: id
+                        userId: id,
+                        pageNo,
+                        pageSize
                     });
                 });
             },
-            submits: (id) => {
+            submits: (id, pageNo = undefined, pageSize = undefined) => {
                 return this.context.ready.then((axios) => {
-                    return axios.get(`/api/v2/coremde-sale/approval/submit/list?userId=${id}`);
+                    return axios.get(`/api/v2/coremde-sale/approval/submit/list`, {
+                        params: {
+                            userId: id,
+                            pageNo,
+                            pageSize
+                        }
+                    });
                 });
             }
         };
@@ -240,9 +249,13 @@ class UserGateway extends Object {
             },
         };
     }
-    info() {
-        return this.context.ready.then((axios) => {
-            return axios.get(`/api/v1/user/info`);
+    async info() {
+        var axios = await this.context.ready;
+        var factory = await this.context.user.getSelectedFarm();
+        return axios.get(`/api/v1/user/info`, {
+            params: {
+                selected_farm: factory
+            }
         });
     }
 }

package/index.ts

@@ -104,7 +104,6 @@ export class Cpzxrobot {
           // 在发送请求之前在头部添加token
           config.headers.Authorization = this.token;
           // 解析和验证Token
-
           return config;
         },
         function (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cpzxrobot/sdk",
-  "version": "1.1.52",
+  "version": "1.1.54",
   "description": "提供给上海正芯数智APP第三方H5应用使用的SDK",
   "main": "dist/index.js",
   "scripts": {

package/project_gateway.ts

@@ -163,6 +163,15 @@ export class ProjectGateway extends Object {
             }
           },fileName);
         });
+      },
+      approval:(id: number, agree: 1 | 0, auditInfo: string) =>{
+        return this.context.ready.then((axios) => {
+          return axios.post(`/api/v2/coremde-sale/project/inquiry/approve`, {
+            id,
+            agree,
+            auditInfo,
+          });
+        });
       }
     };
   }

package/readme.md

@@ -147,6 +147,7 @@ baseURL: "/"
 | cpzxrobot().user.listByRole | 列出用户（传入公司和角色） |
 | cpzxrobot().user.approval.list | 获取用户审批列表，传入userId和status参数 |
 | cpzxrobot().user.approval.count | 获取用户审批列表的数量，传入userId和status参数 |
+| cpzxrobot().user.approval.submits | 获取已提交的用户审批 |
 | cpzxrobot().user.checkin.add | 添加用户签到记录,传入userId和address参数 |
 | cpzxrobot().user.checkin.list | 列出用户签到记录,传入userId和date参数 |
 | cpzxrobot().user.searchHistory.list | 列出用户搜索历史记录,传入type参数 |
@@ -172,6 +173,7 @@ baseURL: "/"
 | cpzxrobot().project.inquiry.get | 获得项目询盘信息，传入id参数 |
 | cpzxrobot().project.inquiry.add | 添加项目询盘信息，传入project_id和询盘内容 |
 | cpzxrobot().project.inquiry.export | 导出项目询盘信息，传入project_id参数，建议传入自定义文件名，否则默认文件名 |
+| cpzxrobot().project.inquiry.approval | 审批项目询盘，传入id参数和审批意见 |
 | cpzxrobot().project.document.list | 获得项目文档列表，传入project_id参数 |
 | cpzxrobot().project.material.list | 获得项目物料到货列表，传入project_id参数 |
 | cpzxrobot().project.attendance.list | 获得项目到岗列表，传入project_id参数 |

package/user_gateway.ts

@@ -129,10 +129,11 @@ export class UserGateway extends Object {
     });
   }
 
-  listByRole(companyId: number,role: string) {
-    return this.context.ready.then((axios) => {
-      return axios.get(`/api/v2/company/${companyId}/users?roleCode=${role}`);
-    });
+  async listByRole(role: string) {
+    var axios = await this.context.ready;
+    var factory = await this.context.user.getSelectedFarm();
+    //当前如果打开的是公司，则说明该应用支持在公司级别打开，则要求该应用应该有对应的公司级别的角色配置，所以并不需要查找公司下属工厂或工厂的对应公司，再去查找用户
+    return axios.get(`/api/v2/company/${factory.id}/users?roleCode=${role}`);
   }
 
   async mypermission() {
@@ -160,17 +161,25 @@ export class UserGateway extends Object {
           });
         });
       },
-      list: (id: number, status: any) => {
+      list: (id: number, status: any, pageNo: number | undefined = undefined, pageSize: number | undefined = undefined) => {
         return this.context.ready.then((axios) => {
           return axios.post(`/api/v2/coremde-sale/approval/list`, {
             status,
-            userId: id
+            userId: id,
+            pageNo,
+            pageSize
           });
         });
       },
-      submits: (id: number) => {
+      submits: (id: number, pageNo: number | undefined = undefined, pageSize: number | undefined = undefined) => {
         return this.context.ready.then((axios) => {
-          return axios.get(`/api/v2/coremde-sale/approval/submit/list?userId=${id}`);
+          return axios.get(`/api/v2/coremde-sale/approval/submit/list`,{
+            params: {
+              userId: id,
+              pageNo,
+              pageSize
+            }
+          });
         });
       }
     }
@@ -267,9 +276,13 @@ export class UserGateway extends Object {
     }
   }
 
-  info() {
-    return this.context.ready.then((axios) => {
-      return axios.get(`/api/v1/user/info`);
+  async info() {
+    var axios = await this.context.ready;
+    var factory = await this.context.user.getSelectedFarm();
+    return axios.get(`/api/v1/user/info`, {
+      params: {
+        selected_farm: factory
+      }
     });
   }
 }