@newview/permission-service 1.2.44 → 1.2.46

package/README.md

@@ -1,3 +1,12 @@
+### 版本 1.2.46
+1、修改系统平台，增加路段字段
+
+
+
+### 版本 1.2.45
+1、判断同一平台下手机号是否唯一
+
+
 ### 版本 1.2.44
 1、更新
 

package/dist/permission-service.js

@@ -285,7 +285,8 @@ let PlatformInstance$1 = class PlatformInstance extends BaseInstance {
       LastUpdateUserId: 0,
       LastUpdateUserName: "",
       LastUpdateDate: "",
-      DefaultPwd: ""
+      DefaultPwd: "",
+      RoadSection: ""
     }));
     __publicField(this, "platformFormItems", reactive([
       { model: "PlatformName", label: "系统名称", prop: "PlatformName", type: "Input", span: 24, rules: [{ required: true, message: "系统名称不能为空", trigger: "blur" }] },
@@ -308,7 +309,8 @@ let PlatformInstance$1 = class PlatformInstance extends BaseInstance {
       { model: "PlatformUrl", label: "系统URL", prop: "PlatformUrl", type: "Input", span: 24 },
       { model: "CABusinessKey", label: "CAKey", prop: "CABusinessKey", type: "Input", span: 24 },
       { model: "DefaultPwd", label: "用户默认密码", prop: "DefaultPwd", type: "Input", span: 24 },
-      { model: "OrderNo", label: "排序号", prop: "OrderNo", type: "InputNumber", span: 24 }
+      { model: "OrderNo", label: "排序号", prop: "OrderNo", type: "InputNumber", span: 24 },
+      { model: "RoadSection", label: "路段", prop: "RoadSection", type: "Input", span: 24 }
     ]));
     // 响应式方法 | xxx = () => {}
     /**
@@ -475,6 +477,7 @@ let PlatformInstance$1 = class PlatformInstance extends BaseInstance {
     this.platformFormModel.PId = data.PId;
     this.platformFormModel.LastUpdateDate = this.utilities.getCurrentDate();
     this.platformFormModel.DefaultPwd = data.DefaultPwd;
+    this.platformFormModel.RoadSection = data.RoadSection;
     this.editPlatformModalTitle.value = `编辑 - ${data.PlatformName}`;
     const tableData = (_a = this.platformGrid.value) == null ? void 0 : _a.getDatas();
     this.platformFormItems[4].selectProp.datas = tableData.length > 0 ? tableData == null ? void 0 : tableData.map((item) => {
@@ -4535,12 +4538,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();
     });
     /**
@@ -4574,6 +4579,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({});
       }
     });
@@ -4931,17 +4937,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();
@@ -5435,6 +5438,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);
@@ -11947,17 +11954,14 @@ class UserinforInstance2 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();