eoss-ui 0.6.56 → 0.6.58

package/lib/flow-list.js

@@ -4438,8 +4438,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=e8da021e&
-var mainvue_type_template_id_e8da021e_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=f1587d18&
+var mainvue_type_template_id_f1587d18_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4636,10 +4636,10 @@ var mainvue_type_template_id_e8da021e_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_e8da021e_render._withStripped = true
+mainvue_type_template_id_f1587d18_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=e8da021e&
+// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=f1587d18&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4972,7 +4972,10 @@ var _components;
           align: 'center',
           key: 'jbbm',
           showOverflowTooltip: true,
-          width: this.theadWidth.deptid || 150
+          width: this.theadWidth.deptid || 150,
+          render: function render(h, params) {
+            return h('span', {}, params.row.doDeptName ? params.row.doDeptName : params.row.deptName);
+          }
         }, {
           label: '步骤',
           field: 'itemname',
@@ -5926,7 +5929,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_e8da021e_render,
+  mainvue_type_template_id_f1587d18_render,
   staticRenderFns,
   false,
   null,

package/lib/flow.js

@@ -4420,7 +4420,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=06ef5eca&
+// 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=fa4ed272&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5424,6 +5424,112 @@ 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
                                                 ? _c(
                                                     "el-form-item",
@@ -6692,7 +6798,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=06ef5eca&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=fa4ed272&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -7701,8 +7807,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=1e31d327&
-var processFormvue_type_template_id_1e31d327_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=353b8fd9&
+var processFormvue_type_template_id_353b8fd9_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8046,6 +8152,78 @@ var processFormvue_type_template_id_1e31d327_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.isHandleExplain == 1
                 ? _c(
                     "el-form-item",
@@ -8240,11 +8418,11 @@ var processFormvue_type_template_id_1e31d327_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_1e31d327_staticRenderFns = []
-processFormvue_type_template_id_1e31d327_render._withStripped = true
+var processFormvue_type_template_id_353b8fd9_staticRenderFns = []
+processFormvue_type_template_id_353b8fd9_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=1e31d327&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=353b8fd9&
 
 // 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=615d0e78&
 var selectUservue_type_template_id_615d0e78_render = function () {
@@ -9984,6 +10162,45 @@ var processFormvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -10037,7 +10254,9 @@ var processFormvue_type_script_lang_js_components;
       notificationMessageReadOnly: false,
       readOnlyNotificationType: '',
       show: true,
+      enableCustomLimitTimeSetting: false,
       radioList: [],
+      showCustomLimitTimeText: false,
       activeNames: '',
       selectUserList: [],
       defaultNextNode: '',
@@ -10093,6 +10312,7 @@ var processFormvue_type_script_lang_js_components;
       mixOrgIdList: [], //办理对象混选
       nextNode: {
         nodeName: '',
+        customLimitTime: '',
         newOpinion: '',
         countersignaturetypeText: '',
         nextNode: '',
@@ -10139,6 +10359,12 @@ var processFormvue_type_script_lang_js_components;
   },
 
   methods: {
+    changeCustomLimitTime: function changeCustomLimitTime(val) {
+      if (!Number(val) || val.indexOf('.') != -1 || Number(val) < 0) {
+        this.$message.warning('请输入正确的天数');
+        this.nextNode.customLimitTime = '';
+      }
+    },
     getUserInfo: function getUserInfo() {
       var _this = this;
 
@@ -10310,7 +10536,8 @@ var processFormvue_type_script_lang_js_components;
               presetReadUserId = _nextNode.presetReadUserId,
               nextReadUserId = _nextNode.nextReadUserId,
               nextOrgId = _nextNode.nextOrgId,
-              newOpinion = _nextNode.newOpinion;
+              newOpinion = _nextNode.newOpinion,
+              customLimitTime = _nextNode.customLimitTime;
 
           if (noticeType.length === 0) {
             return _this4.$message.warning('请选择通知方式');
@@ -10338,6 +10565,7 @@ var processFormvue_type_script_lang_js_components;
           var params = {
             processDefinitionId: _this4.processDefinitionId,
             nextUserId: _this4.multiple ? newNextUser.join(',') : nextUser,
+            customLimitTime: customLimitTime,
             nextNodeId: nextNode,
             businessId: _this4.businessId,
             notificationType: newNoticeType,
@@ -10423,6 +10651,7 @@ var processFormvue_type_script_lang_js_components;
           _this5.nextNode.userInfo = nextUserList;
           _this5.countersignaturetypeCode = countersignaturetypeCode;
           _this5.nextNode.countersignaturetypeText = countersignaturetypeText;
+          _this5.enableCustomLimitTimeSetting = nodeExtAttr.enableCustomLimitTimeSetting == 1;
           _this5.isTaskread = nodeExtAttr.isTaskread;
           _this5.isHandleExplain = nodeExtAttr.isHandleExplain;
           _this5.isCustomUser = nodeExtAttr.isCustomUser; //是否展示选人组件按钮
@@ -10680,8 +10909,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_1e31d327_render,
-  processFormvue_type_template_id_1e31d327_staticRenderFns,
+  processFormvue_type_template_id_353b8fd9_render,
+  processFormvue_type_template_id_353b8fd9_staticRenderFns,
   false,
   null,
   null,
@@ -21306,6 +21535,35 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -21380,6 +21638,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       otherOrgDisabledObjId: [],
       isCanReadTransferHandle: false,
       readTransferHandleDisabled: true,
+      showCustomLimitTimeText: false,
       currentOrgDisabledObjId: [],
       nextNodeCheckType: 'select',
       readOnlyNotificationType: '',
@@ -21404,6 +21663,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       flowDisabled: false,
       activeNames: '',
       isEndUserTask: true,
+      enableCustomLimitTimeSetting: false, //是否开启限时办理
       isForceDisplayDefaultOptionForPrefix: false,
       selectUserList: [],
       selectNextCurrentOrgObjList: [],
@@ -21485,6 +21745,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       addSignMode: 'postAddSign',
       isAddSign: '', // 是否加签
       isRemoveSign: '', // 是否减签
+      customLimitTime: '', //限时天数
       nextOperate: '', // 下步操作
       notificationMsg: '', // 通知信息
       addSignUserId: [], // 加签办理人
@@ -21621,6 +21882,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     }
   },
   methods: {
+    changeCustomLimitTime: function changeCustomLimitTime(val) {
+      if (!Number(val) || val.indexOf('.') != -1 || Number(val) < 0) {
+        this.$message.warning('请输入正确的天数');
+        this.nextNode.customLimitTime = '';
+      }
+    },
     taskReadTransferHandle: function taskReadTransferHandle() {
       if (this.taskReadOpinionRequired == 'true' && !this.value) {
         if (!this.$refs.commonOpinions.validate()) return;
@@ -22112,6 +22379,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         params: {
           businessId: businessId,
           processDefinitionId: processDefinitionId,
+          pendingId: this.pendingId,
           nodeId: nodeId
         }
       };
@@ -22493,6 +22761,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 
         _this24.loading.close();
         if (status === 'success') {
+          _this24.enableCustomLimitTimeSetting = data.nodeExtAttr.enableCustomLimitTimeSetting == 1;
           data.otherOrgDisabledObjId && (_this24.otherOrgDisabledObjId = data.otherOrgDisabledObjId.split(','));
           data.currentOrgDisabledObjId && (_this24.currentOrgDisabledObjId = data.currentOrgDisabledObjId.split(','));
           if (data != null) {
@@ -23163,10 +23432,13 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           } else {
             _this30.freeValid = true;
           }
-          if (_this30.currentNodeIsCircularReadNode && _this30.nextNode.nextOtherOrgObj.length != 0) {
-            _this30.reqCircularRead(type);
-            return;
-          }
+          // if (
+          //   this.currentNodeIsCircularReadNode &&
+          //   this.nextNode.nextOtherOrgObj.length != 0
+          // ) {
+          //   this.reqCircularRead(type);
+          //   return;
+          // }
           if (type == 'multiInsMidwayWithSubmitScene') {
             _this30.sendData(type);
             return;