uepay-mesh 4.0.21 → 4.0.22-beta-1

package/bpm/form/flow.js

@@ -4,26 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("core-js/modules/web.dom.iterable.js");
-var _react = _interopRequireWildcard(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _antd = require("antd");
 var _dateFormat = require("../util/dateFormat");
 var _serverEnums = require("../config/serverEnums");
 var _CheckOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/CheckOutlined"));
 var _LoadingOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/LoadingOutlined"));
+var _ClockCircleOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/ClockCircleOutlined"));
+var _CloseOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/CloseOutlined"));
+var _EditOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/EditOutlined"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const {
   Item
 } = _antd.Timeline;
-function Pending(_ref) {
-  let {
-    current
-  } = _ref;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", null, current.title), /*#__PURE__*/_react.default.createElement("p", null, current.content));
-}
 
 /**
  *
@@ -31,136 +23,110 @@ function Pending(_ref) {
  * @return {*}
  * @constructor
  */
-function Flow(_ref2) {
+function Flow(_ref) {
   let {
     bpm
-  } = _ref2;
-  const {
-    current,
-    history,
-    isEnd
-  } = combineData(bpm);
-  return /*#__PURE__*/_react.default.createElement(_antd.Timeline, {
-    pending: /*#__PURE__*/_react.default.createElement(Pending, {
-      current: current
-    }),
-    mode: "left",
-    pendingDot: isEnd ? /*#__PURE__*/_react.default.createElement(_CheckOutlined.default, null) : /*#__PURE__*/_react.default.createElement(_LoadingOutlined.default, null)
-  }, history.map(node => {
-    return /*#__PURE__*/_react.default.createElement(Item, {
-      key: node.id
-    }, node.title, /*#__PURE__*/_react.default.createElement("p", null, node.content));
+  } = _ref;
+  return /*#__PURE__*/React.createElement(_antd.Timeline, {
+    mode: "left"
+  }, bpm.steps.map(step => {
+    return /*#__PURE__*/React.createElement(Item, {
+      key: step.id,
+      label: getLabel(step),
+      dot: getDot(step)
+    }, /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("span", null, "\u72C0\u614B"), "\uFF1A", /*#__PURE__*/React.createElement("span", null, getOperationName(bpm.instance, step))), /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("span", null, "\u74B0\u7BC0"), "\uFF1A", /*#__PURE__*/React.createElement("span", null, step.stepName)), /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("span", null, !!step.preStepId ? '審批人' : '修改人'), "\uFF1A", /*#__PURE__*/React.createElement("span", null, step.stepUserName)), step.preStepId && /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("span", null, "\u5BE9\u6279\u4FE1\u606F"), "\uFF1A", /*#__PURE__*/React.createElement("span", null, step.stepContext)));
   }));
 }
