eoss-ui 0.4.40 → 0.4.42

package/packages/flow/src/main.vue

@@ -36,6 +36,7 @@
         @change="(val) => (value = val)"
         :opinion="value"
         :isBanInputOpinion="isBanInputOpinion"
+        :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
       />
     </div>
     <div
@@ -220,6 +221,7 @@
                   :radioList="radioList"
                   :multiple="multiple"
                   :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
+                  :isCurrentNodeForbiddenChangeCandidate="isCurrentNodeForbiddenChangeCandidate"
                   :options="options"
                   :mix="multiple"
                   :presetEdit="presetEdit"
@@ -304,6 +306,7 @@
           @loadingEnd="customLoading('end')"
           @loadingStart="customLoading('start')"
           :nextNode="nextNode.nextNodeId"
+          :customPresetHintMessage="customPresetHintMessage"
           :id="businessIds"
           :processDefinitionId="nodeInfo.nextNode"
         />
@@ -318,6 +321,7 @@
           @loadingStart="customLoading('start')"
           :nodeId="nextNode.nextNodeId"
           :businessId="businessIds"
+          :customPresetHintMessage="customPresetHintMessage"
           :processDefinitionId="nodeInfo.nextNode"
           :presetTaskNodeMap="presetTaskNodeMap"
           :presetTaskNodeKeyStr="presetTaskNodeKeyStr"
@@ -375,7 +379,7 @@
       </div>
       <div
         class="es-user-defined"
-        v-if="nodeInfos.length > 0 || nodeInfo.option.length > 0"
+        v-if="nodeInfos.length > 0 || nodeInfo.option.length > 0 || operationList.length>0"
       >
         <el-button
           v-show="isSubmitButtonShowAgreeAndDisagree != 1"
