eoss-ui 0.7.61 → 0.7.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.7.61",
+  "version": "0.7.62",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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

@@ -159,11 +159,11 @@ export default {
       currentOrgName: '',
       otherOrgName: '',
       newMultiple: true,
-      params: { filid: 'all' },
+      params: { filid: 'all',only_filid:true },
       isHideOtherOrg: '',
       isHideCurrentOrg: 0,
       isOpinionRequired: 0,
-      otherParams: { filid: 'other', nofilid: 1 },
+      otherParams: { filid: 'all', nofilid: 1 },
       loading: false,
       subLoading: null,
       userModel: {}
@@ -173,6 +173,7 @@ export default {
     selectorParams: {
       handler(val) {
         this.params = val;
+        this.params.only_filid = true;
       },
       deep: true,
       immediate: true

package/packages/flow/src/component/FreeCirculation.vue

@@ -26,7 +26,7 @@
           mix
           :showTooltip="showTooltip"
           :disableds="otherOrgDisabledObjId"
-          :where="{ filid: 'other',roleid :selectorParams.roleid }"
+          :where="{ filid: 'all',roleid :selectorParams.roleid,nofilid:sessionStorage.getItem('orgId') }"
 
           @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
           :types="foreignOrgSelectorTabs"
@@ -78,11 +78,11 @@ export default {
       nextOtherOrgObjSelect: [],
       nextNode: {},
       currentOrgSelectorParams: {
-        filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId
+        filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId,only_filid:true
       },
       currentOrgSelectorTabs: ['employee', 'persongroup'],
       foreignOrgSelectorTabs: ['enterprise', 'filgroup'],
-      foreignOrgSelectorParams: {enterprise:{filid: 'other', roleid: '', nofilid:sessionStorage.getItem('orgId')},filgroup:{filid: sessionStorage.getItem('orgId'), roleid: '', nofilid: sessionStorage.getItem('orgId')},roleid:''  },
+      foreignOrgSelectorParams: {enterprise:{filid: 'all', roleid: '', nofilid:sessionStorage.getItem('orgId')},filgroup:{filid: 'all', roleid: '', nofilid: sessionStorage.getItem('orgId')},roleid:''  },
       loading: null
     };
   },

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

@@ -69,7 +69,7 @@
       >
         <SelectUser
           :nextUser="infoList.nextOtherOrgObj"
-          :where="{ filid: 'other', roleid: selectorParams.roleid }"
+          :where="{ filid: 'all', roleid: selectorParams.roleid,nofilid:sessionStorage.getItem('orgId') }"
           :showTooltip="showTooltip"
           :multiple="newMultiple"
           @change="changeSelectUser($event, 'nextOtherOrgObj')"
@@ -251,11 +251,11 @@ export default {
       currentOrgName: '',
       otherOrgName: '',
       newMultiple: true,
-      params: { filid: 'all' },
+      params: { filid: 'all',only_filid:true },
       isHideOtherOrg: '',
       isHideCurrentOrg: 0,
       isOpinionRequired: 0,
-      otherParams: { filid: 'other' },
+      otherParams: { filid: 'all', roleid: '', nofilid: sessionStorage.getItem('orgId') },
       loading: false
     };
   },
@@ -465,7 +465,8 @@ export default {
                         ? (this.params.filid = JSON.parse(
                             util.getStorage('mainConfig')
                           ).userModel.orgId)
-                        : param[i]
+                        : param[i],
+                      only_filid:true
                   };
                 });
               } else {

package/packages/flow/src/freeStartFlow.vue

@@ -294,7 +294,7 @@
                     :disableds="currentOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
                     :types="['department', 'employee']"
-                    :params="{ filid: userModel.orgId,roleid:selectorParams.roleid }"
+                    :params="{ filid: userModel.orgId,roleid:selectorParams.roleid,only_filid:true }"
                   />
                 </el-form-item>
                 <el-form-item
@@ -306,7 +306,7 @@
                     :nextUser="nextOtherOrgObjSelect"
                     multiple
                     mix
-            :where="{ filid: 'other',roleid:selectorParams.roleid  }"
+                    :where="{ filid: 'all',roleid:selectorParams.roleid,nofilid:sessionStorage.getItem('orgId')  }"
                     :showTooltip="showTooltip"
                     :disableds="otherOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"

package/packages/flow/src/main.vue

@@ -84,7 +84,7 @@
           style="margin-top: 10px"
           :businessId="businessIds"
           :label-position="formLabelPosition"
-                  :showTooltip="showTooltip"
+          :showTooltip="showTooltip"
           ref="circulate"
           :selectorParams="selectorParams"
           :pending-id="pendingId"
@@ -112,7 +112,7 @@
       v-else-if="typeCode == 'read'"
       :pending-id="pendingId"
       :opinion="value"
-                  :showTooltip="showTooltip"
+      :showTooltip="showTooltip"
       type="create"
       :simpleTips="simpleTips"
       :key="StartTaskReadKey"
@@ -131,7 +131,7 @@
       :appId="resetAppId"
       :params="param"
       :showOther="showOther"
-                  :showTooltip="showTooltip"
+      :showTooltip="showTooltip"
       :selectorParams="selectorParams"
       :formLabelPosition="formLabelPosition"
       :simpleTips="simpleTips"
@@ -139,7 +139,7 @@
     <Supervise
       :businessId="businessId"
       :appId="resetAppId"
-                  :showTooltip="showTooltip"
+      :showTooltip="showTooltip"
       :simpleTips="simpleTips"
       @cancel="closeProcess($event)"
       v-else-if="typeCode == 'supervise'"
@@ -147,6 +147,7 @@
     <reset
       style="height: 100%"
       :type="newTypeCode"
+      :showTooltip="showTooltip"
       :simpleTips="simpleTips"
       :appId="resetAppId"
       @cancel="closeProcess($event)"
@@ -168,7 +169,7 @@
             @click="setShrink"
           ></es-button>
         </div>
-         <!-- 'es-icon-indent' : 'es-icon-increase' -->
+        <!-- 'es-icon-indent' : 'es-icon-increase' -->
         <div class="es-opinion" v-show="!shrink">
           <span class="es-eidt-title" :style="`${!isFlow ? 'color:red' : ''}`"
             >填写意见</span
@@ -474,7 +475,7 @@
                     :radioList="radioList"
                     :multiple="multiple"
                     :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
-                  :showTooltip="showTooltip"
+                    :showTooltip="showTooltip"
                     :isCurrentNodeForbiddenChangeCandidate="
                       isCurrentNodeForbiddenChangeCandidate
                     "
@@ -494,7 +495,7 @@
                     :tabs="nextUserTabs"
                   />
                 </el-form-item>
-               
+
                 <el-form-item
                   v-if="isHideCurrentOrg && nextNode.isReturnSubmitter != 1"
                   prop="nextCurrentOrgObj"
@@ -506,7 +507,7 @@
                     mix
                     :disableds="currentOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
-                  :showTooltip="showTooltip"
+                    :showTooltip="showTooltip"
                     :types="currentOrgSelectorTabs"
                     :params="currentOrgSelectorParams"
                   />
@@ -519,7 +520,7 @@
                   <SelectUser
                     :nextUser="nextOtherOrgObjSelect"
                     multiple
-                  :showTooltip="showTooltip"
+                    :showTooltip="showTooltip"
                     mix
                     :where="{ filid: 'other' }"
                     :disableds="otherOrgDisabledObjId"
@@ -562,7 +563,7 @@
                     :multiple="true"
                     :selectUserList="selectReadUserList"
                     :options="userOptions"
-                  :showTooltip="showTooltip"
+                    :showTooltip="showTooltip"
                     title="分阅用户"
                     :mix="true"
                     :types="types"
@@ -581,7 +582,7 @@
                     :nextUser="nextNode.presetReadUserId"
                     :multiple="true"
                     :selectUserList="selectPresetUserList"
-                  :showTooltip="showTooltip"
+                    :showTooltip="showTooltip"
                     :options="presetOptions"
                     :radioList="presetReadUserId"
                     :presetEdit="1"
@@ -592,30 +593,29 @@
                     :tabs="tabs"
                   />
                 </el-form-item>
-                 <el-form-item
+                <el-form-item
                   v-if="enableCustomLimitTimeSetting"
                   prop="customLimitTime"
                   label="限时办理"
                   style="margin-bottom: 10px"
                 >
-                <!-- v-if="!showCustomLimitTimeText" -->
-                <div style="display: flex;width: 100%;">
-                  <es-select
-                style="flex: 1 !important; display: inline-block;"
+                  <!-- v-if="!showCustomLimitTimeText" -->
+                  <div style="display: flex; width: 100%">
+                    <es-select
+                      style="flex: 1 !important; display: inline-block"
                       v-model="nextNode.customLimitTimeText"
                       placeholder="请选择"
-          @change="handleChangeTime"
+                      @change="handleChangeTime"
                       sysCode="bpm_custom_limit_time"
-                      ></es-select>
-                  <el-input
-                style="flex: 1; display: inline-block;"
-                    v-model="nextNode.customLimitTime"
-                    placeholder="请输入限时办理的天数"
-                    @change="changeCustomLimitTime"
-                    class="input-with-select custom-limit-time"
-                  >
-                    
-                    <!-- <es-button
+                    ></es-select>
+                    <el-input
+                      style="flex: 1; display: inline-block"
+                      v-model="nextNode.customLimitTime"
+                      placeholder="请输入限时办理的天数"
+                      @change="changeCustomLimitTime"
+                      class="input-with-select custom-limit-time"
+                    >
+                      <!-- <es-button
                       type="primary"
                       slot="append"
                       @click="
@@ -628,10 +628,10 @@
                         showCustomLimitTimeText ? '选择框' : '文本框'
                       }}</es-button
                     > -->
