@newview/permission-service 1.2.49 → 1.2.51

package/dist/permission-service.js

@@ -5247,12 +5247,32 @@ let UserinforInstance$1 = class UserinforInstance extends BaseInstance {
     }));
     __publicField(this, "userSignFormItems", reactive([
       // { 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);
-      } } }
+      {
+        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 方法名() {}
     /** 当前所选人 */
@@ -11825,6 +11845,7 @@ class UserinforInstance2 extends BaseInstance {
       CIdNo: "",
       UserIconToken: "",
       UserSignImgToken: "",
+      UserSignatureImgToken: "",
       Account: "",
       AccountType: 0,
       AccountStatus: 1,
@@ -11926,7 +11947,17 @@ class UserinforInstance2 extends BaseInstance {
             model: "UserSignImgToken",
             prop: "UserSignImgToken",
             type: "UploadFile",
-            span: 24,
+            span: 12,
+            uploadFileProp: {
+              uploadQuantity: 1
+            }
+          },
+          {
+            label: "签章图片",
+            model: "UserSignatureImgToken",
+            prop: "UserSignatureImgToken",
+            type: "UploadFile",
+            span: 12,
             uploadFileProp: {
               uploadQuantity: 1
             }
@@ -12694,6 +12725,7 @@ class UserinforInstance2 extends BaseInstance {
     this.userFormModel.CIdNo = data.CIdNo;
     this.userFormModel.UserIconToken = data.UserIconToken;
     this.userFormModel.UserSignImgToken = data.UserSignImgToken;
+    this.userFormModel.UserSignatureImgToken = data.UserSignatureImgToken;
     this.userFormModel.Account = data.Account;
     this.userFormModel.AccountStatus = data.AccountStatus;
     this.userFormModel.AccountType = data.AccountType;
@@ -12720,6 +12752,7 @@ class UserinforInstance2 extends BaseInstance {
     this.userFormModel.CIdNo = "";
     this.userFormModel.UserIconToken = "";
     this.userFormModel.UserSignImgToken = "";
+    this.userFormModel.UserSignatureImgToken = "";
     this.userFormModel.Account = "";
     this.userFormModel.AccountType = 1;
     this.userFormModel.AccountStatus = 1;
@@ -12934,16 +12967,31 @@ class UserinforInstance2 extends BaseInstance {
     if (index2 == users.length) {
       this.message.success("转换成功！");
     } else {
-      const token = users[index2].UserSignImgToken;
-      let imgs = this.utilities.parseApiResult(await new FileApi().getFiles(token));
-      let base64 = this.utilities.parseApiResult(await new FileApi().getBase64(token, imgs[0].Id));
       const apiResult = await this.userSignApi.getEntityByFilter(QueryWrapper.create().eq("UserId", users[index2].Id));
       const result = this.utilities.parseApiResult(apiResult);
-      const CAUserSealImg = "data:image/png;base64," + base64;
+      let CAUserSealImg = "";
+      let SAUserSealImg = "";
+      const token = users[index2].UserSignImgToken;
+      if (!this.utilities.isNull(token)) {
+        let imgs = this.utilities.parseApiResult(await new FileApi().getFiles(token));
+        if (imgs.length > 0) {
+          let base64 = this.utilities.parseApiResult(await new FileApi().getBase64(token, imgs[0].Id));
+          CAUserSealImg = "data:image/png;base64," + base64;
+        }
+      }
+      const SAtoken = users[index2].UserSignatureImgToken;
+      if (!this.utilities.isNull(SAtoken)) {
+        let SAimgs = this.utilities.parseApiResult(await new FileApi().getFiles(SAtoken));
+        if (SAimgs.length > 0) {
+          let SAbase64 = this.utilities.parseApiResult(await new FileApi().getBase64(token, SAimgs[0].Id));
+          SAUserSealImg = "data:image/png;base64," + SAbase64;
+        }
+      }
       if (this.utilities.isNull(result)) {
-        await this.userSignApi.save({ Id: 0, UserId: users[index2].Id, CAUserSealImg });
+        await this.userSignApi.save({ Id: 0, UserId: users[index2].Id, CAUserSealImg, CAUserYZImg: SAUserSealImg });
       } else {
         result.CAUserSealImg = CAUserSealImg;
+        result.CAUserYZImg = SAUserSealImg;
         await this.userSignApi.save(result);
       }
       index2 += 1;