Merge branch 'dev' into test

src/views/produce/components/produceOrder.vue

@@ -129,16 +129,22 @@ export default {
           filterMethod: this.filterMethod,
           width: 100
         },
-
         {
-          prop: 'brandNo',
-          label: '牌号',
+          prop: 'model',
+          label: '型号',
           align: 'center',
           showOverflowTooltip: true,
         },
         {
-          prop: 'model',
-          label: '型号',
+            prop: 'productionCodes',
+            label: '生产编号',
+            align: 'center',
+            minWidth: 150,
+            showOverflowTooltip: true
+        },
+        {
+          prop: 'brandNo',
+          label: '牌号',
           align: 'center',
           showOverflowTooltip: true,
         },

src/views/produceOrder/index.vue

@@ -390,16 +390,22 @@ export default {
           align: 'center'
         },
         {
-          prop: 'brandNo',
-          label: '牌号',
+          prop: 'model',
+          label: '型号',
           align: 'center'
         },
         {
-          prop: 'model',
-          label: '型号',
+            prop: 'productionCodes',
+            label: '生产编号',
+            align: 'center',
+            minWidth: 150,
+            showOverflowTooltip: true
+        },
+        {
+          prop: 'brandNo',
+          label: '牌号',
           align: 'center'
         },
-
         {
           prop: 'priority',
           label: '优先级',