ydb-components-material 0.1.108 → 0.1.109

package/es/components/sign-file/signUtil.js

@@ -0,0 +1,367 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { getBlob, getFileExtension, upload, dataURLtoBlob, uploadFilePromise } from "./file";
+import { createbycategory, contractSignUrl, signurl, checkSignState, contractFinish, documentDownload, fileUploadApi } from "../../api";
+var categoryId = '3354397552669692408';
+// 预发
+var categoryIdRelease = '3291682531601133765'; // 手写签批id
+var documentId = ''; // 手写签批生成的文件id
+var contractId = ''; // 合同id
+
+// 对外的方法 初始化手写签批的页面
+export function initSignPageMethod(_x, _x2, _x3) {
+  return _initSignPageMethod.apply(this, arguments);
+}
+
+// 【第 1 步】上传要手写签批的文件
+function _initSignPageMethod() {
+  _initSignPageMethod = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(fileObj, userInfo, config) {
+    var name, docId, contrId, flag, pageUrl, params;
+    return _regeneratorRuntime.wrap(function (_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          console.log('fileObj', fileObj, userInfo);
+          name = fileObj.name; // 【第 1 步】上传要手写签批的文件
+          _context.next = 1;
+          return uploadSignFile(fileObj, config);
+        case 1:
+          docId = _context.sent;
+          console.log('docId---', docId);
+          if (docId) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return", false);
+        case 2:
+          documentId = docId; // 保存文档 id
+
+          // 【第 2 步】创建或者发起电子签批
+          _context.next = 3;
+          return createbycategoryFun(name, docId, config);
+        case 3:
+          contrId = _context.sent;
+          console.log('contrId---', contrId);
+          if (contrId) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return", false);
+        case 4:
+          contractId = contrId;
+
+          // 【第 3 步】创建手写签批页面
+          _context.next = 5;
+          return getContractSignUrl(contrId, userInfo, config);
+        case 5:
+          flag = _context.sent;
+          if (flag) {
+            _context.next = 6;
+            break;
+          }
+          return _context.abrupt("return", false);
+        case 6:
+          _context.next = 7;
+          return getSignUrl(userInfo, config);
+        case 7:
+          pageUrl = _context.sent;
+          if (pageUrl) {
+            _context.next = 8;
+            break;
+          }
+          return _context.abrupt("return", false);
+        case 8:
+          // 将 文档 id/签批文件 id/签署地址/文件名称 返回
+          params = {
+            documentId: documentId,
+            contractId: contractId,
+            pageUrl: pageUrl,
+            name: name
+          };
+          return _context.abrupt("return", params);
+        case 9:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _initSignPageMethod.apply(this, arguments);
+}
+function uploadSignFile(_x4, _x5) {
+  return _uploadSignFile.apply(this, arguments);
+} // 【第 2 步】创建或者发起电子签批
+function _uploadSignFile() {
+  _uploadSignFile = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(event, config) {
+    var blob, file, signApprovalFileType;
+    return _regeneratorRuntime.wrap(function (_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          console.log(event, '文件 1111', config);
+          // uni.showLoading({ title: '加载中' })
+          _context2.next = 1;
+          return getBlob(event.url);
+        case 1:
+          blob = _context2.sent;
+          file = new File([blob], event.name, {
+            type: event.type
+          }); // 获取文件类型
+          signApprovalFileType = getFileExtension(event.name);
+          return _context2.abrupt("return", new Promise(function (resolve) {
+            // 上传文件
+            upload({
+              file: file,
+              title: event.name,
+              fileType: signApprovalFileType,
+              filename: event.name,
+              // 文件名称
+              headers: {
+                Authorization: config.tokenTY
+              },
+              // https://zwfwpt.sxzwfw.gov.cn${window.env === 'release' ? ':10010' : ''}/DeclarationAPI
+              action: config.baseUrl + "/declaration/center/signapproval/api/createbyfile",
+              // 上传文件的地址
+              onError: function onError(e) {
+                // uni.$u.toast(e.msg || '手写签批上传文件异常');
+                // uni.hideLoading();
+                resolve(false);
+              },
+              onSuccess: function onSuccess(e) {
+                // 上传成功
+                console.log('上传成功', e);
+                resolve(e.data.documentId);
+              }
+            });
+          }));
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _uploadSignFile.apply(this, arguments);
+}
+function createbycategoryFun(fileName, documentIdVal, config) {
+  // uni.showLoading({ title: '加载中' })
+  console.log('env---', config.env);
+  var params = {
+    subject: fileName,
+    documents: [documentIdVal],
+    categoryId: config.env === 'releaseHLW' ? categoryIdRelease : categoryId,
+    send: true,
+    tenantName: '山西省行政审批服务管理局'
+  };
+  return new Promise(function (resolve) {
+    createbycategory(params, config).then(function (res) {
+      console.log('创建订单成功', res);
+      if (res.code === 200) {
+        resolve(res.data.contractId);
+      } else {
+        resolve(false);
+      }
+    })["catch"](function (error) {
+      // uni.hideLoading();
+      resolve(false);
+    });
+  });
+}
+
+// 【第 3 步】创建手写签批页面
+function getContractSignUrl(contractIdVal, userInfo, config) {
+  console.log('contractIdVal', contractIdVal, userInfo);
+  // uni.showLoading({ title: '加载中' })
+  var params = {
+    contractId: contractIdVal,
+    signatories: [{
+      tenantType: 'PERSONAL',
+      tenantName: userInfo.acctType === '20' ? userInfo.legalName : userInfo.userName,
+      contact: userInfo.acctType === '20' ? userInfo.legalMobile : userInfo.contactMobile,
+      serialNo: 1,
+      signAuthConfig: {
+        signAuth: 'DEFAULT'
+      },
+      remind: false
+    }]
+  };
+  return new Promise(function (resolve) {
+    contractSignUrl(params, config).then(function (res) {
+      if (res.data.code == 0) {
+        resolve(true);
+      } else {
+        // uni.hideLoading();
+        // uni.showModal({
+        //   title: '温馨提示',
+        //   content: '获取签批页面失败',
+        //   confirmText: '知道了',
+        //   showCancel: false,
+        // })
+        resolve(false);
+      }
+    })["catch"](function (error) {
+      // uni.hideLoading();
+      resolve(false);
+    });
+  });
+}
+
+// 【第 4 步】获取签 pi 页面
+function getSignUrl(userInfo, config) {
+  // uni.showLoading({ title: '加载中' })
+  var params = {
+    contractId: contractId,
+    tenantType: 'PERSONAL',
+    // COMPANY（组织）,PERSONAL（个人）
+    tenantName: userInfo.acctType === '20' ? userInfo.legalName : userInfo.userName,
+    contact: userInfo.acctType === '20' ? userInfo.legalMobile : userInfo.contactMobile,
+    canReturn: false,
+    // 页面是否显示返回按钮
+    canWithdraw: false,
+    // 页面是否显示撤回/回退/拒签按钮
+    rejectable: false,
+    // 页面是否显示拒签按钮
+    allowDownload: false,
+    // 页面是否显示下载按钮
+    allowPrint: false,
+    // 页面是否显示打印按钮
+    canViewDetail: false,
+    // 页面是否显示签署详情按钮
+    canMoreOperation: false,
+    // 页面是否显示"更多操作"按钮
+    autoClosePage: true,
+    // 操作完成自动关闭页面
+    language: 'ZH_CN',
+    deviceType: config.isPC || 'H5' // 取值范围：PC（返回 PC 页面），H5（返回 H5 页面）；不传值默认为：根据请求的 UserAgent 自动判断返回的页面类型。
+  };
+  return new Promise(function (resolve) {
+    signurl(params, config).then(function (res) {
+      console.log(res, '页面结果');
+      if (res.data.code == 0) {
+        resolve(res.data.signUrl);
+      } else {
+        resolve(false);
+      }
+      // uni.hideLoading();
+    })["catch"](function (error) {
+      resolve(false);
+      // uni.hideLoading();
+    });
+  });
+}
+
+// 下方是打开手写签批页面后 的后续操作
+
+// 对外的方法 获取签批后的文件
+export function getSignRes(_x6, _x7, _x8, _x9, _x0) {
+  return _getSignRes.apply(this, arguments);
+}
+
+// 轮询 签批状态
+function _getSignRes() {
+  _getSignRes = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(documentIdVal, contractIdVal, name, autoUpload, config) {
+    var isSignSucc, newFile, params, uploadRes;
+    return _regeneratorRuntime.wrap(function (_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.next = 1;
+          return getCheckSignState(contractIdVal, config);
+        case 1:
+          isSignSucc = _context3.sent;
+          if (!isSignSucc) {
+            _context3.next = 8;
+            break;
+          }
+          // 封存
+          getContractFinish(contractIdVal, config);
+          _context3.next = 2;
+          return handleSignApprovalDown(documentIdVal, name, config);
+        case 2:
+          newFile = _context3.sent;
+          console.log('newFile', newFile);
+          // 如果需要自动上传
+          if (!autoUpload) {
+            _context3.next = 6;
+            break;
+          }
+          params = {
+            materiaBase: newFile,
+            open: true
+          };
+          console.log('params', params);
+          _context3.next = 3;
+          return fileUploadApi(params, config);
+        case 3:
+          uploadRes = _context3.sent;
+          // const uploadedFileObj = await uploadFilePromise(newFile, config)
+          console.log('签批完成后的文件地址', uploadRes);
+          if (!(uploadRes.code === 200)) {
+            _context3.next = 4;
+            break;
+          }
+          return _context3.abrupt("return", uploadRes.data);
+        case 4:
+          return _context3.abrupt("return", false);
+        case 5:
+          _context3.next = 7;
+          break;
+        case 6:
+          return _context3.abrupt("return", newFile);
+        case 7:
+          _context3.next = 9;
+          break;
+        case 8:
+          return _context3.abrupt("return", false);
+        case 9:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _getSignRes.apply(this, arguments);
+}
+function getCheckSignState(contractIdVal, config) {
+  return new Promise(function (resolve) {
+    checkSignState({
+      contractId: contractIdVal
+    }, config).then(function (res) {
+      console.log('轮询结果---', res);
+      // console.log('轮询结果', JSON.parse(res.data));
+      // 签署完成
+      if (res.data !== 'null') {
+        res = JSON.parse(res.data);
+        if (res.status == 'SIGNED') {
+          resolve(true);
+        } else {
+          resolve(false);
+        }
+      } else {
+        resolve(false);
+      }
+    });
+  });
+}
+
+// 封存电子签批
+function getContractFinish(contractIdVal, config) {
+  contractFinish({
+    contractId: contractIdVal
+  }, config);
+}
+
+// 下载签署完的文档
+function handleSignApprovalDown(documentIdVal, name, config) {
+  var params = {
+    documentId: documentIdVal,
+    type: 'pdf'
+  };
+  return new Promise(function (resolve) {
+    documentDownload(params, config).then(function (res) {
+      console.log('下载文件：', res);
+      // 返回来是base64格式的
+      // const blob = dataURLtoBlob(res.data); // 转成blob格式进行上传
+      // console.log(blob, '新文件的blob格式');
+      if (res.code === 200) {
+        resolve(res.data);
+      } else {
+        resolve(false);
+      }
+    });
+  });
+}

package/es/index.d.ts

@@ -17,8 +17,6 @@ export type { SuccessPromptProps } from './components/success-prompt';
 export { default as SuccessPrompt } from './components/success-prompt';
 export type { CheckDetailProps } from './components/check-detail';
 export { default as CheckDetail } from './components/check-detail';
-export type { FilePCProps } from './components/file-pc';
-export { default as FilePC } from './components/file-pc';
 export type { PreCheckResPCProps } from './components/pre-check-res-pc';
 export { default as PreCheckResPC } from './components/pre-check-res-pc';
 export type { CheckDetailPcProps } from './components/check-detail-pc';
@@ -51,5 +49,7 @@ export type { GuideProps } from './components/guide';
 export { default as Guide } from './components/guide';
 export type { CommentProps } from './components/guide/comment';
 export { default as Comment } from './components/guide/comment';
+export type { SignFileProps } from './components/sign-file';
+export { default as SignFile } from './components/sign-file';
 declare const bizCssPrefix = "bizpack";
 export { bizCssPrefix };

package/es/index.js

@@ -14,7 +14,6 @@ export { default as Statstic } from "./components/statistic";
 export { default as MaterialCheckRes } from "./components/material-check-res";
 export { default as SuccessPrompt } from "./components/success-prompt";
 export { default as CheckDetail } from "./components/check-detail";
-export { default as FilePC } from "./components/file-pc";
 export { default as PreCheckResPC } from "./components/pre-check-res-pc";
 export { default as CheckDetailPc } from "./components/check-detail-pc";
 export { default as IconCustom } from "./components/icon-custom";
@@ -31,5 +30,6 @@ export { default as FileListPreview } from "./components/file-list-preview";
 export { default as DragDropList } from "./components/drag-drop";
 export { default as Guide } from "./components/guide";
 export { default as Comment } from "./components/guide/comment";
+export { default as SignFile } from "./components/sign-file";
 var bizCssPrefix = 'bizpack';
 export { bizCssPrefix };

package/es/style.js

@@ -4,6 +4,7 @@ import '@alifd/next/es/radio/style';
 import '@alifd/next/es/checkbox/style';
 import '@alifd/next/es/balloon/style';
 import 'antd/es/cascader/style';
+import '@alifd/next/es/input/style';
 import '@alifd/next/es/dialog/style';
 import '@alifd/next/es/loading/style';
 import '@alifd/next/es/button/style';

package/lib/components/file-item/index.js

@@ -11,14 +11,12 @@ var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
 var _react = _interopRequireWildcard(require("react"));
 var _checked = _interopRequireDefault(require("./icon/checked.svg"));
-var _del = _interopRequireDefault(require("./icon/del.svg"));
 var _preview = _interopRequireDefault(require("./icon/preview.svg"));
 var _preview_pc = _interopRequireDefault(require("./icon/preview_pc.svg"));
 var _download = _interopRequireDefault(require("./icon/download.svg"));
 var _download_pc = _interopRequireDefault(require("./icon/download_pc.svg"));
 var _file = _interopRequireDefault(require("./icon/file.svg"));
 var _icon_warning = _interopRequireDefault(require("./icon/icon_warning.svg"));
-var _icon_errorMsg = _interopRequireDefault(require("./icon/icon_errorMsg.svg"));
 var _upload = _interopRequireDefault(require("./icon/upload.svg"));
 var _close = _interopRequireDefault(require("./icon/close.svg"));
 var _sign = _interopRequireDefault(require("./sign"));
@@ -498,18 +496,7 @@ var FileItem = function FileItem(_ref) {
     className: "small_img",
     src: _file["default"],
     alt: ""
-  }), "\u6587\u4EF6", !disabled && /*#__PURE__*/_react["default"].createElement("img", {
-    className: "del",
-    src: _del["default"],
-    alt: "",
-    onClick: function onClick() {
-      return del();
-    }
-  }), isInValid && /*#__PURE__*/_react["default"].createElement("img", {
-    className: "error_msg",
-    src: _icon_errorMsg["default"],
-    alt: ""
-  })) : /*#__PURE__*/_react["default"].createElement("div", {
+  }), "\u6587\u4EF6") : /*#__PURE__*/_react["default"].createElement("div", {
     className: "add",
     onClick: function onClick() {
       return upload();
@@ -742,7 +729,7 @@ var FileItem = function FileItem(_ref) {
   }), /*#__PURE__*/_react["default"].createElement("img", {
     src: guideurl,
     style: {
-      height: '90%'
+      width: '100%'
     }
   })), checkPointData && /*#__PURE__*/_react["default"].createElement(_checkPoint["default"], {
     checkPointData: checkPointData,

package/lib/components/file-list/icon/add.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="20" height="20" viewBox="0 0 20 20"><defs><clipPath id="master_svg0_1207_75555"><rect x="0" y="0" width="20" height="20" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_1207_75555)"><path d="M8.832264925,10.916015625C9.753515225,10.916015625,10.489764225,10.916015625,11.082264625,10.963515472C11.684764625,11.013515472,12.207264625,11.116015625,12.686015625,11.361015315C13.454546625,11.752638285,14.079391625,12.377482625,14.471014625,13.146015125C14.716013625,13.624765825,14.818514625,14.147264925,14.868514625,14.749765825C14.916015625,15.342266125,14.916015625,16.078516525,14.916015625,16.999765825L14.916015625,17.499765825C14.916015625,17.913979525000002,14.580229625,18.249765825,14.166015625,18.249765825L1.666015625,18.249765825C1.251802055,18.249765825,0.916015625,17.913979525000002,0.916015625,17.499765825L0.916015625,16.999765825C0.916015625,16.078516525,0.916015625,15.342266125,0.963515665,14.749765825C1.013515666,14.147266425,1.116015625,13.624765825,1.361015705,13.146015125C1.752639415,12.377483325,2.377483925,11.752638995,3.146015925,11.361015315C3.624765825,11.116015625,4.147265625,11.013515472,4.749765825,10.963515472C5.342265625,10.916015625,6.078515525,10.916015625,6.999765825,10.916015625L8.832264925,10.916015625ZM6.999764925,12.416015625C6.053514925,12.416015625,5.389765225,12.416015625,4.871015325,12.459765625C4.362265125,12.501015525,4.059765325,12.578515625,3.827265225,12.697265625C3.340702025,12.945127225,2.945126725,13.340702025,2.6972652249999998,13.827265225C2.5785153249999997,14.059764825,2.501015325,14.362265825,2.4597653250000002,14.872264825C2.4210151250000003,15.342264625,2.417265325,15.934764825,2.417265325,16.748514625L13.414764625,16.748514625C13.414764625,15.934764825,13.411013625,15.342264625,13.372263625,14.872264825C13.331013625,14.362264425,13.253514625,14.059764825,13.134764625,13.827265225C12.886903625,13.340700625,12.491327625,12.945125625,12.004763625,12.697264925C11.772264625,12.578514925,11.469763625,12.501014725000001,10.961013625,12.459764825C10.442263625,12.417264625,9.778513925,12.416014925,8.832263925,12.416014925L6.999764925,12.416015625Z" fill="#999999" fill-opacity="1" style="mix-blend-mode:passthrough"/><path d="M15.833983674999999,4.666015625C16.248197275,4.66601600646973,16.583985375,5.001802445,16.583983675,5.416015625L16.583983675,7.166015625L18.333983875,7.166015625C18.748197075,7.166016325,19.083983875,7.501802925,19.083983875,7.916016325C19.083983875,8.330230025,18.748197075,8.666016625000001,18.333983875,8.666015625L16.583983675,8.666015625L16.583983675,10.416015625C16.583985375,10.830229325000001,16.248198775,11.166016625000001,15.833985075000001,11.166016625000001C15.419771675,11.166016625000001,15.083985075000001,10.830230225000001,15.083983674999999,10.416015625L15.083983674999999,8.666015625L13.333983605,8.666015625C12.919770065,8.666016625000001,12.583984375,8.330230025,12.583984375,7.916016325C12.583984375,7.501802925,12.919770065,7.166016325,13.333983605,7.166015625L15.083983674999999,7.166015625L15.083983674999999,5.416015625C15.083985075000001,5.001802055,15.419769975,4.66601600646973,15.833983674999999,4.666015625Z" fill="#999999" fill-opacity="1" style="mix-blend-mode:passthrough"/><path d="M7.91638631875,1.75C9.94154591875,1.75000019073487,11.583261018750001,3.3917156,11.583261018750001,5.4168746C11.583261018750001,7.4420342,9.94154591875,9.0837502,7.91638631875,9.0837502C5.8912273187499995,9.0837502,4.24951171875,7.4420342,4.24951171875,5.4168746C4.24951171875,3.3917156,5.8912273187499995,1.75000019073487,7.91638631875,1.75ZM7.91638631875,3.25C6.71930931875,3.2503452,5.74916651875,4.2210481,5.74951171875,5.4181252C5.74985691875,6.6152024,6.72055891875,7.5853457,7.91763611875,7.585C9.114712718749999,7.5846553,10.08485551875,6.6139526,10.084510818750001,5.4168758C10.08416601875,4.2197987999999995,9.11346391875,3.2496551,7.91638631875,3.25Z" fill="#999999" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></svg>

package/lib/components/file-list/icon/close_black.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="14.166254997253418" height="14.166254997253418" viewBox="0 0 14.166254997253418 14.166254997253418"><path d="M5.9393778,7.083128L0.2368781,1.380628C-0.078959465,1.0647899,-0.078959465,0.55271596,0.2368784,0.2368784C0.55271626,-0.078959465,1.0647901,-0.078959465,1.380628,0.2368781L7.083128,5.9393778L12.785627,0.2368781C13.101511,-0.078696012,13.61337,-0.078570843,13.929096,0.23715764C14.244826,0.55288643,14.244952,1.0647446,13.929379,1.380628L8.2268772,7.083128L13.929377,12.785627C14.245214,13.101465,14.245214,13.613542,13.929377,13.929377C13.613539,14.245214,13.101463,14.245214,12.785627,13.929379L7.083128,8.2268772L1.380628,13.929379C1.0647446,14.244952,0.55288613,14.244826,0.23715734,13.929096C-0.078571141,13.61337,-0.078696012,13.101511,0.2368781,12.785627L5.9393778,7.083128Z" fill="#666666" fill-opacity="1" style="mix-blend-mode:passthrough"/></svg>

package/lib/components/file-list/index.d.ts

@@ -5,6 +5,7 @@ export interface FileListProps {
      * 列表数据
      */
     fileList: Array<object>;
+    signerInfo: object;
     token: string;
     tokenTY: string;
     accessToken: string;
@@ -18,6 +19,7 @@ export interface FileListProps {
     openLoading: () => void;
     closeLoading: () => void;
     valChange: (value: any) => void;
+    saveSignerInfo: (value: any) => boolean;
 }
 declare const FileList: React.FC<FileListProps>;
 export default FileList;

package/lib/components/file-list/index.js

@@ -47,10 +47,12 @@ var FileList = function FileList(_ref) {
     isPC = _ref.isPC,
     disabled = _ref.disabled,
     style = _ref.style,
+    signerInfo = _ref.signerInfo,
     download = _ref.download,
     openLoading = _ref.openLoading,
     closeLoading = _ref.closeLoading,
-    valChange = _ref.valChange;
+    valChange = _ref.valChange,
+    saveSignerInfo = _ref.saveSignerInfo;
   var _useState = (0, _react.useState)(false),
     showMerge = _useState[0],
     setShowMerge = _useState[1];
@@ -293,11 +295,13 @@ var FileList = function FileList(_ref) {
           baseUrl: baseUrl,
           env: env,
           isPC: isPC,
+          signerInfo: signerInfo,
           disabled: disabled,
           download: download,
           valChange: handleChange,
           openLoading: openLoading,
           closeLoading: closeLoading,
+          saveSignerInfo: saveSignerInfo,
           style: {
             marginBottom: '12px'
           }
@@ -309,6 +313,7 @@ var FileList = function FileList(_ref) {
       return /*#__PURE__*/_react["default"].createElement(_item["default"], {
         index: index,
         fileIndex: i,
+        signerInfo: signerInfo,
         file: file,
         fileConfig: item,
         maxFileSize: item.materialSize,
@@ -325,6 +330,7 @@ var FileList = function FileList(_ref) {
         valChange: handleChange,
         openLoading: openLoading,
         closeLoading: closeLoading,
+        saveSignerInfo: saveSignerInfo,
         style: {
           marginBottom: '12px'
         }

package/lib/components/file-list/item.d.ts

@@ -18,10 +18,12 @@ export interface FileItemProps {
     isInValid: boolean;
     userInfo: object;
     style?: object;
+    signerInfo: object;
     openLoading: () => void;
     closeLoading: () => void;
     valChange: (value: any, fileIndex: any, index: any, subIndex: any) => void;
     download: (value: any) => void;
+    saveSignerInfo: (value: any) => boolean;
 }
 declare const FileItem: React.FC<FileItemProps>;
 export default FileItem;

package/lib/components/file-list/item.js

@@ -25,6 +25,7 @@ var _seal = _interopRequireDefault(require("./seal"));
 var _api = require("../../api");
 var _file2 = require("./file.js");
 var _checkPoint = _interopRequireDefault(require("./checkPoint"));
+var _signerInfo = _interopRequireDefault(require("./signerInfo"));
 require("./item.scss");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var RadioGroup = _radio["default"].Group;
@@ -39,6 +40,7 @@ var FileItem = function FileItem(_ref) {
     userInfo = _ref.userInfo,
     token = _ref.token,
     tokenTY = _ref.tokenTY,
+    signerInfo = _ref.signerInfo,
     accessToken = _ref.accessToken,
     baseUrl = _ref.baseUrl,
     env = _ref.env,
@@ -48,7 +50,8 @@ var FileItem = function FileItem(_ref) {
     valChange = _ref.valChange,
     download = _ref.download,
     openLoading = _ref.openLoading,
-    closeLoading = _ref.closeLoading;
+    closeLoading = _ref.closeLoading,
+    saveSignerInfo = _ref.saveSignerInfo;
   console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
@@ -62,7 +65,10 @@ var FileItem = function FileItem(_ref) {
     signGuidFileId = fileConfig.signGuidFileId,
     keyPoint = fileConfig.keyPoint,
     isSmart = fileConfig.isSmart,
-    isShareFile = fileConfig.isShareFile;
+    isShareFile = fileConfig.isShareFile,
+    needOtherSign = fileConfig.needOtherSign;
+  var signBtnText = needOtherSign ? '联合签署' : '签署文件';
+  var reSignBtnText = needOtherSign ? '重新联合签署' : '重新签署';
   var _useState = (0, _react.useState)(false),
     isShowMaterialLib = _useState[0],
     setIsShowMaterialLib = _useState[1];
@@ -114,6 +120,9 @@ var FileItem = function FileItem(_ref) {
   var _useState15 = (0, _react.useState)(),
     sealedFile = _useState15[0],
     setSealedFile = _useState15[1];
+  var _useState16 = (0, _react.useState)(false),
+    showSignerInfo = _useState16[0],
+    setShowSignerInfo = _useState16[1];
   var upload = function upload() {
     if (disabled) return;
     var inputEl = document.createElement('input');
@@ -310,13 +319,19 @@ var FileItem = function FileItem(_ref) {
     setIsShowSealPage(true);
   };
   var signAndSeal = function signAndSeal() {
-    seal();
+    // 如果不能签章就直接签批
+    if (!(userInfo.acctType === '20' && signEnable)) {
+      sign();
+    } else {
+      seal();
+    }
   };
 
   // 获取签pi结果
   var getRes = function getRes(val) {
     console.log('val---', val);
     valChange(val, fileIndex, index, subIndex);
+    needOtherSign && setShowSignerInfo(true);
   };
 
   // 获取签章结果
@@ -328,6 +343,7 @@ var FileItem = function FileItem(_ref) {
       sign();
     } else {
       valChange(val, fileIndex, index, subIndex);
+      needOtherSign && setShowSignerInfo(true);
     }
   };
   var queryFileLibs = function queryFileLibs() {
@@ -715,16 +731,16 @@ var FileItem = function FileItem(_ref) {
   // 有文件且配置了这俩功能且没有禁用操作才展示
   _react["default"].createElement("div", {
     className: "btn"
-  }, signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
+  }, signatureEnable || userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
     onClick: signAndSeal
-  }, isSigned && isSealed ? '重新签署' : '签署文件'), !(userInfo.acctType === '20' && signEnable) && signatureEnable && /*#__PURE__*/_react["default"].createElement("div", {
+  }, isSigned && isSealed ? reSignBtnText : signBtnText), !(userInfo.acctType === '20' && signEnable) && signatureEnable && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
     onClick: sign
-  }, isSigned ? '重新签批' : '签署文件'), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
+  }, isSigned ? reSignBtnText : signBtnText), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
     onClick: seal
-  }, isSealed ? '重新签章' : '签署文件')) :
+  }, isSealed ? reSignBtnText : signBtnText)) :
   // 展示材料库
   !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
@@ -872,6 +888,13 @@ var FileItem = function FileItem(_ref) {
     handleClose: function handleClose() {
       return setCheckPointData(null);
     }
+  }), showSignerInfo && /*#__PURE__*/_react["default"].createElement(_signerInfo["default"], {
+    signerInfo: signerInfo,
+    handleClose: function handleClose() {
+      console.log('close');
+      setShowSignerInfo(false);
+    },
+    saveSignerInfo: saveSignerInfo
   }));
 };
 FileItem.displayName = 'FileItem';

package/lib/components/file-list/seal.js

@@ -23,7 +23,9 @@ function SealPage(props) {
     env = props.env,
     isPC = props.isPC,
     accessToken = props.accessToken,
-    closeLoading = props.closeLoading;
+    closeLoading = props.closeLoading,
+    _props$showClose = props.showClose,
+    showClose = _props$showClose === void 0 ? true : _props$showClose;
   var _useState = (0, _react.useState)(''),
     srcUrl = _useState[0],
     setSrcUrl = _useState[1];
@@ -220,7 +222,7 @@ function SealPage(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "sealPage",
     ref: elementRef
-  }, /*#__PURE__*/_react["default"].createElement("img", {
+  }, showClose && /*#__PURE__*/_react["default"].createElement("img", {
     className: "seal_close",
     src: _close["default"],
     alt: "",