eoss-ui 0.8.39 → 0.8.41

package/packages/flow/src/flow.vue

@@ -10,7 +10,7 @@
       style="height: 100%; display: flex; flex-direction: column"
     >
       <div class="es-flow-top">
-        <div class="es-flow-title">
+        <div :class="`es-flow-title ${shrink?'border_none' : ''}`">
           <span v-show="!shrink"
             >当前步骤：{{ isFlow ? nodeName || '拟稿' : NodeName }}</span
           >
@@ -70,6 +70,7 @@
             label="下步节点"
           >
             <el-select
+            class="es-flow-select"
               v-if="nextNodeCheckType == 'select'"
               v-model="circulateForm.nextNodeId"
               style="width: 100% !important"
@@ -127,6 +128,7 @@
       :key="StartTaskReadKey"
       typeCode="read"
       :param="param"
+      :businessName="businessName"
       :selectorConfig="selectorConfig"
       :resetAppId="resetAppId"
       :taskExamine="taskExamineInfo"
@@ -178,7 +180,7 @@
       v-else
     >
       <div class="es-flow-top">
-        <div class="es-flow-title">
+        <div :class="`es-flow-title ${shrink?'border_none' : ''}`">
           <span v-show="!shrink"
             >当前节点：{{ isFlow ? nodeName || '拟稿' : NodeName }}</span
           >
@@ -333,6 +335,7 @@
             >
               <el-select
                 slot="prepend"
+            class="es-flow-select"
                 v-model="nodeInfo.nextNode"
                 style="width: calc(100% + 40px)"
                 :placeholder="`请选择流程`"
@@ -468,6 +471,7 @@
                   v-if="nextOperateCheckType == 'select'"
                   v-model="nextNode.nextOperate"
                   :placeholder="`请选择下步操作`"
+            class="es-flow-select"
                   :disabled="operationList && operationList.length == 1"
                   @change="selecNext($event, true)"
                 >
@@ -505,10 +509,12 @@
                     v-model="nextNode.nextNodeId"
                     :placeholder="`请选择下步节点`"
                     :disabled="nodeInfos && nodeInfos.length == 1"
+            class="es-flow-select"
                     @change="selecNext($event, false)"
                   >
                     <el-option
                       v-for="items in nodeInfos"
+            class="es-flow-select"
                       :key="items.id"
                       :label="items.nodeName"
                       :value="items.nodeId"
@@ -613,6 +619,7 @@
                 >
                   <el-select
                     v-model="nextNode.mainSubId"
+            class="es-flow-select"
                     :placeholder="`请选择主办`"
                   >
                     <el-option
@@ -743,7 +750,7 @@
             </div>
           </div>
           <CustomPreset
