eoss-ui 0.7.66 → 0.7.67

package/lib/flow.js

@@ -4689,7 +4689,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=a58e1888&
+// 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=389411fe&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -6556,6 +6556,7 @@ var render = function () {
                               taskExamineParam:
                                 _vm.freeStartFlowParams
                                   .newFlowStartNodeItemName,
+                              selectorParams: _vm.selectorParams,
                               taskParams: _vm.taskParams,
                               formType: _vm.processFormType,
                             },
@@ -7313,6 +7314,7 @@ var render = function () {
                               "pending-id": _vm.pendingId,
                               showTooltip: _vm.showTooltip,
                               simpleTips: _vm.simpleTips,
+                              selectorParams: _vm.selectorParams,
                               "is-free-start-flow":
                                 _vm.freeStartFlowParams.useScene ===
                                 "multiInsMidwayWithSubmitScene",
@@ -7633,7 +7635,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=a58e1888&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=389411fe&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -8695,8 +8697,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=41ac875e&
-var processFormvue_type_template_id_41ac875e_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=9d5d2a78&
+var processFormvue_type_template_id_9d5d2a78_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8738,7 +8740,9 @@ var processFormvue_type_template_id_41ac875e_render = function () {
               style:
                 "height:" +
                 (_vm.showBtn ? "430px" : "auto") +
-                "; overflow-y: auto; margin-bottom: 10px",
+                "; overflow-y:" +
+                (_vm.showBtn ? "auto" : "hidden") +
+                " ; margin-bottom: 10px",
             },
             [
               _c(
@@ -8965,51 +8969,107 @@ var processFormvue_type_template_id_41ac875e_render = function () {
                     1
                   )
                 : _vm._e(),
-              _c(
-                "el-form-item",
-                {
-                  attrs: {
-                    prop: _vm.isShowNextUser ? "nextUser" : "nextOrgId",
-                    label: _vm.isShowNextUser ? "下步办理人" : "办理对象",
-                  },
-                },
-                [
-                  _c("SelectUser", {
-                    attrs: {
-                      nextUser: _vm.isShowNextUser
-                        ? _vm.nextNode.nextUser
-                        : _vm.nextNode.nextOrgId,
-                      radioList: _vm.radioList,
-                      multiple: _vm.multiple,
-                      isCustomUser: !_vm.isShowNextUser ? 1 : _vm.isCustomUser,
-                      showTooltip: _vm.showTooltip,
-                      isCurrentNodeForbiddenChangeCandidate:
-                        _vm.isCurrentNodeForbiddenChangeCandidate,
-                      options: _vm.options,
-                      presetEdit: _vm.presetEdit,
-                      mix: _vm.multiple,
-                      isDefSelectedObj: _vm.isDefSelectedObj,
-                      selectUserList: _vm.selectUserList,
-                      types: !_vm.isShowNextUser
-                        ? _vm.nextUserTypes
-                        : _vm.isCdjxjTaskHandle != "true"
-                        ? ["employee", "persongroup"]
-                        : ["employee"],
-                      params: _vm.isShowNextUser ? _vm.params : {},
-                      tabs: _vm.nextUserTabs,
-                    },
-                    on: {
-                      change: function ($event) {
-                        _vm.changeSelectUser(
-                          $event,
-                          _vm.isShowNextUser ? "nextUser" : "nextOrgId"
-                        )
+              _vm.isHideCurrentOrg
+                ? _c(
+                    "el-form-item",
+                    { attrs: { prop: "nextCurrentOrgObj", label: "本单位" } },
+                    [
+                      _c("SelectUser", {
+                        attrs: {
+                          nextUser: _vm.nextCurrentOrgObjSelect,
+                          multiple: "",
+                          mix: "",
+                          showTooltip: _vm.showTooltip,
+                          types: ["employee", "persongroup"],
+                          params: _vm.currentOrgSelectorParams,
+                        },
+                        on: {
+                          change: function ($event) {
+                            _vm.disposeAppUnit(
+                              $event,
+                              "nextCurrentOrgObjSelect"
+                            )
+                          },
+                        },
+                      }),
+                    ],
+                    1
+                  )
+                : _vm._e(),
+              _vm.isHideOtherOrg
+                ? _c(
+                    "el-form-item",
+                    { attrs: { label: "外单位" } },
+                    [
+                      _c("SelectUser", {
+                        attrs: {
+                          nextUser: _vm.nextOtherOrgObjSelect,
+                          multiple: "",
+                          showTooltip: _vm.showTooltip,
+                          mix: "",
+                          where: { filid: "other" },
+                          types: ["enterprise", "filgroup"],
+                          params: _vm.foreignOrgSelectorParams,
+                        },
+                        on: {
+                          change: function ($event) {
+                            _vm.disposeAppUnit($event, "nextOtherOrgObjSelect")
+                          },
+                        },
+                      }),
+                    ],
+                    1
+                  )
+                : _vm._e(),
+              !_vm.isHideOtherOrg && !_vm.isHideCurrentOrg
+                ? _c(
+                    "el-form-item",
+                    {
+                      attrs: {
+                        prop: _vm.isShowNextUser ? "nextUser" : "nextOrgId",
+                        label: _vm.isShowNextUser ? "下步办理人" : "办理对象",
                       },
                     },
-                  }),
-                ],
-                1
-              ),
+                    [
+                      _c("SelectUser", {
+                        attrs: {
+                          nextUser: _vm.isShowNextUser
+                            ? _vm.nextNode.nextUser
+                            : _vm.nextNode.nextOrgId,
+                          radioList: _vm.radioList,
+                          multiple: _vm.multiple,
+                          isCustomUser: !_vm.isShowNextUser
+                            ? 1
+                            : _vm.isCustomUser,
+                          showTooltip: _vm.showTooltip,
+                          isCurrentNodeForbiddenChangeCandidate:
+                            _vm.isCurrentNodeForbiddenChangeCandidate,
+                          options: _vm.options,
+                          presetEdit: _vm.presetEdit,
+                          mix: _vm.multiple,
+                          isDefSelectedObj: _vm.isDefSelectedObj,
+                          selectUserList: _vm.selectUserList,
+                          types: !_vm.isShowNextUser
+                            ? _vm.nextUserTypes
+                            : _vm.isCdjxjTaskHandle != "true"
+                            ? ["employee", "persongroup"]
+                            : ["employee"],
+                          params: _vm.isShowNextUser ? _vm.params : {},
+                          tabs: _vm.nextUserTabs,
+                        },
+                        on: {
+                          change: function ($event) {
+                            _vm.changeSelectUser(
+                              $event,
+                              _vm.isShowNextUser ? "nextUser" : "nextOrgId"
+                            )
+                          },
+                        },
+                      }),
+                    ],
+                    1
+                  )
+                : _vm._e(),
               _vm.isTaskread == 1
                 ? _c(
                     "el-form-item",
@@ -9468,11 +9528,11 @@ var processFormvue_type_template_id_41ac875e_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_41ac875e_staticRenderFns = []
-processFormvue_type_template_id_41ac875e_render._withStripped = true
+var processFormvue_type_template_id_9d5d2a78_staticRenderFns = []
+processFormvue_type_template_id_9d5d2a78_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=41ac875e&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=9d5d2a78&
 
 // 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=f9652492&
 var selectUservue_type_template_id_f9652492_render = function () {
@@ -11371,6 +11431,37 @@ var processFormvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -11446,7 +11537,8 @@ var processFormvue_type_script_lang_js_components;
     keyCount: {
       type: [Number, String],
       default: 0
-    }
+    },
+    selectorParams: { type: Object, default: function _default() {} }
   },
   data: function data() {
     return {
@@ -11522,6 +11614,13 @@ var processFormvue_type_script_lang_js_components;
       isShowNextUser: true,
       oldMessage: '',
       mixOrgIdList: [], //办理对象混选
+      subProcessColumns: [],
+      nextOtherOrgObjSelect: [],
+      nextCurrentOrgObjSelect: [],
+      isHideCurrentOrg: false,
+      isHideOtherOrg: false,
+      currentOrgSelectorParams: { filid: JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId, only_filid: true },
+      foreignOrgSelectorParams: { filid: 'all', nofilid: 1 },
       nextNode: {
         nodeName: '',
         customLimitTime: '',
@@ -11668,6 +11767,8 @@ var processFormvue_type_script_lang_js_components;
       var mainConfig = util["a" /* default */].getStorage('mainConfig');
       if (mainConfig) {
         this.userModel = JSON.parse(mainConfig).userModel;
+        this.foreignOrgSelectorParams.nofilid = this.userModel.orgId;
+        this.foreignOrgSelectorParams.roleid = this.currentOrgSelectorParams.roleid = this.selectorParams.roleid;
       } else {
         util["a" /* default */].ajax({ url: api["ub" /* loginUserInfo */] }).then(function (res) {
           var status = res.status,
@@ -11675,6 +11776,8 @@ var processFormvue_type_script_lang_js_components;
 
           if (status == 'success') {
             _this2.userModel = data;
+            _this2.foreignOrgSelectorParams.nofilid = _this2.userModel.orgId;
+            _this2.foreignOrgSelectorParams.roleid = tthis.currentOrgSelectorParams.roleid = _this2.selectorParams.roleid;
           } else {
             var msg = res.msg || '系统错误，请联系管理员！';
             _this2.$message.error(msg);
@@ -11774,6 +11877,68 @@ var processFormvue_type_script_lang_js_components;
       this.nextNode[type] = nextUser;
       this.mixOrgIdList = mixList;
     },
+    getsubProcessColumns: function getsubProcessColumns() {
+      var data = [];
+      var obj = { name: '[部门员工]-' };
+      if (this.nextCurrentOrgObjSelect.length > 0) {
+        this.nextCurrentOrgObjSelect.map(function (x) {
+          if (x.stype == 'employee') {
+            obj.name = !obj.value ? obj.name + x.showname : obj.name + ',' + x.showname;
+            obj.value = obj.value ? obj.value + ',' + x.showid : 'employee-' + x.showid;
+          } else {
+            data.push({
+              name: '[部门]' + x.showname,
+              value: 'department-' + x.showid
+            });
+          }
+        });
+      }
+      obj.value && data.push(obj);
+      if (this.nextOtherOrgObjSelect.length > 0) {
+        this.nextOtherOrgObjSelect.map(function (x) {
+          data.push({
+            name: '[企业]' + x.showname,
+            value: 'enterprise-' + x.showid
+          });
+        });
+      }
+      this.subProcessColumns = data;
+      // return data;
+    },
+
+    // 单位选择完回调
+    disposeAppUnit: function disposeAppUnit(res, type) {
+      var label = type.substring(0, type.lastIndexOf('Select'));
+      this.nextNode[label + 'Name'] = '';
+      res.options && (this[type] = res.options);
+      var obj = {};
+      // if (typeof res.mixList == 'array')
+      res.mixList && (this.nextNode[label] = res.mixList.join('|'));
+      res.options.map(function (item) {
+        if (obj[item.stype]) {
+          obj[item.stype].push(item.showname);
+        } else {
+          obj[item.stype] = [item.showname];
+        }
+      });
+      for (var key in obj) {
+        if (key === 'enterprise' && this.nextNode[label + 'Name'].indexOf('[企业]') == -1) {
+          this.nextNode[label + 'Name'] = this.nextNode[label + 'Name'] ? this.nextNode[label + 'Name'] + '|' + '[企业]-' + obj[key].join(',') : '' + '[企业]-' + obj[key].join(',');
+        }
+        if (key === 'department' && this.nextNode[label + 'Name'].indexOf('[部门]') == -1) {
+          this.nextNode[label + 'Name'] = this.nextNode[label + 'Name'] ? this.nextNode[label + 'Name'] + '|' + '[部门]-' + obj[key].join(',') : '' + '[部门]-' + obj[key].join(',');
+        }
+        if (key === 'employee' && this.nextNode[label + 'Name'].indexOf('[部门员工]') == -1) {
+          this.nextNode[label + 'Name'] = this.nextNode[label + 'Name'] ? this.nextNode[label + 'Name'] + '|' + '[部门员工]-' + obj[key].join(',') : '' + '[部门员工]-' + obj[key].join(',');
+        }
+      }
+      // this.nextNode[label + 'Name'] = obj.enterprise?;
+      if (!this.currentNodeIsCircularReadNode) {
+        this.nextNode[label + 'SerialId'] = res.nextUser.join(',');
+        this.nextNode[label + 'Json'] = JSON.stringify(res.options);
+      }
+      this.getsubProcessColumns();
+    },
     getNodeType: function getNodeType() {
       var _this3 = this;
 
@@ -11854,13 +12019,15 @@ var processFormvue_type_script_lang_js_components;
               nextReadUserId = _nextNode.nextReadUserId,
               nextOrgId = _nextNode.nextOrgId,
               newOpinion = _nextNode.newOpinion,
-              customLimitTime = _nextNode.customLimitTime;
+              customLimitTime = _nextNode.customLimitTime,
+              nextOtherOrgObj = _nextNode.nextOtherOrgObj,
+              nextCurrentOrgObj = _nextNode.nextCurrentOrgObj;
           // if (noticeType.length === 0) {
           //   return this.$message.warning('请选择通知方式');
           // }
 
           if (_this5.isShowNextUser) {
-            if (nextUser == '' || _this5.multiple && nextUser.length == 0) {
+            if ((nextUser == '' || _this5.multiple && nextUser.length == 0) && !_this5.isHideCurrentOrg && !_this5.isHideOtherOrg) {
               return _this5.$message.warning('请选择下步办理人');
             }
           } else {
@@ -11868,6 +12035,9 @@ var processFormvue_type_script_lang_js_components;
               return _this5.$message.warning('请选择办理对象');
             }
           }
+          if ((_this5.isHideOtherOrg || _this5.isHideCurrentOrg) && !nextCurrentOrgObj && !nextOtherOrgObj) {
+            return _this5.$message.warning('请选择办理对象');
+          }
           if (_this5.showBtn) {
             _this5.loading = true;
           } else {
@@ -11911,6 +12081,12 @@ var processFormvue_type_script_lang_js_components;
               return;
             }
           }
+          if (_this5.isHideCurrentOrg) {
+            params.nextCurrentOrgObj = nextCurrentOrgObj;
+          }
+          if (_this5.isHideOtherOrg) {
+            params.nextOtherOrgObj = nextOtherOrgObj;
+          }
           if (_this5.activeNames != '1') delete params.customPresetUserJson;
           if (_this5.isFreeStartFlow || _this5.formType === 'readTransfer') {
             var newParm = {};
@@ -12020,7 +12196,14 @@ var processFormvue_type_script_lang_js_components;
             _this6.params = _params;
           }
           // this.isReadMultiple(nodeExtAttr.userSelectionType);
+          if (nodeExtAttr.nodeType === 1 || nodeExtAttr.nodeType === 2) {
 
+            _this6.isHideCurrentOrg = nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
+            _this6.isHideOtherOrg = nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
+          } else {
+            _this6.isHideCurrentOrg = false;
+            _this6.isHideOtherOrg = false;
+          }
           nextUserList.map(function (item) {
             if (_this6.multiple && nodeExtAttr.isDefSelectedObj == 1 && nextUserList !== undefined) {
               _this6.nextNode.nextUser.push(item.userId);
@@ -12170,6 +12353,9 @@ var processFormvue_type_script_lang_js_components;
         userId: util["a" /* default */].getStorage('userId'),
         businessId: this.businessId
       };
+      if (!this.shwowBtn) {
+        params.taskAction = "toStartFlowWithoutTempSave";
+      }
       // 获取节点
       util["a" /* default */].ajax({ url: api["kc" /* toStartFlow */], params: params }).then(function (res) {
         //pc接口返回数据处理
@@ -12282,8 +12468,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_41ac875e_render,
-  processFormvue_type_template_id_41ac875e_staticRenderFns,
+  processFormvue_type_template_id_9d5d2a78_render,
+  processFormvue_type_template_id_9d5d2a78_staticRenderFns,
   false,
   null,
   null,
@@ -24689,6 +24875,8 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
+//