Merge remote-tracking branch 'origin/master'

resources/views/admin/pages/order-page.blade.php

@@ -116,9 +116,36 @@
           url: '/admin/api/orderList',
           method: 'GET',
           cols: [[
-            {type: 'checkbox', fixed: true},
-            {field: 'tax_title', title: '公司名称'}
+            {type: 'numbers', fixed: true,title:'序号',width: 60},
+            {field: 'goods_id', title: 'SKUID', width: 120},
+            {field: 'goods_name', title: '商品型号', width: 120},
+            {field: 'purchase_name', title: '标准品牌', width: 120},
+            {field: 'other_amount', title: '供应商', width: 120},
+            {field: 'other_amount', title: '供应商物料唯一编码', width: 160},
+            {field: 'other_amount', title: '供应商物料品牌', width: 160},
+            {field: 'other_amount', title: '采购员', width: 120},
+            {field: 'other_amount', title: '币种', width: 120},
+            {field: 'other_amount', title: '单价', width: 120},
+            {field: 'goods_price', title: '数量', width: 120},
+            {field: 'goods_price', title: '小计', width: 120},
+            {field: 'goods_price', title: '折扣', width: 120},
+            {field: 'goods_price', title: '其他费用', width: 120},
+            {field: 'other_amount', title: '合计', width: 120},
+            {field: 'other_amount', title: '货期', width: 120},
+            {field: 'other_amount', title: '批次', width: 120},
+            {field: 'other_amount', title: '客户备注', width: 120},
+            {field: 'other_amount', title: '售后类型', width: 120},
+            {field: 'other_amount', title: '售后数量', width: 120},
+            {field: 'other_amount', title: '售后单价', width: 120},
+            {field: 'other_amount', title: '售后金额', width: 120}
           ]],
+          parseData: LayUiTableParseData,
+          page: true,
+          size: 'sm',
+          cellMinWidth: 80,
+          defaultToolbar: ['filter'],
+          limit: 15,
+          limits: [15, 50, 100, 200],
           done: function (res, curr, count) {
             layui.form.render();
           }