@newview/permission-service 1.2.43 → 1.2.45

package/README.md

@@ -1,3 +1,13 @@
+### 版本 1.2.45
+1、判断同一平台下手机号是否唯一
+
+
+### 版本 1.2.44
+1、更新
+
+### 版本 1.2.41
+1、更新
+
 ### 版本 1.2.40
 1、更新
 

package/dist/permission-service.js

@@ -7,8 +7,7 @@ var __publicField = (obj, key, value) => {
 import { BaseInstance } from "@newview/base-vue";
 import { defineComponent, ref, reactive, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createTextVNode, nextTick, toDisplayString, createElementBlock, Fragment, renderList, withDirectives, vShow, pushScopeId, popScopeId, onUnmounted, createCommentVNode, computed, withModifiers } from "vue";
 import { PlatformApi, PlatformGroupApi, ModuleApi, RoleApi, RoleModuleApi, InstitutionRoleApi, InstitutionTypeApi, InstitutioninforApi, InstitutionPlatformApi, InstitutionTreeApi, EnterpriseApi, LoginLogApi, UserinforApi, InstitutionUserApi, UserRoleApi, OAuthApi, UserSignApi, InstitutionLinePointApi, InstitutionPointApi, ProjectSummaryApi, DataBoardModuleApi, DataInistitutionRelationApi, DataInstitutionBoardRelationApi } from "@newview/permission-api";
-import { QueryWrapper, request } from "@newview/infrastructure";
-import { CorePlatformConfigApi, CorePartnerApi } from "@newview/permission-db-api";
+import { BaseApi, QueryWrapper, request } from "@newview/infrastructure";
 import { Icon, Tag, Checkbox, Divider, CheckboxGroup, Space } from "view-ui-plus";
 import { SelectPlatform, BaseLogin, PersonSel, getUserSealImg } from "@newview/permission-ui";
 import { SignTaskInfoApi } from "@newview/casign-api";
@@ -16,6 +15,35 @@ import { NvComFormUp } from "@newview/file-ui";
 import { ProvinceApi, CityApi, AreaApi, DictionaryDetailApi, DictionaryTypeApi } from "@newview/basics-api";
 import { FileApi, OSSFileApi, FileInfoApi } from "@newview/fileservice-api";
 import { NvMap } from "@newview/map";
+class DBCenterBaseApi extends BaseApi {
+  get ProxyName() {
+    return "CalcPythonApi";
+  }
+  constructor() {
+    super();
+    this.addHeader("projectid", 0);
+    this.addHeader("devprod", "prod");
+    this.addHeader("dbSkey", "08fb72ad2cf661088849ef17fdaab21a");
+  }
+}
+class CorePartnerApi extends DBCenterBaseApi {
+  get ControllerName() {
+    return "currency";
+  }
+  constructor() {
+    super();
+    this.addHeader("tableName", "core_partner");
+  }
+}
+class CorePlatformConfigApi extends DBCenterBaseApi {
+  get ControllerName() {
+    return "currency";
+  }
+  constructor() {
+    super();
+    this.addHeader("tableName", "core_platform_config");
+  }
+}
 const propDefine$l = {
   linkParam: {
     // 带入的参数
@@ -4507,12 +4535,14 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
     // 响应属性 | ref、reactive、computed
     __publicField(this, "institutionTree", ref([]));
     __publicField(this, "loadingInstitutionTree", ref(false));
+    __publicField(this, "insTreeIds", ref(""));
     // 响应式方法 | xxx = () => {}
     /**
      * 平台切换
      */
     __publicField(this, "doChangePlatform", (data) => {
       this.selectedPlatform = data;
+      console.log(data, "11111111111111111111;;;;");
       this.loadInsTree();
     });
     /**
@@ -4546,6 +4576,7 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
     __publicField(this, "doChangeInsTree", (datas) => {
       if (datas.length > 0) {
         this.selectedInsTree = datas[0];
+        this.insTreeUserGrid.value.setPageIndex(1);
         this.loadInstitutionTreeUsers({});
       }
     });
@@ -4903,17 +4934,14 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
           this.saveingUser.value = false;
           return;
         }
-        const queryWrapper2 = QueryWrapper.create();
-        queryWrapper2.eq("Phone", this.userFormModel.Phone).eq("IsDel", 0);
-        if (this.userFormModel.Id > 0) {
-          queryWrapper2.ne("Id", this.userFormModel.Id);
-        }
-        const apiResult2 = await this.userinforApi.isExist(queryWrapper2);
-        result = this.utilities.parseApiResult(apiResult2);
-        if (result) {
-          this.message.warning(`手机号 ${this.userFormModel.Phone} 已关联其他账号, 请重新输入!`);
-          this.saveingUser.value = false;
-          return;
+        let res = this.utilities.parseApiResult(await this.userinforApi.getInstitutionTreeAllUsers(0, this.selectedPlatform.Id));
+        if (res && res.length > 0) {
+          let user = res.filter((x) => x.IsDel == 0 && x.Phone == this.userFormModel.Phone && x.Id !== this.userFormModel.Id);
+          if (user.length > 0) {
+            this.message.warning(`手机号 ${this.userFormModel.Phone} 已在当前平台下关联其他账号, 请重新输入!`);
+            this.saveingUser.value = false;
+            return;
+          }
         }
       }
       const queryWrapper = QueryWrapper.create();
@@ -5407,6 +5435,10 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
     this.loadingInstitutionTree.value = true;
     const apiResult = await this.institutionTreeApi.getInstitutionTrees(this.selectedPlatform.Id);
     const datas = this.utilities.parseApiResult(apiResult);
+    if (datas && datas.length > 0) {
+      this.insTreeIds.value = datas.map((item) => item.Id).join(",");
+      this.utilities.parseApiResult(await this.userinforApi.getInstitutionTreeAllUsers(0, this.selectedPlatform.Id));
+    }
     this.loadingInstitutionTree.value = false;
     const whileChildData = (pId) => {
       const childDatas = datas.filter((item) => item.PId == pId);
@@ -14211,8 +14243,8 @@ class ModuleInstance2 extends BaseInstance {
   // 响应式方法 | xxx = () => {}
   //#endregion 业务逻辑  END
 }
-const Module_vue_vue_type_style_index_0_scoped_a73dad2e_lang = "";
-const _withScopeId$1 = (n) => (pushScopeId("data-v-a73dad2e"), n = n(), popScopeId(), n);
+const Module_vue_vue_type_style_index_0_scoped_23a8ab5f_lang = "";
+const _withScopeId$1 = (n) => (pushScopeId("data-v-23a8ab5f"), n = n(), popScopeId(), n);
 const _hoisted_1$4 = { style: { "height": "650px", "overflow-y": "auto" } };
 const _hoisted_2$2 = {
   class: "import-module",
@@ -14482,7 +14514,7 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const subModule = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["render", _sfc_render$5], ["__scopeId", "data-v-a73dad2e"]]);
+const subModule = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["render", _sfc_render$5], ["__scopeId", "data-v-23a8ab5f"]]);
 const type = "FeatureCollection";
 const features = [
   {
@@ -30170,7 +30202,7 @@ let ProjectUserinforInstance$1 = class ProjectUserinforInstance extends BaseInst
   }
   //#endregion 系统平台  END
 };
-const Sublinepoins_vue_vue_type_style_index_0_scoped_5bc5e71a_lang = "";
+const Sublinepoins_vue_vue_type_style_index_0_scoped_cb9d2558_lang = "";
 const _hoisted_1$3 = { class: "instree-search" };
 const _hoisted_2$1 = { class: "instree-list" };
 const _hoisted_3$1 = { class: "nv-flex-1 nv-flex-col map-box" };
@@ -30439,7 +30471,7 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const sublinepoins = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$4], ["__scopeId", "data-v-5bc5e71a"]]);
+const sublinepoins = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$4], ["__scopeId", "data-v-cb9d2558"]]);
 const propDefine$3 = {
   Id: {
     default: 0,