ztxkui 3.3.13 → 3.3.14

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

@@ -12,6 +12,7 @@ interface IProps {
     ZT_API_BASEURL: string;
     isEdit: boolean;
     isOnlyQunj: boolean;
+    showContranctNum: boolean;
     handleRef?: any;
 }
 declare const QunjSeal: React.FC<IProps>;

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

@@ -1,3 +1,14 @@
+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);
+};
 /**
  * @author 陈亚雄
  * @description
@@ -12,21 +23,12 @@ import { Form, Input, InputNumber, SearchContainer, Radio, Button, message, Chec
 import { SealCheckboxGroup } from './SealCheckbox';
 // 其他文件
 var SearchLeft = SearchContainer.SearchLeft, Item = SearchContainer.SearchItem;
-// 采购合同 销售合同 双边合同 部门间交易合同
-var FLOW_IDS = [
-    'scm_order_contract_cght',
-    'scm_order_contract_xsht',
-    'scm_order_contract_sbht',
-    'scm_order_contract_bjjyht',
-];
 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, handleRef = _a.handleRef;
+    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 form = Form.useForm()[0];
     // 是否加盖群杰印章
     var _b = useState(false), checked = _b[0], setChecked = _b[1];
     var _c = useState([]), sealList = _c[0], setSealList = _c[1];
-    // 采购合同 销售合同 双边合同 部门间交易合同 需要展示合同份数 其他的不需要
-    var showContranctNum = FLOW_IDS.includes("" + flowId);
     useEffect(function () {
         request({
             url: "/api/zmdms-resource/flowqjuse/query-qj-seal-list/" + flowId,
@@ -52,10 +54,13 @@ var QunjSeal = function (_a) {
     useEffect(function () {
         var _a;
         if (value) {
-            form.setFieldsValue(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]);

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

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

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

@@ -25,12 +25,18 @@ import sumBy from 'lodash/sumBy';
 import { Checkbox, InputNumber } from '../../../../index';
 import { message } from 'antd';
 var SealCheckbox = function (_a) {
-    var name = _a.name, id = _a.id, value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, isOnlyQunj = _a.isOnlyQunj;
+    var name = _a.name, id = _a.id, value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, isOnlyQunj = _a.isOnlyQunj, handleRef = _a.handleRef;
     var onCheckboxChange = function (e) {
         onChange &&
             onChange(__assign(__assign({}, (value || {})), { sealName: e.target.checked ? name : null, sealNo: e.target.checked ? id : null }));
     };
     var onNumberChange = function (count) {
+        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;
+        if (!contractNum) {
+            message.info('请输入合同份数！');
+            return;
+        }
         var num = count;
         if (count < 0) {
             num = 0;
@@ -100,7 +106,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, 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, isOnlyQunj: isOnlyQunj, handleRef: handleRef, onChange: function (value, type) {
                     onChangeHandle(value, index, item.sealNo, type);
                 } }));
         })));

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

@@ -37,6 +37,13 @@ var NEED_SAVE_TEMPLATE = [
     'scm_order_contract_xsht',
     'scm_order_contract_sbht',
 ];
+/** 采购合同 销售合同 双边合同 部门间交易合同 */
+var FLOW_IDS = [
+    'scm_order_contract_cght',
+    'scm_order_contract_xsht',
+    'scm_order_contract_sbht',
+    'scm_order_contract_bjjyht',
+];
 /**
  * TodoList
  * 实现可以上传文件，删除列
@@ -70,6 +77,8 @@ var Sinatures = function (_a) {
     var _k = useState(false), isTotalSealNumTooMore = _k[0], setIsTotalSealNumTooMore = _k[1];
     // 单独使用群杰章
     var isOnlyQunj = !!needQj && !needDg && !needQys;
+    // 采购合同 销售合同 双边合同 部门间交易合同 需要展示合同份数 其他的不需要
+    var showContranctNum = FLOW_IDS.includes("" + flowId);
     useEffect(function () {
         // 判断入参fileList中是否有已勾选电子印章的元素
         if (Array.isArray(fileList) &&
@@ -83,6 +92,27 @@ var Sinatures = function (_a) {
             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列表
@@ -251,7 +281,9 @@ var Sinatures = function (_a) {
             dataIndex: 'isWatermark',
             width: 100,
             render: function (text, record, index) {
-                return (React.createElement(Checkbox, { checked: text, disabled: !isEdit, onChange: function (e) { return onCheckboxChangeHandle(e, 'isWatermark', index); } }, "\u662F"));
+                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"))));
             },
         },
         {
@@ -260,7 +292,7 @@ var Sinatures = function (_a) {
             dataIndex: 'qunjSeal',
             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 })),
+                    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 })),
                     props: {},
                 };
                 obj.props['rowSpan'] = index === 0 ? records.length : 0;
@@ -397,13 +429,12 @@ var Sinatures = function (_a) {
         /** 签章组件相关校验 */
         validateSealFn: function () {
             var _a;
+            // 是否有勾选加盖电子印章
+            var hasElectronicSeal = records.some(function (item) { return !!item.isElectronicSeal; });
             // 勾选加盖电子印章时未勾选电子印章
-            if (innerElectronicSeal.length === 0) {
-                var isElectronicSeal = records.filter(function (item) { return !!item.isElectronicSeal; });
-                if (isElectronicSeal.length > 0) {
-                    message.warning('请勾选电子印章！');
-                    return false;
-                }
+            if (innerElectronicSeal.length === 0 && hasElectronicSeal) {
+                message.warning('请勾选加盖电子印章所需要的印章列表[表格右侧]！');
+                return false;
             }
             // 超过4倍禁止提交审批
             if (needQj && isTotalSealNumTooMore) {
@@ -411,13 +442,13 @@ var Sinatures = function (_a) {
                 return false;
             }
             // 没有确认盖章
-            if (needQys && !contractId) {
+            if (needQys && hasElectronicSeal && !contractId) {
                 message.warning('请点击确认盖章按钮，确认盖章位置后方可提交！');
                 return false;
             }
             if (innerQunjSeal.needQj) {
                 // 合同份数为空
-                if (!(innerQunjSeal === null || innerQunjSeal === void 0 ? void 0 : innerQunjSeal.contranctNum)) {
+                if (!(innerQunjSeal === null || innerQunjSeal === void 0 ? void 0 : innerQunjSeal.contranctNum) && showContranctNum) {
                     message.warning('请填写合同份数！');
                     return false;
                 }

package/package.json

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