#116 projects/mes-zjl
Merged
juzi
merged 2 commits from projects/mes-zjl into projects/mes-test 9 months ago
2 changed files with 3 additions and 3 deletions
-
+1 -1src/views/order/base/orderManage/index.vue
-
+2 -2src/views/order/monitoring/orderCompletionMonitoring/index.vue
+ 1
- 1
src/views/order/base/orderManage/index.vue
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" | ||||
+ 2
- 2
src/views/order/monitoring/orderCompletionMonitoring/index.vue
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 | ||||