@lambo-design/workflow-approve 1.0.0-beta.60 → 1.0.0-beta.62
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/portrait.vue +1 -1
- package/src/workflow-diagram.vue +5 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lambo-design/workflow-approve",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.62",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"author": "lambo",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"axios": "^0.24.0",
|
|
14
14
|
"axios-cache-plugin": "^0.1.0",
|
|
15
15
|
"@lambo-design/core": "^4.7.1-beta.156",
|
|
16
|
-
"@lambo-design/shared": "^1.0.0-beta.
|
|
16
|
+
"@lambo-design/shared": "^1.0.0-beta.250"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"bpmn-js": "^7.3.1",
|
package/src/portrait.vue
CHANGED
|
@@ -801,7 +801,7 @@ export default {
|
|
|
801
801
|
column.push({
|
|
802
802
|
title: `${this.handleName}时间`, key: 'auditTime', minWidth: 150,
|
|
803
803
|
render: (h, { row }) => {
|
|
804
|
-
const displayDate = row.
|
|
804
|
+
const displayDate = row.auditDate
|
|
805
805
|
return h('span', displayDate)
|
|
806
806
|
}
|
|
807
807
|
})
|
package/src/workflow-diagram.vue
CHANGED
|
@@ -70,12 +70,12 @@
|
|
|
70
70
|
</FormItem>
|
|
71
71
|
</i-col>
|
|
72
72
|
<i-col span="12" offset="0">
|
|
73
|
-
<FormItem v-if="item.
|
|
74
|
-
{{ item.createTime }}
|
|
75
|
-
</FormItem>
|
|
76
|
-
<FormItem v-else :label="item.handleName ? item.handleName + '时间：' : '审批时间：'">
|
|
73
|
+
<FormItem v-if="item.auditDate" :label="item.handleName ? item.handleName + '时间：' : '审批时间：'">
|
|
77
74
|
{{ item.auditDate }}
|
|
78
75
|
</FormItem>
|
|
76
|
+
<FormItem v-else :label="item.auditResult == '00' ? '发起时间：' : '接收时间：'">
|
|
77
|
+
{{ item.createTime }}
|
|
78
|
+
</FormItem>
|
|
79
79
|
</i-col>
|
|
80
80
|
</Row>
|
|
81
81
|
<Row>
|
|
@@ -221,7 +221,7 @@ export default {
|
|
|
221
221
|
{
|
|
222
222
|
title: '审批时间', key: 'auditTime', minWidth: 150,
|
|
223
223
|
render: (h, {row}) => {
|
|
224
|
-
const displayDate = row.
|
|
224
|
+
const displayDate = row.auditDate;
|
|
225
225
|
return h('span', displayDate);
|
|
226
226
|
}
|
|
227
227
|
},
|