eoss-mobiles 0.3.84 → 0.3.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.3.84",
+  "version": "0.3.85",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/flow/src/components/Handle.vue

@@ -206,7 +206,7 @@
                   "
                 >
                   <em-picker
-                    v-if="nextNodeCheckType == 'select'"
+                    v-if="nextNodeCheckType == 'select' && flowSelectType == 'picker'"
                     title="下步节点"
                     label="下步节点"
                     required
@@ -218,6 +218,19 @@
                     label-key="nodeName"
                     @confirm="onConfirmNextNode"
                   />
+                  <em-input
+                    v-else-if="nextNodeCheckType == 'select' && flowSelectType == 'popup'"
+                    label="下步节点"
+                    required
+                    :readonly="true"
+                    @click="showFlowSelect = true"
+                    label-position="top"
+                    right-icon="arrow"
+                  >
+                <template slot="input">
+                      <div style="width: calc(100% - 40px);">{{ form.nextNodeName }}</div>
+                    </template>
+                </em-input>
                   <em-input
                     v-else
                     value="下步节点"
@@ -623,6 +636,30 @@
         </div>
       </div>
     </em-popup>
+    <em-popup
+    lass="em-flow-popup"
+  v-model="showFlowSelect"
+  position="center"
+  style="width: 80%;"
+>
+<div class="em-flow-popup-box" >
+        <div class="em-flow-popup-box-top">
+          <div></div>
+          <span>下步节点 </span
+          ><van-icon name="cross" @click="showFlowSelect = false" />
+        </div>
+        <div class="em-flow-popup-box-content">
+          <div
+            class="em-flow-popup-box-item"
+            v-for="item in nodeList"
+            :key="item.nodeId"
+            @click="handleClickFlow(item)"
+          >
+            {{ item.nodeName }}
+          </div>
+        </div>
+      </div>
+</em-popup>  
   </div>
 </template>
 
@@ -703,6 +740,10 @@ export default {
       type: Object,
       default: () => ({})
     },
+    flowSelectType: {
+      type: Boolean,
+      default: 'picker'
+    },
     hideMessage: {
       type: Boolean,
       default: false
@@ -717,8 +758,9 @@ export default {
       showFlowBtn: false,
       endFlow: false,
       submitButtonName:'',
+      showFlowSelect:false,
       currentOrgSelectorParams: {},
-      currentOrgSelectorTabs: 'employee,persongroup',
+      currentOrgSelectorTabs: 'department,employee',
       foreignOrgSelectorTabs: 'enterprise,filgroupobj',
       foreignOrgSelectorParams: { roleid: '' },
       otherOrgDisabledObjId: [],
@@ -888,8 +930,7 @@ export default {
   created() {
     // 获取用户信息
     // 生成时间数组
-    this.currentOrgSelectorParams={pid:this.orgId}
-    console.log(this.currentOrgSelectorParams,'this.currentOrgSelectorParams')
+    this.currentOrgSelectorParams={pid:this.orgId,only_filid: true,onlyMyOrg: true}
     this.timeList = new Array();
     for (let i = 0; i < 25; i++) {
       this.timeList.push(i);
@@ -945,6 +986,14 @@ export default {
     }
   },
   methods: {
+    handleClickFlow(val){
+      console.log(val)
+      if(val.nodeId === this.form.nextNodeId) return this.showFlowSelect = false;
+      this.form.nextNodeId = val.nodeId;
+      this.form.nextNodeName = val.nodeName;
+      this.showFlowSelect = false;
+      this.onConfirmNextNode(val);
+    },
     handleSuccess() {
       this.$parent.$emit('success');
     },
@@ -1664,6 +1713,7 @@ export default {
                 customPresetHintMessage,
                 currentOrgName,
                 currentOrgSelectorParams,
+                isChoiceOtherOrgDept,
                 notificationMessageReadOnly,
                 readOnlyNotificationType,
                 otherOrgName,
@@ -1725,6 +1775,18 @@ export default {
               });
               that.foreignOrgSelectorTabs =
                 that.foreignOrgSelectorTabs.join(',');
+            }else if(isChoiceOtherOrgDept == 'true'){
+              that.foreignOrgSelectorTabs = 'enterprise,department'
+              that.foreignOrgSelectorParams.pid = 'root'
+              that.foreignOrgSelectorParams.nofilid = 1
+              that.foreignOrgSelectorParams = {...that.foreignOrgSelectorParams, ...that.selectorParams}
+              console.log(that.foreignOrgSelectorParams,1)
+            }else{
+               that.foreignOrgSelectorTabs = 'enterprise'
+              that.foreignOrgSelectorParams.pid = 'root'
+              that.foreignOrgSelectorParams.nofilid = 1
+              that.foreignOrgSelectorParams = {...that.foreignOrgSelectorParams, ...that.selectorParams}
+              console.log(that.foreignOrgSelectorParams,2)
             }
             if (
               taskOperationShiftedNodeList &&
@@ -2055,7 +2117,7 @@ export default {
           this.nextUserList.map((r) => {
             _this.$set(r, 'checked', false);
           });
-
+          _that.currentOrgSelectorParams.roleid = _that.deptRoleCode
           this.isHandleExplain =
             res.data.nodeExtAttr.isHandleExplain == 1 ? true : false; //判断是否隐藏办理说明
           this.isCustomUserClick =

package/src/index.js

@@ -105,7 +105,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.3.84',
+  version: '0.3.85',
   install,
   Button,
   ButtonGroup,