ztxkui 4.2.23-605 → 4.2.23-607

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),

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

@@ -10,16 +10,99 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import i18next from 'ztxkutils/dist/i18next';
-import React, { memo, useRef, useMemo } from 'react';
+import React, { memo, useRef, useMemo, useState, useContext, useEffect, } from 'react';
 import { Checkbox, Collapse, InputNumber, Radio, EnhanceSelect, } from '../../../index.build';
+import { ElectronSignaturesContext } from '..';
+import useBaseContext from '../../utils/useBaseContext';
 var defaultQunjAddressList = [
     { id: '1', name: i18next.t('杭州') },
     { id: '2', name: i18next.t('长沙') },
 ];
+/** 获取公司名称（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 QunjList = function (props) {
     var qunjList = props.qunjList, qunjSeal = props.qunjSeal, onChange = props.onChange, isContranctNum = props.isContranctNum, qunjChecked = props.qunjChecked, setQunjChecked = props.setQunjChecked, _a = props.qunjAddressList, qunjAddressList = _a === void 0 ? defaultQunjAddressList : _a, currentQunjAddress = props.currentQunjAddress, onQunjAddressChange = props.onQunjAddressChange, isQunjAddress = props.isQunjAddress, _b = props.isShowChecked, isShowChecked = _b === void 0 ? true : _b, qunjListRenderFilter = props.qunjListRenderFilter;
+    var isNewQunjSealStyle = useContext(ElectronSignaturesContext).isNewQunjSealStyle;
+    var _c = useBaseContext().qunjSealTabTrigger, qunjSealTabTrigger = _c === void 0 ? 'hover' : _c;
     var contranctNumRef = useRef(null);
-    var _c = qunjSeal || {}, contranctNum = _c.contranctNum, isTakeOut = _c.isTakeOut, details = _c.details;
+    var _d = qunjSeal || {}, contranctNum = _d.contranctNum, isTakeOut = _d.isTakeOut, details = _d.details;
+    // ========= 新版：按公司名称分组 =========
+    var _e = useMemo(function () {
+        if (!Array.isArray(qunjList)) {
+            return {
+                companyList: [],
+                companyMap: {},
+            };
+        }
+        var map = {};
+        qunjList.forEach(function (item) {
+            var name = getCompanyName(item);
+            if (!map[name])
+                map[name] = [];
+            map[name].push(item);
+        });
+        return { companyList: Object.keys(map), companyMap: map };
+    }, [qunjList]), companyList = _e.companyList, companyMap = _e.companyMap;
+    // 新版：当前选中公司
+    var _f = useState(companyList[0]), selectedCompany = _f[0], setSelectedCompany = _f[1];
+    useEffect(function () {
+        if (companyList.length > 0 && !companyList.includes(selectedCompany)) {
+            setSelectedCompany(companyList[0]);
+        }
+    }, [companyList, selectedCompany]);
+    // 悬浮延迟切换：停留 300ms 才切换，快速划过（如跨行移动）不触发
+    var hoverTimerRef = useRef(null);
+    useEffect(function () {
+        return function () { return clearTimeout(hoverTimerRef.current); };
+    }, []);
+    var handleCompanyHover = function (company) {
+        if (selectedCompany === company)
+            return;
+        clearTimeout(hoverTimerRef.current);
+        hoverTimerRef.current = setTimeout(function () {
+            setSelectedCompany(company);
+        }, 300);
+    };
+    var clearHoverTimer = function () {
+        clearTimeout(hoverTimerRef.current);
+    };
+    // 新版：当前公司印章列表（含盖章地点过滤）
+    var currentCompanySeals = useMemo(function () {
+        var list = companyMap[selectedCompany] || [];
+        list = list.filter(function (item) {
+            return isFilterAreaType(currentQunjAddress === null || currentQunjAddress === void 0 ? void 0 : currentQunjAddress.id, item.areaType);
+        });
+        if (qunjListRenderFilter) {
+            list = qunjListRenderFilter(list);
+        }
+        return list;
+    }, [companyMap, selectedCompany, currentQunjAddress, qunjListRenderFilter]);
+    // 新版：每个公司选中的印章数量
+    var companySelectedCount = useMemo(function () {
+        var countMap = {};
+        var sealNoToCompany = {};
+        Object.keys(companyMap).forEach(function (company) {
+            companyMap[company].forEach(function (item) {
+                sealNoToCompany[item.sealNo] = company;
+            });
+        });
+        (details || []).forEach(function (detail) {
+            var company = sealNoToCompany[detail.sealNo];
+            if (company) {
+                countMap[company] = (countMap[company] || 0) + 1;
+            }
+        });
+        return countMap;
+    }, [companyMap, details]);
+    // 新版：已选印章完整列表
+    var selectedDetails = details || [];
+    // 旧版：按 useType 分组
     var qunjListTypeMemo = useMemo(function () {
         var _a;
         var newData = [];
@@ -39,6 +122,106 @@ var QunjList = function (props) {
         });
         return newData;
     }, [qunjList]);
+    // ========= 新版渲染 =========
+    if (isNewQunjSealStyle) {
+        // 没有印章数据时不显示内容
+        if (companyList.length === 0) {
+            return null;
+        }
+        return (React.createElement("div", { className: "qunj-list-new--wrap" },
+            React.createElement("div", { className: "qunj-list-new--title" },
+                React.createElement("div", { className: "qunj-list-new--left" },
+                    React.createElement(Radio.Group, { value: isTakeOut, onChange: function (e) {
+                            onChange === null || onChange === void 0 ? void 0 : onChange({ isTakeOut: e.target.value });
+                        } },
+                        React.createElement(Radio, { value: 0 }, i18next.t('内部用印')),
+                        React.createElement(Radio, { value: 1 }, i18next.t('外部用印'))),
+                    isQunjAddress && isTakeOut + '' === '1' ? (React.createElement(EnhanceSelect, { style: { width: 70 }, list: qunjAddressList, size: "small", value: currentQunjAddress === null || currentQunjAddress === void 0 ? void 0 : currentQunjAddress.id, onChange: function (value, option, completeData) {
+                            var _a, _b;
+                            // 切换盖章地点时，清理非当前地点的已选印章
+                            var copyDetails = ((_b = (_a = details === null || details === void 0 ? void 0 : details.slice()) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, function (d) { return (__assign({}, d)); })) || [];
+                            var newDetails = copyDetails.filter(function (qunjItem) {
+                                return isFilterAreaType(completeData === null || completeData === void 0 ? void 0 : completeData.id, qunjItem.areaType);
+                            });
+                            var qunjSealUpdate = {};
+                            if (copyDetails.length !== newDetails.length) {
+                                qunjSealUpdate.details = newDetails;
+                            }
+                            onQunjAddressChange(completeData, {
+                                qunjSeal: qunjSealUpdate,
+                            });
+                        } })) : null),
+                React.createElement("div", { className: "qunj-list-new--right" }, isContranctNum ? (React.createElement("div", { className: "qunj-list-new--contract" },
+                    React.createElement("span", null, i18next.t('文件份数')),
+                    React.createElement(InputNumber, { size: "small", value: contranctNum === null ? undefined : contranctNum, onChange: function (e) {
+                            contranctNumRef.current = e;
+                            onChange === null || onChange === void 0 ? void 0 : onChange({ contranctNum: contranctNumRef.current });
+                        }, min: 1 }))) : null)),
+            React.createElement("div", { className: "seal-owner-tabs" }, companyList.map(function (company) {
+                var count = companySelectedCount[company] || 0;
+                return (React.createElement("div", __assign({ key: company, className: "seal-owner-tab " + (selectedCompany === company ? 'seal-owner-tab--active' : ''), title: company }, (qunjSealTabTrigger === 'hover'
+                    ? {
+                        onMouseEnter: function () { return handleCompanyHover(company); },
+                        onMouseLeave: clearHoverTimer,
+                    }
+                    : { onClick: function () { return setSelectedCompany(company); } })),
+                    React.createElement("span", { className: "seal-owner-tab--name" }, company),
+                    count > 0 && (React.createElement("span", { className: "seal-owner-tab--count" }, count))));
+            })),
+            React.createElement("div", { className: "qunj-seal-list-current" }, currentCompanySeals.map(function (qunjItem) {
+                var _a, _b;
+                var sealNo = qunjItem.sealNo;
+                var copyDetails = ((_b = (_a = details === null || details === void 0 ? void 0 : details.slice()) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, function (d) { return (__assign({}, d)); })) || [];
+                var findItem = copyDetails.find(function (d) { return d.sealNo === sealNo; });
+                return (React.createElement("div", { className: "qunj-list-new--item", key: sealNo },
+                    React.createElement(Checkbox, { checked: !!findItem, onChange: function (e) {
+                            var isChecked = e.target.checked;
+                            if (isChecked) {
+                                copyDetails.push(__assign({}, qunjItem));
+                                onChange === null || onChange === void 0 ? void 0 : onChange({
+                                    details: copyDetails,
+                                });
+                            }
+                            else {
+                                var index = copyDetails.findIndex(function (d) { return d.sealNo === sealNo; });
+                                copyDetails.splice(index, 1);
+                                var data = { details: copyDetails };
+                                if (copyDetails.length === 0) {
+                                    data.contranctNum = undefined;
+                                }
+                                onChange === null || onChange === void 0 ? void 0 : onChange(data);
+                            }
+                        } },
+                        React.createElement("span", { title: qunjItem.sealName }, getSealShortName(qunjItem))),
+                    React.createElement("div", { className: "qunj-list-new--seal-count" },
+                        i18next.t('次数'),
+                        React.createElement(InputNumber, { size: "small", value: findItem === null || findItem === void 0 ? void 0 : findItem.sealCount, min: 1, onChange: function (e) {
+                                var index = copyDetails.findIndex(function (d) { return d.sealNo === sealNo; });
+                                if (index === -1) {
+                                    copyDetails.push(__assign(__assign({}, qunjItem), { sealCount: e }));
+                                }
+                                else {
+                                    copyDetails[index].sealCount = e;
+                                }
+                                onChange === null || onChange === void 0 ? void 0 : onChange({
+                                    details: copyDetails,
+                                    contranctNum: contranctNum ? contranctNum : 1,
+                                });
+                            } }))));
+            })),
+            React.createElement("div", { className: "seal-selected-summary" },
+                React.createElement("div", { className: "seal-selected-title" }, i18next.t('已选印章')),
+                selectedDetails.length > 0 ? (selectedDetails.map(function (detail) { return (React.createElement("div", { key: detail.sealNo, className: "seal-selected-item seal-selected-item--qunj", title: detail.sealName },
+                    React.createElement("span", { className: "seal-selected-name" },
+                        getCompanyName(detail),
+                        " ",
+                        getSealShortName(detail)),
+                    React.createElement("span", { className: "seal-selected-use-count" },
+                        i18next.t('用印'),
+                        detail.sealCount,
+                        i18next.t('次')))); })) : (React.createElement("div", { className: "seal-selected-empty" }, i18next.t('暂未选择印章'))))));
+    }
+    // ========= 旧版渲染（按 useType 分组 + 用印申请勾选） =========
     return (React.createElement("div", { className: "qunj-list--wrap" },
         React.createElement("div", { className: "qunj-list--need" },
             isShowChecked ? (React.createElement(Checkbox, { checked: qunjChecked, onChange: function (e) {
@@ -83,7 +266,7 @@ var QunjList = function (props) {
                 return (React.createElement(Collapse.Panel, { key: "" + item.useType, header: item.useTypeName }, currentQunjList === null || currentQunjList === void 0 ? void 0 : currentQunjList.map(function (qunjItem) {
                     var _a, _b;
                     var sealNo = qunjItem.sealNo, sealName = qunjItem.sealName;
-                    // redux数据所有属性都被冻结了，需要“深拷贝”。这里只有一层
+                    // redux数据所有属性都被冻结了，需要"深拷贝"。这里只有一层
                     var copyDetails = ((_b = (_a = details === null || details === void 0 ? void 0 : details.slice()) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, function (detail) { return (__assign({}, detail)); })) || [];
                     var findItem = copyDetails === null || copyDetails === void 0 ? void 0 : copyDetails.find(function (detailItem) { return detailItem.sealNo === sealNo; });
                     return (React.createElement("div", { className: "qunj-list--item", key: sealNo },

package/dist/components/electron-signatures/qunjComponents/useQunjColumns.js

@@ -35,10 +35,12 @@ function WorkflowIdButton(props) {
 // 群杰印章的clomuns
 export default function useQunjColumns(options) {
     var records = options.records, dataTypeSort = options.dataTypeSort, allData = options.allData, contractNumFlowIds = options.contractNumFlowIds, refreshCode = options.refreshCode, request = options.request, isSingleQj = options.isSingleQj, isQjUseModal = options.isQjUseModal, apiBaseUrl = options.apiBaseUrl, caseId = options.caseId, qjVerifyCodeData = options.qjVerifyCodeData, getQjVerifyCodeHandle = options.getQjVerifyCodeHandle, isShowSealApply = options.isShowSealApply, goWorkflowSeal = options.goWorkflowSeal, qunjListRenderFilter = options.qunjListRenderFilter;
-    var isNewQys = useContext(ElectronSignaturesContext).isNewQys;
-    var useSealTitle = isNewQys
-        ? i18next.t('已选群杰印章')
-        : i18next.t('申请用章情况');
+    var _a = useContext(ElectronSignaturesContext), isNewQys = _a.isNewQys, isNewQunjSealStyle = _a.isNewQunjSealStyle;
+    var useSealTitle = isNewQunjSealStyle
+        ? i18next.t('选择群杰印章')
+        : isNewQys
+            ? i18next.t('已选群杰印章')
+            : i18next.t('申请用章情况');
     var qjColumn = isSingleQj
         ? [
             {
@@ -131,98 +133,149 @@ export default function useQunjColumns(options) {
             },
         ]
         : isQjUseModal
-            ? // 这种场景是群杰相对于整个合同，但是默认不显示印章
-                [
-                    {
-                        title: i18next.t('盖群杰印章'),
-                        dataIndex: 'isStampQunj',
-                        key: 'isStampQunj',
-                        width: 100,
-                        align: 'center',
-                        render: function (text, record, index) {
-                            var _a;
-                            // 需要合并
-                            var _b = getColumnMergeProp({
-                                record: record,
-                                index: index,
-                                records: records,
-                                dataTypeSort: dataTypeSort,
-                            }), props = _b.props, currentDataType = _b.currentDataType;
-                            var _c = allData[currentDataType] || {}, isEdit = _c.isEdit, qunjList = _c.qunjList, currentQunjSeal = _c.currentQunjSeal, onQunjSealChange = _c.onQunjSealChange, needQj = _c.needQj, isContranctNum = _c.isContranctNum, qunjChecked = _c.qunjChecked, setQunjChecked = _c.setQunjChecked, currentQunjAddress = _c.currentQunjAddress, onQunjAddressChange = _c.onQunjAddressChange, isQunjAddress = _c.isQunjAddress, wfProcessInstId = _c.wfProcessInstId;
-                            // 是否显示群杰印章信息 如果非编辑状态下，使用数据中的字段来判断是否选择了群杰印章
-                            var isShowQunjDetail = !isEdit
-                                ? (currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) &&
-                                    ((_a = currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) === null || _a === void 0 ? void 0 : _a.length) !== 0
-                                : qunjChecked;
-                            return {
-                                children: !needQj ? (React.createElement(React.Fragment, null,
-                                    React.createElement(NoUseQj, null),
-                                    wfProcessInstId ? (React.createElement(WorkflowIdButton, { wfProcessInstId: wfProcessInstId, isShowSealApply: isShowSealApply, isEdit: isEdit, goWorkflowSeal: goWorkflowSeal }, wfProcessInstId)) : (''))) : (React.createElement(React.Fragment, null,
-                                    React.createElement(QunjCheck, { disabled: !isEdit, checked: isShowQunjDetail, onChange: function (checked) {
-                                            setQunjChecked && setQunjChecked(checked);
-                                        }, qunjList: qunjList, currentQunjSeal: currentQunjSeal, currentQunjAddress: currentQunjAddress, isContranctNum: isContranctNum, isQunjAddress: isQunjAddress, onQunjAddressSingleChange: function (data) {
-                                            var _a, _b, _c;
-                                            // 如果切换了盖章地点，需要将非当前地点的数据删除
-                                            var copyDetails = ((_c = (_b = (_a = currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) === null || _a === void 0 ? void 0 : _a.slice()) === null || _b === void 0 ? void 0 : _b.map) === null || _c === void 0 ? void 0 : _c.call(_b, function (detail) { return (__assign({}, detail)); })) || [];
-                                            var newDetails = copyDetails.filter(function (qunjItem) {
-                                                return isFilterAreaType(data === null || data === void 0 ? void 0 : data.id, qunjItem.areaType);
-                                            });
-                                            var qunjSeal = {};
-                                            if (copyDetails.length !== newDetails.length) {
-                                                qunjSeal.details = newDetails;
-                                            }
-                                            onQunjAddressChange &&
-                                                onQunjAddressChange(data, { qunjSeal: qunjSeal });
-                                        }, onQunjSealSingleChange: function (data) {
-                                            onQunjSealChange && onQunjSealChange(data);
-                                        }, qunjListRenderFilter: qunjListRenderFilter }),
-                                    wfProcessInstId ? (React.createElement(WorkflowIdButton, { wfProcessInstId: wfProcessInstId, isShowSealApply: isShowSealApply, isEdit: isEdit, goWorkflowSeal: goWorkflowSeal }, wfProcessInstId)) : (''))),
-                                props: props,
-                            };
+            ? // 新版模式：合并为单列"选择群杰印章"；旧版模式：两列（盖群杰印章 + 已选群杰印章）
+                isNewQunjSealStyle
+                    ? [
+                        {
+                            title: i18next.t('选择群杰印章'),
+                            dataIndex: 'qunjDetail',
+                            key: 'qunjDetail',
+                            width: 326,
+                            align: 'center',
+                            // 固定列宽（scroll.x=max-content 时 width 会被内容撑开）
+                            onHeaderCell: function () { return ({
+                                style: { width: 326, minWidth: 326, maxWidth: 326 },
+                            }); },
+                            onCell: function () { return ({
+                                // 内容从顶部往下排，避免切换公司时因印章数量不同导致内容垂直居中抖动
+                                style: {
+                                    width: 326,
+                                    minWidth: 326,
+                                    maxWidth: 326,
+                                    verticalAlign: 'top',
+                                },
+                            }); },
+                            render: function (text, record, index) {
+                                var _a;
+                                var _b = getColumnMergeProp({
+                                    record: record,
+                                    index: index,
+                                    records: records,
+                                    dataTypeSort: dataTypeSort,
+                                }), props = _b.props, currentDataType = _b.currentDataType;
+                                var _c = allData[currentDataType] || {}, isEdit = _c.isEdit, qunjList = _c.qunjList, isContranctNum = _c.isContranctNum, isQunjAddress = _c.isQunjAddress, currentQunjSeal = _c.currentQunjSeal, onQunjSealChange = _c.onQunjSealChange, qunjChecked = _c.qunjChecked, setQunjChecked = _c.setQunjChecked, qunjAddressList = _c.qunjAddressList, currentQunjAddress = _c.currentQunjAddress, onQunjAddressChange = _c.onQunjAddressChange, needQj = _c.needQj, wfProcessInstId = _c.wfProcessInstId, verifyUserIds = _c.verifyUserIds, flowStatus = _c.flowStatus;
+                                return {
+                                    children: !needQj ? (React.createElement(NoUseQj, null)) : isEdit ? (React.createElement(QunjList, { qunjList: qunjList, qunjSeal: currentQunjSeal, onChange: onQunjSealChange, isContranctNum: isContranctNum, isQunjAddress: isQunjAddress, qunjAddressList: qunjAddressList, currentQunjAddress: currentQunjAddress, onQunjAddressChange: onQunjAddressChange, qunjChecked: qunjChecked, setQunjChecked: setQunjChecked, qunjListRenderFilter: qunjListRenderFilter })) : ((_a = currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) === null || _a === void 0 ? void 0 : _a.length) !== 0 ? (React.createElement(QunjDetail, { qunjList: qunjList, qunjSeal: currentQunjSeal, isContranctNum: isContranctNum, isQunjAddress: isQunjAddress, currentQunjAddress: currentQunjAddress, isEdit: isEdit, refreshCode: refreshCode, request: request, apiBaseUrl: apiBaseUrl, caseId: caseId, wfProcessInstId: wfProcessInstId, verifyUserIds: verifyUserIds, qjVerifyCodeData: qjVerifyCodeData, getQjVerifyCodeHandle: getQjVerifyCodeHandle, flowStatus: flowStatus, isShowSealApply: isShowSealApply, goWorkflowSeal: goWorkflowSeal })) : (React.createElement(NoUseQj, null)),
+                                    props: props,
+                                };
+                            },
                         },
-                    },
-                    {
-                        title: useSealTitle,
-                        dataIndex: 'qunjDetail',
-                        key: 'qunjDetail',
-                        width: 260,
-                        align: 'center',
-                        render: function (text, record, index) {
-                            var _a;
-                            // 需要合并
-                            var _b = getColumnMergeProp({
-                                record: record,
-                                index: index,
-                                records: records,
-                                dataTypeSort: dataTypeSort,
-                            }), props = _b.props, currentDataType = _b.currentDataType;
-                            // 公用信息获取
-                            var _c = allData[currentDataType] || {}, isEdit = _c.isEdit, 
-                            // 当前流程下的群杰章信息
-                            qunjList = _c.qunjList, 
-                            // 是否显示合同分数
-                            isContranctNum = _c.isContranctNum, 
-                            // 是否显示群杰章地址
-                            isQunjAddress = _c.isQunjAddress, currentQunjSeal = _c.currentQunjSeal, qunjChecked = _c.qunjChecked, currentQunjAddress = _c.currentQunjAddress, wfProcessInstId = _c.wfProcessInstId, verifyUserIds = _c.verifyUserIds, flowStatus = _c.flowStatus;
-                            // 是否显示群杰印章信息 如果非编辑状态下，使用数据中的字段来判断是否选择了群杰印章
-                            var isShowQunjDetail = !isEdit
-                                ? (currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) &&
-                                    ((_a = currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) === null || _a === void 0 ? void 0 : _a.length) !== 0
-                                : qunjChecked;
-                            return {
-                                children: isShowQunjDetail ? (React.createElement(QunjDetail, { qunjList: qunjList, qunjSeal: currentQunjSeal, isContranctNum: isContranctNum, isQunjAddress: isQunjAddress, currentQunjAddress: currentQunjAddress, isEdit: isEdit, refreshCode: refreshCode, request: request, apiBaseUrl: apiBaseUrl, caseId: caseId, wfProcessInstId: wfProcessInstId, verifyUserIds: verifyUserIds, qjVerifyCodeData: qjVerifyCodeData, getQjVerifyCodeHandle: getQjVerifyCodeHandle, flowStatus: flowStatus })) : null,
-                                props: props,
-                            };
-                        },
-                    },
-                ]
+                    ]
+                    : // 旧版模式：两列（盖群杰印章 + 已选群杰印章）
+                        [
+                            {
+                                title: i18next.t('盖群杰印章'),
+                                dataIndex: 'isStampQunj',
+                                key: 'isStampQunj',
+                                width: 100,
+                                align: 'center',
+                                render: function (text, record, index) {
+                                    var _a;
+                                    // 需要合并
+                                    var _b = getColumnMergeProp({
+                                        record: record,
+                                        index: index,
+                                        records: records,
+                                        dataTypeSort: dataTypeSort,
+                                    }), props = _b.props, currentDataType = _b.currentDataType;
+                                    var _c = allData[currentDataType] || {}, isEdit = _c.isEdit, qunjList = _c.qunjList, currentQunjSeal = _c.currentQunjSeal, onQunjSealChange = _c.onQunjSealChange, needQj = _c.needQj, isContranctNum = _c.isContranctNum, qunjChecked = _c.qunjChecked, setQunjChecked = _c.setQunjChecked, currentQunjAddress = _c.currentQunjAddress, onQunjAddressChange = _c.onQunjAddressChange, isQunjAddress = _c.isQunjAddress, wfProcessInstId = _c.wfProcessInstId;
+                                    // 是否显示群杰印章信息 如果非编辑状态下，使用数据中的字段来判断是否选择了群杰印章
+                                    var isShowQunjDetail = !isEdit
+                                        ? (currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) &&
+                                            ((_a = currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) === null || _a === void 0 ? void 0 : _a.length) !== 0
+                                        : qunjChecked;
+                                    return {
+                                        children: !needQj ? (React.createElement(React.Fragment, null,
+                                            React.createElement(NoUseQj, null),
+                                            wfProcessInstId ? (React.createElement(WorkflowIdButton, { wfProcessInstId: wfProcessInstId, isShowSealApply: isShowSealApply, isEdit: isEdit, goWorkflowSeal: goWorkflowSeal }, wfProcessInstId)) : (''))) : (React.createElement(React.Fragment, null,
+                                            React.createElement(QunjCheck, { disabled: !isEdit, checked: isShowQunjDetail, onChange: function (checked) {
+                                                    setQunjChecked && setQunjChecked(checked);
+                                                }, qunjList: qunjList, currentQunjSeal: currentQunjSeal, currentQunjAddress: currentQunjAddress, isContranctNum: isContranctNum, isQunjAddress: isQunjAddress, onQunjAddressSingleChange: function (data) {
+                                                    var _a, _b, _c;
+                                                    // 如果切换了盖章地点，需要将非当前地点的数据删除
+                                                    var copyDetails = ((_c = (_b = (_a = currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) === null || _a === void 0 ? void 0 : _a.slice()) === null || _b === void 0 ? void 0 : _b.map) === null || _c === void 0 ? void 0 : _c.call(_b, function (detail) { return (__assign({}, detail)); })) || [];
+                                                    var newDetails = copyDetails.filter(function (qunjItem) {
+                                                        return isFilterAreaType(data === null || data === void 0 ? void 0 : data.id, qunjItem.areaType);
+                                                    });
+                                                    var qunjSeal = {};
+                                                    if (copyDetails.length !== newDetails.length) {
+                                                        qunjSeal.details = newDetails;
+                                                    }
+                                                    onQunjAddressChange &&
+                                                        onQunjAddressChange(data, { qunjSeal: qunjSeal });
+                                                }, onQunjSealSingleChange: function (data) {
+                                                    onQunjSealChange && onQunjSealChange(data);
+                                                }, qunjListRenderFilter: qunjListRenderFilter }),
+                                            wfProcessInstId ? (React.createElement(WorkflowIdButton, { wfProcessInstId: wfProcessInstId, isShowSealApply: isShowSealApply, isEdit: isEdit, goWorkflowSeal: goWorkflowSeal }, wfProcessInstId)) : (''))),
+                                        props: props,
+                                    };
+                                },
+                            },
+                            {
+                                title: useSealTitle,
+                                dataIndex: 'qunjDetail',
+                                key: 'qunjDetail',
+                                width: 260,
+                                align: 'center',
+                                render: function (text, record, index) {
+                                    var _a;
+                                    // 需要合并
+                                    var _b = getColumnMergeProp({
+                                        record: record,
+                                        index: index,
+                                        records: records,
+                                        dataTypeSort: dataTypeSort,
+                                    }), props = _b.props, currentDataType = _b.currentDataType;
+                                    // 公用信息获取
+                                    var _c = allData[currentDataType] || {}, isEdit = _c.isEdit, 
+                                    // 当前流程下的群杰章信息
+                                    qunjList = _c.qunjList, 
+                                    // 是否显示合同分数
+                                    isContranctNum = _c.isContranctNum, 
+                                    // 是否显示群杰章地址
+                                    isQunjAddress = _c.isQunjAddress, currentQunjSeal = _c.currentQunjSeal, qunjChecked = _c.qunjChecked, currentQunjAddress = _c.currentQunjAddress, wfProcessInstId = _c.wfProcessInstId, verifyUserIds = _c.verifyUserIds, flowStatus = _c.flowStatus;
+                                    // 是否显示群杰印章信息 如果非编辑状态下，使用数据中的字段来判断是否选择了群杰印章
+                                    var isShowQunjDetail = !isEdit
+                                        ? (currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) &&
+                                            ((_a = currentQunjSeal === null || currentQunjSeal === void 0 ? void 0 : currentQunjSeal.details) === null || _a === void 0 ? void 0 : _a.length) !== 0
+                                        : qunjChecked;
+                                    return {
+                                        children: isShowQunjDetail ? (React.createElement(QunjDetail, { qunjList: qunjList, qunjSeal: currentQunjSeal, isContranctNum: isContranctNum, isQunjAddress: isQunjAddress, currentQunjAddress: currentQunjAddress, isEdit: isEdit, refreshCode: refreshCode, request: request, apiBaseUrl: apiBaseUrl, caseId: caseId, wfProcessInstId: wfProcessInstId, verifyUserIds: verifyUserIds, qjVerifyCodeData: qjVerifyCodeData, getQjVerifyCodeHandle: getQjVerifyCodeHandle, flowStatus: flowStatus })) : null,
+                                        props: props,
+                                    };
+                                },
+                            },
+                        ]
             : [
                 {
                     title: React.createElement("div", null, i18next.t('群杰用印申请')),
                     dataIndex: 'isStampQunj',
                     key: 'isStampQunj',
-                    width: 420,
+                    width: 330,
                     align: 'center',
+                    // 固定列宽（scroll.x=max-content 时 width 会被内容撑开）
+                    onHeaderCell: function () { return ({
+                        style: { width: 330, minWidth: 330, maxWidth: 330 },
+                    }); },
+                    onCell: function () { return ({
+                        // 内容从顶部往下排，避免切换公司时因印章数量不同导致内容垂直居中抖动
+                        style: {
+                            width: 330,
+                            minWidth: 330,
+                            maxWidth: 330,
+                            verticalAlign: 'top',
+                        },
+                    }); },
                     render: function (text, record, index) {
                         // 需要合并
                         var _a = getColumnMergeProp({

package/dist/components/electron-signatures/translateComponents/useTranslateCom.js

@@ -1,18 +1,34 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import i18next from 'ztxkutils/dist/i18next';
-import React from 'react';
+import React, { useContext } from 'react';
 import TranslationButton from './TranslateButton';
 import { getColumnMergeProp } from '../hooks/useParseRecords';
 import { Checkbox } from '../../../index.build';
+import { ElectronSignaturesContext } from '..';
 function useTranslateCom(_a) {
     var isTranslation = _a.isTranslation, previewUrl = _a.previewUrl, request = _a.request, records = _a.records, dataTypeSort = _a.dataTypeSort, allData = _a.allData;
+    var isNewQys = useContext(ElectronSignaturesContext).isNewQys;
     var translateColumns = [
-        {
-            title: i18next.t('附件扩展功能'),
-            dataIndex: 'translatedFile',
-            key: 'translatedFile',
-            width: 180,
-            align: 'center',
-            render: function (text, record, index) {
+        __assign(__assign({ title: i18next.t('附件扩展功能'), dataIndex: 'translatedFile', key: 'translatedFile', width: 180, align: 'center' }, (isNewQys
+            ? {
+                onHeaderCell: function () { return ({
+                    style: { width: 180, minWidth: 180, maxWidth: 180 },
+                }); },
+                onCell: function () { return ({
+                    style: { width: 180, minWidth: 180, maxWidth: 180 },
+                }); },
+            }
+            : {})), { render: function (text, record, index) {
                 var currentDataType = getColumnMergeProp({
                     record: record,
                     index: index,
@@ -25,8 +41,7 @@ function useTranslateCom(_a) {
                 return (React.createElement(React.Fragment, null,
                     !record.isHideSaveCustomerReference && isShowSaveTemplate ? (React.createElement(Checkbox, { checked: isCustomerReference, disabled: true }, i18next.t('存样板'))) : null,
                     React.createElement(TranslationButton, { request: request, previewUrl: previewUrl, isTranslation: isTranslation, record: record, realIndex: index, setRecords: setSameTypeRecords })));
-            },
-        },
+            } }),
     ];
     return {
         translateColumns: translateColumns,