eoss-ui 0.7.86 → 0.7.87

package/packages/flow/index.js

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

package/packages/flow/src/component/TimeLimit.vue

@@ -1,190 +1,190 @@
-<template>
-  <div class="time-limit">
-    <el-form-item prop="isLimitedTime" label="是否限时办理">
-      <el-radio-group v-model="isLimitedTime">
-        <el-radio label="1">是</el-radio>
-        <el-radio label="2">否</el-radio>
-      </el-radio-group>
-    </el-form-item>
-    <div v-show="isLimitedTime == '1'">
-      <el-form-item prop="isLimitedTime" label="限时办理时间">
-        <div  style="display:flex;">
-          <div style="width:48%">
-            <es-input-number
-              v-model="limitedTimeDay"
-              type="number"
-              style="width:80%;margin-right:10px"
-              :controls="false"
-              @change="changeInfo"
-              placeholder="请输入限时天数"
-            />天
-          </div>
-          <div style="width:45%">
-            <es-select
-              style="width:80% !important;margin-right:10px"
-              v-model="limitedTimeHour"
-              placeholder="请选择限时时长"
-              :data="options"
-              @change="changeInfo"
-            />时
-          </div>
-        </div>
-      </el-form-item>
-      <el-form-item prop="isLimitedTime" label="提前通知时间">
-           <div  style="display:flex;">
-          <div style="width:48%">
-            <es-input-number
-              v-model="advanceNoticeDay"
-              type="number"
-              style="width:80%;margin-right:10px"
-              :controls="false"
-              @change="changeInfo"
-              placeholder="请输入提前通知天数"
-            />天
-          </div>
-          <div style="width:45%">
-            <es-select
-              style="width:80% !important;margin-right:10px"
-              v-model="advanceNoticeHour"
-              @change="changeInfo"
-              placeholder="请选择提前通知时长"
-              :data="options"
-            />时
-          </div>
-        </div> </el-form-item>
-      <el-form-item prop="isLimitedTime" label="催办通知方式">
-        <el-checkbox-group v-model="advanceNoticeType" @change="changeInfo">
-          <el-checkbox
-            v-for="item of $attrs.newsList"
-            :key="item.cciValue"
-            :label="item.cciValue"
-          >
-            {{ item.shortName }}
-          </el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'TimeLimit',
-  data() {
-    return {
-      isLimitedTime: '2', //是否限时办理
-        limitedTimeDay: '',
-        limitedTimeHour:'',
-        advanceNoticeDay:'',
-     advanceNoticeHour:'',
-      advanceNoticeType: [], //催办通知方式
-      options: [
-        {
-          value: '0',
-          label: '0'
-        },
-        {
-          value: '1',
-          label: '1'
-        },
-        {
-          value: '2',
-          label: '2'
-        },
-        {
-          value: '3',
-          label: '3'
-        },
-        {
-          value: '4',
-          label: '4'
-        },
-        {
-          value: '5',
-          label: '5'
-        },
-        {
-          value: '6',
-          label: '6'
-        },
-        {
-          value: '7',
-          label: '7'
-        },
-        {
-          value: '8',
-          label: '8'
-        },
-        {
-          value: '9',
-          label: '9'
-        },
-        {
-          value: '10',
-          label: '10'
-        },
-        {
-          value: '11',
-          label: '11'
-        },
-        {
-          value: '12',
-          label: '12'
-        },
-        {
-          value: '13',
-          label: '13'
-        },
-        {
-          value: '14',
-          label: '14'
-        },
-        {
-          value: '15',
-          label: '15'
-        },
-        {
-          value: '16',
-          label: '16'
-        },
-        {
-          value: '17',
-          label: '17'
-        },
-        {
-          value: '18',
-          label: '18'
-        },
-        {
-          value: '19',
-          label: '19'
-        },
-        {
-          value: '20',
-          label: '20'
-        },
-        {
-          value: '21',
-          label: '21'
-        },
-        {
-          value: '22',
-          label: '22'
-        },
-        {
-          value: '23',
-          label: '23'
-        }
-      ]
-    };
-  },
-  methods:{
-    changeInfo(){
-      const {isLimitedTime,limitedTimeDay,limitedTimeHour,advanceNoticeDay,advanceNoticeHour,advanceNoticeType} = this
-      this.$emit('change',{isLimitedTime,limitedTimeDay,limitedTimeHour,advanceNoticeDay,advanceNoticeHour,advanceNoticeType:advanceNoticeType.join(',')})
-    },
-  }
-};
-</script>
-
-<style></style>
+<template>
+  <div class="time-limit">
+    <el-form-item prop="isLimitedTime" label="是否限时办理">
+      <el-radio-group v-model="isLimitedTime">
+        <el-radio label="1">是</el-radio>
+        <el-radio label="2">否</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <div v-show="isLimitedTime == '1'">
+      <el-form-item prop="isLimitedTime" label="限时办理时间">
+        <div  style="display:flex;">
+          <div style="width:48%">
+            <es-input-number
+              v-model="limitedTimeDay"
+              type="number"
+              style="width:80%;margin-right:10px"
+              :controls="false"
+              @change="changeInfo"
+              placeholder="请输入限时天数"
+            />天
+          </div>
+          <div style="width:45%">
+            <es-select
+              style="width:80% !important;margin-right:10px"
+              v-model="limitedTimeHour"
+              placeholder="请选择限时时长"
+              :data="options"
+              @change="changeInfo"
+            />时
+          </div>
+        </div>
+      </el-form-item>
+      <el-form-item prop="isLimitedTime" label="提前通知时间">
+           <div  style="display:flex;">
+          <div style="width:48%">
+            <es-input-number
+              v-model="advanceNoticeDay"
+              type="number"
+              style="width:80%;margin-right:10px"
+              :controls="false"
+              @change="changeInfo"
+              placeholder="请输入提前通知天数"
+            />天
+          </div>
+          <div style="width:45%">
+            <es-select
+              style="width:80% !important;margin-right:10px"
+              v-model="advanceNoticeHour"
+              @change="changeInfo"
+              placeholder="请选择提前通知时长"
+              :data="options"
+            />时
+          </div>
+        </div> </el-form-item>
+      <el-form-item prop="isLimitedTime" label="催办通知方式">
+        <el-checkbox-group v-model="advanceNoticeType" @change="changeInfo">
+          <el-checkbox
+            v-for="item of $attrs.newsList"
+            :key="item.cciValue"
+            :label="item.cciValue"
+          >
+            {{ item.shortName }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TimeLimit',
+  data() {
+    return {
+      isLimitedTime: '2', //是否限时办理
+        limitedTimeDay: '',
+        limitedTimeHour:'',
+        advanceNoticeDay:'',
+     advanceNoticeHour:'',
+      advanceNoticeType: [], //催办通知方式
+      options: [
+        {
+          value: '0',
+          label: '0'
+        },
+        {
+          value: '1',
+          label: '1'
+        },
+        {
+          value: '2',
+          label: '2'
+        },
+        {
+          value: '3',
+          label: '3'
+        },
+        {
+          value: '4',
+          label: '4'
+        },
+        {
+          value: '5',
+          label: '5'
+        },
+        {
+          value: '6',
+          label: '6'
+        },
+        {
+          value: '7',
+          label: '7'
+        },
+        {
+          value: '8',
+          label: '8'
+        },
+        {
+          value: '9',
+          label: '9'
+        },
+        {
+          value: '10',
+          label: '10'
+        },
+        {
+          value: '11',
+          label: '11'
+        },
+        {
+          value: '12',
+          label: '12'
+        },
+        {
+          value: '13',
+          label: '13'
+        },
+        {
+          value: '14',
+          label: '14'
+        },
+        {
+          value: '15',
+          label: '15'
+        },
+        {
+          value: '16',
+          label: '16'
+        },
+        {
+          value: '17',
+          label: '17'
+        },
+        {
+          value: '18',
+          label: '18'
+        },
+        {
+          value: '19',
+          label: '19'
+        },
+        {
+          value: '20',
+          label: '20'
+        },
+        {
+          value: '21',
+          label: '21'
+        },
+        {
+          value: '22',
+          label: '22'
+        },
+        {
+          value: '23',
+          label: '23'
+        }
+      ]
+    };
+  },
+  methods:{
+    changeInfo(){
+      const {isLimitedTime,limitedTimeDay,limitedTimeHour,advanceNoticeDay,advanceNoticeHour,advanceNoticeType} = this
+      this.$emit('change',{isLimitedTime,limitedTimeDay,limitedTimeHour,advanceNoticeDay,advanceNoticeHour,advanceNoticeType:advanceNoticeType.join(',')})
+    },
+  }
+};
+</script>
+
+<style></style>

package/packages/flow/src/component/taskUnionExamine.vue

@@ -51,7 +51,7 @@
                 ? currentOrgTabs
                 : ['department', 'employee']
               : type == 'startDraf'
-              ? ['enterprise', 'employee']
+              ? ['employee', 'enterprise']
               : ['enterprise']
           "
           :params="

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;

package/packages/icon/index.js

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

package/packages/icons/index.js

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