From b1b8797ad0b246221fe5ce31d7d784f943a62edf Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 3 Feb 2024 17:37:34 +0800 Subject: [PATCH 1/3] bug --- fuintAdmin/src/api/staff/user/creditunit.js | 28 +++ .../src/views/convenienceStore/goodsFile.vue | 1 + .../views/convenienceStore/stockStatistic.vue | 15 +- fuintAdmin/src/views/member/creditIndex.vue | 221 ++++++++++++++++++ .../controller/CreditUnitController.java | 13 ++ .../business/order/entity/CreditUnit.java | 8 + .../order/mapper/CreditUnitMapper.java | 10 + .../order/mapper/xml/CreditUnitMapper.xml | 25 ++ .../order/service/CreditUnitService.java | 10 + .../service/impl/CreditUnitServiceImpl.java | 13 +- 10 files changed, 339 insertions(+), 5 deletions(-) create mode 100644 fuintAdmin/src/api/staff/user/creditunit.js create mode 100644 fuintAdmin/src/views/member/creditIndex.vue create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml diff --git a/fuintAdmin/src/api/staff/user/creditunit.js b/fuintAdmin/src/api/staff/user/creditunit.js new file mode 100644 index 000000000..1bd48a133 --- /dev/null +++ b/fuintAdmin/src/api/staff/user/creditunit.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +// 查询挂账信息列表 +export function listCreditUnit(query) { + return request({ + url: '/business/creditUnit/list', + method: 'get', + params: query + }) +} + +// 查询挂账信息列表 +export function listsCreditUnit(query) { + return request({ + url: '/business/creditUnit/queryList', + method: 'get', + params: query + }) +} + +// 新增挂账记录 +export function addCreditUnit(data) { + return request({ + url: '/business/creditUnit', + method: 'post', + data: data + }) +} diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue index 2b53dbbf7..f738a3cbe 100644 --- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue +++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue @@ -632,6 +632,7 @@ export default { if (recovery==1){ name = "确定要将此商品移至回收站吗?移出后将无法售卖当前商品！" prompt = "商品已移至回收站,收银台商品信息页面刷新后实时生效！" + form.status = 'jy' }else { name = "确定要将此商品从回收站移至商品档案里吗?移出后将可售卖当前商品！" prompt = "商品已移至商品档案,收银台商品信息页面刷新后实时生效！" diff --git a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue index 6547274dd..ca64a0bcc 100644 --- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue +++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue @@ -101,7 +101,7 @@ {{ getName(supplierList, scope.row.supplierId) }} - + @@ -116,8 +116,8 @@ @@ -288,6 +288,15 @@ export default { this.getTree(); }, methods: { + getName(list,id){ + let name = "" + list.forEach(item => { + if (item.id==id){ + name = item.name; + } + }) + return name; + }, // 获取分类菜单 getTree(){ cvsGoodsTree().then(response => { diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue new file mode 100644 index 000000000..393f04623 --- /dev/null +++ b/fuintAdmin/src/views/member/creditIndex.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java index 90ec94daa..c9c39f93c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java @@ -1,5 +1,6 @@ package com.fuint.business.order.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.order.entity.CreditUnit; import com.fuint.business.order.service.CreditUnitService; import com.fuint.framework.web.BaseController; @@ -14,6 +15,18 @@ public class CreditUnitController extends BaseController { @Autowired private CreditUnitService creditUnitService; + /** + * 查询所有挂账单位信息 + * @return + */ + @GetMapping("/queryList") + private ResponseObject queryList(CreditUnit creditUnit, + @RequestParam(value = "page",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ + Page page =new Page(pageNo,pageSize); + return getSuccessResult(creditUnitService.selectCreditUnitList(page,creditUnit)); + } + /** * 查询所有挂账单位信息 * @return diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java index 07d612346..fc85668df 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java @@ -53,6 +53,14 @@ public class CreditUnit extends BaseEntity implements Serializable { * 挂账额度 */ private Double creditLimit; + /** + * 挂账额度 + */ + private Double usedCreditLimit; + /** + * 挂账额度 + */ + private Double residueCreditLimit; /** * 单据备注 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java index 1d39b3b01..135dc366f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CreditUnitMapper.java @@ -1,10 +1,20 @@ package com.fuint.business.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.order.entity.CreditUnit; +import org.apache.ibatis.annotations.Param; /** * 挂账单位信息 mapper层 */ public interface CreditUnitMapper extends BaseMapper { + /** + * 根据条件分页查询挂账单位信息 + * @param page + * @param creditUnit + * @return + */ + public IPage selectCreditUnitList(Page page,@Param("creditUnit") CreditUnit creditUnit); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml new file mode 100644 index 000000000..e9a64d4de --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java index 9a9857417..49df45d53 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CreditUnitService.java @@ -1,5 +1,7 @@ package com.fuint.business.order.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.fuint.business.order.entity.CreditUnit; import org.springframework.transaction.annotation.Transactional; @@ -11,6 +13,14 @@ import java.util.List; */ @Transactional public interface CreditUnitService extends IService { + /** + * 根据条件分页查询挂账单位信息 + * @param page + * @param creditUnit + * @return + */ + public IPage selectCreditUnitList(Page page, CreditUnit creditUnit); + /** * 查询所有挂账单位信息 * @return diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java index 0c2f4b187..421d75243 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java @@ -1,6 +1,8 @@ package com.fuint.business.order.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.business.order.entity.CreditUnit; import com.fuint.business.order.mapper.CreditUnitMapper; @@ -18,13 +20,20 @@ import java.util.List; public class CreditUnitServiceImpl extends ServiceImpl implements CreditUnitService { @Autowired private ILJStoreService storeService; + + @Override + public IPage selectCreditUnitList(Page page, CreditUnit creditUnit) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + creditUnit.setStoreId(nowAccountInfo.getStoreId()); + return baseMapper.selectCreditUnitList(page,creditUnit); + } + @Override public List selectCreditUnitList() { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId()); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("status","qy"); - queryWrapper.eq("chain_store_id",store.getChainStoreId()); + queryWrapper.eq("store_id",nowAccountInfo.getStoreId()); List list = baseMapper.selectList(queryWrapper); return list; } From 033a66f12da36b9a0eb4662b4f976f88b32e7fc9 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sun, 4 Feb 2024 13:37:04 +0800 Subject: [PATCH 2/3] bug --- fuintAdmin/src/api/staff/user/creditunit.js | 27 + fuintAdmin/src/views/member/creditIndex.vue | 147 ++- fuintAdmin/src/views/order/order_Cashier.vue | 60 +- .../fuyou/service/impl/FyPayServiceImpl.java | 8 - .../controller/CreditUnitController.java | 30 + .../business/order/entity/CreditUnit.java | 6 +- .../order/service/CreditUnitService.java | 12 + .../service/impl/CreditUnitServiceImpl.java | 21 +- fuintCashierWeb/src/api/cashier/creditunit.js | 28 + .../views/cashier/NewComponents/homeindex.vue | 985 +++++++++++++++++- fuintCashierWeb/src/views/cashier/index.vue | 4 +- .../cashier/orderComponents/order_Cashier.vue | 33 +- 12 files changed, 1286 insertions(+), 75 deletions(-) diff --git a/fuintAdmin/src/api/staff/user/creditunit.js b/fuintAdmin/src/api/staff/user/creditunit.js index 1bd48a133..cbe8a1d5e 100644 --- a/fuintAdmin/src/api/staff/user/creditunit.js +++ b/fuintAdmin/src/api/staff/user/creditunit.js @@ -26,3 +26,30 @@ export function addCreditUnit(data) { data: data }) } + +// 修改挂账记录 +export function editCreditUnit(data) { + return request({ + url: '/business/creditUnit', + method: 'put', + data: data + }) +} + + +// 根据id查询挂账记录 +export function creditUnitInfo(id) { + return request({ + url: '/business/creditUnit/' + id, + method: 'get', + }) +} + + +// 根据id删除挂账记录 +export function deleteCreditUnit(id) { + return request({ + url: '/business/creditUnit/' + id, + method: 'delete', + }) +} diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue index 393f04623..ef39e737a 100644 --- a/fuintAdmin/src/views/member/creditIndex.vue +++ b/fuintAdmin/src/views/member/creditIndex.vue @@ -2,24 +2,48 @@
- + - + + + + + + + + + 搜索 @@ -69,7 +93,7 @@ size="mini" type="text" icon="el-icon-delete" - @click="handleDelete(scope.row,1)" + @click="handleDelete(scope.row)" >删除 @@ -85,7 +109,7 @@ - + @@ -110,12 +134,36 @@ - - + + - 0为不限额,额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还 + 额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还 + + + + + + + + + + + + 额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还 + + + + + + + + + + + + 额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还 @@ -144,9 +192,16 @@ + + diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue index 4e12f373f..75847caae 100644 --- a/fuintAdmin/src/views/order/order_Oil.vue +++ b/fuintAdmin/src/views/order/order_Oil.vue @@ -141,54 +141,51 @@ - - - + + + + + + + + + + + + + + + + + - + - + - - + + - - - - - - + + + + + @@ -203,6 +200,11 @@ + + + diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue index ad02e5344..ebeb2db0b 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue @@ -5,18 +5,6 @@
挂账
- - - - - - - - - - - -
列表
- 新增挂账记录 + 新增挂账单位 批量挂账归还
- + - - - - - + + + + + + + + + - - - - - - - - - - - - + - + @@ -218,6 +214,107 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - 0为不限额,额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还 + 额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还 + + + + + + + + + + + + 额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还 + + + + + + + + + + + + 额度为当前单位最大可挂账金额,如已挂账金额归还,额度将也同步返还 @@ -683,7 +804,14 @@ import { listHangBill, queryHangBill } from "@/api/cashier/hangbill"; -import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit"; +import { + addCreditUnit, + creditUnitInfo, + creditUnits, + deleteCreditUnit, + editCreditUnit, + listCreditUnit +} from "@/api/cashier/creditunit"; import {getDicts} from "@/api/dict/data"; import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/cashier/returnrecord"; @@ -761,6 +889,8 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c hangBillList:[], // 归还记录列表 returnRecordList:[], + // 挂账单位列表 + creditUnitList:[], // 总条数 total: 0, total1: 0, @@ -796,11 +926,11 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c } }, created() { - this.getList(); - this.getUnitList(); + // this.getList(); + // this.getUnitList(); this.getPayList(); this.getLists(); - // this.getStatistic(); + this.getCreditUnits(); }, directives: { // 注册一个局部的自定义指令 v-focus @@ -816,6 +946,34 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c }, }, methods:{ + handleUpdate(data){ + creditUnitInfo(data.id).then(res => { + this.form1 = res.data + this.title = "修改挂账单位" + this.open1 = true + }) + }, + handleDelete(row){ + const name = row.unitName + this.$modal.confirm('确定删除"' + name + '"的挂账单位信息？').then(function() { + // return deleteMember(row.id); + return deleteCreditUnit(row.id); + }).then(() => { + this.queryParams.page = 1 + this.getList(); + this.$modal.msgSuccess("删除成功"); + }).catch(() => {}); + }, + getCreditUnits(val){ + if (val!=undefined){ + this.queryParams.page = val + } + creditUnits().then(res => { + this.creditUnitList = res.data.records + this.total = res.data.total; + }) + + }, // 获取挂账统计信息 getStatistic(){ hangBillReturnTotal(this.addDateRange(this.queryParams, this.dateRange)).then(res => { @@ -1138,11 +1296,31 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c addCredit(){ this.$refs["formName"].validate((valid) => { if (valid) { - addCreditUnit(this.form1).then( response => { - this.$modal.msgSuccess("挂账单位信息创建成功"); - this.open1 = false; - this.getUnitList(); - }) + if (this.form1.id){ + if (this.form1.creditLimit < this.form1.residueCreditLimit){ + this.$modal.msgError("请确保预设挂账额度大于剩余挂账额度"); + return ; + } + editCreditUnit(this.form1).then(res => { + if (res.data==1) { + this.$modal.msgSuccess("挂账单位信息修改成功"); + this.open1 = false; + this.getCreditUnits(); + }else { + this.$modal.msgError("挂账单位信息修改失败"); + } + }) + }else { + addCreditUnit(this.form1).then( response => { + if (response.data==1) { + this.$modal.msgSuccess("挂账单位信息创建成功"); + this.open1 = false; + this.getCreditUnits(); + }else { + this.$modal.msgError("挂账单位信息创建失败，挂站单位名称不可重复"); + } + }) + } }else { return false; } diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue index 2d77cd51f..f207e6b7a 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue @@ -1,116 +1,174 @@ -
+ :total="total" + :page.sync="queryParams.page" + :limit.sync="queryParams.pageSize" + @current-change="getList">
+ + + +
+ +
+
+
+