-                  </el-input>
-                  <span style="margin-left:5px">天</span>
-                </div>
-                      <!-- slot="prepend" -->
+                    </el-input>
+                    <span style="margin-left: 5px">天</span>
+                  </div>
+                  <!-- slot="prepend" -->
                 </el-form-item>
 
                 <el-form-item
@@ -675,7 +675,7 @@
             "
             @changeActiveNames="(val) => (activeNames = val)"
             @loadingEnd="customLoading('end')"
-                  :showTooltip="showTooltip"
+            :showTooltip="showTooltip"
             @loadingStart="customLoading('start')"
             :nextNode="nextNode.nextNodeId"
             :customPresetHintMessage="customPresetHintMessage"
@@ -692,7 +692,7 @@
             @loadingEnd="customLoading('end')"
             @loadingStart="customLoading('start')"
             :nodeId="nextNode.nextNodeId"
-                  :showTooltip="showTooltip"
+            :showTooltip="showTooltip"
             :businessId="businessIds"
             :customPresetHintMessage="customPresetHintMessage"
             :processDefinitionId="nodeInfo.nextNode"
@@ -710,7 +710,7 @@
           ref="processFormIndex"
           :id="freeStartFlowParams.startFlowBusinessId || businessIds"
           :simpleTips="simpleTips"
