eoss-mobiles 0.2.7 → 0.2.9

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

@@ -118,19 +118,25 @@
                 class="item"
                 v-if="!isHiddenNextStepInfo && isChooseNextNode == 1"
               >
-              <em-input
-                value="下步操作"
-                label="下步操作"
-                required
-                :disabled="true"
-                label-position="top"
-              >
-              <template slot="input">
-                <span class="em-flow-tag" :class="{'em-flow-tag-active':tagKey === item.key}" @click="changeNextOperate(item)" v-for="item in taskOperations" :key="item.key">
-                  {{item.value}}
-                </span>
-              </template>
-              </em-input>
+                <em-input
+                  value="下步操作"
+                  label="下步操作"
+                  required
+                  :disabled="true"
+                  label-position="top"
+                >
+                  <template slot="input">
+                    <span
+                      class="em-flow-tag"
+                      :class="{ 'em-flow-tag-active': tagKey === item.key }"
+                      @click="changeNextOperate(item)"
+                      v-for="item in taskOperations"
+                      :key="item.key"
+                    >
+                      {{ item.value }}
+                    </span>
+                  </template>
+                </em-input>
                 <!-- <em-picker
                   title="下步操作"
                   label="下步操作"
@@ -421,7 +427,8 @@ import {
   toStartTaskReadHtml,
   taskReadHtml,
   getNodeInfoHtml,
-  taskHandleHtml
+  taskHandleHtml,
+  taskHandleHtmlImg
 } from '../../../../src/config/api.js';
 import request from '../../../../src/utils/http.js';
 import Opinion from './Opinion.vue';
