eoss-ui 0.4.94 → 0.4.96

package/packages/flow/src/main.vue

@@ -274,7 +274,7 @@
                 />
               </el-form-item>
               <el-form-item
-                v-if="isMainSubProcess"
+                v-if="isMainSubProcess && isNodeShowProcess"
                 prop="mainSubId"
                 label="主办"
               >
@@ -501,7 +501,7 @@
               "
               trigger="click"
               placement="top"
-              style="border-left:1px solid #d9d9d9"
+              style="border-left: 1px solid #d9d9d9"
             >
               <el-button>...</el-button>
               <el-dropdown-menu slot="dropdown">
@@ -778,6 +778,7 @@ export default {
       isHideCurrentOrg: false, //是否隐藏本单位(承办)
       isHideOtherOrg: false, //是否隐藏外单位(承办)
       isMainSubProcess: false, // 判断是否子-主流程
+      isNodeShowProcess: false, //是否展示主办
       isNextUser: false,
       isShowNode: false,
       nextNodeList: [],
@@ -945,7 +946,7 @@ export default {
   },
   methods: {
     getsubProcessColumns() {
-      if (!this.isMainSubProcess) return [];
+      if (!this.isMainSubProcess || !this.isNodeShowProcess) return [];
       let data = [];
       let obj = { name: '[部门员工]-' };
       if (this.nextCurrentOrgObjSelect.length > 0) {
@@ -1644,6 +1645,9 @@ export default {
               this.nodeType = data.nodeExtAttr.nodeType;
               //如果当前为承办节点/会签节点,则展示本单位外单位办理人选择
               if (this.nodeType === 1 || this.nodeType === 2) {
+                this.isMainSubProcess === true
+                  ? (this.isNodeShowProcess = true)
+                  : (this.isNodeShowProcess = false);
                 this.isMainSubProcess === true
                   ? (this.isMainSubProcess = true)
                   : (this.isMainSubProcess = false);
@@ -1655,6 +1659,7 @@ export default {
               } else {
                 this.isHideCurrentOrg = false;
                 this.isHideOtherOrg = false;
+                this.isNodeShowProcess = false;
                 this.isMainSubProcess = false;
                 this.isNextUser = true;
                 // this.isMainSubProcess === true
@@ -1748,6 +1753,7 @@ export default {
         this.isNextUser = false;
         this.isShowNode = false;
         this.isMainSubProcess = false;
+        this.isNodeShowProcess = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;
@@ -2255,7 +2261,7 @@ export default {
             this.value = this.value.replace(RegExp('同意。', 'g'), '');
             this.value = val + this.value;
           }
-          if(!this.validInfo()) return
+          if (!this.validInfo()) return;
           if (this.beforeSubmit == undefined) {
             this.subFun(this.sendData);
           } else {
@@ -2269,58 +2275,59 @@ export default {
       });
     },
     validInfo() {
-       if (
-            !this.endFlow &&
-            this.newTypeCode != 'fenyue' &&
-            !this.shrink &&
-            this.nextNode.isAddSign != '1' &&
-            this.nextNode.isRemoveSign != '1' &&
-            this.isSpecial &&
-            !this.isReject &&
-            this.nodeInfos.length != 0 &&
-            this.isNextUser
-          ) {
-            if (this.isShowNextUser) {
-              if (
-                this.nextNode.nextUserId == '' ||
-                (this.multiple && this.nextNode.nextUserId.length == 0)
-              ) {
-              this.$message.warning('请选择下步办理人');
-                return false
-              }
-            } else {
-              if (
-                this.nextNode.nextOrgId == '' ||
-                (this.multiple && this.nextNode.nextOrgId.length == 0)
-              ) {
-                 this.$message.warning('请选择办理对象');
-                return false
-              }
-            }
-          }
-
-          if (
-            this.nextNode.isAddSign == '1' &&
-            this.nextNode.addSignUserId.length == 0
-          )
-            {this.$message.warning('请选择加签办理人');
-                return false}
+      if (
+        !this.endFlow &&
+        this.newTypeCode != 'fenyue' &&
+        !this.shrink &&
+        this.nextNode.isAddSign != '1' &&
+        this.nextNode.isRemoveSign != '1' &&
+        this.isSpecial &&
+        !this.isReject &&
+        this.nodeInfos.length != 0 &&
+        this.isNextUser
+      ) {
+        if (this.isShowNextUser) {
           if (
-            this.nextNode.isRemoveSign == '1' &&
-            this.nextNode.removeSignUserId.length == 0
-          ){
-           this.$message.warning('请选择减签办理人');
-                return false
-            }
-          if (!this.value && this.isOpinionRequired === 1) {
-            this.$message.warning('请选择输入审批意见');
+            this.nextNode.nextUserId == '' ||
+            (this.multiple && this.nextNode.nextUserId.length == 0)
+          ) {
+            this.$message.warning('请选择下步办理人');
             return false;
           }
-          if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
-            this.$message.warning(`请选择${this.currentOrgName || '本单位'}`);
+        } else {
+          if (
+            this.nextNode.nextOrgId == '' ||
+            (this.multiple && this.nextNode.nextOrgId.length == 0)
+          ) {
+            this.$message.warning('请选择办理对象');
             return false;
           }
-          return true
+        }
+      }
+
+      if (
+        this.nextNode.isAddSign == '1' &&
+        this.nextNode.addSignUserId.length == 0
+      ) {
+        this.$message.warning('请选择加签办理人');
+        return false;
+      }
+      if (
+        this.nextNode.isRemoveSign == '1' &&
+        this.nextNode.removeSignUserId.length == 0
+      ) {
+        this.$message.warning('请选择减签办理人');
+        return false;
+      }
+      if (!this.value && this.isOpinionRequired === 1) {
+        this.$message.warning('请选择输入审批意见');
+        return false;
+      }
+      if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
+        this.$message.warning(`请选择${this.currentOrgName || '本单位'}`);
+        return false;
+      }
+      return true;
     },
     sendData() {
       this.$refs['nextNode'].validate(async (valid) => {

package/packages/main/src/main.vue

@@ -666,20 +666,6 @@ export default {
         Object.prototype.hasOwnProperty.call(query, 'serverId') &&
         Object.prototype.hasOwnProperty.call(query, 'authType')
       ) {
-        let url = util.win.top.location.href;
-        if (query.openType) {
-          switch (query.openType) {
-            case 'self':
-              url = util.win.location.href;
-              break;
-            case 'blank':
-              url = util.win.open(url);
-              break;
-            case 'parent':
-              url = util.win.parent.location.href;
-              break;
-          }
-        }
         await util
           .ajax({
             method: 'post',
@@ -691,9 +677,8 @@ export default {
               let { results } = res;
               switch (results.statusCode) {
                 case 0:
-                  const storage = getStorage('storage');
-                  setStorage({
-                    type: storage,
+                  util.setStorage({
+                    type: this.storage,
                     key: {
                       ssId: results.ssId,
                       token: results.token,
@@ -701,41 +686,53 @@ export default {
                       deviceUnique: results.deviceUnique
                     }
                   });
-                  this.getConfig();
-                  if (this.socket) {
-                    this.initWebSocket();
-                  }
-                  break;
-                case 1:
-                  break;
-                case 2:
-                  break;
-                case 3:
-                  const href = results.authorizeUrl.replace(
-                    '{redirectUri}',
-                    encodeURIComponent(url)
-                  );
                   if (query.openType) {
+                    let url = util.win.top.location.href;
+                    let newUrl = util.delUrlParam({
+                      url: url,
+                      key: ['serverId', 'authType', 'openType']
+                    });
                     switch (query.openType) {
                       case 'self':
-                        util.win.location.href = href;
+                        util.win.location.href = newUrl;
                         break;
                       case 'blank':
-                        util.win.open(href);
-                        break;
-                      case 'top':
-                        util.win.top.location.href = href;
+                        util.win.open(newUrl);
                         break;
                       case 'parent':
                         util.win.parent.location.href = href;
                         break;
+                      default:
+                        util.win.top.location.href = href;
                     }
                   } else {
-                    if (open) {
+                    this.getConfig();
+                    if (this.socket) {
+                      this.initWebSocket();
+                    }
+                  }
+                  break;
+                case 1:
+                  break;
+                case 2:
+                  break;
+                case 3:
+                  const href = results.authorizeUrl.replace(
+                    '{redirectUri}',
+                    encodeURIComponent(url)
+                  );
+                  switch (query.openType) {
+                    case 'self':
+                      util.win.location.href = href;
+                      break;
+                    case 'blank':
                       util.win.open(href);
-                    } else {
+                      break;
+                    case 'parent':
+                      util.win.parent.location.href = href;
+                      break;
+                    default:
                       util.win.top.location.href = href;
-                    }
                   }
                   break;
                 case 4: