@newview/permission-service 1.2.31 → 1.2.32

package/README.md

@@ -1,5 +1,11 @@
+### 版本 1.2.32
+
+1、用户功能修改优化
+
 ### 版本 1.2.30
+
 1、平台增加配置字段
+
 ### 版本 1.2.29
 
 1、修改导出路径

package/dist/permission-service.js

@@ -11,8 +11,8 @@ import { BaseApi, QueryWrapper } 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";
-import { ProvinceApi, CityApi, AreaApi, DictionaryDetailApi, DictionaryTypeApi } from "@newview/basics-api";
 import { NvComFormUp } from "@newview/file-ui";
+import { ProvinceApi, CityApi, AreaApi, DictionaryDetailApi, DictionaryTypeApi } from "@newview/basics-api";
 import { NvMap } from "@newview/map";
 class DBCenterBaseApi extends BaseApi {
   get ProxyName() {
@@ -4483,7 +4483,7 @@ const propDefine$f = {
 };
 const _sfc_main$f = defineComponent({
   name: "Userinfor",
-  components: { SelectPlatform, LoginLog: LoginLog$1, BaseLogin },
+  components: { SelectPlatform, LoginLog: LoginLog$1, BaseLogin, NvComFormUp },
   emits: [""],
   // 例如: ['clearRadioRow', 'change', 'delete', 'addchild']
   props: propDefine$f,
@@ -4781,7 +4781,8 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
       PwdAuthentication: 0,
       LastUpdateUserId: 0,
       LastUpdateUserName: "",
-      LastUpdateDate: ""
+      LastUpdateDate: "",
+      OrderNo: 0
     }));
     __publicField(this, "userFormItems", reactive([
       {
@@ -4800,6 +4801,11 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
               datas: [{ text: "男", value: 1 }, { text: "女", value: 2 }, { text: "其他", value: 3 }],
               transfer: true
             }
+          },
+          {
+            model: "OrderNo",
+            label: "排序号",
+            type: "InputNumber"
           }
         ]
       },
@@ -4848,6 +4854,23 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
           },
           { model: "ErrorNum", label: "错误次数", type: "Input" }
         ]
+      },
+      {
+        model: "",
+        label: "签字信息",
+        span: 24,
+        children: [
+          {
+            label: "签字图片",
+            model: "UserSignImgToken",
+            prop: "UserSignImgToken",
+            type: "UploadFile",
+            span: 24,
+            uploadFileProp: {
+              uploadQuantity: 1
+            }
+          }
+        ]
       }
     ]));
     __publicField(this, "userFormRule", reactive({
@@ -5337,6 +5360,7 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
     this.userFormModel.LastUpdateUserId = user.Id;
     this.userFormModel.LastUpdateUserName = user.UserName;
     this.userFormModel.LastUpdateDate = this.utilities.getCurrentDate();
+    this.userFormModel.OrderNo = data.OrderNo;
     this.editUserTitle.value = "编辑用户 - " + data.UserName;
     this.showEditUser.value = true;
   }
@@ -5356,6 +5380,7 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
     this.userFormModel.AccountType = 1;
     this.userFormModel.AccountStatus = 1;
     this.userFormModel.ErrorNum = 0;
+    this.userFormModel.OrderNo = 0;
     let currentDate = this.utilities.getCurrentDate();
     currentDate = this.utilities.dateHelper.format(this.utilities.dateHelper.add(this.utilities.stringHelper.toDate(currentDate), 1, "years"), "YYYY-MM-DD");
     this.userFormModel.ExpiredDate = currentDate;
@@ -5518,11 +5543,11 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
   // 响应式方法 | xxx = () => {}
   //#endregion 重置密码  END
 };
-const Userinfor_vue_vue_type_style_index_0_scoped_3969fae6_lang = "";
-const _withScopeId$3 = (n) => (pushScopeId("data-v-3969fae6"), n = n(), popScopeId(), n);
+const Userinfor_vue_vue_type_style_index_0_scoped_a643a221_lang = "";
+const _withScopeId$3 = (n) => (pushScopeId("data-v-a643a221"), n = n(), popScopeId(), n);
 const _hoisted_1$e = { class: "instree-search" };
 const _hoisted_2$6 = { class: "instree-list" };
-const _hoisted_3$6 = { style: { "height": "600px", "overflow-y": "auto" } };
+const _hoisted_3$6 = { style: { "height": "774px", "overflow-y": "auto" } };
 const _hoisted_4$6 = /* @__PURE__ */ _withScopeId$3(() => /* @__PURE__ */ createElementVNode("div", { style: { "margin-left": "16px", "color": "#ff9900" } }, [
   /* @__PURE__ */ createElementVNode("div", { style: { "padding-bottom": "8px" } }, "用户账号：手机号必填。在新设备登录时，需进行短信验证。"),
   /* @__PURE__ */ createElementVNode("div", null, "内部账号：手机号可不填。")
@@ -5544,11 +5569,12 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Space = resolveComponent("Space");
   const _component_NvBox = resolveComponent("NvBox");
   const _component_NvGrid = resolveComponent("NvGrid");
-  const _component_NvComForm = resolveComponent("NvComForm");
+  const _component_NvComFormUp = resolveComponent("NvComFormUp");
   const _component_Form = resolveComponent("Form");
   const _component_Modal = resolveComponent("Modal");
   const _component_LoginLog = resolveComponent("LoginLog");
   const _component_BaseLogin = resolveComponent("BaseLogin");
+  const _component_NvComForm = resolveComponent("NvComForm");
   const _component_FormItem = resolveComponent("FormItem");
   const _component_NvPage = resolveComponent("NvPage");
   return openBlock(), createBlock(_component_NvPage, {
@@ -5657,7 +5683,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
               rules: _ctx.userFormRule
             }, {
               default: withCtx(() => [
-                createVNode(_component_NvComForm, {
+                createVNode(_component_NvComFormUp, {
                   ref: "userComForm",
                   formModel: _ctx.userFormModel,
                   formItems: _ctx.userFormItems
@@ -5898,7 +5924,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   });
 }
-const Userinfor = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-3969fae6"]]);
+const Userinfor = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-a643a221"]]);
 const propDefine$e = {
   linkParam: {
     // 带入的参数
@@ -8124,7 +8150,9 @@ class RoleInstance2 extends BaseInstance {
     // 私有属性 | private
     // 响应属性 | ref、reactive、computed、watch
     __publicField(this, "platId", ref(0));
+    /** 平台数据 */
     __publicField(this, "platData", ref([]));
+    /** 平台加载状态 */
     __publicField(this, "spinPlatShow", ref(false));
     __publicField(this, "webOrApp", ref(0));
     // 0：WEB 1：APP
@@ -11497,7 +11525,8 @@ class UserinforInstance2 extends BaseInstance {
       PwdAuthentication: 0,
       LastUpdateUserId: 0,
       LastUpdateUserName: "",
-      LastUpdateDate: ""
+      LastUpdateDate: "",
+      OrderNo: 0
     }));
     __publicField(this, "isDe", false);
     __publicField(this, "userFormItems", reactive([
@@ -11517,6 +11546,11 @@ class UserinforInstance2 extends BaseInstance {
               datas: [{ text: "男", value: 1 }, { text: "女", value: 2 }, { text: "其他", value: 3 }],
               transfer: true
             }
+          },
+          {
+            model: "OrderNo",
+            label: "排序号",
+            type: "InputNumber"
           }
         ]
       },
@@ -11572,6 +11606,23 @@ class UserinforInstance2 extends BaseInstance {
           },
           { model: "ErrorNum", label: "错误次数", type: "Input" }
         ]
+      },
+      {
+        model: "",
+        label: "签字信息",
+        span: 24,
+        children: [
+          {
+            label: "签字图片",
+            model: "UserSignImgToken",
+            prop: "UserSignImgToken",
+            type: "UploadFile",
+            span: 24,
+            uploadFileProp: {
+              uploadQuantity: 1
+            }
+          }
+        ]
       }
     ]));
     __publicField(this, "userFormRule", reactive({
@@ -11630,7 +11681,6 @@ class UserinforInstance2 extends BaseInstance {
         this.saveingUser.value = false;
         return;
       }
-      debugger;
       apiResult = await this.userinforApi.save(this.userFormModel);
       result = this.utilities.parseApiResult(apiResult);
       if (this.userFormModel.Id == 0) {
@@ -12051,7 +12101,6 @@ class UserinforInstance2 extends BaseInstance {
   //     return this.userFormModel.Id == 0
   // });
   dateDis() {
-    debugger;
     return this.userFormModel.Id == 0;
   }
   // 私有方法 | private 方法名() {}
@@ -12078,6 +12127,7 @@ class UserinforInstance2 extends BaseInstance {
     this.userFormModel.LastUpdateUserId = user.Id;
     this.userFormModel.LastUpdateUserName = user.UserName;
     this.userFormModel.LastUpdateDate = this.utilities.getCurrentDate();
+    this.userFormModel.OrderNo = data.OrderNo;
     this.editUserTitle.value = "编辑用户 - " + data.UserName;
     this.showEditUser.value = true;
   }
@@ -12097,6 +12147,7 @@ class UserinforInstance2 extends BaseInstance {
     this.userFormModel.AccountType = 1;
     this.userFormModel.AccountStatus = 1;
     this.userFormModel.ErrorNum = 0;
+    this.userFormModel.OrderNo = 0;
     let currentDate = this.utilities.getCurrentDate();
     currentDate = this.utilities.dateHelper.format(this.utilities.dateHelper.add(this.utilities.stringHelper.toDate(currentDate), 1, "years"), "YYYY-MM-DD");
     this.userFormModel.ExpiredDate = currentDate;
@@ -12259,11 +12310,11 @@ class UserinforInstance2 extends BaseInstance {
   // 响应式方法 | xxx = () => {}
   //#endregion 重置密码  END
 }
-const Userinfor_vue_vue_type_style_index_0_scoped_6a60ce29_lang = "";
-const _withScopeId$2 = (n) => (pushScopeId("data-v-6a60ce29"), n = n(), popScopeId(), n);
+const Userinfor_vue_vue_type_style_index_0_scoped_a05ded52_lang = "";
+const _withScopeId$2 = (n) => (pushScopeId("data-v-a05ded52"), n = n(), popScopeId(), n);
 const _hoisted_1$5 = { class: "instree-search" };
 const _hoisted_2$3 = { class: "instree-list" };
-const _hoisted_3$3 = { style: { "height": "600px", "overflow-y": "auto" } };
+const _hoisted_3$3 = { style: { "height": "750px", "overflow-y": "auto" } };
 const _hoisted_4$3 = /* @__PURE__ */ _withScopeId$2(() => /* @__PURE__ */ createElementVNode("div", { style: { "margin-left": "16px", "color": "#ff9900" } }, [
   /* @__PURE__ */ createElementVNode("div", { style: { "padding-bottom": "8px" } }, "用户账号：手机号必填。在新设备登录时，需进行短信验证。"),
   /* @__PURE__ */ createElementVNode("div", null, "内部账号：手机号可不填。")
@@ -12673,7 +12724,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-6a60ce29"]]);
+const subuserinfor = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-a05ded52"]]);
 const propDefine$5 = {
   linkParam: {
     // 带入的参数
@@ -26388,7 +26439,6 @@ const _sfc_main$4 = defineComponent({
   name: "Sublinepoins",
   components: { SelectPlatform, NvMap },
   emits: [""],
-  // 例如: ['clearRadioRow', 'change', 'delete', 'addchild']
   props: propDefine$4,
   setup(props, ctx) {
     return new ProjectUserinforInstance$1(props, ctx);
@@ -26442,6 +26492,9 @@ let ProjectUserinforInstance$1 = class ProjectUserinforInstance extends BaseInst
       this.userBoxWidth.value = isExpand ? "calc(100% - 300px)" : "calc(100% - 45px)";
     });
     // 响应式方法 | xxx = () => {}
+    /**
+     * 地图加载完毕事件
+     */
     __publicField(this, "mapOnLoad", () => {
       this.shanxiGeoObj = this.NvMap1.value.addGeoJSON(shanxi, { color: "#9EFFFF", weight: 1, fillOpacity: 0 });
       this.polyline = this.NvMap1.value.addPolyline([], { color: "#D8A451", weight: 5 });
@@ -26732,7 +26785,6 @@ let ProjectUserinforInstance$1 = class ProjectUserinforInstance extends BaseInst
   }
   /** 清除地图临时数据 */
   clearMapData() {
-    console.log("清除地图临时数据", this.polyline);
     if (!this.utilities.isNull(this.polyline) && this.polyline.getLatLngs().length > 0) {
       this.polyline.remove();
       this.polyline = null;
@@ -26847,7 +26899,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_4e966cc1_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" };
@@ -27005,11 +27057,11 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
           createVNode(_component_NvMap, {
             option: _ctx.mapOption,
             ref: "NvMap1",
-            theme: _ctx.mapTheme,
+            theme: "light",
             onOnload: _ctx.mapOnLoad,
             onClick: _ctx.mapClick,
             onRightClick: _ctx.mapRightClick
-          }, null, 8, ["option", "theme", "onOnload", "onClick", "onRightClick"])
+          }, null, 8, ["option", "onOnload", "onClick", "onRightClick"])
         ])
       ]),
       _ctx.pointData.length > 0 ? (openBlock(), createBlock(_component_NvBox, {
@@ -27094,7 +27146,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-4e966cc1"]]);
 const propDefine$3 = {
   Id: {
     default: 0,
@@ -27436,7 +27488,6 @@ class ProjectSummaryInstance extends BaseInstance {
    */
   setProvinceDatas() {
     if (!this.utilities.isNull(this.provinceIndex.value)) {
-      debugger;
       this.mainFormItems[this.provinceIndex.value].selectProp.datas = this.provinces.map((item) => {
         return { text: item.ProvinceName, value: item.ProvinceCode };
       });
@@ -27996,7 +28047,6 @@ class ProjectUserinforInstance2 extends BaseInstance {
         this.saveingUser.value = false;
         return;
       }
-      debugger;
       apiResult = await this.userinforApi.save(this.userFormModel);
       result = this.utilities.parseApiResult(apiResult);
       if (this.userFormModel.Id == 0) {
@@ -29492,7 +29542,6 @@ class Instance2 extends BaseInstance {
           SubInsName: e.InstitutionAbbreviation
         };
       });
-      debugger;
       if (saveDatas.length == 0) {
         if (this.tabSavedData.length > 0) {
           let ids = this.tabSavedData.map((e) => e.Id).toString();