eoss-ui 0.4.80 → 0.4.82

package/lib/flow.js

@@ -3086,7 +3086,7 @@ var mainDetail = '/config/configLayoutTheme/detail';
 // export const toStartFlow = '/api/mecp/v1/mecpItask/toStartFlow.json';
 var toStartFlow = '/bpm/bpmBackend/toStartFlow';
 // 暂存数据
-var tempSave = '/oa/task/taskHandle/tempSave.dhtml';
+var tempSave = '/bpm/task/taskHandle/tempSave.dhtml';
 // 获取常用意见
 // /oa/commonOpinionsManager/getOpinionsList.dhtml  /api/v1/mecpIpending/commonOpion.json
 // /api/v1/mecpIpending/commonOpion.json
@@ -3105,16 +3105,16 @@ var deleteCommonOpion = '/oa/commonOpinionsManager/delete.dhtml';
 //   '/api/mecp/v1/mecpItask/getProcessDefList.json';
 var getProcessDefList = '/bpm/bpmBackend/toStartFlowIndex';
 // 获取下步办理人 /api/mecp/v1/mecpItask/getNodeInfo.json
-var getNodeInfo = '/oa/task/taskHandle/getNodeInfo.dhtml';
+var getNodeInfo = '/bpm/task/taskHandle/getNodeInfo.dhtml';
 
 // 系统消息
 // 通知方式
 var findCodeValues = '/bpm/bpmCommon/findCodeValues';
 var findSysParam = '/bpm/bpmCommon/findSysParam';
-var findSysCodes = '/oa/task/taskHandle/getDefaultNotificationType.dhtml';
+var findSysCodes = '/bpm/task/taskHandle/getDefaultNotificationType.dhtml';
 
 // 获取通知消息
-var getNotificationMsg = '/oa/task/taskHandle/getNotificationMsg.dhtml';
+var getNotificationMsg = '/bpm/task/taskHandle/getNotificationMsg.dhtml';
 // 获取审核页面数据
 var getHandleInfoHtml = '/bpm/bpmBackend/toTaskHandleIndex.dhtml';
 // export const getHandleInfoHtml =
@@ -3122,11 +3122,11 @@ var getHandleInfoHtml = '/bpm/bpmBackend/toTaskHandleIndex.dhtml';
 // 获取节点信息(获取节点属性及办理人)
 // export const getNodeInfoHtml = '/api/mecp/v1/mecpItask/getNodeInfoHtml.json';
 // 提交办理
-var taskHandleHtml = '/oa/task/taskHandle/taskHandle.dhtml';
+var taskHandleHtml = '/bpm/task/taskHandle/taskHandle.dhtml';
 // 获取流程图
 var getView = '/bpm/service/diagram/view.html';
 // 开始流程
-var register = '/oa/task/taskHandle/startFlow.dhtml';
+var register = '/bpm/task/taskHandle/startFlow.dhtml';
 // 获取流程列表
 var pendedhistoryList = '/api/v1/mecpIpending/pendedhistoryList.json';
 // 获取审核按钮信息
@@ -3153,7 +3153,7 @@ var endFlowHtml = '/bpm/task/taskHandle/endFlow.dhtml';
 // 获取用户信息
 // export const findUserBaseInfos = '/api/v1/mecpSys/findUserBaseInfo.dhtml';
 // 搜索用户信息
-var handleInfo = '/oa/task/taskHandle/handleInfo.dhtml';
+var handleInfo = '/bpm/task/taskHandle/handleInfo.dhtml';
 // 获取当前用户信息
 var loginUserInfo = '/bpm/bpmCommon/loginUserInfo';
 
@@ -3162,9 +3162,9 @@ var wss = window.wss || '/main2/ws';
 // 订阅
 var topic = '/user/topic/all';
 // 流程预设
-var getPresetCustomInfo = '/oa/task/taskHandle/getPresetCustomInfo.dhtml';
+var getPresetCustomInfo = '/bpm/task/taskHandle/getPresetCustomInfo.dhtml';
 // 办理人预设
-var getPresetNodeInfo = '/oa/task/taskHandle/getPresetNodeInfo.dhtml';
+var getPresetNodeInfo = '/bpm/task/taskHandle/getPresetNodeInfo.dhtml';
 // 获取转办页面数据
 var toTaskTransferIndex = '/bpm/bpmBackend/toTaskTransferIndex';
 // 转办提交按钮
