ztxkui 3.9.11 → 3.9.12

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

@@ -5,21 +5,39 @@
 import React, { memo, useEffect } from 'react';
 // redux
 // ztxkui公共组件
-import { Checkbox } from '../../../../index';
+import { Checkbox, Collapse } from '../../../../index';
 var ElectronicSeal = function (_a) {
     var electronicList = _a.electronicList, value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, setElectronicSeal = _a.setElectronicSeal;
     useEffect(function () {
         setElectronicSeal(value);
     }, [setElectronicSeal, value]);
+    var getOptions = function (result) {
+        if (result === void 0) { result = {}; }
+        if (Array.isArray(electronicList) && electronicList.length > 0) {
+            var companyList = Array.from(new Set(electronicList.map(function (item) { return item.ownerName; })));
+            companyList.forEach(function (item) {
+                result[item] = [];
+                electronicList.forEach(function (ele) {
+                    if (ele.ownerName === item) {
+                        result[item].push(ele);
+                    }
+                });
+            });
+            return (React.createElement(Collapse, { defaultActiveKey: Array.from({ length: Object.keys(result).length }, function (v, k) { return k; }) }, Object.entries(result).map(function (_a, index) {
+                var key = _a[0], list = _a[1];
+                return (React.createElement(Collapse.Panel, { key: index, header: key },
+                    React.createElement(Checkbox.Group, { defaultValue: value, value: value, onChange: onChange, className: "flex-checkbox-group", disabled: !isEdit }, Array.isArray(list) &&
+                        list.map(function (item) {
+                            return (React.createElement(Checkbox, { key: item.sealId, value: item.sealId }, item.sealName));
+                        }))));
+            })));
+        }
+    };
     return (React.createElement("div", { style: {
             height: '100%',
             minHeight: '150px',
             overflowY: 'auto',
             overflowX: 'hidden',
-        } },
-        React.createElement(Checkbox.Group, { defaultValue: value, value: 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));
-            }))));
+        } }, getOptions()));
 };
 export default memo(ElectronicSeal);

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

