ydb-components-material 0.1.109 → 0.1.111

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.
Files changed (43) hide show
  1. package/build/docs/404.html +3 -3
  2. package/build/docs/_demos/:uuid +3 -3
  3. package/build/docs/colorful-button.html +3 -3
  4. package/build/docs/colorful-input.html +3 -3
  5. package/build/docs/index.html +3 -3
  6. package/build/docs/{umi.9e1659ce.js → umi.473363dd.js} +1 -1
  7. package/build/docs/{umi.2e42e1a7.css → umi.e486411a.css} +1 -1
  8. package/build/docs/~demos/:uuid.html +3 -3
  9. package/build/docs/~demos/colorful-button-demo.html +3 -3
  10. package/build/docs/~demos/colorful-input-demo.html +3 -3
  11. package/build/lowcode/assets-daily.json +11 -11
  12. package/build/lowcode/assets-dev.json +2 -2
  13. package/build/lowcode/assets-prod.json +11 -11
  14. package/build/lowcode/meta.js +1 -1
  15. package/build/lowcode/render/default/view.css +1 -1
  16. package/build/lowcode/render/default/view.js +1 -1
  17. package/build/lowcode/view.css +1 -1
  18. package/build/lowcode/view.js +1 -1
  19. package/dist/BizComps.css +1 -1
  20. package/dist/BizComps.js +10 -10
  21. package/dist/BizComps.js.map +1 -1
  22. package/es/components/file-list/index.d.ts +1 -1
  23. package/es/components/file-list/item.d.ts +1 -1
  24. package/es/components/file-list/item.js +25 -12
  25. package/es/components/file-list/signerInfo.js +33 -14
  26. package/es/components/file-list/signerInfo.scss +28 -1
  27. package/es/components/guide/compoents/materials/situation.js +1 -1
  28. package/es/components/sign-file/index.js +31 -17
  29. package/es/components/sign-file/index.scss +4 -2
  30. package/lib/components/file-list/index.d.ts +1 -1
  31. package/lib/components/file-list/item.d.ts +1 -1
  32. package/lib/components/file-list/item.js +25 -12
  33. package/lib/components/file-list/signerInfo.js +33 -14
  34. package/lib/components/file-list/signerInfo.scss +28 -1
  35. package/lib/components/guide/compoents/materials/situation.js +1 -1
  36. package/lib/components/sign-file/index.js +31 -17
  37. package/lib/components/sign-file/index.scss +4 -2
  38. package/lowcode/file-list/meta.ts +2 -2
  39. package/lowcode_es/file-list/meta.js +2 -2
  40. package/lowcode_es/meta.js +1 -1
  41. package/lowcode_lib/file-list/meta.js +2 -2
  42. package/lowcode_lib/meta.js +1 -1
  43. package/package.json +3 -3
