eoss-ui 0.4.52 → 0.4.53

package/lib/flow.js

@@ -101,6 +101,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _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; };
 
+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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -204,6 +206,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);
@@ -3010,7 +3013,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=9783bc8c&
+// 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=88cb49c6&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3625,91 +3628,51 @@ var render = function () {
                                             1
                                           )
                                         : _vm._e(),
-                                      _c(
-                                        "el-form-item",
-                                        {
-                                          attrs: {
-                                            prop: _vm.isShowNextUser
-                                              ? "nextUserId"
-                                              : "nextOrgId",
-                                            label: _vm.isShowNextUser
-                                              ? "下步办理人"
-                                              : "办理对象",
-                                          },
-                                        },
-                                        [
-                                          _c("SelectUser", {
-                                            attrs: {
-                                              nextUser: _vm.isShowNextUser
-                                                ? _vm.nextNode.nextUserId
-                                                : _vm.nextNode.nextOrgId,
-                                              radioList: _vm.radioList,
-                                              multiple: _vm.multiple,
-                                              isCustomUser: !_vm.isShowNextUser
-                                                ? 1
-                                                : _vm.isCustomUser,
-                                              isCurrentNodeForbiddenChangeCandidate:
-                                                _vm.isCurrentNodeForbiddenChangeCandidate,
-                                              options: _vm.options,
-                                              mix: _vm.multiple,
-                                              presetEdit: _vm.presetEdit,
-                                              selectUserList:
-                                                _vm.selectUserList,
-                                              types: _vm.nextUserTypes,
-                                              params: _vm.isShowNextUser
-                                                ? _vm.params
-                                                : {},
-                                              tabs: _vm.nextUserTabs,
-                                            },
-                                            on: {
-                                              change: function ($event) {
-                                                _vm.changeSelectUser(
-                                                  $event,
-                                                  _vm.isShowNextUser
-                                                    ? "nextUserId"
-                                                    : "nextOrgId",
-                                                  true
-                                                )
-                                              },
-                                            },
-                                          }),
-                                        ],
-                                        1
-                                      ),
-                                      _vm.isHideCurrentOrg
+                                      _vm.isNextUser
                                         ? _c(
                                             "el-form-item",
                                             {
                                               attrs: {
-                                                prop: "nextCurrentOrgObj",
-                                                label: _vm.currentOrgName
-                                                  ? _vm.currentOrgName
-                                                  : "本单位",
+                                                prop: _vm.isShowNextUser
+                                                  ? "nextUserId"
+                                                  : "nextOrgId",
+                                                label: _vm.isShowNextUser
+                                                  ? "下步办理人"
+                                                  : "办理对象",
                                               },
                                             },
                                             [
                                               _c("SelectUser", {
                                                 attrs: {
-                                                  nextUser:
-                                                    _vm.nextNode
-                                                      .nextCurrentOrgObj,
-                                                  multiple: "",
-                                                  mix: "",
+                                                  nextUser: _vm.isShowNextUser
+                                                    ? _vm.nextNode.nextUserId
+                                                    : _vm.nextNode.nextOrgId,
+                                                  radioList: _vm.radioList,
+                                                  multiple: _vm.multiple,
+                                                  isCustomUser:
+                                                    !_vm.isShowNextUser
+                                                      ? 1
+                                                      : _vm.isCustomUser,
+                                                  isCurrentNodeForbiddenChangeCandidate:
+                                                    _vm.isCurrentNodeForbiddenChangeCandidate,
+                                                  options: _vm.options,
+                                                  mix: _vm.multiple,
+                                                  presetEdit: _vm.presetEdit,
                                                   selectUserList:
-                                                    _vm.selectNextCurrentOrgObjList,
-                                                  types: [
-                                                    "department",
-                                                    "employee",
-                                                  ],
-                                                  params: {
-                                                    filid: _vm.userModel.orgId,
-                                                  },
+                                                    _vm.selectUserList,
+                                                  types: _vm.nextUserTypes,
+                                                  params: _vm.isShowNextUser
+                                                    ? _vm.params
+                                                    : {},
+                                                  tabs: _vm.nextUserTabs,
                                                 },
                                                 on: {
                                                   change: function ($event) {
                                                     _vm.changeSelectUser(
                                                       $event,
-                                                      "nextCurrentOrgObj",
+                                                      _vm.isShowNextUser
+                                                        ? "nextUserId"
+                                                        : "nextOrgId",
                                                       true
                                                     )
                                                   },
@@ -4427,7 +4390,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=9783bc8c&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=88cb49c6&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -9486,8 +9449,8 @@ var processReject_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var processReject = (processReject_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/startTaskRead.vue?vue&type=template&id=95f78930&
-var startTaskReadvue_type_template_id_95f78930_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/startTaskRead.vue?vue&type=template&id=31232218&
+var startTaskReadvue_type_template_id_31232218_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -9862,15 +9825,11 @@ var startTaskReadvue_type_template_id_95f78930_render = function () {
     1
   )
 }
-var startTaskReadvue_type_template_id_95f78930_staticRenderFns = []
-startTaskReadvue_type_template_id_95f78930_render._withStripped = true
-
+var startTaskReadvue_type_template_id_31232218_staticRenderFns = []
+startTaskReadvue_type_template_id_31232218_render._withStripped = true
 
-// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=95f78930&
 
-// EXTERNAL MODULE: external "qs"
-var external_qs_ = __webpack_require__(4);
-var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
+// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=31232218&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/startTaskRead.vue?vue&type=script&lang=js&
 var startTaskReadvue_type_script_lang_js_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; };
@@ -10024,7 +9983,6 @@ var startTaskReadvue_type_script_lang_js_components;
 
 
 
-
 /* harmony default export */ var startTaskReadvue_type_script_lang_js_ = ({
   name: 'StartTaskRead',
   components: (startTaskReadvue_type_script_lang_js_components = {}, startTaskReadvue_type_script_lang_js_components[Option.name] = Option, startTaskReadvue_type_script_lang_js_components[selectUser.name] = selectUser, startTaskReadvue_type_script_lang_js_components),
@@ -10394,12 +10352,10 @@ var startTaskReadvue_type_script_lang_js_components;
               url: api["qb" /* taskReadHtml */],
               params: { taskAction: _this7.type },
               headers: {
-                Accept: 'application/json,text/plain',
-                'Content-Type': ' application/x-www-form-urlencoded; charset=UTF-8'
+                Accept: 'application/json,text/plain'
               },
               method: 'post',
-              format: false,
-              data: external_qs_default.a.stringify(params)
+              data: params
             }).then(function (res) {
               var message = res.message,
                   status = res.status;
@@ -10470,8 +10426,8 @@ var startTaskReadvue_type_script_lang_js_components;
 
 var startTaskRead_component = Object(componentNormalizer["a" /* default */])(
   src_startTaskReadvue_type_script_lang_js_,
-  startTaskReadvue_type_template_id_95f78930_render,
-  startTaskReadvue_type_template_id_95f78930_staticRenderFns,
+  startTaskReadvue_type_template_id_31232218_render,
+  startTaskReadvue_type_template_id_31232218_staticRenderFns,
   false,
   null,
   null,
@@ -11768,7 +11724,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
-
+//
 
 
 
@@ -12113,12 +12069,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           url: api["qb" /* taskReadHtml */],
           params: { taskAction: 'complete' },
           headers: {
-            Accept: 'application/json,text/plain',
-            'Content-Type': ' application/x-www-form-urlencoded; charset=UTF-8'
+            Accept: 'application/json,text/plain'
           },
           method: 'post',
-          format: false,
-          data: external_qs_default.a.stringify(params)
+          data: params
         }).then(function (res) {
           var status = res.status,
               message = res.message;
@@ -13052,6 +13006,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           _this14.getNodeInfo();
         } else {
           if (res.status === 'taskCompleted') {
+            _this14.$emit('shrink', true);
             _this14.shrinkAbled = true;
             _this14.$message.warning(res.message || '系统错误，请联系管理员！');
           } else {
@@ -13245,7 +13200,7 @@ 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)) {
+                  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;
                   }

package/lib/form.js

@@ -102,6 +102,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _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; };
 
+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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -205,6 +207,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);

package/lib/handle-user.js

@@ -102,6 +102,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _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; };
 
+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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -205,6 +207,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);

package/lib/handler.js

@@ -102,6 +102,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _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; };
 
+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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -205,6 +207,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);