eoss-ui 0.8.35 → 0.8.36

package/package.json

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

package/packages/flow/src/flow.vue

@@ -221,7 +221,7 @@
         />
       </div>
       <div
-        v-show="!isStartFlow && !shrink && typeList.length>1"
+        v-show="!isStartFlow && !shrink && typeList.length > 1"
         class="es-flow-middle-more-btn"
         :style="{
           flex: getFlexStyle()
@@ -631,9 +631,7 @@
                 <el-form-item
                   prop="nextReadUserId"
                   v-if="isTaskread == 1"
-                  label="
-           分阅用户
-          "
+                  label="分阅用户"
                 >
                   <SelectUser
                     :nextUser="nextNode.nextReadUserId"
@@ -642,6 +640,7 @@
                     :options="userOptions"
                     :showTooltip="showTooltip"
                     title="分阅用户"
+                    :params="fyParams"
                     :mix="true"
                     :types="types"
                     @change="changeSelectReadUser($event, 'nextReadUserId')"
@@ -664,6 +663,7 @@
                     :radioList="presetReadUserId"
                     :presetEdit="1"
                     title="分阅用户"
+                    :params="fyParams"
                     :mix="true"
                     :types="types"
                     @change="changeSelectReadUser($event, 'presetReadUserId')"
@@ -916,7 +916,7 @@
         ref="reject"
         :pending-id="pendingId"
         :option="value"
-          class="es-info"
+        class="es-info"
         hideBtn
         :showTooltip="showTooltip"
         :simpleTips="simpleTips"
@@ -931,10 +931,10 @@
         ref="toStartTaskRead"
         :pending-id="pendingId"
         hideBtn
-          class="es-info"
+        class="es-info"
         :opinion="value"
         :type="taskReadType"
-      :resetAppId="resetAppId"
+        :resetAppId="resetAppId"
         :showTooltip="showTooltip"
         :flowLabelConfig="flowLabelConfig"
         :hideMessage="hideMessage"
@@ -946,24 +946,24 @@
         @cancel="closeProcess($event, 'showTaskRead')"
       />
       <TaskUnionExamine
-          v-else-if="
-            btnType === 'toTakeAdvice' ||
-            btnType === 'toUnionExamine' ||
-            btnType === 'toStartDraf'
-          "
-          :ref="btnType"
-          class="es-info"
-          hideBtn
-          @cancel="closeProcess($event, 'showTaskUnionExamine')"
-          :simpleTips="simpleTips"
-          :pendingId="pendingId"
-          :defaultOpinion="nodeDefaultSubmitOpinion"
-          :oldOption="value"
-          :selectorParams="selectorParams"
-          :type="flowType"
-          :multiple="flowMultiple"
-          :disabled="flowDisabled"
-        />
+        v-else-if="
+          btnType === 'toTakeAdvice' ||
+          btnType === 'toUnionExamine' ||
+          btnType === 'toStartDraf'
+        "
+        :ref="btnType"
+        class="es-info"
+        hideBtn
+        @cancel="closeProcess($event, 'showTaskUnionExamine')"
+        :simpleTips="simpleTips"
+        :pendingId="pendingId"
+        :defaultOpinion="nodeDefaultSubmitOpinion"
+        :oldOption="value"
+        :selectorParams="selectorParams"
+        :type="flowType"
+        :multiple="flowMultiple"
+        :disabled="flowDisabled"
+      />
       <div
         class="es-flow-buttons"
         v-if="newTypeCode != 'fenyue' && !shrink"
@@ -1047,7 +1047,7 @@
               style="margin: 0px 10px"
               v-if="hideBtn"
             > -->
-              <!-- <el-button
+            <!-- <el-button
                 v-show="isSubmitButtonShowAgreeAndDisagree != 1"
                 v-for="item of btnList.slice(0, 2)"
                 :key="item.name"
@@ -1059,7 +1059,7 @@
               >
                 {{ item.event == 'save' ? saveButtonName : item.text }}
               </el-button> -->
-              <!-- <el-dropdown
+            <!-- <el-dropdown
                 v-if="
                   !isFlow &&
                   (rejectObj.fun || pointsReadingObj.fun || moreList.length > 0)
