eoss-mobiles 0.2.66 → 0.2.68

package/package.json

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

package/packages/checkbox/src/main.vue

@@ -15,10 +15,14 @@
         v-bind="exclAttribute({ data: item, attrs: 'checkedColor' })"
         v-on="$listeners"
         :disabled="item.disabled"
-        :checked-color="checkedColor || item.checkedColor"
+        :label-disabled="item.labelDisabled || labelDisabled"
+        :label-position="item.labelPosition || labelPosition"
+        :shape="item.shape || shape"
+        :checked-color="item.checkedColor || checkedColor"
+        :icon-size="item.iconSize || iconSize"
         :name="item[valueKey]"
-        >
-        <span v-html="item[labelKey]"></span> 
+      >
+        <span v-html="item[labelKey]"></span>
         <slot
           slot="icon"
           :checked="newValue.indexOf(item[valueKey]) != -1"
@@ -31,7 +35,11 @@
       v-bind="$attrs"
       v-model="newValue"
       v-on="$listeners"
+      :label-disabled="labelDisabled"
+      :label-position="labelPosition"
+      :shape="shape"
       :checked-color="checkedColor"
+      :icon-size="iconSize"
       :disabled="disabled"
       :name="$attrs[valueKey]"
       >{{ $attrs.name }}
@@ -42,7 +50,7 @@
 <script>
 import { findSysCode } from '../../../src/config/api';
 import request from '../../../src/utils/http.js';
