projects/mes-zjl #116

Merged
juzi merged 2 commits from projects/mes-zjl into projects/mes-test 2023-11-27 16:43:49 +08:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit b86094c630 - Show all commits

View File

@ -17,7 +17,7 @@
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="320" :width="240"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"

View File

@ -73,7 +73,7 @@ const tableProps = [
{ {
prop: 'status', prop: 'status',
label: '订单状态', label: '订单状态',
filter: publicFormatter('order_priority') filter: publicFormatter('order_status')
}, },
{ {
prop: 'startProduceTime', prop: 'startProduceTime',
@ -88,7 +88,7 @@ const tableProps = [
minWidth: 160 minWidth: 160
}, },
{ {
prop: 'productLines', prop: 'lineNames',
label: '加工线', label: '加工线',
filter: (val) => val ? val.join(',') : '', filter: (val) => val ? val.join(',') : '',
minWidth: 180 minWidth: 180