-                  :showTooltip="showTooltip"
+          :showTooltip="showTooltip"
           :is-free-start-flow="
             freeStartFlowParams.useScene === 'multiInsMidwayWithSubmitScene'
           "
@@ -737,7 +737,7 @@
             directCreateCircularReadWhenFlowStarted
           "
           ref="flowCirculate"
-                  :showTooltip="showTooltip"
+          :showTooltip="showTooltip"
           :label-position="formLabelPosition"
           :businessId="businessId"
           :startFlowPageEmbeddedIntoStartFlowIndex="
@@ -856,9 +856,9 @@
         >
           <el-button
             v-show="isSubmitButtonShowAgreeAndDisagree != 1"
-            v-for="item of (hideBtn || isHideTemporarySave
+            v-for="item of hideBtn || isHideTemporarySave
               ? btnList.slice(0, 1)
-              : btnList)"
+              : btnList"
             :key="item.name"
             :type="item.type"
             :style="btnStyle"
@@ -989,7 +989,7 @@
         <circulate
           :businessId="businessId"
           :processDefinitionId="nodeInfo.nextNode"
-                  :showTooltip="showTooltip"
+          :showTooltip="showTooltip"
           :simpleTips="simpleTips"
           :selectorParams="selectorParams"
           :oldOption="value"
@@ -1010,7 +1010,7 @@
         <ProcessForm
           :id="freeStartFlowParams.startFlowBusinessId || businessIds"
           :pending-id="pendingId"
-                  :showTooltip="showTooltip"
+          :showTooltip="showTooltip"
           :simpleTips="simpleTips"
           :is-free-start-flow="
             freeStartFlowParams.useScene === 'multiInsMidwayWithSubmitScene'
@@ -1053,7 +1053,7 @@
         <ProcessReject
           :pending-id="pendingId"
           :option="value"
-                  :showTooltip="showTooltip"
+          :showTooltip="showTooltip"
           :simpleTips="simpleTips"
           :show-reject="showReject"
           :news-info="nextNode.notificationMsg"
@@ -1074,7 +1074,7 @@
           :pending-id="pendingId"
           :opinion="value"
           :type="taskReadType"
-                  :showTooltip="showTooltip"
+          :showTooltip="showTooltip"
           :selectorConfig="selectorConfig"
           :simpleTips="simpleTips"
           :subParams="subParams"
@@ -1111,7 +1111,7 @@
           @cancel="closeProcess($event, 'showSendMsg')"
           :simpleTips="simpleTips"
           :pendingId="pendingId"