-
-/**
- * 处理线性流程审批数据
- * @param bpm
- * @return {Object} {current:{title:,content:,option:}, history:[{title:,content:,option:}]}
- */
-function combineData(bpm) {
-  const exeNodes = bpm.getExeNodes(),
-    bpmIns = bpm.getIns(),
-    insNodeDict = {},
-    exeNodeUsrDict = {};
-  bpm.getInsNodes().forEach(insNode => {
-    insNodeDict[insNode.id] = insNode;
-  });
-  bpm.getExeNodeUsrs().forEach(exeNodeUsr => {
-    const _nodeUsr = exeNodeUsrDict[exeNodeUsr.nodeFk] || [],
-      usrDict = bpm.usrDict;
-    _nodeUsr.push(exeNodeUsr);
-    exeNodeUsrDict[exeNodeUsr.nodeFk] = _nodeUsr;
-  });
-  const isEnd = _serverEnums.InsStatus.FINISHED === bpmIns.status,
-    curExeNode = bpm.getCurExeNode(),
-    curExeNodeId = curExeNode.id,
-    current = isEnd ? {
-      title: '流程已結束',
-      content: '',
-      options: 'finished'
-    } : {
-      title: insNodeDict[curExeNode.nodeFk].name,
-      content: combineCurrent(exeNodeUsrDict[curExeNodeId]),
-      options: 'wait'
-    },
-    history = [];
-  for (let node of exeNodes) {
-    if (node.id !== curExeNodeId) {
-      const usr = exeNodeUsrDict[node.id][0];
-      history.push({
-        id: node.id,
-        title: /*#__PURE__*/_react.default.createElement("strong", null, insNodeDict[node.nodeFk].name, "(", (0, _dateFormat.dayTime)(node.modifyDate), ")"),
-        content: /*#__PURE__*/_react.default.createElement(HisContent, {
-          exeNodeID: node.id,
-          exeNodeUsrDict: exeNodeUsrDict
-        })
+function getDot(step) {
+  switch (step.stepOperation) {
+    case _serverEnums.BpmStepOperation.Submitted:
+      return /*#__PURE__*/React.createElement(_EditOutlined.default, {
+        style: {
+          fontSize: '16px',
+          color: '#1890ff'
+        }
+      });
+    case _serverEnums.BpmStepOperation.Standby:
+      return /*#__PURE__*/React.createElement(_ClockCircleOutlined.default, {
+        style: {
+          fontSize: '16px',
+          color: '#7661eb'
+        }
+      });
+    case _serverEnums.BpmStepOperation.Waiting:
+      return /*#__PURE__*/React.createElement(_LoadingOutlined.default, {
+        style: {
+          fontSize: '16px'
+        }
+      });
+    case _serverEnums.BpmStepOperation.Approved:
+      return /*#__PURE__*/React.createElement(_CheckOutlined.default, {
+        style: {
+          fontSize: '16px',
+          color: '#52c41a'
+        }
+      });
+    case _serverEnums.BpmStepOperation.Rejected:
+      return /*#__PURE__*/React.createElement(_CloseOutlined.default, {
+        style: {
+          fontSize: '16px',
+          color: '#ff4d4f'
+        }
+      });
+    case _serverEnums.BpmStepOperation.Revoked:
+      return /*#__PURE__*/React.createElement(_CloseOutlined.default, {
+        style: {
+          fontSize: '16px',
+          color: '#ff4d4f'
+        }
+      });
+    default:
+      return /*#__PURE__*/React.createElement(_LoadingOutlined.default, {
+        style: {
+          fontSize: '16px'
+        }
       });
-    }
-  }
-  return {
-    current,
-    history,
-    isEnd
-  };
-}
-
-/**
- *
- * @param activityExeNodeUsrs {[{id:number, pid: number, instanceFk: number, nodeFk: number, usrFk: number, options: ExeNodeUserOptions}]}
- */
-function combineCurrent(activityExeNodeUsrs) {
-  const activityList = [],
-    completeList = [],
-    retList = [];
-  for (let usr of activityExeNodeUsrs) {
-    _serverEnums.ExeNodeUserOptions.WAIT === usr.options ? activityList.push(usr) : completeList.push(usr);
-  }
-  retList.push( /*#__PURE__*/_react.default.createElement("span", {
-    key: "wait"
-  }, "\u7B49\u5F85 ", activityList.map(usr => usr.name).join(), " \u5BE9\u6279 | "));
-  for (let usr of completeList) {
-    retList.push( /*#__PURE__*/_react.default.createElement("span", {
-      key: usr.id
-    }, usr.name, " ", _serverEnums.ExeNodeUserOptionsName[usr.options], " ", /*#__PURE__*/_react.default.createElement(Tip, {
-      usr: usr
-    }), " | "));
   }
-  return retList;
 }
-var _default = exports.default = Flow;
-/**
- *
- * @param exeNodeID
- * @param exeNodeUsrDict {{exeNodeId:{id:number, pid: number, instanceFk: number, nodeFk: number, usrFk: number, options: ExeNodeUserOptions}}}
- * @constructor
- */
-function HisContent(_ref3) {
-  let {
-    exeNodeID,
-    exeNodeUsrDict
-  } = _ref3;
-  const nodeUsrList = exeNodeUsrDict[exeNodeID],
-    compList = [];
-  for (let usr of nodeUsrList) {
-    compList.push( /*#__PURE__*/_react.default.createElement("span", {
-      key: usr.id
-    }, usr.name, " ", _serverEnums.ExeNodeUserOptionsName[usr.options], " ", /*#__PURE__*/_react.default.createElement(Tip, {
-      usr: usr
-    }), " | "));
+function getLabel(step) {
+  switch (step.stepOperation) {
+    case _serverEnums.BpmStepOperation.Submitted:
+      return "\u4FEE\u6539(".concat((0, _dateFormat.dayTime)(step.operationTime), ")");
+    case _serverEnums.BpmStepOperation.Standby:
+      return '待審批';
+    case _serverEnums.BpmStepOperation.Waiting:
+      return '審批中';
+    case _serverEnums.BpmStepOperation.Approved:
+      return "\u5DF2\u901A\u904E(".concat((0, _dateFormat.dayTime)(step.operationTime), ")");
+    case _serverEnums.BpmStepOperation.Rejected:
+      return "\u5DF2\u62D2\u7D55(".concat((0, _dateFormat.dayTime)(step.operationTime), ")");
+    default:
+      return '審批中';
   }
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, compList);
 }
-function Tip(_ref4) {
-  let {
-    usr
-  } = _ref4;
-  switch (usr.options) {
-    case _serverEnums.ExeNodeUserOptions.REFUSE:
-      return /*#__PURE__*/_react.default.createElement("strong", null, "\u539F\u56E0\uFF1A", usr.remark);
-    case _serverEnums.ExeNodeUserOptions.APPROVE:
-      return /*#__PURE__*/_react.default.createElement("strong", null, "\u610F\u898B\uFF1A", usr.remark);
+function getOperationName(instance, step) {
+  switch (step.stepOperation) {
+    case _serverEnums.BpmStepOperation.Submitted:
+      switch (instance.access) {
+        case _serverEnums.ExeNodeUserOptions.Update:
+          return '修改後提交';
+        case _serverEnums.ExeNodeUserOptions.Insert:
+          return '新增後提交';
+        case _serverEnums.ExeNodeUserOptions.Delete:
+          return '刪除後提交';
+        default:
+          return '提交';
+      }
+    case _serverEnums.BpmStepOperation.Standby:
+      return '待審批';
+    case _serverEnums.BpmStepOperation.Waiting:
+      return '審批中';
+    case _serverEnums.BpmStepOperation.Approved:
+      return '已通過';
+    case _serverEnums.BpmStepOperation.Rejected:
+      return '拒絕';
     default:
-      return null;
+      return '審批中';
   }
-}
+}
+var _default = exports.default = Flow;

package/bpm/form/options/approve.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("core-js/modules/es6.regexp.replace.js");
 require("core-js/modules/web.dom.iterable.js");
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -23,13 +22,6 @@ const {
     Approve: 'Approve',
     Refuse: 'Refuse'
   },
-  Text = {
-    Approve: '[#APPROVE#]',
-    Refuse: '[#REFUSE#]'
-  },
-  getText = text => {
-    return text && text.replace(Text.Approve, '同意!').replace(Text.Refuse, '拒绝!') || '';
-  },
   getTip = option => {
     if (Options.Approve === option) {
       return '確認同意流程?!';
@@ -58,26 +50,52 @@ function Approve(_ref) {
     placement,
     size
   } = _ref;
-  const [value, setValue] = (0, _react.useState)(false),
-    [radio, setRadio] = (0, _react.useState)(false),
+  return bpm.options[_serverEnums.BpmFormOptions.Approve] ? /*#__PURE__*/_react.default.createElement(ApproveComponent, {
+    loading: loading,
+    bpm: bpm,
+    onApprove: onApprove,
+    onRefuse: onRefuse
+  }) : null;
+}
+Approve.propTypes = {
+  size: _propTypes.default.oneOf(['large', 'middle', 'small']),
+  placement: _propTypes.default.oneOf(['left', 'bottomLeft']),
+  onComment: _propTypes.default.func
+};
+Approve.defaultProps = {
+  size: "middle",
+  placement: "bottomLeft"
+};
+var _default = exports.default = Approve;
+function ApproveComponent(_ref2) {
+  let {
+    loading,
+    onApprove,
+    onRefuse,
+    placement,
+    size
+  } = _ref2;
+  const textRef = (0, _react.useRef)(null),
+    [radio, setRadio] = (0, _react.useState)(null),
     [visible, setVisible] = (0, _react.useState)(false);
   function handleChange(e) {
     const select = e.target.value;
-    if (!value || value === Text.Approve || value === Text.Refuse) {
-      setValue(Text[select]);
-    }
     setRadio(select);
   }
   function handelSubmit() {
-    const text = getText(value);
+    var _textRef$current, _textRef$current2;
     setVisible(false);
+    const value = ((_textRef$current = textRef.current) === null || _textRef$current === void 0 || (_textRef$current = _textRef$current.resizableTextArea) === null || _textRef$current === void 0 || (_textRef$current = _textRef$current.textArea) === null || _textRef$current === void 0 ? void 0 : _textRef$current.value) || '';
     if (Options.Approve === radio) {
-      onApprove(text);
+      onApprove(value);
     } else {
-      onRefuse(text);
+      onRefuse(value);
+    }
+    if ((_textRef$current2 = textRef.current) !== null && _textRef$current2 !== void 0 && (_textRef$current2 = _textRef$current2.resizableTextArea) !== null && _textRef$current2 !== void 0 && _textRef$current2.textArea) {
+      textRef.current.resizableTextArea.textArea.value = '';
     }
   }
-  return bpm.options[_serverEnums.BpmFormOptions.Approve] ? /*#__PURE__*/_react.default.createElement(_antd.Popover, {
+  return /*#__PURE__*/_react.default.createElement(_antd.Popover, {
     placement: placement,
     visible: visible,
     onVisibleChange: visible => {
@@ -99,28 +117,15 @@ function Approve(_ref) {
       loading: loading,
       disabled: !radio
     }, "\u63D0\u4EA4"))), /*#__PURE__*/_react.default.createElement(TextArea, {
+      ref: textRef,
       cols: 50,
       rows: 4,
       allowClear: true,
       showCount: true,
-      placeholder: "\u8ACB\u8F38\u5165\u5BE9\u6279\u610F\u898B",
-      value: getText(value),
-      onChange: e => {
-        setValue(e.target.value);
-      }
+      placeholder: "\u8ACB\u8F38\u5165\u5BE9\u6279\u610F\u898B"
     }))
   }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
     size: size,
     loading: loading
-  }, "\u5BE9\u6279")) : null;
-}
-Approve.propTypes = {
-  size: _propTypes.default.oneOf(['large', 'middle', 'small']),
-  placement: _propTypes.default.oneOf(['left', 'bottomLeft']),
-  onComment: _propTypes.default.func
-};
-Approve.defaultProps = {
-  size: "middle",
-  placement: "bottomLeft"
-};
-var _default = exports.default = Approve;
+  }, "\u5BE9\u6279"));
+}

