eoss-ui 0.7.19 → 0.7.21

package/lib/flow.js

@@ -198,12 +198,14 @@ var ajax = function ajax(_ref) {
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
       defaults = _ref$defaults === undefined ? false : _ref$defaults,
+      _ref$withCredentials = _ref.withCredentials,
+      withCredentials = _ref$withCredentials === undefined ? true : _ref$withCredentials,
       loading = _ref.loading,
       publicKey = _ref.publicKey,
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'withCredentials', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -241,20 +243,18 @@ var ajax = function ajax(_ref) {
       // delPendingRequest(response.config);
       loading && loading.close();
       if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-        if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
-          localStorage.setItem('token', response.headers.authorization);
-          localStorage.setItem('Authorization', response.headers.authorization);
-        } else {
-          sessionStorage.setItem('token', response.headers.authorization);
-          sessionStorage.setItem('Authorization', response.headers.authorization);
-        }
+        setStorage({
+          key: ['token', 'Authorization'],
+          value: response.headers.authorization
+        });
       }
-      if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
-        if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
-          localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
-        } else {
-          sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
-        }
+      var ssId = response.headers.ssId || response.headers.Ssid || response.headers.ssid;
+
+      if (ssId && ssId !== getStorage('ssId')) {
+        setStorage({
+          key: 'ssId',
+          value: ssId
+        });
       }
       if (response.status === 200) {
         responses(response.data);
@@ -1791,37 +1791,6 @@ var getSecond = function getSecond(datetime) {
   return datetimeObj.getSeconds();
 };
 
-/**
- * getStorage
- * @desc:获取本地储存数据
- * @author huangbo
- * @date 2022年5月7日
- * @param {String} [key] - 获取的名称
- **/
-var getStorage = function getStorage(key) {
-  if (key) {
-    var res = sessionStorage.getItem(key) || localStorage.getItem(key) || win[key];
-    if (key === 'host' && !res) {
-      return win.location.origin;
-    }
-    return res;
-  }
-  var defaults = {};
-  var token = sessionStorage.getItem('token') || localStorage.getItem('token') || win.token;
-  var ssId = sessionStorage.getItem('ssId') || localStorage.getItem('ssId') || win.ssId;
-  var deviceUnique = sessionStorage.getItem('deviceUnique') || localStorage.getItem('deviceUnique') || win.deviceUnique;
-  if (token) {
-    defaults.Authorization = token;
-  }
-  if (ssId) {
-    defaults.ssId = ssId;
-  }
-  if (deviceUnique) {
-    defaults.deviceUnique = deviceUnique;
-  }
-  return defaults;
-};
-
 /**
  * getStyle
  * @desc:获取元素样式（含非行内样式）
@@ -2348,9 +2317,7 @@ var isLogined = function () {
 
                 switch (results.statusCode) {
                   case 0:
-                    var storage = getStorage('storage');
                     setStorage({
-                      type: storage,
                       key: {
                         ssId: results.ssId,
                         token: results.token,
@@ -2727,28 +2694,6 @@ var receiveMessage = function receiveMessage(_ref14) {
   });
 };
 
-/**
- * removeStorage
- * @desc:删除本地储存数据
- * @author huangbo
- * @date 2022年5月7日
- * @param {String, Array} [key] - 获取的名称
- **/
-var removeStorage = function removeStorage(key) {
-  if (Array.isArray(key)) {
-    for (var i = 0; i < key.length; i++) {
-      sessionStorage.removeItem(key[i]);
-      localStorage.removeItem(key[i]);
-    }
-  } else if (key) {
-    sessionStorage.removeItem(key);
-    localStorage.removeItem(key);
-  } else {
-    sessionStorage.clear();
-    localStorage.clear();
-  }
-};
-
 /**
  * replenish
  * @desc:补全小数位数
@@ -3046,52 +2991,6 @@ var setFavicon = function setFavicon(url) {
   }
 };
 
-/**
- * setStorage
- * @desc:设置本地储存数据
- * @author huangbo
- * @date 2022年5月7日
- * @param {String} [type] - 储存类型
- * @param {String, Array, Object} [key] - 数据的名称，array类型表示多个key保存同一个value,object类型时对象的属性名称作为key属性值作为value
- * @param {String} [value] - 数据的值
- **/
-var setStorage = function setStorage(_ref17) {
-  var type = _ref17.type,
-      key = _ref17.key,
-      value = _ref17.value;
-
-  if (value && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object') {
-    value = JSON.stringify(value);
-  }
-  if (type === 'localStorage') {
-    if (typeof key === 'string') {
-      localStorage.setItem(key, value);
-    } else if (Array.isArray(key)) {
-      for (var i in key) {
-        localStorage.setItem(key[i], value);
-      }
-    } else {
-      for (var _i7 in key) {
-        var val = _typeof(key[_i7]) === 'object' ? JSON.stringify(key[_i7]) : key[_i7];
-        localStorage.setItem(_i7, val);
-      }
-    }
-  } else {
-    if (typeof key === 'string') {
-      sessionStorage.setItem(key, value);
-    } else if (Array.isArray(key)) {
-      for (var _i8 in key) {
-        sessionStorage.setItem(key[_i8], value);
-      }
-    } else {
-      for (var _i9 in key) {
-        var _val = _typeof(key[_i9]) === 'object' ? JSON.stringify(key[_i9]) : key[_i9];
-        sessionStorage.setItem(_i9, _val);
-      }
-    }
-  }
-};
-
 /**
  * socket
  * @desc:webSocket
@@ -3352,10 +3251,10 @@ var upperCase = function upperCase(text) {
  * @param {Object} [url] - url地址
  * @param {Object} [param] - 被转换的对象
  **/
-var urlJoinParams = function urlJoinParams(_ref18) {
-  var url = _ref18.url,
-      param = _ref18.param,
-      timestamp = _ref18.timestamp;
+var urlJoinParams = function urlJoinParams(_ref17) {
+  var url = _ref17.url,
+      param = _ref17.param,
+      timestamp = _ref17.timestamp;
 
   var arry = decodeURI(url).split('?');
   var times = new Date().getTime();
@@ -3471,6 +3370,195 @@ var watermark = function watermark(option) {
   };
 };
 
+/**
+ * setStorage
+ * @desc:设置本地储存数据
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String} [type] - 储存类型
+ * @param {String, Array, Object} [key] - 数据的名称，array类型表示多个key保存同一个value,object类型时对象的属性名称作为key属性值作为value
+ * @param {String} [value] - 数据的值
+ **/
+var setStorage = function setStorage(_ref18) {
+  var type = _ref18.type,
+      key = _ref18.key,
+      value = _ref18.value;
+
+  type = type || getStorage('storage');
+
+  if (value && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object') {
+    value = JSON.stringify(value);
+  }
+  if (type === 'localStorage') {
+    if (typeof key === 'string') {
+      localStorage.setItem(key, value);
+      if (key === 'token') {
+        setCookie('token', value);
+      }
+    } else if (Array.isArray(key)) {
+      for (var i in key) {
+        localStorage.setItem(key[i], value);
+        if (key[i] === 'token') {
+          setCookie('token', value);
+        }
+      }
+    } else {
+      for (var _i7 in key) {
+        var val = _typeof(key[_i7]) === 'object' ? JSON.stringify(key[_i7]) : key[_i7];
+        localStorage.setItem(_i7, val);
+        if (_i7 === 'token') {
+          setCookie('token', val);
+        }
+      }
+    }
+  } else {
+    if (typeof key === 'string') {
+      sessionStorage.setItem(key, value);
+      if (key === 'token') {
+        setCookie('token', value);
+      }
+    } else if (Array.isArray(key)) {
+      for (var _i8 in key) {
+        sessionStorage.setItem(key[_i8], value);
+        if (key[_i8] === 'token') {
+          setCookie('token', value);
+        }
+      }
+    } else {
+      for (var _i9 in key) {
+        var _val = _typeof(key[_i9]) === 'object' ? JSON.stringify(key[_i9]) : key[_i9];
+        sessionStorage.setItem(_i9, _val);
+        if (_i9 === 'token') {
+          setCookie('token', _val);
+        }
+      }
+    }
+  }
+};
+
+/**
+ * getStorage
+ * @desc:获取本地储存数据
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String} [key] - 获取的名称
+ **/
+var getStorage = function getStorage(key) {
+  if (key) {
+    var res = sessionStorage.getItem(key) || localStorage.getItem(key) || win[key];
+    if (key === 'host' && !res) {
+      return win.location.origin;
+    }
+    return res;
+  }
+  var defaults = {};
+  var token = sessionStorage.getItem('token') || localStorage.getItem('token') || getCookie('token') || win.token;
+  var ssId = sessionStorage.getItem('ssId') || localStorage.getItem('ssId') || getCookie('ssId') || win.ssId;
+
+  var deviceUnique = sessionStorage.getItem('deviceUnique') || localStorage.getItem('deviceUnique') || getCookie('deviceUnique') || win.deviceUnique;
+  if (token) {
+    defaults.Authorization = token;
+  }
+  if (ssId) {
+    defaults.ssId = ssId;
+  }
+  if (deviceUnique) {
+    defaults.deviceUnique = deviceUnique;
+  }
+  return defaults;
+};
+
+/**
+ * removeStorage
+ * @desc:删除本地储存数据
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String, Array} [key] - 获取的名称
+ **/
+var removeStorage = function removeStorage(key) {
+  if (Array.isArray(key)) {
+    for (var i = 0; i < key.length; i++) {
+      sessionStorage.removeItem(key[i]);
+      localStorage.removeItem(key[i]);
+      if (key[i] === 'token') {
+        removeCookie('token');
+      }
+    }
+  } else if (key) {
+    sessionStorage.removeItem(key);
+    localStorage.removeItem(key);
+    if (key === 'token') {
+      removeCookie('token');
+    }
+  } else {
+    sessionStorage.clear();
+    localStorage.clear();
+    removeCookie('token');
+  }
+};
+
+/**
+ * setCookie
+ * @desc 设置cookie
+ * @author huangbo
+ * @param {string} [name] cookie名称
+ * @return {string} [value] cookie值
+ **/
+var setCookie = function setCookie(name, value) {
+  // 不设置 expires 或 max-age，默认为会话 Cookie
+  document.cookie = encodeURIComponent(name) + '=' + encodeURIComponent(value) + '; path=/';
+};
+
+/**
+ * getCookie
+ * @desc 获取cookie中指定名称的值
+ * @author huangbo
+ * @param {string} [name] cookie名称
+ **/
+var getCookie = function getCookie(name) {
+  var cookies = document.cookie.split(';');
+  for (var _iterator = cookies, _isArray = Array.isArray(_iterator), _i10 = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref19;
+
+    if (_isArray) {
+      if (_i10 >= _iterator.length) break;
+      _ref19 = _iterator[_i10++];
+    } else {
+      _i10 = _iterator.next();
+      if (_i10.done) break;
+      _ref19 = _i10.value;
+    }
+
+    var cookie = _ref19;
+
+    var _cookie$trim$split = cookie.trim().split('='),
+        cookieName = _cookie$trim$split[0],
+        cookieValue = _cookie$trim$split[1];
+
+    if (decodeURIComponent(cookieName) === name) {
+      return decodeURIComponent(cookieValue);
+    }
+  }
+  return null;
+};
+
+/**
+ * removeCookie
+ * @desc:删除cookie
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String, Array} [key] - 获取的名称
+ **/
+var removeCookie = function removeCookie(key) {
+  if (Array.isArray(key)) {
+    for (var i = 0; i < key.length; i++) {
+      document.cookie = encodeURIComponent(key[i]) + '=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+    }
+  } else {
+    document.cookie = encodeURIComponent(key) + '=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+  }
+};
+
 /* harmony default export */ __webpack_exports__["a"] = ({
   ajax: ajax,
   ajaxStream: ajaxStream,
@@ -3497,6 +3585,7 @@ var watermark = function watermark(option) {
   formatDate: formatDate,
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
+  getCookie: getCookie,
   getHour: getHour,
   getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
@@ -3534,6 +3623,7 @@ var watermark = function watermark(option) {
   mixColor: mixColor,
   overbrim: overbrim,
   queryParams: queryParams,
+  removeCookie: removeCookie,
   receiveMessage: receiveMessage,
   removeStorage: removeStorage,
   replenish: replenish,
@@ -3541,6 +3631,7 @@ var watermark = function watermark(option) {
   rgbToHsv: rgbToHsv,
   rmbToCapital: rmbToCapital,
   sendMessage: sendMessage,
+  setCookie: setCookie,
   setFavicon: setFavicon,
   setScale: setScale,
   setStorage: setStorage,
@@ -4489,7 +4580,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=d565d514&
+// 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=5ee0fd1a&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5062,6 +5153,7 @@ var render = function () {
                           staticClass: "demo-dynamic",
                           attrs: {
                             model: _vm.isFlow ? _vm.nodeInfo : _vm.nextNode,
+                            rules: _vm.rules,
                             "label-width":
                               _vm.startFlowPageEmbeddedIntoStartFlowIndex
                                 ? "100px"
@@ -5809,112 +5901,6 @@ var render = function () {
                                                     1
                                                   )
                                                 : _vm._e(),
-                                              _vm.enableCustomLimitTimeSetting
-                                                ? _c(
-                                                    "el-form-item",
-                                                    {
-                                                      attrs: {
-                                                        prop: "customLimitTime",
-                                                        label: "限时办理",
-                                                      },
-                                                    },
-                                                    [
-                                                      _c(
-                                                        "el-input",
-                                                        {
-                                                          staticClass:
-                                                            "input-with-select custom-limit-time",
-                                                          attrs: {
-                                                            placeholder:
-                                                              "请输入限时办理的天数",
-                                                          },
-                                                          on: {
-                                                            change:
-                                                              _vm.changeCustomLimitTime,
-                                                          },
-                                                          model: {
-                                                            value:
-                                                              _vm.nextNode
-                                                                .customLimitTime,
-                                                            callback: function (
-                                                              $$v
-                                                            ) {
-                                                              _vm.$set(
-                                                                _vm.nextNode,
-                                                                "customLimitTime",
-                                                                $$v
-                                                              )
-                                                            },
-                                                            expression:
-                                                              "nextNode.customLimitTime",
-                                                          },
-                                                        },
-                                                        [
-                                                          !_vm.showCustomLimitTimeText
-                                                            ? _c("es-select", {
-                                                                attrs: {
-                                                                  slot: "prepend",
-                                                                  placeholder:
-                                                                    "请选择",
-                                                                  sysCode:
-                                                                    "bpm_custom_limit_time",
-                                                                },
-                                                                slot: "prepend",
-                                                                model: {
-                                                                  value:
-                                                                    _vm.nextNode
-                                                                      .customLimitTime,
-                                                                  callback:
-                                                                    function (
-                                                                      $$v
-                                                                    ) {
-                                                                      _vm.$set(
-                                                                        _vm.nextNode,
-                                                                        "customLimitTime",
-                                                                        $$v
-                                                                      )
-                                                                    },
-                                                                  expression:
-                                                                    "nextNode.customLimitTime",
-                                                                },
-                                                              })
-                                                            : _vm._e(),
-                                                          _c(
-                                                            "es-button",
-                                                            {
-                                                              attrs: {
-                                                                slot: "append",
-                                                                type: "primary",
-                                                              },
-                                                              on: {
-                                                                click:
-                                                                  function () {
-                                                                    _vm.nextNode.customLimitTime =
-                                                                      ""
-                                                                    _vm.showCustomLimitTimeText =
-                                                                      !_vm.showCustomLimitTimeText
-                                                                  },
-                                                              },
-                                                              slot: "append",
-                                                            },
-                                                            [
-                                                              _vm._v(
-                                                                "切换" +
-                                                                  _vm._s(
-                                                                    _vm.showCustomLimitTimeText
-                                                                      ? "选择框"
-                                                                      : "文本框"
-                                                                  )
-                                                              ),
-                                                            ]
-                                                          ),
-                                                        ],
-                                                        1
-                                                      ),
-                                                    ],
-                                                    1
-                                                  )
-                                                : _vm._e(),
                                               _vm.isHideCurrentOrg &&
                                               _vm.nextNode.isReturnSubmitter !=
                                                 1
@@ -6164,6 +6150,115 @@ var render = function () {
                                                     1
                                                   )
                                                 : _vm._e(),
+                                              _vm.enableCustomLimitTimeSetting
+                                                ? _c(
+                                                    "el-form-item",
+                                                    {
+                                                      staticStyle: {
+                                                        "margin-bottom": "10px",
+                                                      },
+                                                      attrs: {
+                                                        prop: "customLimitTime",
+                                                        label: "限时办理",
+                                                      },
+                                                    },
+                                                    [
+                                                      _c(
+                                                        "el-input",
+                                                        {
+                                                          staticClass:
+                                                            "input-with-select custom-limit-time",
+                                                          attrs: {
+                                                            placeholder:
+                                                              "请输入限时办理的天数",
+                                                          },
+                                                          on: {
+                                                            change:
+                                                              _vm.changeCustomLimitTime,
+                                                          },
+                                                          model: {
+                                                            value:
+                                                              _vm.nextNode
+                                                                .customLimitTime,
+                                                            callback: function (
+                                                              $$v
+                                                            ) {
+                                                              _vm.$set(
+                                                                _vm.nextNode,
+                                                                "customLimitTime",
+                                                                $$v
+                                                              )
+                                                            },
+                                                            expression:
+                                                              "nextNode.customLimitTime",
+                                                          },
+                                                        },
+                                                        [
+                                                          !_vm.showCustomLimitTimeText
+                                                            ? _c("es-select", {
+                                                                attrs: {
+                                                                  slot: "prepend",
+                                                                  placeholder:
+                                                                    "请选择",
+                                                                  sysCode:
+                                                                    "bpm_custom_limit_time",
+                                                                },
+                                                                slot: "prepend",
+                                                                model: {
+                                                                  value:
+                                                                    _vm.nextNode
+                                                                      .customLimitTime,
+                                                                  callback:
+                                                                    function (
+                                                                      $$v
+                                                                    ) {
+                                                                      _vm.$set(
+                                                                        _vm.nextNode,
+                                                                        "customLimitTime",
+                                                                        $$v
+                                                                      )
+                                                                    },
+                                                                  expression:
+                                                                    "nextNode.customLimitTime",
+                                                                },
+                                                              })
+                                                            : _vm._e(),
+                                                          _c(
+                                                            "es-button",
+                                                            {
+                                                              attrs: {
+                                                                slot: "append",
+                                                                type: "primary",
+                                                              },
+                                                              on: {
+                                                                click:
+                                                                  function () {
+                                                                    _vm.nextNode.customLimitTime =
+                                                                      ""
+                                                                    _vm.showCustomLimitTimeText =
+                                                                      !_vm.showCustomLimitTimeText
+                                                                  },
+                                                              },
+                                                              slot: "append",
+                                                            },
+                                                            [
+                                                              _vm._v(
+                                                                "切换" +
+                                                                  _vm._s(
+                                                                    _vm.showCustomLimitTimeText
+                                                                      ? "选择框"
+                                                                      : "文本框"
+                                                                  )
+                                                              ),
+                                                            ]
+                                                          ),
+                                                        ],
+                                                        1
+                                                      ),
+                                                    ],
+                                                    1
+                                                  )
+                                                : _vm._e(),
                                               _vm.isHandleExplain == 1
                                                 ? _c(
                                                     "el-form-item",
@@ -7407,7 +7502,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=d565d514&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5ee0fd1a&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -8463,8 +8558,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=e536b88e&
-var processFormvue_type_template_id_e536b88e_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=e6806444&
+var processFormvue_type_template_id_e6806444_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8495,6 +8590,7 @@ var processFormvue_type_template_id_e536b88e_render = function () {
           attrs: {
             model: _vm.nextNode,
             "label-width": "100px",
+            rules: _vm.rules,
             "label-position": _vm.labelPosition,
           },
         },
@@ -8651,7 +8747,7 @@ var processFormvue_type_template_id_e536b88e_render = function () {
                     label: "下步节点",
                     rules: [
                       {
-                        required: true,
+                        required: false,
                         message: "请选择下步节点",
                         trigger: "blur",
                       },
@@ -8841,7 +8937,26 @@ var processFormvue_type_template_id_e536b88e_render = function () {
               _vm.enableCustomLimitTimeSetting
                 ? _c(
                     "el-form-item",
-                    { attrs: { prop: "customLimitTime", label: "限时办理" } },
+                    {
+                      attrs: {
+                        prop: "customLimitTime",
+                        label: "限时办理",
+                        rules: [
+                          {
+                            required: _vm.enableCustomLimitTimeSetting,
+                            message: _vm.showCustomLimitTimeText
+                              ? "请输入限时办理天数"
+                              : "请选择限时办理天数",
+                            trigger: "blur",
+                          },
+                          {
+                            required: _vm.enableCustomLimitTimeSetting,
+                            validator: _vm.checkCustomLimitTime,
+                            trigger: "blur",
+                          },
+                        ],
+                      },
+                    },
                     [
                       _c(
                         "el-input",
@@ -8937,7 +9052,7 @@ var processFormvue_type_template_id_e536b88e_render = function () {
                       name: "show",
                       rawName: "v-show",
                       value: _vm.showBtn && _vm.nextNode.noticeList.length > 0,
-                      expression: "showBtn && nextNode.noticeList.length>0",
+                      expression: "showBtn && nextNode.noticeList.length > 0",
                     },
                   ],
                   attrs: { prop: "noticeType", label: "通知方式" },
@@ -9221,11 +9336,11 @@ var processFormvue_type_template_id_e536b88e_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_e536b88e_staticRenderFns = []
-processFormvue_type_template_id_e536b88e_render._withStripped = true
+var processFormvue_type_template_id_e6806444_staticRenderFns = []
+processFormvue_type_template_id_e6806444_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=e536b88e&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=e6806444&
 
 // 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=4750588e&
 var selectUservue_type_template_id_4750588e_render = function () {
@@ -11093,6 +11208,28 @@ var processFormvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -11313,6 +11450,19 @@ var processFormvue_type_script_lang_js_components;
     }
   },
   computed: {
+    rules: function rules() {
+      return {
+        customLimitTime: [{
+          required: this.enableCustomLimitTimeSetting,
+          message: this.showCustomLimitTimeText ? '请输入限时办理天数' : '请选择限时办理天数',
+          trigger: 'blur'
+        }, {
+          required: this.enableCustomLimitTimeSetting,
+          validator: this.checkCustomLimitTime,
+          trigger: 'blur'
+        }]
+      };
+    },
     types: function types() {
       if (this.isCdjxjTaskHandle == 'true') {
         return ['employee', 'enterprise', 'department'];
@@ -11337,6 +11487,25 @@ var processFormvue_type_script_lang_js_components;
   },
 
   methods: {
+    limitTimevalidate: function limitTimevalidate() {
+      var validSate = true;
+      this.$refs.nextNode.validate(function (valid) {
+        if (valid) {
+          validSate = true;
+        } else {
+          validSate = false;
+        }
+      });
+      return validSate;
+    },
+    checkCustomLimitTime: function checkCustomLimitTime(rule, value, callback) {
+      if (!Number(value) || value.indexOf('.') != -1 || Number(value) < 0) {
+        callback(new Error('请输入正确的天数'));
+        this.nextNode.customLimitTime = '';
+      } else {
+        callback();
+      }
+    },
     handleChange: function handleChange() {
       this.isChangeMessage = true;
     },
@@ -11570,7 +11739,6 @@ var processFormvue_type_script_lang_js_components;
           var params = {
             processDefinitionId: _this5.processDefinitionId,
             nextUserId: _this5.multiple ? newNextUser.join(',') : nextUser,
-            customLimitTime: customLimitTime,
             nextNodeId: nextNode,
             businessId: _this5.businessId,
             notificationType: newNoticeType,
@@ -11584,6 +11752,18 @@ var processFormvue_type_script_lang_js_components;
             presetReadUserId: _this5.mixPresetList && _this5.mixPresetList.length > 0 ? _this5.mixPresetList.join('|') : presetReadUserId.join(','),
             opinion: _this5.newOpinion || newOpinion
           };
+          if (_this5.enableCustomLimitTimeSetting) {
+            params.customLimitTime = customLimitTime;
+            if (!customLimitTime) {
+              _this5.$message.warning('请选择或输入限时办理的天数');
+              _this5.nextNode.customLimitTime = '';
+              return;
+            } else if (!Number(customLimitTime) || val.indexOf('.') != -1 || Number(customLimitTime) < 0) {
+              _this5.$message.warning('请输入正确的天数');
+              _this5.nextNode.customLimitTime = '';
+              return;
+            }
+          }
           if (_this5.activeNames != '1') delete params.customPresetUserJson;
           if (_this5.isFreeStartFlow || _this5.formType === 'readTransfer') {
             var newParm = {};
@@ -11954,8 +12134,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_e536b88e_render,
-  processFormvue_type_template_id_e536b88e_staticRenderFns,
+  processFormvue_type_template_id_e6806444_render,
+  processFormvue_type_template_id_e6806444_staticRenderFns,
   false,
   null,
   null,
@@ -15983,8 +16163,8 @@ var reset_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var src_reset = (reset_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/taskUnionExamine.vue?vue&type=template&id=e0b78d58&
-var taskUnionExaminevue_type_template_id_e0b78d58_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/taskUnionExamine.vue?vue&type=template&id=6dd739cc&
+var taskUnionExaminevue_type_template_id_6dd739cc_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -16007,7 +16187,11 @@ var taskUnionExaminevue_type_template_id_e0b78d58_render = function () {
         {
           ref: "infoList",
           staticClass: "demo-dynamic",
-          attrs: { model: _vm.infoList, "label-width": "120px" },
+          attrs: {
+            model: _vm.infoList,
+            rules: _vm.rules,
+            "label-width": "120px",
+          },
         },
         [
           _vm.isSinglePage
@@ -16131,6 +16315,73 @@ var taskUnionExaminevue_type_template_id_e0b78d58_render = function () {
                 1
               )
             : _vm._e(),
+          _vm.enableCustomLimitTimeSetting
+            ? _c(
+                "el-form-item",
+                { attrs: { prop: "customLimitTime", label: "限时办理" } },
+                [
+                  _c(
+                    "el-input",
+                    {
+                      staticClass: "input-with-select custom-limit-time",
+                      attrs: { placeholder: "请输入限时办理的天数" },
+                      model: {
+                        value: _vm.infoList.customLimitTime,
+                        callback: function ($$v) {
+                          _vm.$set(_vm.infoList, "customLimitTime", $$v)
+                        },
+                        expression: "infoList.customLimitTime",
+                      },
+                    },
+                    [
+                      !_vm.showCustomLimitTimeText
+                        ? _c("es-select", {
+                            attrs: {
+                              slot: "prepend",
+                              placeholder: "请选择",
+                              sysCode: "bpm_custom_limit_time",
+                            },
+                            slot: "prepend",
+                            model: {
+                              value: _vm.infoList.customLimitTime,
+                              callback: function ($$v) {
+                                _vm.$set(_vm.infoList, "customLimitTime", $$v)
+                              },
+                              expression: "infoList.customLimitTime",
+                            },
+                          })
+                        : _vm._e(),
+                      _c(
+                        "es-button",
+                        {
+                          attrs: { slot: "append", type: "primary" },
+                          on: {
+                            click: function () {
+                              _vm.infoList.customLimitTime = ""
+                              _vm.showCustomLimitTimeText =
+                                !_vm.showCustomLimitTimeText
+                            },
+                          },
+                          slot: "append",
+                        },
+                        [
+                          _vm._v(
+                            "切换" +
+                              _vm._s(
+                                _vm.showCustomLimitTimeText
+                                  ? "选择框"
+                                  : "文本框"
+                              )
+                          ),
+                        ]
+                      ),
+                    ],
+                    1
+                  ),
+                ],
+                1
+              )
+            : _vm._e(),
           _c(
             "el-form-item",
             {
@@ -16246,11 +16497,11 @@ var taskUnionExaminevue_type_template_id_e0b78d58_render = function () {
     1
   )
 }
-var taskUnionExaminevue_type_template_id_e0b78d58_staticRenderFns = []
-taskUnionExaminevue_type_template_id_e0b78d58_render._withStripped = true
+var taskUnionExaminevue_type_template_id_6dd739cc_staticRenderFns = []
+taskUnionExaminevue_type_template_id_6dd739cc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=e0b78d58&
+// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=6dd739cc&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/taskUnionExamine.vue?vue&type=script&lang=js&
 var taskUnionExaminevue_type_script_lang_js_components;
@@ -16392,6 +16643,37 @@ var taskUnionExaminevue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -16408,9 +16690,12 @@ var taskUnionExaminevue_type_script_lang_js_components;
     disabled: { type: Boolean, default: false },
     simpleTips: { type: Boolean, default: true },
     multiple: { type: Boolean, default: true },
-    selectorParams: { type: Object, default: function _default() {
+    selectorParams: {
+      type: Object,
+      default: function _default() {
         return {};
-      } }
+      }
+    }
   },
   inheritAttrs: false,
   data: function data() {
@@ -16419,13 +16704,17 @@ var taskUnionExaminevue_type_script_lang_js_components;
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
       otherMix: false,
+      enableCustomLimitTimeSetting: false,
+      showCustomLimitTimeText: false,
       currentMix: false,
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
         noticeType: [],
+        noticeList: [],
         noticeInfo: '',
-        opinion: ''
+        opinion: '',
+        customLimitTime: ''
       },
       onlyName: '',
       unionSealData: [],
@@ -16451,6 +16740,18 @@ var taskUnionExaminevue_type_script_lang_js_components;
       loading: false
     };
   },
+
+  computed: {
+    rules: function rules() {
+      return {
+        customLimitTime: [{
+          required: this.enableCustomLimitTimeSetting,
+          message: this.showCustomLimitTimeText ? '请输入限时办理天数' : '请选择限时办理天数',
+          trigger: 'blur'
+        }, { required: this.enableCustomLimitTimeSetting, validator: this.checkCustomLimitTime, trigger: 'change' }]
+      };
+    }
+  },
   mounted: function mounted() {
     this.loading = true;
     this.newMultiple = this.multiple;
@@ -16462,6 +16763,25 @@ var taskUnionExaminevue_type_script_lang_js_components;
   },
 
   methods: {
+    validate: function validate() {
+      var validSate = true;
+      this.$refs.infoList.validate(function (valid) {
+        if (valid) {
+          validSate = true;
+        } else {
+          validSate = false;
+        }
+      });
+      return validSate;
+    },
+    checkCustomLimitTime: function checkCustomLimitTime(rule, value, callback) {
+      if (!Number(value) || value.indexOf('.') != -1 || Number(value) < 0) {
+        callback(new Error('请输入正确的天数'));
+        this.infoList.customLimitTime = '';
+      } else {
+        callback();
+      }
+    },
     isMultiple: function isMultiple(val) {
       if (val == 7 || val == 9 || val == 11) {
         this.newMultiple = false;
@@ -16573,6 +16893,8 @@ var taskUnionExaminevue_type_script_lang_js_components;
               unionDispatchOrgId = _res$data2.unionDispatchOrgId,
               otherOrgDisabledObjId = _res$data2.otherOrgDisabledObjId,
               orgNames = _res$data2.orgNames,
+              enableCustomLimitTimeSetting = _res$data2.enableCustomLimitTimeSetting,
+              defaultCustomLimitDays = _res$data2.defaultCustomLimitDays,
               _res$data2$nodeInfoMa = _res$data2.nodeInfoMap.nodeExtAttr,
               userSelectionType = _res$data2$nodeInfoMa.userSelectionType,
               isHideOtherOrg = _res$data2$nodeInfoMa.isHideOtherOrg,
@@ -16582,6 +16904,10 @@ var taskUnionExaminevue_type_script_lang_js_components;
           if (otherOrgDisabledObjId) {
             _this3.otherOrgDisabledObjId = otherOrgDisabledObjId.split(',');
           }
+          _this3.enableCustomLimitTimeSetting = enableCustomLimitTimeSetting;
+          if (_this3.enableCustomLimitTimeSetting && defaultCustomLimitDays) {
+            _this3.infoList.customLimitTime = defaultCustomLimitDays + '';
+          }
           if (res.data.customizedConfig) {
             if (res.data.customizedConfig.currentOrgSelectorCustomized) {
               _this3.currentMix = res.data.customizedConfig.currentOrgSelectorSelectMix == 'true';
@@ -16668,6 +16994,7 @@ var taskUnionExaminevue_type_script_lang_js_components;
           nextCurrentOrgObj = _infoList2.nextCurrentOrgObj,
           nextOtherOrgObj = _infoList2.nextOtherOrgObj,
           noticeType = _infoList2.noticeType,
+          customLimitTime = _infoList2.customLimitTime,
           noticeInfo = _infoList2.noticeInfo,
           isOpinionRequired = this.isOpinionRequired,
           opinion = this.opinion,
@@ -16679,9 +17006,11 @@ var taskUnionExaminevue_type_script_lang_js_components;
           isSubFlow = this.isSubFlow,
           pendingId = this.pendingId;
 
-      if (type == 'takeAdvice' && !nextCurrentOrgObj && isHideCurrentOrg == 0 && isHideOtherOrg == 0 && !nextOtherOrgObj) {
+      console.log(nextCurrentOrgObj);
+      console.log(nextOtherOrgObj);
+      if (type == 'takeAdvice' && !nextCurrentOrgObj && isHideCurrentOrg == 0 && nextCurrentOrgObj.length == 0 && isHideOtherOrg == 0 && (!nextOtherOrgObj || nextOtherOrgObj.length == 0)) {
         return this.$message.warning('请选择处理对象!');
-      } else if (isHideCurrentOrg == 0 && !nextOtherOrgObj && !nextCurrentOrgObj) {
+      } else if (isHideCurrentOrg == 0 && (!nextOtherOrgObj || nextOtherOrgObj.length == 0) && (!nextCurrentOrgObj || nextCurrentOrgObj.length == 0)) {
         return this.$message.warning('请选择处理对象!');
       }
 
@@ -16695,6 +17024,7 @@ var taskUnionExaminevue_type_script_lang_js_components;
         data: {
           opinion: opinion,
           pendingId: pendingId,
+
           nextOtherOrgObj: this.type == 'unionSeal' ? this.unionSealData.map(function (x) {
             return x.showid;
           }).join(',') : Array.isArray(nextOtherOrgObj) ? nextOtherOrgObj.join(',') : nextOtherOrgObj,
@@ -16708,6 +17038,11 @@ var taskUnionExaminevue_type_script_lang_js_components;
         headers: { Accept: 'application/json,text/plain' },
         method: 'POST'
       };
+      if (this.enableCustomLimitTimeSetting) {
+        param.data.customLimitTime = customLimitTime;
+        console.log(this.validate(), 'this.validate()');
+        if (!this.validate()) return;
+      }
       this.loading = true;
       util["a" /* default */].ajax(param).then(function (res) {
         var message = res.message,
@@ -16844,8 +17179,8 @@ var taskUnionExaminevue_type_script_lang_js_components;
 
 var taskUnionExamine_component = Object(componentNormalizer["a" /* default */])(
   component_taskUnionExaminevue_type_script_lang_js_,
-  taskUnionExaminevue_type_template_id_e0b78d58_render,
-  taskUnionExaminevue_type_template_id_e0b78d58_staticRenderFns,
+  taskUnionExaminevue_type_template_id_6dd739cc_render,
+  taskUnionExaminevue_type_template_id_6dd739cc_staticRenderFns,
   false,
   null,
   null,
@@ -24134,6 +24469,9 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
+//
+//
 
 
 
@@ -24205,9 +24543,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       type: Object,
       default: function _default() {}
     },
-    selectorParams: { type: Object, default: function _default() {
+    selectorParams: {
+      type: Object,
+      default: function _default() {
         return {};
-      } },
+      }
+    },
     width: {
       type: String
     },
@@ -24477,6 +24818,15 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     }
   },
   computed: {
+    rules: function rules() {
+      return {
+        customLimitTime: [{
+          required: this.enableCustomLimitTimeSetting,
+          message: this.showCustomLimitTimeText ? '请输入限时办理天数' : '请选择限时办理天数',
+          trigger: 'blur'
+        }, { required: this.enableCustomLimitTimeSetting, validator: this.checkCustomLimitTime, trigger: 'change' }]
+      };
+    },
     tabs: function tabs() {
       return {
         employee: {
@@ -24519,6 +24869,25 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     }
   },
   methods: {
+    limitTimevalidate: function limitTimevalidate() {
+      var validSate = true;
+      this.$refs.nextNode.validate(function (valid) {
+        if (valid) {
+          validSate = true;
+        } else {
+          validSate = false;
+        }
+      });
+      return validSate;
+    },
+    checkCustomLimitTime: function checkCustomLimitTime(rule, value, callback) {
+      if (!Number(value) || value.indexOf('.') != -1 || Number(value) < 0) {
+        callback(new Error('请输入正确的天数'));
+        this.nextNode.customLimitTime = '';
+      } else {
+        callback();
+      }
+    },
     getAdminMsgType: function getAdminMsgType() {
       var _this = this;
 
@@ -24597,7 +24966,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           //   });
           // }
           _this3.optionsKey++;
-          _this3.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired == 1;
+          _this3.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired;
           _this3.showOpinion = false;
           setTimeout(function () {
             _this3.showOpinion = true;
@@ -25502,6 +25871,9 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         if (status === 'success') {
           _this27.currentNodeEnableItemHandleDescription = data.nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
           _this27.enableCustomLimitTimeSetting = data.nodeExtAttr.enableCustomLimitTimeSetting == 1;
+          if (_this27.enableCustomLimitTimeSetting && data.nodeMoreInfo.defaultCustomLimitDays) {
+            _this27.nextNode.customLimitTime = data.nodeMoreInfo.defaultCustomLimitDays + '';
+          }
           data.otherOrgDisabledObjId && (_this27.otherOrgDisabledObjId = data.otherOrgDisabledObjId.split(','));
           data.currentOrgDisabledObjId && (_this27.currentOrgDisabledObjId = data.currentOrgDisabledObjId.split(','));
           if (data != null) {
@@ -25928,7 +26300,6 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
               });
             }
             _this29.isCurrentNodeForbiddenChangeCandidate = nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
-            console.log(opinion, 'opinionopinionopinion');
             _this29.value = opinion || '';
             _this29.nodeDefaultSubmitOpinion = nodeInfoMap.nodeExtAttr.nodeDefaultSubmitOpinion;
             _this29.isSubmitButtonShowAgreeAndDisagree = nodeInfoMap.nodeExtAttr.isSubmitButtonShowAgreeAndDisagree;