eoss-ui 0.6.61 → 0.6.62

package/packages/flow/src/supervise.vue

@@ -8,48 +8,51 @@
       label-position="left"
     >
       <el-form-item prop="pendTitle" label="标题">
-        <el-input v-model="nextNode.pendTitle" disabled type="textarea" autosize />
+        <el-input
+          v-model="nextNode.pendTitle"
+          disabled
+          type="textarea"
+          autosize
+        />
       </el-form-item>
       <el-form-item prop="currentHandleNode" label="当前办理节点">
         <el-input v-model="nextNode.currentHandleNode" disabled />
       </el-form-item>
       <el-form-item prop="pendingUserNames" label="当前办理人">
-        <el-input type="textarea" autosize v-model="nextNode.pendingUserNames"  disabled />
+        <el-input
+          type="textarea"
+          autosize
+          v-model="nextNode.pendingUserNames"
+          disabled
+        />
       </el-form-item>
       <el-form-item prop="noticeType" label="通知方式">
-          <el-checkbox-group v-model="nextNode.noticeType">
-            <el-checkbox
-              v-for="(item,index) of nextNode.notificationType"
-              :key="index"
-              :label="item.cciValue"
-            >
-              {{ item.shortName }}
-            </el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-        <!-- v-show="nextNode.noticeType.length != 0" -->
-        <el-form-item
-          prop="notifyMessage"
-          label="通知消息"
-        >
-          <es-input
-            style="
-              border-color: #ccc;
-              padding: 5px;
-              border-radius: 5px;
-              font-size: 13px;
-            "
-            type="textarea"
-            v-model="nextNode.notifyMessage"
-          />
-        </el-form-item>
-        <el-form-item style="margin-bottom: 0px">
-        <div style="text-align: right">
-          <el-button
-            type="primary"
-            size="small"
-            @click="subProcess()"
+        <el-checkbox-group v-model="nextNode.noticeType">
+          <el-checkbox
+            v-for="(item, index) of nextNode.notificationType"
+            :key="index"
+            :label="item.cciValue"
           >