package/bpm/form/options/revoke.js

@@ -27,9 +27,12 @@ function Revoke(_ref) {
     placement,
     size
   } = _ref;
+  function handleRevoke() {
+    onRevoke('');
+  }
   return bpm.options[_serverEnums.BpmFormOptions.Revoke] ? /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
-    title: "\u64A4\u56DE\u5F8C\u6240\u6709\u5BE9\u6279\u5C07\u6703\u4F5C\u5EE2\uFF0C\u786E\u5B9A\u64A4\u56DE?!",
-    onConfirm: onRevoke
+    title: "\u64A4\u56DE\u5F8C\u5BE9\u6279\u5C07\u6703\u4F5C\u5EE2\uFF0C\u786E\u5B9A\u64A4\u56DE?!",
+    onConfirm: handleRevoke
   }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
     loading: loading,
     size: size

package/bpm/form/options.js

@@ -16,24 +16,40 @@ const Config = {
   size: "small",
   placement: "left"
 };
+
+/**
+ * 
+ * @param {{operation:'123'}} operation 
+ * @returns 
+ */
 function Options(_ref) {
   let {
     bpm,
-    opt,
+    operation,
+    loading,
     onApprove,
+    onRefuse,
     onRevoke,
     onComment,
     onClose
   } = _ref;
-  return /*#__PURE__*/_react.default.createElement(_antd.Popover, {
-    trigger: "click",
-    content: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_revoke.default, _extends({
-      bpm: bpm
-    }, Config))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_approve.default, _extends({
-      onApprove: onApprove
-    }, Config))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_comment.default, Config)))
-  }, /*#__PURE__*/_react.default.createElement("a", {
-    className: "uepay-bpm-form-hover uepay-bpm-form-transition uepay-bpm-form-options"
-  }, /*#__PURE__*/_react.default.createElement(_AppstoreAddOutlined.default, null)));
+  return /*#__PURE__*/_react.default.createElement(_approve.default, _extends({
+    loading: loading,
+    onApprove: onApprove,
+    onRefuse: onRefuse
+  }, Config));
+  // return (<Popover trigger="click" content={<>
+  //     <div>
+  //         <Revoke bpm={bpm} {...Config}/>
+  //     </div>
+  //     <div>
+  //         <Approve onApprove={onApprove} {...Config}/>
+  //     </div>
+  //     <div>
+  //         <Comment {...Config}/>
+  //     </div>
+  // </>}><a className="uepay-bpm-form-hover uepay-bpm-form-transition uepay-bpm-form-options">
+  //     <AppstoreAddOutlined/>
+  // </a></Popover>)
 }
 var _default = exports.default = Options;

