修改一些bug完善,新增app更新新功能

This commit is contained in:
lemon橪
2021-05-21 16:45:47 +08:00
parent 38dc952a07
commit 41093b2032
14 changed files with 633 additions and 470 deletions

View File

@@ -6,18 +6,20 @@
<Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
<Form-item label="账单编号" prop="sn">
<Input
type="text"
v-model="searchForm.sn"
placeholder="请输入账单编号"
clearable
style="width: 200px"
/>
<Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
</Form-item>
<Form-item label="出帐时间" prop="createTime">
<DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
</DatePicker>
</Form-item>
<Form-item label="筛选状态">
<Select v-model="searchForm.billStatus" style="width:160px">
<Option value="">全部</Option>
<Option value="OUT">已出账</Option>
<Option value="CHECK">已核对</Option>
<Option value="COMPLETE">已完成</Option>
</Select>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form>
</Row>
@@ -26,14 +28,11 @@
<Button @click="delAll">批量删除</Button>
</Row>
<Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
</Table>
</Row>
<Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
size="small" show-total show-elevator show-sizer></Page>
</Row>
</Card>
@@ -88,6 +87,7 @@ export default {
order: "desc", // 默认排序方式
startDate: "", // 起始时间
endDate: "", // 终止时间
billStatus:"" //状态
},
selectDate: null, // 选择一个时间段
form: {
@@ -114,7 +114,7 @@ export default {
title: "账单号",
key: "sn",
minWidth: 200,
tooltip: true
tooltip: true,
},
{
title: "生成时间",
@@ -126,14 +126,14 @@ export default {
key: "startTime",
width: 200,
render: (h, params) => {
return h('div', params.row.startTime +"~"+params.row.endTime)
}
return h("div", params.row.startTime + "~" + params.row.endTime);
},
},
{
title: "店铺名称",
key: "storeName",
minWidth: 120,
tooltip: true
tooltip: true,
},
{
@@ -152,16 +152,16 @@ export default {
key: "billStatus",
width: 100,
render: (h, params) => {
if(params.row.billStatus == 'OUT'){
return h('div', '已出账')
} else if (params.row.billStatus == 'CHECK') {
return h('div', '已对账')
} else if (params.row.billStatus == 'EXAMINE') {
return h('div', '已审核')
}else{
return h('div', '已付款')
if (params.row.billStatus == "OUT") {
return h("div", "已出账");
} else if (params.row.billStatus == "CHECK") {
return h("div", "已对账");
} else if (params.row.billStatus == "EXAMINE") {
return h("div", "已审核");
} else {
return h("div", "已付款");
}
}
},
},
{
title: "操作",