eoss-ui 0.8.46 → 0.8.48

package/packages/flow/src/flow.vue

@@ -10,7 +10,7 @@
       style="height: 100%; display: flex; flex-direction: column"
     >
       <div class="es-flow-top">
-        <div :class="`es-flow-title ${shrink?'border_none' : ''}`">
+        <div :class="`es-flow-title ${shrink ? 'border_none' : ''}`">
           <span v-show="!shrink"
             >当前步骤：{{ isFlow ? nodeName || '拟稿' : NodeName }}</span
           >
@@ -70,7 +70,7 @@
             label="下步节点"
           >
             <el-select
-            class="es-flow-select"
+              class="es-flow-select"
               v-if="nextNodeCheckType == 'select'"
               v-model="circulateForm.nextNodeId"
               style="width: 100% !important"
@@ -180,7 +180,7 @@
       v-else
     >
       <div class="es-flow-top">
-        <div :class="`es-flow-title ${shrink?'border_none' : ''}`">
+        <div :class="`es-flow-title ${shrink ? 'border_none' : ''}`">
           <span v-show="!shrink"
             >当前节点：{{ isFlow ? nodeName || '拟稿' : NodeName }}</span
           >
@@ -335,7 +335,7 @@
             >
               <el-select
                 slot="prepend"
-            class="es-flow-select"
+                class="es-flow-select"
                 v-model="nodeInfo.nextNode"
                 style="width: calc(100% + 40px)"
                 :placeholder="`请选择流程`"
@@ -471,7 +471,7 @@
                   v-if="nextOperateCheckType == 'select'"
                   v-model="nextNode.nextOperate"
                   :placeholder="`请选择下步操作`"
-            class="es-flow-select"
+                  class="es-flow-select"
                   :disabled="operationList && operationList.length == 1"
                   @change="selecNext($event, true)"
                 >
@@ -509,12 +509,12 @@
                     v-model="nextNode.nextNodeId"
                     :placeholder="`请选择下步节点`"
                     :disabled="nodeInfos && nodeInfos.length == 1"
-            class="es-flow-select"
+                    class="es-flow-select"
                     @change="selecNext($event, false)"
                   >
                     <el-option
                       v-for="items in nodeInfos"
-            class="es-flow-select"
+                      class="es-flow-select"
                       :key="items.id"
                       :label="items.nodeName"
                       :value="items.nodeId"
@@ -619,7 +619,7 @@
                 >
                   <el-select
                     v-model="nextNode.mainSubId"
-            class="es-flow-select"
+                    class="es-flow-select"
                     :placeholder="`请选择主办`"
                   >
                     <el-option
@@ -919,63 +919,67 @@
         </el-form-item>
       </el-form>
       <div class="es-info" v-show="btnType != 'default'">
-      <ProcessReject
-        v-if="btnType === 'reject'"
-        ref="reject"
-        :pending-id="pendingId"
-        :option="value"
-        class="es-info"
-        hideBtn
-        :showTooltip="showTooltip"
-        :simpleTips="simpleTips"
-        :flowLabelConfig="flowLabelConfig"
+        <ProcessReject
+          v-if="btnType === 'reject'"
+          ref="reject"
+          :pending-id="pendingId"
+          :option="value"
+          class="es-info"
+          hideBtn
+          :showTooltip="showTooltip"
+          :simpleTips="simpleTips"
+          :flowLabelConfig="flowLabelConfig"
           :isCancelSecondConfirmationType="isCancelSecondConfirmationType"