-            v-if="isCustomPreset"
+            v-if="isCustomPreset && nextNode.nextOperate != 9"
             ref="customPreset"
             @changeCustom="
               (data) => {
@@ -911,6 +918,7 @@
           />
         </el-form-item>
       </el-form>
+      <div class="es-info">
       <ProcessReject
         v-if="btnType === 'reject'"
         ref="reject"
@@ -928,7 +936,7 @@
         @cancel="closeProcess($event, 'showReject')"
       />
       <StartTaskRead
-        v-else-if="btnType === 'toStartTaskRead' || btnType==='toTaskReadAndEnd'"
+        v-else-if="btnType === 'toStartTaskRead' || btnType==='toTaskReadAndEnd' || btnType==='toTransfer'"
         :ref="btnType"
         :pending-id="pendingId"
         hideBtn
@@ -936,6 +944,7 @@
         :opinion="value"
         :type="taskReadType"
         :resetAppId="resetAppId"
+        :businessName="businessName"
         :showTooltip="showTooltip"
         :flowLabelConfig="flowLabelConfig"
         :hideMessage="hideMessage"
@@ -946,6 +955,7 @@
         :news-info="nextNode.notificationMsg"
         @cancel="closeProcess($event, 'showTaskRead')"
       />
+ 
       <TaskUnionExamine
         v-else-if="
           btnType === 'toTakeAdvice' ||
@@ -966,6 +976,7 @@
         :multiple="flowMultiple"
         :disabled="flowDisabled"
       />
+      </div>
       <div
         class="es-flow-buttons"
         v-if="newTypeCode != 'fenyue' && !shrink"
@@ -1229,6 +1240,7 @@
           :opinion="value"
           :type="taskReadType"
           :showTooltip="showTooltip"
+          :businessName="businessName"
           :flowLabelConfig="flowLabelConfig"
           :hideMessage="hideMessage"
           :selectorConfig="selectorConfig"
@@ -1415,6 +1427,7 @@ export default {
     nodeName: { type: String, default: '' },
     typeCode: { type: String, default: '' },
     selectorConfig: { type: [Object, undefined], default: undefined },
+    businessName: { type: String, default: '' },
     flowTypeCode: { type: String, default: '' },
     defaultProcessKey: { type: String, default: '' },
     hideBtn: { type: Boolean, default: false },
@@ -2185,7 +2198,7 @@ export default {
     setShrink() {
       this.shrink = !this.shrink;
       this.styles = this.shrink
-        ? { width: 0 }
+        ? { width: '80px' }
         : { width: this.width ? parseInt(this.width, 10) + 'px' : '' };
       this.$emit('shrink', this.shrink);
     },
@@ -2389,6 +2402,7 @@ export default {
     saveInfo(type, btn) {
       if (this.isFlow) {
         if (!type) {
+          console.log(btn)
           if (btn && btn.before) {
             btn
               .before(
@@ -2402,7 +2416,7 @@ export default {
             this.beforeSubmit(
               btn && Object.prototype.hasOwnProperty.call(btn, 'code')
                 ? btn.code
-                : 1
+                : 1,btn.event
             )
               .then((next) => {
                 this.$emit('save', this.businessIds);
@@ -2496,7 +2510,7 @@ export default {
     taskReadBtn(res) {
       // return this.$message.warning('暂未开放！敬请期待');
       
-      this.isLoadRead() && (this.btnType='')
+      this.btnType=''
       setTimeout(() => {
         if (this.beforeSubmit != undefined) {
           this.beforeSubmit()
@@ -2504,14 +2518,22 @@ export default {
               if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
               this.taskReadType = 'create';
               // this.showTaskRead = true;
-              this.btnType = this.btnFunValue(res.fun);
+              if(this.typeCode == 'fenyue'){
+                this.showTaskRead = true;
+              }else{
+                this.btnType = this.btnFunValue(res.fun);
+              }
             })
             .catch((e) => {});
         } else {
           if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
           this.taskReadType = 'create';
           // this.showTaskRead = true;
-          this.btnType = this.btnFunValue(res.fun);
+         if(this.typeCode == 'fenyue'){
+                this.showTaskRead = true;
+              }else{
+                this.btnType = this.btnFunValue(res.fun);
+              }
         }
       }, 0);
     },
@@ -2870,7 +2892,7 @@ export default {
      **/
     toTaskReadAndEnd(res) {
       
-      this.isLoadRead() && (this.btnType='')
+      this.btnType=''
       setTimeout(() => {
         if (this.beforeSubmit != undefined) {
           this.beforeSubmit()
@@ -2957,17 +2979,22 @@ export default {
      * @date 2022年9月29日
      **/
     toTransfer(res) {
-      if (this.beforeSubmit != undefined) {
+      this.btnType = ''
+      setTimeout(() => {
+        if (this.beforeSubmit != undefined) {
         this.beforeSubmit(0)
           .then((next) => {
             this.taskReadType = 'transfer';
-            this.showTaskRead = true;
+            // this.showTaskRead = true;
+            this.btnType = this.btnFunValue(res.fun);
           })
           .catch((e) => {});
       } else {
         this.taskReadType = 'transfer';
-        this.showTaskRead = true;
+        this.btnType = this.btnFunValue(res.fun);
+        // this.showTaskRead = true;
       }
+      }, 0);
     },
     handleChangeTime(val) {
       this.nextNode.customLimitTime = val;

package/packages/flow/src/main.vue

@@ -17,6 +17,7 @@
       @buttonClick="handleButtonClick"
       :nodeName="nodeName"
       :typeCode="typeCode"
+      :businessName="businessName"
       :ownerType="ownerType"
       :selectorConfig="selectorConfig"
       :flowTypeCode="flowTypeCode"
@@ -41,6 +42,8 @@
       :userSelectRange="userSelectRange"
       :rows="rows"
       @success="handleNewFlowSuccess"
+      @save="handleNewFlowSave"
+      @shrink="setShrink"
       :showOther="showOther"
       :flowLabelConfig="flowLabelConfig"
       :isEndMessage="isEndMessage"
@@ -59,7 +62,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 +232,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' -->
@@ -1182,6 +1185,7 @@
         <StartTaskRead
           :pending-id="pendingId"
           :opinion="value"
+          :businessName="businessName"
           :type="taskReadType"
           :showTooltip="showTooltip"
           :flowLabelConfig="flowLabelConfig"
@@ -1414,6 +1418,7 @@ export default {
       type: Object,
       default: () => {}
     },
+    businessName: { type: String, default: '' },
     selectorParams: {
       type: Object,
       default: () => {
@@ -1990,6 +1995,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 +2132,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/src/startTaskRead.vue

@@ -205,6 +205,7 @@ export default {
       type: [Object, undefined],
       default: undefined
     },
+    businessName: { type: String, default: '' },
     readParams: {
       type: [Object, undefined],
       default: undefined
@@ -640,6 +641,8 @@ export default {
             }
             if(this.subParams){
               params = { ...params, ...this.subParams };
+            }else if(this.businessName){
+              params.businessName = this.businessName;
             }
             delete this.configInfo.taskExamine.taskExamineParam;
             util

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'
@@ -539,6 +545,7 @@ export default {
       showSuggest: 'all', //筛选显示数据
       presetInfoListHiddenColumns: '', //隐藏表格展示数据
       canDelete: false, //是否展示操作按钮
+      presetCanDelete: false, //预设列表是否展示操作按钮
       canBatchDelete: false, //是否可以批量删除
       isSuperRole: false, //是否管理员
       isShowReset: false, //是否显示重设记录
@@ -719,6 +726,19 @@ export default {
             type: 'text',
             contents:
               (this.taskReadName ? this.taskReadName : '非流程') + '列表'
+          },
+          {
+            type: 'search',
+            config: {
+              enterSubmit: true
+            },
+            contents: [
+              {
+                name: 'splitReadingSearchKey',
+                type: 'text',
+                placeholder: '分阅办理人名称...'
+              }
+            ]
           }
         ],
         circular: [
@@ -758,6 +778,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 +871,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 +1050,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 +1493,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];
@@ -1590,7 +1631,7 @@ export default {
           (items) => this.presetInfoListHiddenColumns.indexOf(items.key) == -1
         );
       }
-      if (!this.canDelete) table.splice(table.length - 1, 1);
+      if (!this.presetCanDelete) table.splice(table.length - 1, 1);
       return table;
     }
   },
@@ -1610,7 +1651,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 +1848,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;
@@ -2327,7 +2386,7 @@ export default {
             }
             this.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
             this.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth;
-            this.canDelete = canDelete;
+            this.presetCanDelete = canDelete;
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
           }