eoss-ui 0.6.70 → 0.6.72

package/lib/flow-group.js

@@ -192,6 +192,8 @@ var ajax = function ajax(_ref) {
       params = _ref$params === undefined ? {} : _ref$params,
       _ref$format = _ref.format,
       format = _ref$format === undefined ? true : _ref$format,
+      _ref$formatConfig = _ref.formatConfig,
+      formatConfig = _ref$formatConfig === undefined ? {} : _ref$formatConfig,
       _ref$mix = _ref.mix,
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
@@ -201,7 +203,7 @@ var ajax = function ajax(_ref) {
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -476,7 +478,7 @@ var ajax = function ajax(_ref) {
     }
   }
   if (method === 'post' && format) {
-    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data);
+    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data, formatConfig);
     if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }

package/lib/flow-list.js

@@ -192,6 +192,8 @@ var ajax = function ajax(_ref) {
       params = _ref$params === undefined ? {} : _ref$params,
       _ref$format = _ref.format,
       format = _ref$format === undefined ? true : _ref$format,
+      _ref$formatConfig = _ref.formatConfig,
+      formatConfig = _ref$formatConfig === undefined ? {} : _ref$formatConfig,
       _ref$mix = _ref.mix,
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
@@ -201,7 +203,7 @@ var ajax = function ajax(_ref) {
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -476,7 +478,7 @@ var ajax = function ajax(_ref) {
     }
   }
   if (method === 'post' && format) {
-    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data);
+    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data, formatConfig);
     if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
@@ -4464,8 +4466,8 @@ 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-list/src/main.vue?vue&type=template&id=017a3796&
-var mainvue_type_template_id_017a3796_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-list/src/main.vue?vue&type=template&id=137c2ec3&
+var mainvue_type_template_id_137c2ec3_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4518,11 +4520,14 @@ var mainvue_type_template_id_017a3796_render = function () {
                           },
                           attrs: {
                             display: _vm.display,
-                            numbers: _vm.numbers,
                             full: _vm.height !== "auto",
                             data: _vm.showDoresult
                               ? _vm.returnData(item.type).filter(function (x) {
-                                  return x.doresult || x.handleInfo
+                                  return (
+                                    x.doresult ||
+                                    x.handleInfo ||
+                                    x.pendstate != 2
+                                  )
                                 })
                               : _vm.returnData(item.type),
                           },
@@ -4673,10 +4678,10 @@ var mainvue_type_template_id_017a3796_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_017a3796_render._withStripped = true
+mainvue_type_template_id_137c2ec3_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=017a3796&
+// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=137c2ec3&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -4794,6 +4799,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 
@@ -5061,7 +5071,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       var _this2 = this;
 
       var _that = this;
