eoss-mobiles 0.3.16 → 0.3.17

package/lib/eoss-mobile.common.js

@@ -2150,8 +2150,8 @@ mainvue_type_template_id_17308961_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=17308961
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=d4e42ba6
-var selector_treevue_type_template_id_d4e42ba6_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=a36bef12
+var selector_treevue_type_template_id_a36bef12_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2331,11 +2331,11 @@ var selector_treevue_type_template_id_d4e42ba6_render = function () {
     1
   )
 }
-var selector_treevue_type_template_id_d4e42ba6_staticRenderFns = []
-selector_treevue_type_template_id_d4e42ba6_render._withStripped = true
+var selector_treevue_type_template_id_a36bef12_staticRenderFns = []
+selector_treevue_type_template_id_a36bef12_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=d4e42ba6
+// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=a36bef12
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=207ee6a0
 var treevue_type_template_id_207ee6a0_render = function () {
@@ -3204,8 +3204,8 @@ var taskHandleHtmlImg = pending + '/task/taskHandle/taskHandleWithHandwrittenOpi
 var registerNew = '/bpm/task/taskHandle/startFlow.dhtml';
 
 // 获取节点信息(获取节点属性及办理人,发起)
-// export const getNodeInfo = '/api/mecp/v1/mecpItask/getNodeInfo.json';
-var api_getNodeInfo = '/bpm/v1/mecpItask/getNodeInfoNew.json';
+var api_getNodeInfo = pending + '/task/taskHandle/getNodeInfo.dhtml';
+// export const getNodeInfo = '/bpm/v1/mecpItask/getNodeInfoNew.json';
 
 // 获取发起流程信息
 var toStartFlow = '/bpm/v1/mecpItask/toStartFlowNew.json';
@@ -4305,7 +4305,7 @@ var _props, _methods;
         this.newParam.pid = 'root';
         this.newParam.myUserid = this.newParam.myUserid || util["a" /* default */].getStorage('userId');
       } else {
-        this.newParam = _extends({}, this.newParam, this.newTabs[this.selectIndex].param);
+        this.newParam = _extends({}, this.newTabs[this.selectIndex].param, this.newParam);
         //  this.newTabs[this.selectIndex].param.pid || this.param.pid || 'root';
       }
       delete this.newParam.department;
@@ -4629,8 +4629,8 @@ var _props, _methods;
 
 var selector_tree_component = normalizeComponent(
   src_selector_treevue_type_script_lang_js,
-  selector_treevue_type_template_id_d4e42ba6_render,
-  selector_treevue_type_template_id_d4e42ba6_staticRenderFns,
+  selector_treevue_type_template_id_a36bef12_render,
+  selector_treevue_type_template_id_a36bef12_staticRenderFns,
   false,
   null,
   null,
@@ -12861,8 +12861,8 @@ list_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var list = (list_src_main);
-// 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=a746ec3a
-var mainvue_type_template_id_a746ec3a_render = function () {
+// 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=81a61f1c
+var mainvue_type_template_id_81a61f1c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12962,7 +12962,13 @@ var mainvue_type_template_id_a746ec3a_render = function () {
         ? _c(
             "Reset",
             _vm._b(
-              { attrs: { userId: _vm.userId, beforeSubmit: _vm.beforeSubmit } },
+              {
+                attrs: {
+                  userId: _vm.userId,
+                  type: _vm.type,
+                  beforeSubmit: _vm.beforeSubmit,
+                },
+              },
               "Reset",
               _vm.$attrs,
               false
@@ -12973,14 +12979,14 @@ var mainvue_type_template_id_a746ec3a_render = function () {
     1
   )
 }
-var mainvue_type_template_id_a746ec3a_staticRenderFns = []
-mainvue_type_template_id_a746ec3a_render._withStripped = true
+var mainvue_type_template_id_81a61f1c_staticRenderFns = []
+mainvue_type_template_id_81a61f1c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=a746ec3a
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=81a61f1c
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/StartFlow.vue?vue&type=template&id=00776333
-var StartFlowvue_type_template_id_00776333_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/StartFlow.vue?vue&type=template&id=dc8fcb64
+var StartFlowvue_type_template_id_dc8fcb64_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13290,11 +13296,11 @@ var StartFlowvue_type_template_id_00776333_render = function () {
     ]),
   ])
 }
