@newview/permission-service 1.2.33 → 1.2.34

package/README.md

@@ -1,5 +1,5 @@
-### 版本 1.2.33
-1、平台用户新增字段
+### 版本 1.2.34
+1、用户管理增加签字配置
 
 ### 版本 1.2.30
 1、平台增加配置字段

package/dist/permission-service.js

@@ -7,7 +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 { BaseApi, QueryWrapper } from "@newview/infrastructure";
+import { BaseApi, QueryWrapper, request } from "@newview/infrastructure";
 import { Icon, Tag, Checkbox, Divider, CheckboxGroup, Space } from "view-ui-plus";
 import { SelectPlatform, BaseLogin, PersonSel } from "@newview/permission-ui";
 import { SignTaskInfoApi } from "@newview/casign-api";
@@ -344,10 +344,13 @@ let PlatformInstance$1 = class PlatformInstance extends BaseInstance {
       PlatformType: 1,
       AppId: "",
       AppSecret: "",
+      MapCompany: 1,
+      TDTKey: "",
       LastUpdateUserId: this.storageInfo.getUser().Id,
       LastUpdateUserName: this.storageInfo.getUser().UserName,
       LastUpdateDate: this.utilities.getCurrentDate()
     }));
+    __publicField(this, "TDTKeyShow", ref(true));
     __publicField(this, "platConfigFormItems", reactive([
       {
         model: "PlatformType",
@@ -380,7 +383,20 @@ let PlatformInstance$1 = class PlatformInstance extends BaseInstance {
         }
       },
       { model: "AppId", label: "小程序AppId", prop: "AppId", type: "Input", span: 24 },
-      { model: "AppSecret", label: "小程序秘钥", prop: "AppSecret", type: "Input", span: 24 }
+      { model: "AppSecret", label: "小程序秘钥", prop: "AppSecret", type: "Input", span: 24 },
+      { model: "MapCompany", label: "地图厂家", prop: "MapCompany", type: "Select", span: 24, selectProp: {
+        datas: [
+          { value: 1, text: "天地图" },
+          { value: 2, text: "必应地图" },
+          { value: 3, text: "新视窗超图地图" }
+        ],
+        onChange: (event, item) => {
+          this.TDTKeyShow.value = event == 1;
+        }
+      } },
+      { model: "TDTKey", label: "天地图密钥", prop: "TDTKey", type: "Input", span: 24, isShow: () => {
+        return this.TDTKeyShow.value;
+      } }
     ]));
     __publicField(this, "doSavePlatConfig", async () => {
       this.saveingPlatConfig.value = true;
@@ -510,15 +526,18 @@ let PlatformInstance$1 = class PlatformInstance extends BaseInstance {
         PlatformType: 1,
         AppId: "",
         AppSecret: "",
+        MapCompany: 1,
+        TDTKey: "",
         LastUpdateUserId: this.storageInfo.getUser().Id,
         LastUpdateUserName: this.storageInfo.getUser().UserName,
         LastUpdateDate: this.utilities.getCurrentDate()
       };
     } else {
       this.platConfigFormModel.value = res;
-      this.platConfigFormModel.valueLastUpdateUserId = this.storageInfo.getUser().Id;
-      this.platConfigFormModel.valueLastUpdateUserNamed = this.storageInfo.getUser().UserName;
-      this.platConfigFormModel.valueLastUpdateDated = this.utilities.getCurrentDate();
+      this.platConfigFormModel.value.MapCompany = res.MapCompany ? res.MapCompany : 1;
+      this.platConfigFormModel.value.LastUpdateUserId = this.storageInfo.getUser().Id;
+      this.platConfigFormModel.value.LastUpdateUserNamed = this.storageInfo.getUser().UserName;
+      this.platConfigFormModel.value.LastUpdateDated = this.utilities.getCurrentDate();
     }
     this.isShowPlatConfig.value = true;
   }
@@ -4619,6 +4638,13 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
           onclick: () => {
             this.doShowImportUser();
           }
