eoss-ui 0.8.34 → 0.8.35

package/packages/flow/src/processForm.vue

@@ -40,9 +40,64 @@
             class="opinions"
             :opinion="nextNode.newOpinion"
             :rows="copyHistory || formType == 'readTransfer' ? 2 : 5"
+            v-if="showOpinion"
+            :required="isOpinionRequired == 1"
             @change="(val) => (nextNode.newOpinion = val)"
           />
         </el-form-item>
+        <!-- 阅转办时新增选择流程功能 -->
+        <el-form-item
+          v-if="isCanReadTransferHandle && readTransferHandleFlowTypeCode"
+          prop="nextNode"
+          label="选择流程"
+          :rules="[
+            // { required: true, message: `请选择流程`, trigger: 'blur' }
+          ]"
+        >
+          <el-input
+            placeholder="请输入内容"
+            class="input-with-select select-process"
+            :class="{ 'hide-flow-char': isStartFlowChartView != 'true' }"
+          >
+            <el-select
+              slot="prepend"
+              v-model="currentNodeInfo.nextNode"
+              style="width: calc(100% + 40px)"
+              :placeholder="`请选择流程`"
+              :key="optionsKey"
+              @change="handleFlowChange"
+            >
+              <el-option
+                v-for="items in currentNodeInfo.option"
+                :key="items.id"
+                :label="items.name"
+                :disabled="items.disabled"
+                :value="items.processDefId"
+              ></el-option>
+            </el-select>
+            <div slot="append" v-show="isStartFlowChartView == 'true'">
+              <el-button
+                icon="es-icon-shu-jituan"
+                type="primary"
+                @click="
+                  () => {
+                    showFlowChart = true;
+                  }
+                "
+              ></el-button>
+              <el-button
+                v-show="activitiDefinitionSort"
+                icon="es-icon-paixu"
+                type="primary"
+                @click="
+                  () => {
+                    showSort = true;
+                  }
+                "
+              ></el-button>
+            </div>
+          </el-input>
+        </el-form-item>
         <el-form-item
           prop="nextOperate"
           label="下步操作"
@@ -429,6 +484,8 @@ import {
   loginUserInfo,
   register,
   freeStartFlow,
+  getProcessDefList,
+  getNodeInfoForStart,
   freeStartFlowWithSubmitTask,
   startReadTransferHandleFlowWithTaskReadEnd
 } from 'eoss-ui/src/config/api';
