fe / yoho-shop-manage · Commits

Go to a project

Authored by htoooth
Commit 1925317a9476ed29b62f34211fb3821302666e0f 1 parent 6d2179cd

add fix

Inline Side-by-side
Showing 7 changed files with 175 additions and 56 deletions
<template>
<Modal
v-model="modal"
title="是否确认对账？"
@on-ok="onOk(data)"
@on-cancel="onCancel(data)">
<Alert type="warning" show-icon>温馨提示：结算金额以结算单为准</Alert>
<Form :label-width="80">
<FormItem label="支付金额:" style="margin-bottom: 0">
<span>200</span>
</FormItem>
<FormItem label="结算比例:" style="margin-bottom: 0">
<span>7%</span>
</FormItem>
<FormItem label="结算金额:" style="margin-bottom: 0">
<span>14</span>
</FormItem>
</Form>
</Modal>
</template>
<script>
export default {
name: 'reconciliation-confirm',
props: {
onOk: {
type: Function,
default() {
return {};
}
},
onCancel: {
type: Function,
default() {
return {};
}
}
},
data() {
return {
modal: this.value,
data: {}
};
},
methods: {
show(row) {
this.data = row;
this.modal = true;
}
}
};
</script>
... ...
<template>
<div>局部组件</div>
</template>
<script>
export default {
name: 'Demo',
};
</script>
import Demo from './demo';
import Confirm from './confirm.vue';
export {
Demo
Confirm
};
... ...
... ... @@ -40,11 +40,13 @@
<Page :total="pageData.total" :current="pageData.current"
@on-change="pageChange" :page-size="20" show-total></Page>
</layout-list>
<Confirm ref="confirm"></Confirm>
</layout-body>
</template>
<script>
import {Demo} from './components';
import {Confirm} from './components';
export default {
data() {
return {
... ... @@ -139,10 +141,11 @@ export default {
this.search();
},
edit() {
this.$refs.confirm.show();
},
del() {}
},
components: {Demo}
components: {Confirm}
};
</script>
... ...
<template>
<layout-body>
<layout-filter ref="filter" :model="query">
<filter-item label="结算单号">
<Input v-model.trim="query.settlementId" :maxlength="9"></Input>
</filter-item>
<filter-item label="SKN编码">
<Input v-model.trim="query.sknCode" :maxlength="9"></Input>
</filter-item>
<filter-item label="商家编码">
<Input v-model.trim="query.prodCode"></Input>
</filter-item>
<filter-item label="商品名称">
<Input v-model.trim="query.prodName"></Input>
</filter-item>
<filter-item label="商品条码">
<Input v-model.trim="query.prodBarCode"></Input>
<filter-item label="品牌">
<select-brand v-model="query.brand"></select-brand>
</filter-item>
<filter-item label="订单号">
<Input v-model.trim="query.orderId"></Input>
</filter-item>
<filter-item label="业务类型">
<Select v-model="query.settlementType" clearable>
<Option value="1">销售出库</Option>
<Option value="2">退货入库</Option>
<Option value="3">换货入库</Option>
<Option value="3">换货出库</Option>
</Select>
</filter-item>
<filter-item label="状态">
<Select v-model="query.settlementStatus" clearable>
<Option value="2">待支付</Option>
<Option value="3">已支付</Option>
</Select>
</filter-item>
<filter-item>
<Button type="primary" @click="search">筛选</Button>
... ... @@ -33,14 +50,13 @@ export default {
data() {
return {
query: {
settlementId: '',
sknCode: '',
prodCode: '',
prodName: '',
prodBarCode: '',
category: [],
brand: 0,
saleStatus: 0,
stockStatus: 0
orderId: 0,
settlementType: 0,
settlementStatus: 0
},
pageData: {
total: 0,
... ... @@ -57,21 +73,44 @@ export default {
col2: '6'
}],
tableCols: [{
title: '列1',
title: '结算单号',
key: 'col1'
}, {
title: '对账单号',
key: 'col1'
}, {
title: '列2',
key: 'col2'
title: 'SKU',
key: 'col1'
}, {
title: '商品名称',
key: 'col1'
}, {
title: '品牌',
key: 'col1'
}, {
title: '订单号',
key: 'col1'
}, {
title: '操作',
render: (h, params) => {
return (
<action-group>
<i-button type="primary" size="small" onClick={() => this.edit(params.row)}>编辑</i-button>
<i-button type="error" size="small" onClick={() => this.del(params.row)}>删除</i-button>
</action-group>
);
}
title: '业务类型',
key: 'col1'
}, {
title: '吊牌价',
key: 'col1'
}, {
title: '支付金额',
key: 'col1'
}, {
title: '结算比例',
key: 'col1'
}, {
title: '数量',
key: 'col1'
}, {
title: '佣金',
key: 'col1'
}, {
title: '状态',
key: 'col1'
}]
};
},
... ...
<template>
<layout-body>
<layout-filter ref="filter" :model="query">
<filter-item label="结算单ID">
<Input v-model.trim="query.settlementId"></Input>
</filter-item>
<filter-item label="SKN编码">
<Input v-model.trim="query.sknCode" :maxlength="9"></Input>
</filter-item>
<filter-item label="商家编码">
<Input v-model.trim="query.prodCode"></Input>
<filter-item label="结算单名称">
<Input v-model.trim="query.settlementName"></Input>
</filter-item>
<filter-item label="商品名称">
<Input v-model.trim="query.prodName"></Input>
<filter-item label="支付时间">
<Input v-model.trim="query.payDate"></Input>
</filter-item>
<filter-item label="商品条码">
<Input v-model.trim="query.prodBarCode"></Input>
<filter-item label="结算单状态">
<Select v-model="query.settlementStatus" clearable>
<Option value="1">未到票</Option>
<Option value="2">待支付</Option>
<Option value="3">已支付</Option>
</Select>
</filter-item>
<filter-item>
<Button type="primary" @click="search">筛选</Button>
... ... @@ -28,19 +35,16 @@
</template>
<script>
import {Demo} from './components';
export default {
data() {
return {
query: {
settlementId: '',
sknCode: '',
prodCode: '',
prodName: '',
prodBarCode: '',
category: [],
brand: 0,
saleStatus: 0,
stockStatus: 0
settlementName: '',
payDate: 0,
settlementStatus: 0
},
pageData: {
total: 0,
... ... @@ -57,18 +61,38 @@ export default {
col2: '6'
}],
tableCols: [{
title: '列1',
title: '结算单ID',
key: 'col1'
}, {
title: '开始时间',
key: 'col1'
}, {
title: '结束时间',
key: 'col1'
}, {
title: '应付金额',
key: 'col1'
}, {
title: '到票金额',
key: 'col1'
}, {
title: '实付金额',
key: 'col1'
}, {
title: '状态',
key: 'col1'
}, {
title: '列2',
title: '支付时间',
key: 'col1'
}, {
title: '备注',
key: 'col2'
}, {
title: '操作',
render: (h, params) => {
return (
<action-group>
<i-button type="primary" size="small" onClick={() => this.edit(params.row)}>编辑</i-button>
<i-button type="error" size="small" onClick={() => this.del(params.row)}>删除</i-button>
<i-button type="primary" size="small" onClick={() => this.edit(params.row)}>查看详情</i-button>
</action-group>
);
}
... ... @@ -88,10 +112,17 @@ export default {
pageChange() {
this.search();
},
edit() {},
edit() {
this.$router.push({
name: 'kol.settlement.detail',
params: {
id: 1
}
});
},
del() {}
},
components: {Demo}
components: {}
};
</script>
... ...
... ... @@ -58,7 +58,7 @@
"express-session": "^1.15.2",
"font-awesome": "^4.7.0",
"gt3-sdk": "^2.0.0",
"iview": "^2.4.0",
"iview": "^2.8.0",
"lodash": "^4.17.4",
"moment": "^2.18.1",
"promise-polyfill": "^6.0.2",
... ...