package/bpm/form/title.js

@@ -15,19 +15,6 @@ var _end = _interopRequireDefault(require("./options/end"));
 var _save = _interopRequireDefault(require("./options/save"));
 var _serverEnums = require("../config/serverEnums");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 获取提交者
- * @param bpm {BpmInstance}
- */
-function obtainApplicant(bpm) {
-  let ret = null;
-  bpm.execute.exeUsrs.forEach(usr => {
-    if (usr.type === _serverEnums.ExeUsrType.APPLICANT) {
-      ret = usr;
-    }
-  });
-}
-
 /**
  * 显示标题
  * @param {Object} bpm
@@ -56,18 +43,12 @@ const Title = _ref => {
     onClose,
     onEnd
   } = _ref;
-  const {
-      name
-    } = bpm.getExeApplicant(),
-    {
-      content
-    } = bpm.getIns();
   return /*#__PURE__*/_react.default.createElement(_antd.PageHeader, {
     backIcon: false,
     className: "site-page-header",
     onBack: () => null,
-    title: name,
-    subTitle: content,
+    title: bpm.instance.name,
+    subTitle: getSubTitle(bpm),
     extra: [/*#__PURE__*/_react.default.createElement(_close.default, {
       key: "close",
       loading: loading,
@@ -84,27 +65,46 @@ const Title = _ref => {
       loading: loading,
       bpm: bpm,
       onRevoke: onRevoke
-    }), /*#__PURE__*/_react.default.createElement(_save.default, {
-      key: "save",
-      loading: loading,
-      bpm: bpm,
-      onSave: onSave
-    }), /*#__PURE__*/_react.default.createElement(_submit.default, {
-      key: "submit",
-      loading: loading,
-      bpm: bpm,
-      onSubmit: onSubmit
-    }), /*#__PURE__*/_react.default.createElement(_comment.default, {
-      key: "comment",
-      loading: loading,
-      bpm: bpm,
-      onComment: onComment
-    }), /*#__PURE__*/_react.default.createElement(_end.default, {
-      key: "end",
-      loading: loading,
-      bpm: bpm,
-      onEnd: onEnd
-    })]
+    })
+    // (<Save key="save" loading={loading} bpm={bpm} onSave={onSave}/>),
+    // (<Submit key="submit" loading={loading} bpm={bpm} onSubmit={onSubmit}/>),
+    // (<Comment key="comment" loading={loading} bpm={bpm} onComment={onComment}/>),
+    // (<End key="end" loading={loading} bpm={bpm} onEnd={onEnd}/>)
+    ]
   });
 };