-var StartFlowvue_type_template_id_00776333_staticRenderFns = []
-StartFlowvue_type_template_id_00776333_render._withStripped = true
+var StartFlowvue_type_template_id_dc8fcb64_staticRenderFns = []
+StartFlowvue_type_template_id_dc8fcb64_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/StartFlow.vue?vue&type=template&id=00776333
+// CONCATENATED MODULE: ./packages/flow/src/components/StartFlow.vue?vue&type=template&id=dc8fcb64
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Opinion.vue?vue&type=template&id=4d744373
 var Opinionvue_type_template_id_4d744373_render = function () {
@@ -15087,7 +15093,7 @@ var StartFlowvue_type_script_lang_js_typeof = typeof Symbol === "function" && ty
             // }
           }
         } else {
-          _this2.$toast(res.msg);
+          _this2.$toast(res.msg || res.message);
           setTimeout(function () {
             _this2.$parent.$emit('error');
           }, 1000);
@@ -15314,8 +15320,8 @@ var StartFlowvue_type_script_lang_js_typeof = typeof Symbol === "function" && ty
 
 var StartFlow_component = normalizeComponent(
   components_StartFlowvue_type_script_lang_js,
-  StartFlowvue_type_template_id_00776333_render,
-  StartFlowvue_type_template_id_00776333_staticRenderFns,
+  StartFlowvue_type_template_id_dc8fcb64_render,
+  StartFlowvue_type_template_id_dc8fcb64_staticRenderFns,
   false,
   null,
   null,
@@ -15324,8 +15330,8 @@ var StartFlow_component = normalizeComponent(
 )
 
 /* harmony default export */ var StartFlow = (StartFlow_component.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/components/Handle.vue?vue&type=template&id=2f778f92
-var Handlevue_type_template_id_2f778f92_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Handle.vue?vue&type=template&id=3f30400a
+var Handlevue_type_template_id_3f30400a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -15717,35 +15723,101 @@ var Handlevue_type_template_id_2f778f92_render = function () {
                                                 "div",
                                                 { staticClass: "item" },
                                                 [
-                                                  _c("em-picker", {
-                                                    attrs: {
-                                                      title: "下步节点",
-                                                      label: "下步节点",
-                                                      required: "",
-                                                      "show-toolbar": "",
-                                                      "label-width": "100%",
-                                                      columns: _vm.nodeList,
-                                                      "value-key": "nodeId",
-                                                      "label-key": "nodeName",
-                                                    },
-                                                    on: {
-                                                      confirm:
-                                                        _vm.onConfirmNextNode,
-                                                    },
-                                                    model: {
-                                                      value:
-                                                        _vm.form.nextNodeName,
-                                                      callback: function ($$v) {
-                                                        _vm.$set(
-                                                          _vm.form,
-                                                          "nextNodeName",
-                                                          $$v
-                                                        )
-                                                      },
-                                                      expression:
-                                                        "form.nextNodeName",
-                                                    },
-                                                  }),
+                                                  _vm.nextNodeCheckType ==
+                                                  "select"
+                                                    ? _c("em-picker", {
+                                                        attrs: {
+                                                          title: "下步节点",
+                                                          label: "下步节点",
+                                                          required: "",
+                                                          "show-toolbar": "",
+                                                          "label-width": "100%",
+                                                          columns: _vm.nodeList,
+                                                          "value-key": "nodeId",
+                                                          "label-key":
+                                                            "nodeName",
+                                                        },
+                                                        on: {
+                                                          confirm:
+                                                            _vm.onConfirmNextNode,
+                                                        },
+                                                        model: {
+                                                          value:
+                                                            _vm.form
+                                                              .nextNodeName,
+                                                          callback: function (
+                                                            $$v
+                                                          ) {
+                                                            _vm.$set(
+                                                              _vm.form,
+                                                              "nextNodeName",
+                                                              $$v
+                                                            )
+                                                          },
+                                                          expression:
+                                                            "form.nextNodeName",
+                                                        },
+                                                      })
+                                                    : _c(
+                                                        "em-input",
+                                                        {
+                                                          staticClass:
+                                                            "em-flow-next-steps",
+                                                          attrs: {
+                                                            value: "下步节点",
+                                                            label: "下步节点",
+                                                            required: "",
+                                                            disabled: true,
+                                                            "label-position":
+                                                              "top",
+                                                          },
+                                                        },
+                                                        [
+                                                          _c(
+                                                            "template",
+                                                            { slot: "input" },
+                                                            [
+                                                              _c(
+                                                                "em-radio-group",
+                                                                {
+                                                                  attrs: {
+                                                                    data: _vm.nodeList,
+                                                                    "value-key":
+                                                                      "nodeId",
+                                                                    "label-key":
+                                                                      "nodeName",
+                                                                    direction:
+                                                                      "horizontal",
+                                                                  },
+                                                                  on: {
+                                                                    change:
+                                                                      _vm.onConfirmNextNode,
+                                                                  },
+                                                                  model: {
+                                                                    value:
+                                                                      _vm.form
+                                                                        .nextNodeId,
+                                                                    callback:
+                                                                      function (
+                                                                        $$v
+                                                                      ) {
+                                                                        _vm.$set(
+                                                                          _vm.form,
+                                                                          "nextNodeId",
+                                                                          $$v
+                                                                        )
+                                                                      },
+                                                                    expression:
+                                                                      "form.nextNodeId",
+                                                                  },
+                                                                }
+                                                              ),
+                                                            ],
+                                                            1
+                                                          ),
+                                                        ],
+                                                        2
+                                                      ),
                                                 ],
                                                 1
                                               )
@@ -16661,11 +16733,11 @@ var Handlevue_type_template_id_2f778f92_render = function () {
     1
   )
 }
-var Handlevue_type_template_id_2f778f92_staticRenderFns = []
-Handlevue_type_template_id_2f778f92_render._withStripped = true
+var Handlevue_type_template_id_3f30400a_staticRenderFns = []
+Handlevue_type_template_id_3f30400a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=2f778f92
+// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=3f30400a
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Reject.vue?vue&type=template&id=46f10c43
 var Rejectvue_type_template_id_46f10c43_render = function () {
@@ -17893,6 +17965,27 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -17961,6 +18054,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       freeStartFlowParams: {}, //自由发起流程参数
       taskParams: {},
       isCanPreAddSign: false,
+      nextNodeCheckType: 'select',
       showAppUnit: false, // 弹窗单位
       handleFlow: true,
       freeValid: true,
@@ -18476,6 +18570,8 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
     // 切换下一步操作
     changeNextOperate: function changeNextOperate(val, isDef) {
+      var _this8 = this;
+
       if (!isDef && val.key === this.tagKey) return;
       this.tagKey = val.key;
       //恢复默认
@@ -18540,8 +18636,17 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         } else {}
       }
       if (this.nodeList && this.nodeList.length > 0) {
-        this.form.nextNodeId = this.nodeList[this.nextNodeDefault].nodeId;
-        this.form.nextNodeName = this.nodeList[this.nextNodeDefault].nodeName;
+        var defNode = this.nodeList.filter(function (i) {
+          return i.nodeId === _this8.nextNodeDefault;
+        });
+        if (defNode.length > 0) {
+          this.form.nextNodeId = defNode[0].nodeId;
+          this.form.nextNodeName = defNode[0].nodeName;
+        } else {
+          this.form.nextNodeId = this.nodeList[0].nodeId;
+          this.form.nextNodeName = this.nodeList[0].nodeName;
+        }
+
         this.$toast.loading({
           message: '加载中...',
           forbidClick: true,
@@ -18558,8 +18663,13 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
     // 确认流程节点操作
     onConfirmNextNode: function onConfirmNextNode(val) {
-      this.form.nextNodeId = val.nodeId;
-      this.form.nextNodeName = val.nodeName;
+      console.log(val, 'cal');
+      if (this.nextNodeCheckType === 'select') {
+        this.form.nextNodeId = val.nodeId;
+        this.form.nextNodeName = val.nodeName;
+      } else {
+        this.form.nextNodeId = val;
+      }
       this.$toast.loading({
         message: '加载中...',
         forbidClick: true,
@@ -18667,10 +18777,12 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
                 notificationMessageReadOnly = _res$data.notificationMessageReadOnly,
                 readOnlyNotificationType = _res$data.readOnlyNotificationType,
                 otherOrgName = _res$data.otherOrgName,
+                nextNodeCheckType = _res$data.nextNodeCheckType,
                 defaultNotificationMessage = _res$data.defaultNotificationMessage,
                 defaultNotificationType = _res$data.defaultNotificationType,
                 isCanPreAddSign = _res$data.isCanPreAddSign;
 
+            nextNodeCheckType && (that.nextNodeCheckType = nextNodeCheckType);
             that.customPresetHintMessage = customPresetHintMessage;
             that.currentOrgName = currentOrgName;
             that.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
@@ -18717,10 +18829,10 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
                     } else {
                       that.nodeList = that.taskOperations[0].taskNodeList;
                       var info = [];
-                      that.nodeList.map(function (x, y) {
+                      that.nodeList.map(function (x) {
                         if (x.nodeId === nodeInfoMap.nodeExtAttr.defaultNextNode) {
                           info.push(x);
-                          that.nextNodeDefault = y;
+                          that.nextNodeDefault = nodeInfoMap.nodeExtAttr.defaultNextNode;
                         }
                       });
                       if (info.length == 0 && that.nodeList.length != 0) info = [that.nodeList[0]];
@@ -18743,7 +18855,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
                       that.nodeList.map(function (x, y) {
                         if (x.nodeId === nodeInfoMap.nodeExtAttr.defaultNextNode) {
                           _info.push(x);
-                          that.nextNodeDefault = y;
+                          that.nextNodeDefault = nodeInfoMap.nodeExtAttr.defaultNextNode;
                         }
                       });
                       if (_info.length == 0 && that.nodeList.length != 0) _info = [that.nodeList[0]];
@@ -18823,7 +18935,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       });
     },
     getToStartTaskReadIndex: function getToStartTaskReadIndex() {
-      var _this8 = this;
+      var _this9 = this;
 
       utils_http({
         url: this.baseUrl ? this.baseUrl + toStartTaskReadHtml : toStartTaskReadHtml,
@@ -18837,27 +18949,27 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
             taskReadOpinionRequired = _res$data2.taskReadOpinionRequired;
 
         if (status === 'success') {
-          _this8.taskExamineInfo = taskExamine;
-          _this8.isCanFenyue = isCanFenyue;
-          _this8.taskReadOpinionRequired = taskReadOpinionRequired;
+          _this9.taskExamineInfo = taskExamine;
+          _this9.isCanFenyue = isCanFenyue;
+          _this9.taskReadOpinionRequired = taskReadOpinionRequired;
           // if (this.nodeName) {
-          _this8.processObj.taskExamine.nodeName = '分阅';
+          _this9.processObj.taskExamine.nodeName = '分阅';
           // }
         } else {
-          _this8.$toast(message || '系统错误，请联系管理员！');
+          _this9.$toast(message || '系统错误，请联系管理员！');
         }
-        _this8.$toast.clear();
+        _this9.$toast.clear();
       }).catch(function (err) {
-        _this8.$toast.clear();
+        _this9.$toast.clear();
         if (err.message && err.message !== 'canceled') {
-          _this8.$toast(err.message);
+          _this9.$toast(err.message);
         }
       });
     },
 
     // 获取节点信息(获取节点属性及办理人)
     getNodeObj: function getNodeObj(res) {
-      var _this9 = this;
+      var _this10 = this;
 
       var _that = this;
       utils_http({
@@ -18871,89 +18983,89 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
           userId: _that.userId
         }
       }).then(function (res) {
-        _this9.$toast.clear();
+        _this10.$toast.clear();
         if (res.status == 'success') {
           _that.deptRoleCode = res.data.nodeExtAttr.deptRoleCode;
           _that.enableCustomLimitTimeSetting = res.data.nodeExtAttr.enableCustomLimitTimeSetting == 1;
-          res.data.otherOrgDisabledObjId && (_this9.otherOrgDisabledObjId = res.data.otherOrgDisabledObjId.split(','));
-          res.data.currentOrgDisabledObjId && (_this9.currentOrgDisabledObjId = res.data.currentOrgDisabledObjId.split(','));
-          _this9.appointNotUserIds = res.data.appointNotUserIds;
-          _this9.handleRoleId = res.data.handleRoleId;
-          _this9.nextRole = res.data.nextRole;
-          _this9.filterCandinateIds = res.data.nodeExtAttr.filterCandinateIds;
-          _this9.selectorDefShowDeptId = res.data.nodeExtAttr.selectorDefShowDeptId;
-          _this9.userSelectionType = res.data.nodeExtAttr.userSelectionType;
+          res.data.otherOrgDisabledObjId && (_this10.otherOrgDisabledObjId = res.data.otherOrgDisabledObjId.split(','));
+          res.data.currentOrgDisabledObjId && (_this10.currentOrgDisabledObjId = res.data.currentOrgDisabledObjId.split(','));
+          _this10.appointNotUserIds = res.data.appointNotUserIds;
+          _this10.handleRoleId = res.data.handleRoleId;
+          _this10.nextRole = res.data.nextRole;
+          _this10.filterCandinateIds = res.data.nodeExtAttr.filterCandinateIds;
+          _this10.selectorDefShowDeptId = res.data.nodeExtAttr.selectorDefShowDeptId;
+          _this10.userSelectionType = res.data.nodeExtAttr.userSelectionType;
           // this.changePidObjtype();
-          _this9.orgSelectionType = res.data.nodeExtAttr.orgSelectionType;
-          _this9.notificationType = res.data.nodeExtAttr.notificationType;
-          _this9.nodeType = res.data.nodeExtAttr.nodeType;
-          _this9.deptRoleCode = res.data.nodeExtAttr.deptRoleCode;
-          _this9.orgRoleCode = res.data.nodeExtAttr.orgRoleCode;
-          _this9.isCustomUser = res.data.nodeExtAttr.isCustomUser;
-          _this9.presetEdit = res.data.nodeExtAttr.presetEdit;
-          _this9.isLimitedTimeHandling = res.data.nodeExtAttr.isLimitedTimeHandling;
-          _this9.peopleObj = res.data.nodeExtAttr;
-          _this9.nextUserList = res.data.nextUserList.filter(function (x) {
+          _this10.orgSelectionType = res.data.nodeExtAttr.orgSelectionType;
+          _this10.notificationType = res.data.nodeExtAttr.notificationType;
+          _this10.nodeType = res.data.nodeExtAttr.nodeType;
+          _this10.deptRoleCode = res.data.nodeExtAttr.deptRoleCode;
+          _this10.orgRoleCode = res.data.nodeExtAttr.orgRoleCode;
+          _this10.isCustomUser = res.data.nodeExtAttr.isCustomUser;
+          _this10.presetEdit = res.data.nodeExtAttr.presetEdit;
+          _this10.isLimitedTimeHandling = res.data.nodeExtAttr.isLimitedTimeHandling;
+          _this10.peopleObj = res.data.nodeExtAttr;
+          _this10.nextUserList = res.data.nextUserList.filter(function (x) {
             return x.userId && x.username;
           });
-          var _this = _this9;
-          _this9.nextUserList.map(function (r) {
+          var _this = _this10;
+          _this10.nextUserList.map(function (r) {
             _this.$set(r, 'checked', false);
           });
 
-          _this9.isHandleExplain = res.data.nodeExtAttr.isHandleExplain == 1 ? true : false; //判断是否隐藏办理说明
-          _this9.isCustomUserClick = res.data.nodeExtAttr.isCustomUser == 1 ? true : false; // 判断办理人是否可点击显示弹框
-          _this9.isTaskread = res.data.nodeExtAttr.isTaskread == 1 ? true : false; // 判断是否显示分阅
-          _this9.countersignaturetypeCode = res.data.countersignaturetypeCode !== 0 ? true : false; //判断是否隐藏处理方式
-          _this9.countersignaturetypeText = res.data.countersignaturetypeText;
+          _this10.isHandleExplain = res.data.nodeExtAttr.isHandleExplain == 1 ? true : false; //判断是否隐藏办理说明
+          _this10.isCustomUserClick = res.data.nodeExtAttr.isCustomUser == 1 ? true : false; // 判断办理人是否可点击显示弹框
+          _this10.isTaskread = res.data.nodeExtAttr.isTaskread == 1 ? true : false; // 判断是否显示分阅
+          _this10.countersignaturetypeCode = res.data.countersignaturetypeCode !== 0 ? true : false; //判断是否隐藏处理方式
+          _this10.countersignaturetypeText = res.data.countersignaturetypeText;
           //如果当前为承办节点/会签节点,则展示本单位外单位办理人选择
-          if (_this9.nodeType === 1 || _this9.nodeType === 2) {
-            _this9.isMainSubProcess === true ? _this9.isNodeShowProcess = true : _this9.isNodeShowProcess = false;
-            _this9.isMainSubProcess === true ? _this9.isMainSubProcess = true : _this9.isMainSubProcess = false;
-            _this9.isNextUser = false;
-            _this9.isHideCurrentOrg = res.data.nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
-            _this9.isHideOtherOrg = res.data.nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
+          if (_this10.nodeType === 1 || _this10.nodeType === 2) {
+            _this10.isMainSubProcess === true ? _this10.isNodeShowProcess = true : _this10.isNodeShowProcess = false;
+            _this10.isMainSubProcess === true ? _this10.isMainSubProcess = true : _this10.isMainSubProcess = false;
+            _this10.isNextUser = false;
+            _this10.isHideCurrentOrg = res.data.nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
+            _this10.isHideOtherOrg = res.data.nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
           } else {
-            _this9.isHideCurrentOrg = false;
-            _this9.isHideOtherOrg = false;
-            _this9.isMainSubProcess = false;
-            _this9.isNodeShowProcess = false;
-            _this9.isNextUser = true;
+            _this10.isHideCurrentOrg = false;
+            _this10.isHideOtherOrg = false;
+            _this10.isMainSubProcess = false;
+            _this10.isNodeShowProcess = false;
+            _this10.isNextUser = true;
             // this.isMainSubProcess === true
             //   ? (this.isMainSubProcess = true)
             //   : (this.isMainSubProcess = false);
           }
           // userSelectionType 机构内单选人1,机构内多选人2,所有机构单选人3,所有部门多选人4,本部门单选人5,本部门多选人6,本单位单选部门7,本单位多选部门8,单选单位9,多选单位10,单选机构11,多选机构12,本部门角色13,本单位角色14
-          _this9.userSelectionType == 2 || _this9.userSelectionType == 4 || _this9.userSelectionType == 6 || _this9.userSelectionType == 8 || _this9.userSelectionType == 10 || _this9.userSelectionType == 11 || _this9.userSelectionType == 12 ? _this9.isRadio = false : _this9.isRadio = true; //判断办理人单选多选
+          _this10.userSelectionType == 2 || _this10.userSelectionType == 4 || _this10.userSelectionType == 6 || _this10.userSelectionType == 8 || _this10.userSelectionType == 10 || _this10.userSelectionType == 11 || _this10.userSelectionType == 12 ? _this10.isRadio = false : _this10.isRadio = true; //判断办理人单选多选
 
-          if (_this9.userSelectionType == 7 || _this9.userSelectionType == 8 || _this9.userSelectionType == 9 || _this9.userSelectionType == 10 || _this9.userSelectionType == 11 || _this9.userSelectionType == 12) {
-            _this9.isDealObject = true;
-            _this9.isNextUser = false;
+          if (_this10.userSelectionType == 7 || _this10.userSelectionType == 8 || _this10.userSelectionType == 9 || _this10.userSelectionType == 10 || _this10.userSelectionType == 11 || _this10.userSelectionType == 12) {
+            _this10.isDealObject = true;
+            _this10.isNextUser = false;
           }
-          if (_this9.userSelectionType == 13 || _this9.userSelectionType == 14) {
-            _this9.isNextUser = false;
-            _this9.isDealObject = false;
-            _this9.isDealRole = true;
-            _this9.nextUserflag = true;
+          if (_this10.userSelectionType == 13 || _this10.userSelectionType == 14) {
+            _this10.isNextUser = false;
+            _this10.isDealObject = false;
+            _this10.isDealRole = true;
+            _this10.nextUserflag = true;
           }
-          _this9.isHiddenNextStepInfo = res.data.nodeExtAttr.isHiddenNextStepInfo == 1 && _this9.nextUserflag ? true : false; // 判断是否隐藏下一步节点信息和接收人信息
+          _this10.isHiddenNextStepInfo = res.data.nodeExtAttr.isHiddenNextStepInfo == 1 && _this10.nextUserflag ? true : false; // 判断是否隐藏下一步节点信息和接收人信息
           if (res.data.globalNodeType === 'endEvent') {
-            _this9.isNextUser = false;
-            _this9.form.nextUserId = '流程办结';
+            _this10.isNextUser = false;
+            _this10.form.nextUserId = '流程办结';
           } else {
-            _this9.nodeType != 1 && _this9.nodeType != 2 && (_this9.isNextUser = true); //判断是否是流程办结 办结下步办理人不显示
+            _this10.nodeType != 1 && _this10.nodeType != 2 && (_this10.isNextUser = true); //判断是否是流程办结 办结下步办理人不显示
           }
-          _this9.changeDefPeople(res.data.nodeExtAttr.isDefSelectedObj, res.data.nodeExtAttr.isSelectedAllObj);
-          _this9.changePidObjtype(res.data.nodeExtAttr.userSelectionType, _this9.choiceOrgId, _this9.choiceDeptId, _this9.pOrgId);
+          _this10.changeDefPeople(res.data.nodeExtAttr.isDefSelectedObj, res.data.nodeExtAttr.isSelectedAllObj);
+          _this10.changePidObjtype(res.data.nodeExtAttr.userSelectionType, _this10.choiceOrgId, _this10.choiceDeptId, _this10.pOrgId);
         } else {
-          _this9.$toast(res.message);
+          _this10.$toast(res.message);
         }
       });
     },
 
     // 修改默认办理人
     changeDefPeople: function changeDefPeople(def, all) {
-      var _this10 = this;
+      var _this11 = this;
 
       this.nextUserSelectList = [];
       if (def == 1 && all == 1 || def == 0 && all == 1) {
@@ -18961,9 +19073,9 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         this.nextUserList.map(function (r, i) {
           r.showid = r.userId;
           r.showname = r.username;
-          _this10.$set(r, 'checked', true);
-          _this10.nextUserSelectList.push(r);
-          ids += r.userId + (i === _this10.nextUserList.length - 1 ? '' : ',');
+          _this11.$set(r, 'checked', true);
+          _this11.nextUserSelectList.push(r);
+          ids += r.userId + (i === _this11.nextUserList.length - 1 ? '' : ',');
         });
         this.form.nextUserId = ids;
       } else if (def == 1 && (!all || all == 0) && this.nextUserList.length > 0) {
@@ -19016,8 +19128,8 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var Handle_component = normalizeComponent(
   components_Handlevue_type_script_lang_js,
-  Handlevue_type_template_id_2f778f92_render,
-  Handlevue_type_template_id_2f778f92_staticRenderFns,
+  Handlevue_type_template_id_3f30400a_render,
+  Handlevue_type_template_id_3f30400a_staticRenderFns,
   false,
   null,
   null,
@@ -20903,8 +21015,8 @@ var supervise_component = normalizeComponent(
 )
 
 /* harmony default export */ var supervise = (supervise_component.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/components/reset.vue?vue&type=template&id=b2f284b2
-var resetvue_type_template_id_b2f284b2_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/reset.vue?vue&type=template&id=c502f2b2
+var resetvue_type_template_id_c502f2b2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -20913,12 +21025,37 @@ var resetvue_type_template_id_b2f284b2_render = function () {
       "div",
       { staticClass: "startFlow-content" },
       [
-        _vm.showPresentNode
-          ? _c("div", { staticClass: "present-node" }, [
-              _c("div", { staticClass: "label" }, [_vm._v("当前节点:")]),
-              _c("div", [_vm._v(_vm._s(_vm.processObj.nodeName))]),
-            ])
-          : _vm._e(),
+        _c(
+          "div",
+          { staticStyle: { "border-radius": "5px", overflow: "hidden" } },
+          [
+            _c("em-input", {
+              attrs: { "label-width": "90", label: "标题", readonly: "" },
+              model: {
+                value: _vm.title,
+                callback: function ($$v) {
+                  _vm.title = $$v
+                },
+                expression: "title",
+              },
+            }),
+            _c("em-input", {
+              attrs: {
+                "label-width": "90",
+                label: "当前办理节点",
+                readonly: "",
+              },
+              model: {
+                value: _vm.processObj.nodeName,
+                callback: function ($$v) {
+                  _vm.$set(_vm.processObj, "nodeName", $$v)
+                },
+                expression: "processObj.nodeName",
+              },
+            }),
+          ],
+          1
+        ),
         _vm.showOpinion
           ? _c("Opinion", {
               attrs: {
@@ -21180,11 +21317,11 @@ var resetvue_type_template_id_b2f284b2_render = function () {
     ]),
   ])
 }
-var resetvue_type_template_id_b2f284b2_staticRenderFns = []
-resetvue_type_template_id_b2f284b2_render._withStripped = true
+var resetvue_type_template_id_c502f2b2_staticRenderFns = []
+resetvue_type_template_id_c502f2b2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/reset.vue?vue&type=template&id=b2f284b2
+// CONCATENATED MODULE: ./packages/flow/src/components/reset.vue?vue&type=template&id=c502f2b2
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/reset.vue?vue&type=script&lang=js
 var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -21381,6 +21518,7 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
     orgId: String,
     depId: String,
     appId: String,
+    type: String,
     paddingTop: {
       type: [String, Number],
       default: 0
@@ -21409,10 +21547,6 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
       type: String,
       default: ''
     },
-    formType: {
-      type: String,
-      default: 'freeStart'
-    },
     taskParams: {
       type: Object,
       default: function _default() {}
@@ -21424,6 +21558,7 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
   },
   data: function data() {
     return {
+      title: '',
       showOpinion: true,
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
@@ -21480,9 +21615,7 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
       // hideTempSave: true,
       businessId: this.businessId
     };
-    if (this.formType == 'freeStart' || this.copyHistory) {
-      this.form.opinion = this.opinion;
-    }
+
     this.geAllData(obj);
     this.getDefNoticeType();
   },
@@ -21591,17 +21724,16 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
       // }
 
       var info = {
-        processDefinitionId: this.flowObj.processDefinitionId,
+        processDefinitionId: this.processObj.processDefinitionId,
         nextUserId: this.form.nextUserId,
         nextNodeId: this.form.nextNodeId,
-        businessId: this.businessId,
+        businessId: this.processObj.businessId,
+        pendingId: this.processObj.pendingId,
         notificationType: Array.isArray(this.form.notificationType) ? '' : this.form.notificationType,
         opinion: this.form.opinion,
         customLimitTime: resetvue_type_script_lang_js_typeof(this.form.customLimitTime) === 'object' ? this.form.customLimitTime.cciValue : this.form.customLimitTime,
-        nodeId: this.form.nodeId,
         notificationMsg: this.form.notificationMsg,
         loginType: 2, //登录方式
-        isImageOpinion: this.form.isImageOpinion,
         userId: this.userId || util["a" /* default */].getStorage('userId'),
         mobileKey: util["a" /* default */].getStorage('deviceId') || '123'
       };
@@ -21618,31 +21750,6 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
           delete info.isCustomPreset;
         }
       }
-      if (this.isFreeStartFlow || this.formType === 'readTransfer') {
-        var newParm = {};
-        newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory';
-        newParm.startFlowParamJson = info;
-        newParm.startFlowParamJson.businessId = this.businessId; //this.businessId
-        newParm.startFlowParamJson = JSON.stringify(newParm.startFlowParamJson);
-        for (var key in this.taskParams) {
-          if (Array.isArray(this.taskParams[key])) {
-            this.taskParams[key] = this.taskParams[key].length > 0 ? this.taskParams[key].join(',') : '';
-          }
-        }
-
-        newParm.submitTaskParamJson = JSON.stringify(this.taskParams);
-        if (this.formType == 'readTransfer') {
-          newParm.readTransferHandleStartFlowParamJson = JSON.stringify(info);
-          newParm.taskReadEndParamJson = JSON.stringify(this.taskParams);
-          delete newParm.copyHistory;
-          delete newParm.startFlowParamJson;
-          delete newParm.submitTaskParamJson;
-        }
-        info = newParm;
-      }
-      if (this.formType == 'freeStart' && !this.isFreeStartFlow) {
-        info.businessId = this.businessId; //this.businessId
-      }
       if (this.beforeSubmit) {
         this.beforeSubmit(info);
         return;
@@ -21665,23 +21772,15 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
       });
       var _that = this;
       utils_http({
-        url: (_that.apiBaseUrl || '') + (_that.isFreeStartFlow ? freeStartFlowWithSubmitTask : _that.formType == 'readTransfer' ? startReadTransferHandleFlowWithTaskReadEnd : registerNew),
+        url: (_that.apiBaseUrl || '') + _that.type === 'reset' ? resetProcess : taskContinuation,
         type: 'post',
-        params: _that.isFreeStartFlow || _that.formType == 'readTransfer' ? info : { params: info },
+        params: info,
         format: false
       }).then(function (res) {
         _this4.$toast.clear();
         if (res.rCode == 0 || res.status == 'success') {
           _this4.$toast('操作成功');
-          if (_that.formType == 'freeStart' && !_that.isFreeStartFlow) {
-            _this4.$emit('closePop');
-          } else {
-            if (_that.formType == 'freeStart') {
-              _that.$emit('success');
-            } else {
-              _that.$parent.$emit('success');
-            }
-          }
+          _that.$parent.$emit('success');
         } else {
           _this4.$toast(res.msg);
           setTimeout(function () {
@@ -21750,6 +21849,7 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
 
     // 确认下一步操作
     onConfirmNext: function onConfirmNext(val) {
+      console.log(val, 'vaaav');
       this.form.nextName = val.itemName;
       this.nodeList = val.list;
       this.form.nextNodeId = val.list[0].nodeId;
@@ -21764,6 +21864,14 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
       this.form.nextNodeId = val.nodeId;
       this.form.nextNodeName = val.nodeName;
       this.showNextNodeList = false;
+      this.nextUserSelectList = [];
+      this.$toast.loading({
+        message: '加载中...',
+        forbidClick: true,
+        loadingType: 'spinner',
+        overlay: true,
+        duration: 0
+      });
       this.getPeopleObj(this.form.nextNodeId);
     },
 
@@ -21782,15 +21890,17 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
     // 获取发起流程信息
     getProcessObj: function getProcessObj(res) {
       var that = this;
+      var url = that.type === 'reset' ? toResetProcessIndex : toTaskContinuationIndex;
       return new Promise(function (resolve, reiect) {
         utils_http({
-          url: that.apiBaseUrl ? that.apiBaseUrl + toResetProcessIndex : toResetProcessIndex,
+          url: that.apiBaseUrl ? that.apiBaseUrl + url : url,
           params: {
             appId: that.appId,
             userId: that.userId || util["a" /* default */].getStorage('userId')
           }
         }).then(function (res) {
           if (res.rCode == 0 || res.status == 'success') {
+            that.title = res.data.pendtitle || res.data.taskExamine.businessName;
             that.isCurrentNodeForbiddenChangeCandidate = res.data.nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
             that.processObj = res.data.taskExamine;
             that.isOpinionRequired = res.data.nodeInfoMap.nodeExtAttr.isOpinionRequired;
@@ -21808,6 +21918,27 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
                 that.nodeList.push({ nodeName: obj[key], nodeId: key });
               }
             }
+            if (res.data.taskNodeList && res.data.taskNodeList.length > 0) {
+              for (var _key in res.data.taskNodeList[0]) {
+                that.nodeList.push({
+                  nodeName: res.data.taskNodeList[0][_key],
+                  nodeId: _key
+                });
+              }
+            } else {
+              for (var _key2 in res.data.taskNodeMap) {
+                that.nodeList.push({
+                  nodeName: res.data.taskNodeMap[_key2],
+                  nodeId: _key2
+                });
+              }
+            }
+            // if (res.data.taskNodeMap && res.data.taskNodeMap.length > 0) {
+            //   let obj = res.data.taskNodeMap;
+            //   for (let key in obj) {
+            //     that.nodeList.push({ nodeName: obj[key], nodeId: key });
+            //   }
+            // }
 
             that.form.nextNodeId = that.nodeList[0].nodeId;
             that.form.nextNodeName = that.nodeList[0].nodeName;
@@ -21832,29 +21963,37 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
       utils_http({
         url: _that.apiBaseUrl ? _that.apiBaseUrl + api_getNodeInfo : api_getNodeInfo,
         params: {
-          params: {
-            processDefinitionId: this.processObj.processDefinitionId,
-            nodeId: res,
-            // taskId: this.processObj.taskId,
-            userId: _that.userId
-          }
+          // params: {
+          processDefinitionId: this.processObj.processDefinitionId,
+          nextNodeId: res,
+          businessId: this.processObj.businessId,
+          // taskId: this.processObj.taskId,
+          pendingId: this.processObj.pendingId,
+          userId: _that.userId
+          // }
         }
       }).then(function (res) {
         _this5.$toast.clear();
-        if (res.rCode == 0) {
-          _that.isCustomUser = res.data.nodeInfoMap.nodeExtAttr.isCustomUser;
-          _this5.peopleObj = res.data.nodeInfoMap.nodeExtAttr;
+        if (res.rCode == 0 || res.status == 'success') {
+          _that.isCustomUser = res.data.nodeExtAttr.isCustomUser;
+          _this5.peopleObj = res.data.nodeExtAttr;
+          _this5.nextUserList = res.data.nextUserList.map(function (x) {
+            return {
+              showname: x.username,
+              showid: x.userId
+            };
+          });
           _that.enableCustomLimitTimeSetting = _this5.peopleObj.enableCustomLimitTimeSetting == 1;
-          if (res.data.nodeInfoMap.nodeExtAttr.userSelectionType) {
-            _this5.treeType = res.data.nodeInfoMap.nodeExtAttr.userSelectionType;
-            if (res.data.nodeInfoMap.nodeExtAttr) {
+          if (res.data.nodeExtAttr.userSelectionType) {
+            _this5.treeType = res.data.nodeExtAttr.userSelectionType;
+            if (res.data.nodeExtAttr) {
               var idStr = '';
-              if (res.data.nodeInfoMap.nodeExtAttr.isDefSelectedObj == 1 && _this5.nextUserList.length > 0) {
+              if (res.data.nodeExtAttr.isDefSelectedObj == 1 && _this5.nextUserList.length > 0) {
                 _this5.nextUserList[0].checked = true;
                 _this5.nextUserSelectList = [_this5.nextUserList[0]];
                 idStr = _this5.nextUserSelectList[0].showid;
               }
-              if (res.data.nodeInfoMap.nodeExtAttr.isSelectedAllObj == 1 && _this5.nextUserList.length > 0) {
+              if (res.data.nodeExtAttr.isSelectedAllObj == 1 && _this5.nextUserList.length > 0) {
                 _this5.nextUserSelectList = [];
                 idStr = '';
                 _this5.nextUserList.map(function (x) {
@@ -21887,8 +22026,8 @@ var resetvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
 
 var reset_component = normalizeComponent(
   components_resetvue_type_script_lang_js,
-  resetvue_type_template_id_b2f284b2_render,
-  resetvue_type_template_id_b2f284b2_staticRenderFns,
+  resetvue_type_template_id_c502f2b2_render,
+  resetvue_type_template_id_c502f2b2_staticRenderFns,
   false,
   null,
   null,
@@ -21949,6 +22088,7 @@ var reset_component = normalizeComponent(
 //
 //
 //
+//
 
 
 
@@ -21999,8 +22139,8 @@ var reset_component = normalizeComponent(
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js,
-  mainvue_type_template_id_a746ec3a_render,
-  mainvue_type_template_id_a746ec3a_staticRenderFns,
+  mainvue_type_template_id_81a61f1c_render,
+  mainvue_type_template_id_81a61f1c_staticRenderFns,
   false,
   null,
   null,
@@ -27434,7 +27574,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-  version: '0.3.16',
+  version: '0.3.17',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,