Merge branch 'demo_' of http://124.71.196.186:8888/hfxc226/hitch-antd into demo_

src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -327,14 +327,10 @@ export default {
           scopedSlots: { customRender: 'num' }
         },
         {
-          title: '货架号',
+          title: '本币无税单价',
+          dataIndex: 'funitprice',
           width: 150,
-          dataIndex: 'storePosition'
-        },
-        {
-          title: '批号',
-          width: 100,
-          dataIndex: 'cbatch'
+          scopedSlots: { customRender: 'funitprice' }
         },
         {
           title: '需求人',
@@ -360,12 +356,6 @@ export default {
           width: 150,
           scopedSlots: { customRender: 'iexchrate' }
         },
-        {
-          title: '本币无税单价',
-          dataIndex: 'funitprice',
-          width: 150,
-          scopedSlots: { customRender: 'funitprice' }
-        },
         {
           title: '税率',
           dataIndex: 'ipertaxrate',
@@ -382,7 +372,16 @@ export default {
           dataIndex: 'fmoney',
           width: 150,
           scopedSlots: { customRender: 'fmoney' }
-
+        },
+        {
+          title: '货架号',
+          width: 150,
+          dataIndex: 'storePosition'
+        },
+        {
+          title: '批号',
+          width: 100,
+          dataIndex: 'cbatch'
         },
         {
           title: '操作',