ztxkui 3.5.13 → 3.5.14

package/dist/components/PrintContainer/print-container.js

@@ -266,7 +266,14 @@ var PrintContainer = function (_a) {
                                         result_1.then(function (res) {
                                             if (res) {
                                                 if (Date.now() - startTime_1 > 1000) {
-                                                    isOkSure_1 = true;
+                                                    // 关闭打印页面
+                                                    setTimeout(function () {
+                                                        printCurrentDom({
+                                                            hiddenClassNames: __spreadArray([
+                                                                '.print-container--header'
+                                                            ], (hiddenClassName || [])),
+                                                        });
+                                                    });
                                                 }
                                                 else {
                                                     setTimeout(function () {

package/dist/components/business/Signatures/index.js

@@ -80,13 +80,13 @@ var Sinatures = function (_a) {
     // 设置确认盖章按钮是否展示
     var _e = useState(false), checkSealVisible = _e[0], setCheckSealVisible = _e[1];
     // 合同id
-    var _f = useState(contract_id), contractId = _f[0], setContractId = _f[1];
+    var _f = useState(null), contractId = _f[0], setContractId = _f[1];
     // 已盖章附件id
-    var _g = useState(checkAttachIdList || []), sealedIds = _g[0], setSealedIds = _g[1];
+    var _g = useState([]), sealedIds = _g[0], setSealedIds = _g[1];
     // docAttachMap
-    var _h = useState(docAttachMap), attachMap = _h[0], setAttachMap = _h[1];
+    var _h = useState(null), attachMap = _h[0], setAttachMap = _h[1];
     // 文档id列表
-    var _j = useState(documentIdList), documentIds = _j[0], setDocumentIds = _j[1];
+    var _j = useState([]), documentIds = _j[0], setDocumentIds = _j[1];
     // 总用印次数超过4倍
     var _k = useState(false), isTotalSealNumTooMore = _k[0], setIsTotalSealNumTooMore = _k[1];
     // 采购合同 销售合同 双边合同 部门间交易合同 需要展示合同份数 其他的不需要
@@ -105,8 +105,36 @@ var Sinatures = function (_a) {
     var _q = useState(true), checked = _q[0], setChecked = _q[1];
     // 盖章按钮loading
     var _r = useState(false), loading = _r[0], setLoading = _r[1];
-    // 加盖电子印章开关全部关闭时的标识
-    var _s = useState(false), remark = _s[0], setRemark = _s[1];
+    // 初始化是否清空契约锁信息标识
+    var _s = useState(true), isInit = _s[0], setIsInit = _s[1];
+    useEffect(function () {
+        // 是否有勾选加盖电子印章
+        if (isInit) {
+            var hasElectronicSeal = records === null || records === void 0 ? void 0 : records.some(function (item) { return !!item.isElectronicSeal; });
+            if (hasElectronicSeal) {
+                setContractId(contract_id);
+                setSealedIds(checkAttachIdList);
+                setAttachMap(docAttachMap);
+                setDocumentIds(documentIdList);
+            }
+            else {
+                setContractId(null);
+                setSealedIds([]);
+                setAttachMap(null);
+                setDocumentIds([]);
+            }
+            if ((records === null || records === void 0 ? void 0 : records.length) > 0) {
+                setIsInit(false);
+            }
+        }
+    }, [
+        checkAttachIdList,
+        contract_id,
+        docAttachMap,
+        documentIdList,
+        isInit,
+        records,
+    ]);
     /** 是否加盖群杰印章 */
     var needQjSealFn = function (e) {
         var _value = __assign(__assign({ isTakeOut: 0 }, (showContranctNum ? { contranctNum: 1 } : {})), { details: [] });
@@ -235,25 +263,28 @@ var Sinatures = function (_a) {
             deleteAttachIdList: [],
             docAttachMap: attachMap,
         };
-        if (!(contractId || contract_id)) {
+        if (!contractId) {
             setDocumentIds([]);
             setSealedIds([]);
             params.attachIdList = checkedElecSealIds;
             params.deleteAttachIdList = [];
         }
         else {
-            params.contractId = contractId || contract_id;
+            params.contractId = contractId;
+            // 已勾选的要加盖电子印章的附件id列表与已盖章附件id（用于校验上传的附件是新增还是删除）比较
             checkedElecSealIds.forEach(function (n) {
                 if (sealedIds.length !== 0 && !sealedIds.includes(n)) {
                     params.attachIdList.push(n);
                 }
             });
         }
+        // 已盖章的附件id列表中筛选出要删除的附件id列表
         sealedIds.forEach(function (n) {
             if (checkedElecSealIds.length !== 0 && !checkedElecSealIds.includes(n)) {
                 params.deleteAttachIdList.push(n);
             }
         });
+        // 上一次盖章时的参数信息
         setPrevParam(params);
         request({
             url: '/api/zmdms-resource/seal/confirm-seal-info',
@@ -296,10 +327,10 @@ var Sinatures = function (_a) {
     };
     /** 查看盖章页面 */
     var viewSealPageFn = function () {
-        if (contractId || contract_id) {
+        if (contractId) {
             request({
                 url: '/api/zmdms-resource/seal/view-seal-state',
-                data: { contractId: contractId || contract_id, canEdit: canEdit, flowStatus: flowStatus },
+                data: { contractId: contractId, canEdit: canEdit, flowStatus: flowStatus },
                 method: 'POST',
             })
                 .then(function (res) {
@@ -454,7 +485,7 @@ var Sinatures = function (_a) {
                                 React.createElement(Button, { type: "link", style: __assign({}, (checkSealVisible && isEdit
                                         ? {}
                                         : { display: 'none' })), size: "small", loading: loading, onClick: checkSealFn }, "\u6307\u5B9A\u7B7E\u7F72\u4F4D\u7F6E"),
-                                React.createElement(Button, { type: "link", style: __assign({}, (contractId || contract_id ? {} : { display: 'none' })), size: "small", onClick: viewSealPageFn }, "\u9884\u89C8\u76D6\u7AE0\u6548\u679C"))) : (React.createElement(React.Fragment, null));
+                                React.createElement(Button, { type: "link", style: __assign({}, (contractId ? {} : { display: 'none' })), size: "small", onClick: viewSealPageFn }, "\u9884\u89C8\u76D6\u7AE0\u6548\u679C"))) : (React.createElement(React.Fragment, null));
                         };
                         var obj = {
                             children: React.createElement(Comp, null),
@@ -523,15 +554,18 @@ var Sinatures = function (_a) {
             setCheckSealVisible(value ? true : hasElecSeal.length > 1 ? true : false);
             // 去除加盖电子印章勾选时  清除合同id 等之前的信息
             if (!value && hasElecSeal.length === 1) {
-                setRemark(true);
                 setSealedIds([]);
-                setContractId('');
+                setContractId(null);
                 setAttachMap(null);
                 setDocumentIds([]);
                 setElectronicSeal([]);
-            }
-            else {
-                setRemark(false);
+                if (onSigValuesChange) {
+                    onSigValuesChange(sigValuesChange('contractId', null));
+                    onSigValuesChange(sigValuesChange('docAttachMap', null));
+                    onSigValuesChange(sigValuesChange('checkAttachIdList', []));
+                    onSigValuesChange(sigValuesChange('documentIdList', []));
+                    onSigValuesChange(sigValuesChange('electronicSealIdList', []));
+                }
             }
         }
         setRecords(function (preRecords) {
@@ -600,11 +634,11 @@ var Sinatures = function (_a) {
             return {
                 fileList: records,
                 qunjSeal: innerQunjSeal,
-                electronicSealIdList: remark ? [] : innerElectronicSeal,
-                checkAttachIdList: remark ? [] : sealedIds,
-                docAttachMap: remark ? null : attachMap,
-                documentIdList: remark ? [] : documentIds,
-                contractId: remark ? null : contractId || contract_id,
+                electronicSealIdList: innerElectronicSeal,
+                checkAttachIdList: sealedIds,
+                docAttachMap: attachMap,
+                documentIdList: documentIds,
+                contractId: contractId,
                 isTotalSealNumTooMore: isTotalSealNumTooMore,
             };
         },
@@ -655,10 +689,7 @@ var Sinatures = function (_a) {
                 return false;
             }
             // 没有确认盖章
-            if (isEdit &&
-                needQys &&
-                hasElectronicSeal &&
-                !(contractId || contract_id)) {
+            if (isEdit && needQys && hasElectronicSeal && !contractId) {
                 message.warning('请点击确认盖章按钮，确认盖章位置后方可提交！');
                 return false;
             }
@@ -688,7 +719,7 @@ var Sinatures = function (_a) {
         },
     }); });
     var detail = {
-        contractId: contract_id,
+        contractId: contractId,
         records: records,
         electronicSealIdList: electronicSeal,
         qunjSeal: qunjSeal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "3.5.13",
+  "version": "3.5.14",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",