@@ -3195,12 +3195,12 @@ var taskTakeAdvice = '/bpm/task/taskHandle/taskTakeAdvice.dhtml';
 var toTaskStartDraft = '/bpm/bpmBackend/totaskStartDraft';
 
 // 稿件递送提交接口
-// export const taskStartDraft = '/oa/task/taskHandle/taskStartDraft.dhtml';
+// export const taskStartDraft = '/bpm/task/taskHandle/taskStartDraft.dhtml';
 var taskStartDraft = '/archives/task/taskHandle/taskStartDraft.dhtml';
 // 复核
 var toTaskReview = '/bpm/bpmBackend/toTaskReview';
 // 复核提交
-var taskReview = '/oa/task/taskHandle/taskReview.dhtml';
+var taskReview = '/bpm/task/taskHandle/taskReview.dhtml';
 // 联合用印
 var toTaskUnionSeal = '/bpm/bpmBackend/toTaskUnionSeal';
 // 联合用印提交
@@ -3561,7 +3561,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=446ce748&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=3b4925ad&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4699,92 +4699,213 @@ var render = function () {
                         1
                       )
                     : _vm._e(),
-                  _vm.nodeInfos.length > 0 ||
-                  _vm.nodeInfo.option.length > 0 ||
-                  _vm.operationList.length > 0
+                  (_vm.nodeInfos.length > 0 ||
+                    _vm.nodeInfo.option.length > 0 ||
+                    _vm.operationList.length > 0) &&
+                  _vm.btnList.length <= 2
                     ? _c(
                         "div",
                         { staticClass: "es-user-defined" },
-                        _vm._l(_vm.btnList, function (item) {
-                          return _c(
-                            "el-button",
-                            {
-                              directives: [
-                                {
-                                  name: "show",
-                                  rawName: "v-show",
-                                  value:
-                                    _vm.isSubmitButtonShowAgreeAndDisagree != 1,
-                                  expression:
-                                    "isSubmitButtonShowAgreeAndDisagree != 1",
-                                },
-                              ],
-                              key: item.name,
-                              style: _vm.btnStyle,
-                              attrs: { type: item.type },
-                              on: {
-                                click: function ($event) {
-                                  item.event === "sub"
-                                    ? _vm.subProcess()
-                                    : _vm.saveInfo(false, item)
-                                },
-                              },
-                            },
-                            [
-                              _vm._v(
-                                "\n        " + _vm._s(item.text) + "\n      "
-                              ),
-                            ]
-                          )
-                        }),
-                        1
-                      )
-                    : _vm._e(),
-                  !_vm.isFlow
-                    ? _c(
-                        "div",
-                        { staticClass: "es-footer-btn" },
                         [
-                          _vm.rejectObj.fun
-                            ? _c(
-                                "el-button",
-                                {
-                                  staticClass: "btn",
-                                  attrs: { type: "danger" },
-                                  on: { click: _vm.rejectBtn },
-                                },
-                                [_vm._v("\n        驳回\n      ")]
-                              )
-                            : _vm._e(),
-                          _vm.pointsReadingObj.fun
-                            ? _c(
-                                "el-button",
-                                {
-                                  staticClass: "btn",
-                                  on: { click: _vm.taskReadBtn },
-                                },
-                                [_vm._v("分阅")]
-                              )
-                            : _vm._e(),
-                          _vm._l(_vm.moreList, function (item) {
+                          _vm._l(_vm.btnList.slice(0, 1), function (item) {
                             return _c(
                               "el-button",
                               {
-                                key: item.key,
-                                staticClass: "btn",
+                                directives: [
+                                  {
+                                    name: "show",
+                                    rawName: "v-show",
+                                    value:
+                                      _vm.isSubmitButtonShowAgreeAndDisagree !=
+                                      1,
+                                    expression:
+                                      "isSubmitButtonShowAgreeAndDisagree != 1",
+                                  },
+                                ],
+                                key: item.name,
+                                style: _vm.btnStyle,
+                                attrs: { type: item.type },
                                 on: {
                                   click: function ($event) {
-                                    _vm.goView(item)
+                                    item.event === "sub"
+                                      ? _vm.subProcess()
+                                      : _vm.saveInfo(false, item)
                                   },
                                 },
                               },
                               [
                                 _vm._v(
-                                  "\n        " + _vm._s(item.value) + "\n      "
+                                  "\n        " + _vm._s(item.text) + "\n      "
                                 ),
                               ]
                             )
                           }),
+                          _vm.btnList.length > 2 ||
+                          (!_vm.isFlow &&
+                            (_vm.rejectObj.fun ||
+                              _vm.pointsReadingObj.fun ||
+                              _vm.moreList))
+                            ? _c(
+                                "div",
+                                {
+                                  attrs: { placement: "top", trigger: "click" },
+                                },
+                                [
+                                  _c(
+                                    "el-button-group",
+                                    {
+                                      staticStyle: { margin: "0px 10px" },
+                                      attrs: { slot: "reference" },
+                                      slot: "reference",
+                                    },
+                                    [
+                                      _vm._l(
+                                        _vm.btnList.slice(1),
+                                        function (item) {
+                                          return _c(
+                                            "el-button",
+                                            {
+                                              directives: [
+                                                {
+                                                  name: "show",
+                                                  rawName: "v-show",
+                                                  value:
+                                                    _vm.isSubmitButtonShowAgreeAndDisagree !=
+                                                    1,
+                                                  expression:
+                                                    "isSubmitButtonShowAgreeAndDisagree != 1",
+                                                },
+                                              ],
+                                              key: item.name,
+                                              style: _vm.btnStyle,
+                                              attrs: { type: item.type },
+                                              on: {
+                                                click: function ($event) {
+                                                  $event.stopPropagation()
+                                                  item.event === "sub"
+                                                    ? _vm.subProcess()
+                                                    : _vm.saveInfo(false, item)
+                                                },
+                                              },
+                                            },
+                                            [
+                                              _vm._v(
+                                                "\n            " +
+                                                  _vm._s(item.text) +
+                                                  "\n          "
+                                              ),
+                                            ]
+                                          )
+                                        }
+                                      ),
+                                      !_vm.isFlow &&
+                                      (_vm.rejectObj.fun ||
+                                        _vm.pointsReadingObj.fun ||
+                                        _vm.moreList.length > 0)
+                                        ? _c(
+                                            "el-dropdown",
+                                            {
+                                              staticStyle: {
+                                                "border-left":
+                                                  "1px solid #d9d9d9",
+                                              },
+                                              attrs: {
+                                                trigger: "click",
+                                                placement: "top",
+                                              },
+                                            },
+                                            [
+                                              _c("el-button", [_vm._v("...")]),
+                                              _c(
+                                                "el-dropdown-menu",
+                                                {
+                                                  attrs: { slot: "dropdown" },
+                                                  slot: "dropdown",
+                                                },
+                                                [
+                                                  _vm._l(
+                                                    _vm.moreList,
+                                                    function (item) {
+                                                      return _c(
+                                                        "el-dropdown-item",
+                                                        { key: item.key },
+                                                        [
+                                                          _c(
+                                                            "div",
+                                                            {
+                                                              staticClass:
+                                                                "btn",
+                                                              on: {
+                                                                click:
+                                                                  function (
+                                                                    $event
+                                                                  ) {
+                                                                    _vm.goView(
+                                                                      item
+                                                                    )
+                                                                  },
+                                                              },
+                                                            },
+                                                            [
+                                                              _vm._v(
+                                                                "\n                  " +
+                                                                  _vm._s(
+                                                                    item.value
+                                                                  ) +
+                                                                  "\n                "
+                                                              ),
+                                                            ]
+                                                          ),
+                                                        ]
+                                                      )
+                                                    }
+                                                  ),
+                                                  _vm.pointsReadingObj.fun
+                                                    ? _c("el-dropdown-item", [
+                                                        _c(
+                                                          "div",
+                                                          {
+                                                            staticClass: "btn",
+                                                            on: {
+                                                              click:
+                                                                _vm.taskReadBtn,
+                                                            },
+                                                          },
+                                                          [_vm._v("分阅")]
+                                                        ),
+                                                      ])
+                                                    : _vm._e(),
+                                                  _vm.rejectObj.fun
+                                                    ? _c("el-dropdown-item", [
+                                                        _c(
+                                                          "div",
+                                                          {
+                                                            staticStyle: {
+                                                              color: "red",
+                                                            },
+                                                            on: {
+                                                              click:
+                                                                _vm.rejectBtn,
+                                                            },
+                                                          },
+                                                          [_vm._v("驳回")]
+                                                        ),
+                                                      ])
+                                                    : _vm._e(),
+                                                ],
+                                                2
+                                              ),
+                                            ],
+                                            1
+                                          )
+                                        : _vm._e(),
+                                    ],
+                                    2
+                                  ),
+                                ],
+                                1
+                              )
+                            : _vm._e(),
                         ],
                         2
                       )
@@ -5065,7 +5186,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=446ce748&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=3b4925ad&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -12420,6 +12541,56 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -12571,7 +12742,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       notificationType: [], // 通知方式
       isLimitedTime: '2', // 是否限时办理
       mainSubId: ''
-    }, _ref.nodeInfos = [], _ref.nextFlowNode = '', _ref.currentOrgName = '', _ref.otherOrgName = '', _ref.nodeInfo = {
+    }, _ref.nodeInfos = [], _ref.nextFlowNode = '', _ref.currentOrgName = '', _ref.otherOrgName = '', _ref.needRetrialAuth = false, _ref.nodeInfo = {
       nextNode: '',
       nextUser: '',
       option: []
@@ -13634,6 +13805,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           }
 
           if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
+            _this14.needRetrialAuth = !!nodeInfoMap.nodeExtAttr.isCurrentNodeSubmitNeedRetrialAuth;
             if (nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList) {
               var notice = JSON.parse(nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList);
               notice.map(function (x) {
@@ -13904,6 +14076,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             _this17.value = _this17.value.replace(RegExp('同意。', 'g'), '');
             _this17.value = val + _this17.value;
           }
+          if (!_this17.validInfo()) return;
           if (_this17.beforeSubmit == undefined) {
             _this17.subFun(_this17.sendData);
           } else {
@@ -13914,19 +14087,51 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         }
       });
     },
