eoss-mobiles 0.3.66 → 0.3.68

package/package.json

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

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

@@ -203,7 +203,7 @@ export default {
         { name: '前置加签', value: 'preAddSign' },
         { name: '后置加签', value: 'postAddSign' }
       ],
-      currentOrgSelectorParams: { only_filid: true },
+      currentOrgSelectorParams: { only_filid: true,onlyMyOrg:true },
       currentOrgSelectorTabs: 'employee, persongroup',
       foreignOrgSelectorTabs: 'enterprise,filgroupobj',
       foreignOrgSelectorParams: { roleid: '' },

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

@@ -4,12 +4,13 @@
       v-if="showFreeStart"
       @close="showFreeStart = false"
       :defId="freeStartFlowParams.defId"
-      :businessId="freeStartFlowParams.startFlowBusinessId"
+      :businessId="freeStartFlowParams.startFlowBusinessId || taskExamineInfo.businessId"
       :taskParams="taskParams"
       :is-free-start-flow="
         freeStartFlowParams.useScene === 'multiInsMidwayWithSubmitScene'
       "
       @closePop="showFreeStart = false"
+      @success="handleSuccess"
       :opinion="form.opinion"
       :copy-history="freeStartFlowParams.pendedHistoryHandle"
       :formType="processFormType"
@@ -340,7 +341,7 @@
                       type="primary"
                       @click="
                         () => {
-                          form.customLimitTime = '';
+                          // form.customLimitTime = '';
                           showCustomLimitTimeText = !showCustomLimitTimeText;
                         }
                       "
@@ -363,7 +364,7 @@
                       type="primary"
                       @click="
                         () => {
-                          form.customLimitTime = '';
+                          // form.customLimitTime = '';
                           showCustomLimitTimeText = !showCustomLimitTimeText;
                         }
                       "
@@ -912,6 +913,9 @@ export default {
     }
   },
   methods: {
+    handleSuccess(){
+      this.$parent.$emit('success')
+    },
     handleClickDefList(info) {
       this.freeStartFlowParams.defId = info.defId;
       this.showFreeStart = true;
@@ -1639,7 +1643,7 @@ export default {
                 isCanPreAddSign
               }
             } = res;
-            if (currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
+            if (currentOrgSelectorParams && currentOrgSelectorParams.enableCurrentOrgConfig == 'true') {
               that.currentOrgSelectorTabs =
                 currentOrgSelectorParams.currentOrgType.split(',');
               let currentOrgparams =
@@ -1650,13 +1654,14 @@ export default {
                     currentOrgparams[i] == 'my'
                       ? choiceOrgId
                       : currentOrgparams[i],
-                  only_filid: true
+                  only_filid: true,
+                  onlyMyOrg:true
                 };
               });
               that.currentOrgSelectorTabs =
                 that.currentOrgSelectorTabs.join(',');
             }
-            if (currentOrgSelectorParams.enableForeignOrgConfig == 'true') {
+            if (currentOrgSelectorParams &&currentOrgSelectorParams.enableForeignOrgConfig == 'true') {
               that.foreignOrgSelectorTabs =
                 currentOrgSelectorParams.foreignOrgType.split(',');
               let foreignOrgparams =
@@ -1968,6 +1973,9 @@ export default {
           _that.deptRoleCode = res.data.nodeExtAttr.deptRoleCode;
           _that.enableCustomLimitTimeSetting =
             res.data.nodeExtAttr.enableCustomLimitTimeSetting == 1;
+          if(_that.enableCustomLimitTimeSetting && res.data.nodeMoreInfo.defaultCustomLimitDays){
+            _that.form.customLimitTime = res.data.nodeMoreInfo.defaultCustomLimitDays + '';
+          }
           res.data.otherOrgDisabledObjId &&
             (this.otherOrgDisabledObjId =
               res.data.otherOrgDisabledObjId.split(','));

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

@@ -107,7 +107,7 @@
                   type="primary"
                   @click="
                     () => {
-                      form.customLimitTime = '';
+                      // form.customLimitTime = '';
                       showCustomLimitTimeText = !showCustomLimitTimeText;
                     }
                   "
@@ -130,7 +130,7 @@
                   type="primary"
                   @click="
                     () => {
-                      form.customLimitTime = '';
+                      // form.customLimitTime = '';
                       showCustomLimitTimeText = !showCustomLimitTimeText;
                     }
                   "
@@ -319,6 +319,7 @@ export default {
     if (this.formType == 'freeStart' || this.copyHistory) {
       this.form.opinion = this.opinion;
     }
+
     this.geAllData(obj);
   },
 
@@ -499,11 +500,11 @@ export default {
           if (_that.formType == 'freeStart' && !_that.isFreeStartFlow) {
             this.$emit('closePop');
           } else {
-            // if(_that.formType == 'freeStart'){
-            //   _that.$emit('success');
-            // }else{
+            if(_that.formType == 'freeStart'){
+              _that.$emit('success');
+            }else{
             _that.$parent.$emit('success');
-            // }
+            }
           }
         } else {
           this.$toast(res.msg || res.message);
@@ -744,6 +745,9 @@ export default {
           // _that.nextUserList = res.results.transactorInfos || [];
           _that.enableCustomLimitTimeSetting =
             this.peopleObj.enableCustomLimitTimeSetting == 1;
+          if(_that.enableCustomLimitTimeSetting && res.data.nodeMoreInfo.defaultCustomLimitDays){
+            _that.form.customLimitTime = res.data.nodeMoreInfo.defaultCustomLimitDays + '';
+          }
           if (res.results.nodeExtr.userSelectionType) {
             this.treeType = res.results.nodeExtr.userSelectionType;
             if (res.results.nodeExtr) {

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

@@ -89,7 +89,7 @@
                   type="primary"
                   @click="
                     () => {
-                      form.customLimitTime = '';
+                      // form.customLimitTime = '';
                       showCustomLimitTimeText = !showCustomLimitTimeText;
                     }
                   "
@@ -112,7 +112,7 @@
                   type="primary"
                   @click="
                     () => {
-                      form.customLimitTime = '';
+                      // form.customLimitTime = '';
                       showCustomLimitTimeText = !showCustomLimitTimeText;
                     }
                   "
@@ -662,6 +662,9 @@ export default {
           });
           _that.enableCustomLimitTimeSetting =
             this.peopleObj.enableCustomLimitTimeSetting == 1;
+          if(_that.enableCustomLimitTimeSetting && res.data.nodeMoreInfo.defaultCustomLimitDays){
+            _that.form.customLimitTime = res.data.nodeMoreInfo.defaultCustomLimitDays + '';
+          }
           if (res.data.nodeExtAttr.userSelectionType) {
             this.treeType = res.data.nodeExtAttr.userSelectionType;
             if (res.data.nodeExtAttr) {

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

@@ -204,6 +204,7 @@ export default {
     this.params.nofilid = this.otherParams.nofilid = this.orgId || JSON.parse($.getStorage('userInfo')).orgId || this.userId || '';
     if(this.type == 'takeAdvice'){
       this.params.only_filid=true
+      this.params.onlyMyOrg=true
     }else{
       this.params = {...this.params,...this.selectorParams}
     }
@@ -467,7 +468,8 @@ export default {
                              $.getStorage('userInfo')
                             ).orgId)
                           : param[i],
-                          only_filid:true
+                          only_filid:true,
+                          onlyMyOrg:true
                     };
                   });
               } else {

package/src/index.js

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