@@ -448,6 +505,14 @@ export default {
     Preset
   },
   props: {
+    isCanReadTransferHandle: {
+      type: Boolean,
+      default: false
+    },
+    readTransferHandleFlowTypeCode: {
+      type: String,
+      default: ''
+    },
     processDefinitionId: {
       type: String,
       default: ''
@@ -527,11 +592,15 @@ export default {
     return {
       loading: false,
       isCustomUser: 0,
+      currentNodeInfo: { nextNode: '', nextUser: '', option: [] },
+      isStartFlowChartView: false,
       isCurrentNodeForbiddenChangeCandidate: 0,
       allLoading: null,
       selectUser: false,
       multiple: false,
       readMultiple: true,
+      showOpinion: true,
+      isOpinionRequired: 0,
       currentOrgSelectorTabs: ['employee', 'persongroup'],
       customPresetHintMessage: '', //流程预设标题
       nextNodeCheckType: 'select',
@@ -550,6 +619,7 @@ export default {
       defaultNextNode: '',
       presetUserJson: [],
       businessId: '',
+      optionsKey: 0,
       isTaskread: 0, //是否显示分阅用户
       isHandleExplain: 0, //是否展示办理说明
       options: [],
@@ -587,6 +657,7 @@ export default {
           }
         }
       },
+      activitiDefinitionSort: false,
       userModel: {},
       nextUserTabs: {},
       selectPresetUserList: [],
@@ -651,7 +722,9 @@ export default {
       }
     },
     processDefinitionId(val) {
+      const savedNodeInfo = { ...this.currentNodeInfo };
       Object.assign(this.$data, this.$options.data());
+      this.currentNodeInfo = savedNodeInfo;
       this.getUserInfo();
       this.getNodeType();
       this.getStartFlow(val);
@@ -715,8 +788,70 @@ export default {
     } else if (this.formType != 'readTransfer') {
       this.newOpinion = this.opinion;
     }
+    if (this.isCanReadTransferHandle && this.readTransferHandleFlowTypeCode) {
+      this.getProcess(this.readTransferHandleFlowTypeCode);
+    }
   },
   methods: {
+    /**
+     * getProcess
+     * @desc:获取选择流程
+     * @author liufan
+     * @date 2022年5月25日
+     **/
+    getProcess(val) {
+      let params = {
+        businessId: this.businessId,
+        flowTypeCode: val || this.flowTypeCode,
+        // defaultProcessKey: this.defaultProcessKey,
+        isOnly: true,
+        hideTempSave: true
+      };
+      const loading = util.loading(this.$loading, '加载中...');
+      util
+        .ajax({ url: getProcessDefList, params })
+        .then((res) => {
+          const { status, message, data } = res;
+          loading.close();
+          if (status === 'success') {
+            this.isStartFlowChartView = data.isStartFlowChartView;
+            if (
+              !Object.keys(data).length ||
+              (data.definitionList && !data.definitionList.length)
+            ) {
+              this.$message.error('流程不存在或未关联对应流程！');
+            } else {
+              this.activitiDefinitionSort = data.activitiDefinitionSort;
+              this.currentNodeInfo.option = data.definitionList;
+              this.currentNodeInfo.nextNode = data.definitionList.filter(
+                (item) => item.processDefKey == this.defaultProcessKey
+              );
+              if (this.currentNodeInfo.nextNode.length) {
+                this.currentNodeInfo.nextNode =
+                  this.currentNodeInfo.nextNode[0].processDefId;
+              } else {
+                if (data.definitionList.length != 0) {
+                  this.currentNodeInfo.nextNode =
+                    data.definitionList[0].processDefId;
+                } else {
+                  this.currentNodeInfo.nextNode = '';
+                }
+              }
+              if (this.currentNodeInfo.nextNode) {
+                this.handleFlowChange(this.currentNodeInfo.nextNode, true);
+              }
+            }
+          } else {
+            this.$message.error(message || '系统错误，请联系管理员！');
+          }
+        })
+        .catch((err) => {
+          loading.close();
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
     handleChangeTime(val) {
       this.nextNode.customLimitTime = val;
     },
@@ -739,6 +874,28 @@ export default {
         callback();
       }
     },
+    handleFlowChange(val) {
+      this.getNodeInfoForStartFlow(val);
+      this.$parent.$emit('flowChange', val);
+    },
+    getNodeInfoForStartFlow(processDefinitionId) {
+      let params = {
+        url: getNodeInfoForStart,
+        params: { processDefinitionId }
+      };
+      util.ajax(params).then((res) => {
+        if (res.status == 'success') {
+          this.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired;
+          this.showOpinion = false;
+          setTimeout(() => {
+            this.showOpinion = true;
+          }, 0);
+          this.processDefinitionId = processDefinitionId;
+          // this.getStartFlow(processDefinitionId);
+          // this.getNodeInfos(undefined, undefined, processDefinitionId);
+        }
+      });
+    },
     handleChange() {
       this.isChangeMessage = true;
     },
@@ -1137,7 +1294,8 @@ export default {
               if (this.isHideOtherOrg) {
                 params.nextOtherOrgObj = nextOtherOrgObj;
               }
-              if (this.activeNames != '1' || !this.isCustomPreset) delete params.customPresetUserJson;
+              if (this.activeNames != '1' || !this.isCustomPreset)
+                delete params.customPresetUserJson;
               if (this.isFreeStartFlow || this.formType === 'readTransfer') {
                 let newParm = {};
                 newParm.copyHistory =
@@ -1275,7 +1433,8 @@ export default {
           if (this.isHideOtherOrg) {
             params.nextOtherOrgObj = nextOtherOrgObj;
           }
-          if (this.activeNames != '1' || !this.isCustomPreset) delete params.customPresetUserJson;
+          if (this.activeNames != '1' || !this.isCustomPreset)
+            delete params.customPresetUserJson;
           if (this.isFreeStartFlow || this.formType === 'readTransfer') {
             let newParm = {};
             newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory';
@@ -1352,9 +1511,9 @@ export default {
         }
       });
     },
-    getNodeInfos(nodeId, index) {
+    getNodeInfos(nodeId, index, processDefinitionId) {
       let params = {
-        processDefinitionId: this.processDefinitionId,
+        processDefinitionId: processDefinitionId || this.processDefinitionId,
         nextNodeId: nodeId ? nodeId : this.nextNode.nextNode,
         businessId: this.id,
         userId: util.getStorage('userId')
@@ -1379,8 +1538,14 @@ export default {
             this.allLoading.close();
           }
           if (status === 'success') {
-             if( this.currentOrgSelectorParams.department && !this.currentOrgSelectorParams.department.roleid && this.selectorParams.roleid && nodeExtAttr.deptRoleCode){
-              this.currentOrgSelectorParams.department.roleid = nodeExtAttr.deptRoleCode;
+            if (
+              this.currentOrgSelectorParams.department &&
+              !this.currentOrgSelectorParams.department.roleid &&
+              this.selectorParams.roleid &&
+              nodeExtAttr.deptRoleCode
+            ) {
+              this.currentOrgSelectorParams.department.roleid =
+                nodeExtAttr.deptRoleCode;
             }
             this.isCurrentNodeForbiddenChangeCandidate =
               nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
@@ -1390,7 +1555,7 @@ export default {
             this.enableCustomLimitTimeSetting =
               nodeExtAttr.enableCustomLimitTimeSetting == 1;
             if (nodeMoreInfo.currentOrgDefaultSelectObjectItems) {
-              this.nextCurrentOrgselectUserList = []
+              this.nextCurrentOrgselectUserList = [];
               if (
                 nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length >
                 0
@@ -1439,7 +1604,8 @@ export default {
                   }
                 );
               }
-              this.nextNode.nextCurrentOrgObj = nodeMoreInfo.currentOrgDefaultSelectObjects
+              this.nextNode.nextCurrentOrgObj =
+                nodeMoreInfo.currentOrgDefaultSelectObjects;
             }
             if (
               this.enableCustomLimitTimeSetting &&
@@ -1780,10 +1946,14 @@ export default {
                 this.nextNode.presetReadUserId.push(item);
               });
             }
-            this.getNodeInfos();
+            this.getNodeInfos(undefined, undefined, processId);
             // this.getPresetFlowInfo();
             this.isCustomPreset &&
-              this.$refs.customPreset.getPresetFlowInfo(this.nextNode.nextNode);
+              this.$refs.customPreset.getPresetFlowInfo(
+                this.nextNode.nextNode,
+                undefined,
+                true
+              );
             this.getFind();
             this.getMessage();
           } else {

package/packages/flow/src/processReject.vue

@@ -13,8 +13,8 @@
       label-width="100px"
       label-align="left"
     >
-      <div style="max-height: 290px; overflow-y: auto; margin-bottom: 10px">
-        <el-form-item prop="nodeName" label="当前节点">
+      <div :style="`max-height: 290px; overflow-y: ${hideBtn?'unset' : 'auto'}; margin-bottom: 10px`">
+        <el-form-item prop="nodeName" label="当前节点`">
           <el-input v-model="nodeName" disabled />
         </el-form-item>
         <el-form-item

package/packages/flow/src/startTaskRead.vue

@@ -5,7 +5,7 @@
     element-loading-text="加载中..."
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(255, 255,255, 0.8)"
-    :style="`height: ${typeCode == 'read'? '100%' : 'unset'};`"
+    :style="`height: ${typeCode == 'read' || hideBtn ? '100%' : 'unset'};`"
   >
     <el-form
       ref="nextNode"
@@ -15,8 +15,8 @@
     >
       <div
         :style="`max-height: ${
-          typeCode ? 'unset' : '290px'
-        }; overflow-y: auto; margin-bottom: 10px`"
+          typeCode || hideBtn ? '100%' : '290px'
+        }; overflow-y:${hideBtn?'unset' : 'auto'}; margin-bottom: 10px`"
       >
         <el-form-item
           prop="handleExplain"
@@ -248,14 +248,14 @@ export default {
       let tab = {};
       if (this.type != 'transfer') {
         tab = {
-          employee: {
-            param: {
-              filid: this.orgId,
-              name: '本单位用户'
-            }
-          },
-          department: { param: { filid: this.orgId } },
-          enterprise: {}
+          // employee: {
+          //   param: {
+          //     filid: '',//this.orgId
+          //     name: '本单位用户'
+          //   }
+          // },
+          department: { param: { filid: this.orgId } },//this.orgId
+          // enterprise: {}
         };
       } else {
         tab = {
@@ -283,6 +283,11 @@ export default {
     }
   },
   methods: {
+    // getSelectType(info){
+    //   if(info.selectPersonValue == 4){
+    //     this.selectorParams.filid = 'all'
+    //   }
+    // },
     getSelectorConfig() {
       this.selectorTabs = this.selectorConfig.type.split(',');
       this.selectorParams = this.selectorConfig.params;
@@ -403,7 +408,14 @@ export default {
       } else if (this.configInfo.selectPersonValue == 6) {
         this.multiple = true;
         this.params.filid = '';
+      }else if (this.configInfo.selectPersonValue == 7) {
+        this.multiple = false;
+        this.params.filid = orgId;
+      }else if (this.configInfo.selectPersonValue == 8) {
+         this.multiple = true;
+        this.params.filid = orgId;
       }
+      console.log(this.params,'params')
     },
     handleSelectCheck(val, data) {
       let { userIds, userNames } = data;
@@ -446,6 +458,7 @@ export default {
         url: toStartTaskRead,
         params: {
           pendingId: this.pendingId,
+          appId: this.resetAppId,
           taskAction: this.type,
           ...this.param
         }