ztxkui 3.3.15 → 3.3.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -191,6 +191,7 @@ var SinaturesDemo = function () {
191
191
  flowId: 1231231,
192
192
  deptId: '1262999321077198849',
193
193
  canEdit: canEdit,
194
+ flowStatus: 1,
194
195
  caseId: 'bf21be574ce741398e8f0769b61ac983',
195
196
  contractId: '2982140578506318463',
196
197
  docAttachMap: {},
@@ -300,6 +300,7 @@ var PrintContainer = function (_a) {
300
300
  var waterBase64 = '';
301
301
  var img = new Image();
302
302
  img.src = imgWaterBg;
303
+ img.setAttribute('crossOrigin', 'Anonymous');
303
304
  img.onload = function () {
304
305
  waterBase64 = image2Base64(img);
305
306
  htmlToPdfNoCanvas({
@@ -71,6 +71,7 @@ var _accept = [
71
71
  '.docx',
72
72
  '.xls',
73
73
  '.xlsx',
74
+ '.xlsm',
74
75
  '.rar',
75
76
  '.zip',
76
77
  '.jpg',
@@ -92,7 +92,7 @@ var QunjSeal = function (_a) {
92
92
  overflowY: 'auto',
93
93
  overflowX: 'hidden',
94
94
  } },
95
- React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, handleRef: handleRef, isEdit: isEdit, isOnlyQunj: isOnlyQunj })));
95
+ React.createElement(SealCheckboxGroup, { sealList: sealList, onChange: onSealCheckboxHandle, handleRef: handleRef, isEdit: isEdit, isOnlyQunj: isOnlyQunj, showContranctNum: showContranctNum })));
96
96
  };
97
97
  return isOnlyQunj ? (React.createElement(Form, { form: form, onValuesChange: onValuesChangeHandle },
98
98
  React.createElement(SearchContainer, null,
@@ -7,6 +7,7 @@ interface IProps {
7
7
  name: string;
8
8
  id: string;
9
9
  isEdit: boolean;
10
+ showContranctNum: boolean;
10
11
  value?: any;
11
12
  onChange?: any;
12
13
  isOnlyQunj?: boolean;
@@ -24,6 +25,7 @@ interface ISealProps {
24
25
  }[];
25
26
  handleRef?: any;
26
27
  isEdit: boolean;
28
+ showContranctNum: boolean;
27
29
  isOnlyQunj?: boolean;
28
30
  }
29
31
  declare const SealCheckboxGroup: React.FC<ISealProps>;
@@ -25,7 +25,7 @@ import sumBy from 'lodash/sumBy';
25
25
  import { Checkbox, InputNumber } from '../../../../index';
26
26
  import { message } from 'antd';
27
27
  var SealCheckbox = function (_a) {
28
- var name = _a.name, id = _a.id, value = _a.value, onChange = _a.onChange, isEdit = _a.isEdit, isOnlyQunj = _a.isOnlyQunj, handleRef = _a.handleRef;
28
+ 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;
29
29
  var onCheckboxChange = function (e) {
30
30
  onChange &&
31
31
  onChange(__assign(__assign({}, (value || {})), { sealName: e.target.checked ? name : null, sealNo: e.target.checked ? id : null }));
@@ -33,7 +33,7 @@ var SealCheckbox = function (_a) {
33
33
  var onNumberChange = function (count) {
34
34
  var _a, _b;
35
35
  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;
36
- if (!contractNum) {
36
+ if (!contractNum && showContranctNum) {
37
37
  message.info('请输入合同份数!');
38
38
  return;
39
39
  }
@@ -57,7 +57,7 @@ var SealCheckbox = function (_a) {
57
57
  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' } }))));
58
58
  };
59
59
  var SealCheckboxGroup = function (_a) {
60
- var value = _a.value, onChange = _a.onChange, sealList = _a.sealList, handleRef = _a.handleRef, isEdit = _a.isEdit, isOnlyQunj = _a.isOnlyQunj;
60
+ var value = _a.value, onChange = _a.onChange, sealList = _a.sealList, handleRef = _a.handleRef, isEdit = _a.isEdit, showContranctNum = _a.showContranctNum, isOnlyQunj = _a.isOnlyQunj;
61
61
  var onChangeHandle = function (_value, index, sealNo, type) {
62
62
  var _a, _b, _c, _d;
63
63
  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;
@@ -106,7 +106,7 @@ var SealCheckboxGroup = function (_a) {
106
106
  if (Array.isArray(value)) {
107
107
  itemValue = value.find(function (valueItem) { return valueItem.sealNo === item.sealNo; });
108
108
  }
109
- 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) {
109
+ 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) {
110
110
  onChangeHandle(value, index, item.sealNo, type);
111
111
  } }));
112
112
  })));
@@ -50,7 +50,7 @@ var FLOW_IDS = [
50
50
  * 实现受控,接收一个附件列表
51
51
  */
52
52
  var Sinatures = function (_a) {
53
- 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, 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, caseId = _a.caseId, contract_id = _a.contractId, docAttachMap = _a.docAttachMap, checkAttachIdList = _a.checkAttachIdList, // 已盖章附件id
53
+ 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, 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
54
54
  documentIdList = _a.documentIdList;
55
55
  var authToken = token || '';
56
56
  // 是否可编辑 1可编辑 0不可编辑
@@ -182,7 +182,7 @@ var Sinatures = function (_a) {
182
182
  if (contractId || contract_id) {
183
183
  request({
184
184
  url: '/api/zmdms-resource/seal/view-seal-state',
185
- data: { contractId: contractId || contract_id, canEdit: canEdit },
185
+ data: { contractId: contractId || contract_id, canEdit: canEdit, flowStatus: flowStatus },
186
186
  method: 'POST',
187
187
  })
188
188
  .then(function (res) {
@@ -442,7 +442,7 @@ var Sinatures = function (_a) {
442
442
  return false;
443
443
  }
444
444
  // 没有确认盖章
445
- if (needQys && hasElectronicSeal && !contractId) {
445
+ if (needQys && hasElectronicSeal && !(contractId || contract_id)) {
446
446
  message.warning('请点击确认盖章按钮,确认盖章位置后方可提交!');
447
447
  return false;
448
448
  }
@@ -75,4 +75,6 @@ export interface IProps {
75
75
  checkAttachIdList: any[];
76
76
  /** 文档id列表 */
77
77
  documentIdList: string[];
78
+ /** 流程状态 */
79
+ flowStatus: number;
78
80
  }
@@ -20,6 +20,7 @@ var _accept = [
20
20
  '.docx',
21
21
  '.xls',
22
22
  '.xlsx',
23
+ '.xlsm',
23
24
  '.rar',
24
25
  '.zip',
25
26
  '.jpg',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ztxkui",
3
- "version": "3.3.15",
3
+ "version": "3.3.18",
4
4
  "private": false,
5
5
  "description": "React components library",
6
6
  "author": "zt-front-end",