ztxkui 4.2.23-605 → 4.2.23-606

package/dist/UI/Detail/index.js

@@ -2,6 +2,7 @@ import i18next from 'ztxkutils/dist/i18next';
 import React, { useMemo, useRef } from 'react';
 import { DetailHeader, OperationBtnGroup, Container, Button, InputNumber, Input, Tabs, Dropdown, DatePicker, Collapse, Modal, Tooltip, } from '../../index.build';
 import dayjs from 'dayjs';
+import EditTable from '../Table/EditTable';
 var Detail = function () {
     var rangeDatesRef = useRef(null);
     var items = useMemo(function () {
@@ -224,7 +225,9 @@ var Detail = function () {
             React.createElement(Collapse.Panel, { key: "1", header: "\u9762\u677F1" }, "\u9762\u677F1"),
             React.createElement(Collapse.Panel, { key: "2", header: "\u9762\u677F2" }, "\u9762\u677F2")),
         React.createElement(Button, { onClick: function () { return setVisible(true); } }, "\u6253\u5F00\u5F39\u6846"),
-        React.createElement(Modal, { title: "\u5F39\u6846\u6807\u9898", loading: false, visible: visible, onCancel: function () { return setVisible(false); } }, "\u6211\u662F\u5F39\u6846\u5185\u5BB9"),
+        React.createElement(Modal, { title: "\u5F39\u6846\u6807\u9898", loading: false, visible: visible, onCancel: function () { return setVisible(false); } },
+            "\u6211\u662F\u5F39\u6846\u5185\u5BB9",
+            React.createElement(EditTable, null)),
         React.createElement(Tooltip, { title: "\u6211\u662F\u63D0\u793A" },
             React.createElement(Button, null, "\u6211\u662F\u6309\u94AE"))));
 };

package/dist/UI/Table/EditTable.js