+        },
+        {
+          name: "import",
+          text: "导入CA",
+          onclick: () => {
+            this.importCAData();
+          }
         }
       ],
       rightToolbars: [
@@ -5216,10 +5242,17 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
       CAUserYZImg: ""
     }));
     __publicField(this, "userSignFormItems", reactive([
-      { model: "CAUserInfoKey", label: "用户KEY", type: "Input", prop: "CAUserInfoKey", span: 24 },
-      { model: "CAUserSealKey", label: "印章KEY", type: "Input", prop: "CAUserSealKey", span: 24 },
-      { model: "CAUserYZKey", label: "圆章KEY", type: "Input", prop: "CAUserYZKey", span: 24 }
+      // { model: 'CAUserInfoKey', label: '用户KEY', type: 'Input', prop: 'CAUserInfoKey', span: 24 },
+      { model: "CAUserSealKey", label: "印章KEY", type: "Input", prop: "CAUserSealKey", span: 24, inputProp: { append: "选择", onTextClick: () => {
+        this.GetUserSealData(3);
+      } } },
+      { model: "CAUserYZKey", label: "圆章KEY", type: "Input", prop: "CAUserYZKey", span: 24, inputProp: { append: "选择", onTextClick: () => {
+        this.GetUserSealData(2);
+      } } }
     ]));
+    // 私有方法 | private 方法名() {}
+    /** 当前所选人 */
+    __publicField(this, "activeUserSealRow", ref({}));
     // 响应式方法 | xxx = () => {}
     /**
      * 保存用户签字
@@ -5280,6 +5313,115 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
         this.message.error("读取失败，请稍后重试");
       }
     });
+    // 响应式方法 | xxx = () => {}
+    //#endregion 重置密码  END
+    __publicField(this, "importCAModal", ref(false));
+    __publicField(this, "importCAData", () => {
+      this.importCAModal.value = true;
+    });
+    __publicField(this, "doExcelPointImport", async (datas) => {
+      console.log(datas);
+      if (datas.length == 0) {
+        return;
+      }
+      let names = datas.filter((x) => this.utilities.isNull(x["印章ID"]) == true);
+      if (names.length > 0) {
+        this.message.info("印章ID不能为空！");
+        return;
+      }
+      let names1 = datas.filter((x) => this.utilities.isNull(x["印章名称"]) == true);
+      if (names1.length > 0) {
+        this.message.info("印章名称不能为空！");
+        return;
+      }
+      let names2 = datas.filter((x) => this.utilities.isNull(x["所属用户名"]) == true);
+      if (names2.length > 0) {
+        this.message.info("所属用户名不能为空！");
+        return;
+      }
+      let names3 = datas.filter((x) => this.utilities.isNull(x["印章类型"]) == true);
+      if (names3.length > 0) {
+        this.message.info("印章类型不能为空！");
+        return;
+      }
+      let NewId = this.utilities.getUniqueCode();
+      try {
+        let eqlist = [];
+        datas.forEach((element) => {
+          eqlist.push({
+            Id: 0,
+            ProjectId: this.selectedPlatform.Id,
+            RoadId: this.selectedPlatform.Id,
+            ZId: this.utilities.isNull(element["印章ID"]) ? "" : element["印章ID"],
+            ZName: this.utilities.isNull(element["印章名称"]) ? "" : element["印章名称"],
+            UName: this.utilities.isNull(element["所属用户名"]) ? "" : element["所属用户名"],
+            PIn: "111111",
+            CertType: this.utilities.isNull(element["印章类型"]) ? "3" : element["印章类型"] == "签字" ? 3 : 2,
+            HandleKey: NewId
+          });
+        });
+        if (eqlist.length > 0) {
+          var loginparam = {
+            Account: this.utilities.stringHelper.encodeToBase64("hhlhf"),
+            Pwd: this.utilities.stringHelper.encodeToBase64("Lhf513723."),
+            SystemType: 1
+          };
+          let tokenRes = await request("/OldSysApi/OAuth/Token", {
+            params: loginparam
+          });
+          let headers = await this.getTempRequestHeader();
+          let saveRes = await request("/CASignApi/CA_Userinfointo/saves", {
+            headers,
+            method: "post",
+            data: eqlist
+          });
+          let saveRes2 = await request("/CASignApi/CA_Userinfointo/SaveUserSignNew", {
+            headers,
+            params: { HandleKey: NewId, ProjetId: this.selectedPlatform.Id, RoadId: this.selectedPlatform.Id, BusinessKey: this.selectedPlatform.CABusinessKey }
+          });
+          this.message.success("导入成功！");
+          this.importCAModal.value = false;
+        }
+      } catch (error) {
+        this.message.error("导入失败！");
+      }
+    });
+    __publicField(this, "userSealData", ref([]));
+    __publicField(this, "userSealAllData", []);
+    __publicField(this, "searchUserSeal", ref(""));
+    __publicField(this, "userSealListLoading", ref(false));
+    __publicField(this, "selectCASealModal", ref(false));
+    __publicField(this, "selCaType", ref("3"));
+    __publicField(this, "selUserSealId", ref(0));
+    __publicField(this, "caTypeChange", () => {
+      this.userSealData.value = this.userSealAllData.filter((e) => e["CertType"] == this.selCaType.value);
+    });
+    __publicField(this, "doSearchUserSeal", () => {
+      this.userSealData.value = this.userSealAllData.filter((e) => e["SealName"].indexOf(this.searchUserSeal.value) >= 0);
+    });
+    /**
+     * 选择签字信息
+     */
+    __publicField(this, "doSelUserSeal", async () => {
+      console.log(this.selUserSealId.value);
+      let sealInfo = this.userSealAllData.find((e) => e["Id"] == this.selUserSealId.value);
+      if (sealInfo.CertType == 3) {
+        this.userSignFormModel.CAUserSealKey = sealInfo.SKey;
+        this.doLoadUserSealImg();
+      } else {
+        this.userSignFormModel.CAUserYZKey = sealInfo.SKey;
+        this.doLoadUserYZImg();
+      }
+      this.selectCASealModal.value = false;
+      request("/CASignApi/Userseal/saveDynamic", {
+        headers: await this.getTempRequestHeader(),
+        method: "post",
+        data: {
+          Id: sealInfo.Id,
+          BIId: this.selectedInsTree.InstitutionId
+        }
+      });
+    });
     this.props = props;
     this.ctx = ctx;
   }
