ztxkui 3.4.19 → 3.5.0

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

@@ -15,7 +15,6 @@ interface IProps {
     electronicList: any;
     sealList: any;
     querySealStatus?: () => void;
-    flow_status: string;
     needQj: number;
     needQys: number;
     records: any;

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

@@ -18,7 +18,7 @@ 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 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;
     var authToken = token || '';
     /** 下载水印附件 */
     var downFileFn = function (_record) {
@@ -124,14 +124,7 @@ var DetailTable = function (_a) {
                                 } },
                                 "\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("span", { style: { color: '#FF6666', fontSize: '16px' } }, (qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.vertifyCode) || ''))),
                         React.createElement("div", { style: {
                                 borderBottom: '1px solid #EBEBEB',
                             } },
@@ -172,7 +165,7 @@ var DetailTable = function (_a) {
     ];
     // 由外部传入needQj needQys参数过滤出需展示的列
     var columnsLast = columns;
-    if (!needQj) {
+    if (!needQj || ((qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.details) && (qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.details.length) === 0)) {
         columnsLast = columnsLast.filter(function (item) { return item.key !== 'qunjSeal'; });
     }
     if (!needQys) {

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

@@ -10,6 +10,7 @@ var ElectronicSeal = function (_a) {
     var electronicList = _a.electronicList, value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit;
     return (React.createElement("div", { style: {
             height: '100%',
+            minHeight: '150px',
             overflowY: 'auto',
             overflowX: 'hidden',
         } },

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

@@ -12,6 +12,8 @@ interface IProps {
     sealList: any;
     handleRef?: any;
     querySealStatus?: () => void;
+    checked: boolean;
+    form: any;
 }
 declare const QunjSeal: React.FC<IProps>;
 export default QunjSeal;

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

@@ -13,44 +13,22 @@ var __assign = (this && this.__assign) || function () {
  * @author 陈亚雄
  * @description
  */
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 // redux
 // ztxkui公共组件
-import { Form, InputNumber, SearchContainer, Radio, Checkbox, } from '../../../../index';
+import { Form, InputNumber, SearchContainer, Radio } from '../../../../index';
 // 路由配置
 // store
 // 自定义组件
 import { SealCheckboxGroup } from './SealCheckbox';
 var Item = SearchContainer.SearchItem;
 var QunjSeal = function (_a) {
-    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(true), checked = _b[0], setChecked = _b[1];
+    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, checked = _a.checked, form = _a.form;
     useEffect(function () {
-        var _a;
         if (value) {
             form.setFieldsValue(__assign(__assign({}, value), { isTakeOut: "" + value.isTakeOut === '1' ? 1 : 0 }));
-            // 有已勾选群杰用印时 展示群杰组件
-            if (((_a = value.details) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-                setChecked(true);
-                form.setFieldsValue({
-                    needQj: true,
-                });
-            }
         }
     }, [value, form]);
-    /** 是否加盖群杰印章 */
-    var needQjSealFn = function (e) {
-        if (!e.target.checked) {
-            form.setFieldsValue({
-                isTakeOut: 0,
-                details: [],
-            });
-            onChange && onChange({});
-        }
-        setChecked(e.target.checked);
-    };
     var onSealCheckboxHandle = function (values) {
         form.setFieldsValue({
             values: values,
@@ -72,31 +50,29 @@ var QunjSeal = function (_a) {
     /** 渲染SealCheckboxGroup组件 */
     var getSealCheckboxGroupRender = function () {
         return (React.createElement(Item, { name: "details", label: "", noBorder: true, width: "all", style: {
-                height: '200px',
+                height: '180px',
                 overflowY: 'auto',
                 overflowX: 'hidden',
             } },
             React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, handleRef: handleRef, isEdit: isEdit, showContranctNum: showContranctNum })));
     };
-    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 },
+    return (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle }, 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("div", { style: { width: '60%' } },
+                React.createElement(Item, { name: "isTakeOut", label: "", noBorder: true, width: "all" },
+                    React.createElement(Radio.Group, { 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))));
+                        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.js

@@ -56,7 +56,7 @@ var SealCheckbox = function (_a) {
             justifyContent: 'space-between',
             height: '32px',
         } },
-        React.createElement(Checkbox, { onChange: onCheckboxChange, checked: value && value.sealNo ? true : false, disabled: !isEdit, style: { width: '40%' } }, name),
+        React.createElement(Checkbox, { onChange: onCheckboxChange, checked: value && value.sealNo ? true : false, disabled: !isEdit, style: { width: '70%' } }, name),
         React.createElement("div", { style: { display: 'flex', lineHeight: '32px' } },
             React.createElement("div", { style: { marginRight: '5px' } }, "\u7528\u5370"),
             React.createElement(Item, { noLabel: true, width: "half" },

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

@@ -32,7 +32,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 import React, { useImperativeHandle, useCallback, useState, useMemo, useEffect, } from 'react';
 // redux
 // ztxkui公共组件
-import { Table, Upload, message, Button, Modal } from '../../../index';
+import { Table, Upload, message, Button, Modal, Checkbox, Form, } from '../../../index';
 import { Switch } from 'antd';
 // 路由配置
 // store
@@ -57,17 +57,6 @@ 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
  * 实现可以上传文件，删除列
@@ -110,6 +99,26 @@ var Sinatures = function (_a) {
     var _o = useState({}), prevParam = _o[0], setPrevParam = _o[1];
     // 请确认
     var _p = useState(false), isSure = _p[0], setIsSure = _p[1];
+    // 群杰表单
+    var form = Form.useForm()[0];
+    // 是否加盖群杰印章
+    var _q = useState(true), checked = _q[0], setChecked = _q[1];
+    /** 是否加盖群杰印章 */
+    var needQjSealFn = function (e) {
+        if (!e.target.checked) {
+            form.setFieldsValue({
+                isTakeOut: 0,
+                contranctNum: 1,
+                details: [],
+            });
+            qunjSealChangeHandle({
+                isTakeOut: 0,
+                contranctNum: 1,
+                details: [],
+            });
+        }
+        setChecked(e.target.checked);
+    };
     /** 查询用印状态 */
     var querySealStatus = function () {
         var url = ZT_API_BASEURL + "/api/zmdms-esb-outer/outer/qj/view-stamp?caseId=" + caseId + "&systemId=1493475945847648257";
@@ -351,7 +360,7 @@ var Sinatures = function (_a) {
                     title: '合同比对模板',
                     key: 'templateAttachId',
                     dataIndex: 'templateAttachId',
-                    width: 160,
+                    width: 150,
                     render: function (text, record, index) {
                         return record.attachTypeName === '合同本身' ? (React.createElement(TemplateAttach, { record: record, index: index, openCustomerModalHandle: openCustomerModalHandle, isEdit: isEdit })) : ('');
                     },
@@ -360,7 +369,7 @@ var Sinatures = function (_a) {
                     title: '合同比对结果',
                     key: 'compareAttachId',
                     dataIndex: 'compareAttachId',
-                    width: 100,
+                    width: 150,
                     render: function (text, record, index) {
                         return record.attachTypeName === '合同本身' ? (React.createElement(CompareResult, { record: record, index: index, request: request, getTaskId: getTaskId, isEdit: isEdit })) : ('');
                     },
@@ -369,7 +378,7 @@ var Sinatures = function (_a) {
                     title: '保存为模版',
                     key: 'templateAttachId',
                     dataIndex: 'templateAttachId',
-                    width: 80,
+                    width: 90,
                     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);
@@ -398,7 +407,7 @@ var Sinatures = function (_a) {
                     title: '盖电子印章',
                     key: 'isElectronicSeal',
                     dataIndex: 'isElectronicSeal',
-                    width: 80,
+                    width: 90,
                     render: function (text, record, index) {
                         return (React.createElement(Switch, { checked: text, disabled: !isEdit, onChange: function (value) {
                                 return onSwitchChangeHandle(value, 'isElectronicSeal', index);
@@ -425,7 +434,7 @@ var Sinatures = function (_a) {
                     title: '电子印章设置',
                     key: 'setElectronicSeal',
                     dataIndex: 'setElectronicSeal',
-                    width: 95,
+                    width: 110,
                     render: function (value, row, index) {
                         var Comp = function () {
                             return records.length !== 0 ? (React.createElement("div", { style: { height: '100%', paddingTop: '23px' } },
@@ -445,24 +454,34 @@ var Sinatures = function (_a) {
             ],
         },
         {
-            title: '群杰印章',
-            key: 'qunjSeal',
-            dataIndex: 'qunjSeal',
-            width: 240,
-            render: function (value, row, index) {
-                var obj = {
-                    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;
-                return obj;
-            },
+            title: function () { return (React.createElement("div", { style: { width: '100%', textAlign: 'center' } }, "\u7FA4\u6770\u5370\u7AE0")); },
+            key: 'qunJ',
+            dataIndex: 'qunJ',
+            width: 500,
+            children: [
+                {
+                    title: function () {
+                        return (React.createElement(Checkbox, { checked: checked, disabled: !isEdit, onChange: function (e) { return needQjSealFn(e); } }, "\u7FA4\u6770\u5370\u7AE0-\u7528\u5370\u7533\u8BF7"));
+                    },
+                    key: 'qunjSeal',
+                    dataIndex: 'qunjSeal',
+                    width: 500,
+                    render: function (value, row, index) {
+                        var obj = {
+                            children: (React.createElement(QunjSeal, { value: qunjSeal, onChange: qunjSealChangeHandle, querySealStatus: querySealStatus, ZT_API_BASEURL: ZT_API_BASEURL, isEdit: isEdit, handleRef: handleRef, showContranctNum: showContranctNum, sealList: sealList, checked: checked, form: form })),
+                            props: {},
+                        };
+                        obj.props['rowSpan'] = index === 0 ? records.length : 0;
+                        return obj;
+                    },
+                },
+            ],
         },
     ];
     // 由外部传入needQj needDg needQys参数过滤出需展示的列
     var columnsLast = columns;
     if (!needQj) {
-        columnsLast = columnsLast.filter(function (item) { return item.key !== 'qunjSeal'; });
+        columnsLast = columnsLast.filter(function (item) { return item.key !== 'qunJ'; });
     }
     if (!needDg && !needQys) {
         columnsLast = columnsLast.filter(function (item) { return !['attachTypeName'].includes(item.key); });
@@ -474,7 +493,7 @@ var Sinatures = function (_a) {
         columnsLast = columnsLast.filter(function (item) { return !['isWatermark', 'needQys'].includes(item.key); });
     }
     // 上传组件的数据
-    var _q = useState(), originFileList = _q[0], setOriginFileList = _q[1];
+    var _r = useState(), originFileList = _r[0], setOriginFileList = _r[1];
     /** 签章组件onChange事件 */
     var sigValuesChange = function (type, value) {
         var _a, _b;
@@ -490,7 +509,7 @@ var Sinatures = function (_a) {
             // 勾选加盖电子印章后 显示确认盖章按钮
             setCheckSealVisible(value ? true : hasElecSeal.length > 1 ? true : false);
             // 去除加盖电子印章勾选时  清除合同id 等之前的信息
-            if (!value) {
+            if (!value && hasElecSeal.length === 1) {
                 setSealedIds(__spreadArray([], sealedIds));
                 setContractId('');
                 setAttachMap(null);
@@ -583,7 +602,8 @@ var Sinatures = function (_a) {
         validateSealFn: function () {
             var _a;
             // 确认盖章后 勾选的信息有更改
-            if (needQys &&
+            if (isEdit &&
+                needQys &&
                 (prevParam === null || prevParam === void 0 ? void 0 : prevParam.sealIdList) &&
                 (prevParam === null || prevParam === void 0 ? void 0 : prevParam.sealIdList.length) !== (innerElectronicSeal === null || innerElectronicSeal === void 0 ? void 0 : innerElectronicSeal.length) &&
                 !isSure) {
@@ -604,21 +624,27 @@ var Sinatures = function (_a) {
             // 是否有勾选加盖电子印章
             var hasElectronicSeal = records === null || records === void 0 ? void 0 : records.some(function (item) { return !!item.isElectronicSeal; });
             // 勾选加盖电子印章时未勾选电子印章
-            if ((innerElectronicSeal === null || innerElectronicSeal === void 0 ? void 0 : innerElectronicSeal.length) === 0 && hasElectronicSeal) {
+            if (needQys &&
+                isEdit &&
+                (innerElectronicSeal === null || innerElectronicSeal === void 0 ? void 0 : innerElectronicSeal.length) === 0 &&
+                hasElectronicSeal) {
                 message.warning('请勾选加盖电子印章所需要的印章列表！');
                 return false;
             }
             // 超过4倍禁止提交审批
-            if (needQj && isTotalSealNumTooMore) {
+            if (isEdit && needQj && isTotalSealNumTooMore) {
                 message.warning('您的用印次数远超超过合理次数范围，请修改。');
                 return false;
             }
             // 没有确认盖章
-            if (needQys && hasElectronicSeal && !(contractId || contract_id)) {
+            if (isEdit &&
+                needQys &&
+                hasElectronicSeal &&
+                !(contractId || contract_id)) {
                 message.warning('请点击确认盖章按钮，确认盖章位置后方可提交！');
                 return false;
             }
-            if (innerQunjSeal === null || innerQunjSeal === void 0 ? void 0 : innerQunjSeal.needQj) {
+            if (isEdit && checked && needQj) {
                 // 合同份数为空
                 if (!(innerQunjSeal === null || innerQunjSeal === void 0 ? void 0 : innerQunjSeal.contranctNum) && showContranctNum) {
                     message.warning('请填写合同份数！');
@@ -655,7 +681,6 @@ var Sinatures = function (_a) {
         electronicList: electronicList,
         sealList: sealList,
         querySealStatus: querySealStatus,
-        flow_status: FLOW_STATUS[flowStatus],
         needQj: needQj,
         needQys: needQys,
     };

package/dist/hooks/useFormatter.js

@@ -67,12 +67,20 @@ function useFormatter(formatterType, currencySymbol) {
 function formatCurrency(n) {
     if (n != null) {
         var _n = n.toString();
-        var pointIndex = _n.indexOf('.');
+        var pointBeforeNum = '';
         var pointAfterNum = '';
+        if (_n.startsWith('-')) {
+            pointBeforeNum = '-';
+            _n = _n.slice(1);
+        }
+        var pointIndex = _n.indexOf('.');
         if (pointIndex !== -1) {
             n = _n.slice(0, pointIndex);
             pointAfterNum = _n.slice(pointIndex);
         }
+        else {
+            n = _n;
+        }
         var res = '';
         var s = n.toString();
         var length_1 = s.length;
@@ -90,7 +98,7 @@ function formatCurrency(n) {
                 res = s[i] + res;
             }
         }
-        return res + pointAfterNum;
+        return pointBeforeNum + res + pointAfterNum;
     }
     else {
         return n;

package/package.json

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