eoss-ui 0.4.95 → 0.4.96

package/lib/theme-chalk/toolbar.css

@@ -1 +1 @@
-@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:12px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content,.es-toolbar .el-form-item__label{line-height:32px!important}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}
+@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:12px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content,.es-toolbar .el-form-item__label{line-height:32px!important}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.95",
+  "version": "0.4.96",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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) => {