eoss-mobiles 0.3.65 → 0.3.67

package/package.json

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

package/packages/date/src/date-picker.vue

@@ -2,6 +2,7 @@
   <van-datetime-picker
     ref="emDatePicker"
     show-toolbar
+    
     v-model="newValue"
     v-bind="$attrs"
     :filter="filter"
@@ -53,6 +54,7 @@ export default {
         this.$attrs.type === 'datehour' &&
         this.timePeriod
       ) {
+         
         return ['上午', '下午'];
       }
       return options;
@@ -62,13 +64,16 @@ export default {
     },
     onConfirm(value) {
       let timePeriod;
+      console.log(this.$attrs.type === 'datehour',this.timePeriod,'aaaa')
       if (this.$attrs.type === 'datehour' && this.timePeriod) {
+        console.log(this.$attrs.type);
         timePeriod =
           this.$refs.emDatePicker.$children[0].$children[0].$children[3]._data
             .currentIndex == 0
             ? 'AM'
             : 'PM';
       }
+      console.log('confirm', value, timePeriod)
       this.$emit('confirm', value, timePeriod);
     },
     onChange(picker) {

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,7 +4,7 @@
       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'
@@ -340,7 +340,7 @@
                       type="primary"
                       @click="
                         () => {
-                          form.customLimitTime = '';
+                          // form.customLimitTime = '';
                           showCustomLimitTimeText = !showCustomLimitTimeText;
                         }
                       "
@@ -363,7 +363,7 @@
                       type="primary"
                       @click="
                         () => {
-                          form.customLimitTime = '';
+                          // form.customLimitTime = '';
                           showCustomLimitTimeText = !showCustomLimitTimeText;
                         }
                       "
@@ -1650,7 +1650,8 @@ export default {
                     currentOrgparams[i] == 'my'
                       ? choiceOrgId
                       : currentOrgparams[i],
-                  only_filid: true
+                  only_filid: true,
+                  onlyMyOrg:true
                 };
               });
               that.currentOrgSelectorTabs =
@@ -1855,8 +1856,7 @@ export default {
                   that.nodeFixedOpinionSelectList.push({ content: x });
                 });
               }
-              that.isCurrentNodeForbiddenChangeCandidate =
-                nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
+             
               that.isHiddenOftenOpinion =
                 nodeInfoMap.nodeExtAttr.isHiddenOftenOpinion;
               that.nodeDefaultSubmitOpinion =
@@ -1962,11 +1962,16 @@ export default {
         this.$toast.clear();
         this.showFlowBtn = true;
         if (res.status == 'success') {
+           _that.isCurrentNodeForbiddenChangeCandidate =
+                 res.data.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
           _that.currentNodeEnableItemHandleDescription =
             res.data.nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
           _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);
   },
 
@@ -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.65',
+  version: '0.3.67',
   install,
   Button,
   ButtonGroup,