-        :hideMessage="hideMessage"
-        :show-reject="showReject"
-        :news-info="nextNode.notificationMsg"
-        @cancel="closeProcess($event, 'showReject')"
-      />
-      <StartTaskRead
-        v-else-if="btnType === 'toStartTaskRead' || btnType==='toTaskReadAndEnd' || btnType==='toTransfer'"
-        :ref="btnType"
-        :pending-id="pendingId"
-        hideBtn
-        class="es-info"
-        :opinion="value"
-        :type="taskReadType"
-        :resetAppId="resetAppId"
-        :businessName="businessName"
-        :showTooltip="showTooltip"
-        :flowLabelConfig="flowLabelConfig"
-        :hideMessage="hideMessage"
-        :selectorConfig="selectorConfig"
-        :simpleTips="simpleTips"
-        :subParams="subParams"
-        :taskExamine="taskExamineInfo"
-        :news-info="nextNode.notificationMsg"
-        @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"
-        :isCancelSecondConfirmationType="isCancelSecondConfirmationType"
-        :selectorParams="selectorParams"
-        :type="flowType"
-        :multiple="flowMultiple"
-        :disabled="flowDisabled"
-      />
+          :hideMessage="hideMessage"
+          :show-reject="showReject"
+          :news-info="nextNode.notificationMsg"
+          @cancel="closeProcess($event, 'showReject')"
+        />
+        <StartTaskRead
+          v-else-if="
+            btnType === 'toStartTaskRead' ||
+            btnType === 'toTaskReadAndEnd' ||
+            btnType === 'toTransfer'
+          "
+          :ref="btnType"
+          :pending-id="pendingId"
+          hideBtn
+          class="es-info"
+          :opinion="value"
+          :type="taskReadType"
+          :resetAppId="resetAppId"
+          :businessName="businessName"
+          :showTooltip="showTooltip"
+          :flowLabelConfig="flowLabelConfig"
+          :hideMessage="hideMessage"
+          :selectorConfig="selectorConfig"
+          :simpleTips="simpleTips"
+          :subParams="subParams"
+          :taskExamine="taskExamineInfo"
+          :news-info="nextNode.notificationMsg"
+          @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"
+          :isCancelSecondConfirmationType="isCancelSecondConfirmationType"
+          :selectorParams="selectorParams"
+          :type="flowType"
+          :multiple="flowMultiple"
+          :disabled="flowDisabled"
+        />
       </div>
       <div
         class="es-flow-buttons"
@@ -1011,9 +1015,9 @@
         >
           <el-button
             v-show="isSubmitButtonShowAgreeAndDisagree != 1"
-            v-for="item of (hideBtn || isHideTemporarySave
-              ? btnList.filter(item => item.event !== 'save')
-              : btnList)"
+            v-for="item of hideBtn || isHideTemporarySave
+              ? btnList.filter((item) => item.event !== 'save')
+              : btnList"
             :key="item.name"
             :type="item.type"
             :style="btnStyle"
@@ -1196,9 +1200,12 @@
       >
         <!-- <FlowChart :nodeId="nodeInfo.nextNode" v-if="showFlowChart" /> -->
         <img
+          v-show="showFlowImg"
           style="width: 100%"
           :src="`${charUrl}/bpm/service/diagram/getpng.png?processDefinitionId=${nodeInfo.nextNode}`"
           alt="加载失败"
+          @error="handleErrorImg('error')"
+          @load="handleErrorImg('load')"
         />
       </es-dialog>
       <es-dialog
@@ -1277,6 +1284,7 @@
         <SortFlow
           :flowTypeCode="flowTypeCode"
           :defaultProcessKey="defaultProcessKey"
+          :ownerType="ownerType"
           @success="sortSuccess"
           @close="showSort = false"
         />
