fe / yoho-shop-manage · Commits

Go to a project

Authored by htoooth
Commit 6d2179cd7ce38a047c4c2885b85a8224cf47b6c3 1 parent f200502f

fix

Inline Side-by-side
Showing 5 changed files with 73 additions and 20 deletions
1 -sass_binary_site=https://npm.taobao.org/mirrors/node-sass/  
  1 +sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
  2 +registry=http://npm.yohops.com
  3 +
@@ -3,6 +3,6 @@ export default { @@ -3,6 +3,6 @@ export default {
3 name: 'list', 3 name: 'list',
4 component: () => import(/* webpackChunkName: "kol.reconciliation" */'./list'), 4 component: () => import(/* webpackChunkName: "kol.reconciliation" */'./list'),
5 meta: { 5 meta: {
6 - pageName: '新建页面' 6 + pageName: '对帐单管理'
7 } 7 }
8 }; 8 };
1 <template> 1 <template>
2 <layout-body> 2 <layout-body>
3 <layout-filter ref="filter" :model="query"> 3 <layout-filter ref="filter" :model="query">
  4 + <filter-item label="对帐单号">
  5 + <Input v-model.trim="query.reconciliationId" :maxlength="9"></Input>
  6 + </filter-item>
4 <filter-item label="SKN编码"> 7 <filter-item label="SKN编码">
5 <Input v-model.trim="query.sknCode" :maxlength="9"></Input> 8 <Input v-model.trim="query.sknCode" :maxlength="9"></Input>
6 </filter-item> 9 </filter-item>
7 - <filter-item label="商家编码">  
8 - <Input v-model.trim="query.prodCode"></Input>  
9 - </filter-item>  
10 <filter-item label="商品名称"> 10 <filter-item label="商品名称">
11 <Input v-model.trim="query.prodName"></Input> 11 <Input v-model.trim="query.prodName"></Input>
12 </filter-item> 12 </filter-item>
13 - <filter-item label="商品条码">  
14 - <Input v-model.trim="query.prodBarCode"></Input> 13 + <filter-item label="品牌">
  14 + <select-brand v-model="query.brand"></select-brand>
  15 + </filter-item>
  16 + <filter-item label="订单号">
  17 + <Input v-model.trim="query.orderId"></Input>
  18 + </filter-item>
  19 + <filter-item label="业务类型">
  20 + <Select v-model="query.reconciliationType" clearable>
  21 + <Option value="1">销售出库</Option>
  22 + <Option value="2">退货入库</Option>
  23 + </Select>
  24 + </filter-item>
  25 + <filter-item label="对帐单状态">
  26 + <Select v-model="query.reconciliationStatus" clearable>
  27 + <Option value="1">未对帐</Option>
  28 + <Option value="2">待结算</Option>
  29 + <Option value="3">已结算</Option>
  30 + </Select>
15 </filter-item> 31 </filter-item>
16 <filter-item> 32 <filter-item>
17 <Button type="primary" @click="search">筛选</Button> 33 <Button type="primary" @click="search">筛选</Button>
@@ -33,14 +49,13 @@ export default { @@ -33,14 +49,13 @@ export default {
33 data() { 49 data() {
34 return { 50 return {
35 query: { 51 query: {
  52 + reconciliationId: '',
36 sknCode: '', 53 sknCode: '',
37 - prodCode: '',  
38 prodName: '', 54 prodName: '',
39 - prodBarCode: '',  
40 - category: [],  
41 - brand: 0,  
42 - saleStatus: 0,  
43 - stockStatus: 0 55 + brand: null,
  56 + orderId: null,
  57 + reconciliationType: null,
  58 + reconciliationStatus: null,
44 }, 59 },
45 pageData: { 60 pageData: {
46 total: 0, 61 total: 0,
@@ -57,18 +72,53 @@ export default { @@ -57,18 +72,53 @@ export default {
57 col2: '6' 72 col2: '6'
58 }], 73 }],
59 tableCols: [{ 74 tableCols: [{
60 - title: '列1', 75 + title: '订单号',
61 key: 'col1' 76 key: 'col1'
62 }, { 77 }, {
63 - title: '列2', 78 + title: '帐单生成时间',
  79 + key: 'col2'
  80 + }, {
  81 + title: '对帐单号',
  82 + key: 'col2'
  83 + }, {
  84 + title: '对帐时间',
  85 + key: 'col2'
  86 + }, {
  87 + title: 'SKU',
  88 + key: 'col2'
  89 + }, {
  90 + title: '商品名称',
  91 + key: 'col2'
  92 + }, {
  93 + title: '品牌',
64 key: 'col2' 94 key: 'col2'
65 }, { 95 }, {
  96 + title: '吊牌价',
  97 + key: 'col2'
  98 + }, {
  99 + title: '支付金额',
  100 + key: 'col2'
  101 + }, {
  102 + title: '结算比例',
  103 + key: 'col2'
  104 + }, {
  105 + title: '业务类型',
  106 + key: 'col2'
  107 + }, {
  108 + title: '数量',
  109 + key: 'col2'
  110 + }, {
  111 + title: '佣金',
  112 + key: 'col2'
  113 + }, {
  114 + title: '状态',
  115 + key: 'col21'
  116 + }, {
66 title: '操作', 117 title: '操作',
67 render: (h, params) => { 118 render: (h, params) => {
68 return ( 119 return (
69 <action-group> 120 <action-group>
70 - <i-button type="primary" size="small" onClick={() => this.edit(params.row)}>编辑</i-button>  
71 - <i-button type="error" size="small" onClick={() => this.del(params.row)}>删除</i-button> 121 + <i-button type="primary" size="small" onClick={() => this.edit(params.row)}>对帐</i-button>
72 </action-group> 122 </action-group>
73 ); 123 );
74 } 124 }
@@ -88,7 +138,8 @@ export default { @@ -88,7 +138,8 @@ export default {
88 pageChange() { 138 pageChange() {
89 this.search(); 139 this.search();
90 }, 140 },
91 - edit() {}, 141 + edit() {
  142 + },
92 del() {} 143 del() {}
93 }, 144 },
94 components: {Demo} 145 components: {Demo}
@@ -3,6 +3,6 @@ export default { @@ -3,6 +3,6 @@ export default {
3 name: 'detail', 3 name: 'detail',
4 component: () => import(/* webpackChunkName: "kol.settlement-detail" */'./settlement-detail'), 4 component: () => import(/* webpackChunkName: "kol.settlement-detail" */'./settlement-detail'),
5 meta: { 5 meta: {
6 - pageName: '新建页面' 6 + pageName: '结算单详情'
7 } 7 }
8 }; 8 };
@@ -3,6 +3,6 @@ export default { @@ -3,6 +3,6 @@ export default {
3 name: 'list', 3 name: 'list',
4 component: () => import(/* webpackChunkName: "kol.Settlement-list" */'./settlement-list'), 4 component: () => import(/* webpackChunkName: "kol.Settlement-list" */'./settlement-list'),
5 meta: { 5 meta: {
6 - pageName: '新建页面' 6 + pageName: '结算单管理'
7 } 7 }
8 }; 8 };