eoss-ui 0.5.81-beta16 → 0.5.81-beta18

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-button-content .el-button{padding:4px 8px}.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-button,.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-upload,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-button,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.es-upload,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.el-button,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.es-upload,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.el-button,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.es-upload{margin-left:6px}.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:6px;height:32px}.es-toolbar .es-toolbar-content .es-advanced-btn .es-advanced-icon{margin-right:-8px}.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-form-search-small .el-form-item__content{line-height:32px!important}.es-toolbar .es-form-search-small .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}.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 .es-toolbar-button-group .el-button--medium{border-radius:3px!important}.es-toolbar .es-toolbar-button-group .el-dropdown{margin-left:6px}
+@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-button-content .el-button{padding:4px 8px}.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-button,.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-upload,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-button,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.es-upload,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.el-button,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.es-upload,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.el-button,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.es-upload{margin-left:6px}.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:6px;height:32px}.es-toolbar .es-toolbar-content .es-advanced-btn .es-advanced-icon{margin-right:-8px}.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-form-search-small .el-form-item__content,.es-toolbar .es-form-search-small .el-input-number{line-height:32px!important}.es-toolbar .es-form-search-small .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}.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 .es-toolbar-button-group .el-button--medium{border-radius:3px!important}.es-toolbar .es-toolbar-button-group .el-dropdown{margin-left:6px}

package/package.json

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

package/packages/data-table/src/column.vue

@@ -10,10 +10,49 @@
           :rules="isNotRule(scope) ? [] : rules"
           :index="scope.$index"
         >
+          <component
+            v-if="getType(scope.row.formConfigs, 'component')"
+            :is="tag"
+            v-bind="formOption"
+            v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
+            @blur="
+              (event) => {
+                handleBlur({
+                  item: config,
+                  event: event,
+                  data: scope.row,
+                  scope: scope
+                });
+              }
+            "
+            @focus="
+              (event) => {
+                handleFocus({
+                  item: config,
+                  event: event,
+                  data: scope.row,
+                  scope: scope
+                });
+              }
+            "
+            @change="
+              (value) => {
+                handleChange({
+                  item: config,
+                  name: field || prop,
+                  value: value,
+                  data: scope.row,
+                  scope: scope
+                });
+              }
+            "
+          ></component>
           <es-select
-            v-if="type === 'select'"
+            v-else-if="getType(scope.row.formConfigs, 'select')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
             @blur="
               (event) => {
                 handleBlur({
@@ -45,11 +84,13 @@
                 });
               }
             "
-          ></es-select>
+          >
+          </es-select>
           <es-cascader
-            v-else-if="type == 'cascader'"
+            v-else-if="getType(scope.row.formConfigs, 'cascader')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
             @blur="
               (event) => {
                 handleBlur({
@@ -84,10 +125,10 @@
           >
           </es-cascader>
           <es-select-ganged
-            v-else-if="type === 'ganged'"
+            v-else-if="getType(scope.row.formConfigs, 'ganged')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
-            :data="init(option, config)"
+            :data="init(getData(scope.row.formOptions), config)"
             @change="
               (value) => {
                 handleChange({
@@ -98,11 +139,13 @@
                 });
               }
             "
-          ></es-select-ganged>
+          >
+          </es-select-ganged>
           <es-radio-group
-            v-else-if="type === 'radio'"
+            v-else-if="getType(scope.row.formConfigs, 'radio')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
             @change="
               (value) => {
                 handleChange({
@@ -113,11 +156,13 @@
                 });
               }
             "
-          ></es-radio-group>
+          >
+          </es-radio-group>
           <es-checkbox-group
-            v-else-if="type === 'checkbox'"
+            v-else-if="getType(scope.row.formConfigs, 'checkbox')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
             @change="
               (value) => {
                 handleChange({
@@ -128,11 +173,13 @@
                 });
               }
             "
-          ></es-checkbox-group>
+          >
+          </es-checkbox-group>
           <es-switch
-            v-else-if="type === 'switch'"
+            v-else-if="getType(scope.row.formConfigs, 'switch')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
+            :data="getData(scope.row.formOptions)"
             @change="
               (value) => {
                 handleChange({
@@ -143,22 +190,25 @@
                 });
               }
             "
-          ></es-switch>
+          >
+          </es-switch>
           <es-date-picker
             v-else-if="
               config.date ||
-              type == 'date' ||
-              type == 'year' ||
-              type == 'month' ||
-              type == 'date' ||
-              type == 'dates' ||
-              type == 'week' ||
-              type == 'datetime' ||
-              type == 'datetimerange' ||
-              type == 'daterange' ||
-              type == 'monthrange' ||
-              type == 'quarter' ||
-              type == 'halfyear'
+              getType(scope.row.formConfigs, [
+                'date',
+                'year',
+                'month',
+                'date',
+                'dates',
+                'week',
+                'datetime',
+                'datetimerange',
+                'daterange',
+                'monthrange',
+                'quarter',
+                'halfyear'
+              ])
             "
             v-bind="formOption"
             v-model="scope.row[field || prop]"
@@ -194,9 +244,10 @@
                 });
               }
             "
-          ></es-date-picker>
+          >
+          </es-date-picker>
           <es-input-number
-            v-else-if="type == 'number'"
+            v-else-if="getType(scope.row.formConfigs, 'number')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
             @blur="
@@ -230,9 +281,10 @@
                 });
               }
             "
-          ></es-input-number>
+          >
+          </es-input-number>
           <es-selector
-            v-else-if="type == 'selector'"
+            v-else-if="getType(scope.row.formConfigs, 'selector')"
             v-bind="formOption"
             v-model="scope.row[field || prop]"
             v-on="
