eoss-mobiles 0.2.93 → 0.2.94

package/package.json

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

package/packages/checkbox/src/main.vue

@@ -156,17 +156,19 @@ export default {
     },
     disabledValue:{
       handler(val){
-        this.newData.map(item => {
-              item.name = this.allowHtml
-                ? item[this.sysAppCode ? 'shortName' : this.labelKey]
-                : item[this.sysAppCode ? 'shortName' : this.labelKey].replace(
-                    /<[^>]+>/g,
-                    ''
-                  );
-              item.value = item[this.sysAppCode ? 'cciValue' : this.value];
-              
-              item.disabled = val.indexOf(item.value) != -1
-            });
+        // if(val){
+          this.newData.map(item => {
+                item.name = this.allowHtml
+                  ? item[this.sysAppCode ? 'shortName' : this.labelKey]
+                  : item[this.sysAppCode ? 'shortName' : this.labelKey].replace(
+                      /<[^>]+>/g,
+                      ''
+                    );
+                item.value = item[this.sysAppCode ? 'cciValue' : this.valueKey];
+                
+                item.disabled = val.indexOf(item.value) != -1
+              });
+        // }
       },
       deep: true,
       immediate: true
@@ -210,7 +212,7 @@ export default {
                     /<[^>]+>/g,
                     ''
                   );
-              item.value = item[sysAppCode ? 'cciValue' : this.value];
+              item.value = item[sysAppCode ? 'cciValue' : this.valueKey];
               item.disabled = this.disabledValue.indexOf(item.value) != -1
             });
             this.newData = data || results;

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

@@ -6,7 +6,7 @@
         <div>{{ processObj.taskExamine.nodeName }}</div>
       </div> -->
       <div class="input-box">
-        <div class="item" v-if="newType === 'transfer'">
+        <div class="item" v-if="type === 'transfer'">
           <em-input
             readonly
             clickable
@@ -17,7 +17,7 @@
         </div>
         <div class="item" v-if="newType === 'transfer'">
           <em-selector
-            label="分阅人员"
+            label="转办对象"
             required
             :multiple="multiple"
             :isAllCheck="isAllCheck"
@@ -70,7 +70,7 @@
             :notificationMessageReadOnly="notificationMessageReadOnly"
             :defaultNotificationType="defaultNotificationType"
             :baseUrl="baseUrl"
-            :showMsg="true"
+            :showMsg="false"
             @onInputMsg="onInputMsg"
           ></Message>
         </div>
@@ -244,7 +244,7 @@ export default {
           const {
             status,
             message,
-            data: { choiceDeptId, choiceOrgId, nodeInfoMap, taskExamine }
+            data: { choiceDeptId, choiceOrgId, nodeInfoMap, taskExamine,readOnlyNotificationType,notificationMessageReadOnly }
           } = res;
           this.$toast.clear();
           if (status == 'success') {
@@ -253,6 +253,8 @@ export default {
               choiceOrgId,
               choiceDeptId
             );
+            this.notificationMessageReadOnly = notificationMessageReadOnly == 'true';
+          this.readOnlyNotificationType = readOnlyNotificationType;
             this.nextNode.nodeName = taskExamine.nodeName;
             this.transferInfo = taskExamine;
           } else {
@@ -269,6 +271,35 @@ export default {
           }
         });
     },
+    isMultipleTransfer(val, choiceOrgId, choiceDeptId, pOrgId) {
+      if (val == 2 || val == 4 || val == 6 || val == 16) {
+        this.multiple = true;
+      } else {
+        this.multiple = false;
+      }
+      if (val == 1 || val == 2 || val == 5) {
+        this.params.pid = this.orgId;
+        if (choiceOrgId) {
+          this.params.pid = choiceOrgId;
+        }
+      }
+      if (val == 5 || val == 6) {
+        this.params.pid = this.orgId;
+        this.params.deptId = this.orgId;
+        if (choiceDeptId) {
+          this.params.deptId = choiceDeptId;
+        }
+        if (choiceOrgId) {
+          this.params.pid = choiceOrgId;
+        }
+      }
+      if (val == 15 || val == 16) {
+        this.params.pid = this.orgId;
+        if (pOrgId) {
+          this.params.pid = pOrgId;
+        }
+      }
+    },
     isMultiple() {
       let orgId = util.getStorage('orgId') || this.orgId;
       if (this.processObj.selectPersonValue == 1) {

package/packages/flow/src/main.vue

@@ -21,9 +21,10 @@
       :beforeSubmit="beforeSubmit"
     />
     <TaskRead
-      v-else-if="type === 'taskRead'"
+      v-else-if="type === 'taskRead' || type === 'transfer'"
       v-bind="$attrs"
       :userId="userId"
+      :type="type"
       :beforeSubmit="beforeSubmit"
     />
     <TaskUnionExamineVue

package/src/index.js

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