eoss-mobiles 0.3.40 → 0.3.42

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

@@ -1,14 +1,11 @@
 <template>
   <div class="process-handle">
-
-    <div
-      style="display: flex; flex-direction: column; height: 100%"
-    >
+    <div style="display: flex; flex-direction: column; height: 100%">
       <div class="process-content">
         <!-- 当前节点 -->
         <div class="present-node">
           <div class="label">当前节点:</div>
-          <div>{{itemName }}</div>
+          <div>{{ nodeName }}</div>
         </div>
         <!-- 意见 -->
         <Opinion
@@ -31,20 +28,12 @@
         ></Opinion>
         <!-- 审核内容 -->
         <div class="special-box input-box" v-if="typeCode != 'fenyue'">
-      
-          <div >
-            
+          <div>
             <!-- 下一步所有相关操作-->
-            <div
-            
-            >
-              <div class="next-box" >
+            <div>
+              <div class="next-box">
                 <!-- 下步节点 -->
-                <div
-                  class="item"
-                  v-if="
-                    nodeList && nodeList.length > 0"
-                >
+                <div class="item" v-if="nodeList && nodeList.length > 0">
                   <em-picker
                     v-if="nextNodeCheckType == 'select'"
                     title="下步节点"
@@ -80,7 +69,7 @@
               </div>
               <!-- 本单位-->
               <!-- v-if="isHideCurrentOrg" -->
-              <div class="item" >
+              <div class="item">
                 <em-selector
                   v-model="nextCurrentOrgObjSelect"
                   multiple
@@ -116,35 +105,36 @@
                 />
               </div>
             </div>
-           
+
             <!-- 通知方式 -->
-            <div class="item-msg item-msg2">
+            <!-- <div class="item-msg item-msg2">
               <Message
                 ref="message"
                 :code="'notification_type'"
                 :baseUrl="baseUrl"
                 :defaultNotificationType="defaultNotificationType"
+                :pendingId="pendingId"
                 :defaultNotificationMsg="form.notificationMsg"
                 @onInputMsg="onInputMsg"
               ></Message>
-            </div>
+            </div> -->
           </div>
         </div>
       </div>
-    
+
       <div class="btn-list">
         <div class="btn" @click="navigateBack">取消</div>
         <div class="btn" @click="onSubmit()">确定</div>
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
 import {
   directStartTaskCircularRead,
-  getNotificationMsg,
+  endFlowAndStartTaskCircularRead
+  // getNotificationMsg
 } from '../../../../src/config/api.js';
 import request from '../../../../src/utils/http.js';
 import Opinion from './Opinion.vue';