@@ -619,6 +623,8 @@ export default {
       NodeName: '', // 当前节点值
       radioList: [],
       value: '',
+      nodeFixedOpinionSelectList: [],
+      customPresetHintMessage: '', //流程预设标题
       flowType: '',
       flowDisabled: false,
       activeNames: '',
@@ -677,6 +683,7 @@ export default {
       showTaskUnionExamine: false, //展示联合审核弹窗
       charUrl: util.win.location.origin,
       endFlow: false, // 是否结束流程
+      isCurrentNodeForbiddenChangeCandidate:0,//是否禁止选择办理人
       isSubmitButtonShowAgreeAndDisagree: 0, //是否展示同意和不同意按钮
       pointsReadingObj: {
         value: '分阅',
@@ -1584,6 +1591,7 @@ export default {
 
       if (val === 9) {
         this.isReject = true;
+        this.loading.close();
         return;
       } else {
         this.isReject = false;
@@ -1659,6 +1667,7 @@ export default {
               nodeInfoMap,
               canRemoveSignUserList,
               defaultNotificationMessage,
+              customPresetHintMessage,
               isCanAddSign,
               isCanRemoveSign,
               attachedCode,
@@ -1679,6 +1688,8 @@ export default {
             this.endFlowInfo.pOrgId = pOrgId;
             this.canPresetRead = canPresetRead;
             this.isCdjxjTaskHandle = isCdjxjTaskHandle;
+
+            this.customPresetHintMessage = customPresetHintMessage;
             if (canPresetRead) {
               let ids =
                 nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(',');
@@ -1723,6 +1734,15 @@ export default {
             }
             this.operationList = taskOperations;
             if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
+              if (nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList) {
+                let notice = JSON.parse(
+                  nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList
+                );
+                notice.map((x) => {
+                  this.nodeFixedOpinionSelectList.push({ content: x });
+                });
+              }
+              this.isCurrentNodeForbiddenChangeCandidate =  nodeInfoMap.nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
               this.nodeDefaultSubmitOpinion =
                 nodeInfoMap.nodeExtAttr.nodeDefaultSubmitOpinion;
               this.isSubmitButtonShowAgreeAndDisagree =

package/packages/flow/src/processForm.vue

@@ -12,7 +12,7 @@
       class="demo-dynamic"
       label-width="110px"
     >
-      <div style="height: 430px; overflow-y: auto; margin-bottom: 10px" >
+      <div style="height: 430px; overflow-y: auto; margin-bottom: 10px">
         <el-form-item
           prop="nodeName"
           label="当前节点"
@@ -213,6 +213,7 @@
               presetList = data;
             }
           "
+          :customPresetHintMessage="customPresetHintMessage"
           @changeActiveNames="(val) => (activeNames = val)"
           @loadingEnd="loading = false"
           @loadingStart="loading = true"
@@ -229,6 +230,7 @@
           "
           @loadingEnd="loading = false"
           @loadingStart="loading = true"
+          :customPresetHintMessage="customPresetHintMessage"
           :nodeId="nextNode.nextNode"
           :businessId="id"
           :processDefinitionId="processDefinitionId"
@@ -297,6 +299,7 @@ export default {
       selectUser: false,
       multiple: false,
       readMultiple: true,
+      customPresetHintMessage: '', //流程预设标题
       show: true,
       radioList: [],
       activeNames: '',
@@ -383,6 +386,7 @@ export default {
   mounted() {
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
+
   },
   methods: {
     getIsShowNextUser(val) {
@@ -539,7 +543,6 @@ export default {
           if (noticeType) {
             newNoticeType = noticeType.join(',');
           }
-
           let params = {
             processDefinitionId: this.processDefinitionId,
             nextUserId: this.multiple ? newNextUser.join(',') : nextUser,
@@ -563,7 +566,7 @@ export default {
               this.mixPresetList && this.mixPresetList.length > 0
                 ? this.mixPresetList.join('|')
                 : presetReadUserId.join(','),
-            opinion: newOpinion
+            opinion: this.newOpinion || newOpinion
           };
           if (this.activeNames != '1') delete params.customPresetUserJson;
           util
@@ -774,16 +777,20 @@ export default {
           const { status, message, data } = res;
           if (status == 'success') {
             data.nodeInfoMap.nodeExtAttr.submitTipsMsg &&
-              this.$confirm(data.nodeInfoMap.nodeExtAttr.submitTipsMsg, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-              })
-                .then(() => {
-                })
+              this.$confirm(
+                data.nodeInfoMap.nodeExtAttr.submitTipsMsg,
+                '提示',
+                {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }
+              )
+                .then(() => {})
                 .catch(() => {
                   this.quit();
                 });
+            this.customPresetHintMessage = data.customPresetHintMessage;
             this.nextNode.nodeInfo = data.nextNodeList;
             this.nextNode.nextNode = data.nextNodeList[0].nodeId;
             this.isPreset = data.isPreset;

package/packages/flow/src/selectUser.vue

@@ -4,12 +4,14 @@
       v-model="newNextUser"
       v-for="(item, index) of newRadioList"
       v-show="newRadioList.length > 0 && !newMultiple && newPresetEdit != 0"
+      :disabled="isCurrentNodeForbiddenChangeCandidate == 1"
       @change="cancelSelectUser(true)"
       :key="index"
       :label="item.id || item.showid"
       >{{ item.name ? item.name : item.showname }}</el-radio
     >
     <el-checkbox-group
+      :disabled="isCurrentNodeForbiddenChangeCandidate == 1"
       v-model="newNextUser"
       v-show="newRadioList.length > 0 && newMultiple && newPresetEdit != 0"
       @change="cancelSelectUser(true)"
@@ -65,9 +67,13 @@
         :tabs="tabs"
         :title="title"
         :mix="mix"
-        :disabled="!isCustomUser"
+        :disabled="!isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1"
         :filterable="Boolean(isCustomUser)"
-        :class="isCustomUser ? '' : 'no-icon'"
+        :class="
+          isCustomUser && isCurrentNodeForbiddenChangeCandidate == 0
+            ? ''
+            : 'no-icon'
+        "
         :multiple="newMultiple"
         @cancel="cancelSelectUser"
         @change="getSelectUser"
@@ -106,6 +112,7 @@ export default {
       default: false
     },
     isCustomUser: { type: Number, default: 1 },
+    isCurrentNodeForbiddenChangeCandidate: { type: Number, default: 0 },
     options: {
       type: Array,
       default: () => []

package/packages/flow-group/src/main.vue

@@ -59,7 +59,6 @@
                           item.type === 'flow-list' || item.type === 'flowList'
                       }"
                       :display="activeName === String(indexs)"
-                      :zoom="zoom"
                       v-on="item.events"
                     >
                       <template v-if="item.dialog" slot="dialog">
@@ -95,7 +94,6 @@
                           attrs: ['events', 'visible', 'type']
                         })
                       "
-                      :zoom="zoom"
                       :display="activeName === String(indexs)"
                       v-on="{ ...item.events }"
                     ></es-tree-group>
@@ -144,7 +142,6 @@
                     :display="activeName === String(indexs)"
                     :model="item.model"
                     :businessId.sync="businessId"
-                    :zoom="zoom"
                     v-on="{ ...item.events }"
                   ></es-form>
                   <es-data-table
@@ -161,7 +158,6 @@
                         attrs: ['events', 'visible', 'type']
                       })
                     "
-                    :zoom="zoom"
                     :key="index"
                     :class="{
                       'es-flow-group-data-table':
@@ -205,7 +201,6 @@
                         attrs: ['events', 'visible', 'type']
                       })
                     "
-                    :zoom="zoom"
                     :key="index"
                     :display="activeName === String(indexs)"
                     v-on="{ ...item.events }"
@@ -263,7 +258,6 @@
                   })
                 "
                 full
-                :zoom="zoom"
                 :autoId="true"
                 :businessId.sync="businessId"
                 :closeDialog="false"
@@ -293,7 +287,6 @@
                     items.contents.type === 'flow-list' ||
                     items.contents.type === 'flowList'
                 }"
-                :zoom="zoom"
                 :display="activeName === String(indexs)"
                 v-on="items.contents.events"
               >
@@ -331,7 +324,6 @@
                     attrs: ['events', 'visible', 'type']
                   })
                 "
-                :zoom="zoom"
                 :display="activeName === String(indexs)"
                 v-on="{ ...items.contents.events }"
               ></es-tree-group>