eoss-mobiles 0.1.19 → 0.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/flow/src/components/Handle.vue

@@ -19,6 +19,7 @@
           @onInputOpintion="onInputOpintion"
           :isOpinionRequired="isOpinionRequired"
           :disabled="isBanInputOpinion != 0"
+          :baseUrl="baseUrl"
           :isHiddenOftenOpinion="isHiddenOftenOpinion == 1 ? false : true"
         ></Opinion>
         <!-- 审核内容 -->
@@ -95,10 +96,14 @@
                 !isHiddenNextStepInfo
             "
           >
-            <div @click="isNextBox = !isNextBox" class="shrink-btn">
+            <div
+              @click="isNextBox = !isNextBox"
+              v-if="!isReject"
+              class="shrink-btn"
+            >
               {{ isNextBox ? '收起下一步操作和节点' : '展开下一步操作和节点' }}
             </div>
-            <div class="next-box" v-show="isNextBox">
+            <div class="next-box" v-show="isNextBox || isReject">
               <!-- 下一步操作 -->
               <div
                 class="item"
@@ -118,7 +123,10 @@
                 />
               </div>
               <!-- 下步节点 -->
-              <div class="item" v-if="nodeList && nodeList.length > 0">
+              <div
+                class="item"
+                v-if="nodeList && nodeList.length > 0 && !isReject"
+              >
                 <em-picker
                   title="下步节点"
                   label="下步节点"
@@ -397,6 +405,7 @@ export default {
       nextNodeDefault: 0,
       showAppUnit: false, // 弹窗单位
       handleFlow: true,
+      isReject: false,
       isChooseNextNode: 1, //是否展示下步操作
       pid: 'root', //树选中pid
       objType: 'enterprise', //树点击对象
@@ -447,6 +456,7 @@ export default {
         advanceNoticeHour: undefined, //限时办理 时
         advanceNoticeType: [] //催办通知方式
       },
+      isChooseNextNode: 1,
       isOpinionRequired: 0, // 意见是否必填
       isBanInputOpinion: 0, //意见是否禁用
       showTimeList: false, //选择限时办理弹出层
@@ -510,6 +520,7 @@ export default {
       choiceOrgId: '',
       choiceDeptId: '',
       taskExamineInfo: {},
+      nodeInfoMapInfo:{},
       pOrgId: ''
     };
   },
@@ -577,12 +588,12 @@ export default {
         this.isSpecial &&
         this.isNextUser &&
         !this.form.nextUserId &&
-        idStr === ''
+        idStr === '' && !this.isReject
       ) {
         this.$toast('请选择办理人');
         return;
       }