@@ -626,9 +626,7 @@ export default function EditTable() {
             // defaultInnerPageSize={10}
             virtualTableKey: "single-110011", 
             // 是否选择
-            isChoice: true, choiceMode: "radio", selectedRowKeys: selectedRowKeys, onSelectedRowChange: onSelectedRowChange, onChange: onChange, summaryFixed: true, 
-            // hideIndexColumnEditBtn
-            summaryConfig: [
+            isChoice: true, choiceMode: "radio", selectedRowKeys: selectedRowKeys, onSelectedRowChange: onSelectedRowChange, onChange: onChange, summaryFixed: true, hideIndexColumnEditBtn: false, summaryConfig: [
                 {
                     type: 'subtotal',
                     fields: [

package/dist/components/Table/table-menu.js

@@ -296,7 +296,7 @@ var TableMenu = forwardRef(function (_a, ref) {
             onEditableSave || !isContextMenuFullscreen ? null : (React.createElement(Item, { data: "fullscreen", onClick: onMenuItemClick }, isFull ? i18next.t('退出全屏') : i18next.t('全屏')))),
         React.createElement(Modal, { width: "80%", title: i18next.t('详情'), visible: visible, onCancel: onCancel, 
             // stick
-            mask: false, loading: false, className: className, footer: React.createElement(Button, { type: "primary", onClick: onCancel }, i18next.t('确定')), getContainer: false },
+            mask: false, loading: false, className: className, footer: React.createElement(Button, { type: "primary", onClick: onCancel }, i18next.t('确定')) },
             React.createElement("div", { style: { maxHeight: '70vh', minWidth: '800px', overflow: 'auto' } },
                 React.createElement("div", { className: "zt-table-detail-grid" }, record && renderItem(items))))));
 });

package/dist/components/electron-signatures/content.js

@@ -111,7 +111,7 @@ var ElectronSignatures = function (props) {
     // fmsIsElectronicSealPushLabel = '推送银行',
     _j = props.fmsIsElectronicSealPushLabel, 
     // fmsIsElectronicSealPushLabel = '推送银行',
-    fmsIsElectronicSealPushLabel = _j === void 0 ? i18next.t('加盖银行签章') : _j, _k = props.openingContractSealLabel, openingContractSealLabel = _k === void 0 ? i18next.t('盖光盈电子章') : _k, isSingleQj = props.isSingleQj, _l = props.isQjUseModal, isQjUseModal = _l === void 0 ? true : _l, defaultJustNeedQj = props.defaultJustNeedQj, isDeleteAllFileWhenJustUseQj = props.isDeleteAllFileWhenJustUseQj, _m = props.isShowQysWhenNeedNotQys, isShowQysWhenNeedNotQys = _m === void 0 ? true : _m, _o = props.isControlNeedQys, isControlNeedQys = _o === void 0 ? true : _o, isDeletePlaceholderFileData = props.isDeletePlaceholderFileData, isSupportNoAttachQj = props.isSupportNoAttachQj, caseId = props.caseId, _p = props.isChoiseChangeTemplateValid, isChoiseChangeTemplateValid = _p === void 0 ? true : _p, _q = props.isToggleQys, isToggleQys = _q === void 0 ? false : _q, _r = props.isQjVerifyCode, isQjVerifyCode = _r === void 0 ? false : _r, _s = props.isNewQys, isNewQys = _s === void 0 ? false : _s, _t = props.isShowBatchUseElectronicSealBtn, isShowBatchUseElectronicSealBtn = _t === void 0 ? true : _t, isShowBatchUseOpeningContractSealBtn = props.isShowBatchUseOpeningContractSealBtn, isShowOpeningContractSeal = props.isShowOpeningContractSeal, customButtons = props.customButtons, goWorkflowSeal = props.goWorkflowSeal, isShowSealApply = props.isShowSealApply, otherColumns = props.otherColumns, isShowOpeningContractSealNotRelyQys = props.isShowOpeningContractSealNotRelyQys, isNoWatermarkProcess = props.isNoWatermarkProcess, qunjListRenderFilter = props.qunjListRenderFilter, sealDownloadFlowStatus = props.sealDownloadFlowStatus, resetProps = __rest(props, ["request", "isTranslation", "previewUrl", "isUnControlled", "contractNumFlowIds", "fileUploadProps", "isShowFileUpload", "isShowFileUploadIndependence", "otherOptions", "fileBaseUrl", "apiBaseUrl", "electronHandleRef", "onValueChange", "isValidateSuccess", "refreshCode", "onCheckedComparison", "onFileTypeChangeGetItem", "tableScroll", "getCreateTimeHand", "isShowElectronBatchBtn", "isShowDownloadBatchBtn", "isShowBatchDeleteBtn", "isShowBatchDeleteBtnIndependence", "beforeBatchDelete", "isShowBatchPreviewBtn", "isShowFileComparisonBtn", "batchDownloadZipName", "isShowDoubleSignedBatchBtn", "isShowFileType", "isShowFileTypeMerge", "fmsIsElectronicSealLabel", "fmsIsElectronicSealPushLabel", "openingContractSealLabel", "isSingleQj", "isQjUseModal", "defaultJustNeedQj", "isDeleteAllFileWhenJustUseQj", "isShowQysWhenNeedNotQys", "isControlNeedQys", "isDeletePlaceholderFileData", "isSupportNoAttachQj", "caseId", "isChoiseChangeTemplateValid", "isToggleQys", "isQjVerifyCode", "isNewQys", "isShowBatchUseElectronicSealBtn", "isShowBatchUseOpeningContractSealBtn", "isShowOpeningContractSeal", "customButtons", "goWorkflowSeal", "isShowSealApply", "otherColumns", "isShowOpeningContractSealNotRelyQys", "isNoWatermarkProcess", "qunjListRenderFilter", "sealDownloadFlowStatus"]);
+    fmsIsElectronicSealPushLabel = _j === void 0 ? i18next.t('加盖银行签章') : _j, _k = props.openingContractSealLabel, openingContractSealLabel = _k === void 0 ? i18next.t('盖光盈电子章') : _k, isSingleQj = props.isSingleQj, _l = props.isQjUseModal, isQjUseModal = _l === void 0 ? true : _l, defaultJustNeedQj = props.defaultJustNeedQj, isDeleteAllFileWhenJustUseQj = props.isDeleteAllFileWhenJustUseQj, _m = props.isShowQysWhenNeedNotQys, isShowQysWhenNeedNotQys = _m === void 0 ? true : _m, _o = props.isControlNeedQys, isControlNeedQys = _o === void 0 ? true : _o, isDeletePlaceholderFileData = props.isDeletePlaceholderFileData, isSupportNoAttachQj = props.isSupportNoAttachQj, caseId = props.caseId, _p = props.isChoiseChangeTemplateValid, isChoiseChangeTemplateValid = _p === void 0 ? true : _p, _q = props.isToggleQys, isToggleQys = _q === void 0 ? false : _q, _r = props.isQjVerifyCode, isQjVerifyCode = _r === void 0 ? false : _r, _s = props.isNewQys, isNewQys = _s === void 0 ? false : _s, isNewElectronSealStyle = props.isNewElectronSealStyle, isNewQunjSealStyle = props.isNewQunjSealStyle, _t = props.isShowBatchUseElectronicSealBtn, isShowBatchUseElectronicSealBtn = _t === void 0 ? true : _t, isShowBatchUseOpeningContractSealBtn = props.isShowBatchUseOpeningContractSealBtn, isShowOpeningContractSeal = props.isShowOpeningContractSeal, customButtons = props.customButtons, goWorkflowSeal = props.goWorkflowSeal, isShowSealApply = props.isShowSealApply, otherColumns = props.otherColumns, isShowOpeningContractSealNotRelyQys = props.isShowOpeningContractSealNotRelyQys, isNoWatermarkProcess = props.isNoWatermarkProcess, qunjListRenderFilter = props.qunjListRenderFilter, sealDownloadFlowStatus = props.sealDownloadFlowStatus, resetProps = __rest(props, ["request", "isTranslation", "previewUrl", "isUnControlled", "contractNumFlowIds", "fileUploadProps", "isShowFileUpload", "isShowFileUploadIndependence", "otherOptions", "fileBaseUrl", "apiBaseUrl", "electronHandleRef", "onValueChange", "isValidateSuccess", "refreshCode", "onCheckedComparison", "onFileTypeChangeGetItem", "tableScroll", "getCreateTimeHand", "isShowElectronBatchBtn", "isShowDownloadBatchBtn", "isShowBatchDeleteBtn", "isShowBatchDeleteBtnIndependence", "beforeBatchDelete", "isShowBatchPreviewBtn", "isShowFileComparisonBtn", "batchDownloadZipName", "isShowDoubleSignedBatchBtn", "isShowFileType", "isShowFileTypeMerge", "fmsIsElectronicSealLabel", "fmsIsElectronicSealPushLabel", "openingContractSealLabel", "isSingleQj", "isQjUseModal", "defaultJustNeedQj", "isDeleteAllFileWhenJustUseQj", "isShowQysWhenNeedNotQys", "isControlNeedQys", "isDeletePlaceholderFileData", "isSupportNoAttachQj", "caseId", "isChoiseChangeTemplateValid", "isToggleQys", "isQjVerifyCode", "isNewQys", "isNewElectronSealStyle", "isNewQunjSealStyle", "isShowBatchUseElectronicSealBtn", "isShowBatchUseOpeningContractSealBtn", "isShowOpeningContractSeal", "customButtons", "goWorkflowSeal", "isShowSealApply", "otherColumns", "isShowOpeningContractSealNotRelyQys", "isNoWatermarkProcess", "qunjListRenderFilter", "sealDownloadFlowStatus"]);
     var selectRows = useRef(null);
     // 批量更新时用于合并 onValueChange 调用，避免多次触发外部回调
     var batchUpdateRef = useRef({

package/dist/components/electron-signatures/demoComponents/making.js

@@ -163,7 +163,9 @@ var Making = function () {
             electronHandleRef: electronHandleRef, isValidateSuccess: function () {
                 // 最后会调用一个接口 验证下是否所选的电子印章都已经盖了章 如果没有盖章 就会弹出一个选择框 让用户重新选择 重新选择后 如果用户把所有未盖章的电子印章都取消勾选的话 那么就会调用这个方法 说明校验通过 可以进行下一步
                 console.log(i18next.t('最终校验通过了!!!'));
-            } })),
+            }, 
+            // 是否显示合同分数
+            isContranctNum: true })),
         React.createElement("button", { onClick: function () {
                 setParams(function (preParams) {
                     return __assign(__assign({}, preParams), { deptId: preParams.deptId === '1514842376723976194'

package/dist/components/electron-signatures/demoComponents/makingData.d.ts

@@ -270,10 +270,17 @@ declare const historyData1: {
     }[];
     qunjSeal: {
         vertifyCode: number;
-        contranctNum: any;
+        contranctNum: number;
         isTakeOut: number;
         details: {
+            companyType: string;
+            companyTypeName: string;
+            sealName: string;
             sealNo: string;
+            areaType: number;
+            areaTypeName: string;
+            useType: number;
+            useTypeName: string;
             sealCount: number;
         }[];
     };

package/dist/components/electron-signatures/demoComponents/makingData.js

@@ -575,7 +575,8 @@ var historyData1 = [
         needQj: 1,
         deptId: '1514842459376930817',
         memberId: null,
-        flowId: 'scm_order_contract_ccwlht',
+        // flowId: 'scm_order_contract_ccwlht',
+        flowId: 'scm_order_contract_cght',
         contractId: null,
         caseId: 'ab0f7dff-0294-4187-bffe-bf489101546b',
         docAttachMap: null,
@@ -610,11 +611,18 @@ var historyData1 = [
         ],
         qunjSeal: {
             vertifyCode: 281109,
-            contranctNum: null,
+            contranctNum: 3,
             isTakeOut: 0,
             details: [
                 {
-                    sealNo: 'YZ-2025-022',
+                    companyType: 'K000',
+                    companyTypeName: '浙商中拓集团股份有限公司',
+                    sealName: '浙商中拓集团股份有限公司公章（杭州）',
+                    sealNo: 'YZ-2023-008',
+                    areaType: 1,
+                    areaTypeName: '杭州',
+                    useType: 3,
+                    useTypeName: '公章',
                     sealCount: 1,
                 },
             ],

package/dist/components/electron-signatures/electronComponents/electron-seal-detail.js

@@ -1,5 +1,14 @@
 import i18next from 'ztxkutils/dist/i18next';
-import React, { memo } from 'react';
+import React, { memo, useContext } from 'react';
+import { ElectronSignaturesContext } from '..';
+/** 公司简称 fallback 到全称 */
+function getOwnerShortName(item) {
+    return (item === null || item === void 0 ? void 0 : item.ownerShortName) || (item === null || item === void 0 ? void 0 : item.ownerName) || '';
+}
+/** 印章简称 fallback 到全称 */
+function getSealShortName(item) {
+    return (item === null || item === void 0 ? void 0 : item.sealShortName) || (item === null || item === void 0 ? void 0 : item.sealName) || '';
+}
 export var NoUseElectronSeal = function () {
     return (React.createElement("div", { style: {
             height: '100%',
@@ -13,6 +22,7 @@ export var NoUseElectronSeal = function () {
  */
 var ElectronSealDetail = function (_a) {
     var sealList = _a.sealList, value = _a.value;
+    var isNewElectronSealStyle = useContext(ElectronSignaturesContext).isNewElectronSealStyle;
     // 电子印章数据没有加载完成或者加载出错
     if (!Array.isArray(sealList)) {
         return null;
@@ -21,11 +31,29 @@ var ElectronSealDetail = function (_a) {
     if (sealList.length === 0) {
         return React.createElement(NoUseElectronSeal, null);
     }
-    // 整理数据 以ownerName维度，拆分数据
-    return Array.isArray(value) && value.length > 0 ? (React.createElement("div", { className: "electron-seal-detail--wrap" }, value === null || value === void 0 ? void 0 : value.map(function (id) {
+    // 非编辑模式下，没有选中任何印章
+    if (!Array.isArray(value) || value.length === 0) {
+        return React.createElement(NoUseElectronSeal, null);
+    }
+    // 新版展示样式：按照"公司简称 印章简称"模式展示，带"已选印章"标题
+    if (isNewElectronSealStyle) {
+        return (React.createElement("div", { className: "electron-seal-detail-new--wrap" },
+            React.createElement("div", { className: "seal-selected-title" }, "\u5DF2\u9009\u5370\u7AE0"),
+            value.map(function (id) {
+                var _a;
+                var completeItem = (_a = sealList === null || sealList === void 0 ? void 0 : sealList.find) === null || _a === void 0 ? void 0 : _a.call(sealList, function (sealItem) { return sealItem.sealId === id; });
+                return (React.createElement("div", { key: id, className: "seal-selected-item", title: (((completeItem === null || completeItem === void 0 ? void 0 : completeItem.ownerName) || '') + " " + ((completeItem === null || completeItem === void 0 ? void 0 : completeItem.sealName) || '')).trim() },
+                    getOwnerShortName(completeItem),
+                    " ",
+                    getSealShortName(completeItem)));
+            })));
+    }
+    // 旧版展示样式：只显示印章简称
+    return (React.createElement("div", { className: "electron-seal-detail--wrap" }, value === null || value === void 0 ? void 0 : value.map(function (id) {
         var _a;
         var completeItem = (_a = sealList === null || sealList === void 0 ? void 0 : sealList.find) === null || _a === void 0 ? void 0 : _a.call(sealList, function (sealItem) { return sealItem.sealId === id; });
-        return (React.createElement("div", { key: id, className: "electron-seal-detail--wrap__item" }, completeItem === null || completeItem === void 0 ? void 0 : completeItem.sealName));
-    }))) : (React.createElement(NoUseElectronSeal, null));
+        var displayName = (completeItem === null || completeItem === void 0 ? void 0 : completeItem.sealShortName) || (completeItem === null || completeItem === void 0 ? void 0 : completeItem.sealName);
+        return (React.createElement("div", { key: id, className: "electron-seal-detail--wrap__item", title: completeItem === null || completeItem === void 0 ? void 0 : completeItem.sealName }, displayName));
+    })));
 };
 export default memo(ElectronSealDetail);

package/dist/components/electron-signatures/electronComponents/electron-seal-list.js

@@ -20,42 +20,153 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { memo, useMemo } from 'react';
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
+import React, { memo, useMemo, useState, useContext, useEffect } from 'react';
 import { Checkbox, Collapse } from '../../../index.build';
+import { ElectronSignaturesContext } from '..';
+import useBaseContext from '../../utils/useBaseContext';
+/** 公司简称优先排序关键词（按指定顺序排前） */
+var PRIORITY_OWNERS = ['浙商中拓', '浙江中拓', '湖南中拓', '海南中拓'];
+/** 按优先级排序公司简称列表 */
+function sortOwners(owners) {
+    var prioritized = PRIORITY_OWNERS.filter(function (o) { return owners.includes(o); });
+    var rest = owners.filter(function (o) { return !PRIORITY_OWNERS.includes(o); });
+    return __spreadArray(__spreadArray([], prioritized), rest);
+}
+/** 公司简称 fallback 到全称 */
+function getOwnerShortName(item) {
+    return (item === null || item === void 0 ? void 0 : item.ownerShortName) || (item === null || item === void 0 ? void 0 : item.ownerName) || '';
+}
+/** 印章简称 fallback 到全称 */
+function getSealShortName(item) {
+    return (item === null || item === void 0 ? void 0 : item.sealShortName) || (item === null || item === void 0 ? void 0 : item.sealName) || '';
+}
 /**
  * 电子签章选择列表
  */
 var ElectronSealList = function (_a) {
-    var sealList = _a.sealList, onChange = _a.onChange, isEdit = _a.isEdit, resetProp = __rest(_a, ["sealList", "onChange", "isEdit"]);
-    // 整理数据 以ownerName维度，拆分数据
-    var sealListMemo = useMemo(function () {
+    var sealList = _a.sealList, onChange = _a.onChange, isEdit = _a.isEdit, value = _a.value, resetProp = __rest(_a, ["sealList", "onChange", "isEdit", "value"]);
+    var isNewElectronSealStyle = useContext(ElectronSignaturesContext).isNewElectronSealStyle;
+    var _b = useBaseContext().electronSealTabTrigger, electronSealTabTrigger = _b === void 0 ? 'hover' : _b;
+    // 新版：以公司简称维度拆分数据
+    var _c = useMemo(function () {
         if (!Array.isArray(sealList)) {
             return {
-                ownerNameList: [],
-                result: {},
+                ownerList: [],
+                ownerMap: {},
             };
         }
-        var ownerNameList = Array.from(new Set(sealList.map(function (item) { return item.ownerName; })));
-        var result = {};
-        ownerNameList.forEach(function (ownerName) {
-            result[ownerName] = sealList.filter(function (item) { return item.ownerName === ownerName; });
+        var map = {};
+        sealList.forEach(function (item) {
+            var name = getOwnerShortName(item);
+            if (!map[name])
+                map[name] = [];
+            map[name].push(item);
         });
         return {
-            ownerNameList: ownerNameList,
-            result: result,
+            ownerList: sortOwners(Object.keys(map)),
+            ownerMap: map,
         };
-    }, [sealList]);
-    var ownerNameList = sealListMemo.ownerNameList, result = sealListMemo.result;
-    return ownerNameList.length === 0 ? null : (React.createElement(Checkbox.Group, __assign({ onChange: function (e) {
-            onChange && onChange(e);
-        }, disabled: !isEdit, className: "electron-seal-list--wrap" }, resetProp),
-        React.createElement(Collapse, { defaultActiveKey: ownerNameList.map(function (item, index) { return index; }), style: { width: '100%' } }, ownerNameList.map(function (ownerName, index) {
-            var _a;
-            return (React.createElement(Collapse.Panel, { key: index, 
-                // header={ownerName}
-                header: React.createElement("div", { className: "electron-seal-list--owner-name" }, ownerName) }, (_a = result[ownerName]) === null || _a === void 0 ? void 0 : _a.map(function (item) {
-                return (React.createElement(Checkbox, { key: item.sealId, value: item.sealId }, item.sealName));
-            })));
-        }))));
+    }, [sealList]), ownerList = _c.ownerList, ownerMap = _c.ownerMap;
+    // 旧版：以 ownerName 维度拆分数据
+    var _d = useMemo(function () {
+        if (!Array.isArray(sealList)) {
+            return { ownerNameList: [], ownerNameResult: {} };
+        }
+        var list = Array.from(new Set(sealList.map(function (item) { return item.ownerName; })));
+        var result = {};
+        list.forEach(function (ownerName) {
+            result[ownerName] = sealList.filter(function (item) { return item.ownerName === ownerName; });
+        });
+        return { ownerNameList: list, ownerNameResult: result };
+    }, [sealList]), ownerNameList = _d.ownerNameList, ownerNameResult = _d.ownerNameResult;
+    // 新版：当前选中的公司（默认第一个）
+    var _e = useState(ownerList[0]), selectedOwner = _e[0], setSelectedOwner = _e[1];
+    useEffect(function () {
+        // 公司列表变化时，重置选中公司为第一个
+        if (ownerList.length > 0 && !ownerList.includes(selectedOwner)) {
+            setSelectedOwner(ownerList[0]);
+        }
+    }, [ownerList, selectedOwner]);
+    // 新版：当前选中公司下的印章列表
+    var currentSeals = ownerMap[selectedOwner] || [];
+    // 新版：sealId → 公司简称 映射，用于统计每个公司选中了几个印章
+    var sealIdToOwner = useMemo(function () {
+        var map = {};
+        Object.keys(ownerMap).forEach(function (owner) {
+            ownerMap[owner].forEach(function (item) {
+                map[item.sealId] = owner;
+            });
+        });
+        return map;
+    }, [ownerMap]);
+    // 新版：每个公司下选中的印章数量
+    var ownerSelectedCount = useMemo(function () {
+        var countMap = {};
+        if (Array.isArray(value)) {
+            value.forEach(function (sealId) {
+                var owner = sealIdToOwner[sealId];
+                if (owner) {
+                    countMap[owner] = (countMap[owner] || 0) + 1;
+                }
+            });
+        }
+        return countMap;
+    }, [value, sealIdToOwner]);
+    // 新版：已选印章完整信息列表
+    var selectedSealList = useMemo(function () {
+        if (!Array.isArray(value) || !Array.isArray(sealList)) {
+            return [];
+        }
+        return value
+            .map(function (id) { return sealList.find(function (item) { return item.sealId === id; }); })
+            .filter(Boolean);
+    }, [value, sealList]);
+    // ========= 旧版渲染（手风琴模式） =========
+    if (!isNewElectronSealStyle) {
+        return ownerNameList.length === 0 ? null : (React.createElement(Checkbox.Group, __assign({ value: value, onChange: function (e) {
+                onChange && onChange(e);
+            }, disabled: !isEdit, className: "electron-seal-list--wrap" }, resetProp),
+            React.createElement(Collapse, { defaultActiveKey: ownerNameList.map(function (item, index) { return index; }), style: { width: '100%' } }, ownerNameList.map(function (ownerName, index) {
+                var _a;
+                return (React.createElement(Collapse.Panel, { key: index, header: React.createElement("div", { className: "electron-seal-list--owner-name" }, ownerName) }, (_a = ownerNameResult[ownerName]) === null || _a === void 0 ? void 0 : _a.map(function (item) {
+                    return (React.createElement(Checkbox, { key: item.sealId, value: item.sealId }, item.sealName));
+                })));
+            }))));
+    }
+    // ========= 新版渲染（三段式布局） =========
+    if (ownerList.length === 0) {
+        return null;
+    }
+    return (React.createElement("div", __assign({ className: "electron-seal-list-new--wrap" }, resetProp),
+        React.createElement("div", { className: "seal-owner-tabs" }, ownerList.map(function (owner) {
+            var _a, _b;
+            var count = ownerSelectedCount[owner] || 0;
+            return (React.createElement("div", __assign({ key: owner, className: "seal-owner-tab " + (selectedOwner === owner ? 'seal-owner-tab--active' : ''), title: ((_b = (_a = ownerMap[owner]) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.ownerName) || owner }, (electronSealTabTrigger === 'hover'
+                ? { onMouseEnter: function () { return setSelectedOwner(owner); } }
+                : { onClick: function () { return setSelectedOwner(owner); } })),
+                React.createElement("span", { className: "seal-owner-tab--name" }, owner),
+                count > 0 && (React.createElement("span", { className: "seal-owner-tab--count" }, count))));
+        })),
+        React.createElement("div", { className: "seal-list-current" }, currentSeals.map(function (item) {
+            var checked = Array.isArray(value) && value.includes(item.sealId);
+            return (React.createElement(Checkbox, { key: item.sealId, checked: checked, disabled: !isEdit, onChange: function () {
+                    var newValue = checked
+                        ? (value || []).filter(function (id) { return id !== item.sealId; })
+                        : __spreadArray(__spreadArray([], (value || [])), [item.sealId]);
+                    onChange && onChange(newValue);
+                } },
+                React.createElement("span", { title: item.sealName }, getSealShortName(item))));
+        })),
+        React.createElement("div", { className: "seal-selected-summary" },
+            React.createElement("div", { className: "seal-selected-title" }, "\u5DF2\u9009\u5370\u7AE0"),
+            selectedSealList.length > 0 ? (selectedSealList.map(function (item) { return (React.createElement("div", { key: item.sealId, className: "seal-selected-item", title: ((item.ownerName || '') + " " + (item.sealName || '')).trim() },
+                getOwnerShortName(item),
+                " ",
+                getSealShortName(item))); })) : (React.createElement("div", { className: "seal-selected-empty" }, "\u6682\u672A\u9009\u62E9\u5370\u7AE0")))));
 };
 export default memo(ElectronSealList);

package/dist/components/electron-signatures/index.d.ts

@@ -3,6 +3,10 @@ import { IElectronSignaturesProps } from './interface';
 interface IElectronSignaturesContext {
     isQjVerifyCode?: boolean;
     isNewQys?: boolean;
+    /** 电子印章是否使用新版展示样式 */
+    isNewElectronSealStyle?: boolean;
+    /** 群杰印章是否使用新版展示样式 */
+    isNewQunjSealStyle?: boolean;
 }
 export declare const ElectronSignaturesContext: React.Context<IElectronSignaturesContext>;
 declare const _default: React.NamedExoticComponent<IElectronSignaturesProps>;

package/dist/components/electron-signatures/index.js

@@ -22,20 +22,33 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import React, { memo, useMemo, createContext } from 'react';
 import ElectronSignatures from './content';
+import useBaseContext from '../utils/useBaseContext';
 export var ElectronSignaturesContext = createContext({
     isNewQys: true,
     isQjVerifyCode: true,
+    isNewElectronSealStyle: false,
+    isNewQunjSealStyle: false,
 });
 /**
  * 容器组件，为了将context传递给组件，方便组件能快速访问到一些信息
  */
 var ElectronSignaturesWrap = function (props) {
+    var _a, _b, _c, _d;
     // 这里未上线之前，都使用默认为false。不采用最新版本的修改
-    var _a = props.isQjVerifyCode, isQjVerifyCode = _a === void 0 ? false : _a, _b = props.isNewQys, isNewQys = _b === void 0 ? false : _b, resetProps = __rest(props, ["isQjVerifyCode", "isNewQys"]);
+    var _e = props.isQjVerifyCode, isQjVerifyCode = _e === void 0 ? false : _e, _f = props.isNewQys, isNewQys = _f === void 0 ? false : _f, resetProps = __rest(props, ["isQjVerifyCode", "isNewQys"]);
+    // 全局配置：组件 props 优先，未传时取全局 ZtxkContext 配置
+    var _g = useBaseContext(), globalElectronSealStyle = _g.isNewElectronSealStyle, globalQunjSealStyle = _g.isNewQunjSealStyle;
+    var isNewElectronSealStyle = (_b = (_a = props.isNewElectronSealStyle) !== null && _a !== void 0 ? _a : globalElectronSealStyle) !== null && _b !== void 0 ? _b : false;
+    var isNewQunjSealStyle = (_d = (_c = props.isNewQunjSealStyle) !== null && _c !== void 0 ? _c : globalQunjSealStyle) !== null && _d !== void 0 ? _d : false;
     var defaultContext = useMemo(function () {
-        return { isNewQys: isNewQys, isQjVerifyCode: isQjVerifyCode };
-    }, [isNewQys, isQjVerifyCode]);
+        return {
+            isNewQys: isNewQys,
+            isQjVerifyCode: isQjVerifyCode,
+            isNewElectronSealStyle: isNewElectronSealStyle,
+            isNewQunjSealStyle: isNewQunjSealStyle,
+        };
+    }, [isNewQys, isQjVerifyCode, isNewElectronSealStyle, isNewQunjSealStyle]);
     return (React.createElement(ElectronSignaturesContext.Provider, { value: defaultContext },
-        React.createElement(ElectronSignatures, __assign({ isQjVerifyCode: isQjVerifyCode, isNewQys: isNewQys }, resetProps))));
+        React.createElement(ElectronSignatures, __assign({ isQjVerifyCode: isQjVerifyCode, isNewQys: isNewQys, isNewElectronSealStyle: isNewElectronSealStyle, isNewQunjSealStyle: isNewQunjSealStyle }, resetProps))));
 };
 export default memo(ElectronSignaturesWrap);

package/dist/components/electron-signatures/interface.d.ts

@@ -445,6 +445,16 @@ export interface IElectronSignaturesItemPublic {
      * 是否应用 最新的契约锁组件样式
      */
     isNewQys?: boolean;
+    /**
+     * 是否使用新版电子印章展示样式（公司简称分组 + 三段式布局）
+     * 未传时取全局 ZtxkContext 中的 isNewElectronSealStyle
+     */
+    isNewElectronSealStyle?: boolean;
+    /**
+     * 是否使用新版群杰印章展示样式（公司分组 + 三段式布局）
+     * 未传时取全局 ZtxkContext 中的 isNewQunjSealStyle
+     */
+    isNewQunjSealStyle?: boolean;
     /**
      * 户用合同章显示的逻辑的控制
      */

package/dist/components/electron-signatures/qunjComponents/qunj-detail.d.ts

@@ -25,6 +25,10 @@ interface IProps {
     qjVerifyCodeData?: IQjVerifyCode[];
     getQjVerifyCodeHandle?: (params: any) => Promise<any>;
     flowStatus?: ITrackItem['flowStatus'];
+    /** 是否显示用印增加申请 */
+    isShowSealApply?: boolean;
+    /** 前往流程中心用印申请 */
+    goWorkflowSeal?: (wfProcessInstId: string) => void;
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

package/dist/components/electron-signatures/qunjComponents/qunj-detail.js

@@ -43,12 +43,20 @@ import { getToken } from 'ztxkutils/dist/authority';
 import { ElectronSignaturesContext } from '..';
 import { comparePermission } from '../hooks/useGetQjVerifyCode';
 import dayjs from 'dayjs';
+/** 获取公司名称（fallback companyType） */
+function getCompanyName(item) {
+    return (item === null || item === void 0 ? void 0 : item.companyTypeName) || (item === null || item === void 0 ? void 0 : item.companyType) || '';
+}
+/** 获取印章简称（fallback sealName） */
+function getSealShortName(item) {
+    return (item === null || item === void 0 ? void 0 : item.sealShortName) || (item === null || item === void 0 ? void 0 : item.sealName) || '';
+}
 /**
  * 群杰详情列表
  */
 var QunjDetail = function (_a) {
     var _b;
-    var qunjList = _a.qunjList, qunjSeal = _a.qunjSeal, isContranctNum = _a.isContranctNum, isQunjAddress = _a.isQunjAddress, currentQunjAddress = _a.currentQunjAddress, refreshCode = _a.refreshCode, request = _a.request, isEdit = _a.isEdit, apiBaseUrl = _a.apiBaseUrl, caseId = _a.caseId, wfProcessInstId = _a.wfProcessInstId, verifyUserIds = _a.verifyUserIds, qjVerifyCodeData = _a.qjVerifyCodeData, getQjVerifyCodeHandle = _a.getQjVerifyCodeHandle, flowStatus = _a.flowStatus;
+    var qunjList = _a.qunjList, qunjSeal = _a.qunjSeal, isContranctNum = _a.isContranctNum, isQunjAddress = _a.isQunjAddress, currentQunjAddress = _a.currentQunjAddress, refreshCode = _a.refreshCode, request = _a.request, isEdit = _a.isEdit, apiBaseUrl = _a.apiBaseUrl, caseId = _a.caseId, wfProcessInstId = _a.wfProcessInstId, verifyUserIds = _a.verifyUserIds, qjVerifyCodeData = _a.qjVerifyCodeData, getQjVerifyCodeHandle = _a.getQjVerifyCodeHandle, flowStatus = _a.flowStatus, isShowSealApply = _a.isShowSealApply, goWorkflowSeal = _a.goWorkflowSeal;
     // 新版本的群杰验证码是通过接口获取的
     var _c = useState(), vertifyCode = _c[0], setVerifyCode = _c[1];
     var _d = useState(false), isError = _d[0], setIsError = _d[1]; // 接口调用是否报错
@@ -59,7 +67,7 @@ var QunjDetail = function (_a) {
     var code = useMemo(function () {
         return padWithZeroes((qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.code) || (qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.vertifyCode), 6);
     }, [qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.code, qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.vertifyCode]);
-    var isNewQys = useContext(ElectronSignaturesContext).isNewQys;
+    var _g = useContext(ElectronSignaturesContext), isNewQys = _g.isNewQys, isNewQunjSealStyle = _g.isNewQunjSealStyle;
     /**
      * 更新当前组件状态
      */
@@ -192,17 +200,27 @@ var QunjDetail = function (_a) {
                         if (refreshCode) {
                             (_a = codeModalRef.current) === null || _a === void 0 ? void 0 : _a.open({ formNo: wfProcessInstId });
                         }
-                    } }, i18next.t('刷新验证码')))),
+                    } }, i18next.t('刷新验证码'))),
+                isShowSealApply && goWorkflowSeal && wfProcessInstId ? (React.createElement(Button, { style: { marginLeft: 'auto' }, type: "link", onClick: function () { return goWorkflowSeal(wfProcessInstId); } }, i18next.t('用印增加申请'))) : null),
             (qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.code) || (qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.vertifyCode) ? (React.createElement("div", null,
                 React.createElement(Button, { type: "link", onClick: function () {
                         querySealStatus();
                     } }, i18next.t('查询用印状态')))) : null)),
         React.createElement("div", { className: "qunj-detail--info" },
-            isContranctNum && (React.createElement("div", null,
-                i18next.t('盖章文件数量:'),
-                React.createElement("span", null, qunjSeal === null || qunjSeal === void 0 ? void 0 :
-                    qunjSeal.contranctNum,
-                    i18next.t('份')))),
+            React.createElement("div", { style: {
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'space-between',
+                } },
+                isContranctNum && (React.createElement("div", null,
+                    i18next.t('盖章文件数量:'),
+                    React.createElement("span", null, qunjSeal === null || qunjSeal === void 0 ? void 0 :
+                        qunjSeal.contranctNum,
+                        i18next.t('份')))),
+                isNewQunjSealStyle && wfProcessInstId ? (React.createElement("div", null,
+                    "\u6D41\u7A0Bid:",
+                    ' ',
+                    React.createElement("span", { style: { fontSize: '15px' } }, wfProcessInstId))) : null),
             React.createElement("div", { className: "qunj-detail--address" },
                 React.createElement("div", { className: "qunj-detail--type" },
                     i18next.t('用印类型：'),
@@ -218,7 +236,9 @@ var QunjDetail = function (_a) {
             var _a;
             var item = (_a = qunjList === null || qunjList === void 0 ? void 0 : qunjList.find) === null || _a === void 0 ? void 0 : _a.call(qunjList, function (qunj) { return (qunj === null || qunj === void 0 ? void 0 : qunj.sealNo) === (detail === null || detail === void 0 ? void 0 : detail.sealNo); });
             return (React.createElement("div", { className: "qunj-detail--item", key: detail === null || detail === void 0 ? void 0 : detail.sealNo },
-                React.createElement("div", null, item === null || item === void 0 ? void 0 : item.sealName),
+                React.createElement("div", null, isNewQunjSealStyle
+                    ? getCompanyName(item || detail) + " " + getSealShortName(item || detail)
+                    : item === null || item === void 0 ? void 0 : item.sealName),
                 React.createElement("div", null,
                     i18next.t('用印'),
                     React.createElement("span", null, detail === null || detail === void 0 ? void 0 : detail.sealCount),