ztxkui 3.4.4 → 3.4.7

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

@@ -10,50 +10,6 @@ var CompareResult = function (_a) {
     var record = _a.record, index = _a.index, request = _a.request, isEdit = _a.isEdit, getTaskId = _a.getTaskId;
     // 设置查看比对结果按钮的loading状态
     var _b = useState(false), resultLoading = _b[0], setResultLoading = _b[1];
-    // 设置合同比对按钮的loading状态
-    var _c = useState(false), loading = _c[0], setLoading = _c[1];
-    // 设置查看结果按钮是否显示
-    var _d = useState(false), isShow = _d[0], setIsShow = _d[1];
-    var onClickHandle = function () {
-        console.log('合同比对', index, record);
-        setLoading(true);
-        try {
-            if (!record.templateAttachId) {
-                message.info('请选择客户样板');
-                return;
-            }
-            var params = {
-                leftAttachId: record.attachId,
-                rightAttachId: record.templateAttachId,
-            };
-            // 发起比对任务
-            request({
-                url: "/api/zmdms-resource/seal/create-compare-task/" + params.leftAttachId + "/" + params.rightAttachId,
-                method: 'GET',
-            })
-                .then(function (res) {
-                var _a;
-                if (res.status === 200 && res.data.code === 200) {
-                    getTaskId((_a = res.data.data) === null || _a === void 0 ? void 0 : _a.taskId, index);
-                    setIsShow(true);
-                    message.success('操作成功');
-                }
-                else {
-                    message.error(res.data.msg || '出错了');
-                }
-            })
-                .catch(function (error) {
-                var _a, _b;
-                message.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '请求失败！');
-            });
-        }
-        catch (err) {
-            //
-        }
-        finally {
-            setLoading(false);
-        }
-    };
     var viewCompareResult = function () {
         console.log('查看比对结果', index, record);
         setResultLoading(true);
@@ -97,7 +53,6 @@ var CompareResult = function (_a) {
         }
     };
     return (React.createElement(React.Fragment, null,
-        React.createElement(Button, { type: "primary", size: "small", disabled: !isEdit, onClick: onClickHandle, loading: loading }, "\u5408\u540C\u6BD4\u5BF9"),
-        React.createElement("div", null, isShow || record.taskId ? (React.createElement(Button, { type: "link", onClick: viewCompareResult, loading: resultLoading }, "\u67E5\u770B\u6BD4\u5BF9\u7ED3\u679C")) : (''))));
+        React.createElement("div", null, record.taskId ? (React.createElement(Button, { type: "link", onClick: viewCompareResult, loading: resultLoading }, "\u67E5\u770B\u6BD4\u5BF9\u7ED3\u679C")) : (React.createElement(React.Fragment, null)))));
 };
 export default CompareResult;

package/dist/components/business/Signatures/components/DetailTable.d.ts

@@ -0,0 +1,30 @@
+/**
+ * @author zyh
+ * @description 审批中审批后详情展示
+ */
+import React from 'react';
+interface IProps {
+    /** 接口api */
+    ZT_API_BASEURL: string;
+    /** 附件api */
+    ZT_FILE_BASEURL: string;
+    /** token */
+    token?: any;
+    /** 合同id */
+    contractId: string;
+    electronicList: any;
+    sealList: any;
+    querySealStatus?: () => void;
+    flow_status: string;
+    needQj: number;
+    needQys: number;
+    records: any;
+    /** 已选中的电子印章列表 */
+    electronicSealIdList: any;
+    /** 已选中群杰印章列表 */
+    qunjSeal: any;
+    /** 查看盖章页面 */
+    viewSealPageFn: any;
+}
+declare const _default: React.NamedExoticComponent<IProps>;
+export default _default;

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

@@ -0,0 +1,184 @@
+/**
+ * @author zyh
+ * @description 审批中审批后详情展示
+ */
+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 React, { memo } from 'react';
+import { Table, Button } from '../../../../index';
+// 自定义组件
+import AttachOperation from './AttachOperation';
+var DetailTable = function (_a) {
+    var needQj = _a.needQj, needQys = _a.needQys, records = _a.records, qunjSeal = _a.qunjSeal, electronicSeal = _a.electronicSealIdList, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, token = _a.token, viewSealPageFn = _a.viewSealPageFn, contractId = _a.contractId, electronicList = _a.electronicList, sealList = _a.sealList, querySealStatus = _a.querySealStatus, flow_status = _a.flow_status;
+    var authToken = token || '';
+    /** 下载水印附件 */
+    var downFileFn = function (_record) {
+        try {
+            var xhr_1 = new XMLHttpRequest();
+            xhr_1.open('GET', ZT_API_BASEURL + "/api/zmdms-resource/seal/download-watermark-attach/" + (_record === null || _record === void 0 ? void 0 : _record.attachId) + "?Zmdms-Auth=bearer " + token, true);
+            xhr_1.responseType = 'blob';
+            xhr_1.onload = function () {
+                var _a;
+                if (xhr_1.status === 200 || xhr_1.status === 201) {
+                    var link = document.createElement('a');
+                    link.href = window.URL.createObjectURL(xhr_1.response);
+                    link.download = ((_a = _record === null || _record === void 0 ? void 0 : _record.attachName) === null || _a === void 0 ? void 0 : _a.split('.')[0]) + ".pdf";
+                    // fix Firefox
+                    link.style.display = 'none';
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link);
+                    window.URL.revokeObjectURL(link.href);
+                }
+            };
+            xhr_1.send();
+        }
+        catch (err) {
+            //
+        }
+    };
+    var columns = [
+        {
+            title: '序号',
+            key: 'orderNum',
+            dataIndex: 'orderNum',
+            width: 62,
+            fixed: 'left',
+            render: function (text, record, index) { return "" + (index + 1); },
+        },
+        {
+            title: '附件类型',
+            key: 'attachTypeName',
+            dataIndex: 'attachTypeName',
+            width: 100,
+        },
+        {
+            title: '附件名称',
+            key: 'attachId',
+            dataIndex: 'attachId',
+            width: 240,
+            render: function (text, record, index) {
+                return (React.createElement(React.Fragment, null,
+                    React.createElement(AttachOperation, { ZT_API_BASEURL: ZT_API_BASEURL, ZT_FILE_BASEURL: ZT_FILE_BASEURL, token: authToken, attachId: record === null || record === void 0 ? void 0 : record.attachId, attachName: record === null || record === void 0 ? void 0 : record.attachName, attachSize: record === null || record === void 0 ? void 0 : record.attachSize })));
+            },
+        },
+        {
+            title: '水印',
+            key: 'isWatermark',
+            dataIndex: 'isWatermark',
+            width: 60,
+            render: function (text, record, index) {
+                return (React.createElement(Button, { type: "link", onClick: function () { return downFileFn(record); } }, "\u4E0B\u8F7D\u6C34\u5370\u7248"));
+            },
+        },
+        {
+            title: '电子印章',
+            key: 'electronicSeal',
+            dataIndex: 'electronicSeal',
+            width: '20%',
+            render: function (value, row, index) {
+                var obj = {
+                    children: (React.createElement("div", { style: { height: '100%', padding: '10px 0' } },
+                        React.createElement(Button, { type: "link", style: __assign({}, (contractId ? {} : { display: 'none' })), size: "small", onClick: function () {
+                                viewSealPageFn && viewSealPageFn();
+                            } }, "\u9884\u89C8\u76D6\u7AE0\u6548\u679C"),
+                        (electronicList || [])
+                            .filter(function (item) { return electronicSeal.includes(item.sealId); })
+                            .map(function (n) { return (React.createElement("div", { style: { padding: '3px 0' }, key: n.sealId }, n.sealName || '')); }))),
+                    props: {},
+                };
+                obj.props['rowSpan'] = index === 0 ? records.length : 0;
+                return obj;
+            },
+        },
+        {
+            title: '群杰印章-用印申请',
+            key: 'qunjSeal',
+            dataIndex: 'qunjSeal',
+            width: 240,
+            render: function (value, row, index) {
+                var obj = {
+                    children: (React.createElement("div", { style: { height: '100%', padding: '10px 0' } },
+                        React.createElement("div", { style: {
+                                display: 'flex',
+                                justifyContent: 'space-between',
+                                height: '50px',
+                                borderBottom: '1px solid #EBEBEB',
+                            } },
+                            React.createElement("div", { style: {
+                                    width: '160px',
+                                    height: '38px',
+                                    background: '#FCECC8',
+                                    borderRadius: '4px',
+                                    padding: '0 10px',
+                                    lineHeight: '38px',
+                                } },
+                                "\u7FA4\u6770\u9A8C\u8BC1\u7801",
+                                '  ',
+                                React.createElement("span", { style: { color: '#FF6666', fontSize: '16px' } }, (qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.vertifyCode) || '')),
+                            !!flow_status && (React.createElement("div", { style: {
+                                    height: '38px',
+                                    background: '#FCECC8',
+                                    borderRadius: '4px',
+                                    padding: '0 10px',
+                                    lineHeight: '38px',
+                                } }, flow_status))),
+                        React.createElement("div", { style: {
+                                borderBottom: '1px solid #EBEBEB',
+                            } },
+                            React.createElement("div", { style: __assign({}, (!!(qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.vertifyCode) ? {} : { display: 'none' })) },
+                                React.createElement(Button, { type: "link", size: "small", onClick: querySealStatus }, "\u67E5\u8BE2\u7528\u5370\u72B6\u6001")),
+                            React.createElement("div", null,
+                                React.createElement("span", { style: {
+                                        color: '#888888',
+                                    } }, "\u5408\u540C\u4EFD\u6570\uFF1A"),
+                                (qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.contranctNum) || '',
+                                " \u4EFD"),
+                            React.createElement("div", null,
+                                React.createElement("span", { style: {
+                                        color: '#888888',
+                                    } }, "\u7528\u5370\u7C7B\u578B\uFF1A"),
+                                "" + (qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.isTakeOut) === '1' ? '外部用印' : '内部用印')),
+                        React.createElement("div", null, (sealList || [])
+                            .filter(function (item) {
+                            return ((qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.details) || [])
+                                .map(function (n) { return n.sealNo; })
+                                .includes(item.sealNo);
+                        })
+                            .map(function (m) {
+                            var ele = ((qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.details) || []).find(function (element) { return element.sealNo === m.sealNo; });
+                            return (React.createElement("div", { style: { padding: '5px 0' }, key: m.sealNo },
+                                m.sealName,
+                                '  ',
+                                "\u7528\u5370",
+                                ele.sealCount || '',
+                                "\u6B21"));
+                        })))),
+                    props: {},
+                };
+                obj.props['rowSpan'] = index === 0 ? records.length : 0;
+                return obj;
+            },
+        },
+    ];
+    // 由外部传入needQj needQys参数过滤出需展示的列
+    var columnsLast = columns;
+    if (!needQj) {
+        columnsLast = columnsLast.filter(function (item) { return item.key !== 'qunjSeal'; });
+    }
+    if (!needQys) {
+        columnsLast = columnsLast.filter(function (item) { return !['electronicSeal'].includes(item.key); });
+    }
+    return (React.createElement(React.Fragment, null,
+        React.createElement(Table, { columns: columnsLast, rowKey: "attachId", dataSource: records, scroll: { x: 'max-content' } })));
+};
+export default memo(DetailTable);