单据号：{{record.orderNo}}

+
+
+
+
+ 操作员工： + {{ record.realName }} +
+
+
+
+ 挂账单位 + {{record.unitName}} +
+
+ 挂账人 + {{record.personCredit}} +
+
+ 联系电话 + {{record.contactMobile}} +
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index 145108551..4a3fb4c93 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -19,27 +19,27 @@ + - - - - - - - - - - - - 至 - - + + + + + + + + + + 搜索 @@ -418,6 +418,8 @@ import {formatDate} from "@/utils"; queryParams: { page: 1, pageSize: 10, + beginTime:"", + endTime:"", }, orderStatistics:{ numberOfStrokes:'0', @@ -440,8 +442,8 @@ import {formatDate} from "@/utils"; methods:{ exportExcelCashier() { - this.dateRange.push(this.beginTime) - this.dateRange.push(this.endTime) + // this.dateRange.push(this.beginTime) + // this.dateRange.push(this.endTime) exportExcelCashierApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{ const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }); this.$download.saveAs(blob,'收银台订单统计.xLsx') @@ -450,8 +452,8 @@ import {formatDate} from "@/utils"; // 获取订单统计信息 getOrderStatistics() { - this.dateRange.push(this.beginTime) - this.dateRange.push(this.endTime) + // this.dateRange.push(this.beginTime) + // this.dateRange.push(this.endTime) orderStatisticsApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{ this.orderStatistics = res.data }) @@ -682,6 +684,16 @@ import {formatDate} from "@/utils"; this.goodsInfo = response.data; }) }, + parseTime1(dateTime) { + let date = new Date(dateTime); + let y = date.getFullYear() + "-"; + let mon = ((date.getMonth() + 1 < 10) ? ('0' + date.getMonth()) : date.getMonth()) + "-"; + let d = ((date.getDate() < 10) ? ('0' + date.getDate()) : date.getDate()) + " "; + let h = ((date.getHours() < 10) ? ('0' + date.getHours()) : date.getHours()) + ":"; + let m = ((date.getMinutes() < 10) ? ('0' + date.getMinutes()) : date.getMinutes()) + ":"; + let s = ((date.getSeconds() < 10) ? ('0' + date.getSeconds()) : date.getSeconds()); + return new Date(y , mon , d , h , m , s); + }, // 获取列表信息 getList(val){ if (val!=undefined){ @@ -691,17 +703,17 @@ import {formatDate} from "@/utils"; let time1 = "" let time2 = "" if (this.beginTime && this.endTime){ - let beginTime = this.beginTime.getTime() - let endTime = this.endTime.getTime() - // time1 = formatDate(beginTime, 'yyyy-MM-dd') - // time2 = formatDate(endTime, 'yyyy-MM-dd') - time1 = new Date(beginTime) - time2 = new Date(endTime) - this.$modal.msgError(time1) + // let beginTime = this.beginTime.getTime() + // let endTime = this.endTime.getTime() + time1 = this.parseTime1(this.beginTime) + time2 = this.parseTime1(this.endTime) } + let dateRange = [] // this.$modal.msgError() - this.dateRange.push(time1) - this.dateRange.push(time2) + // dateRange.push(time1.toString()) + // dateRange.push(time2.toString()) + // this.$modal.msgError(this.dateRange.toString()) + // this.dateRange = dateRange.toString() listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => { this.orderList = response.data.records; this.total = response.data.total; @@ -712,8 +724,8 @@ import {formatDate} from "@/utils"; if (val!=undefined){ this.queryParams.page = val } - this.dateRange.push(this.beginTime) - this.dateRange.push(this.endTime) + // this.dateRange.push(this.beginTime) + // this.dateRange.push(this.endTime) cashierOrderSeekZeroAmount(this.addDateRange(this.queryParams, this.dateRange)).then( response => { if (response.data) { this.seekZeroAmount = response.data diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue index f2831fd52..aa53457ea 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue @@ -53,7 +53,7 @@ size="medium" value-format="yyyy-MM-dd" type="daterange" - range-separator="-" + range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" > diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue index e891bc53f..fa24eb03d 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue @@ -73,7 +73,7 @@ size="medium" value-format="yyyy-MM-dd" type="daterange" - range-separator="-" + range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" > @@ -142,54 +142,51 @@ v-loading="loading" :data="oilOrderList" style="width: 100%"> - - - + + + + + + + + + + + + + + + + + - + - + - - + + - - - - - - + + + + + @@ -204,6 +201,11 @@ + + +