eoss-ui 0.7.86 → 0.7.88

package/packages/flow/src/processForm.vue

@@ -1329,6 +1329,7 @@ export default {
             data: {
               nextUserList,
               nodeExtAttr,
+              nodeMoreInfo,
               countersignaturetypeText,
               countersignaturetypeCode
             }
@@ -1346,6 +1347,14 @@ export default {
             this.nextNode.countersignaturetypeText = countersignaturetypeText;
             this.enableCustomLimitTimeSetting =
               nodeExtAttr.enableCustomLimitTimeSetting == 1;
+               if (
+              this.enableCustomLimitTimeSetting &&
+              nodeMoreInfo.defaultCustomLimitDays
+            ) {
+              this.nextNode.customLimitTime =
+                this.nextNode.customLimitTimeText =
+                 nodeMoreInfo.defaultCustomLimitDays + '';
+            }
             this.isTaskread = nodeExtAttr.isTaskread;
             this.isHandleExplain = nodeExtAttr.isHandleExplain;
             this.isCustomUser = nodeExtAttr.isCustomUser; //是否展示选人组件按钮

package/packages/flow/src/selectUser.vue

@@ -68,6 +68,7 @@
         :types="types"
         :tabs="tabs"
         :title="title"
+        reset
         :classify="classify"
         :collapse-tags="selectorTags"
         :mix="mix"
@@ -247,7 +248,6 @@ export default {
     },
     nextUser: {
       handler(val) {
-        console.log(val, 'nextUser');
         this.newNextUser = val;
       },
       deep: true,
@@ -402,11 +402,9 @@ export default {
           this.newNextUser.push(item.showid);
         });
       } else {
-        console.log(val, this.newSelectUserList, 'aaaa');
         if (this.newSelectUserList.length > 0) {
           const { showid, showname } = this.newSelectUserList[0];
           if (val[0]) {
-            console.log(val[0],'1111');
             this.newOptions.push({
               ...this.newSelectUserList[0],
               id: showid,
@@ -414,7 +412,6 @@ export default {
             });
             this.newNextUser = showid;
           } else {
-            console.log(val[0],'2222');
             this.newOptions = [];
             this.newNextUser = '';
             this.showSelectUser = false;
@@ -431,7 +428,6 @@ export default {
             }, 0);
         }
       }
-      console.log(this.newNextUser, this.newOptions, 'bbb');
       this.$emit('change', {
         nextUser: this.newNextUser,
         mixList: data,

package/packages/flow-group/index.js

@@ -1,5 +1,5 @@
-import EsFlowGroup from './src/main';
-
-EsFlowGroup.install = Vue => Vue.component(EsFlowGroup.name, EsFlowGroup);
-
-export default EsFlowGroup;
+import EsFlowGroup from './src/main';
+
+EsFlowGroup.install = Vue => Vue.component(EsFlowGroup.name, EsFlowGroup);
+
+export default EsFlowGroup;

package/packages/flow-list/index.js

@@ -1,5 +1,5 @@
-import EsFlowList from './src/main';
-
-EsFlowList.install = Vue => Vue.component(EsFlowList.name, EsFlowList);
-
-export default EsFlowList;
+import EsFlowList from './src/main';
+
+EsFlowList.install = Vue => Vue.component(EsFlowList.name, EsFlowList);
+
+export default EsFlowList;

package/packages/flow-list/src/main.vue

@@ -677,7 +677,6 @@ export default {
                   // click: (key, value) => {
                   this.showBatchDelete = true;
                   this.batchdeleteTableList = this.flowData.filter((x) => x.pendstate == 2);
-                  console.log(res, '批量删除');
                   // }
                 }
               },
@@ -691,7 +690,6 @@ export default {
                   this.currentPage = 1;
                   this.pageSize = 20;
                   this.getResetList();
-                  console.log(res, '重设记录');
                   // }
                 }
               }
@@ -1624,7 +1622,6 @@ export default {
         method: 'POST',
         data: { ids,reason:this.batchdeletereason }
       };
-      console.log(params);
       this.$confirm('您确定要批量删除勾选上的流程历史数据吗?', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1728,7 +1725,6 @@ export default {
     handleSelectionChange(val,type) {
       if(type == 'batchDelete'){
         this.batchDeleteSelectList = val
-        console.log(this.batchDeleteSelectList,'this.batchDeleteSelectList')
       }else{
         this.selectList = val;
       }
@@ -1833,6 +1829,42 @@ export default {
         this.del(row.id, handle.text == '删除' ? 'del' : 'modify');
       } else if (handle.fun == 'recallRead') {
         this[handle.fun]();
+      }else if(handle.text == '置为失效'){
+        if (row.status == 0) {
+          this.$confirm('您确定要置为失效吗?')
+            .then(() => {
+              this.loading = util.loading(this.$loading, '提交中...');
+              let param = {
+                url: deletePresetInfo,
+                headers: { Accept: 'application/json,text/plain' },
+                method: 'post',
+                data: { id:row.id }
+              };
+              util
+                .ajax(param)
+                .then((res) => {
+                  const { status, message } = res;
+                  this.loading.close();
+                  if (status === 'success') {
+                    this.$message.success('操作成功');
+                    this.getListInfo();
+                  } else {
+                    this.$message.error(message || '系统错误，请联系管理员！');
+                  }
+                })
+                .catch((err) => {
+                  this.loading.close();
+                  if (err.message && err.message !== 'canceled') {
+                    this.$message.error(err.message);
+                  }
+                });
+            })
+            .catch((e) => {
+              // on cancel
+            });
+        } else {
+          this.$message.warning('当前数据已为失效状态');
+        }
       }
     },
     /**
@@ -1922,7 +1954,6 @@ export default {
      * @date 2022年11月29日
      **/
     sortChange(info, type) {
-      console.log(info);
       let { prop } = info;
       this.sidx = prop;
       this.sord = this.sord == 'asc' ? 'desc' : 'asc';

package/packages/form/index.js

@@ -1,5 +1,5 @@
-import EsForm from './src/main';
-
-EsForm.install = Vue => Vue.component(EsForm.name, EsForm);
-
-export default EsForm;
+import EsForm from './src/main';
+
+EsForm.install = Vue => Vue.component(EsForm.name, EsForm);
+
+export default EsForm;

package/packages/handle-user/index.js

@@ -1,5 +1,5 @@
-import EsHandleUser from './src/main';
-
-EsHandleUser.install = Vue => Vue.component(EsHandleUser.name, EsHandleUser);
-
-export default EsHandleUser;
+import EsHandleUser from './src/main';
+
+EsHandleUser.install = Vue => Vue.component(EsHandleUser.name, EsHandleUser);
+
+export default EsHandleUser;

package/packages/handler/index.js

@@ -1,5 +1,5 @@
-import EsHandler from './src/main';
-
-EsHandler.install = Vue => Vue.component(EsHandler.name, EsHandler);
-
-export default EsHandler;
+import EsHandler from './src/main';
+
+EsHandler.install = Vue => Vue.component(EsHandler.name, EsHandler);
+
+export default EsHandler;