Merge pull request 'projects/mes-zjl' (#116 ) from projects/mes-zjl into projects/mes-test

Reviewed-on: #116
merge test
2023-11-27 16:43:48 +08:00 · 2023-11-27 16:43:15 +08:00 · 2023-11-27 16:41:14 +08:00
2 changed files with 3 additions and 3 deletions
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@ -17,7 +17,7 @@
      <method-btn
        v-if="tableBtn.length"
        slot="handleBtn"
-        :width="320"
+        :width="240"
        label="操作"
        :method-list="tableBtn"
        @clickBtn="handleClick"
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@ -73,7 +73,7 @@ const tableProps = [
  {
    prop: 'status',
    label: '订单状态',
-    filter: publicFormatter('order_priority')
+    filter: publicFormatter('order_status')
  },
  {
    prop: 'startProduceTime',
@ -88,7 +88,7 @@ const tableProps = [
    minWidth: 160
  },
  {
-    prop: 'productLines',
+    prop: 'lineNames',
    label: '加工线',
    filter: (val) => val ? val.join(',') : '',
    minWidth: 180
Author	SHA1	Message	Date
juzi	6d465c17c2	Merge pull request 'projects/mes-zjl' (#116 ) from projects/mes-zjl into projects/mes-test Reviewed-on: #116	2023-11-27 16:43:48 +08:00
juzi	669345c983	merge test	2023-11-27 16:43:15 +08:00
juzi	b86094c630	订单监控	2023-11-27 16:41:14 +08:00