@@ -1433,7 +1441,7 @@ export default {
     hideBtn: { type: Boolean, default: false },
     isCirculate: { type: Boolean, default: false },
     newFlow: { type: Boolean, default: false },
-    ownerType:{type:String, default: ''},
+    ownerType: { type: String, default: '' },
     formLabelPosition: {
       type: String,
       default: 'left'
@@ -1524,6 +1532,7 @@ export default {
       isHideTemporarySave: false,
       oldNextOperate: '',
       showOpinion: true,
+      showFlowImg: true,
       submitButtonFunKey: '',
       activitiDefinitionSort: false,
       taskNodeButtons: [],
@@ -1624,7 +1633,7 @@ export default {
       nextNodeList: [],
       removeUsers: [],
       options: [],
-      configInfo:{},
+      configInfo: {},
       params: {
         filid: 'all', //选择范围(my:本单位/ "" or all:全部)
         selectmix: 'true1',
@@ -1896,6 +1905,9 @@ export default {
     }
   },
   methods: {
+    handleErrorImg(type) {
+      this.showFlowImg = type != 'error';
+    },
     sortSuccess(list) {
       this.nodeInfo.option = list;
       if (this.defaultProcessKey == '') {
@@ -2402,7 +2414,7 @@ export default {
     saveInfo(type, btn) {
       if (this.isFlow) {
         if (!type) {
-          console.log(btn)
+          console.log(btn);
           if (btn && btn.before) {
             btn
               .before(
@@ -2416,7 +2428,8 @@ export default {
             this.beforeSubmit(
               btn && Object.prototype.hasOwnProperty.call(btn, 'code')
                 ? btn.code
-                : 1,btn.event
+                : 1,
+              btn.event
             )
               .then((next) => {
                 this.$emit('save', this.businessIds);
@@ -2509,8 +2522,8 @@ export default {
      **/
     taskReadBtn(res) {
       // return this.$message.warning('暂未开放！敬请期待');
-      
-      this.btnType=''
+
+      this.btnType = '';
       setTimeout(() => {
         if (this.beforeSubmit != undefined) {
           this.beforeSubmit()
@@ -2518,9 +2531,9 @@ export default {
               if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
               this.taskReadType = 'create';
               // this.showTaskRead = true;
-              if(this.typeCode == 'fenyue'){
+              if (this.typeCode == 'fenyue') {
                 this.showTaskRead = true;
-              }else{
+              } else {
                 this.btnType = this.btnFunValue(res.fun);
               }
             })
@@ -2529,11 +2542,11 @@ export default {
           if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
           this.taskReadType = 'create';
           // this.showTaskRead = true;
-         if(this.typeCode == 'fenyue'){
-                this.showTaskRead = true;
-              }else{
-                this.btnType = this.btnFunValue(res.fun);
-              }
+          if (this.typeCode == 'fenyue') {
+            this.showTaskRead = true;
+          } else {
+            this.btnType = this.btnFunValue(res.fun);
+          }
         }
       }, 0);
     },
@@ -2703,8 +2716,7 @@ export default {
       // 驳回：taskRejectHtml
       // 直接办结：endFlowHtml
       // 自由发起子流程：toFreeStartFlow
-    
-     
+
       if (res.type == 4) {
         this.$emit(
           'buttonClick',
@@ -2880,8 +2892,10 @@ export default {
       }
     },
     isLoadRead() {
-      const funs = this.typeList.map(item => this.btnFunValue(item.fun));
-      return funs.includes('toStartTaskRead') && funs.includes('toTaskReadAndEnd');
+      const funs = this.typeList.map((item) => this.btnFunValue(item.fun));
+      return (
+        funs.includes('toStartTaskRead') && funs.includes('toTaskReadAndEnd')
+      );
     },
 
     /**
@@ -2891,8 +2905,7 @@ export default {
      * @date 2022年9月29日
      **/
     toTaskReadAndEnd(res) {
-      
-      this.btnType=''
+      this.btnType = '';
       setTimeout(() => {
         if (this.beforeSubmit != undefined) {
           this.beforeSubmit()
@@ -2900,14 +2913,14 @@ export default {
               if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
               this.taskReadType = 'taskReadAndEnd';
               this.btnType = this.btnFunValue(res.fun);
-  
+
               // this.showTaskRead = true;
             })
             .catch((e) => {});
         } else {
           if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
           this.taskReadType = 'taskReadAndEnd';
-              this.btnType = this.btnFunValue(res.fun);
+          this.btnType = this.btnFunValue(res.fun);
           // this.showTaskRead = true;
         }
       }, 0);
@@ -2979,21 +2992,21 @@ export default {
      * @date 2022年9月29日
      **/
     toTransfer(res) {
-      this.btnType = ''
+      this.btnType = '';
       setTimeout(() => {
         if (this.beforeSubmit != undefined) {
-        this.beforeSubmit(0)
-          .then((next) => {
-            this.taskReadType = 'transfer';
-            // this.showTaskRead = true;
-            this.btnType = this.btnFunValue(res.fun);
-          })
-          .catch((e) => {});
-      } else {
-        this.taskReadType = 'transfer';
-        this.btnType = this.btnFunValue(res.fun);
-        // this.showTaskRead = true;
-      }
+          this.beforeSubmit(0)
+            .then((next) => {
+              this.taskReadType = 'transfer';
+              // this.showTaskRead = true;
+              this.btnType = this.btnFunValue(res.fun);
+            })
+            .catch((e) => {});
+        } else {
+          this.taskReadType = 'transfer';
+          this.btnType = this.btnFunValue(res.fun);
+          // this.showTaskRead = true;
+        }
       }, 0);
     },
     handleChangeTime(val) {
@@ -3471,7 +3484,7 @@ export default {
             if (temporarySaveButtonName) {
               this.saveButtonName = temporarySaveButtonName;
             }
-            this.configInfo = res.data
+            this.configInfo = res.data;
             if (simpleTips != undefined) {
               this.simpleTips = simpleTips;
             }
@@ -3801,7 +3814,7 @@ export default {
      * @date 2022年5月25日
      **/
     closeProcess(val, type, closeParent) {
-     if (!this.startFlowPageEmbeddedIntoStartFlowIndex) {
+      if (!this.startFlowPageEmbeddedIntoStartFlowIndex) {
         this[type] = false;
       }
       if (
@@ -3820,13 +3833,12 @@ export default {
         this.flowSuccess(true);
         // this.$emit('success');
       } else {
-        if(type == 'showTaskRead'){
-          !this.simpleTips && this.$message.success('分阅成功')
-          this.$emit('success','taskRead');
-        }else{
+        if (type == 'showTaskRead') {
+          !this.simpleTips && this.$message.success('分阅成功');
+          this.$emit('success', 'taskRead');
+        } else {
           this.$emit('cancel');
         }
-        
       }
     },
     /**
@@ -3867,9 +3879,8 @@ export default {
         ...this.param
         // onlyFlag: true
       };
-      if(this.ownerType){
+      if (this.ownerType) {
         params.ownerType = this.ownerType;
-
       }
       this.loading = util.loading(this.$loading, '加载中...');
       util
@@ -4001,7 +4012,7 @@ export default {
     },
     // 提交流程前验证
     beforeSubProcess(val, type) {
-            return this.$refs['nextNode'].validate((valid) => {
+      return this.$refs['nextNode'].validate((valid) => {
         if (valid) {
           if (this.isSubmitButtonShowAgreeAndDisagree == 1) {
             this.value = this.value.replace(RegExp('不同意。', 'g'), '');
@@ -4021,7 +4032,7 @@ export default {
           //   this.reqCircularRead(type);
           //   return;
           // }
-         
+
           if (this.submitButtonFunKey) {
             let btnInfo = this.taskNodeButtons.filter(
               (x) => x.key === this.submitButtonFunKey
@@ -4071,17 +4082,15 @@ export default {
         this.$refs[this.btnType].subProcess('nextNode');
         return;
       }
-           if (this.beforeSubmit == undefined) {
-            this.beforeSubProcess(val, type)
-            
-          } else {
-            this.beforeSubmit(1)
-              .then((next) => {
-                 this.beforeSubProcess(val, type)
-              })
-              .catch((e) => {});
-          }
-
+      if (this.beforeSubmit == undefined) {
+        this.beforeSubProcess(val, type);
+      } else {
+        this.beforeSubmit(1)
+          .then((next) => {
+            this.beforeSubProcess(val, type);
+          })
+          .catch((e) => {});
+      }
     },
     validInfo() {
       if (
@@ -4246,12 +4255,19 @@ export default {
             delete this.nextNode.nextNodeId;
           }
 
-          if (this.isCustomPreset && this.activeNames == '1'){
+          if (this.isCustomPreset && this.activeNames == '1') {
             for (let i = 0; i < this.presetList.length; i++) {
-              if(this.presetList[i].name && this.presetList[i].name != '1' && this.presetList[i].name != 'endEvent' &&( !this.presetList[i].value || this.presetList[i].value.length == 0)){
-             
-                return this.$message.warning(`预设节点<节点${this.presetList[i].sequence}-${this.presetList[i].label}>必须选择办理人！`);
-              }else{
+              if (
+                this.presetList[i].name &&
+                this.presetList[i].name != '1' &&
+                this.presetList[i].name != 'endEvent' &&
+                (!this.presetList[i].value ||
+                  this.presetList[i].value.length == 0)
+              ) {
+                return this.$message.warning(
+                  `预设节点<节点${this.presetList[i].sequence}-${this.presetList[i].label}>必须选择办理人！`
+                );
+              } else {
                 delete this.presetList[i].label;
               }
             }
@@ -4297,7 +4313,9 @@ export default {
                 presetUserJson: JSON.stringify(this.presetUserJson),
                 removeSignUserId,
                 nextReadUserId: this.readMultiple
-                  ? this.mixReadList ? this.mixReadList.join('|') : ''
+                  ? this.mixReadList
+                    ? this.mixReadList.join('|')
+                    : ''
                   : this.nextNode.nextReadUserId.join(','),
                 nextOrgId: !this.isShowNextUser
                   ? this.multiple
@@ -4310,7 +4328,8 @@ export default {
                     : this.nextNode.presetReadUserId.join(','),
                 notificationType
               };
-              if (this.activeNames != '1'  || !this.isCustomPreset) delete params.customPresetUserJson;
+              if (this.activeNames != '1' || !this.isCustomPreset)
+                delete params.customPresetUserJson;
               delete params.customLimitTimeText;
               if (this.nextNode.isRemoveSign != '1') {
                 delete params.removeSignUserId;
@@ -4414,8 +4433,10 @@ export default {
             presetUserJson: JSON.stringify(this.presetUserJson),
             removeSignUserId,
             nextReadUserId: this.readMultiple
-              ? this.mixReadList ? this.mixReadList.join('|') : ''
-                  : this.nextNode.nextReadUserId.join(','),
+              ? this.mixReadList
+                ? this.mixReadList.join('|')
+                : ''
+              : this.nextNode.nextReadUserId.join(','),
             nextOrgId: !this.isShowNextUser
               ? this.multiple
                 ? this.mixOrgIdList && this.mixOrgIdList.join('|')
@@ -4427,7 +4448,8 @@ export default {
                 : this.nextNode.presetReadUserId.join(','),
             notificationType
           };
-          if (this.activeNames != '1'  || !this.isCustomPreset) delete params.customPresetUserJson;
+          if (this.activeNames != '1' || !this.isCustomPreset)
+            delete params.customPresetUserJson;
           delete params.customLimitTimeText;
           if (this.nextNode.isRemoveSign != '1') {
             delete params.removeSignUserId;

package/packages/flow/src/main.vue

@@ -214,7 +214,7 @@
       :flowParams="param"
       :subParams="subParams"
       v-else-if="
-        newTypeCode == 'reset' || (newTypeCode == 'continuation' && !newFlow)
+       ( newTypeCode == 'reset' || newTypeCode == 'continuation' )&& !newFlow
       "
     />
     <div
@@ -751,7 +751,7 @@
             </div>
           </div>
           <CustomPreset
-            v-if="isCustomPreset"
+            v-if="isCustomPreset && nextNode.nextOperate != 9"
             ref="customPreset"
             @changeCustom="
               (data) => {
@@ -962,7 +962,7 @@
             :style="btnStyle"
             @click="item.event === 'sub' ? subProcess() : saveInfo(false, item)"
           >
-            {{ item.event == 'save' ? saveButtonName : item.text }}222
+            {{ item.event == 'save' ? saveButtonName : item.text }}
           </el-button>
 
           <div
@@ -1223,6 +1223,7 @@
       >
         <SortFlow
           :flowTypeCode="flowTypeCode"
+          :ownerType="ownerType"
           :defaultProcessKey="defaultProcessKey"
           @success="sortSuccess"
           @close="showSort = false"

package/packages/flow/src/selectUser.vue

@@ -60,6 +60,8 @@
         @cancel="cancelSelectUser"
         :param="newParams"
       ></es-selector> -->
+      <!-- :showSwitch="showSwitch"
+        :treeTitle="treeTitle" -->
       <el-input v-if="disabled" :readonly="disabled" v-model="onlyName" />
       <es-selector
         v-else-if="!disabled && isChange"
@@ -70,12 +72,14 @@
         :title="title"
         :showFilterListDep="false"
         reset
+        
         destroyOnClose
         :classify="classify"
         :collapse-tags="selectorTags"
         :mix="mix"
         :min="isUnionSeal ? 1 : 0"
         :disabled="!isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1"
+        :readonly="!isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1"
         :filterable="Boolean(isCustomUser && !isUnionSeal)"
         :class="
           isCustomUser &&
@@ -112,6 +116,14 @@ export default {
       type: Boolean,
       default: false
     },
+    treeTitle: {
+      type: String,
+      default: '组织机构'
+    },
+    showSwitch: {
+      type: Boolean,
+      default: false
+    },
     tabs: {
       type: Object
     },
@@ -289,7 +301,7 @@ export default {
     this.classify =
       util.getStorage('classify') != undefined
         ? util.getStorage('classify')
-        : false;
+        : true;
   },
 
   methods: {

package/packages/flow/src/startTaskRead.vue

@@ -10,13 +10,14 @@
     <el-form
       ref="nextNode"
       :model="nextNode"
-      class="demo-dynamic"
+      class="demo-dynamic task-read-form"
       label-width="110px"
     >
       <div
         :style="`max-height: ${
           typeCode || hideBtn ? '100%' : '290px'
         }; overflow-y:${hideBtn?'unset' : 'auto'}; margin-bottom: 10px`"
+        class="task-read-form-content"
       >
         <el-form-item
           prop="handleExplain"