package/dist/components/business/Signatures/components/ElectronicSeal.d.ts

@@ -4,12 +4,10 @@
  */
 import React from 'react';
 interface IProps {
+    electronicList: any;
     value?: any;
     onChange?: any;
-    request?: any;
-    flowId: number;
-    deptId: any;
     isEdit: boolean;
 }
-declare const ElectronicSeal: React.FC<IProps>;
-export default ElectronicSeal;
+declare const _default: React.NamedExoticComponent<IProps>;
+export default _default;

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

@@ -2,67 +2,20 @@
  * @author 陈亚雄
  * @description
  */
-import React, { useEffect, useState } from 'react';
+import React, { memo } from 'react';
 // redux
 // ztxkui公共组件
-import { Checkbox, message } from '../../../../index';
+import { Checkbox } from '../../../../index';
 var ElectronicSeal = function (_a) {
-    var value = _a.value, onChange = _a.onChange, request = _a.request, flowId = _a.flowId, deptId = _a.deptId, isEdit = _a.isEdit;
-    var _b = useState([]), electronicList = _b[0], setElectronicList = _b[1];
-    useEffect(function () {
-        var params = {
-            deptId: deptId,
-            size: 200,
-        };
-        if (flowId) {
-            params.flowId = flowId;
-        }
-        request({
-            url: '/api/zmdms-resource/flowdeptseal/page',
-            params: params,
-            method: 'GET',
-        })
-            .then(function (res) {
-            var _a, _b, _c;
-            if (res.status === 200 && res.data.code === 200) {
-                // 当前部门和流程没查到数据时 调下面接口查所有的印章
-                if (((_a = res.data.data) === null || _a === void 0 ? void 0 : _a.records.length) === 0) {
-                    request({
-                        url: '/api/zmdms-resource/qyssealinfo/list',
-                        method: 'GET',
-                    })
-                        .then(function (res) {
-                        var _a, _b;
-                        if ((_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[0]) {
-                            var list = res.data.data.map(function (item) { return ({
-                                sealId: item.id,
-                                sealName: item.sealName,
-                            }); });
-                            setElectronicList(list);
-                        }
-                        else {
-                            message.error(res.data.msg || '出错了');
-                        }
-                    })
-                        .catch(function (error) {
-                        var _a, _b;
-                        message.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '请求失败！');
-                    });
-                }
-                setElectronicList((_c = (_b = res.data.data) === null || _b === void 0 ? void 0 : _b.records[0]) === null || _c === void 0 ? void 0 : _c.sealInfoList);
-            }
-            else {
-                message.error(res.data.msg || '出错了');
-            }
-        })
-            .catch(function (error) {
-            var _a, _b;
-            message.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '请求失败！');
-        });
-    }, [request, flowId, deptId]);
-    return (React.createElement(Checkbox.Group, { defaultValue: value, onChange: onChange, className: "flex-checkbox-group", disabled: !isEdit }, Array.isArray(electronicList) &&
-        electronicList.map(function (item) {
-            return (React.createElement(Checkbox, { key: item.sealId, value: item.sealId }, item.sealName));
-        })));
+    var electronicList = _a.electronicList, value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit;
+    return (React.createElement("div", { style: {
+            height: '100%',
+            overflowY: 'auto',
+            overflowX: 'hidden',
+        } },
+        React.createElement(Checkbox.Group, { defaultValue: value, onChange: onChange, className: "flex-checkbox-group", disabled: !isEdit }, Array.isArray(electronicList) &&
+            electronicList.map(function (item) {
+                return (React.createElement(Checkbox, { key: item.sealId, value: item.sealId }, item.sealName));
+            }))));
 };
-export default ElectronicSeal;
+export default memo(ElectronicSeal);

package/dist/components/business/Signatures/components/QunjSeal.d.ts

@@ -6,14 +6,12 @@ import React from 'react';
 interface IProps {
     value?: any;
     onChange?: any;
-    request?: any;
-    flowId: number;
-    caseId: string;
     ZT_API_BASEURL: string;
     isEdit: boolean;
-    isOnlyQunj: boolean;
     showContranctNum: boolean;
+    sealList: any;
     handleRef?: any;
+    querySealStatus?: () => void;
 }
 declare const QunjSeal: React.FC<IProps>;
 export default QunjSeal;

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