@@ -5490,12 +5632,12 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
     this.storageInfo.removeAll();
     this.loginRef.value.setLoginResult(result);
   }
-  // 私有方法 | private 方法名() {}
   /**
    * 编辑用户签字
    */
   async doShowEditUserSign(row) {
     this.showEditUserSign.value = true;
+    this.activeUserSealRow.value = row;
     const apiResult = await this.userSignApi.getEntityByFilter(QueryWrapper.create().eq("UserId", row.Id));
     const result = this.utilities.parseApiResult(apiResult);
     if (!this.utilities.isNull(result)) {
@@ -5540,11 +5682,43 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
       }
     });
   }
-  // 响应式方法 | xxx = () => {}
-  //#endregion 重置密码  END
+  async GetUserSealData(type2) {
+    this.userSealData.value = [];
+    this.userSealListLoading.value = true;
+    this.selCaType.value = type2;
+    this.selectCASealModal.value = true;
+    ({
+      Account: this.utilities.stringHelper.encodeToBase64("hhlhf"),
+      Pwd: this.utilities.stringHelper.encodeToBase64("Lhf513723."),
+      SystemType: 1
+    });
+    let res = this.utilities.parseApiResult(await request("/CASignApi/Userseal/GetUserSeal", {
+      headers: await this.getTempRequestHeader(),
+      params: {
+        BusinessKey: this.selectedPlatform.CABusinessKey,
+        Parms: ""
+      }
+    }));
+    this.userSealListLoading.value = false;
+    this.userSealAllData = this.utilities.deepCopy(res);
+    this.caTypeChange();
+  }
+  async getTempRequestHeader() {
+    var loginparam = {
+      Account: this.utilities.stringHelper.encodeToBase64("hhkf"),
+      Pwd: this.utilities.stringHelper.encodeToBase64("Nv88341268#"),
+      SystemType: 1
+    };
+    let tokenRes = await request("/OldSysApi/OAuth/Token", {
+      params: loginparam
+    });
+    return {
+      Authorization: "Bearer " + tokenRes.result.Token
+    };
+  }
 };
-const Userinfor_vue_vue_type_style_index_0_scoped_a643a221_lang = "";
-const _withScopeId$3 = (n) => (pushScopeId("data-v-a643a221"), n = n(), popScopeId(), n);
+const Userinfor_vue_vue_type_style_index_0_scoped_65fc1807_lang = "";
+const _withScopeId$3 = (n) => (pushScopeId("data-v-65fc1807"), n = n(), popScopeId(), n);
 const _hoisted_1$e = { class: "instree-search" };
 const _hoisted_2$6 = { class: "instree-list" };
 const _hoisted_3$6 = { style: { "height": "774px", "overflow-y": "auto" } };