@@ -453,6 +460,10 @@ export default {
     esign: {
       type: Boolean,
       default: false
+    },
+    userId: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -584,8 +595,9 @@ export default {
       nodeInfoMapInfo: {},
       file: '',
       isEndUserTask: '',
-      tagKey:'',
-      pOrgId: ''
+      tagKey: '',
+      pOrgId: '',
+      needRetrialAuth: false
     };
   },
   created() {
@@ -684,9 +696,10 @@ export default {
         processDefinitionId,
         pendingId,
         opinion: this.form.opinion,
-        taskAction: 'complete'
+        taskAction: 'complete',
+        userId: this.userId
       };
-        let formData = new FormData();
+      let formData = new FormData();
       if (this.form.isImageOpinion == 1) {
         formData.append('file', this.file);
       }
@@ -837,11 +850,13 @@ export default {
         choiceDeptId,
         pOrgId,
         taskExamineInfo,
+        needRetrialAuth,
         nodeInfoMapInfo
       } = this;
       _that.form.isEndUserTask = isEndUserTask;
       _that.form.choiceOrgId = choiceOrgId;
       _that.form.choiceDeptId = choiceDeptId;
+      _that.form.needRetrialAuth = needRetrialAuth;
       _that.form.pOrgId = pOrgId;
       _that.form.processType = taskExamineInfo.processType;
       _that.form.businessId = taskExamineInfo.businessId;
@@ -849,6 +864,7 @@ export default {
       _that.form.processDefinitionId = taskExamineInfo.processDefinitionId;
       _that.form.isSubFlow = taskExamineInfo.isSubFlow;
       _that.form.nodeId = taskExamineInfo.nodeId;
+      _that.form.userId = _that.userId;
       _that.form.nextNodeId =
         _that.form.nextOperate == 0 || _that.form.nextOperate == 1
           ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode
@@ -864,7 +880,14 @@ export default {
         }
       }
       request({
-        url: _that.baseUrl ? _that.baseUrl + taskHandleHtml : taskHandleHtml,
+        url: _that.baseUrl
+          ? _that.baseUrl +
+            (_that.form.isImageOpinion == 1
+              ? taskHandleHtmlImg
+              : taskHandleHtml)
+          : _that.form.isImageOpinion == 1
+          ? taskHandleHtmlImg
+          : taskHandleHtml,
         type: 'post',
         params: formData
       }).then(res => {
@@ -913,8 +936,8 @@ export default {
     },
     // 切换下一步操作
     changeNextOperate(val, isDef) {
-      if(!isDef && val.key === this.tagKey) return
-      this.tagKey = val.key
+      if (!isDef && val.key === this.tagKey) return;
+      this.tagKey = val.key;
       //恢复默认
       this.isNextUser = false;
       this.isShowNode = false;
@@ -1109,7 +1132,8 @@ export default {
             ? that.baseUrl + getHandleInfoHtml
             : getHandleInfoHtml,
           params: {
-            pendingId: that.pendingId
+            pendingId: that.pendingId,
+            userId: that.userId
           }
         }).then(res => {
           if (res.status == 'success') {
@@ -1234,6 +1258,8 @@ export default {
               }
             }
             if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
+              that.needRetrialAuth = !!nodeInfoMap.nodeExtAttr
+                .isCurrentNodeSubmitNeedRetrialAuth;
               if (nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList) {
                 let notice = JSON.parse(
                   nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList
@@ -1298,7 +1324,7 @@ export default {
         url: this.baseUrl
           ? this.baseUrl + toStartTaskReadHtml
           : toStartTaskReadHtml,
-        params: { pendingId: this.pendingId }
+        params: { pendingId: this.pendingId, userId: this.userId }
       })
         .then(res => {
           const {
@@ -1334,7 +1360,8 @@ export default {
           nextNodeId: res,
           taskId: this.processObj.taskExamine.taskId,
           pendingId: this.pendingId,
-          businessId: this.taskExamineInfo.businessId
+          businessId: this.taskExamineInfo.businessId,
+          userId: this.userId
         }
       }).then(res => {
         this.$toast.clear();

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

@@ -63,7 +63,11 @@ export default {
       type: Boolean,
       default: true,
     },
-    baseUrl:String
+    baseUrl:String,
+    userId:{
+      type:String,
+      default:''
+    }
   },
   data() {
     return {

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

@@ -135,6 +135,10 @@ export default {
     esign: {
       type: Boolean,
       default: false
+    },
+    userId: {
+      type: String,
+      default: ''
     }
   },
   // components: {
@@ -171,7 +175,7 @@ export default {
       this.$emit('onInputOpintion', {
         opinion: this.opinion,
         isImageOpinion,
-        file:info.file
+        file: info.file
       });
     },
     handleChange() {
@@ -190,7 +194,7 @@ export default {
       const _that = this;
       request({
         url: _that.baseUrl ? _that.baseUrl + commonOpion : commonOpion,
-        params: {}
+        params: { userId: this.userId }
       }).then(res => {
         if (res.status == 'success') {
           this.opinionList = res.data.list;

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

@@ -57,6 +57,10 @@ export default {
      esign: {
       type: Boolean,
       default: false
+    },
+    userId:{
+      type:String,
+      default:''
     }
   },
   data() {
@@ -131,6 +135,7 @@ export default {
         formData.append('file', this.file);
       }
       formData.append('pendingId', this.pendingId);
+      this.form.userId = this.userId
       for (let key in this.form) {
         if (this.form[key] !== '' && this.form[key] !== undefined) {
           formData.append(key, this.form[key]);
@@ -179,7 +184,8 @@ export default {
         params: {
           pendingId: this.pendingId,
           isSinglePage: false,
-          opinion: this.form.opinion
+          opinion: this.form.opinion,
+          userId: this.userId
         }
       }).then(res => {
         if (res.status == 'success') {

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

@@ -138,6 +138,10 @@ export default {
     esign: {
       type: Boolean,
       default: false
+    },
+    userId:{
+      type:String,
+      default:''
     }
   },
   data() {
@@ -278,7 +282,8 @@ export default {
         userId: sessionStorage.getItem('userId'),
         notificationMsg: this.form.notificationMsg,
         loginType: 2, //登录方式
-        isImageOpinion:this.form.isImageOpinion
+        isImageOpinion:this.form.isImageOpinion,
+        userId: this.userId
       };
       if (this.beforeSubmit) {
         this.beforeSubmit(info);
@@ -405,7 +410,7 @@ export default {
       return new Promise(function(resolve, reiect) {
         request({
           url: that.apiBaseUrl ? that.apiBaseUrl + toStartFlow : toStartFlow,
-          params: res
+          params: {...res,userId:this.userId}
         }).then(res => {
           if (res.rCode == 0) {
             res.results.nodeExtr.submitTipsMsg &&
@@ -467,7 +472,8 @@ export default {
         params: {
           processDefinitionId: this.flowObj.processDefinitionId,
           nodeId: res,
-          taskId: this.processObj.taskId
+          taskId: this.processObj.taskId,
+          userId: this.userId
         }
       }).then(res => {
         this.$toast.clear();

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

@@ -131,6 +131,10 @@ export default {
     paddingTop: {
       type: [String, Number],
       default: 0
+    },
+    userId:{
+      type:String,
+      default:''
     }
   },
   computed: {
@@ -203,7 +207,8 @@ export default {
           opinion,
           pendingId,
           isSubFlow: taskExamine.isSubFlow,
-          isSinglePage: taskExamine.isSinglePage
+          isSinglePage: taskExamine.isSinglePage,
+          userId: this.userId
         }
       };
       request(params)
@@ -267,7 +272,8 @@ export default {
       const _that = this;
       let params = {
         pendingId: this.pendingId,
-        taskAction: _that.newType
+        taskAction: _that.newType,
+        userId: _that.userId
       };
       if (_that.newType != 'taskReadAndEnd') delete params.taskAction;
 
@@ -321,7 +327,8 @@ export default {
           notificationMsg: this.form.notificationMsg,
           isImageOpinion: 0,
           loginType: 2,
-          taskAction: this.type
+          taskAction: this.type,
+          userId: this.userId
         }
       };
       if (this.beforeSubmit) {
@@ -354,7 +361,7 @@ export default {
         url: this.baseUrl
           ? this.baseUrl + getHandleInfoHtml
           : getHandleInfoHtml,
-        params: { pendingId: this.pendingId }
+        params: { pendingId: this.pendingId,userId: this.userId }
       }).then(res => {
         let {
           status,
@@ -417,6 +424,7 @@ export default {
           currentOrgProcessKey: processDefinitionId,
           noticeType: this.form.notificationMsgType,
           taskAction: 'create',
+          userId: this.userId,
           // notificationMsg: this.form.notificationMsg,
           nextReadUserId: ids
         }

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

@@ -111,6 +111,7 @@ export default {
     inevitableNode: { type: String, default: '' },
     appId: { type: String, default: '' },
     defaultOpinion: { type: String, default: '' },
+    userId:{type:String,default:''},
     // disabled: { type: Boolean, default: false },
     // multiple: { type: Boolean, default: true },
     baseUrl: { type: String, default: '' },
@@ -202,7 +203,8 @@ export default {
         url: isCanStartSubFlow,
         params: {
           appId: this.appId,
-          inevitableNode: this.inevitableNode
+          inevitableNode: this.inevitableNode,
+          userId: this.userId
         },
         type: 'post',
         headers: { Accept: 'application/json,text/plain' }
@@ -221,7 +223,8 @@ export default {
     //获取通知信息
     getMessage() {
       let params = {
-        pendingId: this.pendingId
+        pendingId: this.pendingId,
+        userId: this.userId
       };
       request({ url: getNotificationMsg, params, methods: 'post' })
         .then(res => {
@@ -319,7 +322,7 @@ export default {
             : this.type == 'twoOfficesDispatch'
             ? toTwoOfficesDispatch
             : toTaskUnionExamine,
-        params: { pendingId: this.pendingId },
+        params: { pendingId: this.pendingId,userId: this.userId },
         headers: { Accept: 'application/json,text/plain' }
       };
       this.$toast.loading({
@@ -431,18 +434,17 @@ export default {
       }
       if (
         (type == 'takeAdvice' &&
-          (nextCurrentOrgObj == '' ||
-            (nextCurrentOrgObj == null && isHideCurrentOrg == 0))) ||
-        ((isHideOtherOrg == 0 && nextOtherOrgObj == '') ||
-          nextOtherOrgObj == null)
+          (!nextCurrentOrgObj && isHideCurrentOrg == 0)) &&
+        (isHideOtherOrg == 0 && !nextOtherOrgObj)
       ) {
         return this.$toast('请选择处理对象!');
-      } else if (
-        isHideCurrentOrg == 0 &&
-        (nextOtherOrgObj == '' || nextOtherOrgObj == null)
-      ) {
-        return this.$toast('请选择处理对象!');
-      }
+      } 
+      // else if (
+      //   isHideCurrentOrg == 0 &&
+      //   (nextOtherOrgObj == '' || nextOtherOrgObj == null)
+      // ) {
+      //   return this.$toast('请选择处理对象!');
+      // }
       let info = {
           opinion,
           pendingId,
@@ -456,7 +458,8 @@ export default {
           notificationType: noticeType.join(','),
           choiceDeptId,
           isSubFlow,
-          choiceOrgId
+          choiceOrgId,
+          userId: this.userId
         }
         let formData = new FormData();
       if (isImageOpinion == 1) {

package/packages/pull-refresh/index.js

@@ -0,0 +1,5 @@
+import EmPullRefresh from './src/main';
+
+EmPullRefresh.install = Vue => Vue.component(EmPullRefresh.name, EmPullRefresh);
+
+export default EmPullRefresh;

package/packages/pull-refresh/src/main.vue

@@ -0,0 +1,31 @@
+<template>
+  <van-pull-refresh v-model="isLoading" v-bind="$attrs" v-on="$listeners">
+    <template v-for="(index, name) in $slots" :slot="name">
+      <slot :name="name" />
+    </template>
+  </van-pull-refresh>
+</template>
+
+<script>
+export default {
+  name: 'EmPullRefresh',
+  props: {
+    value: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    isLoading: {
+      set() {
+        return this.value;
+      },
+      get(val) {
+        return val;
+      }
+    }
+  }
+};
+</script>
+
+<style></style>

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

@@ -22,6 +22,7 @@
     <em-tabs
       v-show="newTabs.length > 1 && !showTree"
       @click="handleClick"
+      class="em-flow-tabs"
       type="card"
       style="margin:10px 0px"
     >
@@ -679,6 +680,7 @@ export default {
             this.$emit('update:selectList', this.list);
           }
           this.personnel = res.results;
+          console.log(this.personnel,'this.personnel')
           let _this = this;
           this.list.filter(r => {
             _this.personnel.find(i => {

package/packages/swipe/index.js

@@ -0,0 +1,5 @@
+import EmSwipe from './src/main';
+
+EmSwipe.install = Vue => Vue.component(EmSwipe.name, EmSwipe);
+
+export default EmSwipe;

package/packages/swipe/src/main.vue

@@ -0,0 +1,42 @@
+<template>
+  <van-swipe ref="swipe" v-bind="$attrs" v-on="$listeners">
+    <van-swipe-item v-for="(item, index) in contents" :key="index">
+      <div @click="handleClick(item,index)" v-if="item.render" v-html="item.render(item)"></div>
+      <img v-else @click="handleClick(item,index)" :src="item.url" style="width: 100%; height: 100%;" />
+    </van-swipe-item>
+    <template v-for="(index, name) in $slots" :slot="name">
+      <slot :name="name" />
+    </template>
+  </van-swipe>
+</template>
+
+<script>
+export default {
+  name: 'EmSwipe',
+  props: {
+    contents: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods:{
+    resize() {
+      this.$refs.swipe.resize()
+    },
+    prev() {
+      this.$refs.swipe.prev()
+    },
+    next() {
+      this.$refs.swipe.next()
+    },
+    swipeTo(index,options) {
+      this.$refs.swipe.swipeTo(index,options)
+    },
+    handleClick(info,index){
+      this.$emit('click',info,index)
+    },
+  }
+};
+</script>
+
+<style></style>