+            {{ item.shortName }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <!-- v-show="nextNode.noticeType.length != 0" -->
+      <el-form-item prop="notifyMessage" label="通知消息">
+        <es-input
+          style="
+            border-color: #ccc;
+            padding: 5px;
+            border-radius: 5px;
+            font-size: 13px;
+          "
+          type="textarea"
+          v-model="nextNode.notifyMessage"
+        />
+      </el-form-item>
+      <el-form-item style="margin-bottom: 0px">
+        <div style="text-align: right">
+          <el-button type="primary" size="small" @click="subProcess()">
             确认
           </el-button>
         </div>
@@ -62,18 +65,19 @@
 import { toTaskSupervise, toTaskSuperviseSub } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
 export default {
+  name:'supervise',
   props: {
     businessId: {
       type: String,
       default: ''
-    }
+    },
   },
   data() {
     return {
       nextNode: {
-        noticeType:[],
-        notificationType:[],
-        loading:undefined
+        noticeType: [],
+        notificationType: [],
+        loading: undefined
       }
     };
   },
@@ -81,39 +85,40 @@ export default {
     this.getFlowInfo();
   },
   methods: {
-    subProcess(){
-        if(this.nextNode.noticeType.length == 0){
-            this.$message.warning('请选择通知方式');
-            return
-        }
-        if(!this.nextNode.notifyMessage){
-            this.$message.warning('请填写通知消息内容');
-            return
-        }
-        let {noticeType,notifyMessage,pendingUserIds} = this.nextNode
-        let params = {
-           url:toTaskSuperviseSub,
-           params:{
-            userId:util.getStorage('userId'),
-            urgeUserIds:pendingUserIds,
-            notificationType:noticeType.join(','),notificationMessage:notifyMessage,
-            businessId:this.businessId
-           }
+    subProcess() {
+      if (this.nextNode.noticeType.length == 0) {
+        this.$message.warning('请选择通知方式');
+        return;
+      }
+      if (!this.nextNode.notifyMessage) {
+        this.$message.warning('请填写通知消息内容');
+        return;
+      }
+      let { noticeType, notifyMessage, pendingUserIds } = this.nextNode;
+      let params = {
+        url: toTaskSuperviseSub,
+        params: {
+          userId: util.getStorage('userId'),
+          urgeUserIds: pendingUserIds,
+          notificationType: noticeType.join(','),
+          notificationMessage: notifyMessage,
+          businessId: this.businessId
         }
-        this.loading = util.loading(this.$loading, '提交中...');
-       util.ajax(params).then(res => {
+      };
+      this.loading = util.loading(this.$loading, '提交中...');
+      util.ajax(params).then((res) => {
         this.loading.close();
-        if(res.rCode == 0 || res.status=='success'){
-            this.$message.success('操作成功');
-            this.$parent.$emit('success')
-        }else{
-            this.$message.error(res.message || '系统错误，请联系管理员！');
+        if (res.rCode == 0 || res.status == 'success') {
+          this.$message.success('操作成功');
+          this.$parent.$emit('success');
+        } else {
+          this.$message.error(res.message || '系统错误，请联系管理员！');
         }
-       })
+      });
     },
-    
+
     getFlowInfo() {
-        this.loading = util.loading(this.$loading, '加载中...');
+      this.loading = util.loading(this.$loading, '加载中...');
       util
         .ajax({
           url: toTaskSupervise,
@@ -123,12 +128,12 @@ export default {
           }
         })
         .then((res) => {
-            this.loading.close();
-          console.log(res);
-          if(res.rCode == 0){
-            this.nextNode = {...this.nextNode,...res.results};
-            this.nextNode.noticeType = res.results.defaultNotificationType.split(',');
-          }else{
+          this.loading.close();
+          if (res.rCode == 0) {
+            this.nextNode = { ...this.nextNode, ...res.results };
+            this.nextNode.noticeType =
+              res.results.defaultNotificationType.split(',');
+          } else {
             this.$message({
               message: res.rMsg,
               type: 'error'

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

@@ -15,7 +15,11 @@
         (item.type != 'splitReading' && item.type != 'preset')
       "
     >
-      <div class="es-flow-list-box">
+      <div
+        class="es-flow-list-box"
+        :ref="item.type"
+        :style="`position:${height == 'auto' ? 'unset' : 'absolute'}`"
+      >
         <es-data-table
           v-if="show"
           :class="{ 'es-flow-group-data-table': item.type !== 'sign' }"
@@ -24,6 +28,7 @@
           @cell-click="handleCellClick"
           full
           v-bind="item"
+          :height="getHeight(item.type)"
           :data="returnData(item.type)"
           @btn-click="handleBtnClick"
           @selection-change="handleSelectionChange"
@@ -141,6 +146,11 @@ export default {
         return ['flow', 'splitReading', 'preset'];
       }
     },
+    height: {
+      type: String,
+      default: ''
+    },
+
     theadWidth: {
       type: Object,
       default: () => {
@@ -159,7 +169,14 @@ export default {
       pressLoading: false,
       pressTableList: [],
       circularData: [],
-      selectList:[],
+      selectList: [],
+      flowHeight: '',
+      presetHeight: '',
+      signHeight: '',
+      splitReadingHeight: '',
+      circularHeight: '',
+      untreatedReadHeight: '',
+      processedReadHeight: '',
       untreatedReadData: [],
       processedReadData: [],
       hasCircularReadWithdrawAuthority: false,
@@ -358,9 +375,9 @@ export default {
             contents: [
               {
                 text: '撤销分阅',
-                fun:'recallRead'
+                fun: 'recallRead'
               }
-            ],
+            ]
           }
         ],
         processedRead: [
@@ -1051,7 +1068,7 @@ export default {
           }
           return {
             type: item,
-            checkbox:newContents.indexOf('untreatedRead') !=-1,
+            checkbox: newContents.indexOf('untreatedRead') != -1,
             toolbar: this.toolbars[item],
             thead: data.length > 0 ? data : this.theads[item],
             showFormBtn: false
@@ -1186,7 +1203,7 @@ export default {
       return table;
     }
   },
-   async mounted() {
+  async mounted() {
     this.loading = util.loading(this.$loading, '加载中...');
     if (this.contents.indexOf('readingSituation') != -1) {
       await this.getFyListJson(1);
@@ -1202,42 +1219,45 @@ export default {
   },
 
   methods: {
-    recallReadFun(){
-      const _that = this
-      let pendingIds = _that.selectList.map(x => x.id).join(',');
+    getHeight(type) {
+      return this[`${type}Height`];
+    },
+    recallReadFun() {
+      const _that = this;
+      let pendingIds = _that.selectList.map((x) => x.id).join(',');
       let params = {
-        url:taskReadWithDraw,
-        params:{
+        url: taskReadWithDraw,
+        params: {
           pendingIds
         }
-      }
-       _that.loading = util.loading(_that.$loading, '撤销中...');
-      util.ajax(params).then(async res=>{
+      };
+      _that.loading = util.loading(_that.$loading, '撤销中...');
+      util.ajax(params).then(async (res) => {
         _that.loading.close();
-        if(res.rCode == 0 || res.status=='success'){
+        if (res.rCode == 0 || res.status == 'success') {
           _that.$message.success('撤销成功！');
           await _that.getFyListJson(1);
-        _that.getListCount(_that.flowListCount);
-        }else{
+          _that.getListCount(_that.flowListCount);
+        } else {
           _that.$message.error(res.message);
         }
-        
-      })
+      });
     },
-    recallRead(){
-      if(this.selectList.length == 0) return this.$message.warning('请选择需要撤销的分阅')
+    recallRead() {
+      if (this.selectList.length == 0)
+        return this.$message.warning('请选择需要撤销的分阅');
       this.$confirm('是否确认撤销选中的分阅?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.recallReadFun()
-      })
+        this.recallReadFun();
+      });
     },
-    handleSelectionChange(val){
-      this.selectList = val
+    handleSelectionChange(val) {
+      this.selectList = val;
     },
-     handledraw(pendedHistoryId) {
+    handledraw(pendedHistoryId) {
       let params = {
         url: circularReadWithdraw,
         params: { pendedHistoryId }
@@ -1318,12 +1338,12 @@ export default {
       }
     },
     handleBtnClick(data) {
-    // recallRead
+      // recallRead
       const { handle, row } = data;
       if (handle.text == '删除') {
         this.del(row.id);
-      }else if(handle.fun == 'recallRead'){
-        this[handle.fun]()
+      } else if (handle.fun == 'recallRead') {
+        this[handle.fun]();
       }
     },
     /**
@@ -1472,7 +1492,7 @@ export default {
       this.loading = util.loading(this.$loading, '加载中...');
       this.getFlowList();
     },
-   async getFyListJson(type) {
+    async getFyListJson(type) {
       let params = {
         url: fyListJson,
         params: {
@@ -1480,7 +1500,7 @@ export default {
           status: type
         }
       };
-     await util.ajax(params).then((res) => {
+      await util.ajax(params).then((res) => {
         if (type == 1) {
           this.untreatedReadData = res.data;
         } else {
@@ -1538,6 +1558,13 @@ export default {
             this.splitReadingData = fyHistoryList;
             this.modify = modify;
             this.show = true;
+            if (this.height == 'auto') {
+              this.$nextTick(() => {
+                this.content.map((x) => {
+                  this[`${x.type}Height`] = this.$refs[x.type][0].offsetHeight;
+                });
+              });
+            }
             if (this.contents.indexOf('circular') != -1) {
               this.getCircularReadList();
             } else {

package/src/config/api.js

@@ -284,3 +284,7 @@ export const sendBatch = '/notify2/sendRecord/reSendNotifyMessageBatch';
 
 export const formContents =
   '/lowcode/admin/online/onlineForm/getOnlineFormFromCache';
+export const directStartTaskCircularRead =
+  '/bpm/bpmBackend/directStartTaskCircularRead';
+export const getNodeInfoForStart =
+  '/bpm/task/taskHandle/getNodeInfoForStart.dhtml';

package/src/index.js

@@ -123,7 +123,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.6.61',
+  version: '0.6.62',
   install,
   Button,
   ButtonGroup,