@@ -5561,6 +5735,17 @@ const _hoisted_10$2 = { style: { "display": "none" } };
 const _hoisted_11$2 = { style: { "height": "400px", "overflow-y": "auto" } };
 const _hoisted_12$1 = ["src"];
 const _hoisted_13$1 = ["src"];
+const _hoisted_14 = { style: { "height": "260px" } };
+const _hoisted_15 = { class: "nv-flex" };
+const _hoisted_16 = { style: { "height": "300px", "overflow": "auto", "margin-top": "10px", "padding": "0 20px" } };
+const _hoisted_17 = {
+  key: 1,
+  class: "nv-full nv-pos-r"
+};
+const _hoisted_18 = {
+  key: 1,
+  class: "nv-c-v-center"
+};
 function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_SelectPlatform = resolveComponent("SelectPlatform");
   const _component_Tree = resolveComponent("Tree");
@@ -5576,6 +5761,12 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_BaseLogin = resolveComponent("BaseLogin");
   const _component_NvComForm = resolveComponent("NvComForm");
   const _component_FormItem = resolveComponent("FormItem");
+  const _component_NvExcelImport = resolveComponent("NvExcelImport");
+  const _component_nvModal = resolveComponent("nvModal");
+  const _component_Input = resolveComponent("Input");
+  const _component_Radio = resolveComponent("Radio");
+  const _component_RadioGroup = resolveComponent("RadioGroup");
+  const _component_NvLoading = resolveComponent("NvLoading");
   const _component_NvPage = resolveComponent("NvPage");
   return openBlock(), createBlock(_component_NvPage, {
     gutter: 8,
@@ -5834,7 +6025,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
         mask: true,
         "mask-closable": false,
         width: 440,
-        title: "编辑签字信息",
+        title: _ctx.activeUserSealRow.UserName + "签字信息",
         styles: { top: "3%" }
       }, {
         footer: withCtx(() => [
@@ -5877,7 +6068,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
                       key: 0,
                       src: _ctx.userSignFormModel.CAUserSealImg,
                       alt: "",
-                      style: { "width": "120px", "height": "35px" }
+                      style: { "width": "120px", "height": "35px", "object-fit": "contain" }
                     }, null, 8, _hoisted_12$1)) : createCommentVNode("", true),
                     createVNode(_component_Button, {
                       type: "primary",
@@ -5898,7 +6089,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
                       key: 0,
                       src: _ctx.userSignFormModel.CAUserYZImg,
                       alt: "",
-                      style: { "width": "120px", "height": "120px", "margin-left": "16px" }
+                      style: { "width": "120px", "height": "120px", "object-fit": "contain", "margin-left": "16px" }
                     }, null, 8, _hoisted_13$1)) : createCommentVNode("", true),
                     createVNode(_component_Button, {
                       type: "primary",
@@ -5919,12 +6110,106 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
           ])
         ]),
         _: 1
