eoss-ui 0.5.11 → 0.5.13

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

@@ -415,7 +415,13 @@ export default {
       type: Boolean,
       default: true
     },
-    zoom: false
+    zoom: false,
+    exportExcludeLabel: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
   },
   data() {
     return {
@@ -451,8 +457,8 @@ export default {
     },
     theads: {
       get() {
-        if (typeof this.thead === 'string') {
-          this.theadData.length && this.setMinWidth(this.theadData);
+        if (this.theadData.length) {
+          this.setMinWidth(this.theadData);
           return this.theadData;
         }
         this.setMinWidth(this.thead);
@@ -581,6 +587,11 @@ export default {
         this.config = util.extend({}, this.config, this.page);
       }
     },
+    'config.pageNum'() {
+      if (this.data.length) {
+        this.$refs.oaTable.resetScroll(0, 0);
+      }
+    },
     height: {
       immediate: true,
       handler(val) {
@@ -822,10 +833,16 @@ export default {
         this.config.pageNum = 1;
       }
       this.tableLoadingText = '加载中...';
-      let reqData = util.extend({}, this.param, {
-        pageNum: this.config.pageNum,
-        pageSize: this.config.pageSize
-      });
+      let reqData = util.extend(
+        {},
+        this.param,
+        this.page
+          ? {
+              pageNum: this.config.pageNum,
+              pageSize: this.config.pageSize
+            }
+          : {}
+      );
       if (where) {
         reqData = util.extend({}, reqData, where);
       }
@@ -841,6 +858,7 @@ export default {
         .then((res) => {
           this.tableLoading = false;
           if (res.rCode === 0 || res.status === 'success') {
+            this.$refs.oaTable.resetScroll(0, 0);
             let results =
               this.parseData !== undefined
                 ? this.parseData(res.results || res.data || res)
@@ -1153,9 +1171,14 @@ export default {
           ) {
             text = this.theads[this.theads.length - 1].title;
           }
+          let type = ['selection', 'index', 'expand'];
           thead = thead.map((item) => {
             return item.filter((ele) => {
-              return ele.label !== text && ele.label;
+              return (
+                !type.includes(ele.type) &&
+                ele.label !== text &&
+                !this.exportExcludeLabel.includes(ele.label)
+              );
             });
           });
           util.exportXls({

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

@@ -95,7 +95,7 @@ export default {
       this.visible = true;
     },
     getThead(res, data) {
-      res.forEach(item => {
+      res.forEach((item) => {
         if (
           item.type !== 'index' &&
           item.type !== 'selection' &&

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

@@ -448,7 +448,7 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type' }
+          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
         })
         .then((res) => {
           const { status, data } = res;

package/packages/flow/src/main.vue

@@ -307,6 +307,7 @@
                   :multiple="true"
                   :selectUserList="selectReadUserList"
                   :options="userOptions"
+                  title="分阅用户"
                   :mix="true"
                   :types="types"
                   @change="changeSelectReadUser($event, 'nextReadUserId')"
@@ -327,6 +328,7 @@
                   :options="presetOptions"
                   :radioList="presetReadUserId"
                   :presetEdit="1"
+                  title="分阅用户"
                   :mix="true"
                   :types="types"
                   @change="changeSelectReadUser($event, 'presetReadUserId')"
@@ -1195,7 +1197,7 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type' }
+          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
         })
         .then((res) => {
           const { status, data } = res;

package/packages/flow/src/processForm.vue

@@ -145,6 +145,7 @@
             :multiple="true"
             :selectUserList="selectReadUserList"
             :options="userOptions"
+            title="分阅用户"
             :mix="true"
             :types="types"
             @change="changeSelectReadUser($event, 'nextReadUserId')"
@@ -163,6 +164,7 @@
             :multiple="true"
             :selectUserList="selectPresetUserList"
             :options="presetOptions"
+            title="分阅用户"
             :radioList="presetReadUserId"
             :presetEdit="1"
             :mix="true"
@@ -181,10 +183,7 @@
             v-model="nextNode.handleExplain"
           />
         </el-form-item>
-        <el-form-item
-          prop="noticeType"
-          label="通知方式"
-        >
+        <el-form-item prop="noticeType" label="通知方式">
           <el-checkbox-group v-model="nextNode.noticeType">
             <el-checkbox
               v-for="item of nextNode.noticeList"
@@ -331,11 +330,17 @@ export default {
       tabs: {
         employee: {
           param: {
-            filid: sessionStorage.getItem('orgId'),
+            filid: JSON.parse(sessionStorage.getItem('mainConfig')).userModel
+              .orgId,
             name: '本单位用户'
           }
         },
-        department: { param: { filid: sessionStorage.getItem('orgId') } }
+        department: {
+          param: {
+            filid: JSON.parse(sessionStorage.getItem('mainConfig')).userModel
+              .orgId
+          }
+        }
       },
       nextUserTabs: {},
       selectPresetUserList: [],
@@ -383,7 +388,6 @@ export default {
   mounted() {
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
-
   },
   methods: {
     getIsShowNextUser(val) {
@@ -401,7 +405,12 @@ export default {
         if (val == 7 || val == 8) {
           this.nextUserTypes = ['department'];
           this.nextUserTabs = {
-            department: { param: { filid: sessionStorage.getItem('orgId') } }
+            department: {
+              param: {
+                filid: JSON.parse(sessionStorage.getItem('mainConfig'))
+                  .userModel.orgId
+              }
+            }
           };
           this.multiple = true;
         } else if (val == 9 || val == 10) {
@@ -412,7 +421,12 @@ export default {
           this.nextUserTypes = ['department', 'enterprise'];
           this.nextUserTabs = {
             enterprise: { param: { filid: 'other' } },
-            department: { param: { filid: sessionStorage.getItem('orgId') } }
+            department: {
+              param: {
+                filid: JSON.parse(sessionStorage.getItem('mainConfig'))
+                  .userModel.orgId
+              }
+            }
           };
           this.multiple = true;
         }
@@ -468,7 +482,7 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type' }
+          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
         })
         .then((res) => {
           const { status, data } = res;

package/packages/flow/src/processReject.vue

@@ -131,7 +131,7 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type' }
+          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
         })
         .then(res => {
           const { status, data } = res;

package/packages/flow/src/startTaskRead.vue

@@ -384,7 +384,7 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type' }
+          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
         })
         .then((res) => {
           const { status, data } = res;

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

@@ -8,7 +8,7 @@
         (item.type == 'splitReading' &&
           splitReadingData &&
           splitReadingData.length > 0) ||
-        (item.type == 'preset' && presetData && presetData.length > 0) ||
+        (item.type == 'preset' && presetData && presetData.length > 0 && currentUserHasPresetInfoAuth) ||
         (item.type != 'splitReading' && item.type != 'preset')
       "
     >
@@ -128,6 +128,7 @@ export default {
       pressTableList: [],
       currentPage: 1,
       pageSize: 20,
+      currentUserHasPresetInfoAuth:false,
       pressThead: [
         {
           title: '催办节点',
@@ -320,6 +321,7 @@ export default {
             label: '经办部门',
             field: 'deptid',
             align: 'center',
+            key:'jbbm',
             showOverflowTooltip: true,
             width: 150
           },
@@ -327,6 +329,7 @@ export default {
             label: '步骤',
             field: 'itemname',
             align: 'center',
+            key:'bz',
             showOverflowTooltip: true,
             width: 110
           },
@@ -334,6 +337,7 @@ export default {
             label: '办理人',
             field: 'userName',
             align: 'center',
+            key:'blr',
             showOverflowTooltip: true,
             width: 110
           },
@@ -342,11 +346,13 @@ export default {
             field: 'deptName',
             align: 'center',
             showOverflowTooltip: true,
+            key:'blrbm',
             width: 110
           },
           {
             label: '状态',
             field: 'pendstate',
+            key:'zt',
             align: 'center',
             showOverflowTooltip: true,
             width: 80,
@@ -369,6 +375,7 @@ export default {
             field: 'doresult',
             align: 'center',
             showOverflowTooltip: true,
+            key:'blyj',
             render: (h, params) => {
               return h(
                 'span',
@@ -381,6 +388,7 @@ export default {
             label: '验签',
             field: 'authTypeStr',
             align: 'center',
+            key:'yq',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -393,6 +401,7 @@ export default {
           },
           {
             label: '附件',
+            key:'fj',
             field: 'hasAdjunct',
             align: 'center',
             showOverflowTooltip: true,
@@ -414,6 +423,7 @@ export default {
             label: '时间',
             field: 'doetime',
             align: 'center',
+            key:'sj',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -428,6 +438,7 @@ export default {
             label: '代办人',
             field: 'douserid',
             align: 'center',
+            key:'dbr',
             showOverflowTooltip: true,
             width: 80,
             hide: _that.flowTableInfo.hasAgent != '1'
@@ -436,6 +447,7 @@ export default {
             label: '催办',
             field: 'pressTimes',
             align: 'center',
+            key:'cb',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -472,6 +484,7 @@ export default {
           {
             label: '经办部门',
             field: 'deptid',
+            key:'jbbm',
             align: 'center',
             showOverflowTooltip: true,
             width: 150
@@ -480,6 +493,7 @@ export default {
             label: '步骤',
             field: 'itemname',
             align: 'center',
+            key:'bz',
             showOverflowTooltip: true,
             width: 110
           },
@@ -487,6 +501,7 @@ export default {
             label: '办理人',
             field: 'userName',
             align: 'center',
+            key:'blr',
             showOverflowTooltip: true,
             width: 110
           },
@@ -494,6 +509,7 @@ export default {
             label: '状态',
             field: 'pendstate',
             align: 'center',
+            key:'zt',
             showOverflowTooltip: true,
             width: 80,
             render: (h, params) => {
@@ -514,6 +530,7 @@ export default {
             label: '办理意见',
             field: 'doresult',
             align: 'center',
+            key:'blyj',
             showOverflowTooltip: true,
             render: (h, params) => {
               return h(
@@ -527,6 +544,7 @@ export default {
             label: '验签',
             field: 'authTypeStr',
             align: 'center',
+            key:'yq',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -541,6 +559,7 @@ export default {
             label: '附件',
             field: 'hasAdjunct',
             align: 'center',
+            key:'fj',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -560,6 +579,7 @@ export default {
             label: '时间',
             field: 'doetime',
             align: 'center',
+            key:'sj',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -574,6 +594,7 @@ export default {
             label: '代办人',
             field: 'douserid',
             align: 'center',
+            key:'dbr',
             showOverflowTooltip: true,
             width: 80,
             hide: _that.flowTableInfo.hasAgent != '1'
@@ -582,6 +603,7 @@ export default {
             label: '催办',
             field: 'pressTimes',
             align: 'center',
+            key:'cb',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -1084,12 +1106,13 @@ export default {
           const {
             status,
             message,
-            data: { presetInfoList, presetInfoListHiddenColumns, canDelete }
+            data: { presetInfoList, presetInfoListHiddenColumns, canDelete,currentUserHasPresetInfoAuth }
           } = res;
           this.loading.close();
           if (status == 'success') {
             presetInfoList && (this.presetData = presetInfoList);
             this.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
+            this.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth
             this.canDelete = canDelete;
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');

package/packages/label/src/main.vue

@@ -10,6 +10,7 @@ export default {
         return '';
       }
     },
+    text: String,
     rules: {
       type: [Array, Object],
       default() {
@@ -132,8 +133,8 @@ export default {
         doms.push(this.$slots.prepend);
       }
       if (typeof this.contents === 'string') {
-        if (this.contents) {
-          doms.push(this.contents);
+        if (this.contents || this.text) {
+          doms.push(this.contents || this.text);
         }
         if (this.icon) {
           if (

package/packages/main/src/main.vue

@@ -254,6 +254,8 @@ import notice from './notice.vue';
 import AsyncComponent from './async-component/index.vue';
 import {
   //authCenter,
+  wss,
+  topic,
   mainConfig,
   updateUserCustomInfo,
   getComplexApplications,
@@ -540,8 +542,6 @@ export default {
         copyright: { comp: '', data: {} }
       },
       pageLoading: false,
-      close: null,
-      connect: 0,
       wjName: 'singlespa',
       menus: '',
       //头部导航
@@ -618,7 +618,8 @@ export default {
       navIds: null,
       timer: null,
       pid: null,
-      showPage: false
+      showPage: false,
+      webSocket: null
     };
   },
   created() {
@@ -818,6 +819,9 @@ export default {
       this.showSet = !this.showSet;
     },
     setConfig(results, flag) {
+      if (this.socket) {
+        this.initWebSocket();
+      }
       if (flag) {
         sessionStorage.setItem('mainConfig', JSON.stringify(results));
         util.setStorage({
@@ -933,9 +937,6 @@ export default {
         .then((res) => {
           if (res && res.rCode === 0) {
             this.setConfig(res.results, 1);
-            if (this.socket) {
-              this.initWebSocket();
-            }
             if (this.remote) {
               this.getMenu();
             } else {
@@ -1874,11 +1875,11 @@ export default {
     },
     //开启weosocket
     initWebSocket() {
-      util
-        .socket()
-        .then((res, close) => {
-          this.close = close;
-          let data = res.data;
+      this.webSocket = util.socket({
+        url: wss,
+        take: topic,
+        success: (res) => {
+          let data = res.data || {};
           for (let i in data) {
             if (data[i] !== null && data[i] !== undefined) {
               if (i === 'onlineUserNums' && data[i] > 0) {
@@ -1902,7 +1903,9 @@ export default {
             }
           }
           if (this.$store) {
-            this.$store.commit('websocket', data);
+            try {
+              this.$store.commit('websocket', data);
+            } catch (error) {}
           }
           if (this.$eventBus) {
             this.$eventBus.$emit('websocket', data);
@@ -1910,10 +1913,8 @@ export default {
           if (util.win.eventBus) {
             util.win.eventBus.$emit('websocket', data);
           }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+        }
+      });
     },
     handleOpened(res) {
       if (res === undefined) {
@@ -2048,8 +2049,8 @@ export default {
   },
   beforeDestroy() {
     this.timer = null;
-    if (this.close) {
-      this.close();
+    if (this.webSocket) {
+      this.webSocket.destroy();
     }
   }
 };