+function getSubTitle(bpm) {
+  const accessName = _serverEnums.BpmInstanceAccessDisplayName[bpm.instance.access];
+  switch (bpm.instance.state) {
+    case _serverEnums.BpmInstanceState.ACTIVITY:
+      return /*#__PURE__*/_react.default.createElement(SubTitleName, {
+        stateName: "\u5BE9\u6279\u4E2D",
+        accessName: accessName
+      });
+    case _serverEnums.BpmInstanceState.COMPLETE:
+      return /*#__PURE__*/_react.default.createElement(SubTitleName, {
+        stateName: "\u5B8C\u6210",
+        accessName: accessName
+      });
+    case _serverEnums.BpmInstanceState.BACKOUT:
+      return /*#__PURE__*/_react.default.createElement(SubTitleName, {
+        stateName: "\u64A4\u9500",
+        accessName: accessName
+      });
+    case _serverEnums.BpmInstanceState.REJECT:
+      return /*#__PURE__*/_react.default.createElement(SubTitleName, {
+        stateName: "\u62D2\u7EDD",
+        accessName: accessName
+      });
+    default:
+      return '';
+  }
+}
+function SubTitleName(_ref2) {
+  let {
+    stateName,
+    accessName
+  } = _ref2;
+  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", null, stateName), " | ", /*#__PURE__*/_react.default.createElement("span", null), accessName);
+}
 var _default = exports.default = Title;