+      }, 8, ["modelValue", "title"]),
+      createVNode(_component_nvModal, {
+        modelValue: _ctx.importCAModal,
+        "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => _ctx.importCAModal = $event),
+        draggable: "",
+        mask: true,
+        "mask-closable": false,
+        width: 500,
+        title: "导入CA数据",
+        "footer-hide": ""
+      }, {
+        default: withCtx(() => [
+          createElementVNode("div", _hoisted_14, [
+            createVNode(_component_NvExcelImport, {
+              ref: "NvExcelImport",
+              onImport: _ctx.doExcelPointImport,
+              isExportTemplete: true,
+              templeteUrl: "https://nvplanfromoss.oss-cn-beijing.aliyuncs.com/XiHu/ExeclTemplate/%E9%99%95%E8%A5%BFCA%E7%AD%BE%E5%AD%97%E6%A8%A1%E6%9D%BF.xlsx"
+            }, null, 8, ["onImport"])
+          ])
+        ]),
+        _: 1
+      }, 8, ["modelValue"]),
+      createVNode(_component_nvModal, {
+        modelValue: _ctx.selectCASealModal,
+        "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => _ctx.selectCASealModal = $event),
+        draggable: "",
+        mask: true,
+        "mask-closable": false,
+        width: 400,
+        title: "选择签字人员"
+      }, {
+        footer: withCtx(() => [
+          createVNode(_component_Button, {
+            type: "text",
+            onClick: _cache[13] || (_cache[13] = ($event) => _ctx.selectCASealModal = false)
+          }, {
+            default: withCtx(() => [
+              createTextVNode("关闭")
+            ]),
+            _: 1
+          }),
+          createVNode(_component_Button, {
+            type: "primary",
+            disabled: !_ctx.selUserSealId,
+            onClick: _ctx.doSelUserSeal
+          }, {
+            default: withCtx(() => [
+              createTextVNode("确定")
+            ]),
+            _: 1
+          }, 8, ["disabled", "onClick"])
+        ]),
+        default: withCtx(() => [
+          createElementVNode("div", _hoisted_15, [
+            createVNode(_component_Input, {
+              class: "nv-flex-1",
+              style: { "margin-left": "10px" },
+              modelValue: _ctx.searchUserSeal,
+              "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => _ctx.searchUserSeal = $event),
+              onOnChange: _ctx.doSearchUserSeal,
+              search: "",
+              placeholder: "请输入人员名称"
+            }, null, 8, ["modelValue", "onOnChange"])
+          ]),
+          createElementVNode("div", _hoisted_16, [
+            _ctx.userSealData.length > 0 ? (openBlock(), createBlock(_component_RadioGroup, {
+              key: 0,
+              modelValue: _ctx.selUserSealId,
+              "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => _ctx.selUserSealId = $event),
+              vertical: ""
+            }, {
+              default: withCtx(() => [
+                (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.userSealData, (item, index2) => {
+                  return openBlock(), createBlock(_component_Radio, {
+                    label: item.Id
+                  }, {
+                    default: withCtx(() => [
+                      createElementVNode("span", null, toDisplayString(item.SealName), 1)
+                    ]),
+                    _: 2
+                  }, 1032, ["label"]);
+                }), 256))
+              ]),
+              _: 1
+            }, 8, ["modelValue"])) : (openBlock(), createElementBlock("div", _hoisted_17, [
+              _ctx.userSealListLoading ? (openBlock(), createBlock(_component_NvLoading, {
+                key: 0,
+                content: "人员数据加载中..."
+              })) : (openBlock(), createElementBlock("div", _hoisted_18, "暂无人员数据"))
+            ]))
+          ])
+        ]),
+        _: 1
       }, 8, ["modelValue"])
     ]),
     _: 1
   });
 }
-const Userinfor = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-a643a221"]]);
+const Userinfor = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-65fc1807"]]);
 const propDefine$e = {
   linkParam: {
     // 带入的参数
@@ -13589,8 +13874,8 @@ class ModuleInstance2 extends BaseInstance {
   // 响应式方法 | xxx = () => {}
   //#endregion 业务逻辑  END
 }
-const Module_vue_vue_type_style_index_0_scoped_23a8ab5f_lang = "";
-const _withScopeId$1 = (n) => (pushScopeId("data-v-23a8ab5f"), n = n(), popScopeId(), n);
+const Module_vue_vue_type_style_index_0_scoped_a73dad2e_lang = "";
+const _withScopeId$1 = (n) => (pushScopeId("data-v-a73dad2e"), n = n(), popScopeId(), n);
 const _hoisted_1$4 = { style: { "height": "650px", "overflow-y": "auto" } };
 const _hoisted_2$2 = {
   class: "import-module",
@@ -13860,7 +14145,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-23a8ab5f"]]);
+const subModule = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["render", _sfc_render$5], ["__scopeId", "data-v-a73dad2e"]]);
 const type = "FeatureCollection";
 const features = [
   {
@@ -26897,7 +27182,7 @@ let ProjectUserinforInstance$1 = class ProjectUserinforInstance extends BaseInst
   }
   //#endregion 系统平台  END
 };
-const Sublinepoins_vue_vue_type_style_index_0_scoped_66a288c7_lang = "";
+const Sublinepoins_vue_vue_type_style_index_0_scoped_297f680c_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" };
@@ -27144,7 +27429,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-66a288c7"]]);
+const sublinepoins = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$4], ["__scopeId", "data-v-297f680c"]]);
 const propDefine$3 = {
   Id: {
     default: 0,