eoss-ui 0.5.81-beta16 → 0.5.81-beta17

package/packages/flow/src/main.vue

@@ -117,6 +117,17 @@
                 @change="changeSelectUser($event, 'addSignUserId', true)"
               />
             </el-form-item>
+            <el-form-item
+              prop="addSignMode"
+              v-if="isCanPreAddSign"
+              label="加签模式"
+              :rules="[{ required: true, trigger: 'blur' }]"
+            >
+              <el-radio-group v-model="nextNode.addSignMode">
+                <el-radio label="preAddSign">前置加签</el-radio>
+                <el-radio label="postAddSign">后置加签</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </div>
           <!-- 加签结束 -->
           <!-- 减签开始 -->
@@ -400,12 +411,10 @@
           <div
             v-show="showNews"
             style="
-               {
-                border: 1px solid #ccc;
-                padding: 5px;
-                border-radius: 5px;
-                font-size: 13px;
-              }
+              border: 1px solid #ccc;
+              padding: 5px;
+              border-radius: 5px;
+              font-size: 13px;
             "
           >
             {{ nextNode.notificationMsg }}
@@ -740,6 +749,7 @@ export default {
     return {
       styles: {},
       userModel: {},
+      isCanPreAddSign: false,
       nextOtherOrgObjSelect: [],
       subProcessColumns: [],
       nextCurrentOrgObjSelect: [],
@@ -860,6 +870,7 @@ export default {
       presetReadUserId: [],
       nextNode: {
         nextNodeId: '', // 下步节点
+        addSignMode: 'postAddSign',
         isAddSign: '', // 是否加签
         isRemoveSign: '', // 是否减签
         nextOperate: '', // 下步操作
@@ -1332,8 +1343,8 @@ export default {
     rejectBtn() {
       if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
       if (!this.value) {
-              if(!this.$refs.commonOpinions.validate()) return
-            }
+        if (!this.$refs.commonOpinions.validate()) return;
+      }
       if (this.beforeSubmit != undefined) {
         this.beforeSubmit(0)
           .then((next) => {
@@ -1341,7 +1352,6 @@ export default {
           })
           .catch((e) => {});
       } else {
-        
         this.showReject = true;
       }
     },
@@ -1643,11 +1653,10 @@ export default {
      * @date 2022年9月29日
      **/
     rejectAndEnd(res) {
-      if (this.isOpinionRequired == 1 && (this.value == '' || !this.value)){
-            if(!this.$refs.commonOpinions.validate()) return
-          }
+      if (this.isOpinionRequired == 1 && (this.value == '' || !this.value)) {
+        if (!this.$refs.commonOpinions.validate()) return;
+      }
       if (this.beforeSubmit != undefined) {
-        
         this.beforeSubmit()
           .then((next) => {
             this.saveRejectAndEnd(res);
@@ -1660,7 +1669,6 @@ export default {
     saveRejectAndEnd(res) {
       this.$confirm('确认' + res.value + '?')
         .then(() => {
-          
           // return this.$message.warning('请填写意见');
           let params = {
             url: rejectAndEnd,
@@ -1783,7 +1791,7 @@ export default {
                 this.isHideOtherOrg = false;
                 this.isNodeShowProcess = false;
                 this.isMainSubProcess = false;
-                this.isNextUser =this.nextNode.nextOperate != 9 ;
+                this.isNextUser = this.nextNode.nextOperate != 9;
                 // this.isMainSubProcess === true
                 //   ? (this.isMainSubProcess = true)
                 //   : (this.isMainSubProcess = false);
@@ -1960,7 +1968,7 @@ export default {
         return;
       } else {
       }
-     
+
       if (isDef !== true) this.getNodeInfo();
     },
     /**
@@ -2041,13 +2049,15 @@ export default {
                 isSpecial,
                 canPresetRead,
                 isCdjxjTaskHandle,
-                taskButtonList
+                taskButtonList,
+                isCanPreAddSign
               }
             } = res;
             this.$emit('startTaskRead', res);
             this.$emit('start-task-read', res);
             this.currentOrgName = currentOrgName;
             this.otherOrgName = otherOrgName;
+            this.isCanPreAddSign = isCanPreAddSign;
             this.endFlowInfo.choiceOrgId = choiceOrgId;
             this.endFlowInfo.choiceDeptId = choiceDeptId;
             this.endFlowInfo.pendingId = this.pendingId;
@@ -2514,6 +2524,9 @@ export default {
           notificationType = this.nextNode.notificationType.join(',');
           addSignUserId = addSignUserId.join(',');
           removeSignUserId = removeSignUserId.join(',');
+          if (!this.isCanPreAddSign) {
+            delete this.nextNode.addSignMode;
+          }
           let params = {
             ...this.nextNode,
             pendingId: this.pendingId,

package/packages/main/src/simplicity/index.vue

@@ -1359,6 +1359,16 @@ export default {
       } else {
         if (res.method == 'iframe') {
           res.url = util.handlerUrl(res.url);
+        } else {
+          let tab = this.tabs[i];
+          if (tab.method === 'iframe') {
+            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+          } else {
+            this.$set(this.tabs[i], 'refresh', false);
+            this.$nextTick(() => {
+              this.$set(this.tabs[i], 'refresh', true);
+            });
+          }
         }
       }
     },
@@ -1415,11 +1425,17 @@ export default {
       let tab = this.tabs[i];
       if (tab.method === 'iframe') {
         tab.url = util.handlerUrl(tab.url);
+      } else {
+        let tab = this.tabs[i];
+        if (tab.method === 'iframe') {
+          this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+        } else {
+          this.$set(this.tabs[i], 'refresh', false);
+          this.$nextTick(() => {
+            this.$set(this.tabs[i], 'refresh', true);
+          });
+        }
       }
-      tab.refresh = false;
-      this.$nextTick(() => {
-        tab.refresh = true;
-      });
     },
     /**
      * @desc:删除iframe
@@ -1501,7 +1517,7 @@ export default {
       } else if (open) {
         util.win.open(open);
       } else if (link) {
-        util.win.location.href = link;
+        util.win.open(link, '_self');
       } else {
         switch (type) {
           case 'quit':
@@ -1525,15 +1541,23 @@ export default {
             this.showMsg = false;
             break;
           case 'home':
-            if (this.homePage.id !== this.activeName) {
-              let i = util.indexOfObj(this.tabs, this.homePage.id, 'id');
-              if (i == -1) {
-                this.tabs.unshift(this.homePage);
+            let i = util.indexOfObj(this.tabs, this.homePage.id, 'id');
+            if (i == -1) {
+              this.tabs.unshift(this.homePage);
+            } else {
+              let tab = this.tabs[i];
+              if (tab.method === 'iframe') {
+                this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+              } else {
+                this.$set(this.tabs[i], 'refresh', false);
+                this.$nextTick(() => {
+                  this.$set(this.tabs[i], 'refresh', true);
+                });
               }
-              this.activeName = this.homePage.id;
-              this.showMsg = false;
-              this.showSet = false;
             }
+            this.activeName = this.homePage.id;
+            this.showMsg = false;
+            this.showSet = false;
             break;
           case 'search':
             this.handlerSetDrawer(res);
@@ -1684,6 +1708,16 @@ export default {
         if (i == -1) {
           let tab = this.setIframeType(obj);
           this.tabs.splice(n + 1, 0, tab);
+        } else {
+          let tab = this.tabs[i];
+          if (tab.method === 'iframe') {
+            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+          } else {
+            this.$set(this.tabs[i], 'refresh', false);
+            this.$nextTick(() => {
+              this.$set(this.tabs[i], 'refresh', true);
+            });
+          }
         }
       } else {
         this.$message.error('没有此菜单！');

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.81-beta16',
+  version: '0.5.81-beta17',
   install,
   Button,
   ButtonGroup,