ztxkui 10.0.80 → 10.0.81

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

@@ -32,6 +32,9 @@ interface IProps {
     /** 不需要显示附件类型 */
     isNotFileType?: boolean;
     openContractTemplateModalHandle?: any;
+    refreshCode?: boolean;
+    otherColumns?: any[];
+    organizationId?: string;
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

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

@@ -27,7 +27,7 @@ import CompareResult from './CompareResult';
 import { fileBatchDownload, preCanDownload, nextDownload, sealFileBatchDownload, } from '../../../Upload/utils';
 var DetailTable = function (_a) {
     var _b;
-    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, showContranctNum = _a.showContranctNum, request = _a.request, needSaveTemplate = _a.needSaveTemplate, batchDownloadZipName = _a.batchDownloadZipName, docAttachMap = _a.docAttachMap, isNotFileType = _a.isNotFileType, openContractTemplateModalHandle = _a.openContractTemplateModalHandle;
+    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, showContranctNum = _a.showContranctNum, request = _a.request, needSaveTemplate = _a.needSaveTemplate, batchDownloadZipName = _a.batchDownloadZipName, docAttachMap = _a.docAttachMap, isNotFileType = _a.isNotFileType, openContractTemplateModalHandle = _a.openContractTemplateModalHandle, refreshCode = _a.refreshCode, _c = _a.otherColumns, otherColumns = _c === void 0 ? [] : _c, organizationId = _a.organizationId;
     var authToken = token || '';
     var isOnlyQj = "" + ((_b = records === null || records === void 0 ? void 0 : records[0]) === null || _b === void 0 ? void 0 : _b.attachId) === '123456789';
     var selectRows = useRef(null);
@@ -35,7 +35,7 @@ var DetailTable = function (_a) {
     var downFileFn = function (_record) {
         try {
             var xhr_1 = new XMLHttpRequest();
-            xhr_1.open('GET', ZT_API_BASEURL + "/api/zmdms-scm-system/seal/download-watermark-attach/" + (_record === null || _record === void 0 ? void 0 : _record.attachId) + "?Zmdms-Auth=bearer " + token, true);
+            xhr_1.open('GET', ZT_API_BASEURL + "/api/zmdms-scm-system/seal/download-watermark-attach/" + (_record === null || _record === void 0 ? void 0 : _record.attachId) + "?watermarkOrganizationType=12&watermarkOrganizationId=" + organizationId + "&Zmdms-Auth=bearer " + token, true);
             xhr_1.responseType = 'blob';
             xhr_1.onload = function () {
                 var _a;

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

@@ -14,3 +14,6 @@ export declare function useElectronicData(data: any): {
     electronicSeal: any;
     setElectronicSeal: import("react").Dispatch<any>;
 };
+export declare function useCheckedSealInfoList(request: any): {
+    getDeptInfo: any;
+};

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

@@ -1,4 +1,8 @@
 import { useState, useEffect } from 'react';
+/**
+ * 验证契约锁是否全部盖章
+ */
+import useMemoizedFn from '../../utils/useMemoizedFn';
 /**
  * 外部数据发生改变，设置内部数据
  */
@@ -54,3 +58,33 @@ export function useElectronicData(data) {
         setElectronicSeal: setElectronicSeal,
     };
 }
+export function useCheckedSealInfoList(request) {
+    var getDeptInfo = useMemoizedFn(function (params) {
+        return new Promise(function (resolve, reject) {
+            request({
+                url: '/api/zmdms-system/dept/detail',
+                params: params,
+                method: 'GET',
+            })
+                .then(function (res) {
+                var _a;
+                if ((res === null || res === void 0 ? void 0 : res.status) === 200 && ((_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.code) === 200) {
+                    var result = res.data.data;
+                    resolve(result || {});
+                }
+                else {
+                    // message.error(res.data.msg || '获取部门信息失败！');
+                    reject(res.data.msg || '获取部门信息失败！');
+                }
+            })
+                .catch(function (error) {
+                var _a, _b;
+                // message.error(error?.response?.data?.msg || '获取部门信息失败！');
+                reject(((_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) || '获取部门信息失败！');
+            });
+        });
+    });
+    return {
+        getDeptInfo: getDeptInfo,
+    };
+}

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

@@ -80,7 +80,7 @@ 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';
+import { useRecords, useQunjData, useElectronicData, useCheckedSealInfoList, } from './hooks';
 /** 需要存样板合同类型 采购合同 销售合同 双边合同 */
 var NEED_SAVE_TEMPLATE = [
     'scm_order_contract_cght',
@@ -213,6 +213,23 @@ var Sinatures = function (_a) {
         records,
         isCheckedEconomic,
     ]);
+    var _1 = useState(''), organizationId = _1[0], setOrganizationId = _1[1];
+    var getDeptInfo = useCheckedSealInfoList(request).getDeptInfo;
+    /**
+     * 通过部门Id获得公司id
+     */
+    useEffect(function () {
+        var _deptId = deptId;
+        if (_deptId) {
+            // 调用接口
+            getDeptInfo({
+                id: _deptId,
+            }).then(function (res) {
+                setOrganizationId((res === null || res === void 0 ? void 0 : res.companyId) || '');
+            });
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [deptId]);
     /** 是否加盖群杰印章 */
     var needQjSealFn = function (e) {
         var _value = __assign(__assign({ isTakeOut: 0 }, (showContranctNum ? { contranctNum: 1 } : {})), { details: [] });
@@ -831,7 +848,7 @@ var Sinatures = function (_a) {
         });
     }
     // 上传组件的数据
-    var _1 = useState(), originFileList = _1[0], setOriginFileList = _1[1];
+    var _2 = useState(), originFileList = _2[0], setOriginFileList = _2[1];
     /** 签章组件onChange事件 */
     var sigValuesChange = useCallback(function (type, value) {
         var _a, _b;
@@ -1139,7 +1156,7 @@ var Sinatures = function (_a) {
         docAttachMap: attachMap,
     };
     return (React.createElement(React.Fragment, null,
-        isEdit ? (React.createElement(Table, { columns: columnsLast, rowKey: "attachId", loading: tbloading, dataSource: records, scroll: { x: 'max-content', y: 400 } })) : (React.createElement(DetailTable, __assign({ isNotFileType: isNotFileType }, detail, { batchDownloadZipName: batchDownloadZipName, openContractTemplateModalHandle: openContractTemplateModalHandle }))),
+        isEdit ? (React.createElement(Table, { columns: columnsLast, rowKey: "attachId", loading: tbloading, dataSource: records, scroll: { x: 'max-content', y: 400 } })) : (React.createElement(DetailTable, __assign({ isNotFileType: isNotFileType }, detail, { batchDownloadZipName: batchDownloadZipName, openContractTemplateModalHandle: openContractTemplateModalHandle, organizationId: organizationId }))),
         React.createElement(Modal, { title: "\u4E0B\u5217\u5370\u7AE0\u672A\u786E\u8BA4\u76D6\u7AE0\u4F4D\u7F6E\uFF0C\u5982\u4E0D\u9700\u8981\u8BF7\u53D6\u6D88\u52FE\u9009\u3002", width: 800, closable: false, visible: visible, loading: false, onCancel: function () {
                 setVisible(false);
             }, footer: React.createElement(React.Fragment, null,

package/package.json

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