@lambo-design/workflow-approve 1.0.0-beta.33 → 1.0.0-beta.36

package/src/portrait.vue

@@ -658,7 +658,11 @@ export default {
         render: (h, {row, column, index}) => {
           let label = "";
           let tagColor = "";
-          if (row.auditResult == '30'){
+          if (row.auditResult == '00'){
+            label = '流程发起';
+            tagColor = 'green'; // 绿色
+          }
+          else if (row.auditResult == '30'){
             label = '通过';
             tagColor = 'green'; // 绿色
           }
@@ -1133,6 +1137,14 @@ export default {
                 self.disable = false
               }
             })
+          } 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 {
             self.loading = true
             self.disable = true
@@ -1164,7 +1176,7 @@ export default {
           }
         })
       } else {
-        if (!self.handleButtons || self.handleButtons.includes('appointHandler') || self.handleButtons.includes('appointTimeoutTime')){
+        if (self.auditResult === '30' && (!self.handleButtons || self.handleButtons.includes('appointHandler') || self.handleButtons.includes('appointTimeoutTime'))){
           self.getNextNodes()
           self.appointBoxShow = true
         } else {
@@ -1203,6 +1215,14 @@ export default {
                 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, null, null, auditResult, self.curTaskId)
+            }, 1000)
           } else if (result.code == '20002') {
             // 流程结束
             self.loading = false
@@ -1472,12 +1492,12 @@ export default {
       return false
     },
     readingRangeClick(item) {
-      let permScope = item.organTreeType === this.defaultOrganTreeType ? this.permScope : 'all'
+      let permScope = item.orgTreeType === this.defaultOrganTreeType ? this.permScope : 'all'
       let orgTreeType = item.orgTreeType ? item.orgTreeType : this.defaultOrganTreeType
       this.$refs.assigneeHelpBox.toggleShowHelpBox(orgTreeType, permScope, 'transferNextTask', item.id)
     },
     candidateGroupsReadingRangeClick(item) {
-      let permScope = item.organTreeType === this.defaultOrganTreeType ? this.permScope : 'all'
+      let permScope = item.orgTreeType === this.defaultOrganTreeType ? this.permScope : 'all'
       let orgTreeType = item.orgTreeType ? item.orgTreeType : this.defaultOrganTreeType
       this.$refs.candidateGroupsHelpBox.toggleShowHelpBox(permScope, item.candidates, orgTreeType, item.id);
     },

package/src/workflow-diagram.vue

@@ -53,7 +53,8 @@
           <Row>
             <i-col span="12" offset="0">
               <FormItem :label="item.handleName ? item.handleName + '结果：' : '审批结果：'">
-                <Tag color="green" v-if="item.auditResult == '30'">通过</Tag>
+                <Tag color="green" v-if="item.auditResult == '00'">流程发起</Tag>
+                <Tag color="green" v-else-if="item.auditResult == '30'">通过</Tag>
                 <Tag color="volcano" v-else-if="item.auditResult == '40'">驳回上一节点</Tag>
                 <Tag color="red" v-else-if="item.auditResult=='50'">驳回到原点</Tag>
                 <Tag color="purple" v-else-if="item.auditResult=='51'">流程终止</Tag>
@@ -64,8 +65,8 @@
               </FormItem>
             </i-col>
             <i-col span="12" offset="0">
-              <FormItem v-if="item.startDate" label="发起时间：">
-                {{ item.startDate }}
+              <FormItem v-if="item.startDate" label="接收时间：">
+                {{ item.createTime }}
               </FormItem>
               <FormItem v-else :label="item.handleName ? item.handleName + '时间：' : '审批时间：'">
                 {{ item.auditDate }}