-      if (!this.form.nextNodeId && this.nodeList.length > 0 && this.isSpecial) {
+      if (!this.form.nextNodeId && this.nodeList.length > 0 && this.isSpecial && !this.isReject) {
         this.$toast('请选择流程节点');
         return;
       }
@@ -649,7 +660,8 @@ export default {
         choiceOrgId,
         choiceDeptId,
         pOrgId,
-        taskExamineInfo
+        taskExamineInfo,
+        nodeInfoMapInfo
       } = this;
       _that.form.isEndUserTask = isEndUserTask;
       _that.form.choiceOrgId = choiceOrgId;
@@ -660,7 +672,8 @@ export default {
       _that.form.appId = taskExamineInfo.appId;
       _that.form.processDefinitionId = taskExamineInfo.processDefinitionId;
       _that.form.isSubFlow = taskExamineInfo.isSubFlow;
-      _that.form.nodeId = taskExamineInfo.nodeId;
+      _that.form.nodeId = taskExamineInfo.nodeId ;
+      _that.form.nextNodeId = _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode
       request({
         url: _that.baseUrl ? _that.baseUrl + taskHandleHtml : taskHandleHtml,
         params: {
@@ -724,6 +737,14 @@ export default {
       } else if (val == 7) {
       } else if (val == 8) {
       } else if (val == 9) {
+      } else {
+      }
+      if (val == 9) {
+        this.isNextUser = false;
+        this.isReject = true
+      } else {
+        this.isNextUser = true;
+        this.isReject = false;
       }
       this.form.nextOperate = val.key;
       this.form.nextOperateName = val.value;
@@ -823,6 +844,8 @@ export default {
             that.taskExamineInfo = taskExamine;
             that.form.notificationMsg = defaultNotificationMessage;
             that.defaultNotificationType = defaultNotificationType.split(',');
+            that.nodeInfoMapInfo = nodeInfoMap
+            // that.defaultNextNode = nodeInfoMap.nodeExtAttr.defaultNextNode;
             that.isCanAddSign = res.data.isCanAddSign;
             if (that.isCanAddSign) {
               that.form.isAddSign = '2';
@@ -846,8 +869,9 @@ export default {
                       !that.taskOperations[0].taskNodeList ||
                       that.taskOperations[0].taskNodeList.length === 0
                     ) {
-                      that.form.nextNodeId = undefined;
+                      that.form.nextNodeId =undefined;
                       that.form.nextNodeName = undefined;
+                      console.log(that.form.nextNodeId,'that.form.nextNodeId')
                     } else {
                       that.nodeList = that.taskOperations[0].taskNodeList;
                       let info = [];
@@ -859,6 +883,7 @@ export default {
                           that.nextNodeDefault = y;
                         }
                       });
+                      if(info.length == 0 && that.nodeList.length !=0) info =[that.nodeList[0]]
                       if (info.length > 0) {
                         that.form.nextNodeId = info[0].nodeId;
                         that.form.nextNodeName = info[0].nodeName;
@@ -883,6 +908,8 @@ export default {
                           that.nextNodeDefault = y;
                         }
                       });
+                       if(info.length == 0 && that.nodeList.length !=0) info =[that.nodeList[0]]
+                       console.log(info,'infoinfo')
                       if (info.length > 0) {
                         that.form.nextNodeId = info[0].nodeId;
                         that.form.nextNodeName = info[0].nodeName;
@@ -891,13 +918,14 @@ export default {
                       // that.form.nextNodeName = that.nodeList[0].nodeName;
                     }
                   }
-
-                  // if (item.key == 9) {
-                  //   that.isHiddenNextStepInfo = true;
-                  // }
+                  console.log(that.taskOperations, that.form, 'asdsdsa');
+                  if (item.key == 9) {
+                    that.isReject = true;
+                  }
                 }
+                console.log(that.form, 'that.form');
               });
-              if (isSelected) {
+              if (!isSelected) {
                 that.form.nextOperate = that.taskOperations[0].key;
                 that.form.nextOperateName = that.taskOperations[0].value;
                 that.nodeList = that.taskOperations[0].taskNodeList || [];
@@ -916,7 +944,7 @@ export default {
                 nodeInfoMap.nodeExtAttr.isSubmitButtonShowAgreeAndDisagree;
               that.isOpinionRequired =
                 nodeInfoMap.nodeExtAttr.isOpinionRequired;
-              that.isChooseNextNode = nodeInfoMap.nodeExtAttr.isChooseNextNode;
+              // that.isChooseNextNode = nodeInfoMap.nodeExtAttr.isChooseNextNode;
               that.isBanInputOpinion =
                 nodeInfoMap.nodeExtAttr.isBanInputOpinion;
             }

package/packages/flow/src/components/Reject.vue

@@ -11,6 +11,7 @@
         @onInputOpintion="onInputOpintion"
         :isOpinionRequired="isBanInputOpinion"
         :disabled="isBanInputOpinion != 0"
+        :baseUrl="baseUrl"
         :isHiddenOftenOpinion="isHiddenOftenOpinion == 1 ? false : true"
       ></Opinion>
       <div class="input-box">

package/packages/flow/src/components/StartFlow.vue

@@ -13,6 +13,7 @@
         :code="processObj.attachedCode"
         :ownId="businessId"
         :isFile="false"
+        :baseUrl="baseUrl"
         @onInputOpintion="onInputOpintion"
         :isOpinionRequired="isOpinionRequired"
         :disabled="isBanInputOpinion != 0"

package/src/index.js

@@ -89,7 +89,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.1.19',
+  version: '0.1.21',
   install,
   Button,
   ButtonGroup,