@@ -154,10 +144,11 @@ export default {
   inheritAttrs: false,
   components: {
     Opinion,
-    Message,
+    Message
   },
   props: {
-    businessId: String, 
+    businessId: String,
+    pendingId: String,
     identityIds: String, //用户id
     beforeSubmit: Function,
     orgId: String, //单位id
@@ -170,9 +161,9 @@ export default {
       type: [String, Number],
       default: 0
     },
-    defId:{
-        type: String,
-        default: ''
+    defId: {
+      type: String,
+      default: ''
     },
     isAllCheck: {
       type: Boolean,
@@ -190,17 +181,17 @@ export default {
       type: String,
       default: ''
     },
-    itemName:{
-        type: String,
-        default: '拟稿'
+    nodeName: {
+      type: String,
+      default: '拟稿'
     },
-    nextNodeCheckType:{
-        type: String,
-        default: ''
+    nextNodeCheckType: {
+      type: String,
+      default: ''
     },
-    title:{
-        type: String,
-        default: ''              
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -209,10 +200,10 @@ export default {
         { name: '前置加签', value: 'preAddSign' },
         { name: '后置加签', value: 'postAddSign' }
       ],
-      currentOrgSelectorParams: {  },
+      currentOrgSelectorParams: {},
       currentOrgSelectorTabs: 'employee, persongroup',
       foreignOrgSelectorTabs: 'enterprise,filgroupobj',
-      foreignOrgSelectorParams: {  roleid: '' },
+      foreignOrgSelectorParams: { roleid: '' },
       otherOrgDisabledObjId: [],
       currentNodeEnableItemHandleDescription: false,
       pendingItemHandleDescription: '',
@@ -260,18 +251,18 @@ export default {
         nextOtherOrgObj: undefined, //外单位对象
         nextOtherOrgObjSerialId: undefined, //外单位办理对象序列id
         notificationMsg: undefined, //通知消息
-        nextNodeName:3,
-        nextNodeId:3
+        nextNodeName: 3,
+        nextNodeId: 3
       },
       isCanFenyue: '0',
-      
+
       nextCurrentOrgObjSelect: [], // 选中本单位
       nextOtherOrgObjSelect: [], //选中外单位
       nextReadUserSelectList: [], //分阅选择数组
-      nodeList: [{nodeId:3,nodeName:'传阅'}], // 流程节点列表
-     
+      nodeList: [{ nodeId: 3, nodeName: '传阅' }], // 流程节点列表
+
       opinionList: [], // 意见列表
-     
+
       userInfo: {}, // 用户信息
       isCanAddSign: false, //是否显示加签
       isCanRemoveSign: false, //是否显示减签
@@ -330,69 +321,80 @@ export default {
     };
   },
   created() {
-    this.getMessage()
-    this.currentOrgSelectorParams.employee ={pid: this.orgId}
-    this.foreignOrgSelectorParams.filgroup ={pid: 'root',myUserid:this.userId}
-  },
-  computed: {
+    // this.getMessage();
+    this.currentOrgSelectorParams.employee = { pid: this.orgId };
+    this.foreignOrgSelectorParams.nofilid = this.orgId
+    this.foreignOrgSelectorParams.myUserid = ''
+    this.foreignOrgSelectorParams.filgroup = {
+      pid: 'root',
+      myUserid: this.userId
+    };
   },
+  computed: {},
   methods: {
-    getMessage(){
-        let params = {
-            url:getNotificationMsg,
-            params:{
-              processDefinitionId:this.defId,
-              businessId:this.businessId,
-              openMode:'samepage'
-            }
+    getMessage() {
+      let params = {
+        url: getNotificationMsg,
+        params: {
+          processDefinitionId: this.defId,
+          businessId: this.businessId,
+          pendingId:this.pendingId,
+          openMode: this.pendingId ? '' : 'samepage'
         }
-        request(params).then((res) => { 
-            if(res.rCode == 0 || res.status == "success"){
-                this.form.notificationMsg = res.message.replace('{title}',this.title || '')
-            }
-        });
+      };
+      request(params).then((res) => {
+        if (res.rCode == 0 || res.status == 'success') {
+          this.form.notificationMsg = res.message.replace(
+            '{title}',
+            this.title || ''
+          );
+        }
+      });
     },
-     navigateBack() {
+    navigateBack() {
       this.$parent.$emit('close');
     },
-     // 通知消息回调
+    // 通知消息回调
     onInputMsg(obj) {
       this.form.notificationType = obj.notificationType.join(',');
       this.form.notificationMsg = obj.notificationMsg;
     },
-onSubmit() { 
-    let params = {
-        url:directStartTaskCircularRead,
-        params:{
-           businessId:this.businessId,
-            processDefinitionId:this.defId,
-            notificationMsg:this.form.notificationMsg,
-            notificationType:this.form.notificationType,
-            opinion:this.form.opinion,
-            nextOtherOrgObj:this.form.nextOtherOrgObj,
-            nextCurrentOrgObj:this.form.nextCurrentOrgObj,
+    onSubmit() {
+      let params = {
+        url: this.pendingId?endFlowAndStartTaskCircularRead : directStartTaskCircularRead,
+        params: {
+          businessId: this.businessId,
+          pendingId:this.pendingId,
+          processDefinitionId: this.defId,
+          notificationMsg: this.form.notificationMsg,
+          notificationType: this.form.notificationType,
+          opinion: this.form.opinion,
+          nextOtherOrgObj: this.form.nextOtherOrgObj,
+          nextCurrentOrgObj: this.form.nextCurrentOrgObj,
+          mobileKey: 'ceshi',
+          loginType: 2
         },
-        type:'post'
-    }
-     this.$toast.loading({
+        type: 'post'
+      };
+      this.$toast.loading({
         message: '提交中...',
         forbidClick: true,
         loadingType: 'spinner',
         overlay: true,
         duration: 0
       });
-    request(params).then(res => { 
-          this.$toast.clear();
-          if (res.rCode == 0 || res.status == 'success') {
-            this.$toast.success('提交成功');
-            this.$parent.$emit('success');
-          } else {
-            this.$toast(res.message || '系统错误，请联系管理员！');
-            setTimeout(() => {
-              this.$parent.$emit('error');
-            }, 1000);
-          }
-    })
+      request(params).then((res) => {
+        this.$toast.clear();
+        if (res.rCode == 0 || res.status == 'success') {
+          this.$toast.success('提交成功');
+          this.$parent.$emit('success');
+        } else {
+          this.$toast(res.message || '系统错误，请联系管理员！');
+          setTimeout(() => {
+            this.$parent.$emit('error');
+          }, 1000);
+        }
+      });
     },
     // 删除
     delteList(label, i) {
@@ -428,7 +430,6 @@ onSubmit() {
       });
     },
 
-
     // 意见回调
     onInputOpintion(val) {
       const { opinion, isImageOpinion, file } = val;
@@ -524,9 +525,7 @@ onSubmit() {
       this.form[label + 'SerialId'] = SerialId.join(',');
       this.form[label + 'Json'] = JSON.stringify(res.list);
     },
-  
 
- 
     // 修改默认办理人
     changeDefPeople(def, all) {
       this.nextUserSelectList = [];
@@ -551,7 +550,7 @@ onSubmit() {
         this.nextUserSelectList.push(this.nextUserList[0]);
         this.form.nextUserId = this.nextUserSelectList[0].userId;
       }
-    },
+    }
   }
 };
 </script>

package/packages/flow/src/main.vue

@@ -108,7 +108,7 @@ export default {
     }
   },
   mounted() {
-    this.newType = this.type;
+    this.newType = this.isCirculate ? 'circulate' : this.type;
   }
 };
 </script>

package/packages/selector/src/selector-tree.vue

@@ -5,6 +5,7 @@
       v-if="showNavBar && !showTree"
       :class="isBgColor ? 'em-selector-nav-bar' : ''"
       :paddingTop="paddingTop"
+      :disabled="newTabs[selectIndex].name == 'persongroupobj'"
       @click-left="navigateBack"
     >
       <template slot="left">

package/src/config/api.js

@@ -152,3 +152,4 @@ export const directStartTaskCircularRead =
   '/bpm/bpmBackend/directStartTaskCircularRead';
 export const endFlowAndStartTaskCircularRead =
   '/bpm/bpmBackend/endFlowAndStartTaskCircularRead';
+

package/src/index.js

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