package/bpm/list/applicantTable.js

@@ -9,20 +9,24 @@ var _react = _interopRequireWildcard(require("react"));
 var _uepayOps = require("uepay-ops2");
 var _optionsFormQueryAbleTable = _interopRequireDefault(require("../../mesh/table/optionsFormQueryAbleTable"));
 var _router = require("next/router");
+var _serverEnums = require("../config/serverEnums");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const CustomOptions = [{
-  type: 'View',
+  type: _serverEnums.BpmStepOperation.Submitted,
   icon: /*#__PURE__*/_react.default.createElement("span", null, "\u67E5\u770B"),
   tip: '查看'
 }];
 const ApplicantTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   const router = (0, _router.useRouter)();
   function handleAction(type, pkValue, record, text) {
-    if ("View" === type) {
-      ref.current.flush();
-      router.push("/bpm/form?insId=".concat(record['bpm_ins_id']));
+    if (_serverEnums.BpmStepOperation.Submitted === type) {
+      const loop = {
+        insId: record['id'],
+        operation: _serverEnums.BpmStepOperation.Submitted
+      };
+      router.push("/bpm/form?content=".concat(btoa(encodeURIComponent(JSON.stringify(loop)))));
     }
   }
   return /*#__PURE__*/_react.default.createElement(_optionsFormQueryAbleTable.default, {
@@ -31,7 +35,7 @@ const ApplicantTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
     deliverAuth: 0,
     actionOptions: CustomOptions,
     type: "auto",
-    collectId: 3495175734015488,
+    collectId: "14411294476870656",
     host: (0, _uepayOps.getHost)()
   });
 });

package/bpm/list/completeTable.js

@@ -9,11 +9,12 @@ var _react = _interopRequireWildcard(require("react"));
 var _uepayOps = require("uepay-ops2");
 var _optionsFormQueryAbleTable = _interopRequireDefault(require("../../mesh/table/optionsFormQueryAbleTable"));
 var _router = require("next/router");
+var _serverEnums = require("../config/serverEnums");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const CustomOptions = [{
-  type: 'View',
+  type: _serverEnums.BpmStepOperation.Approved,
   icon: /*#__PURE__*/_react.default.createElement("span", null, "\u67E5\u770B"),
   tip: '查看'
 }];
@@ -26,8 +27,12 @@ const CustomOptions = [{
 const CompleteTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   const router = (0, _router.useRouter)();
   function handleAction(type, pkValue, record, tex) {
-    if ("View" === type) {
-      router.push("/bpm/form?insId=".concat(record['bpm_ins_id']));
+    if (_serverEnums.BpmStepOperation.Approved === type) {
+      const loop = {
+        insId: record['id'],
+        operation: _serverEnums.BpmStepOperation.Approved
+      };
+      router.push("/bpm/form?content=".concat(btoa(encodeURIComponent(JSON.stringify(loop)))));
     }
   }
   return /*#__PURE__*/_react.default.createElement(_optionsFormQueryAbleTable.default, {
@@ -36,7 +41,7 @@ const CompleteTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
     deliverAuth: 0,
     actionOptions: CustomOptions,
     type: "auto",
-    collectId: 4277480203335168,
+    collectId: "14406472369447936",
     host: (0, _uepayOps.getHost)()
   });
 });