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

Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/116

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"

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