@lambo-design/workflow-approve 1.0.0-beta.95 → 1.0.0-beta.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.95",
+  "version": "1.0.0-beta.97",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,8 +12,8 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/core": "^4.7.1-beta.169",
-    "@lambo-design/shared": "^1.0.0-beta.297"
+    "@lambo-design/core": "^4.7.1-beta.170",
+    "@lambo-design/shared": "^1.0.0-beta.299"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/assignee-box.vue

@@ -11,7 +11,7 @@
           </div>
         </div>
         <div class="org-detil">
-          <LamboPagingTable ref="selection" highlight-row :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams"
+          <LamboPagingTable :key="useTransferRangeUsers" ref="selection" highlight-row :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams" :height="tableHeight"
                             @on-selection-change="onSelectionChange" @on-current-change="onCurrentChange" :page-disable="useTransferRangeUsers" :showTableOption="!useTransferRangeUsers">
             <div slot="search" v-if="!useTransferRangeUsers">
               <Form :label-width="60">
@@ -135,7 +135,9 @@ export default {
     this.getSystemConfig()
   },
   computed: {
-
+    tableHeight(){
+      return this.useTransferRangeUsers ? 600 : 0
+    },
     tableColumn () {
       let columns = []
       let self = this
@@ -162,7 +164,7 @@ export default {
         sortable: 'custom'
       })
 
-      if (self.useTransferRangeUsers){
+      if (self.useTransferRangeUsers && self.ucAdapterType == 'x1'){
         columns.push({
           title: '联系电话',
           key: 'tel',
@@ -176,30 +178,33 @@ export default {
         sortField: 'organ_name',
         sortable: 'custom'
       })
-      if (self.useTransferRangeUsers){
+      if (self.useTransferRangeUsers && self.ucAdapterType == 'x1'){
         columns.push({
           title: '公司名称',
           key: 'comName',
           sortField: 'com_name',
           sortable: 'custom'
         })
-      } else {
-        columns.push({
-          title: '状态',
-          key: 'status',
-          sortable: 'custom',
-          align: 'center',
-          width: 100,
-          render: function (h, param) {
-            let state = param.row.status
-            if (state === '00') {
-              state = '正常'
-            } else {
-              state = '锁定'
+      }
+      if (!self.useTransferRangeUsers){
+        {
+          columns.push({
+            title: '状态',
+            key: 'status',
+            sortable: 'custom',
+            align: 'center',
+            width: 100,
+            render: function (h, param) {
+              let state = param.row.status
+              if (state === '00') {
+                state = '正常'
+              } else {
+                state = '锁定'
+              }
+              return h('span', state)
             }
-            return h('span', state)
-          }
-        })
+          })
+        }
       }
 
       return columns
@@ -309,23 +314,33 @@ export default {
               code: self.data.auditResult,
               name: self.data.auditResultName,
             }
-            self.data.selectedUserId=idSelectedArr[0];
-            let url = this.smartFlowServerContext + '/manage/processTodo/audit'
-            ajax.post(url, self.data).then(function (resp) {
-              let result = resp.data
-              if (result.code == '200') {
-                self.loading = false
-                self.$Message.success(result.message);
-                if (self.executionCompleted) {
-                  self.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
-                }
-                self.toBeDoneListDoSearch();
-              } else {
+            self.$Modal.confirm({
+              title: '提示',
+              content: '确定要' + auditResult.name + '吗？',
+              onOk: () => {
+                self.data.selectedUserId=idSelectedArr[0];
+                let url = this.smartFlowServerContext + '/manage/processTodo/audit'
+                ajax.post(url, self.data).then(function (resp) {
+                  let result = resp.data
+                  if (result.code == '200') {
+                    self.loading = false
+                    self.$Message.success(result.message);
+                    if (self.executionCompleted) {
+                      self.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
+                    }
+                    self.toBeDoneListDoSearch();
+                  } else {
+                    self.loading = false
+                    self.$Message.error(result.message)
+                    if (self.executionCompleted) {
+                      self.executionCompleted(false, null, null, auditResult, self.data.taskId);
+                    }
+                  }
+                })
+              },
+              onCancel: () => {
                 self.loading = false
-                self.$Message.error(result.message)
-                if (self.executionCompleted) {
-                  self.executionCompleted(false, null, null, auditResult, self.data.taskId);
-                }
+                self.disable = false
               }
             })
           } else if (self.helpBoxType === 'delegateTask'){

package/src/components/history.vue

@@ -381,7 +381,7 @@ export default {
       allGroupKeys: [],
       displayedList: [],
       arrowShow: true, // 控制加载更多按钮的显示
-      activeName: 'panel0',
+      activeName: '',
       modalDocx: false,
       setModals: {
         modals: []
@@ -513,6 +513,7 @@ export default {
 
         return groupedRecords;
       } else {
+        this.activeName = ''
         // 按节点分组：保持原有的节点分组结构
         return this.itemList;
       }

package/src/portrait.vue

@@ -528,9 +528,9 @@ export default {
       },
       handleButtonsNames: {
         '30': '通过',
-        '70': `${this.rejectName}到原点`,
-        '40': `${this.rejectName}上一节点`,
-        '90': `${this.rejectName}指定节点`,
+        '70': `驳回到原点`,
+        '40': `驳回上一节点`,
+        '90': `驳回指定节点`,
         '80': '跳转指定节点',
         '82': '指定他人处理',
         '50': '直接结束流程',
@@ -1218,6 +1218,19 @@ export default {
           if (!self.handleButtons || (!self.handleButtons.includes('auditOpinion') && !self.handleButtons.includes('attachmentFile') && !self.handleButtons.includes('auditHistory'))) {
             self.showProcessInfo = false;
           }
+          self.handleButtonsNames = {
+            '30': `${self.passName}`,
+            '70': `${self.rejectName}到原点`,
+            '40': `${self.rejectName}上一节点`,
+            '90': `${self.rejectName}指定节点`,
+            '80': '跳转指定节点',
+            '82': '指定他人处理',
+            '50': '直接结束流程',
+            '84': '委派任务',
+            '61': '交回委派任务',
+            '62': '撤回委派任务',
+            'passContinue': '通过并继续',
+          }
         } else {
           self.$Message.error(resp.data.message);
         }
@@ -1485,38 +1498,58 @@ export default {
         this.getTransferRangeAndOpenModal(self.organTreeType, '', 'delegateTask', '')
       } else if (self.auditResult === '62') {
         //撤回委派任务
-        ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
-          let result = resp.data
-          if (result.code == '200') {
-            self.loading = false
-            self.disable = false
-            self.revokeDelegateTask = false
-            self.$Message.success('撤回委派成功')
-          } else {
+        self.$Modal.confirm({
+          title: '提示',
+          content: '确定要' + auditResult.name + '吗？',
+          onOk: () => {
+            ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
+              let result = resp.data
+              if (result.code == '200') {
+                self.loading = false
+                self.disable = false
+                self.revokeDelegateTask = false
+                self.$Message.success('撤回委派成功')
+              } else {
+                self.loading = false
+                self.disable = false
+                self.$Message.error(result.message)
+              }
+            })
+          },
+          onCancel: () => {
             self.loading = false
             self.disable = false
-            self.$Message.error(result.message)
           }
         })
       } else if (self.auditResult === '61') {
         //交回委派任务
-        ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
-          let result = resp.data
-          if (result.code == '200') {
-            self.loading = false
-            self.disable = false
-            self.$Message.success('交回委派任务成功')
-            if (result.data) {
-              let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
-              setTimeout(() => {
-                self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
-                self.isPassContinue = false // 重置标志
-              }, 1000)
-            }
-          } else {
+        self.$Modal.confirm({
+          title: '提示',
+          content: '确定要' + auditResult.name + '吗？',
+          onOk: () => {
+            ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
+              let result = resp.data
+              if (result.code == '200') {
+                self.loading = false
+                self.disable = false
+                self.$Message.success('交回委派任务成功')
+                if (result.data) {
+                  let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
+                  setTimeout(() => {
+                    self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
+                    self.isPassContinue = false // 重置标志
+                  }, 1000)
+                }
+              } else {
+                self.loading = false
+                self.disable = false
+                self.$Message.error(result.message)
+              }
+            })
+          },
+          onCancel: () => {
             self.loading = false
             self.disable = false
-            self.$Message.error(result.message)
           }
         })
       } else if (self.auditResult === '80') {
@@ -1608,79 +1641,91 @@ export default {
         code: self.isPassContinue ? 'passContinue' : self.auditResult,
         name: self.isPassContinue ? self.handleButtonsNames['passContinue'] : self.handleButtonsNames[self.auditResult]
       }
-      if (self.auditResult === '82' && (self.targetTaskNode == '' || self.targetTaskNode == null)) {
-        self.auditResult = ''
-        self.$Message.error(`请选择${self.handleName}节点！`)
-      } else {
-        self.loading = true
-        self.disable = true
-        self.auditParams.targetTaskNode = self.targetTaskNode
-        let url = self.smartFlowServerContext + '/manage/processTodo/audit'
-        ajax.post(url, self.auditParams).then(function (resp) {
-          let result = resp.data
-          if (result.code == '200') {
-            self.loading = false
-            self.disable = false
-            let message = result.message ? result.message : `${self.handleName}成功`
-            if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90'){
-              message = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}成功`
-            }
-            self.$Message.success(message)
-            if (self.isPassContinue) {
-              // 通过并继续操作，获取下一条待办
-              self.getNextTodoAndRefresh()
-            } else {
-              // 普通操作，正常回调
-              if (result.data) {
-                let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
+      //二次确认
+      self.$Modal.confirm({
+        title: '提示',
+        content: '确定要' + auditResult.name + '吗？',
+        onOk: () => {
+          if (self.auditResult === '82' && (self.targetTaskNode == '' || self.targetTaskNode == null)) {
+            self.auditResult = ''
+            self.$Message.error(`请选择${self.handleName}节点！`)
+          } else {
+            self.loading = true
+            self.disable = true
+            self.auditParams.targetTaskNode = self.targetTaskNode
+            let url = self.smartFlowServerContext + '/manage/processTodo/audit'
+            ajax.post(url, self.auditParams).then(function (resp) {
+              let result = resp.data
+              if (result.code == '200') {
+                self.loading = false
+                self.disable = false
+                let message = result.message ? result.message : `${self.handleName}成功`
+                if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90'){
+                  message = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}成功`
+                }
+                self.$Message.success(message)
+                if (self.isPassContinue) {
+                  // 通过并继续操作，获取下一条待办
+                  self.getNextTodoAndRefresh()
+                } else {
+                  // 普通操作，正常回调
+                  if (result.data) {
+                    let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
+                    setTimeout(() => {
+                      self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
+                    }, 1000)
+                  } else {
+                    setTimeout(() => {
+                      self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+                    }, 1000)
+                  }
+                }
+              } else if (result.code == '10012') {
+                // 数据同步
+                self.loading = false
+                self.disable = false
+                self.$Message.warning(result.message)
                 setTimeout(() => {
-                  self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
+                  self.executionCompleted(true, null, null, auditResult, self.curTaskId)
                 }, 1000)
+              } else if (result.code == '20002') {
+                // 流程结束
+                self.loading = false
+                self.disable = false
+                self.$Message.success(result.message)
+                if (self.isPassContinue) {
+                  // 通过并继续操作，获取下一条待办
+                  setTimeout(() => {
+                    self.getNextTodoAndRefresh()
+                  }, 500)
+                }else {
+                  setTimeout(() => {
+                    self.executionCompleted(true, '流程已结束', '流程已结束', auditResult, self.curTaskId)
+                    self.isPassContinue = false // 重置标志
+                  }, 1000)
+                }
               } else {
+                self.loading = false
+                self.disable = false
+                let failedMessage = result.message ? result.message : `${self.handleName}失败`
+                if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90'){
+                  failedMessage = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}失败`
+                }
+                self.$Message.error(failedMessage)
                 setTimeout(() => {
-                  self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+                  self.executionCompleted(false, null, null, auditResult, self.curTaskId)
                 }, 1000)
               }
-            }
-          } else if (result.code == '10012') {
-            // 数据同步
-            self.loading = false
-            self.disable = false
-            self.$Message.warning(result.message)
-            setTimeout(() => {
-              self.executionCompleted(true, null, null, auditResult, self.curTaskId)
-            }, 1000)
-          } else if (result.code == '20002') {
-            // 流程结束
-            self.loading = false
-            self.disable = false
-            self.$Message.success(result.message)
-            if (self.isPassContinue) {
-              // 通过并继续操作，获取下一条待办
-              setTimeout(() => {
-                self.getNextTodoAndRefresh()
-              }, 500)
-            }else {
-              setTimeout(() => {
-                self.executionCompleted(true, '流程已结束', '流程已结束', auditResult, self.curTaskId)
-                self.isPassContinue = false // 重置标志
-              }, 1000)
-            }
-          } else {
-            self.loading = false
-            self.disable = false
-            let failedMessage = result.message ? result.message : `${self.handleName}失败`
-            if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90'){
-              failedMessage = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}失败`
-            }
-            self.$Message.error(failedMessage)
-            setTimeout(() => {
-              self.executionCompleted(false, null, null, auditResult, self.curTaskId)
-            }, 1000)
+              bus.$emit('triggerTimer')
+            })
           }
-          bus.$emit('triggerTimer')
-        })
-      }
+        },
+        onCancel: () => {
+          self.loading = false
+          self.disable = false
+        }
+      })
+
     },
     doJump(){
       if (this.auditResult === '90'){
@@ -1742,25 +1787,37 @@ export default {
         name: self.handleButtonsNames[self.auditResult]
       }
       self.auditParams.selectedUserId = assignee
-      ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
-        let result = resp.data
-        if (result.code == '200') {
-          self.loading = false
-          self.disable = false
-          self.$Message.success('委派成功')
-          if (result.data) {
-            let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
-            setTimeout(() => {
-              self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
-            }, 1000)
-          }
-        } else {
+      self.$Modal.confirm({
+        title: '提示',
+        content: '确定要' + auditResult.name + '吗？',
+        onOk: () => {
+          ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
+            let result = resp.data
+            if (result.code == '200') {
+              self.loading = false
+              self.disable = false
+              self.$Message.success('委派成功')
+              if (result.data) {
+                let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
+                setTimeout(() => {
+                  self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
+                }, 1000)
+              }
+            } else {
+              self.loading = false
+              self.disable = false
+              self.$Message.error(result.message)
+            }
+          }).catch(err => {
+            self.loading = false
+            self.disable = false
+            console.log(err)
+          })
+        },
+        onCancel: () => {
           self.loading = false
           self.disable = false
-          self.$Message.error(result.message)
         }
-      }).catch(err => {
-        console.log(err)
       })
     },
     //加签