@newview/permission-service 1.2.45 → 1.2.47

package/README.md

@@ -1,3 +1,13 @@
+### 版本 1.2.47
+1.系统用户的签字可以通过上传签字图片代替CA签字
+
+
+
+### 版本 1.2.46
+1、修改系统平台，增加路段字段
+
+
+
 ### 版本 1.2.45
 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) => {
@@ -11583,6 +11586,7 @@ class UserinforInstance2 extends BaseInstance {
     __publicField(this, "doChangeInsTree", (datas) => {
       if (datas.length > 0) {
         this.selectedInsTree = datas[0];
+        this.insTreeUserGrid.value.setPageIndex(1);
         this.loadInstitutionTreeUsers({});
       }
     });
@@ -11951,17 +11955,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();
@@ -12332,6 +12333,98 @@ class UserinforInstance2 extends BaseInstance {
         }
       });
     });
+    /**
+     * 上传用户印章图片
+     */
+    __publicField(this, "doUploadUserSealImg", async () => {
+      if (this.utilities.isNull(this.userSignFormModel.CAUserSealImg)) {
+        this.proceedWithUpload();
+      } else {
+        this.modal.confirm({
+          title: "提示",
+          content: "确定要覆盖当前已存在的印章图片吗？",
+          onOk: async () => {
+            this.proceedWithUpload();
+          }
+        });
+      }
+    });
+    /**
+     * 继续选择印章上传
+     */
+    __publicField(this, "proceedWithUpload", async () => {
+      let inputObj = document.createElement("input");
+      inputObj.setAttribute("id", "UserSeal");
+      inputObj.setAttribute("type", "file");
+      inputObj.setAttribute("style", "visibility:hidden");
+      inputObj.setAttribute("accept", "image/*");
+      document.body.appendChild(inputObj);
+      inputObj.addEventListener("change", (event) => {
+        const files = event.target.files;
+        if (files && files.length > 0) {
+          const file = files[0];
+          if (file.size > 50 * 1024) {
+            this.message.warning("图片大小不能超过50KB！");
+            return;
+          }
+          const reader = new FileReader();
+          reader.onloadend = () => {
+            const base64String = reader.result;
+            this.userSignFormModel.CAUserSealImg = base64String;
+            this.userSignFormModel.CAUserSealToken = this.userSignFormModel.CAUserSealToken ? this.userSignFormModel.CAUserSealToken : this.utilities.getUniqueCode();
+            this.uploadUserSignImg(this.userSignFormModel.UserId, this.userSignFormModel.CAUserSealToken, this.userSignFormModel.CAUserSealImg);
+          };
+          reader.readAsDataURL(file);
+        }
+      });
+      inputObj.click();
+    });
+    /**
+     * 上传用户圆章图片
+     */
+    __publicField(this, "doUploadUserYZImg", async () => {
+      if (this.utilities.isNull(this.userSignFormModel.CAUserYZImg)) {
+        this.proceedWithUploadYZImg();
+      } else {
+        this.modal.confirm({
+          title: "提示",
+          content: "确定要覆盖当前已存在的圆章图片吗？",
+          onOk: async () => {
+            this.proceedWithUploadYZImg();
+          }
+        });
+      }
+    });
+    /**
+     * 继续选择圆章上传
+     */
+    __publicField(this, "proceedWithUploadYZImg", async () => {
+      let inputObj = document.createElement("input");
+      inputObj.setAttribute("id", "YZImg");
+      inputObj.setAttribute("type", "file");
+      inputObj.setAttribute("style", "visibility:hidden");
+      inputObj.setAttribute("accept", "image/*");
+      document.body.appendChild(inputObj);
+      inputObj.addEventListener("change", (event) => {
+        const files = event.target.files;
+        if (files && files.length > 0) {
+          const file = files[0];
+          if (file.size > 50 * 1024) {
+            this.message.warning("图片大小不能超过50KB！");
+            return;
+          }
+          const reader = new FileReader();
+          reader.onloadend = () => {
+            const base64String = reader.result;
+            this.userSignFormModel.CAUserYZImg = base64String;
+            this.userSignFormModel.CAUserYZToken = this.userSignFormModel.CAUserYZToken ? this.userSignFormModel.CAUserYZToken : this.utilities.getUniqueCode();
+            this.uploadUserSignImg(this.userSignFormModel.UserId, this.userSignFormModel.CAUserYZToken, this.userSignFormModel.CAUserYZImg);
+          };
+          reader.readAsDataURL(file);
+        }
+      });
+      inputObj.click();
+    });
     /**
      * 加载圆章KEY
      */
@@ -12836,8 +12929,8 @@ class UserinforInstance2 extends BaseInstance {
     };
   }
 }
-const Userinfor_vue_vue_type_style_index_0_scoped_38293ad4_lang = "";
-const _withScopeId$2 = (n) => (pushScopeId("data-v-38293ad4"), n = n(), popScopeId(), n);
+const Userinfor_vue_vue_type_style_index_0_scoped_bed8ccac_lang = "";
+const _withScopeId$2 = (n) => (pushScopeId("data-v-bed8ccac"), n = n(), popScopeId(), n);
 const _hoisted_1$5 = { class: "instree-search" };
 const _hoisted_2$3 = { class: "instree-list" };
 const _hoisted_3$3 = { style: { "height": "750px", "overflow-y": "auto" } };
@@ -13235,10 +13328,19 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
                       type: "primary",
                       size: "small",
                       ghost: "",
-                      style: { "float": "right" },
+                      style: { "float": "right", "margin-left": "3px" },
                       icon: "md-refresh",
                       onClick: _ctx.doLoadUserSealImg,
                       title: "加载印章图片"
+                    }, null, 8, ["onClick"]),
+                    createVNode(_component_Button, {
+                      type: "primary",
+                      size: "small",
+                      ghost: "",
+                      style: { "float": "right" },
+                      icon: "md-arrow-round-up",
+                      onClick: _ctx.doUploadUserSealImg,
+                      title: "上传印章图片"
                     }, null, 8, ["onClick"])
                   ]),
                   _: 1
@@ -13264,10 +13366,19 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
                       type: "primary",
                       size: "small",
                       ghost: "",
-                      style: { "float": "right" },
+                      style: { "float": "right", "margin-left": "3px" },
                       icon: "md-refresh",
                       onClick: _ctx.doLoadUserYZImg,
                       title: "加载圆章图片"
+                    }, null, 8, ["onClick"]),
+                    createVNode(_component_Button, {
+                      type: "primary",
+                      size: "small",
+                      ghost: "",
+                      style: { "float": "right" },
+                      icon: "md-arrow-round-up",
+                      onClick: _ctx.doUploadUserYZImg,
+                      title: "上传圆章图片"
                     }, null, 8, ["onClick"])
                   ]),
                   _: 1
@@ -13377,7 +13488,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const subuserinfor = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-38293ad4"]]);
+const subuserinfor = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-bed8ccac"]]);
 const propDefine$5 = {
   linkParam: {
     // 带入的参数