eoss-ui 0.8.34 → 0.8.35

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

@@ -60,7 +60,7 @@
           >
          
         </div>
-        <el-dropdown trigger="click" @command="handleClickTag">
+        <el-dropdown trigger="click"  @command="handleClickTag">
   <span class="el-dropdown-link">
     <i class="el-icon-arrow-down el-icon--right"></i>
   </span>
@@ -72,7 +72,7 @@
             type="text"
             class="es-flow__opinions--edit"
             icon="es-icon-xiugai"
-            @click="dialogVisible = true"
+            @click="handleOpenDialog"
           >
           </el-button>
       </div>
@@ -210,7 +210,7 @@ export default {
     },
     rows: {
       type: [Number, String],
-      default: 10
+      default: 5
     },
     required: { type: Boolean, default: false }
   },
@@ -246,8 +246,14 @@ export default {
     }
   },
   methods: {
+      handleOpenDialog(){
+        if(this.isBanInputOpinion == '1' || this.disabled) return
+        this.dialogVisible = true
+      },
         handleClickTag(item) {
+          if(this.isBanInputOpinion == '1') return
       this.form.value = typeof item === 'object' ? item.content : item;
+      this.$emit('change', this.form.value);
     },
     handleBlur() {
       this.$emit('blur', this.form.value);

package/packages/flow/src/flow.vue

@@ -221,7 +221,7 @@
         />
       </div>
       <div
-        v-show="!isStartFlow && !shrink && isSpecial"
+        v-show="!isStartFlow && !shrink && typeList.length>1"
         class="es-flow-middle-more-btn"
         :style="{
           flex: getFlexStyle()
@@ -916,6 +916,7 @@
         ref="reject"
         :pending-id="pendingId"
         :option="value"
+          class="es-info"
         hideBtn
         :showTooltip="showTooltip"
         :simpleTips="simpleTips"
@@ -930,8 +931,10 @@
         ref="toStartTaskRead"
         :pending-id="pendingId"
         hideBtn
+          class="es-info"
         :opinion="value"
         :type="taskReadType"
+      :resetAppId="resetAppId"
         :showTooltip="showTooltip"
         :flowLabelConfig="flowLabelConfig"
         :hideMessage="hideMessage"
@@ -1111,7 +1114,7 @@
           size="medium"
           style="margin: 10px 0px; margin-left: 10px"
           @click="taskReadBtn"
-          >分阅222</el-button
+          >分阅</el-button
         >
       </div>
       <!-- 弹窗内容 -->
@@ -1226,6 +1229,7 @@
           :flowLabelConfig="flowLabelConfig"
           :hideMessage="hideMessage"
           :selectorConfig="selectorConfig"
+      :resetAppId="resetAppId"
           :simpleTips="simpleTips"
           :subParams="subParams"
           :taskExamine="taskExamineInfo"
@@ -1474,7 +1478,7 @@ export default {
     },
     rows: {
       type: [String, Number],
-      default: 10
+      default: 5
     },
     showOther: {
       type: Boolean,
@@ -3134,6 +3138,7 @@ export default {
                 data.globalNodeType === 'endEvent' ? (this.endFlow = true) : '';
               }
             }
+            console.log(this.$refs.customPreset.getPresetFlowInfo,'his.$refs.customPreset')
             this.isCustomPreset &&
               this.$refs.customPreset.getPresetFlowInfo(
                 this.nextNode.nextNodeId,

package/packages/flow/src/main.vue

@@ -38,6 +38,7 @@
     :resetAppId="resetAppId"
     :userSelectRange="userSelectRange"
     :rows="rows"
+    @success="handleNewFlowSuccess"
     :showOther="showOther"
     :flowLabelConfig="flowLabelConfig"
     :isEndMessage="isEndMessage"
@@ -88,9 +89,14 @@
         :isBanInputOpinion="isBanInputOpinion"
         :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
       />
-      <div :class="`es-info ${formLabelPosition == 'left' ? 'form-left' : 'form-right'}`" :style="{'flex':fullFlow?'1' : 'unset'}">
+      <div
+        :class="`es-info ${
+          formLabelPosition == 'left' ? 'form-left' : 'form-right'
+        }`"
+        :style="{ flex: fullFlow ? '1' : 'unset' }"
+      >
         <el-form
-        v-if="showCirculate"
+          v-if="showCirculate"
           ref="form"
           :model="circulateForm"
           label-width="120px"
@@ -119,7 +125,7 @@
           </el-form-item>
         </el-form>
         <circulate
-        v-if="showCirculate"
+          v-if="showCirculate"
           style="margin-top: 10px"
           :businessId="businessIds"
           :label-position="formLabelPosition"
@@ -163,7 +169,7 @@
       :resetAppId="resetAppId"
       :taskExamine="taskExamineInfo"
       :flowLabelConfig="flowLabelConfig"
-          :hideMessage="hideMessage"
+      :hideMessage="hideMessage"
       :subParams="subParams"
       :news-info="nextNode.notificationMsg"
       @cancel="closeProcess($event)"
@@ -177,7 +183,7 @@
       :showTooltip="showTooltip"
       :selectorParams="selectorParams"
       :flowLabelConfig="flowLabelConfig"
-          :hideMessage="hideMessage"
+      :hideMessage="hideMessage"
       :formLabelPosition="formLabelPosition"
       :simpleTips="simpleTips"
     />
@@ -186,7 +192,7 @@
       :appId="resetAppId"
       :showTooltip="showTooltip"
       :flowLabelConfig="flowLabelConfig"
-          :hideMessage="hideMessage"
+      :hideMessage="hideMessage"
       :simpleTips="simpleTips"
       @cancel="closeProcess($event)"
       v-else-if="typeCode == 'supervise' && !newFlow"
@@ -198,13 +204,19 @@
       :simpleTips="simpleTips"
       :appId="resetAppId"
       :flowLabelConfig="flowLabelConfig"
-          :hideMessage="hideMessage"
+      :hideMessage="hideMessage"
       @cancel="closeProcess($event)"
       :flowParams="param"
       :subParams="subParams"
-      v-else-if="newTypeCode == 'reset' || newTypeCode == 'continuation' && !newFlow"
+      v-else-if="
+        newTypeCode == 'reset' || (newTypeCode == 'continuation' && !newFlow)
+      "
     />
-    <div class="es-flow-content" :style="{'justify-content':fullFlow?'space-between' : 'unset'}" v-else-if="!newFlow">
+    <div
+      class="es-flow-content"
+      :style="{ 'justify-content': fullFlow ? 'space-between' : 'unset' }"
+      v-else-if="!newFlow"
+    >
       <div class="es-flow-top">
         <div class="es-flow-title">
           <span v-show="!shrink"
@@ -296,8 +308,10 @@
           !shrink
         "
         ref="esContent"
-        :class="`es-info ${formLabelPosition == 'left' ? 'form-left' : 'form-right'}`"
-        :style="{'flex':fullFlow?'1' : 'unset'}"
+        :class="`es-info ${
+          formLabelPosition == 'left' ? 'form-left' : 'form-right'
+        }`"
+        :style="{ flex: fullFlow ? '1' : 'unset' }"
       >
         <el-form
           ref="nextNode"
@@ -528,7 +542,11 @@
                 <el-form-item
                   v-if="isNextUser"
                   :prop="isShowNextUser ? 'nextUserId' : 'nextOrgId'"
-                  :label="isShowNextUser ? `${flowLabelConfig.nextUser||'下步办理人'}` : '办理对象'"
+                  :label="
+                    isShowNextUser
+                      ? `${flowLabelConfig.nextUser || '下步办理人'}`
+                      : '办理对象'
+                  "
                 >
                   <SelectUser
                     :nextUser="
@@ -740,7 +758,7 @@
             @changeActiveNames="(val) => (activeNames = val)"
             @loadingEnd="customLoading('end')"
             :flowLabelConfig="flowLabelConfig"
-          :hideMessage="hideMessage"
+            :hideMessage="hideMessage"
             :showTooltip="showTooltip"
             @loadingStart="customLoading('start')"
             :nextNode="nextNode.nextNodeId"
@@ -761,7 +779,7 @@
             :showTooltip="showTooltip"
             :businessId="businessIds"
             :flowLabelConfig="flowLabelConfig"
-          :hideMessage="hideMessage"
+            :hideMessage="hideMessage"
             :customPresetHintMessage="customPresetHintMessage"
             :processDefinitionId="nodeInfo.nextNode"
             :presetTaskNodeMap="presetTaskNodeMap"
@@ -1105,6 +1123,8 @@
           :taskExamineParam="freeStartFlowParams.newFlowStartNodeItemName"
           :taskParams="taskParams"
           :formType="processFormType"
+          :isCanReadTransferHandle="isCanReadTransferHandle"
+          :readTransferHandleFlowTypeCode="readTransferHandleFlowTypeCode"          
           @cancel="closeProcess($event, 'handleVisible', closeParent)"
         />
       </es-dialog>
@@ -1355,7 +1375,7 @@ export default {
       type: String,
       default: 'left'
     },
-   
+
     flowListDisabled: {
       type: Boolean,
       default: false
@@ -1395,7 +1415,7 @@ export default {
         return {};
       }
     },
-    fullFlow:{
+    fullFlow: {
       type: Boolean,
       default: true
     },
@@ -1412,15 +1432,17 @@ export default {
     },
     rows: {
       type: [String, Number],
-      default: 10
+      default: 5
     },
     showOther: {
       type: Boolean,
       default: true
     },
-     flowLabelConfig: { 
-      type:Object,
-      default: () => {return {}}
+    flowLabelConfig: {
+      type: Object,
+      default: () => {
+        return {};
+      }
     },
     isEndMessage: { type: Boolean, default: false }
   },
@@ -1452,6 +1474,7 @@ export default {
       freeStartFlowNextNode: undefined,
       otherOrgDisabledObjId: [],
       isCanReadTransferHandle: false,
+      readTransferHandleFlowTypeCode: '',
       readTransferHandleDisabled: true,
       showCustomLimitTimeText: false,
       showSort: false,
@@ -1861,7 +1884,7 @@ export default {
         this.getTaskReadFlow();
       } else if (
         this.newTypeCode != 'reset' &&
-        this.newTypeCode != 'continuation'
+        this.newTypeCode != 'continuation' &&!this.newFlow
       ) {
         this.getHedInfo();
       }
@@ -1953,6 +1976,9 @@ export default {
         this.$refs.esContent.scrollTop += this.$refs.messagebox.clientHeight;
       });
     },
+    handleNewFlowSuccess(){
+      this.$emit('success');
+    },
     freeStartFlowSuccess() {
       this.showFreeStartFlow = false;
       this.flowSuccess(true);
@@ -2093,65 +2119,64 @@ export default {
         this.loading.close();
       }
     },
-    subRead(){
-       this.loading = util.loading(this.$loading, '加载中...');
-          const { businessId, appId, processDefinitionId, pendingId } =
-            this.taskExamineInfo;
-          let params = {
-            businessId,
-            appId,
-            processDefinitionId,
-            pendingId,
-            opinion: this.value,
-            taskAction: 'complete'
-          };
-          util
-            .ajax({
-              url: taskReadHtml,
-              params: { taskAction: 'complete' },
-              headers: {
-                Accept: 'application/json,text/plain'
-              },
-              method: 'post',
-              data: params
-            })
-            .then((res) => {
-              const { status, message } = res;
-              this.loading.close();
-              if (status === 'success') {
-                this.flowSuccess();
-                // this.$message.success('提交成功');
-                // this.$emit('success');
-              } else {
-                this.$message.error(message || '系统错误，请联系管理员！');
-                this.$emit('error');
-              }
-            })
-            .catch((err) => {
-              this.loading.close();
-              if (err.message && err.message !== 'canceled') {
-                this.$message.error(err.message);
-              }
-            });
+    subRead() {
+      this.loading = util.loading(this.$loading, '加载中...');
+      const { businessId, appId, processDefinitionId, pendingId } =
+        this.taskExamineInfo;
+      let params = {
+        businessId,
+        appId,
+        processDefinitionId,
+        pendingId,
+        opinion: this.value,
+        taskAction: 'complete'
+      };
+      util
+        .ajax({
+          url: taskReadHtml,
+          params: { taskAction: 'complete' },
+          headers: {
+            Accept: 'application/json,text/plain'
+          },
+          method: 'post',
+          data: params
+        })
+        .then((res) => {
+          const { status, message } = res;
+          this.loading.close();
+          if (status === 'success') {
+            this.flowSuccess();
+            // this.$message.success('提交成功');
+            // this.$emit('success');
+          } else {
+            this.$message.error(message || '系统错误，请联系管理员！');
+            this.$emit('error');
+          }
+        })
+        .catch((err) => {
+          this.loading.close();
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
     },
     taskRead() {
       if (this.taskReadOpinionRequired == 'true' && !this.value) {
         if (!this.$refs.commonOpinions.validate()) return;
       }
-      if(this.showReadConfirm){
-this.$confirm('确认提交?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-         this.subRead()
+      if (this.showReadConfirm) {
+        this.$confirm('确认提交?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
-        .catch(() => {});
-      }else{
- this.subRead()
+          .then(() => {
+            this.subRead();
+          })
+          .catch(() => {});
+      } else {
+        this.subRead();
       }
-      
     },
     validReadTransferHandle(
       readTransferHandleBusinessId,
@@ -2188,6 +2213,7 @@ this.$confirm('确认提交?', '提示', {
               taskExamine,
               taskReadOpinionRequired,
               isCanReadTransferHandle,
+              readTransferHandleFlowTypeCode,
               defaultNotificationMessage
             }
           } = res;
@@ -2197,6 +2223,8 @@ this.$confirm('确认提交?', '提示', {
             this.taskReadOpinionRequired = taskReadOpinionRequired;
             this.nextNode.notificationMsg = defaultNotificationMessage;
             this.isCanReadTransferHandle = isCanReadTransferHandle;
+            this.readTransferHandleFlowTypeCode =
+              readTransferHandleFlowTypeCode;
             this.isCanFenyue = isCanFenyue;
             if (this.nodeName) {
               this.NodeName = this.nodeName;
@@ -2419,7 +2447,7 @@ this.$confirm('确认提交?', '提示', {
         .then((res) => {
           const { status, message } = res;
           if (status === 'success') {
-            if(this.hideMessage) return
+            if (this.hideMessage) return;
             this.nextNode.notificationType = message.split(',');
             let arr = [];
             this.newsList.map((item) => {
@@ -2853,27 +2881,65 @@ this.$confirm('确认提交?', '提示', {
                 this.nextNode.customLimitTimeText =
                   data.nodeMoreInfo.defaultCustomLimitDays + '';
             }
-            if( this.currentOrgSelectorParams.department && !this.currentOrgSelectorParams.department.roleid && this.selectorParams.roleid && data.nodeExtAttr.deptRoleCode){
-              this.currentOrgSelectorParams.department.roleid = data.nodeExtAttr.deptRoleCode;
-            }
-            if(data.nodeMoreInfo.currentOrgDefaultSelectObjectItems){
-              if(data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length > 0){
-                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map((x,i) => {
-                  this.nextCurrentOrgselectUserList.push({showname:data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptNames[i],showid:x,stype:'department'})
-                })
-            }
-             if(data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.length > 0){
-                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.map((x,i) => {
-                  this.nextCurrentOrgselectUserList.push({showname:data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userNames[i],showid:x,stype:'employee'})
-                })
+            if (
+              this.currentOrgSelectorParams.department &&
+              !this.currentOrgSelectorParams.department.roleid &&
+              this.selectorParams.roleid &&
+              data.nodeExtAttr.deptRoleCode
+            ) {
+              this.currentOrgSelectorParams.department.roleid =
+                data.nodeExtAttr.deptRoleCode;
             }
-            if(data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.length > 0){
-                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.map((x,i) => {
-                  this.nextCurrentOrgselectUserList.push({showname:data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgNames[i],showid:x,stype:'enterprise'})
-                })
+            if (data.nodeMoreInfo.currentOrgDefaultSelectObjectItems) {
+              if (
+                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds
+                  .length > 0
+              ) {
+                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map(
+                  (x, i) => {
+                    this.nextCurrentOrgselectUserList.push({
+                      showname:
+                        data.nodeMoreInfo.currentOrgDefaultSelectObjectItems
+                          .deptNames[i],
+                      showid: x,
+                      stype: 'department'
+                    });
+                  }
+                );
+              }
+              if (
+                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds
+                  .length > 0
+              ) {
+                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.map(
+                  (x, i) => {
+                    this.nextCurrentOrgselectUserList.push({
+                      showname:
+                        data.nodeMoreInfo.currentOrgDefaultSelectObjectItems
+                          .userNames[i],
+                      showid: x,
+                      stype: 'employee'
+                    });
+                  }
+                );
+              }
+              if (
+                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds
+                  .length > 0
+              ) {
+                data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.map(
+                  (x, i) => {
+                    this.nextCurrentOrgselectUserList.push({
+                      showname:
+                        data.nodeMoreInfo.currentOrgDefaultSelectObjectItems
+                          .orgNames[i],
+                      showid: x,
+                      stype: 'enterprise'
+                    });
+                  }
+                );
+              }
             }
-            
-          }
             if (
               data.nodeMoreInfo
                 .chooseCurrentOrgUserCandidateNeedForbiddenSubDept === true
@@ -2979,7 +3045,7 @@ this.$confirm('确认提交?', '提示', {
               }
               this.isLimitedTimeHandling =
                 data.nodeExtAttr.isLimitedTimeHandling;
-                this.isCustomUser = data.nodeExtAttr.isCustomUser;
+              this.isCustomUser = data.nodeExtAttr.isCustomUser;
               this.presetEdit = data.nodeExtAttr.presetEdit;
               this.countersignaturetypeCode = data.countersignaturetypeCode; //是否展示处理方式
               this.handleMode = data.countersignaturetypeText;
@@ -3143,7 +3209,7 @@ this.$confirm('确认提交?', '提示', {
       }
       if (this.endFlow && isDef) {
         this.loading.close();
-      } else {
+      } else if(!this.newFlow){
         this.getNodeInfo();
       }
     },
@@ -3280,7 +3346,7 @@ this.$confirm('确认提交?', '提示', {
                       ? choiceOrgId
                       : currentOrgparams[i],
                   only_filid: true,
-                  roleid:this.selectorParams.roleid
+                  roleid: this.selectorParams.roleid
                 };
               });
             }
@@ -3365,14 +3431,17 @@ this.$confirm('确认提交?', '提示', {
             if (!this.isFlow) this.getFile(this.pendingId, attachedCode);
             if (nextNodeList && nextNodeList.length != 0) {
               this.nextNodeList = nextNodeList;
-              if (nextNodeList[0].nodeType === 'endEvent' && nextNodeList.length==1) {
+              if (
+                nextNodeList[0].nodeType === 'endEvent' &&
+                nextNodeList.length == 1
+              ) {
                 this.isNextUser = nextNodeList[0].nodeType != 'endEvent';
                 nextNodeList[0].nodeType === 'endEvent'
                   ? (this.endFlow = true)
                   : '';
               }
-            }else if(nextNodeList){
-              this.endFlow = true
+            } else if (nextNodeList) {
+              this.endFlow = true;
             }
 
             if (canRemoveSignUserList && canRemoveSignUserList.length != 0)
@@ -3710,7 +3779,9 @@ this.$confirm('确认提交?', '提示', {
             this.showNews = false;
             this.nextNode.notificationType = [];
             this.pendingId = results[results.length - 1].attachId;
-            this.getHedInfo();
+            if(!this.newFlow){
+              this.getHedInfo();
+            }
           } else {
             this.$message.error(msg || '系统错误，请联系管理员！');
           }
@@ -3843,7 +3914,9 @@ this.$confirm('确认提交?', '提示', {
             this.nextNode.nextUserId == '' ||
             (this.multiple && this.nextNode.nextUserId.length == 0)
           ) {
-            this.$message.warning(`请选择${this.flowLabelConfig.nextUser || '下步办理人'}`);
+            this.$message.warning(
+              `请选择${this.flowLabelConfig.nextUser || '下步办理人'}`
+            );
             return false;
           }
         } else {
@@ -3910,9 +3983,9 @@ this.$confirm('确认提交?', '提示', {
     },
 
     sendData(freetype) {
-      if(this.isFlow && !this.nodeInfo.nextNode){
+      if (this.isFlow && !this.nodeInfo.nextNode) {
         this.$message.warning('请选择流程');
-        return
+        return;
       }
       if (
         this.isFlow &&