-                  :showTooltip="showTooltip"
+          :showTooltip="showTooltip"
           :newsList="newsList"
         />
       </es-dialog>
@@ -1128,7 +1128,7 @@
         <TaskUnionExamine
           @cancel="closeProcess($event, 'showTaskUnionExamine')"
           :simpleTips="simpleTips"
-                  :showTooltip="showTooltip"
+          :showTooltip="showTooltip"
           :pendingId="pendingId"
           :defaultOpinion="nodeDefaultSubmitOpinion"
           :oldOption="value"
@@ -1306,13 +1306,13 @@ export default {
       isHideTemporarySave: false,
       oldNextOperate: '',
       showOpinion: true,
-      submitButtonFunKey:'',
-      taskNodeButtons:[],
+      submitButtonFunKey: '',
+      taskNodeButtons: [],
       taskOperationShiftedNodeList: null,
       currentNodeEnableItemHandleDescription: false,
       startFlowPageEmbeddedIntoStartFlowIndex: false,
       pendingItemHandleDescription: '',
-      currentOrgSelectorParams: { filid: '' },
+      currentOrgSelectorParams: { filid: '',only_filid:true },
       currentOrgSelectorTabs: ['employee', 'persongroup'],
       foreignOrgSelectorTabs: ['enterprise', 'filgroupobj'],
       foreignOrgSelectorParams: { filid: 'all', roleid: '' },
@@ -1593,11 +1593,17 @@ export default {
       return {
         customLimitTime: [
           {
-            required:this.enableCustomLimitTimeSetting,
-            message: this.showCustomLimitTimeText?'请输入限时办理天数' : '请选择限时办理天数',
+            required: this.enableCustomLimitTimeSetting,
+            message: this.showCustomLimitTimeText
+              ? '请输入限时办理天数'
+              : '请选择限时办理天数',
             trigger: 'blur'
           },
-          {required:this.enableCustomLimitTimeSetting, validator: this.checkCustomLimitTime, trigger: 'change' }
+          {
+            required: this.enableCustomLimitTimeSetting,
+            validator: this.checkCustomLimitTime,
+            trigger: 'change'
+          }
         ]
       };
     },
@@ -1642,7 +1648,7 @@ export default {
     }
   },
   methods: {
-       limitTimevalidate() {
+    limitTimevalidate() {
       let validSate = true;
       this.$refs.nextNode.validate((valid) => {
         if (valid) {
@@ -1653,12 +1659,12 @@ export default {
       });
       return validSate;
     },
-    checkCustomLimitTime(rule, value, callback){
+    checkCustomLimitTime(rule, value, callback) {
       if (!Number(value) || value.indexOf('.') != -1 || Number(value) < 0) {
-        callback(new Error('请输入正确的天数'))
+        callback(new Error('请输入正确的天数'));
         this.nextNode.customLimitTime = '';
-      }else{
-        callback()
+      } else {
+        callback();
       }
     },
     getAdminMsgType() {
@@ -2387,9 +2393,13 @@ export default {
       // 驳回：taskRejectHtml
       // 直接办结：endFlowHtml
       // 自由发起子流程：toFreeStartFlow
-      if(res.type == 4){
-        this.$emit('buttonClick',{fun:res.fun,opinion:this.value},this.sendData);
-      }else if (res.fun === 'toStartTaskRead()') {
+      if (res.type == 4) {
+        this.$emit(
+          'buttonClick',
+          { fun: res.fun, opinion: this.value },
+          this.sendData
+        );
+      } else if (res.fun === 'toStartTaskRead()') {
         // 分阅
         this.taskReadBtn();
       } else if (res.fun === 'reject()') {
@@ -2642,7 +2652,7 @@ export default {
         this.showTaskRead = true;
       }
     },
-     handleChangeTime(val){
+    handleChangeTime(val) {
       this.nextNode.customLimitTime = val;
     },
     /**
@@ -2670,8 +2680,13 @@ export default {
               data.nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
             this.enableCustomLimitTimeSetting =
               data.nodeExtAttr.enableCustomLimitTimeSetting == 1;
-            if(this.enableCustomLimitTimeSetting && data.nodeMoreInfo.defaultCustomLimitDays){
-              this.nextNode.customLimitTime =this.nextNode.customLimitTimeText = data.nodeMoreInfo.defaultCustomLimitDays + ''
+            if (
+              this.enableCustomLimitTimeSetting &&
+              data.nodeMoreInfo.defaultCustomLimitDays
+            ) {
+              this.nextNode.customLimitTime =
+                this.nextNode.customLimitTimeText =
+                  data.nodeMoreInfo.defaultCustomLimitDays + '';
             }
             data.otherOrgDisabledObjId &&
               (this.otherOrgDisabledObjId =
@@ -3063,7 +3078,8 @@ export default {
                   filid:
                     currentOrgparams[i] == 'my'
                       ? choiceOrgId
-                      : currentOrgparams[i]
+                      : currentOrgparams[i],
+                  only_filid:true
                 };
               });
             }
@@ -3077,11 +3093,22 @@ export default {
                   filid:
                     foreignOrgparams[i] == 'my'
                       ? choiceOrgId
-                      : foreignOrgparams[i] ==  'nofilidorg' || foreignOrgparams[i] ==  'nofiliddept' ? 'other' : foreignOrgparams[i],
-                  nofilid:foreignOrgparams[i] ==  'nofilidorg'? sessionStorage.getItem('orgId') :foreignOrgparams[i] ==  'nofiliddept'? sessionStorage.getItem('depId') : foreignOrgparams[i] == 'other' ? 1 : 0,
-                  roleid:this.circularReadParamsMap.circularReadOrgRoleCode || this.foreignOrgSelectorParams.roleid,
+                      : foreignOrgparams[i] == 'nofilidorg' ||
+                        foreignOrgparams[i] == 'nofiliddept'
+                      ? 'all'
+                      : foreignOrgparams[i],
+                  nofilid:
+                    foreignOrgparams[i] == 'nofilidorg'
+                      ? sessionStorage.getItem('orgId')
+                      : foreignOrgparams[i] == 'nofiliddept'
+                      ? sessionStorage.getItem('depId')
+                      : foreignOrgparams[i] == 'other'
+                      ? 1
+                      : 0,
+                  roleid:
+                    this.circularReadParamsMap.circularReadOrgRoleCode ||
+                    this.foreignOrgSelectorParams.roleid
                 };
-              
               });
             }
             this.circularReadParamsMap = circularReadParamsMap || {};
@@ -3093,9 +3120,10 @@ export default {
             this.nextOperateCheckType = nextOperateCheckType || 'select';
             this.currentNodeIsCircularReadNode =
               nodeInfoMap.nodeExtAttr.currentNodeIsCircularReadNode == 1;
-            
-            this.submitButtonFunKey = nodeInfoMap.nodeExtAttr.submitButtonFunKey;
-            this.taskNodeButtons = nodeInfoMap.nodeExtAttr.taskNodeButtons
+
+            this.submitButtonFunKey =
+              nodeInfoMap.nodeExtAttr.submitButtonFunKey;
+            this.taskNodeButtons = nodeInfoMap.nodeExtAttr.taskNodeButtons;
             this.readOnlyNotificationType = readOnlyNotificationType;
 
             this.readOnlyNotificationType = readOnlyNotificationType;
@@ -3403,7 +3431,8 @@ export default {
             ) {
               this.$message.error('流程不存在或未关联对应流程！');
             } else {
-              this.startFlowPageEmbeddedIntoStartFlowIndex = data.startFlowPageEmbeddedIntoStartFlowIndex;
+              this.startFlowPageEmbeddedIntoStartFlowIndex =
+                data.startFlowPageEmbeddedIntoStartFlowIndex;
 
               this.nodeInfo.option = data.definitionList;
               this.nodeInfo.nextNode = data.definitionList.filter(
@@ -3542,17 +3571,22 @@ export default {
           //   this.reqCircularRead(type);
           //   return;
           // }
-          if(this.submitButtonFunKey){
-            let btnInfo = this.taskNodeButtons.filter(x => x.key === this.submitButtonFunKey)
-            if(btnInfo.length>0){
-              if(btnInfo[0].type == 4){
-        this.$emit('buttonClick',{fun:btnInfo[0].fun,opinion:this.value},this.sendData);
-
-              }else if(btnInfo[0].type == 2){
-                this.goView(btnInfo[0])
+          if (this.submitButtonFunKey) {
+            let btnInfo = this.taskNodeButtons.filter(
+              (x) => x.key === this.submitButtonFunKey
+            );
+            if (btnInfo.length > 0) {
+              if (btnInfo[0].type == 4) {
+                this.$emit(
+                  'buttonClick',
+                  { fun: btnInfo[0].fun, opinion: this.value },
+                  this.sendData
+                );
+              } else if (btnInfo[0].type == 2) {
+                this.goView(btnInfo[0]);
               }
             }
-            return
+            return;
           }
           if (type == 'multiInsMidwayWithSubmitScene') {
             this.sendData(type);

package/src/index.js

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