eoss-ui 0.8.39 → 0.8.40

package/packages/flow/src/main.vue

@@ -41,6 +41,8 @@
       :userSelectRange="userSelectRange"
       :rows="rows"
       @success="handleNewFlowSuccess"
+      @save="handleNewFlowSave"
+      @shrink="setShrink"
       :showOther="showOther"
       :flowLabelConfig="flowLabelConfig"
       :isEndMessage="isEndMessage"
@@ -59,7 +61,7 @@
             size="medium"
             class="es-icon"
             :icon="shrink ? 'es-icon-shouqi' : 'es-icon-zhankai'"
-            @click="setShrink"
+            @click="setShrink(!shrink)"
           ></es-button>
         </div>
         <div class="es-opinion" v-show="!shrink">
@@ -229,7 +231,7 @@
             size="medium"
             class="es-icon"
             :icon="shrink ? 'es-icon-shouqi' : 'es-icon-zhankai'"
-            @click="setShrink"
+            @click="setShrink(!shrink)"
           ></es-button>
         </div>
         <!-- 'es-icon-indent' : 'es-icon-increase' -->
@@ -1990,6 +1992,9 @@ export default {
         this.$refs.esContent.scrollTop += this.$refs.messagebox.clientHeight;
       });
     },
+    handleNewFlowSave(businessIds){
+      this.$emit('save', businessIds)
+    },
     handleNewFlowSuccess(type) {
       if(type == 'taskRead'){
         this.$emit('successRead',type);
@@ -2124,10 +2129,10 @@ export default {
         }
       }
     },
-    setShrink() {
-      this.shrink = !this.shrink;
+    setShrink(val) {
+      this.shrink = val;
       this.styles = this.shrink
-        ? { width: 0 }
+        ? { width: '80px' }
         : { width: this.width ? parseInt(this.width, 10) + 'px' : '' };
       this.$emit('shrink', this.shrink);
     },

package/packages/flow/src/selectUser.vue

@@ -382,6 +382,7 @@ export default {
       return mixArr;
     },
     getSelectUser(val) {
+      console.log(val,'val')
       this.newOptions = [];
       let data = {};
       if (this.mix) data = this.getMixList();

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

@@ -36,6 +36,9 @@
           "
           @btn-click="handleBtnClick"
           @selection-change="handleSelectionChange"
+          @search="handleSplitReadingSearch"
+          @page-size-change="handleSplitReadingSizeChange"
+          @page-current-change="handleSplitReadingCurrentChange"
         ></es-data-table>
       </div>
     </div>
@@ -280,6 +283,9 @@ export default {
       currentPage: 1,
       pageSize: 20,
       flowListCount: {},
+      splitReadingSearchKey: '',
+      splitReadingPageNum: 1,
+      splitReadingPageSize: 5,
       currentUserHasPresetInfoAuth: false,
       pressThead: [
         {
@@ -364,8 +370,8 @@ export default {
         },
         {
           title: '办理意见',
-          align: 'center',
-          showOverflowTooltip: true,
+          align: 'left',
+          showOverflowTooltip: false,
             'min-width':200,
           // sortable: true,
           field: 'doresult'
@@ -405,8 +411,8 @@ export default {
         },
         {
           title: '办理意见',
-          align: 'center',
-          showOverflowTooltip: true,
+          align: 'left',
+          showOverflowTooltip: false,
           width: 240,
           // sortable: true,
           field: 'doresult'
@@ -719,6 +725,19 @@ export default {
             type: 'text',
             contents:
               (this.taskReadName ? this.taskReadName : '非流程') + '列表'
+          },
+          {
+            type: 'search',
+            config: {
+              enterSubmit: true
+            },
+            contents: [
+              {
+                name: 'splitReadingSearchKey',
+                type: 'text',
+                placeholder: '分阅办理人名称...'
+              }
+            ]
           }
         ],
         circular: [
@@ -758,6 +777,22 @@ export default {
         totalCount: this.total
       };
     },
+    filteredSplitReadingData() {
+      if (!this.splitReadingSearchKey) {
+        return this.splitReadingData;
+      }
+      const key = String(this.splitReadingSearchKey).trim();
+      return this.splitReadingData.filter((item) => {
+        return item.userName && String(item.userName).includes(key);
+      });
+    },
+    splitReadingPageInfo() {
+      return {
+        pageNum: this.splitReadingPageNum,
+        pageSize: this.splitReadingPageSize,
+        totalCount: this.filteredSplitReadingData.length
+      };
+    },
     theads() {
       const _that = this;
       let newThead = {
@@ -835,9 +870,9 @@ export default {
           {
             label: '办理意见',
             field: 'doresult',
-            align: 'center',
+            align: 'left',
             width: this.theadWidth.doresult,
-            showOverflowTooltip: true,
+            showOverflowTooltip: false,
             'min-width':200,
             key: 'blyj',
             render: (h, params) => {
@@ -1014,11 +1049,11 @@ export default {
           {
             label: '办理意见',
             field: 'doresult',
-            align: 'center',
+            align: 'left',
             'min-width':200,
             key: 'blyj',
             width: this.theadWidth.doresult,
-            showOverflowTooltip: true,
+            showOverflowTooltip: false,
             render: (h, params) => {
               if (
                 params.row.doresult &&
@@ -1457,13 +1492,18 @@ export default {
               }
             });
           }
-          return {
+          const baseConfig = {
             type: item,
             checkbox: newContents.indexOf('untreatedRead') != -1,
             toolbar: this.toolbars[item],
             thead: data.length > 0 ? data : this.theads[item],
             showFormBtn: false
           };
+          if (item === 'splitReading') {
+            baseConfig.showFormBtn = true;
+            baseConfig.page = this.splitReadingPageInfo;
+          }
+          return baseConfig;
         } else {
           if (!Object.prototype.hasOwnProperty.call(item, 'toolbar')) {
             let toolbars = this.toolbars[item.type];
@@ -1610,7 +1650,20 @@ export default {
   },
 
   methods: {
-     /**
+     handleSplitReadingSearch(data) {
+      if (data && data.splitReadingSearchKey !== undefined) {
+        this.splitReadingSearchKey = data.splitReadingSearchKey;
+        this.splitReadingPageNum = 1;
+      }
+    },
+    handleSplitReadingSizeChange(size) {
+      this.splitReadingPageSize = size;
+      this.splitReadingPageNum = 1;
+    },
+    handleSplitReadingCurrentChange(page) {
+      this.splitReadingPageNum = page;
+    },
+    /**
      * handleBatchDelete
      * @desc:批量删除
      * @author liufan
@@ -1794,10 +1847,15 @@ export default {
           this.flowListCount.sign = this.signData.length;
           this.flowListCount.signData = this.signData;
           return this.signData;
-        case 'splitReading':
-          this.flowListCount.splitReading = this.splitReadingData.length;
-          this.flowListCount.splitReadingData = this.splitReadingData;
-          return this.splitReadingData;
+        case 'splitReading': {
+          const splitData = this.filteredSplitReadingData;
+          this.flowListCount.splitReading = splitData.length;
+          this.flowListCount.splitReadingData = splitData;
+          const start =
+            (this.splitReadingPageNum - 1) * this.splitReadingPageSize;
+          const end = start + this.splitReadingPageSize;
+          return splitData.slice(start, end);
+        }
         case 'circular':
           this.flowListCount.circular = this.circularData.length;
           this.flowListCount.circularData = this.circularData;