-    validInfo: function validInfo() {},
+    validInfo: function validInfo() {
+      if (!this.endFlow && this.newTypeCode != 'fenyue' && !this.shrink && this.nextNode.isAddSign != '1' && this.nextNode.isRemoveSign != '1' && this.isSpecial && !this.isReject && this.nodeInfos.length != 0 && this.isNextUser) {
+        if (this.isShowNextUser) {
+          if (this.nextNode.nextUserId == '' || this.multiple && this.nextNode.nextUserId.length == 0) {
+            this.$message.warning('请选择下步办理人');
+            return false;
+          }
+        } else {
+          if (this.nextNode.nextOrgId == '' || this.multiple && this.nextNode.nextOrgId.length == 0) {
+            this.$message.warning('请选择办理对象');
+            return false;
+          }
+        }
+      }
+
+      if (this.nextNode.isAddSign == '1' && this.nextNode.addSignUserId.length == 0) {
+        this.$message.warning('请选择加签办理人');
+        return false;
+      }
+      if (this.nextNode.isRemoveSign == '1' && this.nextNode.removeSignUserId.length == 0) {
+        this.$message.warning('请选择减签办理人');
+        return false;
+      }
+      if (!this.value && this.isOpinionRequired === 1) {
+        this.$message.warning('请选择输入审批意见');
+        return false;
+      }
+      if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
+        this.$message.warning('\u8BF7\u9009\u62E9' + (this.currentOrgName || '本单位'));
+        return false;
+      }
+      return true;
+    },
     sendData: function sendData() {
       var _this18 = this;
 
       this.$refs['nextNode'].validate(function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee(valid) {
-          var nextUserId, addSignUserId, removeSignUserId, str, notificationType, params, isEndUserTask, choiceOrgId, choiceDeptId, pOrgId, taskExamineInfo;
+          var nextUserId, addSignUserId, removeSignUserId, str, notificationType, params, isEndUserTask, choiceOrgId, choiceDeptId, pOrgId, taskExamineInfo, needRetrialAuth;
           return regenerator_default.a.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
                   if (!valid) {
-                    _context.next = 59;
+                    _context.next = 42;
                     break;
                   }
 
@@ -13938,36 +14143,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                   return _context.abrupt('return', _this18.handleVisible = true);
 
                 case 3:
-                  if (!(!_this18.endFlow && _this18.newTypeCode != 'fenyue' && !_this18.shrink && _this18.nextNode.isAddSign != '1' && _this18.nextNode.isRemoveSign != '1' && _this18.isSpecial && !_this18.isReject && _this18.nodeInfos.length != 0 && _this18.isNextUser)) {
-                    _context.next = 11;
-                    break;
-                  }
-
-                  if (!_this18.isShowNextUser) {
-                    _context.next = 9;
-                    break;
-                  }
-
-                  if (!(_this18.nextNode.nextUserId == '' || _this18.multiple && _this18.nextNode.nextUserId.length == 0)) {
-                    _context.next = 7;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择下步办理人'));
-
-                case 7:
-                  _context.next = 11;
-                  break;
-
-                case 9:
-                  if (!(_this18.nextNode.nextOrgId == '' || _this18.multiple && _this18.nextNode.nextOrgId.length == 0)) {
-                    _context.next = 11;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择办理对象'));
-
-                case 11:
                   nextUserId = [];
 
                   if (_this18.multiple) {
@@ -13975,23 +14150,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                       return nextUserId.push(item);
                     });
                   }
-
-                  if (!(_this18.nextNode.isAddSign == '1' && _this18.nextNode.addSignUserId.length == 0)) {
-                    _context.next = 15;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择加签办理人'));
-
-                case 15:
-                  if (!(_this18.nextNode.isRemoveSign == '1' && _this18.nextNode.removeSignUserId.length == 0)) {
-                    _context.next = 17;
-                    break;
-                  }
-
-                  return _context.abrupt('return', _this18.$message.warning('请选择减签办理人'));
-
-                case 17:
                   addSignUserId = [];
 
                   if (_this18.isCanAddSign && _this18.nextNode.isAddSign == '1') {
@@ -14006,25 +14164,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                       removeSignUserId.push(item);
                     });
                   }
-
-                  if (!(!_this18.value && _this18.isOpinionRequired === 1)) {
-                    _context.next = 24;
-                    break;
-                  }
-
-                  _this18.$message.warning('请选择输入审批意见');
-                  return _context.abrupt('return');
-
-                case 24:
-                  if (!(_this18.isHideCurrentOrg && !_this18.nextNode.nextCurrentOrgObjJson)) {
-                    _context.next = 27;
-                    break;
-                  }
-
-                  _this18.$message.warning('\u8BF7\u9009\u62E9' + (_this18.currentOrgName || '本单位'));
-                  return _context.abrupt('return');
-
-                case 27:
                   str = '';
 
                   if (_this18.value) {
@@ -14044,10 +14183,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                   if (_this18.nextNode.nextOperate != 0 && _this18.nextNode.nextOperate != 1) {
                     delete _this18.nextNode.nextNodeId;
                   }
-                  _context.next = 35;
+                  _context.next = 17;
                   return _this18.saveInfo('subMit');
 
-                case 35:
+                case 17:
                   _this18.loading = util["a" /* default */].loading(_this18.$loading, '加载中...');
 
                   notificationType = '';
@@ -14078,7 +14217,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                     delete params.addSignUserId;
                   }
                   _this18.loading = util["a" /* default */].loading(_this18.$loading, '提交中...');
-                  isEndUserTask = _this18.isEndUserTask, choiceOrgId = _this18.choiceOrgId, choiceDeptId = _this18.choiceDeptId, pOrgId = _this18.pOrgId, taskExamineInfo = _this18.taskExamineInfo;
+                  isEndUserTask = _this18.isEndUserTask, choiceOrgId = _this18.choiceOrgId, choiceDeptId = _this18.choiceDeptId, pOrgId = _this18.pOrgId, taskExamineInfo = _this18.taskExamineInfo, needRetrialAuth = _this18.needRetrialAuth;
 
                   params.isEndUserTask = isEndUserTask;
                   params.choiceOrgId = choiceOrgId;
@@ -14090,6 +14229,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                   params.processDefinitionId = taskExamineInfo.processDefinitionId;
                   params.isSubFlow = taskExamineInfo.isSubFlow;
                   params.nodeId = taskExamineInfo.nodeId;
+                  params.needRetrialAuth = needRetrialAuth;
                   return _context.abrupt('return', util["a" /* default */].ajax({ url: api["tb" /* taskHandleHtml */], method: 'post', data: params }).then(function (res) {
                     var status = res.status,
                         message = res.message;
@@ -14109,10 +14249,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                     }
                   }));
 
-                case 59:
+                case 42:
                   return _context.abrupt('return', false);
 
-                case 60:
+                case 43:
                 case 'end':
                   return _context.stop();
               }