@@ -16,41 +16,17 @@ var __assign = (this && this.__assign) || function () {
 import React, { useEffect, useState } from 'react';
 // redux
 // ztxkui公共组件
-import { Form, Input, InputNumber, SearchContainer, Radio, Button, message, Checkbox, } from '../../../../index';
+import { Form, InputNumber, SearchContainer, Radio, Checkbox, } from '../../../../index';
 // 路由配置
 // store
 // 自定义组件
 import { SealCheckboxGroup } from './SealCheckbox';
-// 其他文件
-var SearchLeft = SearchContainer.SearchLeft, Item = SearchContainer.SearchItem;
+var Item = SearchContainer.SearchItem;
 var QunjSeal = function (_a) {
-    var value = _a.value, onChange = _a.onChange, request = _a.request, flowId = _a.flowId, caseId = _a.caseId, ZT_API_BASEURL = _a.ZT_API_BASEURL, isEdit = _a.isEdit, isOnlyQunj = _a.isOnlyQunj, showContranctNum = _a.showContranctNum, handleRef = _a.handleRef;
+    var value = _a.value, onChange = _a.onChange, ZT_API_BASEURL = _a.ZT_API_BASEURL, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, sealList = _a.sealList, handleRef = _a.handleRef, querySealStatus = _a.querySealStatus;
     var form = Form.useForm()[0];
     // 是否加盖群杰印章
-    var _b = useState(false), checked = _b[0], setChecked = _b[1];
-    var _c = useState([]), sealList = _c[0], setSealList = _c[1];
-    useEffect(function () {
-        request({
-            url: "/api/zmdms-resource/flowqjuse/query-qj-seal-list/" + flowId,
-            method: 'GET',
-        })
-            .then(function (res) {
-            var _a;
-            if (res.status === 200 && res.data.code === 200) {
-                setSealList((_a = res.data.data) === null || _a === void 0 ? void 0 : _a.map(function (item, index) { return ({
-                    sealName: item.sealName,
-                    sealNo: item.sealNo,
-                }); }));
-            }
-            else {
-                message.error(res.data.msg || '出错了');
-            }
-        })
-            .catch(function (error) {
-            var _a, _b;
-            message.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '请求失败！');
-        });
-    }, [request, flowId]);
+    var _b = useState(true), checked = _b[0], setChecked = _b[1];
     useEffect(function () {
         var _a;
         if (value) {
@@ -64,26 +40,34 @@ var QunjSeal = function (_a) {
             }
         }
     }, [value, form]);
-    /** 查询用印状态 */
-    var querySealStatus = function () {
-        var url = ZT_API_BASEURL + "/api/zmdms-esb-outer/outer/qj/view-stamp?caseId=" + caseId + "&systemId=1493475945847648257";
-        window.open(url);
-    };
     /** 是否加盖群杰印章 */
     var needQjSealFn = function (e) {
         if (!e.target.checked) {
-            form.resetFields();
+            form.setFieldsValue({
+                isTakeOut: 0,
+                details: [],
+            });
+            onChange && onChange({});
         }
         setChecked(e.target.checked);
     };
-    var onSealCheckboxHandle = function (sealList) {
+    var onSealCheckboxHandle = function (values) {
         form.setFieldsValue({
-            sealList: sealList,
+            values: values,
         });
     };
     var onValuesChangeHandle = function (value, allValues) {
-        onChange && onChange(allValues);
-        form.setFieldsValue(allValues);
+        var _a;
+        var result = allValues;
+        if (result &&
+            Object.keys(result).length === 1 &&
+            Object.keys(result)[0] === 'needQj' &&
+            Object.keys(result)[0]) {
+            result = __assign(__assign({}, result), { isTakeOut: 0, details: [], contranctNum: 1 });
+            (_a = handleRef === null || handleRef === void 0 ? void 0 : handleRef.current) === null || _a === void 0 ? void 0 : _a.getData('enable');
+        }
+        onChange && onChange(result);
+        form.setFieldsValue(result);
     };
     /** 渲染SealCheckboxGroup组件 */
     var getSealCheckboxGroupRender = function () {
@@ -92,42 +76,27 @@ var QunjSeal = function (_a) {
                 overflowY: 'auto',
                 overflowX: 'hidden',
             } },
-            React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, handleRef: handleRef, isEdit: isEdit, isOnlyQunj: isOnlyQunj, showContranctNum: showContranctNum })));
+            React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, handleRef: handleRef, isEdit: isEdit, showContranctNum: showContranctNum })));
     };
-    return isOnlyQunj ? (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle },
-        React.createElement(SearchContainer, null,
-            React.createElement(SearchLeft, null,
-                React.createElement("div", { style: {
-                        display: 'flex',
-                        justifyContent: 'space-between',
-                        width: '100%',
-                    } },
-                    React.createElement(Item, { name: "needQj", label: "", valuePropName: "checked", noBorder: true, width: "half" },
-                        React.createElement(Checkbox, { checked: checked, disabled: !isEdit, style: { marginTop: '8px' }, onChange: function (e) { return needQjSealFn(e); } }, "\u662F\u5426\u52A0\u76D6\u7FA4\u6770\u5370\u7AE0")),
-                    checked ? (React.createElement(React.Fragment, null,
-                        React.createElement(Item, { name: "isTakeOut", label: "", noBorder: true, width: "half" },
-                            React.createElement(Radio.Group, { style: { padding: '5px 6px' }, disabled: !isEdit },
-                                React.createElement(Radio, { value: 0 }, "\u5185\u90E8\u7528\u5370"),
-                                React.createElement(Radio, { value: 1 }, "\u5916\u90E8\u7528\u5370"))),
-                        React.createElement(Item, { name: "vertifyCode", label: "\u7FA4\u6770\u9A8C\u8BC1\u7801", width: "half" },
-                            React.createElement(Input, { disabled: true })),
-                        !!value.vertifyCode ? (React.createElement(Button, { type: "primary", size: "small", style: { margin: '8px 10px auto 0px' }, onClick: querySealStatus }, "\u67E5\u8BE2\u7528\u5370\u72B6\u6001")) : (''))) : (React.createElement(React.Fragment, null))),
-                checked ? (React.createElement(React.Fragment, null,
-                    showContranctNum ? (React.createElement(Item, { name: "contranctNum", label: "\u5408\u540C\u4EFD\u6570", width: "all" },
-                        React.createElement(InputNumber, { disabled: !isEdit, min: 0 }))) : (''),
-                    getSealCheckboxGroupRender())) : (React.createElement(React.Fragment, null)))))) : (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle },
-        React.createElement(Item, { name: "needQj", label: "", valuePropName: "checked", noBorder: true, width: "all" },
-            React.createElement(Checkbox, { checked: checked, disabled: !isEdit, style: { marginTop: '8px' }, onChange: function (e) { return needQjSealFn(e); } }, "\u662F\u5426\u52A0\u76D6\u7FA4\u6770\u5370\u7AE0")),
-        React.createElement(SearchContainer, null, checked ? (React.createElement(SearchLeft, null,
-            React.createElement(Item, { name: "vertifyCode", label: "\u7FA4\u6770\u9A8C\u8BC1\u7801", width: "all" },
-                React.createElement(Input, { disabled: true })),
-            showContranctNum ? (React.createElement(Item, { name: "contranctNum", label: "\u5408\u540C\u4EFD\u6570", width: "all" },
-                React.createElement(InputNumber, { disabled: !isEdit, min: 0 }))) : (''),
-            !!value.vertifyCode ? (React.createElement(Button, { type: "primary", size: "small", style: { marginLeft: '6px' }, onClick: querySealStatus }, "\u67E5\u8BE2\u7528\u5370\u72B6\u6001")) : (''),
-            React.createElement(Item, { name: "isTakeOut", label: "", noBorder: true, width: "all" },
-                React.createElement(Radio.Group, { style: { padding: '0 6px' }, disabled: !isEdit },
-                    React.createElement(Radio, { value: 0 }, "\u5185\u90E8\u7528\u5370"),
-                    React.createElement(Radio, { value: 1 }, "\u5916\u90E8\u7528\u5370"))),
-            getSealCheckboxGroupRender())) : (React.createElement(React.Fragment, null)))));
+    return (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle },
+        React.createElement(Item, { name: "needQj", valuePropName: "checked", noBorder: true, width: "all" },
+            React.createElement(Checkbox, { checked: checked, disabled: !isEdit, style: { marginTop: '8px' }, onChange: function (e) { return needQjSealFn(e); } }, "\u7FA4\u6770\u5370\u7AE0-\u7528\u5370\u7533\u8BF7")),
+        checked ? (React.createElement(React.Fragment, null,
+            React.createElement("div", { style: {
+                    display: 'flex',
+                    justifyContent: 'space-between',
+                    height: '36px',
+                    borderBottom: '1px solid #EBEBEB',
+                    marginBottom: '5px',
+                } },
+                React.createElement(Item, { name: "isTakeOut", label: "", noBorder: true, width: "halfAll" },
+                    React.createElement(Radio.Group, { style: { width: '40%' }, disabled: !isEdit },
+                        React.createElement(Radio, { value: 0 }, "\u5185\u90E8\u7528\u5370"),
+                        React.createElement(Radio, { value: 1 }, "\u5916\u90E8\u7528\u5370"))),
+                showContranctNum ? (React.createElement("div", { style: { display: 'flex', lineHeight: '32px' } },
+                    React.createElement(Item, { name: "contranctNum", label: "\u5408\u540C\u4EFD\u6570", width: "all", colon: false },
+                        React.createElement(InputNumber, { disabled: !isEdit, size: "small", min: 0, style: { width: '60px' } })),
+                    React.createElement("div", { style: { margin: 'auto 42px auto 16px' } }, "\u4EFD"))) : ('')),
+            getSealCheckboxGroupRender())) : (React.createElement(React.Fragment, null))));
 };
 export default QunjSeal;

