Skip to content

Commit 6e64678

Browse files
author
shenshuo
committed
优化订单参数显示
1 parent 215072b commit 6e64678

2 files changed

Lines changed: 13 additions & 20 deletions

File tree

src/view/task-order/history-task-list.vue

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,14 @@
3434
参与人员:<p type="warning" style="marginRight: 2px;float:right" size ="small">{{checkData.associated_user}}</p>
3535
</div>
3636
</Col>
37-
<Col>
37+
<Col v-if="list_id">
3838
<CellGroup>
3939
<Cell v-if="checkData.schedule === 'new'" title="审批执行:">
4040
<Button v-if="checkData.schedule === 'new' && checkData.approval_button" type="success" style="marginRight: 2px" size ="small" slot="extra" @click="handlerApproval">审批</Button>
4141
</Cell>
42-
<!-- <Cell title="审批干预:">
43-
<span slot="extra" v-if="checkData.hand_list" v-for="item, index in checkData.hand_list">
44-
<Button type="info" style="marginRight: 10px" size ="small" slot="extra" @click="handlerHand(item)">{{item}}</Button>
45-
</span>
46-
<Button type="error" style="marginRight: 2px; marginLeft: 10px" size="small" slot="extra" @click="handlerStop()">终止全部</Button>
47-
</Cell> -->
4842
</CellGroup>
4943
</Col>
50-
<Col span="24" style="padding: 10px">
44+
<Col v-if="list_id" span="24" style="padding: 10px">
5145
<Table v-if="dataArgs.length > 0" :columns="columnsArgs" :data="dataArgs" :border="false" :show-header=false size='small'></Table>
5246
<Alert v-else > 没有参数,或者参数格式化的时候发生了异常</Alert>
5347
</Col>

src/view/task-order/task-order-list.vue

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,21 @@
2020
</div>
2121
</Col>
2222
<Col span="12">
23-
<div style="margin-top: 10px; marginLeft: 16px; marginRight: 16px">
24-
发起人:<p type="warning" style="marginRight: 2px;float:right" size ="small">{{checkData.creator}}</p>
25-
</div>
23+
<div style="margin-top: 10px; marginLeft: 16px; marginRight: 16px">
24+
发起人:<p type="warning" style="marginRight: 2px;float:right" size ="small">{{checkData.creator}}</p>
25+
</div>
2626
</Col>
2727
<Col span="12">
28-
<div style="margin-top: 10px; marginLeft: 16px; marginRight: 16px">
29-
审批人:<p type="warning" style="marginRight: 2px;float:right" size ="small">{{checkData.executor}}</p>
30-
</div>
28+
<div style="margin-top: 10px; marginLeft: 16px; marginRight: 16px">
29+
审批人:<p type="warning" style="marginRight: 2px;float:right" size ="small">{{checkData.executor}}</p>
30+
</div>
3131
</Col>
3232
<Col span="24">
33-
<div style="margin-top: 10px; marginLeft: 16px; marginRight: 16px">
34-
参与人员:<p type="warning" style="marginRight: 2px;float:right" size ="small">{{checkData.associated_user}}</p>
35-
</div>
33+
<div style="margin-top: 10px; marginLeft: 16px; marginRight: 16px">
34+
参与人员:<p type="warning" style="marginRight: 2px;float:right" size ="small">{{checkData.associated_user}}</p>
35+
</div>
3636
</Col>
37-
38-
<Col>
37+
<Col v-if="list_id">
3938
<CellGroup>
4039
<Cell v-if="checkData.schedule === 'new'" title="审批执行:">
4140
<Button v-if="checkData.schedule === 'new' && checkData.approval_button" type="success" style="marginRight: 2px" size ="small" slot="extra" @click="handlerApproval">审批</Button>
@@ -48,7 +47,7 @@
4847
</Cell>
4948
</CellGroup>
5049
</Col>
51-
<Col span="24" style="padding: 10px">
50+
<Col v-if="list_id" span="24" style="padding: 10px">
5251
<Table v-if="dataArgs.length > 0" height="122" :columns="columnsArgs" :data="dataArgs" :border="false" :show-header=false size='small'></Table>
5352
<Alert v-else > 没有参数,或者参数格式化的时候发生了异常</Alert>
5453
</Col>

0 commit comments

Comments
 (0)