-import util from '../../../src/utils/util'
+import util from '../../../src/utils/util';
 export default {
   name: 'EmCheckboxGroup',
   inheritAttrs: false,
@@ -52,7 +60,7 @@ export default {
     };
   },
   props: {
-    checkedColor:String,
+    checkedColor: String,
     disabled: {
       type: Boolean,
       default: false
@@ -61,6 +69,22 @@ export default {
       type: [Array, Boolean],
       default: () => []
     },
+    labelDisabled: {
+      type: Boolean,
+      default: false
+    },
+    shape: {
+      type: String,
+      default: 'round'
+    },
+    iconSize: {
+      type: [String, Number],
+      default: '20px'
+    },
+    labelPosition: {
+      type: String,
+      default: 'right'
+    },
     data: {
       type: Array,
       default: () => []
@@ -100,8 +124,7 @@ export default {
     allowHtml: {
       type: Boolean,
       default: false
-    },
-    
+    }
   },
   computed: {
     newValue: {
@@ -134,7 +157,7 @@ export default {
     }
   },
   methods: {
-     exclAttribute({ data, attrs }) {
+    exclAttribute({ data, attrs }) {
       return util.exclAttribute({ data, attrs });
     },
     handleChange() {

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

@@ -32,7 +32,7 @@
         <!-- 审核内容 -->
         <div
           class="special-box input-box"
-          v-if="isSpecial && typeCode != 'fenyue'"
+          v-if=" typeCode != 'fenyue'"
         >
           <!-- 加签 -->
           <div
@@ -87,6 +87,7 @@
               </template>
             </em-input>
           </div>
+          <div v-if="isSpecial && typeCode != 'fenyue'">
           <div
             class="item item-user"
             label="减少办理人"
@@ -415,6 +416,7 @@
             ></Message>
           </div>
         </div>
+          </div>
       </div>
       <div v-if="isSubmitButtonShowAgreeAndDisagree" class="btn-list">
         <div class="btn" @click="handleFlow = false">不同意</div>
@@ -892,6 +894,7 @@ export default {
       _that.form.isSubFlow = taskExamineInfo.isSubFlow;
       _that.form.nodeId = taskExamineInfo.nodeId;
       _that.form.userId = _that.userId || $.getStorage('userId');
+      _that.form.mobileKey = $.getStorage('deviceId') || '123'
       _that.form.nextNodeId =
         _that.form.nextOperate == 0 || _that.form.nextOperate == 1
           ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode

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

@@ -139,6 +139,7 @@ export default {
         this.beforeSubmit({ pendingId: this.pendingId, ...this.form });
         return;
       }
+      this.form.mobileKey = $.getStorage('deviceId') || '123'
       let formData = new FormData();
       if (this.form.isImageOpinion == 1) {
         formData.append('file', this.file);

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

@@ -288,7 +288,8 @@ export default {
         notificationMsg: this.form.notificationMsg,
         loginType: 2, //登录方式
         isImageOpinion: this.form.isImageOpinion,
-        userId: this.userId || $.getStorage('userId')
+        userId: this.userId || $.getStorage('userId'),
+        mobileKey:$.getStorage('deviceId') || '123',
       };
       if (this.beforeSubmit) {
         this.beforeSubmit(info);

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

@@ -215,7 +215,8 @@ export default {
           pendingId,
           isSubFlow: taskExamine.isSubFlow,
           isSinglePage: taskExamine.isSinglePage,
-          userId: this.userId
+          userId: this.userId,
+          mobileKey:util.getStorage('deviceId') || '123'
         }
       };
       request(params)
@@ -280,7 +281,8 @@ export default {
       let params = {
         pendingId: this.pendingId,
         taskAction: _that.newType,
-        userId: _that.userId
+        userId: _that.userId,
+        mobileKey:util.getStorage('deviceId') || '123'
       };
       if (_that.newType != 'taskReadAndEnd') delete params.taskAction;
 
@@ -335,7 +337,8 @@ export default {
           isImageOpinion: 0,
           loginType: 2,
           taskAction: this.type,
-          userId: _that.userId
+          userId: _that.userId,
+          mobileKey:util.getStorage('deviceId') || '123'
         }
       };
       if (this.beforeSubmit) {
@@ -424,6 +427,7 @@ export default {
           choiceOrgId,
           businessName,
           processDefinitionId,
+          mobileKey:util.getStorage('deviceId') || '123',
           bCode,
           bName,
           loginType: 2,

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

@@ -7,7 +7,7 @@
       </div>
       <Opinion
         @onInputOpintion="onInputOpintion"
-          :esign="esign"
+        :esign="esign"
         :baseUrl="baseUrl"
       ></Opinion>
       <div class="input-box">
@@ -101,7 +101,7 @@ import {
 import request from '../../../../src/utils/http.js';
 import Opinion from './Opinion.vue';
 import Message from './Message.vue';
-import $ from '../../../../src/utils/util'
+import $ from '../../../../src/utils/util';
 export default {
   name: 'TaskUnionExamine',
   props: {
@@ -112,7 +112,7 @@ export default {
     inevitableNode: { type: String, default: '' },
     appId: { type: String, default: '' },
     defaultOpinion: { type: String, default: '' },
-    userId:{type:String,default:''},
+    userId: { type: String, default: '' },
     // disabled: { type: Boolean, default: false },
     // multiple: { type: Boolean, default: true },
     baseUrl: { type: String, default: '' },
@@ -125,16 +125,16 @@ export default {
       type: Boolean,
       default: false
     },
-    isAllCheck:{
-      type:Boolean,
-      default:false
+    isAllCheck: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
     return {
       opinion: '', //办理意见
-      isImageOpinion:0,
-      file:'',
+      isImageOpinion: 0,
+      file: '',
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
@@ -197,7 +197,7 @@ export default {
     }
   },
   methods: {
-     onInputOpintion(val) {
+    onInputOpintion(val) {
       const { opinion, isImageOpinion, file } = val;
       this.opinion = opinion;
       this.isImageOpinion = isImageOpinion;
@@ -327,7 +327,7 @@ export default {
             : this.type == 'twoOfficesDispatch'
             ? toTwoOfficesDispatch
             : toTaskUnionExamine,
-        params: { pendingId: this.pendingId,userId: this.userId },
+        params: { pendingId: this.pendingId, userId: this.userId },
         headers: { Accept: 'application/json,text/plain' }
       };
       this.$toast.loading({
@@ -434,16 +434,24 @@ export default {
         isSubFlow,
         pendingId
       } = this;
-       if ((isOpinionRequired == 1 && !opinion && isImageOpinion == 0) || (isOpinionRequired == 1 && isImageOpinion == 1 && !file) ) {
+      if (
+        (isOpinionRequired == 1 && !opinion && isImageOpinion == 0) ||
+        (isOpinionRequired == 1 && isImageOpinion == 1 && !file)
+      ) {
         return this.$toast('当前步骤必须输入意见!');
       }
       if (
-       ( (type == 'takeAdvice' &&
-         isHideCurrentOrg == 0 && ( !nextCurrentOrgObj || nextCurrentOrgObj.length == 0)) &&
-        (isHideOtherOrg == 0 && (!nextOtherOrgObj || nextOtherOrgObj.length == 0))) || (type != 'takeAdvice' && isHideOtherOrg == 0 && (!nextOtherOrgObj || nextOtherOrgObj.length == 0))
+        (type == 'takeAdvice' &&
+          isHideCurrentOrg == 0 &&
+          (!nextCurrentOrgObj || nextCurrentOrgObj.length == 0) &&
+          (isHideOtherOrg == 0 &&
+            (!nextOtherOrgObj || nextOtherOrgObj.length == 0))) ||
+        (type != 'takeAdvice' &&
+          isHideOtherOrg == 0 &&
+          (!nextOtherOrgObj || nextOtherOrgObj.length == 0))
       ) {
         return this.$toast('请选择处理对象!');
-      } 
+      }
       // else if (
       //   isHideCurrentOrg == 0 &&
       //   (nextOtherOrgObj == '' || nextOtherOrgObj == null)
@@ -451,22 +459,23 @@ export default {
       //   return this.$toast('请选择处理对象!');
       // }
       let info = {
-          opinion,
-          pendingId,
-          nextOtherOrgObj: Array.isArray(nextOtherOrgObj)
-            ? nextOtherOrgObj.join(',')
-            : nextOtherOrgObj,
-          nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj)
-            ? nextCurrentOrgObj.join(',')
-            : nextCurrentOrgObj,
-          notificationMsg: noticeInfo,
-          notificationType: noticeType.join(','),
-          choiceDeptId,
-          isSubFlow,
-          choiceOrgId,
-          userId: this.userId || $.getStorage('userId')
-        }
-        let formData = new FormData();
+        opinion,
+        pendingId,
+        nextOtherOrgObj: Array.isArray(nextOtherOrgObj)
+          ? nextOtherOrgObj.join(',')
+          : nextOtherOrgObj,
+        nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj)
+          ? nextCurrentOrgObj.join(',')
+          : nextCurrentOrgObj,
+        notificationMsg: noticeInfo,
+        notificationType: noticeType.join(','),
+        choiceDeptId,
+        isSubFlow,
+        choiceOrgId,
+        userId: this.userId || $.getStorage('userId'),
+        mobileKey: $.getStorage('deviceId') || '123'
+      };
+      let formData = new FormData();
       if (isImageOpinion == 1) {
         formData.append('file', file);
       }
@@ -492,8 +501,7 @@ export default {
         params: formData,
         headers: { Accept: 'application/json,text/plain' },
         type: 'post',
-        format:false
-
+        format: false
       };
       this.$toast.loading({
         message: '加载中...',

package/src/index.js

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