package/dist/components/business/Signatures/components/SealCheckbox.d.ts

@@ -10,7 +10,6 @@ interface IProps {
     showContranctNum: boolean;
     value?: any;
     onChange?: any;
-    isOnlyQunj?: boolean;
     handleRef?: any;
 }
 declare const SealCheckbox: React.FC<IProps>;
@@ -26,7 +25,6 @@ interface ISealProps {
     handleRef?: any;
     isEdit: boolean;
     showContranctNum: boolean;
-    isOnlyQunj?: boolean;
 }
 declare const SealCheckboxGroup: React.FC<ISealProps>;
 export { SealCheckboxGroup };

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

@@ -22,10 +22,11 @@ import React from 'react';
 import sumBy from 'lodash/sumBy';
 // redux
 // ztxkui公共组件
-import { Checkbox, InputNumber } from '../../../../index';
+import { Checkbox, InputNumber, SearchContainer } from '../../../../index';
 import { message } from 'antd';
+var Item = SearchContainer.SearchItem;
 var SealCheckbox = function (_a) {
-    var name = _a.name, id = _a.id, value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, isOnlyQunj = _a.isOnlyQunj, handleRef = _a.handleRef;
+    var name = _a.name, id = _a.id, value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, handleRef = _a.handleRef;
     var onCheckboxChange = function (e) {
         onChange &&
             onChange(__assign(__assign({}, (value || {})), { sealName: e.target.checked ? name : null, sealNo: e.target.checked ? id : null }));
@@ -34,14 +35,14 @@ var SealCheckbox = function (_a) {
         var _a, _b;
         var contractNum = (_b = (_a = handleRef === null || handleRef === void 0 ? void 0 : handleRef.current) === null || _a === void 0 ? void 0 : _a.getData().qunjSeal) === null || _b === void 0 ? void 0 : _b.contranctNum;
         var num = count;
-        if (count < 0) {
-            num = 0;
+        if (count < 1) {
+            num = 1;
         }
-        if (!contractNum && showContranctNum) {
+        if (typeof contractNum !== 'number' && showContranctNum && onChange) {
             message.info('请输入合同份数！');
             num = null;
         }
-        if (typeof num !== 'number') {
+        if (typeof num !== 'number' && value) {
             Reflect.deleteProperty(value, 'sealCount');
         }
         var info = __assign(__assign({}, (value || {})), (typeof num === 'number' ? { sealCount: num } : {}));
@@ -50,14 +51,22 @@ var SealCheckbox = function (_a) {
         }
         onChange && onChange(info, 'sealCount');
     };
-    return (React.createElement("div", { style: __assign({ padding: '6px' }, (isOnlyQunj ? { display: 'flex' } : {})) },
+    return (React.createElement("div", { style: {
+            display: 'flex',
+            justifyContent: 'space-between',
+            height: '32px',
+        } },
         React.createElement(Checkbox, { onChange: onCheckboxChange, checked: value && value.sealNo ? true : false, disabled: !isEdit, style: { width: '40%' } }, name),
-        React.createElement("div", null,
-            React.createElement("span", null, "\u7528\u5370\u6B21\u6570\uFF1A"),
-            React.createElement(InputNumber, { bordered: false, disabled: !isEdit, min: 0, size: "small", value: typeof (value === null || value === void 0 ? void 0 : value.sealCount) === 'number' ? value === null || value === void 0 ? void 0 : value.sealCount : undefined, onChange: onNumberChange, style: { borderBottom: '1px solid #e9ecf3' } }))));
+        React.createElement("div", { style: { display: 'flex', lineHeight: '32px' } },
+            React.createElement("div", { style: { marginRight: '5px' } }, "\u7528\u5370"),
+            React.createElement(Item, { noLabel: true, width: "half" },
+                React.createElement(InputNumber, { disabled: !isEdit, min: 1, size: "small", value: typeof (value === null || value === void 0 ? void 0 : value.sealCount) === 'number'
+                        ? value === null || value === void 0 ? void 0 : value.sealCount
+                        : undefined, onChange: onNumberChange, style: { width: '60px' } })),
+            React.createElement("div", { style: { marginLeft: '50px' } }, "\u6B21"))));
 };
 var SealCheckboxGroup = function (_a) {
-    var value = _a.value, onChange = _a.onChange, sealList = _a.sealList, handleRef = _a.handleRef, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, isOnlyQunj = _a.isOnlyQunj;
+    var value = _a.value, onChange = _a.onChange, sealList = _a.sealList, handleRef = _a.handleRef, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum;
     var onChangeHandle = function (_value, index, sealNo, type) {
         var _a, _b, _c, _d;
         var contractNum = (_b = (_a = handleRef === null || handleRef === void 0 ? void 0 : handleRef.current) === null || _a === void 0 ? void 0 : _a.getData().qunjSeal) === null || _b === void 0 ? void 0 : _b.contranctNum;
@@ -81,7 +90,7 @@ var SealCheckboxGroup = function (_a) {
         }
         var totalSealNum = sumBy(valueArr, 'sealCount');
         onChange && onChange(valueArr);
-        if (contractNum) {
+        if (typeof contractNum === 'number') {
             if (totalSealNum > contractNum * 4) {
                 (_c = handleRef === null || handleRef === void 0 ? void 0 : handleRef.current) === null || _c === void 0 ? void 0 : _c.getData('4');
                 message.warning('您的用印次数远超超过合理次数范围，请修改。');
@@ -106,7 +115,7 @@ var SealCheckboxGroup = function (_a) {
             if (Array.isArray(value)) {
                 itemValue = value.find(function (valueItem) { return valueItem.sealNo === item.sealNo; });
             }
-            return (React.createElement(SealCheckbox, { key: item === null || item === void 0 ? void 0 : item.sealNo, name: item === null || item === void 0 ? void 0 : item.sealName, id: item === null || item === void 0 ? void 0 : item.sealNo, value: itemValue, isEdit: isEdit, isOnlyQunj: isOnlyQunj, showContranctNum: showContranctNum, handleRef: handleRef, onChange: function (value, type) {
+            return (React.createElement(SealCheckbox, { key: item === null || item === void 0 ? void 0 : item.sealNo, name: item === null || item === void 0 ? void 0 : item.sealName, id: item === null || item === void 0 ? void 0 : item.sealNo, value: itemValue, isEdit: isEdit, showContranctNum: showContranctNum, handleRef: handleRef, onChange: function (value, type) {
                     onChangeHandle(value, index, item.sealNo, type);
                 } }));
         })));

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

@@ -13,6 +13,6 @@ var TemplateAttach = function (_a) {
         React.createElement("div", null,
             React.createElement(Button, { type: "link", disabled: !isEdit, onClick: function () {
                     openCustomerModalHandle && openCustomerModalHandle(index);
-                } }, "\u9009\u62E9\u5BA2\u6237\u6837\u677F"))));
+                } }, "\u9009\u62E9\u6BD4\u5BF9\u6A21\u7248"))));
 };
 export default TemplateAttach;

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

@@ -9,6 +9,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 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];
@@ -21,7 +32,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 import React, { useImperativeHandle, useCallback, useState, useMemo, useEffect, } from 'react';
 // redux
 // ztxkui公共组件
-import { Table, Upload, message, Checkbox, Button } from '../../../index';
+import { Table, Upload, message, Button, Modal } from '../../../index';
+import { Switch } from 'antd';
 // 路由配置
 // store
 // 自定义组件
@@ -30,6 +42,7 @@ import TemplateAttach from './components/TemplateAttach';
 import CompareResult from './components/CompareResult';
 import QunjSeal from './components/QunjSeal';
 import ElectronicSeal from './components/ElectronicSeal';
+import DetailTable from './components/DetailTable';
 import { useRecords, useQunjData, useElectronicData } from './hooks';
 /** 需要存样板合同类型 采购合同 销售合同 双边合同 */
 var NEED_SAVE_TEMPLATE = [
@@ -44,14 +57,26 @@ var FLOW_IDS = [
     'scm_order_contract_sbht',
     'scm_order_contract_bjjyht',
 ];
+/** 流程状态 */
+var FLOW_STATUS = {
+    10: '草稿',
+    15: '审批中',
+    20: '已驳回',
+    50: '已生效',
+    60: '收货完成',
+    70: '结算完成',
+    9: '已作废',
+    99: '同步失败', // APPROVE_FAIL
+};
 /**
  * TodoList
  * 实现可以上传文件，删除列
  * 实现受控，接收一个附件列表
  */
 var Sinatures = function (_a) {
-    var needQj = _a.needQj, needDg = _a.needDg, needQys = _a.needQys, isUpload = _a.isUpload, fileList = _a.fileList, qunjSeal = _a.qunjSeal, qunjSealChange = _a.qunjSealChange, electronicSeal = _a.electronicSealIdList, electronicSealChange = _a.electronicSealChange, onSigValuesChange = _a.onSigValuesChange, handleRef = _a.handleRef, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, systemCode = _a.systemCode, token = _a.token, openCustomerModalHandle = _a.openCustomerModalHandle, request = _a.request, flowId = _a.flowId, deptId = _a.deptId, canEdit = _a.canEdit, flowStatus = _a.flowStatus, caseId = _a.caseId, contract_id = _a.contractId, docAttachMap = _a.docAttachMap, checkAttachIdList = _a.checkAttachIdList, // 已盖章附件id
-    documentIdList = _a.documentIdList;
+    var isUpload = _a.isUpload, qunjSealChange = _a.qunjSealChange, electronicSealChange = _a.electronicSealChange, onSigValuesChange = _a.onSigValuesChange, handleRef = _a.handleRef, ZT_API_BASEURL = _a.ZT_API_BASEURL, ZT_FILE_BASEURL = _a.ZT_FILE_BASEURL, systemCode = _a.systemCode, token = _a.token, openCustomerModalHandle = _a.openCustomerModalHandle, request = _a.request, otherParams = __rest(_a, ["isUpload", "qunjSealChange", "electronicSealChange", "onSigValuesChange", "handleRef", "ZT_API_BASEURL", "ZT_FILE_BASEURL", "systemCode", "token", "openCustomerModalHandle", "request"]);
+    var canEdit = otherParams.canEdit, needQj = otherParams.needQj, needDg = otherParams.needDg, needQys = otherParams.needQys, fileList = otherParams.fileList, qunjSeal = otherParams.qunjSeal, electronicSeal = otherParams.electronicSealIdList, flowId = otherParams.flowId, deptId = otherParams.deptId, flowStatus = otherParams.flowStatus, caseId = otherParams.caseId, contract_id = otherParams.contractId, docAttachMap = otherParams.docAttachMap, checkAttachIdList = otherParams.checkAttachIdList, // 已盖章附件id
+    documentIdList = otherParams.documentIdList;
     var authToken = token || '';
     // 是否可编辑 1可编辑  0不可编辑
     var isEdit = canEdit === 1;
@@ -75,10 +100,96 @@ var Sinatures = function (_a) {
     var _j = useState(documentIdList), documentIds = _j[0], setDocumentIds = _j[1];
     // 总用印次数超过4倍
     var _k = useState(false), isTotalSealNumTooMore = _k[0], setIsTotalSealNumTooMore = _k[1];
-    // 单独使用群杰章
-    var isOnlyQunj = !!needQj && !needDg && !needQys;
     // 采购合同 销售合同 双边合同 部门间交易合同 需要展示合同份数 其他的不需要
     var showContranctNum = FLOW_IDS.includes("" + flowId);
+    // 电子印章列表
+    var _l = useState([]), electronicList = _l[0], setElectronicList = _l[1];
+    // 群杰印章列表
+    var _m = useState([]), sealList = _m[0], setSealList = _m[1];
+    // 上一次盖章时的参数信息
+    var _o = useState({}), prevParam = _o[0], setPrevParam = _o[1];
+    // 请确认
+    var _p = useState(false), isSure = _p[0], setIsSure = _p[1];
+    /** 查询用印状态 */
+    var querySealStatus = function () {
+        var url = ZT_API_BASEURL + "/api/zmdms-esb-outer/outer/qj/view-stamp?caseId=" + caseId + "&systemId=1493475945847648257";
+        window.open(url);
+    };
+    /** 获取电子印章列表 */
+    var getElectronicList = useCallback(function () {
+        var params = {
+            deptId: deptId,
+            size: 200,
+        };
+        if (flowId) {
+            params.flowId = flowId;
+        }
+        request({
+            url: '/api/zmdms-resource/flowdeptseal/page',
+            params: params,
+            method: 'GET',
+        })
+            .then(function (res) {
+            var _a, _b, _c;
+            if (res.status === 200 && res.data.code === 200) {
+                // 当前部门和流程没查到数据时 调下面接口查所有的印章
+                if (((_a = res.data.data) === null || _a === void 0 ? void 0 : _a.records.length) === 0) {
+                    request({
+                        url: '/api/zmdms-resource/qyssealinfo/list',
+                        method: 'GET',
+                    })
+                        .then(function (res) {
+                        var _a, _b;
+                        if ((_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[0]) {
+                            var list = res.data.data.map(function (item) { return ({
+                                sealId: item.id,
+                                sealName: item.sealName,
+                            }); });
+                            setElectronicList(list);
+                        }
+                        else {
+                            message.error(res.data.msg || '出错了');
+                        }
+                    })
+                        .catch(function (error) {
+                        var _a, _b;
+                        message.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '请求失败！');
+                    });
+                }
+                setElectronicList((_c = (_b = res.data.data) === null || _b === void 0 ? void 0 : _b.records[0]) === null || _c === void 0 ? void 0 : _c.sealInfoList);
+            }
+            else {
+                message.error(res.data.msg || '出错了');
+            }
+        })
+            .catch(function (error) {
+            var _a, _b;
+            message.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '请求失败！');
+        });
+    }, [deptId, flowId, request]);
+    /** 获取群杰印章列表 */
+    var getQunjSealList = useCallback(function () {
+        request({
+            url: "/api/zmdms-resource/flowqjuse/query-qj-seal-list/" + flowId,
+            method: 'GET',
+        })
+            .then(function (res) {
+            var _a;
+            if (res.status === 200 && res.data.code === 200) {
+                setSealList((_a = res.data.data) === null || _a === void 0 ? void 0 : _a.map(function (item, index) { return ({
+                    sealName: item.sealName,
+                    sealNo: item.sealNo,
+                }); }));
+            }
+            else {
+                message.error(res.data.msg || '出错了');
+            }
+        })
+            .catch(function (error) {
+            var _a, _b;
+            message.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '请求失败！');
+        });
+    }, [flowId, request]);
     useEffect(function () {
         // 判断入参fileList中是否有已勾选电子印章的元素
         if (Array.isArray(fileList) &&
@@ -86,34 +197,21 @@ var Sinatures = function (_a) {
             setCheckSealVisible(true);
         }
     }, [fileList]);
+    useEffect(function () {
+        if (needQys) {
+            getElectronicList();
+        }
+        if (needQj) {
+            getQunjSealList();
+        }
+    }, [getElectronicList, getQunjSealList, needQj, needQys]);
     /** 获取taskId */
     var getTaskId = function (id, index) {
         handleRef.current.setTemplateData({
             taskId: id,
         }, index);
     };
-    /** 下载水印附件 */
-    var downFileFn = function (_record) {
-        var xhr = new XMLHttpRequest();
-        xhr.open('GET', ZT_API_BASEURL + "/api/zmdms-resource/seal/download-watermark-attach/" + (_record === null || _record === void 0 ? void 0 : _record.attachId) + "?Zmdms-Auth=bearer " + token, true);
-        xhr.responseType = 'blob';
-        xhr.onload = function () {
-            var _a;
-            if (xhr.status === 200 || xhr.status === 201) {
-                var link = document.createElement('a');
-                link.href = window.URL.createObjectURL(xhr.response);
-                link.download = ((_a = _record === null || _record === void 0 ? void 0 : _record.attachName) === null || _a === void 0 ? void 0 : _a.split('.')[0]) + ".pdf";
-                // fix Firefox
-                link.style.display = 'none';
-                document.body.appendChild(link);
-                link.click();
-                document.body.removeChild(link);
-                window.URL.revokeObjectURL(link.href);
-            }
-        };
-        xhr.send();
-    };
-    /** 确认盖章 */
+    /** 指定签署位置 */
     var checkSealFn = function () {
         // 已勾选的要加盖电子印章的附件id列表
         var checkedElecSealIds = records
@@ -148,9 +246,11 @@ var Sinatures = function (_a) {
                 params.deleteAttachIdList.push(n);
             }
         });
+        setPrevParam(params);
         request({
             url: '/api/zmdms-resource/seal/confirm-seal-info',
             method: 'POST',
+            timeout: 90000,
             data: params,
         })
             .then(function (res) {
@@ -214,98 +314,143 @@ var Sinatures = function (_a) {
             render: function (text, record, index) { return "" + (index + 1); },
         },
         {
-            title: '附件类型',
-            key: 'attachTypeName',
-            dataIndex: 'attachTypeName',
+            title: '附件',
+            children: [
+                {
+                    title: '类型',
+                    key: 'attachTypeName',
+                    dataIndex: 'attachTypeName',
+                    width: 100,
+                },
+                {
+                    title: function () {
+                        return (React.createElement("div", { className: "seal-file-upload" },
+                            React.createElement("span", null, "\u540D\u79F0"),
+                            React.createElement("span", null, isUpload && (React.createElement(Upload, { apiBaseUrl: ZT_API_BASEURL, method: "post", showTable: false, showTip: false, headers: {
+                                    'Zmdms-Auth': authToken,
+                                }, data: uploadData, authToken: authToken, callback: uploadCallbackFn, originFileList: originFileList, style: { margin: 0 } },
+                                React.createElement(Button, { type: "link" }, "\u6DFB\u52A0\u9644\u4EF6"))))));
+                    },
+                    key: 'attachId',
+                    dataIndex: 'attachId',
+                    width: 240,
+                    render: function (text, record, index) {
+                        return (React.createElement(React.Fragment, null,
+                            React.createElement(AttachOperation, { ZT_API_BASEURL: ZT_API_BASEURL, ZT_FILE_BASEURL: ZT_FILE_BASEURL, token: authToken, attachId: record === null || record === void 0 ? void 0 : record.attachId, attachName: record === null || record === void 0 ? void 0 : record.attachName, attachSize: record === null || record === void 0 ? void 0 : record.attachSize })));
+                    },
+                },
+            ],
         },
         {
-            title: function () {
-                return (React.createElement("div", { className: "seal-file-upload" },
-                    React.createElement("span", null, "\u9644\u4EF6"),
-                    React.createElement("span", null, isUpload && (React.createElement(Upload, { apiBaseUrl: ZT_API_BASEURL, method: "post", showTable: false, showTip: false, headers: {
-                            'Zmdms-Auth': authToken,
-                        }, data: uploadData, authToken: authToken, callback: uploadCallbackFn, originFileList: originFileList, style: { margin: 0 } },
-                        React.createElement(Button, { type: "link" }, "\u6DFB\u52A0\u9644\u4EF6"))))));
-            },
-            key: 'attachId',
-            dataIndex: 'attachId',
-            render: function (text, record, index) {
-                return (React.createElement(React.Fragment, null,
-                    React.createElement(AttachOperation, { ZT_API_BASEURL: ZT_API_BASEURL, ZT_FILE_BASEURL: ZT_FILE_BASEURL, token: authToken, attachId: record === null || record === void 0 ? void 0 : record.attachId, attachName: record === null || record === void 0 ? void 0 : record.attachName, attachSize: record === null || record === void 0 ? void 0 : record.attachSize }),
-                    NEED_SAVE_TEMPLATE.includes("" + flowId) ? (React.createElement(Checkbox, { checked: record.isCustomerReference, disabled: !isEdit, onChange: function (e) {
-                            return onCheckboxChangeHandle(e, 'isCustomerReference', index);
-                        } }, "\u5B58\u6837\u677F")) : ('')));
-            },
+            title: '合同',
+            key: 'needDg',
+            dataIndex: 'needDg',
+            children: [
+                {
+                    title: '合同比对模板',
+                    key: 'templateAttachId',
+                    dataIndex: 'templateAttachId',
+                    width: 160,
+                    render: function (text, record, index) {
+                        return record.attachTypeName === '合同本身' ? (React.createElement(TemplateAttach, { record: record, index: index, openCustomerModalHandle: openCustomerModalHandle, isEdit: isEdit })) : ('');
+                    },
+                },
+                {
+                    title: '合同比对结果',
+                    key: 'compareAttachId',
+                    dataIndex: 'compareAttachId',
+                    width: 100,
+                    render: function (text, record, index) {
+                        return record.attachTypeName === '合同本身' ? (React.createElement(CompareResult, { record: record, index: index, request: request, getTaskId: getTaskId, isEdit: isEdit })) : ('');
+                    },
+                },
+                {
+                    title: '保存为模版',
+                    key: 'templateAttachId',
+                    dataIndex: 'templateAttachId',
+                    width: 80,
+                    render: function (text, record, index) {
+                        return NEED_SAVE_TEMPLATE.includes("" + flowId) ? (React.createElement(Switch, { checked: record.isCustomerReference, disabled: !isEdit, onChange: function (value) {
+                                return onSwitchChangeHandle(value, 'isCustomerReference', index);
+                            } })) : ('');
+                    },
+                },
+            ],
         },
         {
-            title: '合同模板',
-            key: 'templateAttachId',
-            dataIndex: 'templateAttachId',
-            width: 220,
-            render: function (text, record, index) {
-                return record.attachTypeName === '合同本身' ? (React.createElement(TemplateAttach, { record: record, index: index, openCustomerModalHandle: openCustomerModalHandle, isEdit: isEdit })) : ('');
-            },
-        },
-        {
-            title: '合同比对结果',
-            key: 'compareAttachId',
-            dataIndex: 'compareAttachId',
-            width: 100,
-            render: function (text, record, index) {
-                return record.attachTypeName === '合同本身' ? (React.createElement(CompareResult, { record: record, index: index, request: request, getTaskId: getTaskId, isEdit: isEdit })) : ('');
-            },
-        },
-        {
-            title: function () {
-                return (React.createElement(React.Fragment, null,
-                    React.createElement("div", null, "\u52A0\u76D6\u7535\u5B50\u5370\u7AE0"),
-                    records.length !== 0 && (React.createElement("div", null,
-                        React.createElement("div", null,
-                            React.createElement(Button, { type: "link", style: __assign({}, (checkSealVisible && isEdit
-                                    ? {}
-                                    : { display: 'none' })), size: "small", onClick: checkSealFn }, "\u786E\u8BA4\u76D6\u7AE0")),
-                        React.createElement("div", null,
-                            React.createElement(Button, { type: "link", style: __assign({}, (contractId || contract_id ? {} : { display: 'none' })), size: "small", onClick: viewSealPageFn }, "\u67E5\u770B\u76D6\u7AE0\u9875\u9762"))))));
-            },
-            key: 'isElectronicSeal',
-            dataIndex: 'isElectronicSeal',
-            render: function (text, record, index) {
-                return (React.createElement(Checkbox, { checked: text, disabled: !isEdit, onChange: function (e) {
-                        return onCheckboxChangeHandle(e, 'isElectronicSeal', index);
-                    } }, "\u662F"));
-            },
-        },
-        {
-            title: '添加水印',
+            title: isEdit ? '添加水印' : '水印',
             key: 'isWatermark',
             dataIndex: 'isWatermark',
-            width: 100,
+            width: 60,
             render: function (text, record, index) {
-                return (React.createElement(React.Fragment, null,
-                    React.createElement(Checkbox, { checked: text, disabled: !isEdit, onChange: function (e) { return onCheckboxChangeHandle(e, 'isWatermark', index); } }, "\u662F"),
-                    !isEdit && (React.createElement(Button, { type: "link", onClick: function () { return downFileFn(record); } }, "\u4E0B\u8F7D\u6C34\u5370\u9644\u4EF6"))));
+                return (React.createElement(Switch, { checked: text, disabled: !isEdit, onChange: function (value) {
+                        return onSwitchChangeHandle(value, 'isWatermark', index);
+                    } }));
             },
         },
         {
             title: '电子印章',
-            key: 'electronicSeal',
-            dataIndex: 'electronicSeal',
-            render: function (value, row, index) {
-                var obj = {
-                    children: (React.createElement(ElectronicSeal, { value: electronicSeal, request: request, flowId: flowId, deptId: deptId, onChange: electronicSealChangeHandle, isEdit: isEdit })),
-                    props: {},
-                };
-                obj.props['rowSpan'] = index === 0 ? records.length : 0;
-                return obj;
-            },
+            key: 'needQys',
+            dataIndex: 'needQys',
+            children: [
+                {
+                    title: '盖电子印章',
+                    key: 'isElectronicSeal',
+                    dataIndex: 'isElectronicSeal',
+                    width: 80,
+                    render: function (text, record, index) {
+                        return (React.createElement(Switch, { checked: text, disabled: !isEdit, onChange: function (value) {
+                                return onSwitchChangeHandle(value, 'isElectronicSeal', index);
+                            } }));
+                    },
+                },
+                {
+                    title: '选择电子印章',
+                    key: 'electronicSeal',
+                    dataIndex: 'electronicSeal',
+                    width: '20%',
+                    render: function (value, row, index) {
+                        // 是否有勾选加盖电子印章
+                        var hasElectronicSeal = records === null || records === void 0 ? void 0 : records.some(function (item) { return !!item.isElectronicSeal; });
+                        var obj = {
+                            children: (React.createElement(ElectronicSeal, { value: electronicSeal, onChange: electronicSealChangeHandle, isEdit: hasElectronicSeal && isEdit, electronicList: electronicList })),
+                            props: {},
+                        };
+                        obj.props['rowSpan'] = index === 0 ? records.length : 0;
+                        return obj;
+                    },
+                },
+                {
+                    title: '电子印章设置',
+                    key: 'setElectronicSeal',
+                    dataIndex: 'setElectronicSeal',
+                    width: 95,
+                    render: function (value, row, index) {
+                        var Comp = function () {
+                            return records.length !== 0 ? (React.createElement("div", { style: { height: '100%', paddingTop: '23px' } },
+                                React.createElement(Button, { type: "link", style: __assign({}, (checkSealVisible && isEdit
+                                        ? {}
+                                        : { display: 'none' })), size: "small", 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));
+                        };
+                        var obj = {
+                            children: React.createElement(Comp, null),
+                            props: {},
+                        };
+                        obj.props['rowSpan'] = index === 0 ? records.length : 0;
+                        return obj;
+                    },
+                },
+            ],
         },
         {
             title: '群杰印章',
             key: 'qunjSeal',
             dataIndex: 'qunjSeal',
+            width: 240,
             render: function (value, row, index) {
                 var obj = {
-                    children: (React.createElement(QunjSeal, { value: qunjSeal, onChange: qunjSealChangeHandle, request: request, flowId: flowId, caseId: caseId, ZT_API_BASEURL: ZT_API_BASEURL, isEdit: isEdit, handleRef: handleRef, isOnlyQunj: isOnlyQunj, showContranctNum: showContranctNum })),
+                    children: (React.createElement(QunjSeal, { value: qunjSeal, onChange: qunjSealChangeHandle, querySealStatus: querySealStatus, ZT_API_BASEURL: ZT_API_BASEURL, isEdit: isEdit, handleRef: handleRef, showContranctNum: showContranctNum, sealList: sealList })),
                     props: {},
                 };
                 obj.props['rowSpan'] = index === 0 ? records.length : 0;
@@ -322,52 +467,40 @@ var Sinatures = function (_a) {
         columnsLast = columnsLast.filter(function (item) { return !['attachTypeName'].includes(item.key); });
     }
     if (!needDg) {
-        columnsLast = columnsLast.filter(function (item) {
-            return !['attachTypeName', 'templateAttachId', 'compareAttachId'].includes(item.key);
-        });
+        columnsLast = columnsLast.filter(function (item) { return !['needDg'].includes(item.key); });
     }
     if (!needQys) {
-        columnsLast = columnsLast.filter(function (item) {
-            return !['isWatermark', 'isElectronicSeal', 'electronicSeal'].includes(item.key);
-        });
+        columnsLast = columnsLast.filter(function (item) { return !['isWatermark', 'needQys'].includes(item.key); });
     }
     // 上传组件的数据
-    var _l = useState(), originFileList = _l[0], setOriginFileList = _l[1];
+    var _q = useState(), originFileList = _q[0], setOriginFileList = _q[1];
     /** 签章组件onChange事件 */
     var sigValuesChange = function (type, value) {
         var _a, _b;
         var info = (_b = (_a = handleRef === null || handleRef === void 0 ? void 0 : handleRef.current) === null || _a === void 0 ? void 0 : _a.getData) === null || _b === void 0 ? void 0 : _b.call(_a);
         Reflect.deleteProperty(info, type);
         info[type] = value;
-        return info;
+        return __assign(__assign({}, otherParams), info);
     };
     // 是否存入样板 添加水印 电子印章发生改变触发事件
-    function onCheckboxChangeHandle(e, type, index) {
+    function onSwitchChangeHandle(value, type, index) {
         if (type === 'isElectronicSeal') {
             var hasElecSeal = records.filter(function (item) { return item.isElectronicSeal; });
             // 勾选加盖电子印章后 显示确认盖章按钮
-            setCheckSealVisible(e.target.checked ? true : hasElecSeal.length > 1 ? true : false);
+            setCheckSealVisible(value ? true : hasElecSeal.length > 1 ? true : false);
+            // 去除加盖电子印章勾选时  清除合同id 等之前的信息
+            if (!value) {
+                setSealedIds(__spreadArray([], sealedIds));
+                setContractId('');
+                setAttachMap(null);
+                setDocumentIds([]);
+            }
         }
         setRecords(function (preRecords) {
             var _a;
             var newRecords = preRecords.slice();
-            // 勾选添加水印的前提 需要勾选加盖电子印章
-            // if (type === 'isWatermark' && !newRecords[index].isElectronicSeal) {
-            //   message.info('请先选择是否加盖电子印章！');
-            //   return newRecords;
-            // }
-            // 取消勾选电子印章时 不可添加水印
-            // if (type === 'isElectronicSeal' && !e.target.checked) {
-            //   newRecords.splice(index, 1, {
-            //     ...newRecords[index],
-            //     isWatermark: 0,
-            //     [type]: 0,
-            //   });
-            //   return newRecords;
-            // }
-            newRecords.splice(index, 1, __assign(__assign({}, newRecords[index]), (_a = {}, _a[type] = e.target.checked ? 1 : 0, _a)));
-            onSigValuesChange &&
-                onSigValuesChange(sigValuesChange('fileList', newRecords));
+            newRecords.splice(index, 1, __assign(__assign({}, newRecords[index]), (_a = {}, _a[type] = value ? 1 : 0, _a)));
+            onSigValuesChange(sigValuesChange('fileList', newRecords));
             return newRecords;
         });
     }
@@ -403,14 +536,14 @@ var Sinatures = function (_a) {
     function qunjSealChangeHandle(value) {
         qunjSealChange && qunjSealChange(value);
         setQunjSeal(value);
-        onSigValuesChange && onSigValuesChange(sigValuesChange('qunjSeal', value));
+        onSigValuesChange(sigValuesChange('qunjSeal', value));
     }
     /** 电子印章修改 */
     function electronicSealChangeHandle(value) {
         electronicSealChange && electronicSealChange(value);
         setElectronicSeal(value);
-        onSigValuesChange &&
-            onSigValuesChange(sigValuesChange('electronicSealIdList', value));
+        onSigValuesChange(sigValuesChange('electronicSealIdList', value));
+        isSure && setIsSure(false);
     }
     /**
      * 暴露方法给外部调用
@@ -445,7 +578,25 @@ var Sinatures = function (_a) {
         },
         /** 签章组件相关校验 */
         validateSealFn: function () {
-            var _a;
+            var _a, _b;
+            // 确认盖章后 勾选的信息有更改
+            if (needQys &&
+                ((_a = prevParam === null || prevParam === void 0 ? void 0 : prevParam.sealIdList) === null || _a === void 0 ? void 0 : _a.length) !== (innerElectronicSeal === null || innerElectronicSeal === void 0 ? void 0 : innerElectronicSeal.length) &&
+                !isSure) {
+                Modal.confirm({
+                    title: '当前所勾选的电子印章信息与上一次盖章时有差异，请确认是否继续？',
+                    okText: '是',
+                    okType: 'danger',
+                    cancelText: '否',
+                    onOk: function () {
+                        setIsSure(true);
+                    },
+                    onCancel: function () {
+                        setIsSure(false);
+                    },
+                });
+                return false;
+            }
             // 是否有勾选加盖电子印章
             var hasElectronicSeal = records === null || records === void 0 ? void 0 : records.some(function (item) { return !!item.isElectronicSeal; });
             // 勾选加盖电子印章时未勾选电子印章
@@ -470,7 +621,7 @@ var Sinatures = function (_a) {
                     return false;
                 }
                 // 勾选的群杰印章 没有填用印次数
-                if (((_a = innerQunjSeal === null || innerQunjSeal === void 0 ? void 0 : innerQunjSeal.details) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                if (((_b = innerQunjSeal === null || innerQunjSeal === void 0 ? void 0 : innerQunjSeal.details) === null || _b === void 0 ? void 0 : _b.length) > 0) {
                     innerQunjSeal.details.forEach(function (item) {
                         if (!item.sealCount) {
                             message.warning("\u8BF7\u586B\u5199" + item.sealName + " \u7684\u7528\u5370\u6B21\u6570\uFF01");
@@ -488,7 +639,22 @@ var Sinatures = function (_a) {
             return true;
         },
     }); });
-    return (React.createElement(React.Fragment, null,
-        React.createElement(Table, { columns: columnsLast, rowKey: "attachId", dataSource: records, scroll: { x: true } })));
+    var detail = {
+        contractId: contract_id,
+        records: records,
+        electronicSealIdList: electronicSeal,
+        qunjSeal: qunjSeal,
+        ZT_API_BASEURL: ZT_API_BASEURL,
+        ZT_FILE_BASEURL: ZT_FILE_BASEURL,
+        token: token,
+        viewSealPageFn: viewSealPageFn,
+        electronicList: electronicList,
+        sealList: sealList,
+        querySealStatus: querySealStatus,
+        flow_status: FLOW_STATUS[flowStatus],
+        needQj: needQj,
+        needQys: needQys,
+    };
+    return (React.createElement(React.Fragment, null, isEdit ? (React.createElement(Table, { columns: columnsLast, rowKey: "attachId", dataSource: records, scroll: { x: 'max-content' } })) : (React.createElement(DetailTable, __assign({}, detail)))));
 };
 export default Sinatures;

package/dist/index.d.ts

@@ -47,6 +47,6 @@ export { default as UploadSingle } from './components/UploadSingle';
 export { default as CodeQuery } from './components/business/CodeQuery';
 export { default as DgColumns } from './components/business/DgColumns';
 export { default as message } from './components/basic/message';
-export { ConfigProvider, Drawer, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tooltip, Descriptions, Image, Popover, Breadcrumb, Transfer, Row, Col, } from 'antd';
+export { ConfigProvider, Drawer, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tooltip, Descriptions, Image, Popover, Breadcrumb, Transfer, Row, Col, notification, } from 'antd';
 export { default as zhCN } from 'antd/lib/locale/zh_CN';
 export { default as Icon, createFromIconfontCN } from '@ant-design/icons';

package/dist/index.js

@@ -161,6 +161,6 @@ export { default as UploadSingle } from './components/UploadSingle';
 export { default as CodeQuery } from './components/business/CodeQuery';
 export { default as DgColumns } from './components/business/DgColumns';
 export { default as message } from './components/basic/message';
-export { ConfigProvider, Drawer, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tooltip, Descriptions, Image, Popover, Breadcrumb, Transfer, Row, Col, } from 'antd';
+export { ConfigProvider, Drawer, Space, Grid, Divider, Dropdown, Badge, List, Result, Spin, Popconfirm, TreeSelect, Tree, Progress, Cascader, Tooltip, Descriptions, Image, Popover, Breadcrumb, Transfer, Row, Col, notification, } from 'antd';
 export { default as zhCN } from 'antd/lib/locale/zh_CN';
 export { default as Icon, createFromIconfontCN } from '@ant-design/icons';

package/package.json

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