-      return {
+      var newThead = {
         flow: [{
           label: '经办部门',
           field: 'deptid',
@@ -5521,6 +5531,19 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           width: this.theadWidth.doresult
         }]
       };
+      if (this.numbers) {
+        for (var key in newThead) {
+          newThead[key].unshift({
+            label: '序号',
+            field: 'sort',
+            align: 'center',
+            key: 'xh',
+            showOverflowTooltip: true,
+            width: 50
+          });
+        }
+      }
+      return newThead;
     },
     content: function content() {
       var _this3 = this;
@@ -5820,8 +5843,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       };
       util["a" /* default */].ajax(params).then(function (res) {
         if (res.status == 'success' || res.rCode == 0) {
-
           _that.circularData = res.data.fyHistoryList;
+          _that.circularData.map(function (x, i) {
+            x.sort = i + 1;
+          });
           _that.hasCircularReadWithdrawAuthority = res.data.hasCircularReadWithdrawAuthority;
           _that.$nextTick(function () {
             _that.getListCount(_that.flowListCount);
@@ -6061,11 +6086,16 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                 };
                 _context3.next = 3;
                 return util["a" /* default */].ajax(params).then(function (res) {
-
                   if (type == 1) {
                     _this11.untreatedReadData = res.data;
+                    _this11.untreatedReadData.map(function (x, i) {
+                      x.sort = i + 1;
+                    });
                   } else {
                     _this11.processedReadData = res.data;
+                    _this11.processedReadData.map(function (x, i) {
+                      x.sort = i + 1;
+                    });
                   }
                 });
 
@@ -6110,19 +6140,22 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
         _this12.loading.close();
         if (status == 'success') {
-
           _this12.flowTableInfo.adjunctCode = adjunctCode;
           _this12.flowTableInfo.hasAgent = hasAgent;
           _this12.attachmentPaperClipCssStyle = res.data.attachmentPaperClipCssStyle;
           _this12.isShort = isShort;
           _this12.taskReadName = taskReadName;
           _this12.flowData = wfHistoryList;
-          _this12.flowData.map(function (x) {
+          _this12.flowData.map(function (x, i) {
+            x.sort = i + 1;
             if (!x.deptid) {
               x.deptid = x.deptName;
             }
           });
           _this12.splitReadingData = fyHistoryList;
+          _this12.splitReadingData.map(function (x, i) {
+            x.sort = i + 1;
+          });
           _this12.modify = modify;
           _this12.show = true;
           if (_this12.height == 'auto') {
@@ -6268,8 +6301,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
         _this15.loading.close();
         if (status == 'success') {
-
-          presetInfoList && (_this15.presetData = presetInfoList);
+          if (presetInfoList) {
+            _this15.presetData = presetInfoList;
+            _this15.presetData.map(function (x, i) {
+              x.sort = i + 1;
+            });
+          }
           _this15.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
           _this15.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth;
           _this15.canDelete = canDelete;
@@ -6300,7 +6337,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_017a3796_render,
+  mainvue_type_template_id_137c2ec3_render,
   staticRenderFns,
   false,
   null,

package/lib/flow.js

@@ -192,6 +192,8 @@ var ajax = function ajax(_ref) {
       params = _ref$params === undefined ? {} : _ref$params,
       _ref$format = _ref.format,
       format = _ref$format === undefined ? true : _ref$format,
+      _ref$formatConfig = _ref.formatConfig,
+      formatConfig = _ref$formatConfig === undefined ? {} : _ref$formatConfig,
       _ref$mix = _ref.mix,
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
@@ -201,7 +203,7 @@ var ajax = function ajax(_ref) {
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -476,7 +478,7 @@ var ajax = function ajax(_ref) {
     }
   }
   if (method === 'post' && format) {
-    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data);
+    data = qs__WEBPACK_IMPORTED_MODULE_3___default.a.stringify(data, formatConfig);
     if (!header['content-type'] && !header['Content-Type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
@@ -4445,7 +4447,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=5e28124e&
+// 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=89ea98c6&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4563,6 +4565,7 @@ var render = function () {
                       attrs: {
                         model: _vm.circulateForm,
                         "label-width": "120px",
+                        "label-position": _vm.formLabelPosition,
                       },
                     },
                     [
@@ -4629,6 +4632,7 @@ var render = function () {
                     staticStyle: { "margin-top": "10px" },
                     attrs: {
                       businessId: _vm.businessIds,
+                      "label-position": _vm.formLabelPosition,
                       selectorParams: _vm.params,
                       "pending-id": _vm.pendingId,
                       showBtn: false,
@@ -4864,6 +4868,7 @@ var render = function () {
                       attrs: {
                         model: _vm.isFlow ? _vm.nodeInfo : _vm.nextNode,
                         "label-width": "120px",
+                        "label-position": _vm.formLabelPosition,
                       },
                     },
                     [
@@ -4884,8 +4889,8 @@ var render = function () {
                               multiple: "",
                               mix: "",
                               disableds: _vm.currentOrgDisabledObjId,
-                              types: ["employee", "persongroup"],
-                              params: { filid: _vm.userModel.orgId },
+                              types: _vm.currentOrgSelectorTabs,
+                              params: _vm.currentOrgSelectorParams,
                             },
                             on: {
                               change: function ($event) {
@@ -4916,13 +4921,8 @@ var render = function () {
                               multiple: "",
                               mix: "",
                               disableds: _vm.otherOrgDisabledObjId,
-                              types: ["enterprise", "filgroupobj"],
-                              params: {
-                                filid: "all",
-                                roleid:
-                                  _vm.circularReadParamsMap
-                                    .circularReadOrgRoleCode,
-                              },
+                              types: _vm.foreignOrgSelectorTabs,
+                              params: _vm.foreignOrgSelectorParams,
                             },
                             on: {
                               change: function ($event) {
@@ -4966,6 +4966,7 @@ var render = function () {
                           attrs: {
                             model: _vm.isFlow ? _vm.nodeInfo : _vm.nextNode,
                             "label-width": "120px",
+                            "label-position": _vm.formLabelPosition,
                           },
                         },
                         [
@@ -5833,11 +5834,10 @@ var render = function () {
                                                           mix: "",
                                                           disableds:
                                                             _vm.currentOrgDisabledObjId,
-                                                          types: [
-                                                            "department",
-                                                            "employee",
-                                                          ],
-                                                          params: _vm.params,
+                                                          types:
+                                                            _vm.currentOrgSelectorTabs,
+                                                          params:
+                                                            _vm.currentOrgSelectorParams,
                                                         },
                                                         on: {
                                                           change: function (
@@ -5874,10 +5874,10 @@ var render = function () {
                                                           mix: "",
                                                           disableds:
                                                             _vm.otherOrgDisabledObjId,
-                                                          types: ["enterprise"],
-                                                          params: {
-                                                            filid: "all",
-                                                          },
+                                                          types:
+                                                            _vm.foreignOrgSelectorTabs,
+                                                          params:
+                                                            _vm.foreignOrgSelectorParams,
                                                         },
                                                         on: {
                                                           change: function (
@@ -6822,6 +6822,9 @@ var render = function () {
                                 _vm.freeStartFlowNextNode ||
                                 _vm.nodeInfo.nextNode,
                               opinion: _vm.value,
+                              taskExamineParam:
+                                _vm.freeStartFlowParams
+                                  .newFlowStartNodeItemName,
                               taskParams: _vm.taskParams,
                               formType: _vm.processFormType,
                             },
@@ -7121,7 +7124,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5e28124e&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=89ea98c6&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -8135,8 +8138,8 @@ var CommonOpinions_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var CommonOpinions = (CommonOpinions_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/processForm.vue?vue&type=template&id=d7f4c800&
-var processFormvue_type_template_id_d7f4c800_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/processForm.vue?vue&type=template&id=39873a24&
+var processFormvue_type_template_id_39873a24_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8746,14 +8749,14 @@ var processFormvue_type_template_id_d7f4c800_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_d7f4c800_staticRenderFns = []
-processFormvue_type_template_id_d7f4c800_render._withStripped = true
+var processFormvue_type_template_id_39873a24_staticRenderFns = []
+processFormvue_type_template_id_39873a24_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=d7f4c800&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=39873a24&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=12e8d2a9&
-var selectUservue_type_template_id_12e8d2a9_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/selectUser.vue?vue&type=template&id=49031d93&
+var selectUservue_type_template_id_49031d93_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8897,11 +8900,11 @@ var selectUservue_type_template_id_12e8d2a9_render = function () {
     2
   )
 }
-var selectUservue_type_template_id_12e8d2a9_staticRenderFns = []
-selectUservue_type_template_id_12e8d2a9_render._withStripped = true
+var selectUservue_type_template_id_49031d93_staticRenderFns = []
+selectUservue_type_template_id_49031d93_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=12e8d2a9&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=49031d93&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=script&lang=js&
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -9107,7 +9110,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
   computed: {
     newWhere: function newWhere() {
-      return _extends({ mid: JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId + '-org-1' }, this.where);
+      return _extends({ mid: JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId + '-org-1', filid: JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId }, this.where);
     }
   },
   watch: {
@@ -9383,8 +9386,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selectUser_component = Object(componentNormalizer["a" /* default */])(
   src_selectUservue_type_script_lang_js_,
-  selectUservue_type_template_id_12e8d2a9_render,
-  selectUservue_type_template_id_12e8d2a9_staticRenderFns,
+  selectUservue_type_template_id_49031d93_render,
+  selectUservue_type_template_id_49031d93_staticRenderFns,
   false,
   null,
   null,
@@ -10579,6 +10582,10 @@ var processFormvue_type_script_lang_js_components;
     taskParams: {
       type: Object,
       default: function _default() {}
+    },
+    taskExamineParam: {
+      type: String,
+      default: ''
     }
   },
   data: function data() {
@@ -10924,6 +10931,7 @@ var processFormvue_type_script_lang_js_components;
             newParm.copyHistory = _this4.copyHistory === 'needCopyPendedHistory';
             newParm.startFlowParamJson = params;
             newParm.startFlowParamJson.businessId = _this4.id; //this.id
+            newParm.startFlowParamJson.taskExamineParam = { startFlowFirstNodeName: _this4.taskExamineParam };
             newParm.startFlowParamJson = JSON.stringify(newParm.startFlowParamJson);
             for (var key in _this4.taskParams) {
               if (Array.isArray(_this4.taskParams[key])) {
@@ -11248,8 +11256,8 @@ var processFormvue_type_script_lang_js_components;
 
 var processForm_component = Object(componentNormalizer["a" /* default */])(
   src_processFormvue_type_script_lang_js_,
-  processFormvue_type_template_id_d7f4c800_render,
-  processFormvue_type_template_id_d7f4c800_staticRenderFns,
+  processFormvue_type_template_id_39873a24_render,
+  processFormvue_type_template_id_39873a24_staticRenderFns,
   false,
   null,
   null,
@@ -21095,8 +21103,8 @@ var supervise_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* 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/component/Circulate.vue?vue&type=template&id=e3855b2c&
-var Circulatevue_type_template_id_e3855b2c_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/component/Circulate.vue?vue&type=template&id=e4a9ba50&
+var Circulatevue_type_template_id_e4a9ba50_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -21118,7 +21126,11 @@ var Circulatevue_type_template_id_e3855b2c_render = function () {
         "el-form",
         {
           ref: "infoList",
-          attrs: { model: _vm.infoList, "label-width": "120px" },
+          attrs: {
+            model: _vm.infoList,
+            "label-width": "120px",
+            "label-position": _vm.labelPosition,
+          },
         },
         [
           _vm.isHideCurrentOrg == 0
@@ -21284,11 +21296,11 @@ var Circulatevue_type_template_id_e3855b2c_render = function () {
     1
   )
 }
-var Circulatevue_type_template_id_e3855b2c_staticRenderFns = []
-Circulatevue_type_template_id_e3855b2c_render._withStripped = true
+var Circulatevue_type_template_id_e4a9ba50_staticRenderFns = []
+Circulatevue_type_template_id_e4a9ba50_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/Circulate.vue?vue&type=template&id=e3855b2c&
+// CONCATENATED MODULE: ./packages/flow/src/component/Circulate.vue?vue&type=template&id=e4a9ba50&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/Circulate.vue?vue&type=script&lang=js&
 var Circulatevue_type_script_lang_js_components;
@@ -21376,6 +21388,7 @@ var Circulatevue_type_script_lang_js_components;
 //
 //
 //
+//
 
 
 
@@ -21395,7 +21408,11 @@ var Circulatevue_type_script_lang_js_components;
     simpleTips: { type: Boolean, default: true },
     showBtn: { type: Boolean, default: true },
     multiple: { type: Boolean, default: true },
-    selectorParams: { type: Object, default: function _default() {} }
+    selectorParams: { type: Object, default: function _default() {} },
+    labelPosition: {
+      type: String,
+      default: 'left'
+    }
   },
   inheritAttrs: false,
   data: function data() {
@@ -21651,8 +21668,8 @@ var Circulatevue_type_script_lang_js_components;
 
 var Circulate_component = Object(componentNormalizer["a" /* default */])(
   component_Circulatevue_type_script_lang_js_,
-  Circulatevue_type_template_id_e3855b2c_render,
-  Circulatevue_type_template_id_e3855b2c_staticRenderFns,
+  Circulatevue_type_template_id_e4a9ba50_render,
+  Circulatevue_type_template_id_e4a9ba50_staticRenderFns,
   false,
   null,
   null,
@@ -22655,6 +22672,8 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
+//
 
 
 
@@ -22688,6 +22707,10 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     defaultProcessKey: { type: String, default: '' },
     hideBtn: { type: Boolean, default: false },
     isCirculate: { type: Boolean, default: false },
+    formLabelPosition: {
+      type: String,
+      default: 'left'
+    },
     btnList: {
       type: Array,
       default: function _default() {
@@ -22729,7 +22752,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     return _ref = {
       styles: {},
       optionsKey: 0,
-      showCirculate: false,
+      currentOrgSelectorParams: { filid: '' },
+      currentOrgSelectorTabs: ['employee', 'persongroup'],
+      foreignOrgSelectorTabs: ['enterprise', 'filgroupobj'],
+      foreignOrgSelectorParams: { filid: 'all', roleid: '' },
+      showCirculate: undefined,
       circulateForm: { nextNodeId: '111' },
       userModel: {},
       simpleTips: true,
@@ -22878,17 +22905,20 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
   },
   mounted: function mounted() {
     this.businessIds = this.businessId;
+    this.currentOrgSelectorParams.filid = JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId;
     this.nextNode.nextNodeId = this.nextNodeId;
-    this.getInfo();
+    if (!this.isFlow) {
+      this.getInfo();
+    }
   },
 
   watch: {
     isCirculate: {
       handler: function handler(val) {
-        this.showCirculate = val;
-        if (!val) {
+        if (!val && this.showCirculate != undefined) {
           this.getInfo();
         }
+        this.showCirculate = val;
       },
 
       deep: true,
@@ -24184,6 +24214,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
               nextNodeCheckType = _res$data2.nextNodeCheckType,
               pOrgId = _res$data2.pOrgId,
               currentOrgName = _res$data2.currentOrgName,
+              currentOrgSelectorParams = _res$data2.currentOrgSelectorParams,
               otherOrgName = _res$data2.otherOrgName,
               taskExamine = _res$data2.taskExamine,
               nodeInfoMap = _res$data2.nodeInfoMap,
@@ -24205,8 +24236,26 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           }
           _this27.$emit('startTaskRead', res);
           _this27.$emit('start-task-read', res);
+          if (currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
+            _this27.currentOrgSelectorTabs = currentOrgSelectorParams.currentOrgType.split(',');
+            var currentOrgparams = currentOrgSelectorParams.currentOrgRange.split(',');
+            _this27.currentOrgSelectorTabs.map(function (x, i) {
+              _this27.currentOrgSelectorParams[x] = { filid: currentOrgparams[i] == 'my' ? choiceOrgId : param[i] };
+            });
+          }
+          if (currentOrgSelectorParams.enableForeignOrgConfig == 'true') {
+            _this27.foreignOrgSelectorTabs = currentOrgSelectorParams.foreignOrgType.split(',');
+            var foreignOrgparams = currentOrgSelectorParams.foreignOrgRange.split(',');
+            _this27.foreignOrgSelectorTabs.map(function (x, i) {
+              _this27.foreignOrgSelectorParams[x] = { filid: foreignOrgparams[i] == 'my' ? choiceOrgId : foreignOrgparams[i] };
+            });
+          }
           _this27.circularReadParamsMap = circularReadParamsMap || {};
-          _this27.currentOrgName = _this27.nextOperateCheckType = nextOperateCheckType;
+          if (_this27.circularReadParamsMap.circularReadOrgRoleCode) {
+            _this27.foreignOrgSelectorParams.roleid = _this27.circularReadParamsMap.circularReadOrgRoleCode;
+          }
+          _this27.currentOrgName = currentOrgName;
+          _this27.nextOperateCheckType = nextOperateCheckType;
           _this27.currentNodeIsCircularReadNode = nodeInfoMap.nodeExtAttr.currentNodeIsCircularReadNode == 1;
           _this27.readOnlyNotificationType = readOnlyNotificationType;
           _this27.isSpecial = isSpecial;