eoss-mobiles 0.1.51 → 0.1.52

package/lib/eoss-mobile.common.js

@@ -9963,8 +9963,8 @@ mainvue_type_template_id_56353196_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=56353196&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/StartFlow.vue?vue&type=template&id=652918df&
-var StartFlowvue_type_template_id_652918df_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/components/StartFlow.vue?vue&type=template&id=8801d1d2&
+var StartFlowvue_type_template_id_8801d1d2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -10168,11 +10168,11 @@ var StartFlowvue_type_template_id_652918df_render = function () {
     ]),
   ])
 }
-var StartFlowvue_type_template_id_652918df_staticRenderFns = []
-StartFlowvue_type_template_id_652918df_render._withStripped = true
+var StartFlowvue_type_template_id_8801d1d2_staticRenderFns = []
+StartFlowvue_type_template_id_8801d1d2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/StartFlow.vue?vue&type=template&id=652918df&
+// CONCATENATED MODULE: ./packages/flow/src/components/StartFlow.vue?vue&type=template&id=8801d1d2&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Opinion.vue?vue&type=template&id=f682be22&
 var Opinionvue_type_template_id_f682be22_render = function () {
@@ -10660,6 +10660,8 @@ var Message_component = normalizeComponent(
 
 /* harmony default export */ var Message = (Message_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/StartFlow.vue?vue&type=script&lang=js&
+var StartFlowvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 //
 //
 //
@@ -10935,9 +10937,7 @@ var Message_component = normalizeComponent(
       utils_http({
         url: _that.baseUrl ? _that.baseUrl + registerNew : registerNew,
         type: 'post',
-        params: {
-          params: JSON.stringify(info)
-        }
+        params: StartFlowvue_type_script_lang_js_extends({}, info)
       }).then(function (res) {
         _this2.$toast.clear();
         if (res.rCode == 0) {
@@ -11143,8 +11143,8 @@ var Message_component = normalizeComponent(
 
 var StartFlow_component = normalizeComponent(
   components_StartFlowvue_type_script_lang_js_,
-  StartFlowvue_type_template_id_652918df_render,
-  StartFlowvue_type_template_id_652918df_staticRenderFns,
+  StartFlowvue_type_template_id_8801d1d2_render,
+  StartFlowvue_type_template_id_8801d1d2_staticRenderFns,
   false,
   null,
   null,
@@ -11153,8 +11153,8 @@ var StartFlow_component = normalizeComponent(
 )
 
 /* harmony default export */ var StartFlow = (StartFlow_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/components/Handle.vue?vue&type=template&id=689a2638&
-var Handlevue_type_template_id_689a2638_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/components/Handle.vue?vue&type=template&id=a6e9dff2&
+var Handlevue_type_template_id_a6e9dff2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -11609,8 +11609,7 @@ var Handlevue_type_template_id_689a2638_render = function () {
                                             objType: "enterprise",
                                             tabs: "department,employee",
                                             param: {
-                                              pid: "root",
-                                              filid: _vm.userInfo.orgId,
+                                              pid: _vm.orgId,
                                             },
                                             isOtherUnit: false,
                                             label: _vm.currentOrgName
@@ -11649,10 +11648,9 @@ var Handlevue_type_template_id_689a2638_render = function () {
                                             paddingTop: _vm.paddingTop,
                                             objType: "enterprise",
                                             param: {
-                                              pid: _vm.pid,
-                                              filid: _vm.userInfo.orgId,
+                                              pid: "root",
                                             },
-                                            tabs: "department",
+                                            tabs: "enterprise",
                                             isOtherUnit: true,
                                             label: _vm.otherOrgName
                                               ? _vm.otherOrgName
@@ -11683,12 +11681,20 @@ var Handlevue_type_template_id_689a2638_render = function () {
                                       "div",
                                       { staticClass: "item" },
                                       [
-                                        _c("van-field", {
+                                        _c("em-picker", {
                                           attrs: {
-                                            value: "主办",
                                             label: "主办",
-                                            disabled: true,
-                                            placeholder: "请选择",
+                                            title: "主办",
+                                            placeholder: "请选择主办",
+                                            "show-toolbar": "",
+                                            columns: _vm.subProcessColumns,
+                                          },
+                                          model: {
+                                            value: _vm.subProcessInfo,
+                                            callback: function ($$v) {
+                                              _vm.subProcessInfo = $$v
+                                            },
+                                            expression: "subProcessInfo",
                                           },
                                         }),
                                       ],
@@ -12115,11 +12121,11 @@ var Handlevue_type_template_id_689a2638_render = function () {
     1
   )
 }
-var Handlevue_type_template_id_689a2638_staticRenderFns = []
-Handlevue_type_template_id_689a2638_render._withStripped = true
+var Handlevue_type_template_id_a6e9dff2_staticRenderFns = []
+Handlevue_type_template_id_a6e9dff2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=689a2638&
+// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=a6e9dff2&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Reject.vue?vue&type=template&id=873f59d2&
 var Rejectvue_type_template_id_873f59d2_render = function () {
@@ -13111,6 +13117,12 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 
 
@@ -13156,6 +13168,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       isNextBox: true, // 是否展开隐藏下步操作
       isOtherUnit: true, //是否是外单位
       isShowNode: false,
+      subProcessInfo: '',
       isHiddenOftenOpinion: undefined, //是否隐藏常用意见
       isAddSignList: [{ name: '是', value: '1' }, { name: '否', value: '2' }],
       form: {
@@ -13228,7 +13241,26 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
     });
   },
 
-
+  computed: {
+    subProcessColumns: function subProcessColumns() {
+      if (!this.isMainSubProcess) return [];
+      var data = [];
+      var obj = { name: '[部门员工]-' };
+      this.nextCurrentOrgObjSelect.map(function (x) {
+        if (x.objType == 'employee') {
+          obj.name = !obj.value ? obj.name + x.showname : obj.name + ',' + x.showname;
+          obj.value = obj.value ? obj.value + ',' + x.showid : x.showid;
+        } else {
+          data.push({ name: '[部门]' + x.showname, value: x.showid });
+        }
+      });
+      obj.value && data.push(obj);
+      this.nextOtherOrgObjSelect.map(function (x) {
+        data.push({ name: '[企业]' + x.showname, value: x.showid });
+      });
+      return data;
+    }
+  },
   methods: {
     //限时办理时间确认
     onConfirmTimeList: function onConfirmTimeList(val) {
@@ -13273,7 +13305,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         this.$toast('请选择办理人');
         return;
       }
-      if (!this.form.nextNodeId && this.nodeList && this.nodeList.length > 0 && this.isSpecial && !this.isReject) {
+      if (!this.form.nextNodeId && this.nodeList && this.nodeList.length > 0 && this.isSpecial && !this.isReject && this.isShowNode) {
         this.$toast('请选择流程节点');
         return;
       }
@@ -13524,12 +13556,43 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
     // 单位选择完回调
     disposeAppUnit: function disposeAppUnit(res, type) {
+      var _this4 = this;
+
       var label = type.substring(0, type.lastIndexOf('Select'));
       var idStr = '';
+      var types = '';
+      this.form[label + 'Name'] = '';
+      var obj = {};
+      console.log(res, 'ddd');
       res.list.map(function (r, i) {
-        idStr = idStr + r.showid + (i === res.list.length - 1 ? '' : ',');
+        if (!types || types.indexOf(r.objType) == -1) {
+          idStr = !types ? r.objType + '-' + r.showid + (i === res.list.length - 1 ? '' : ',') : idStr + '|' + r.objType + '-' + r.showid + (i === res.list.length - 1 ? '' : ',');
+          types = types ? types + ',' + r.objType : r.objType;
+        } else {
+          idStr = idStr + r.showid + (i === res.list.length - 1 ? '' : ',');
+        }
+        _this4.form[label + 'SerialId'] = r.showid + (i === res.list.length - 1 ? '' : ',');
+        if (obj[r.objType]) {
+          obj[r.objType].push(r.showname);
+        } else {
+          obj[r.objType] = [r.showname];
+        }
+        console.log(obj, 'objobj');
       });
       this.form[label] = idStr;
+      for (var key in obj) {
+        if (key === 'enterprise' && this.form[label + 'Name'].indexOf('[企业]') == -1) {
+          this.form[label + 'Name'] = this.form[label + 'Name'] ? this.form[label + 'Name'] + '|' + '[企业]-' + obj[key].join(',') : '' + '[企业]-' + obj[key].join(',');
+        }
+        if (key === 'department' && this.form[label + 'Name'].indexOf('[部门]') == -1) {
+          this.form[label + 'Name'] = this.form[label + 'Name'] ? this.form[label + 'Name'] + '|' + '[部门]-' + obj[key].join(',') : '' + '[部门]-' + obj[key].join(',');
+        }
+        if (key === 'employee' && this.form[label + 'Name'].indexOf('[部门员工]') == -1) {
+          this.form[label + 'Name'] = this.form[label + 'Name'] ? this.form[label + 'Name'] + '|' + '[部门员工]-' + obj[key].join(',') : '' + '[部门员工]-' + obj[key].join(',');
+        }
+      }
+      // this.form[label + 'Name'] = obj.enterprise?;
+      this.form[label + 'Json'] = JSON.stringify(res.list);
     },
 
     // 获取发起流程信息
@@ -13675,7 +13738,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
               that.countersignaturetypeText = res.data.taskExamine.nodeName;
             }
             that.countersignaturetypeCode = res.data.countersignaturetypeCode !== 0 && res.data.countersignaturetypeCode != undefined ? true : false;
-            that.isMainSubProcess = res.data.isMainSubProcess === true ? true : false;
+            that.isMainSubProcess = res.data.isMainSubProcess == 'true';
             that.isCustomPreset = res.data.isCustomPreset;
             // form.isRemoveSign !== '1' &&
             // form.isAddSign !== '1' &&
@@ -13696,7 +13759,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
     // 获取节点信息(获取节点属性及办理人)
     getNodeObj: function getNodeObj(res) {
-      var _this4 = this;
+      var _this5 = this;
 
       var _that = this;
       utils_http({
@@ -13709,83 +13772,83 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
           businessId: this.taskExamineInfo.businessId
         }
       }).then(function (res) {
-        _this4.$toast.clear();
+        _this5.$toast.clear();
         if (res.status == 'success') {
-          _this4.appointNotUserIds = res.data.appointNotUserIds;
-          _this4.handleRoleId = res.data.handleRoleId;
-          _this4.nextRole = res.data.nextRole;
-          _this4.filterCandinateIds = res.data.nodeExtAttr.filterCandinateIds;
-          _this4.selectorDefShowDeptId = res.data.nodeExtAttr.selectorDefShowDeptId;
-          _this4.userSelectionType = res.data.nodeExtAttr.userSelectionType;
+          _this5.appointNotUserIds = res.data.appointNotUserIds;
+          _this5.handleRoleId = res.data.handleRoleId;
+          _this5.nextRole = res.data.nextRole;
+          _this5.filterCandinateIds = res.data.nodeExtAttr.filterCandinateIds;
+          _this5.selectorDefShowDeptId = res.data.nodeExtAttr.selectorDefShowDeptId;
+          _this5.userSelectionType = res.data.nodeExtAttr.userSelectionType;
           // this.changePidObjtype();
-          _this4.orgSelectionType = res.data.nodeExtAttr.orgSelectionType;
-          _this4.notificationType = res.data.nodeExtAttr.notificationType;
-          _this4.nodeType = res.data.nodeExtAttr.nodeType;
-          _this4.deptRoleCode = res.data.nodeExtAttr.deptRoleCode;
-          _this4.orgRoleCode = res.data.nodeExtAttr.orgRoleCode;
-          _this4.isCustomUser = res.data.nodeExtAttr.isCustomUser;
-          _this4.presetEdit = res.data.nodeExtAttr.presetEdit;
-          _this4.isLimitedTimeHandling = res.data.nodeExtAttr.isLimitedTimeHandling;
-          _this4.peopleObj = res.data.nodeExtAttr;
-          _this4.nextUserList = res.data.nextUserList.filter(function (x) {
+          _this5.orgSelectionType = res.data.nodeExtAttr.orgSelectionType;
+          _this5.notificationType = res.data.nodeExtAttr.notificationType;
+          _this5.nodeType = res.data.nodeExtAttr.nodeType;
+          _this5.deptRoleCode = res.data.nodeExtAttr.deptRoleCode;
+          _this5.orgRoleCode = res.data.nodeExtAttr.orgRoleCode;
+          _this5.isCustomUser = res.data.nodeExtAttr.isCustomUser;
+          _this5.presetEdit = res.data.nodeExtAttr.presetEdit;
+          _this5.isLimitedTimeHandling = res.data.nodeExtAttr.isLimitedTimeHandling;
+          _this5.peopleObj = res.data.nodeExtAttr;
+          _this5.nextUserList = res.data.nextUserList.filter(function (x) {
             return x.userId && x.username;
           });
-          var _this = _this4;
-          _this4.nextUserList.map(function (r) {
+          var _this = _this5;
+          _this5.nextUserList.map(function (r) {
             _this.$set(r, 'checked', false);
           });
 
-          _this4.isHandleExplain = res.data.nodeExtAttr.isHandleExplain == 1 ? true : false; //判断是否隐藏办理说明
-          _this4.isCustomUserClick = res.data.nodeExtAttr.isCustomUser == 1 ? true : false; // 判断办理人是否可点击显示弹框
-          _this4.isTaskread = res.data.nodeExtAttr.isTaskread == 1 ? true : false; // 判断是否显示分阅
-          _this4.countersignaturetypeCode = res.data.countersignaturetypeCode !== 0 ? true : false; //判断是否隐藏处理方式
-          _this4.countersignaturetypeText = res.data.countersignaturetypeText;
+          _this5.isHandleExplain = res.data.nodeExtAttr.isHandleExplain == 1 ? true : false; //判断是否隐藏办理说明
+          _this5.isCustomUserClick = res.data.nodeExtAttr.isCustomUser == 1 ? true : false; // 判断办理人是否可点击显示弹框
+          _this5.isTaskread = res.data.nodeExtAttr.isTaskread == 1 ? true : false; // 判断是否显示分阅
+          _this5.countersignaturetypeCode = res.data.countersignaturetypeCode !== 0 ? true : false; //判断是否隐藏处理方式
+          _this5.countersignaturetypeText = res.data.countersignaturetypeText;
           //如果当前为承办节点/会签节点,则展示本单位外单位办理人选择
-          if (_this4.nodeType === 1 || _this4.nodeType === 2) {
-            _this4.isMainSubProcess === true ? _this4.isMainSubProcess = true : _this4.isMainSubProcess = false;
-            _this4.isNextUser = false;
-            _this4.isHideCurrentOrg = res.data.nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
-            _this4.isHideOtherOrg = res.data.nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
+          if (_this5.nodeType === 1 || _this5.nodeType === 2) {
+            _this5.isMainSubProcess === true ? _this5.isMainSubProcess = true : _this5.isMainSubProcess = false;
+            _this5.isNextUser = false;
+            _this5.isHideCurrentOrg = res.data.nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
+            _this5.isHideOtherOrg = res.data.nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
           } else {
-            _this4.isHideCurrentOrg = false;
-            _this4.isHideOtherOrg = false;
-            _this4.isMainSubProcess = false;
-            _this4.isNextUser = true;
+            _this5.isHideCurrentOrg = false;
+            _this5.isHideOtherOrg = false;
+            _this5.isMainSubProcess = false;
+            _this5.isNextUser = true;
             // this.isMainSubProcess === true
             //   ? (this.isMainSubProcess = true)
             //   : (this.isMainSubProcess = false);
           }
           // userSelectionType 机构内单选人1,机构内多选人2,所有机构单选人3,所有部门多选人4,本部门单选人5,本部门多选人6,本单位单选部门7,本单位多选部门8,单选单位9,多选单位10,单选机构11,多选机构12,本部门角色13,本单位角色14
-          _this4.userSelectionType == 2 || _this4.userSelectionType == 4 || _this4.userSelectionType == 6 || _this4.userSelectionType == 8 || _this4.userSelectionType == 10 || _this4.userSelectionType == 11 || _this4.userSelectionType == 12 ? _this4.isRadio = false : _this4.isRadio = true; //判断办理人单选多选
+          _this5.userSelectionType == 2 || _this5.userSelectionType == 4 || _this5.userSelectionType == 6 || _this5.userSelectionType == 8 || _this5.userSelectionType == 10 || _this5.userSelectionType == 11 || _this5.userSelectionType == 12 ? _this5.isRadio = false : _this5.isRadio = true; //判断办理人单选多选
 
-          if (_this4.userSelectionType == 7 || _this4.userSelectionType == 8 || _this4.userSelectionType == 9 || _this4.userSelectionType == 10 || _this4.userSelectionType == 11 || _this4.userSelectionType == 12) {
-            _this4.isDealObject = true;
-            _this4.isNextUser = false;
+          if (_this5.userSelectionType == 7 || _this5.userSelectionType == 8 || _this5.userSelectionType == 9 || _this5.userSelectionType == 10 || _this5.userSelectionType == 11 || _this5.userSelectionType == 12) {
+            _this5.isDealObject = true;
+            _this5.isNextUser = false;
           }
-          if (_this4.userSelectionType == 13 || _this4.userSelectionType == 14) {
-            _this4.isNextUser = false;
-            _this4.isDealObject = false;
-            _this4.isDealRole = true;
-            _this4.nextUserflag = true;
+          if (_this5.userSelectionType == 13 || _this5.userSelectionType == 14) {
+            _this5.isNextUser = false;
+            _this5.isDealObject = false;
+            _this5.isDealRole = true;
+            _this5.nextUserflag = true;
           }
-          _this4.isHiddenNextStepInfo = res.data.nodeExtAttr.isHiddenNextStepInfo == 1 && _this4.nextUserflag ? true : false; // 判断是否隐藏下一步节点信息和接收人信息
+          _this5.isHiddenNextStepInfo = res.data.nodeExtAttr.isHiddenNextStepInfo == 1 && _this5.nextUserflag ? true : false; // 判断是否隐藏下一步节点信息和接收人信息
           if (res.data.globalNodeType === 'endEvent') {
-            _this4.isNextUser = false;
-            _this4.form.nextUserId = '流程办结';
+            _this5.isNextUser = false;
+            _this5.form.nextUserId = '流程办结';
           } else {
-            _this4.isNextUser = true; //判断是否是流程办结 办结下步办理人不显示
+            _this5.nodeType != 1 && _this5.nodeType != 2 && (_this5.isNextUser = true); //判断是否是流程办结 办结下步办理人不显示
           }
-          _this4.changeDefPeople(res.data.nodeExtAttr.isDefSelectedObj, res.data.nodeExtAttr.isSelectedAllObj);
-          _this4.changePidObjtype(res.data.nodeExtAttr.userSelectionType, _this4.choiceOrgId, _this4.choiceDeptId, _this4.pOrgId);
+          _this5.changeDefPeople(res.data.nodeExtAttr.isDefSelectedObj, res.data.nodeExtAttr.isSelectedAllObj);
+          _this5.changePidObjtype(res.data.nodeExtAttr.userSelectionType, _this5.choiceOrgId, _this5.choiceDeptId, _this5.pOrgId);
         } else {
-          _this4.$toast(res.message);
+          _this5.$toast(res.message);
         }
       });
     },
 
     // 修改默认办理人
     changeDefPeople: function changeDefPeople(def, all) {
-      var _this5 = this;
+      var _this6 = this;
 
       this.nextUserSelectList = [];
       if (def == 1 && all == 1 || def == 0 && all == 1) {
@@ -13793,9 +13856,9 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         this.nextUserList.map(function (r, i) {
           r.showid = r.userId;
           r.showname = r.username;
-          _this5.$set(r, 'checked', true);
-          _this5.nextUserSelectList.push(r);
-          ids += r.userId + (i === _this5.nextUserList.length - 1 ? '' : ',');
+          _this6.$set(r, 'checked', true);
+          _this6.nextUserSelectList.push(r);
+          ids += r.userId + (i === _this6.nextUserList.length - 1 ? '' : ',');
         });
         this.form.nextUserId = ids;
       } else if (def == 1 && (!all || all == 0) && this.nextUserList.length > 0) {
@@ -13847,8 +13910,8 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var Handle_component = normalizeComponent(
   components_Handlevue_type_script_lang_js_,
-  Handlevue_type_template_id_689a2638_render,
-  Handlevue_type_template_id_689a2638_staticRenderFns,
+  Handlevue_type_template_id_a6e9dff2_render,
+  Handlevue_type_template_id_a6e9dff2_staticRenderFns,
   false,
   null,
   null,
@@ -17310,7 +17373,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-  version: '0.1.51',
+  version: '0.1.52',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,