@@ -5,7 +5,7 @@ export interface FileListProps {
5
5
  * 列表数据
6
6
  */
7
7
  fileList: Array<object>;
8
- signerInfo: object;
8
+ signerInfo?: object;
9
9
  token: string;
10
10
  tokenTY: string;
11
11
  accessToken: string;
@@ -18,7 +18,7 @@ export interface FileItemProps {
18
18
  isInValid: boolean;
19
19
  userInfo: object;
20
20
  style?: object;
21
- signerInfo: object;
21
+ signerInfo?: object;
22
22
  openLoading: () => void;
23
23
  closeLoading: () => void;
24
24
  valChange: (value: any, fileIndex: any, index: any, subIndex: any) => void;
@@ -23,6 +23,8 @@ import CheckPoint from "./checkPoint";
23
23
  import SignerInfo from "./signerInfo";
24
24
  import "./item.scss";
25
25
  var RadioGroup = _Radio.Group;
26
+ var SELF = 0;
27
+ var OTHER = 1;
26
28
  var FileItem = function FileItem(_ref) {
27
29
  var index = _ref.index,
28
30
  subIndex = _ref.subIndex,
@@ -60,7 +62,16 @@ var FileItem = function FileItem(_ref) {
60
62
  keyPoint = fileConfig.keyPoint,
61
63
  isSmart = fileConfig.isSmart,
62
64
  isShareFile = fileConfig.isShareFile,
63
- needOtherSign = fileConfig.needOtherSign;
65
+ signatureSelfRole = fileConfig.signatureSelfRole,
66
+ signatureAgentRole = fileConfig.signatureAgentRole,
67
+ signSelfRole = fileConfig.signSelfRole,
68
+ signAgentRole = fileConfig.signAgentRole;
69
+ // 需要他人签批或签章
70
+ var needOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER) || signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
71
+ // 需要他人签名
72
+ var isNeedOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER);
73
+ // 需要他人签章
74
+ var isNeedOtherSeal = signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
64
75
  var signBtnText = needOtherSign ? '联合签署' : '签署文件';
65
76
  var reSignBtnText = needOtherSign ? '重新联合签署' : '重新签署';
66
77
  var _useState = useState(false),
@@ -303,7 +314,6 @@ var FileItem = function FileItem(_ref) {
303
314
 
304
315
  // 签章
305
316
  var seal = function seal() {
306
- console.log('fileType', fileType);
307
317
  var type = getFileExtension(fileName);
308
318
  if (type !== 'pdf') {
309
319
  _Message.notice('只有pdf文件才能使用电子签章');
@@ -313,6 +323,12 @@ var FileItem = function FileItem(_ref) {
313
323
  setIsShowSealPage(true);
314
324
  };
315
325
  var signAndSeal = function signAndSeal() {
326
+ // const notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF)
327
+ // // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
328
+ // if (notNeedSelfSign && needOtherSign) {
329
+ // setShowSignerInfo(true)
330
+ // return
331
+ // }
316
332
  // 如果不能签章就直接签批
317
333
  if (!(userInfo.acctType === '20' && signEnable)) {
318
334
  sign();
@@ -728,13 +744,7 @@ var FileItem = function FileItem(_ref) {
728
744
  }, signatureEnable || userInfo.acctType === '20' && signEnable && /*#__PURE__*/React.createElement("div", {
729
745
  className: "operation_btn",
730
746
  onClick: signAndSeal
731
- }, isSigned && isSealed ? reSignBtnText : signBtnText), !(userInfo.acctType === '20' && signEnable) && signatureEnable && /*#__PURE__*/React.createElement("div", {
732
- className: "operation_btn",
733
- onClick: sign
734
- }, isSigned ? reSignBtnText : signBtnText), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/React.createElement("div", {
735
- className: "operation_btn",
736
- onClick: seal
737
- }, isSealed ? reSignBtnText : signBtnText)) :
747
+ }, isSigned && isSealed ? reSignBtnText : signBtnText)) :
738
748
  // 展示材料库
739
749
  !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/React.createElement("div", {
740
750
  className: "operation_btn",
@@ -885,10 +895,13 @@ var FileItem = function FileItem(_ref) {
885
895
  }), showSignerInfo && /*#__PURE__*/React.createElement(SignerInfo, {
886
896
  signerInfo: signerInfo,
887
897
  handleClose: function handleClose() {
888
- console.log('close');
889
- setShowSignerInfo(false);
898
+ return setShowSignerInfo(false);
890
899
  },
891
- saveSignerInfo: saveSignerInfo
900
+ saveSignerInfo: saveSignerInfo,
901
+ signatureEnable: signatureEnable,
902
+ signEnable: signEnable,
903
+ isNeedOtherSign: isNeedOtherSign,
904
+ isNeedOtherSeal: isNeedOtherSeal
892
905
  }));
893
906
  };
894
907
  FileItem.displayName = 'FileItem';
@@ -14,7 +14,11 @@ var RadioGroup = _Radio.Group;
14
14
  function SignerInfo(props) {
15
15
  var handleClose = props.handleClose,
16
16
  signerInfo = props.signerInfo,
17
- saveSignerInfo = props.saveSignerInfo;
17
+ saveSignerInfo = props.saveSignerInfo,
18
+ signatureEnable = props.signatureEnable,
19
+ signEnable = props.signEnable,
20
+ isNeedOtherSign = props.isNeedOtherSign,
21
+ isNeedOtherSeal = props.isNeedOtherSeal;
18
22
  var _React$useState = React.useState([]),
19
23
  signerInfoList = _React$useState[0],
20
24
  setSignerInfoList = _React$useState[1];
@@ -22,7 +26,7 @@ function SignerInfo(props) {
22
26
  showQRcode = _useState[0],
23
27
  setShowQRcode = _useState[1];
24
28
  var canvasRef = useRef(null);
25
- var _useState2 = useState('123123'),
29
+ var _useState2 = useState(''),
26
30
  url = _useState2[0],
27
31
  setUrl = _useState2[1];
28
32
  var handleFieldChange = function handleFieldChange(field, val, index) {
@@ -42,7 +46,7 @@ function SignerInfo(props) {
42
46
  case 1:
43
47
  saveRes = _context.sent;
44
48
  if (saveRes) {
45
- setUrl('12312312');
49
+ setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?draftNo=" + saveRes);
46
50
  setShowQRcode(true);
47
51
  } else {
48
52
  _Message.warning('信息保存失败,请重试');
@@ -71,15 +75,31 @@ function SignerInfo(props) {
71
75
  };
72
76
  useEffect(function () {
73
77
  if (signerInfo) {
74
- setSignerInfoList([signerInfo]);
78
+ console.log('signerInfo', signerInfo);
79
+ var corpName = signerInfo.corpName,
80
+ certificateSno = signerInfo.certificateSno,
81
+ legalMobile = signerInfo.legalMobile;
82
+ setSignerInfoList([{
83
+ signType: 1,
84
+ signerCompany: corpName,
85
+ signerCertificateSno: certificateSno,
86
+ signerPhoneNum: legalMobile
87
+ }]);
88
+ } else {
89
+ setSignerInfoList([{
90
+ signType: 0,
91
+ signerName: '',
92
+ signerCompany: '',
93
+ signContent: ''
94
+ }]);
75
95
  }
76
96
  }, [signerInfo]);
77
97
  useEffect(function () {
78
98
  if (canvasRef.current) {
79
99
  var options = {
80
- width: 250,
100
+ width: 110,
81
101
  // 二维码的宽度
82
- height: 250,
102
+ height: 110,
83
103
  // 二维码的高度
84
104
  color: {
85
105
  dark: '#000000',
@@ -197,7 +217,7 @@ function SignerInfo(props) {
197
217
  }, "*")), /*#__PURE__*/React.createElement(_Input, {
198
218
  className: "signer-info-input",
199
219
  placeholder: "\u8BF7\u8F93\u5165",
200
- value: item.signerCompany,
220
+ value: item.signerCertificateSno,
201
221
  onChange: function onChange(val) {
202
222
  return handleFieldChange('signerCompany', val, index);
203
223
  }
@@ -216,16 +236,13 @@ function SignerInfo(props) {
216
236
  return handleFieldChange('signContent', val, index);
217
237
  },
218
238
  "aria-labelledby": "groupId"
219
- }, /*#__PURE__*/React.createElement(_Checkbox, {
239
+ }, signatureEnable && isNeedOtherSign && /*#__PURE__*/React.createElement(_Checkbox, {
220
240
  id: "1",
221
241
  value: "1"
222
- }, "\u4EC5\u7B7E\u540D"), /*#__PURE__*/React.createElement(_Checkbox, {
242
+ }, "\u4EC5\u7B7E\u540D"), signEnable && isNeedOtherSeal && item.signType === 1 && /*#__PURE__*/React.createElement(_Checkbox, {
223
243
  id: "2",
224
244
  value: "2"
225
- }, "\u4EC5\u7B7E\u7AE0"), /*#__PURE__*/React.createElement(_Checkbox, {
226
- id: "3",
227
- value: "3"
228
- }, "\u7B7E\u540D\u548C\u7B7E\u7AE0")))));
245
+ }, "\u4EC5\u7B7E\u7AE0")))));
229
246
  })), /*#__PURE__*/React.createElement("div", {
230
247
  className: "footer"
231
248
  }, /*#__PURE__*/React.createElement("div", {
@@ -247,7 +264,9 @@ function SignerInfo(props) {
247
264
  }), /*#__PURE__*/React.createElement("canvas", {
248
265
  className: "qrcode-canvas",
249
266
  ref: canvasRef
250
- }), /*#__PURE__*/React.createElement("p", null, "\u7B7E\u7F72\u4E8C\u7EF4\u7801"), /*#__PURE__*/React.createElement("p", {
267
+ }), /*#__PURE__*/React.createElement("p", {
268
+ className: "code-title"
269
+ }, "\u7B7E\u7F72\u4E8C\u7EF4\u7801"), /*#__PURE__*/React.createElement("p", {
251
270
  className: "tip"
252
271
  }, "\u60A8\u53EF\u4EE5\u5C06\u4E8C\u7EF4\u7801\u622A\u56FE\u5206\u4EAB\u81F3\u7B7E\u7F72\u65B9\uFF0C\u4E5F\u53EF\u70B9\u51FB\u4E0B\u65B9\u6309\u94AE\u5C06\u94FE\u63A5\u53D1\u9001\u81F3\u7B7E\u7F72\u65B9\uFF0C\u7B7E\u7F72\u65B9\u9700\u767B\u5F55\u4E09\u664B\u901A\u5C0F\u7A0B\u5E8F\uFF0C\u540C\u4E00\u4EFD\u6750\u6599\u8BF7\u52FF\u591A\u4EBA\u540C\u65F6\u7B7E\u7F72"), /*#__PURE__*/React.createElement("div", {
253
272
  className: "copy-link",
@@ -23,7 +23,34 @@
23
23
 
24
24
  }
25
25
 
26
-
26
+ .code-title {
27
+ font-size: 18px;
28
+ font-weight: 500;
29
+ margin-top: 24px;
30
+ color: #333333;
31
+ margin-bottom: 12px;
32
+ }
33
+
34
+ .tip {
35
+ font-size: 15px;
36
+ color: #666666;
37
+ width: 90%;
38
+ }
39
+
40
+ .copy-link {
41
+ height: 40px;
42
+ border-radius: 50px;
43
+ text-align: center;
44
+ line-height: 40px;
45
+ color: #1678FF;
46
+ font-size: 16px;
47
+ font-weight: 500;
48
+ box-sizing: border-box;
49
+ border: 1px solid #1678FF;
50
+ width: 90%;
51
+ margin-top: 40px;
52
+ }
53
+
27
54
  }
28
55
  .signer-info {
29
56
  min-height: 50%;
@@ -29,7 +29,7 @@ var Situation = function Situation(_ref) {
29
29
  return function () {
30
30
  window.removeEventListener('message', getMessage);
31
31
  };
32
- }, []);
32
+ }, [eventInfoProp, taskHandleItemProp, situationPageUrlProp, declarationAppTokenProp, finalMaterialsProp, applicationIdProp, accessTokenProp, acctTypeProp]);
33
33
  var initPage = function initPage() {
34
34
  if (!situationPageUrlProp) return;
35
35
  var url = situationPageUrlProp + "&isFirst=1&isReCheck=1";
@@ -68,7 +68,7 @@ var SignFile = function SignFile(_ref) {
68
68
  return _regeneratorRuntime.wrap(function (_context) {
69
69
  while (1) switch (_context.prev = _context.next) {
70
70
  case 0:
71
- if (fileUrl) {
71
+ if (fileId) {
72
72
  _context.next = 1;
73
73
  break;
74
74
  }
@@ -201,24 +201,38 @@ var SignFile = function SignFile(_ref) {
201
201
  // 获取预览图片
202
202
  var getViewUrl = /*#__PURE__*/function () {
203
203
  var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id) {
204
- var type, urlRes, res, list;
204
+ var type, _urlRes, urlRes, res, list;
205
205
  return _regeneratorRuntime.wrap(function (_context4) {
206
206
  while (1) switch (_context4.prev = _context4.next) {
207
207
  case 0:
208
208
  type = getFileExtension(fileName);
209
209
  if (!['png', 'jpg', 'jpeg'].includes(type)) {
210
- _context4.next = 1;
210
+ _context4.next = 2;
211
211
  break;
212
212
  }
213
- return _context4.abrupt("return", fileUrl);
213
+ _context4.next = 1;
214
+ return getUrlById({
215
+ id: fileId,
216
+ effectiveTime: 3600000
217
+ }, {
218
+ token: token,
219
+ tokenTY: tokenTY,
220
+ baseUrl: baseUrl,
221
+ env: env,
222
+ isPC: isPC,
223
+ accessToken: accessToken
224
+ });
214
225
  case 1:
226
+ _urlRes = _context4.sent;
227
+ return _context4.abrupt("return", _urlRes.presignedUrlList[2]);
228
+ case 2:
215
229
  if (!(type !== 'pdf')) {
216
- _context4.next = 2;
230
+ _context4.next = 3;
217
231
  break;
218
232
  }
219
233
  return _context4.abrupt("return", '');
220
- case 2:
221
- _context4.next = 3;
234
+ case 3:
235
+ _context4.next = 4;
222
236
  return getUrlById({
223
237
  id: id,
224
238
  effectiveTime: 3600000
@@ -230,14 +244,14 @@ var SignFile = function SignFile(_ref) {
230
244
  isPC: isPC,
231
245
  accessToken: accessToken
232
246
  });
233
- case 3:
247
+ case 4:
234
248
  urlRes = _context4.sent;
235
249
  if (!(urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0)) {
236
- _context4.next = 6;
250
+ _context4.next = 7;
237
251
  break;
238
252
  }
239
253
  console.log('urlRes', urlRes);
240
- _context4.next = 4;
254
+ _context4.next = 5;
241
255
  return onlinePreview({
242
256
  url: urlRes.presignedUrlList[2]
243
257
  }, {
@@ -248,15 +262,15 @@ var SignFile = function SignFile(_ref) {
248
262
  isPC: isPC,
249
263
  accessToken: accessToken
250
264
  });
251
- case 4:
265
+ case 5:
252
266
  res = _context4.sent;
253
- _context4.next = 5;
267
+ _context4.next = 6;
254
268
  return extractImageUrls(res.url);
255
- case 5:
269
+ case 6:
256
270
  list = _context4.sent;
257
271
  console.log('list---', list);
258
272
  return _context4.abrupt("return", list[0]);
259
- case 6:
273
+ case 7:
260
274
  case "end":
261
275
  return _context4.stop();
262
276
  }
@@ -314,10 +328,10 @@ var SignFile = function SignFile(_ref) {
314
328
  fullScreen: true,
315
329
  visible: loading
316
330
  }, /*#__PURE__*/React.createElement("div", {
317
- className: "sign_file_main"
318
- }, /*#__PURE__*/React.createElement("div", {
319
- className: "sign_file_item",
331
+ className: "sign_file_main",
320
332
  style: style
333
+ }, /*#__PURE__*/React.createElement("div", {
334
+ className: "sign_file_item"
321
335
  }, /*#__PURE__*/React.createElement("div", {
322
336
  className: "file"
323
337
  }, /*#__PURE__*/React.createElement("div", {
@@ -2,6 +2,8 @@
2
2
  display: flex;
3
3
  flex-direction: column;
4
4
  height: 100%;
5
+ padding: 20px 0;
6
+ flex: 1;
5
7
  justify-content: space-between;
6
8
  .sign_btn {
7
9
  height: 40px;
@@ -19,7 +21,7 @@
19
21
  .sign_file_item {
20
22
  border-radius: 8px;
21
23
  opacity: 1;
22
- background: #F7F7F7;
24
+ background: #ffffff;
23
25
  padding: 12px;
24
26
  width: 100%;
25
27
 
@@ -51,7 +53,7 @@
51
53
  }
52
54
 
53
55
  .small_img {
54
- width: 100%;
56
+ height: 80px;
55
57
 
56
58
  }
57
59
 
@@ -5,7 +5,7 @@ export interface FileListProps {
5
5
  * 列表数据
6
6
  */
7
7
  fileList: Array<object>;
8
- signerInfo: object;
8
+ signerInfo?: object;
9
9
  token: string;
10
10
  tokenTY: string;
11
11
  accessToken: string;
@@ -18,7 +18,7 @@ export interface FileItemProps {
18
18
  isInValid: boolean;
19
19
  userInfo: object;
20
20
  style?: object;
21
- signerInfo: object;
21
+ signerInfo?: object;
22
22
  openLoading: () => void;
23
23
  closeLoading: () => void;
24
24
  valChange: (value: any, fileIndex: any, index: any, subIndex: any) => void;
@@ -29,6 +29,8 @@ var _signerInfo = _interopRequireDefault(require("./signerInfo"));
29
29
  require("./item.scss");
30
30
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
31
31
  var RadioGroup = _radio["default"].Group;
32
+ var SELF = 0;
33
+ var OTHER = 1;
32
34
  var FileItem = function FileItem(_ref) {
33
35
  var index = _ref.index,
34
36
  subIndex = _ref.subIndex,
@@ -66,7 +68,16 @@ var FileItem = function FileItem(_ref) {
66
68
  keyPoint = fileConfig.keyPoint,
67
69
  isSmart = fileConfig.isSmart,
68
70
  isShareFile = fileConfig.isShareFile,
69
- needOtherSign = fileConfig.needOtherSign;
71
+ signatureSelfRole = fileConfig.signatureSelfRole,
72
+ signatureAgentRole = fileConfig.signatureAgentRole,
73
+ signSelfRole = fileConfig.signSelfRole,
74
+ signAgentRole = fileConfig.signAgentRole;
75
+ // 需要他人签批或签章
76
+ var needOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER) || signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
77
+ // 需要他人签名
78
+ var isNeedOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER);
79
+ // 需要他人签章
80
+ var isNeedOtherSeal = signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
70
81
  var signBtnText = needOtherSign ? '联合签署' : '签署文件';
71
82
  var reSignBtnText = needOtherSign ? '重新联合签署' : '重新签署';
72
83
  var _useState = (0, _react.useState)(false),
@@ -309,7 +320,6 @@ var FileItem = function FileItem(_ref) {
309
320
 
310
321
  // 签章
311
322
  var seal = function seal() {
312
- console.log('fileType', fileType);
313
323
  var type = (0, _file2.getFileExtension)(fileName);
314
324
  if (type !== 'pdf') {
315
325
  _message["default"].notice('只有pdf文件才能使用电子签章');
@@ -319,6 +329,12 @@ var FileItem = function FileItem(_ref) {
319
329
  setIsShowSealPage(true);
320
330
  };
321
331
  var signAndSeal = function signAndSeal() {
332
+ // const notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF)
333
+ // // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
334
+ // if (notNeedSelfSign && needOtherSign) {
335
+ // setShowSignerInfo(true)
336
+ // return
337
+ // }
322
338
  // 如果不能签章就直接签批
323
339
  if (!(userInfo.acctType === '20' && signEnable)) {
324
340
  sign();
@@ -734,13 +750,7 @@ var FileItem = function FileItem(_ref) {
734
750
  }, signatureEnable || userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
735
751
  className: "operation_btn",
736
752
  onClick: signAndSeal
737
- }, isSigned && isSealed ? reSignBtnText : signBtnText), !(userInfo.acctType === '20' && signEnable) && signatureEnable && /*#__PURE__*/_react["default"].createElement("div", {
738
- className: "operation_btn",
739
- onClick: sign
740
- }, isSigned ? reSignBtnText : signBtnText), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
741
- className: "operation_btn",
742
- onClick: seal
743
- }, isSealed ? reSignBtnText : signBtnText)) :
753
+ }, isSigned && isSealed ? reSignBtnText : signBtnText)) :
744
754
  // 展示材料库
745
755
  !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/_react["default"].createElement("div", {
746
756
  className: "operation_btn",
@@ -891,10 +901,13 @@ var FileItem = function FileItem(_ref) {
891
901
  }), showSignerInfo && /*#__PURE__*/_react["default"].createElement(_signerInfo["default"], {
892
902
  signerInfo: signerInfo,
893
903
  handleClose: function handleClose() {
894
- console.log('close');
895
- setShowSignerInfo(false);
904
+ return setShowSignerInfo(false);
896
905
  },
897
- saveSignerInfo: saveSignerInfo
906
+ saveSignerInfo: saveSignerInfo,
907
+ signatureEnable: signatureEnable,
908
+ signEnable: signEnable,
909
+ isNeedOtherSign: isNeedOtherSign,
910
+ isNeedOtherSeal: isNeedOtherSeal
898
911
  }));
899
912
  };
900
913
  FileItem.displayName = 'FileItem';
@@ -20,7 +20,11 @@ var RadioGroup = _radio["default"].Group;
20
20
  function SignerInfo(props) {
21
21
  var handleClose = props.handleClose,
22
22
  signerInfo = props.signerInfo,
23
- saveSignerInfo = props.saveSignerInfo;
23
+ saveSignerInfo = props.saveSignerInfo,
24
+ signatureEnable = props.signatureEnable,
25
+ signEnable = props.signEnable,
26
+ isNeedOtherSign = props.isNeedOtherSign,
27
+ isNeedOtherSeal = props.isNeedOtherSeal;
24
28
  var _React$useState = _react["default"].useState([]),
25
29
  signerInfoList = _React$useState[0],
26
30
  setSignerInfoList = _React$useState[1];
@@ -28,7 +32,7 @@ function SignerInfo(props) {
28
32
  showQRcode = _useState[0],
29
33
  setShowQRcode = _useState[1];
30
34
  var canvasRef = (0, _react.useRef)(null);
31
- var _useState2 = (0, _react.useState)('123123'),
35
+ var _useState2 = (0, _react.useState)(''),
32
36
  url = _useState2[0],
33
37
  setUrl = _useState2[1];
34
38
  var handleFieldChange = function handleFieldChange(field, val, index) {
@@ -48,7 +52,7 @@ function SignerInfo(props) {
48
52
  case 1:
49
53
  saveRes = _context.sent;
50
54
  if (saveRes) {
51
- setUrl('12312312');
55
+ setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?draftNo=" + saveRes);
52
56
  setShowQRcode(true);
53
57
  } else {
54
58
  _message["default"].warning('信息保存失败,请重试');
@@ -77,15 +81,31 @@ function SignerInfo(props) {
77
81
  };
78
82
  (0, _react.useEffect)(function () {
79
83
  if (signerInfo) {
80
- setSignerInfoList([signerInfo]);
84
+ console.log('signerInfo', signerInfo);
85
+ var corpName = signerInfo.corpName,
86
+ certificateSno = signerInfo.certificateSno,
87
+ legalMobile = signerInfo.legalMobile;
88
+ setSignerInfoList([{
89
+ signType: 1,
90
+ signerCompany: corpName,
91
+ signerCertificateSno: certificateSno,
92
+ signerPhoneNum: legalMobile
93
+ }]);
94
+ } else {
95
+ setSignerInfoList([{
96
+ signType: 0,
97
+ signerName: '',
98
+ signerCompany: '',
99
+ signContent: ''
100
+ }]);
81
101
  }
82
102
  }, [signerInfo]);
83
103
  (0, _react.useEffect)(function () {
84
104
  if (canvasRef.current) {
85
105
  var options = {
86
- width: 250,
106
+ width: 110,
87
107
  // 二维码的宽度
88
- height: 250,
108
+ height: 110,
89
109
  // 二维码的高度
90
110
  color: {
91
111
  dark: '#000000',
@@ -203,7 +223,7 @@ function SignerInfo(props) {
203
223
  }, "*")), /*#__PURE__*/_react["default"].createElement(_input["default"], {
204
224
  className: "signer-info-input",
205
225
  placeholder: "\u8BF7\u8F93\u5165",
206
- value: item.signerCompany,
226
+ value: item.signerCertificateSno,
207
227
  onChange: function onChange(val) {
208
228
  return handleFieldChange('signerCompany', val, index);
209
229
  }
@@ -222,16 +242,13 @@ function SignerInfo(props) {
222
242
  return handleFieldChange('signContent', val, index);
223
243
  },
224
244
  "aria-labelledby": "groupId"
225
- }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
245
+ }, signatureEnable && isNeedOtherSign && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
226
246
  id: "1",
227
247
  value: "1"
228
- }, "\u4EC5\u7B7E\u540D"), /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
248
+ }, "\u4EC5\u7B7E\u540D"), signEnable && isNeedOtherSeal && item.signType === 1 && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
229
249
  id: "2",
230
250
  value: "2"
231
- }, "\u4EC5\u7B7E\u7AE0"), /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
232
- id: "3",
233
- value: "3"
234
- }, "\u7B7E\u540D\u548C\u7B7E\u7AE0")))));
251
+ }, "\u4EC5\u7B7E\u7AE0")))));
235
252
  })), /*#__PURE__*/_react["default"].createElement("div", {
236
253
  className: "footer"
237
254
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -253,7 +270,9 @@ function SignerInfo(props) {
253
270
  }), /*#__PURE__*/_react["default"].createElement("canvas", {
254
271
  className: "qrcode-canvas",
255
272
  ref: canvasRef
256
- }), /*#__PURE__*/_react["default"].createElement("p", null, "\u7B7E\u7F72\u4E8C\u7EF4\u7801"), /*#__PURE__*/_react["default"].createElement("p", {
273
+ }), /*#__PURE__*/_react["default"].createElement("p", {
274
+ className: "code-title"
275
+ }, "\u7B7E\u7F72\u4E8C\u7EF4\u7801"), /*#__PURE__*/_react["default"].createElement("p", {
257
276
  className: "tip"
258
277
  }, "\u60A8\u53EF\u4EE5\u5C06\u4E8C\u7EF4\u7801\u622A\u56FE\u5206\u4EAB\u81F3\u7B7E\u7F72\u65B9\uFF0C\u4E5F\u53EF\u70B9\u51FB\u4E0B\u65B9\u6309\u94AE\u5C06\u94FE\u63A5\u53D1\u9001\u81F3\u7B7E\u7F72\u65B9\uFF0C\u7B7E\u7F72\u65B9\u9700\u767B\u5F55\u4E09\u664B\u901A\u5C0F\u7A0B\u5E8F\uFF0C\u540C\u4E00\u4EFD\u6750\u6599\u8BF7\u52FF\u591A\u4EBA\u540C\u65F6\u7B7E\u7F72"), /*#__PURE__*/_react["default"].createElement("div", {
259
278
  className: "copy-link",
@@ -23,7 +23,34 @@
23
23
 
24
24
  }
25
25
 
26
-
26
+ .code-title {
27
+ font-size: 18px;
28
+ font-weight: 500;
29
+ margin-top: 24px;
30
+ color: #333333;
31
+ margin-bottom: 12px;
32
+ }
33
+
34
+ .tip {
35
+ font-size: 15px;
36
+ color: #666666;
37
+ width: 90%;
38
+ }
39
+
40
+ .copy-link {
41
+ height: 40px;
42
+ border-radius: 50px;
43
+ text-align: center;
44
+ line-height: 40px;
45
+ color: #1678FF;
46
+ font-size: 16px;
47
+ font-weight: 500;
48
+ box-sizing: border-box;
49
+ border: 1px solid #1678FF;
50
+ width: 90%;
51
+ margin-top: 40px;
52
+ }
53
+
27
54
  }
28
55
  .signer-info {
29
56
  min-height: 50%;
@@ -33,7 +33,7 @@ var Situation = function Situation(_ref) {
33
33
  return function () {
34
34
  window.removeEventListener('message', getMessage);
35
35
  };
36
- }, []);
36
+ }, [eventInfoProp, taskHandleItemProp, situationPageUrlProp, declarationAppTokenProp, finalMaterialsProp, applicationIdProp, accessTokenProp, acctTypeProp]);
37
37
  var initPage = function initPage() {
38
38
  if (!situationPageUrlProp) return;
39
39
  var url = situationPageUrlProp + "&isFirst=1&isReCheck=1";