@@ -1229,7 +1229,7 @@
           :flowLabelConfig="flowLabelConfig"
           :hideMessage="hideMessage"
           :selectorConfig="selectorConfig"
-      :resetAppId="resetAppId"
+          :resetAppId="resetAppId"
           :simpleTips="simpleTips"
           :subParams="subParams"
           :taskExamine="taskExamineInfo"
@@ -1430,7 +1430,7 @@ export default {
       type: Array,
       default: () => [
         { text: '暂存', event: 'save' },
-        { text: '提交', event: 'sub', type: 'primary' },
+        { text: '提交', event: 'sub', type: 'primary' }
       ]
     },
     subFun: {
@@ -1853,6 +1853,28 @@ export default {
       } else {
         return { width: '100%' };
       }
+    },
+    fyParams() {
+      let orgId = JSON.parse(util.getStorage('mainConfig')).userModel.orgId;
+      let params = {};
+      if (this.configInfo.selectPersonValue == 1) {
+        params.filid = orgId;
+      } else if (this.configInfo.selectPersonValue == 2) {
+        params.filid = orgId;
+      } else if (this.configInfo.selectPersonValue == 3) {
+        params.filid = 'all';
+      } else if (this.configInfo.selectPersonValue == 4) {
+        params.filid = 'all';
+      } else if (this.configInfo.selectPersonValue == 5) {
+        params.filid = '';
+      } else if (this.configInfo.selectPersonValue == 6) {
+        params.filid = '';
+      } else if (this.configInfo.selectPersonValue == 7) {
+        params.filid = orgId;
+      } else if (this.configInfo.selectPersonValue == 8) {
+        params.filid = orgId;
+      }
+      return params;
     }
   },
   methods: {
@@ -2468,7 +2490,7 @@ export default {
      **/
     taskReadBtn(res) {
       // return this.$message.warning('暂未开放！敬请期待');
-      
+
       if (this.beforeSubmit != undefined) {
         this.beforeSubmit()
           .then((next) => {
@@ -2768,9 +2790,9 @@ export default {
           this.loading.close();
           if (message == 'success') {
             // this.showTaskUnionExamine = true;
-            this.btnType = ''
+            this.btnType = '';
             setTimeout(() => {
-              this.btnType = this.btnFunValue(resInfo.fun)
+              this.btnType = this.btnFunValue(resInfo.fun);
             }, 0);
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
@@ -2790,24 +2812,24 @@ export default {
      * @date 2022年9月29日
      **/
     toStartDraf(res) {
-      console.log(res)
+      console.log(res);
       if (this.beforeSubmit != undefined) {
         this.beforeSubmit()
           .then((next) => {
             // this.showTaskUnionExamine = true;
-            this.btnType = ''
+            this.btnType = '';
             setTimeout(() => {
-              this.btnType = this.btnFunValue(res.fun)
+              this.btnType = this.btnFunValue(res.fun);
             }, 0);
             // this.btnType = this.btnFunValue(res.fun) //this.btnFunValue(res.fun);
           })
           .catch((e) => {});
       } else {
         // this.showTaskUnionExamine = true;
-            this.btnType = ''
-            setTimeout(() => {
-              this.btnType = this.btnFunValue(res.fun)
-            }, 0);
+        this.btnType = '';
+        setTimeout(() => {
+          this.btnType = this.btnFunValue(res.fun);
+        }, 0);
       }
     },
     /**
@@ -3138,7 +3160,10 @@ export default {
                 data.globalNodeType === 'endEvent' ? (this.endFlow = true) : '';
               }
             }
-            console.log(this.$refs.customPreset.getPresetFlowInfo,'his.$refs.customPreset')
+            console.log(
+              this.$refs.customPreset.getPresetFlowInfo,
+              'his.$refs.customPreset'
+            );
             this.isCustomPreset &&
               this.$refs.customPreset.getPresetFlowInfo(
                 this.nextNode.nextNodeId,
@@ -3938,7 +3963,7 @@ export default {
           warning('暂无可驳回节点及对象');
           return;
         }
-         console.log('taskReadBtn', this.btnType);
+        console.log('taskReadBtn', this.btnType);
         this.$refs[this.btnType].subProcess('nextNode');
         return;
       }

package/packages/flow/src/main.vue

@@ -5,44 +5,44 @@
     :style="styles"
     v-if="!shrinkAbled"
   >
-  <FlowNew 
-    v-bind="$attrs"
-    v-if="!shrinkAbled && newFlow" 
-    :hideMessage="hideMessage"
-    :showShrink="showShrink" 
-    :showTooltip="showTooltip"  
-    :isStartFlow="isStartFlow" 
-    :businessId="businessId" 
-    :pendingId="pendingId"
-    :nodeName="nodeName"
-    :typeCode="typeCode"
-    :selectorConfig="selectorConfig"
-    :flowTypeCode="flowTypeCode"
-    :defaultProcessKey="defaultProcessKey"
-    :isCirculate="isCirculate"
-    :newFlow="newFlow"
-    :formLabelPosition="formLabelPosition"
-    :flowListDisabled="flowListDisabled"
-    :subFun="subFun"
-    :urgencyLevel="urgencyLevel"
-    :beforeSubmit="beforeSubmit"
-    :title="title"
-    :formTitle="formTitle"
-    :closeParent="closeParent"
-    :param="param"
-    :subParams="subParams"
-    :selectorParams="selectorParams"
-    :fullFlow="fullFlow"
-    :showReadConfirm="showReadConfirm"
-    :width="width"
-    :resetAppId="resetAppId"
-    :userSelectRange="userSelectRange"
-    :rows="rows"
-    @success="handleNewFlowSuccess"
-    :showOther="showOther"
-    :flowLabelConfig="flowLabelConfig"
-    :isEndMessage="isEndMessage"
-  />
+    <FlowNew
+      v-bind="$attrs"
+      v-if="!shrinkAbled && newFlow"
+      :hideMessage="hideMessage"
+      :showShrink="showShrink"
+      :showTooltip="showTooltip"
+      :isStartFlow="isStartFlow"
+      :businessId="businessId"
+      :pendingId="pendingId"
+      :nodeName="nodeName"
+      :typeCode="typeCode"
+      :selectorConfig="selectorConfig"
+      :flowTypeCode="flowTypeCode"
+      :defaultProcessKey="defaultProcessKey"
+      :isCirculate="isCirculate"
+      :newFlow="newFlow"
+      :formLabelPosition="formLabelPosition"
+      :flowListDisabled="flowListDisabled"
+      :subFun="subFun"
+      :urgencyLevel="urgencyLevel"
+      :beforeSubmit="beforeSubmit"
+      :title="title"
+      :formTitle="formTitle"
+      :closeParent="closeParent"
+      :param="param"
+      :subParams="subParams"
+      :selectorParams="selectorParams"
+      :fullFlow="fullFlow"
+      :showReadConfirm="showReadConfirm"
+      :width="width"
+      :resetAppId="resetAppId"
+      :userSelectRange="userSelectRange"
+      :rows="rows"
+      @success="handleNewFlowSuccess"
+      :showOther="showOther"
+      :flowLabelConfig="flowLabelConfig"
+      :isEndMessage="isEndMessage"
+    />
     <div
       v-if="showCirculate && newTypeCode != 'fenyue' && !newFlow"
       style="height: 100%; display: flex; flex-direction: column"
@@ -636,9 +636,7 @@
                 <el-form-item
                   prop="nextReadUserId"
                   v-if="isTaskread == 1"
-                  label="
-           分阅用户
-          "
+                  label="分阅用户"
                 >
                   <SelectUser
                     :nextUser="nextNode.nextReadUserId"
@@ -1124,7 +1122,7 @@
           :taskParams="taskParams"
           :formType="processFormType"
           :isCanReadTransferHandle="isCanReadTransferHandle"
-          :readTransferHandleFlowTypeCode="readTransferHandleFlowTypeCode"          
+          :readTransferHandleFlowTypeCode="readTransferHandleFlowTypeCode"
           @cancel="closeProcess($event, 'handleVisible', closeParent)"
         />
       </es-dialog>
@@ -1736,6 +1734,7 @@ export default {
           }
           if (this.nodeInfo.nextNode) {
             this.handleChange(this.nodeInfo.nextNode, true);
+            // this.handleChange(val, true);
           }
         }
       },
@@ -1884,7 +1883,8 @@ export default {
         this.getTaskReadFlow();
       } else if (
         this.newTypeCode != 'reset' &&
-        this.newTypeCode != 'continuation' &&!this.newFlow
+        this.newTypeCode != 'continuation' &&
+        !this.newFlow
       ) {
         this.getHedInfo();
       }
@@ -1901,6 +1901,7 @@ export default {
       }
     },
     getNodeInfoForStartFlow(processDefinitionId) {
+      console.log('processDefinitionId',processDefinitionId);
       let params = {
         url: getNodeInfoForStart,
         params: { processDefinitionId }
@@ -1976,7 +1977,7 @@ export default {
         this.$refs.esContent.scrollTop += this.$refs.messagebox.clientHeight;
       });
     },
-    handleNewFlowSuccess(){
+    handleNewFlowSuccess() {
       this.$emit('success');
     },
     freeStartFlowSuccess() {
@@ -1985,6 +1986,7 @@ export default {
       // this.$emit('success');
     },
     handleChange(val, isForStartFlow) {
+      console.log('handleChange val', val);
       this.getNodeInfoForStartFlow(val, isForStartFlow);
       this.$parent.$emit('flowChange', val);
     },
@@ -3209,7 +3211,7 @@ export default {
       }
       if (this.endFlow && isDef) {
         this.loading.close();
-      } else if(!this.newFlow){
+      } else if (!this.newFlow) {
         this.getNodeInfo();
       }
     },
@@ -3779,7 +3781,7 @@ export default {
             this.showNews = false;
             this.nextNode.notificationType = [];
             this.pendingId = results[results.length - 1].attachId;
-            if(!this.newFlow){
+            if (!this.newFlow) {
               this.getHedInfo();
             }
           } else {

package/packages/flow/src/processForm.vue

@@ -276,6 +276,7 @@
             :mix="true"
             :types="types"
             @change="changeSelectReadUser($event, 'nextReadUserId')"
+            :params="fyParams"
             :tabs="tabs"
           />
         </el-form-item>
@@ -293,6 +294,7 @@
             :showTooltip="showTooltip"
             :options="presetOptions"
             title="分阅用户"
+            :params="fyParams"
             :radioList="presetReadUserId"
             :presetEdit="1"
             :mix="true"
@@ -773,6 +775,28 @@ export default {
       } else {
         return ['employee', 'enterprise', 'department', 'persongroup'];
       }
+    },
+    fyParams() {
+      let orgId = JSON.parse(util.getStorage('mainConfig')).userModel.orgId;
+      let params = {};
+      if (this.configInfo.selectPersonValue == 1) {
+        params.filid = orgId;
+      } else if (this.configInfo.selectPersonValue == 2) {
+        params.filid = orgId;
+      } else if (this.configInfo.selectPersonValue == 3) {
+        params.filid = 'all';
+      } else if (this.configInfo.selectPersonValue == 4) {
+        params.filid = 'all';
+      } else if (this.configInfo.selectPersonValue == 5) {
+        params.filid = '';
+      } else if (this.configInfo.selectPersonValue == 6) {
+        params.filid = '';
+      } else if (this.configInfo.selectPersonValue == 7) {
+        params.filid = orgId;
+      } else if (this.configInfo.selectPersonValue == 8) {
+        params.filid = orgId;
+      }
+      return params;
     }
   },
   created() {
@@ -1850,6 +1874,7 @@ export default {
                 });
               }
             }
+            this.configInfo = res.data;
             this.customPresetHintMessage = data.customPresetHintMessage;
             this.readOnlyNotificationType = data.readOnlyNotificationType;
             this.notificationMessageReadOnly =

package/src/index.js

@@ -127,7 +127,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.8.35',
+  version: '0.8.36',
   install,
   Archives,
   Button,