@@ -9,7 +9,6 @@ interface IProps {
     isEdit: boolean;
     showContranctNum: boolean;
     sealList: any;
-    handleRef?: any;
     checked: boolean;
     form: any;
     setQunjSeal: any;

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

@@ -23,7 +23,7 @@ import { Form, InputNumber, SearchContainer, Radio } from '../../../../index';
 import { SealCheckboxGroup } from './SealCheckbox';
 var Item = SearchContainer.SearchItem;
 var QunjSeal = function (_a) {
-    var value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, sealList = _a.sealList, handleRef = _a.handleRef, checked = _a.checked, form = _a.form, setQunjSeal = _a.setQunjSeal;
+    var value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, sealList = _a.sealList, checked = _a.checked, form = _a.form, setQunjSeal = _a.setQunjSeal;
     useEffect(function () {
         if (value) {
             var _value = __assign(__assign(__assign({}, value), { isTakeOut: "" + value.isTakeOut === '1' ? 1 : 0 }), (value.contranctNum || !showContranctNum ? {} : { contranctNum: 1 }));
@@ -47,7 +47,7 @@ var QunjSeal = function (_a) {
                 overflowY: 'auto',
                 overflowX: 'hidden',
             } },
-            React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, handleRef: handleRef, isEdit: isEdit, showContranctNum: showContranctNum })));
+            React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, isEdit: isEdit })));
     };
     return (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle }, checked ? (React.createElement(React.Fragment, null,
         React.createElement("div", { style: {

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

@@ -20,9 +20,7 @@ interface ISealProps {
         sealNo: string;
         sealCount: number;
     }[];
-    handleRef?: any;
     isEdit: boolean;
-    showContranctNum: boolean;
 }
 declare const SealCheckboxGroup: React.FC<ISealProps>;
 export { SealCheckboxGroup };

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

@@ -19,11 +19,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
  * @description
  */
 import React from 'react';
-import sumBy from 'lodash/sumBy';
 // redux
 // ztxkui公共组件
 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;
@@ -66,10 +64,8 @@ var SealCheckbox = function (_a) {
             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;
+    var value = _a.value, onChange = _a.onChange, sealList = _a.sealList, isEdit = _a.isEdit;
     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;
         var valueArr = Array.isArray(value) ? __spreadArray([], value) : [];
         var vIndex = valueArr === null || valueArr === void 0 ? void 0 : valueArr.findIndex(function (item) { return item.sealNo === sealNo; });
         if (_value.sealNo) {
@@ -88,26 +84,7 @@ var SealCheckboxGroup = function (_a) {
         else {
             valueArr.splice(vIndex, 1);
         }
-        var totalSealNum = sumBy(valueArr, 'sealCount');
         onChange && onChange(valueArr);
-        if (typeof contractNum === 'number' && showContranctNum) {
-            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('您的用印次数远超超过合理次数范围，请修改。');
-                return;
-            }
-            else {
-                (_d = handleRef === null || handleRef === void 0 ? void 0 : handleRef.current) === null || _d === void 0 ? void 0 : _d.getData('enable');
-            }
-            if (totalSealNum > contractNum * 3) {
-                message.warning('您的用印次数超过合理次数范围，请慎重确认！');
-                return;
-            }
-            if (totalSealNum > contractNum * 2) {
-                message.warning('您的用印次数已超过2倍合同数量，请确认用印数量是否正确。');
-                return;
-            }
-        }
     };
     return (React.createElement("div", null, Array.isArray(sealList) &&
         sealList.map(function (item, index) {

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

@@ -70,6 +70,7 @@ import React, { useImperativeHandle, useCallback, useState, useMemo, useEffect,
 // ztxkui公共组件
 import { Table, Upload, message, Button, Modal, Checkbox, Form, } from '../../../index';
 import { Switch } from 'antd';
+import sumBy from 'lodash/sumBy';
 // 路由配置
 // store
 // 自定义组件
@@ -671,8 +672,8 @@ var Sinatures = function (_a) {
                         var _label = "\u662F\u5426\u52A0\u76D6\u7ECF\u6D4E\u8D23\u4EFB\u4EBA\u624B\u7B7E\u7AE0" + (yjzrr ? "\uFF08\u7ECF\u6D4E\u8D23\u4EFB\u4EBA: " + yjzrr + "\uFF09" : '');
                         var obj = {
                             children: (React.createElement("div", { style: { height: '100%' } },
-                                React.createElement("div", { style: __assign({ height: '36px', borderBottom: '1px solid #EBEBEB', marginBottom: '5px', lineHeight: '36px' }, (yjzrr ? {} : { display: 'none' })), title: _label },
-                                    React.createElement(Checkbox, { checked: isEconomic, disabled: !isEdit, onChange: function (e) { return needEconomic(e); } },
+                                React.createElement("div", { style: __assign({ height: '36px', borderBottom: '1px solid #EBEBEB', marginBottom: '5px', paddingLeft: '8px', lineHeight: '36px' }, (yjzrr ? {} : { display: 'none' })), title: _label },
+                                    React.createElement(Checkbox, { checked: isEconomic, disabled: !(hasElectronicSeal && isEdit), onChange: function (e) { return needEconomic(e); } },
                                         React.createElement("div", { style: {
                                                 width: '300px',
                                                 whiteSpace: 'nowrap',
@@ -729,7 +730,7 @@ var Sinatures = function (_a) {
                     width: 620,
                     render: function (value, row, index) {
                         var obj = {
-                            children: (React.createElement(QunjSeal, { value: qunjSeal, onChange: qunjSealChangeHandle, isEdit: isEdit, handleRef: handleRef, showContranctNum: showContranctNum, sealList: sealList, checked: checked, form: form, setQunjSeal: setQunjSeal })),
+                            children: (React.createElement(QunjSeal, { value: qunjSeal, onChange: qunjSealChangeHandle, isEdit: isEdit, showContranctNum: showContranctNum, sealList: sealList, checked: checked, form: form, setQunjSeal: setQunjSeal })),
                             props: {},
                         };
                         obj.props['rowSpan'] = index === 0 ? records.length : 0;
@@ -857,6 +858,26 @@ var Sinatures = function (_a) {
     }, [records, setRecords, sigValuesChange]);
     /** 群杰印章修改 */
     function qunjSealChangeHandle(value) {
+        var contractNum = value === null || value === void 0 ? void 0 : value.contranctNum;
+        var totalSealNum = sumBy(value === null || value === void 0 ? void 0 : value.details, 'sealCount');
+        if (typeof contractNum === 'number' && showContranctNum) {
+            if (totalSealNum > contractNum * 4) {
+                setIsTotalSealNumTooMore(true);
+                message.warning('您的用印次数远超超过合理次数范围，请修改。');
+                return;
+            }
+            else {
+                setIsTotalSealNumTooMore(false);
+            }
+            if (totalSealNum > contractNum * 3) {
+                message.warning('您的用印次数超过合理次数范围，请慎重确认！');
+                return;
+            }
+            if (totalSealNum > contractNum * 2) {
+                message.warning('您的用印次数已超过2倍合同数量，请确认用印数量是否正确。');
+                return;
+            }
+        }
         qunjSealChange && qunjSealChange(value);
         setQunjSeal(value);
         onSigValuesChange && onSigValuesChange(sigValuesChange('qunjSeal', value));
@@ -873,14 +894,7 @@ var Sinatures = function (_a) {
      * 暴露方法给外部调用
      */
     useImperativeHandle(handleRef, function () { return ({
-        getData: function (flag) {
-            // 超过4倍禁止提交审批
-            if (flag === '4') {
-                setIsTotalSealNumTooMore(true);
-            }
-            else if (flag === 'enable') {
-                setIsTotalSealNumTooMore(false);
-            }
+        getData: function () {
             var _attachMap = attachMap;
             if (typeof _attachMap === 'string') {
                 _attachMap = JSON.parse(_attachMap);

package/dist/index.css

@@ -2002,7 +2002,7 @@ body {
   justify-content: flex-start;
 }
 .flex-checkbox-group > .ant-checkbox-wrapper.zt-checkbox {
-  margin-left: 0;
+  margin-left: 8px;
   margin-top: 4px;
 }
 

package/package.json

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