ydb-components-material 0.1.110 → 0.1.112

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

@@ -20,6 +20,7 @@ export interface FileListProps {
     closeLoading: () => void;
     valChange: (value: any) => void;
     saveSignerInfo: (value: any) => boolean;
+    signInfoMap?: object;
 }
 declare const FileList: React.FC<FileListProps>;
 export default FileList;

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

@@ -47,7 +47,8 @@ var FileList = function FileList(_ref) {
     openLoading = _ref.openLoading,
     closeLoading = _ref.closeLoading,
     valChange = _ref.valChange,
-    saveSignerInfo = _ref.saveSignerInfo;
+    saveSignerInfo = _ref.saveSignerInfo,
+    signInfoMap = _ref.signInfoMap;
   var _useState = useState(false),
     showMerge = _useState[0],
     setShowMerge = _useState[1];
@@ -291,6 +292,7 @@ var FileList = function FileList(_ref) {
           env: env,
           isPC: isPC,
           signerInfo: signerInfo,
+          signInfoMap: signInfoMap,
           disabled: disabled,
           download: download,
           valChange: handleChange,
@@ -309,6 +311,7 @@ var FileList = function FileList(_ref) {
         index: index,
         fileIndex: i,
         signerInfo: signerInfo,
+        signInfoMap: signInfoMap,
         file: file,
         fileConfig: item,
         maxFileSize: item.materialSize,

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

@@ -24,6 +24,7 @@ export interface FileItemProps {
     valChange: (value: any, fileIndex: any, index: any, subIndex: any) => void;
     download: (value: any) => void;
     saveSignerInfo: (value: any) => boolean;
+    signInfoMap?: object;
 }
 declare const FileItem: React.FC<FileItemProps>;
 export default FileItem;

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

@@ -23,6 +23,8 @@ import CheckPoint from "./checkPoint";
 import SignerInfo from "./signerInfo";
 import "./item.scss";
 var RadioGroup = _Radio.Group;
+var SELF = 0;
+var OTHER = 1;
 var FileItem = function FileItem(_ref) {
   var index = _ref.index,
     subIndex = _ref.subIndex,
@@ -45,7 +47,8 @@ var FileItem = function FileItem(_ref) {
     download = _ref.download,
     openLoading = _ref.openLoading,
     closeLoading = _ref.closeLoading,
-    saveSignerInfo = _ref.saveSignerInfo;
+    saveSignerInfo = _ref.saveSignerInfo,
+    signInfoMap = _ref.signInfoMap;
   console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
@@ -53,14 +56,24 @@ var FileItem = function FileItem(_ref) {
     isSigned = file.isSigned,
     isSealed = file.isSealed,
     fileType = file.fileType;
-  var signatureEnable = fileConfig.signatureEnable,
+  var materialName = fileConfig.materialName,
+    signatureEnable = fileConfig.signatureEnable,
     signEnable = fileConfig.signEnable,
     isInValid = fileConfig.isInValid,
     signGuidFileId = fileConfig.signGuidFileId,
     keyPoint = fileConfig.keyPoint,
     isSmart = fileConfig.isSmart,
     isShareFile = fileConfig.isShareFile,
-    needOtherSign = fileConfig.needOtherSign;
+    signatureSelfRole = fileConfig.signatureSelfRole,
+    signatureAgentRole = fileConfig.signatureAgentRole,
+    signSelfRole = fileConfig.signSelfRole,
+    signAgentRole = fileConfig.signAgentRole;
+  // 需要他人签批或签章
+  var needOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER) || signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
+  // 需要他人签名
+  var isNeedOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER);
+  // 需要他人签章
+  var isNeedOtherSeal = signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
   var signBtnText = needOtherSign ? '联合签署' : '签署文件';
   var reSignBtnText = needOtherSign ? '重新联合签署' : '重新签署';
   var _useState = useState(false),
@@ -303,7 +316,6 @@ var FileItem = function FileItem(_ref) {
 
   // 签章
   var seal = function seal() {
-    console.log('fileType', fileType);
     var type = getFileExtension(fileName);
     if (type !== 'pdf') {
       _Message.notice('只有pdf文件才能使用电子签章');
@@ -313,6 +325,12 @@ var FileItem = function FileItem(_ref) {
     setIsShowSealPage(true);
   };
   var signAndSeal = function signAndSeal() {
+    // const notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF)
+    // // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
+    // if (notNeedSelfSign && needOtherSign) {
+    //   setShowSignerInfo(true)
+    //   return
+    // }
     // 如果不能签章就直接签批
     if (!(userInfo.acctType === '20' && signEnable)) {
       sign();
@@ -728,13 +746,7 @@ var FileItem = function FileItem(_ref) {
   }, signatureEnable || userInfo.acctType === '20' && signEnable && /*#__PURE__*/React.createElement("div", {
     className: "operation_btn",
     onClick: signAndSeal
-  }, isSigned && isSealed ? reSignBtnText : signBtnText), !(userInfo.acctType === '20' && signEnable) && signatureEnable && /*#__PURE__*/React.createElement("div", {
-    className: "operation_btn",
-    onClick: sign
-  }, isSigned ? reSignBtnText : signBtnText), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/React.createElement("div", {
-    className: "operation_btn",
-    onClick: seal
-  }, isSealed ? reSignBtnText : signBtnText)) :
+  }, isSigned && isSealed ? reSignBtnText : signBtnText)) :
   // 展示材料库
   !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/React.createElement("div", {
     className: "operation_btn",
@@ -885,12 +897,16 @@ var FileItem = function FileItem(_ref) {
   }), showSignerInfo && /*#__PURE__*/React.createElement(SignerInfo, {
     signerInfo: signerInfo,
     handleClose: function handleClose() {
-      console.log('close');
-      setShowSignerInfo(false);
+      return setShowSignerInfo(false);
     },
     saveSignerInfo: saveSignerInfo,
     signatureEnable: signatureEnable,
-    signEnable: signEnable
+    signEnable: signEnable,
+    isNeedOtherSign: isNeedOtherSign,
+    isNeedOtherSeal: isNeedOtherSeal,
+    file: file,
+    materialName: materialName,
+    signInfoMap: signInfoMap
   }));
 };
 FileItem.displayName = 'FileItem';

package/es/components/file-list/signerInfo.js

@@ -16,7 +16,12 @@ function SignerInfo(props) {
     signerInfo = props.signerInfo,
     saveSignerInfo = props.saveSignerInfo,
     signatureEnable = props.signatureEnable,
-    signEnable = props.signEnable;
+    signEnable = props.signEnable,
+    isNeedOtherSign = props.isNeedOtherSign,
+    isNeedOtherSeal = props.isNeedOtherSeal,
+    file = props.file,
+    materialName = props.materialName,
+    signInfoMap = props.signInfoMap;
   var _React$useState = React.useState([]),
     signerInfoList = _React$useState[0],
     setSignerInfoList = _React$useState[1];
@@ -33,6 +38,16 @@ function SignerInfo(props) {
     newList[index] = _extends({}, newList[index], (_extends2 = {}, _extends2[field] = val, _extends2));
     setSignerInfoList(newList);
   };
+  var getCurrentTime = function getCurrentTime() {
+    var now = new Date();
+    var year = now.getFullYear();
+    var month = now.getMonth() + 1; // 无前导零
+    var day = now.getDate(); // 无前导零
+    var hours = now.getHours().toString().padStart(2, '0');
+    var minutes = now.getMinutes().toString().padStart(2, '0');
+    var seconds = now.getSeconds().toString().padStart(2, '0');
+    return year + "/" + month + "/" + day + " " + hours + ":" + minutes + ":" + seconds;
+  };
   var next = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var saveRes;
@@ -40,7 +55,12 @@ function SignerInfo(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 1;
-            return saveSignerInfo(signerInfoList);
+            return saveSignerInfo({
+              list: signerInfoList,
+              file: file,
+              materialName: materialName,
+              date: getCurrentTime()
+            });
           case 1:
             saveRes = _context.sent;
             if (saveRes) {
@@ -71,6 +91,14 @@ function SignerInfo(props) {
     navigator.clipboard.writeText(url);
     _Message.success('复制成功');
   };
+  useEffect(function () {
+    if (signInfoMap && file) {
+      var fileId = file.fileId;
+      if (signInfoMap[fileId]) {
+        setSignerInfoList(signInfoMap[fileId]);
+      }
+    }
+  }, [signInfoMap, file]);
   useEffect(function () {
     if (signerInfo) {
       console.log('signerInfo', signerInfo);
@@ -234,10 +262,10 @@ function SignerInfo(props) {
         return handleFieldChange('signContent', val, index);
       },
       "aria-labelledby": "groupId"
-    }, signatureEnable && /*#__PURE__*/React.createElement(_Checkbox, {
+    }, signatureEnable && isNeedOtherSign && /*#__PURE__*/React.createElement(_Checkbox, {
       id: "1",
       value: "1"
-    }, "\u4EC5\u7B7E\u540D"), signEnable && item.signType === 1 && /*#__PURE__*/React.createElement(_Checkbox, {
+    }, "\u4EC5\u7B7E\u540D"), signEnable && isNeedOtherSeal && item.signType === 1 && /*#__PURE__*/React.createElement(_Checkbox, {
       id: "2",
       value: "2"
     }, "\u4EC5\u7B7E\u7AE0")))));

package/es/components/guide/compoents/materials/materials.d.ts

@@ -12,6 +12,7 @@ export interface MaterialsProps {
     download?: (params: any) => void;
     situationResRechange?: (data: any) => void;
     taskHandleItem?: string;
+    previousData?: any;
 }
 declare const Materials: React.FC<MaterialsProps>;
 export default Materials;

package/es/components/guide/compoents/materials/materials.js

@@ -13,7 +13,8 @@ var Materials = function Materials(_ref) {
     baseUrlProp = _ref.baseUrl,
     downloadProp = _ref.download,
     situationResRechangeProp = _ref.situationResRechange,
-    taskHandleItemProp = _ref.taskHandleItem;
+    taskHandleItemProp = _ref.taskHandleItem,
+    previousDataProp = _ref.previousData;
   return /*#__PURE__*/React.createElement("div", {
     className: "materials-content"
   }, situationPageUrlProp && /*#__PURE__*/React.createElement(Situation, {
@@ -25,7 +26,8 @@ var Materials = function Materials(_ref) {
     declarationAppToken: declarationAppTokenProp,
     situationPageUrl: situationPageUrlProp,
     situationResRechange: situationResRechangeProp,
-    taskHandleItem: taskHandleItemProp
+    taskHandleItem: taskHandleItemProp,
+    previousData: previousDataProp
   }), /*#__PURE__*/React.createElement(MaterialsList, {
     eventInfo: eventInfoProp,
     finalMaterials: finalMaterialsProp,

package/es/components/guide/compoents/materials/situation.d.ts

@@ -10,6 +10,7 @@ export interface SituationProps {
     situationPageUrl?: string;
     taskHandleItem?: string;
     situationResRechange?: (data: any) => void;
+    previousData?: any;
 }
 declare const Situation: React.FC<SituationProps>;
 export default Situation;

package/es/components/guide/compoents/materials/situation.js

@@ -14,7 +14,8 @@ var Situation = function Situation(_ref) {
     declarationAppTokenProp = _ref.declarationAppToken,
     situationPageUrlProp = _ref.situationPageUrl,
     taskHandleItemProp = _ref.taskHandleItem,
-    situationResRechangeProp = _ref.situationResRechange;
+    situationResRechangeProp = _ref.situationResRechange,
+    previousDataProp = _ref.previousData;
   var _React$useState = React.useState('说明：因个人情况不同上交材料不同，可通过情形选择查看必须上传的材料！'),
     tip = _React$useState[0];
   var _React$useState2 = React.useState(false),
@@ -29,14 +30,14 @@ var Situation = function Situation(_ref) {
     return function () {
       window.removeEventListener('message', getMessage);
     };
-  }, []);
+  }, [eventInfoProp, taskHandleItemProp, situationPageUrlProp, declarationAppTokenProp, finalMaterialsProp, applicationIdProp, accessTokenProp, acctTypeProp, previousDataProp]);
   var initPage = function initPage() {
     if (!situationPageUrlProp) return;
-    var url = situationPageUrlProp + "&isFirst=1&isReCheck=1";
+    var url = situationPageUrlProp + "&isFirst=1&isReCheck=1&isZXBB=1";
     setIframeSrc(url);
   };
   var getMessage = function getMessage(e) {
-    var typeArr = ['getAccessToken', 'getDeclaraToken', 'getApplicationId', 'getTaskHandleItem', 'getFormId', 'getMaterials', 'getFormData'];
+    var typeArr = ['getAccessToken', 'getDeclaraToken', 'getApplicationId', 'getTaskHandleItem', 'getFormId', 'getMaterials', 'getFormData', 'getPreviousData'];
     var _ref2 = e.data || {},
       type = _ref2.type,
       data = _ref2.data;
@@ -82,6 +83,9 @@ var Situation = function Situation(_ref) {
       case 'getMaterials':
         sendData.data.materials = finalMaterials || (eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.taskGeneralMaterials);
         break;
+      case 'getPreviousData':
+        sendData.data.previousData = previousDataProp;
+        break;
     }
     var formIframe = document.getElementById('situationIframe');
     if (formIframe !== null && formIframe !== void 0 && formIframe.contentWindow) {

package/es/components/guide/index.d.ts

@@ -30,6 +30,8 @@ export interface GuideProps {
     download?: (params: any) => void;
     /** Situation result re-change handler */
     situationResRechange?: (data: any) => void;
+    /** Previous form data from parent */
+    previousData?: any;
 }
 declare const Guide: React.FC<GuideProps>;
 export default Guide;

package/es/components/guide/index.js

@@ -42,7 +42,8 @@ var Guide = function Guide(_ref) {
     situationPageUrl = _ref.situationPageUrl,
     baseUrl = _ref.baseUrl,
     download = _ref.download,
-    situationResRechange = _ref.situationResRechange;
+    situationResRechange = _ref.situationResRechange,
+    previousData = _ref.previousData;
   var _React$useState = React.useState(false),
     pageLoading = _React$useState[0];
   var _React$useState2 = React.useState(true),
@@ -286,7 +287,8 @@ var Guide = function Guide(_ref) {
     baseUrl: baseUrl,
     download: download,
     situationResRechange: situationResRechange,
-    taskHandleItem: taskHandleItem
+    taskHandleItem: taskHandleItem,
+    previousData: previousData
   }), tabIndex === 1 && /*#__PURE__*/React.createElement(BasicInfo, {
     eventInfo: eventInfoProp
   }), tabIndex === 2 && /*#__PURE__*/React.createElement(ProcessImg, {

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

@@ -20,6 +20,7 @@ export interface FileListProps {
     closeLoading: () => void;
     valChange: (value: any) => void;
     saveSignerInfo: (value: any) => boolean;
+    signInfoMap?: object;
 }
 declare const FileList: React.FC<FileListProps>;
 export default FileList;

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

@@ -52,7 +52,8 @@ var FileList = function FileList(_ref) {
     openLoading = _ref.openLoading,
     closeLoading = _ref.closeLoading,
     valChange = _ref.valChange,
-    saveSignerInfo = _ref.saveSignerInfo;
+    saveSignerInfo = _ref.saveSignerInfo,
+    signInfoMap = _ref.signInfoMap;
   var _useState = (0, _react.useState)(false),
     showMerge = _useState[0],
     setShowMerge = _useState[1];
@@ -296,6 +297,7 @@ var FileList = function FileList(_ref) {
           env: env,
           isPC: isPC,
           signerInfo: signerInfo,
+          signInfoMap: signInfoMap,
           disabled: disabled,
           download: download,
           valChange: handleChange,
@@ -314,6 +316,7 @@ var FileList = function FileList(_ref) {
         index: index,
         fileIndex: i,
         signerInfo: signerInfo,
+        signInfoMap: signInfoMap,
         file: file,
         fileConfig: item,
         maxFileSize: item.materialSize,

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

@@ -24,6 +24,7 @@ export interface FileItemProps {
     valChange: (value: any, fileIndex: any, index: any, subIndex: any) => void;
     download: (value: any) => void;
     saveSignerInfo: (value: any) => boolean;
+    signInfoMap?: object;
 }
 declare const FileItem: React.FC<FileItemProps>;
 export default FileItem;

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

@@ -29,6 +29,8 @@ 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;
+var SELF = 0;
+var OTHER = 1;
 var FileItem = function FileItem(_ref) {
   var index = _ref.index,
     subIndex = _ref.subIndex,
@@ -51,7 +53,8 @@ var FileItem = function FileItem(_ref) {
     download = _ref.download,
     openLoading = _ref.openLoading,
     closeLoading = _ref.closeLoading,
-    saveSignerInfo = _ref.saveSignerInfo;
+    saveSignerInfo = _ref.saveSignerInfo,
+    signInfoMap = _ref.signInfoMap;
   console.log('fileItem', file, maxFileSize);
   var fileName = file.fileName,
     fileUrl = file.fileUrl,
@@ -59,14 +62,24 @@ var FileItem = function FileItem(_ref) {
     isSigned = file.isSigned,
     isSealed = file.isSealed,
     fileType = file.fileType;
-  var signatureEnable = fileConfig.signatureEnable,
+  var materialName = fileConfig.materialName,
+    signatureEnable = fileConfig.signatureEnable,
     signEnable = fileConfig.signEnable,
     isInValid = fileConfig.isInValid,
     signGuidFileId = fileConfig.signGuidFileId,
     keyPoint = fileConfig.keyPoint,
     isSmart = fileConfig.isSmart,
     isShareFile = fileConfig.isShareFile,
-    needOtherSign = fileConfig.needOtherSign;
+    signatureSelfRole = fileConfig.signatureSelfRole,
+    signatureAgentRole = fileConfig.signatureAgentRole,
+    signSelfRole = fileConfig.signSelfRole,
+    signAgentRole = fileConfig.signAgentRole;
+  // 需要他人签批或签章
+  var needOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER) || signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
+  // 需要他人签名
+  var isNeedOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER);
+  // 需要他人签章
+  var isNeedOtherSeal = signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
   var signBtnText = needOtherSign ? '联合签署' : '签署文件';
   var reSignBtnText = needOtherSign ? '重新联合签署' : '重新签署';
   var _useState = (0, _react.useState)(false),
@@ -309,7 +322,6 @@ var FileItem = function FileItem(_ref) {
 
   // 签章
   var seal = function seal() {
-    console.log('fileType', fileType);
     var type = (0, _file2.getFileExtension)(fileName);
     if (type !== 'pdf') {
       _message["default"].notice('只有pdf文件才能使用电子签章');
@@ -319,6 +331,12 @@ var FileItem = function FileItem(_ref) {
     setIsShowSealPage(true);
   };
   var signAndSeal = function signAndSeal() {
+    // const notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF)
+    // // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
+    // if (notNeedSelfSign && needOtherSign) {
+    //   setShowSignerInfo(true)
+    //   return
+    // }
     // 如果不能签章就直接签批
     if (!(userInfo.acctType === '20' && signEnable)) {
       sign();
@@ -734,13 +752,7 @@ var FileItem = function FileItem(_ref) {
   }, signatureEnable || userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
     onClick: signAndSeal
-  }, isSigned && isSealed ? reSignBtnText : signBtnText), !(userInfo.acctType === '20' && signEnable) && signatureEnable && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "operation_btn",
-    onClick: sign
-  }, isSigned ? reSignBtnText : signBtnText), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "operation_btn",
-    onClick: seal
-  }, isSealed ? reSignBtnText : signBtnText)) :
+  }, isSigned && isSealed ? reSignBtnText : signBtnText)) :
   // 展示材料库
   !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
@@ -891,12 +903,16 @@ var FileItem = function FileItem(_ref) {
   }), showSignerInfo && /*#__PURE__*/_react["default"].createElement(_signerInfo["default"], {
     signerInfo: signerInfo,
     handleClose: function handleClose() {
-      console.log('close');
-      setShowSignerInfo(false);
+      return setShowSignerInfo(false);
     },
     saveSignerInfo: saveSignerInfo,
     signatureEnable: signatureEnable,
-    signEnable: signEnable
+    signEnable: signEnable,
+    isNeedOtherSign: isNeedOtherSign,
+    isNeedOtherSeal: isNeedOtherSeal,
+    file: file,
+    materialName: materialName,
+    signInfoMap: signInfoMap
   }));
 };
 FileItem.displayName = 'FileItem';

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

@@ -22,7 +22,12 @@ function SignerInfo(props) {
     signerInfo = props.signerInfo,
     saveSignerInfo = props.saveSignerInfo,
     signatureEnable = props.signatureEnable,
-    signEnable = props.signEnable;
+    signEnable = props.signEnable,
+    isNeedOtherSign = props.isNeedOtherSign,
+    isNeedOtherSeal = props.isNeedOtherSeal,
+    file = props.file,
+    materialName = props.materialName,
+    signInfoMap = props.signInfoMap;
   var _React$useState = _react["default"].useState([]),
     signerInfoList = _React$useState[0],
     setSignerInfoList = _React$useState[1];
@@ -39,6 +44,16 @@ function SignerInfo(props) {
     newList[index] = (0, _extends3["default"])({}, newList[index], (_extends2 = {}, _extends2[field] = val, _extends2));
     setSignerInfoList(newList);
   };
+  var getCurrentTime = function getCurrentTime() {
+    var now = new Date();
+    var year = now.getFullYear();
+    var month = now.getMonth() + 1; // 无前导零
+    var day = now.getDate(); // 无前导零
+    var hours = now.getHours().toString().padStart(2, '0');
+    var minutes = now.getMinutes().toString().padStart(2, '0');
+    var seconds = now.getSeconds().toString().padStart(2, '0');
+    return year + "/" + month + "/" + day + " " + hours + ":" + minutes + ":" + seconds;
+  };
   var next = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var saveRes;
@@ -46,7 +61,12 @@ function SignerInfo(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 1;
-            return saveSignerInfo(signerInfoList);
+            return saveSignerInfo({
+              list: signerInfoList,
+              file: file,
+              materialName: materialName,
+              date: getCurrentTime()
+            });
           case 1:
             saveRes = _context.sent;
             if (saveRes) {
@@ -77,6 +97,14 @@ function SignerInfo(props) {
     navigator.clipboard.writeText(url);
     _message["default"].success('复制成功');
   };
+  (0, _react.useEffect)(function () {
+    if (signInfoMap && file) {
+      var fileId = file.fileId;
+      if (signInfoMap[fileId]) {
+        setSignerInfoList(signInfoMap[fileId]);
+      }
+    }
+  }, [signInfoMap, file]);
   (0, _react.useEffect)(function () {
     if (signerInfo) {
       console.log('signerInfo', signerInfo);
@@ -240,10 +268,10 @@ function SignerInfo(props) {
         return handleFieldChange('signContent', val, index);
       },
       "aria-labelledby": "groupId"
-    }, signatureEnable && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+    }, signatureEnable && isNeedOtherSign && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
       id: "1",
       value: "1"
-    }, "\u4EC5\u7B7E\u540D"), signEnable && item.signType === 1 && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+    }, "\u4EC5\u7B7E\u540D"), signEnable && isNeedOtherSeal && item.signType === 1 && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
       id: "2",
       value: "2"
     }, "\u4EC5\u7B7E\u7AE0")))));

package/lib/components/guide/compoents/materials/materials.d.ts

@@ -12,6 +12,7 @@ export interface MaterialsProps {
     download?: (params: any) => void;
     situationResRechange?: (data: any) => void;
     taskHandleItem?: string;
+    previousData?: any;
 }
 declare const Materials: React.FC<MaterialsProps>;
 export default Materials;

package/lib/components/guide/compoents/materials/materials.js

@@ -19,7 +19,8 @@ var Materials = function Materials(_ref) {
     baseUrlProp = _ref.baseUrl,
     downloadProp = _ref.download,
     situationResRechangeProp = _ref.situationResRechange,
-    taskHandleItemProp = _ref.taskHandleItem;
+    taskHandleItemProp = _ref.taskHandleItem,
+    previousDataProp = _ref.previousData;
   return /*#__PURE__*/React.createElement("div", {
     className: "materials-content"
   }, situationPageUrlProp && /*#__PURE__*/React.createElement(_situation["default"], {
@@ -31,7 +32,8 @@ var Materials = function Materials(_ref) {
     declarationAppToken: declarationAppTokenProp,
     situationPageUrl: situationPageUrlProp,
     situationResRechange: situationResRechangeProp,
-    taskHandleItem: taskHandleItemProp
+    taskHandleItem: taskHandleItemProp,
+    previousData: previousDataProp
   }), /*#__PURE__*/React.createElement(_materialsList["default"], {
     eventInfo: eventInfoProp,
     finalMaterials: finalMaterialsProp,

package/lib/components/guide/compoents/materials/situation.d.ts

@@ -10,6 +10,7 @@ export interface SituationProps {
     situationPageUrl?: string;
     taskHandleItem?: string;
     situationResRechange?: (data: any) => void;
+    previousData?: any;
 }
 declare const Situation: React.FC<SituationProps>;
 export default Situation;

package/lib/components/guide/compoents/materials/situation.js

@@ -18,7 +18,8 @@ var Situation = function Situation(_ref) {
     declarationAppTokenProp = _ref.declarationAppToken,
     situationPageUrlProp = _ref.situationPageUrl,
     taskHandleItemProp = _ref.taskHandleItem,
-    situationResRechangeProp = _ref.situationResRechange;
+    situationResRechangeProp = _ref.situationResRechange,
+    previousDataProp = _ref.previousData;
   var _React$useState = React.useState('说明：因个人情况不同上交材料不同，可通过情形选择查看必须上传的材料！'),
     tip = _React$useState[0];
   var _React$useState2 = React.useState(false),
@@ -33,14 +34,14 @@ var Situation = function Situation(_ref) {
     return function () {
       window.removeEventListener('message', getMessage);
     };
-  }, []);
+  }, [eventInfoProp, taskHandleItemProp, situationPageUrlProp, declarationAppTokenProp, finalMaterialsProp, applicationIdProp, accessTokenProp, acctTypeProp, previousDataProp]);
   var initPage = function initPage() {
     if (!situationPageUrlProp) return;
-    var url = situationPageUrlProp + "&isFirst=1&isReCheck=1";
+    var url = situationPageUrlProp + "&isFirst=1&isReCheck=1&isZXBB=1";
     setIframeSrc(url);
   };
   var getMessage = function getMessage(e) {
-    var typeArr = ['getAccessToken', 'getDeclaraToken', 'getApplicationId', 'getTaskHandleItem', 'getFormId', 'getMaterials', 'getFormData'];
+    var typeArr = ['getAccessToken', 'getDeclaraToken', 'getApplicationId', 'getTaskHandleItem', 'getFormId', 'getMaterials', 'getFormData', 'getPreviousData'];
     var _ref2 = e.data || {},
       type = _ref2.type,
       data = _ref2.data;
@@ -86,6 +87,9 @@ var Situation = function Situation(_ref) {
       case 'getMaterials':
         sendData.data.materials = finalMaterials || (eventInfo === null || eventInfo === void 0 ? void 0 : eventInfo.taskGeneralMaterials);
         break;
+      case 'getPreviousData':
+        sendData.data.previousData = previousDataProp;
+        break;
     }
     var formIframe = document.getElementById('situationIframe');
     if (formIframe !== null && formIframe !== void 0 && formIframe.contentWindow) {

package/lib/components/guide/index.d.ts

@@ -30,6 +30,8 @@ export interface GuideProps {
     download?: (params: any) => void;
     /** Situation result re-change handler */
     situationResRechange?: (data: any) => void;
+    /** Previous form data from parent */
+    previousData?: any;
 }
 declare const Guide: React.FC<GuideProps>;
 export default Guide;

package/lib/components/guide/index.js

@@ -47,7 +47,8 @@ var Guide = function Guide(_ref) {
     situationPageUrl = _ref.situationPageUrl,
     baseUrl = _ref.baseUrl,
     download = _ref.download,
-    situationResRechange = _ref.situationResRechange;
+    situationResRechange = _ref.situationResRechange,
+    previousData = _ref.previousData;
   var _React$useState = React.useState(false),
     pageLoading = _React$useState[0];
   var _React$useState2 = React.useState(true),
@@ -291,7 +292,8 @@ var Guide = function Guide(_ref) {
     baseUrl: baseUrl,
     download: download,
     situationResRechange: situationResRechange,
-    taskHandleItem: taskHandleItem
+    taskHandleItem: taskHandleItem,
+    previousData: previousData
   }), tabIndex === 1 && /*#__PURE__*/React.createElement(_basicInfo["default"], {
     eventInfo: eventInfoProp
   }), tabIndex === 2 && /*#__PURE__*/React.createElement(_processImg["default"], {