@@ -251,15 +303,16 @@
                 });
               }
             "
-          ></es-selector>
+          >
+          </es-selector>
           <template
             v-else-if="
-              type === 'text' || type === 'input' || type === 'textarea'
+              getType(scope.row.formConfigs, ['text', 'input', 'textarea'])
             "
           >
             <template v-if="config.lazy">
               <input
-                v-if="type === 'text' || type === 'input'"
+                v-if="getType(scope.row.formConfigs, ['text', 'input'])"
                 class="el-input__inner"
                 v-bind="formOption"
                 v-model.lazy="scope.row[field]"
@@ -370,7 +423,8 @@
                   });
                 }
               "
-            ></es-input>
+            >
+            </es-input>
           </template>
         </el-form-item>
       </template>
@@ -460,6 +514,7 @@ export default {
     }
   },
   props: {
+    tag: String,
     mode: String,
     service: String,
     form: Boolean,
@@ -584,8 +639,7 @@ export default {
           : this.valueKey,
         rules: this.rules,
         events: this.events,
-        ...this.$attrs,
-        data: this.option
+        ...this.$attrs
       };
       return config;
     },
@@ -727,6 +781,18 @@ export default {
       }
       return data;
     },
+    getType(config, types) {
+      let type =
+        config && config[this.field || this.prop]
+          ? config[this.field || this.prop]
+          : this.type;
+      return Array.isArray(types) ? types.includes(type) : type == types;
+    },
+    getData(res) {
+      return res && res[this.field || this.prop]
+        ? res[this.field || this.prop]
+        : this.option;
+    },
     exclAttribute({ data, attrs }) {
       return util.exclAttribute({ data, attrs });
     },
@@ -826,10 +892,14 @@ export default {
       this.$emit('formFocus', data);
       this.$emit('form-focus', data);
     },
-    handleChange(data) {
-      let { item } = data;
-      if (item && this.type == 'ganged') {
-        let { index, value } = data.value;
+    handleChange(datas) {
+      let { item, name, data } = datas;
+      if (
+        item &&
+        ((data.formConfigs && data.formConfigs[name] == 'ganged') ||
+          this.type == 'ganged')
+      ) {
+        let { index, value } = datas.value;
         if (
           (item.url || this.sysCode) &&
           ((item.ganged && index > item.ganged - 1) || value.hasSub)
@@ -890,9 +960,9 @@ export default {
           }
         }
       }
-      this.events && this.events.change && this.events.change(data);
-      this.$emit('formChange', data);
-      this.$emit('form-change', data);
+      this.events && this.events.change && this.events.change(datas);
+      this.$emit('formChange', datas);
+      this.$emit('form-change', datas);
     },
     handleClick(data) {
       this.$emit('handleClick', data);

package/packages/data-table/src/{forms.vue → formItem.vue}

@@ -1,16 +1,15 @@
 <template>
   <el-form-item
-    v-if="!(type === 'handle' && !scope.row.hideHandle)"
     :name="name"
     :prop="field || prop"
-    :rules="isNotRule(scope) ? [] : rules"
-    :index="scope.$index"
+    :rules="rules"
+    :index="index"
   >
     <es-select
       v-if="type == 'select'"
       v-bind="formOption"
       :data="option"
-      v-model="scope.row[field || prop]"
+      v-model="model"
       @blur="
         (event) => {
           handleBlur({
@@ -380,16 +379,33 @@
 
 <script>
 export default {
-  name: '',
+  name: 'FormItem',
   components: {},
   props: {
+    scope: {},
     type: String,
-    scope: {}
+    name: String,
+    value: {},
+    index: [String, Number],
+    labelKey: String,
+    valueKey: String,
+    field: String,
+    prop: String,
+    rules: [Array, Object]
   },
   data() {
     return {};
   },
-  computed: {},
+  computed: {
+    model: {
+      get() {
+        return this.value;
+      },
+      set(val) {
+        this.$emit('input', val);
+      }
+    }
+  },
   watch: {},
   created() {},
   mounted() {},

package/packages/data-table/src/main.vue

@@ -100,6 +100,7 @@
             <children
               v-else
               :key="item.label || item.title"
+              :tag="item.tag"
               v-bind="{
                 mode: mode,
                 name: name,

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

@@ -307,7 +307,6 @@
 </template>
 
 <script>
-const dataTableMode = util.win.dataTableMode || 'default';
 import avatar from './avatar.vue';
 import handler from './handler.vue';
 import subMenu from './sub-menu.vue';
@@ -330,6 +329,7 @@ import {
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 const isIE = navigator.userAgent.indexOf('MSIE') != -1;
+const dataTableMode = util.win.dataTableMode || 'default';
 let events = [
   (tabs, index, that) => {
     let tab = tabs[index];
@@ -1257,7 +1257,7 @@ export default {
             util.win.open(res.url);
           } else if (res.urlopenmode == 2 || res.openModel == 2) {
             set = false;
-            util.win.location.href = res.url;
+            util.win.open(res.url, '_self');
           } else {
             let i = util.indexOfObj(this.tabs, res, 'id');
             this.activeName = res.id;
@@ -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/packages/main/src/simplicity/menu-list.vue

@@ -44,6 +44,7 @@
 </template>
 
 <script>
+import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'MenuList',
   components: {},
@@ -105,7 +106,7 @@ export default {
           util.win.open(res.url);
           return;
         } else if (res.urlopenmode == 2) {
-          util.win.location.href = res.url;
+          util.win.open(res.url, '_self');
           return;
         }
         this.$emit('command', res);