From d2ae2e29c541763786889b5b7f44a51253e8b4e7 Mon Sep 17 00:00:00 2001 From: "@QQNZX" Date: Wed, 22 Nov 2023 17:05:07 +0800 Subject: [PATCH 1/8] =?UTF-8?q?11.22=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/EventMarketing/cardFavorable/index.vue | 2 +- fuintAdmin/src/views/login.vue | 13 ++++++++++++- fuintCashierWeb/src/views/login/index.vue | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue index 03568b261..c52138466 100644 --- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue +++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue @@ -143,7 +143,7 @@ - + diff --git a/fuintAdmin/src/views/login.vue b/fuintAdmin/src/views/login.vue index 0817846ec..3691b4233 100644 --- a/fuintAdmin/src/views/login.vue +++ b/fuintAdmin/src/views/login.vue @@ -113,7 +113,7 @@
获取验证码 - {{count}}s后重新获取 + {{count}}s后重新获取
@@ -453,4 +453,15 @@ export default { } } } +.anniulan{ + width: 100px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + //border: 1px solid #00aaff; + border-radius: 6px; + color: #00aaff; + cursor: pointer; +} diff --git a/fuintCashierWeb/src/views/login/index.vue b/fuintCashierWeb/src/views/login/index.vue index a0fe38dd4..5de770694 100644 --- a/fuintCashierWeb/src/views/login/index.vue +++ b/fuintCashierWeb/src/views/login/index.vue @@ -112,8 +112,8 @@
- 获取验证码 - {{count}}s后重新获取 + 获取验证码 + {{count}}s后重新获取
From b2574cc2cb181cdadda9368213b9745667cc3933 Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Wed, 22 Nov 2023 18:05:02 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E8=BF=9B=E6=B2=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/src/api/oilConfig/oilPurchase.js | 18 ++ fuintAdmin/src/views/member/userInfo.vue | 15 +- .../src/views/oilConfig/oilInventory/list.vue | 2 +- .../views/oilConfig/oilInventory/order.vue | 14 +- .../src/views/oilConfig/oilPurchase/list.vue | 2 +- .../oilConfig/oilPurchase/purchaseOrder.vue | 269 ++++++++++++------ .../controller/CardFuelDieselController.java | 7 +- .../cardFule/mapper/CardFuelDieselMapper.java | 3 + .../mapper/xml/CardFuelDieselMapper.xml | 16 ++ .../service/CardFuelDieselService.java | 4 + .../impl/CardFuelDieselServiceImpl.java | 13 + .../controller/OilPurchaseController.java | 6 + .../OilPurchaseOrderController.java | 12 +- .../dto/OilPurchase4OrdDTO.java | 13 + .../mapper/xml/OilPurchaseOrderMapper.xml | 26 +- .../service/OilPurchaseOrderService.java | 2 +- .../service/OilPurchaseService.java | 3 + .../impl/OilPurchaseOrderServiceImpl.java | 17 +- .../service/impl/OilPurchaseServiceImpl.java | 66 ++++- 19 files changed, 376 insertions(+), 132 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelDieselMapper.xml create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/dto/OilPurchase4OrdDTO.java diff --git a/fuintAdmin/src/api/oilConfig/oilPurchase.js b/fuintAdmin/src/api/oilConfig/oilPurchase.js index 93e931de4..d7ee5c7cb 100644 --- a/fuintAdmin/src/api/oilConfig/oilPurchase.js +++ b/fuintAdmin/src/api/oilConfig/oilPurchase.js @@ -20,6 +20,15 @@ export function insertPurchaseApi(data) { }) } +// 处理全部 +export function unifiedProcessingApi(data) { + return request({ + url: 'business/petrolStationManagement/oilPurchase/unifiedProcessing', + method: 'post', + data: data + }) +} + // 修改有关信息 export function updatePurchaseApi(data) { return request({ @@ -75,6 +84,15 @@ export function editPurchuseApi(data) { }) } +// 批量处理数据 +export function disposeBatchApi(data) { + return request({ + url: 'business/petrolStationManagement/oilPurchaseOrder/disposeBatch', + method: 'post', + data: data + }) +} + // 审核 export function auditApi(data) { diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index c2b65844a..a6cba0102 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -433,7 +433,7 @@
油品类型
- {{ item.type }}{{item.oilType}} + {{ item.type }}
@@ -1010,8 +1010,13 @@ export default { await getCardValueListApi(quy).then(res=>{ this.cardValueList = res.data.records; this.cardValueList.sort((a, b) => a.rechargeBalance - b.rechargeBalance); + }) if (this.cardValueList.length > 0) { + // 过滤 + this.cardValueList = this.cardValueList.filter(item => { + return item.membershipLevel.includes(this.grade.name); + }); this.rechargeCard(0); } }, @@ -1098,12 +1103,14 @@ export default { if (this.oilTypeList.length > 0) { // 默认选中第一个 this.tabOilType = this.oilTypeList[0].oilType - this.selectOilType(this.oilTypeList[0].oilType); + this.selectOilType(this.oilTypeList[0].status,this.oilTypeList[0].oilType); } }) }, // 根据油品过滤查询存油卡 tabOilTypeClick(data){ + console.log("aaaaaaaaaaaaaa",this.grade.name) + this.cardFuelDieselList = this.sourceCardFuelDieselList.filter(item => { return item.oilType === data; }); @@ -1111,9 +1118,9 @@ export default { this.recharge(0) } }, - selectOilType(oilType) { + selectOilType(status,oilType) { this.tabOilType = oilType; - this.tabOilTypeClick(oilType); + this.tabOilTypeClick(status); }, // 查询员工 diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue index 711771011..1ee01b05b 100644 --- a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue @@ -84,7 +84,7 @@ type="text" icon="el-icon-edit" @click="dispose(scope.row)" - >{{ scope.row.status == 'ysh'?'查看单据':'处理单据' }} + >{{ scope.row.status == 'qrts'?'查看单据':'处理单据' }} diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue index a73e0b173..7960cf9a6 100644 --- a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue +++ b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue @@ -437,10 +437,8 @@ export default { } if (isDuplicate) { - console.log("isDuplicate222") - this.$message({ - message: '有重复油罐油罐，请重新选择', + message: '有重复油罐，请重新选择', type: 'warning' }); this.multipleSelection = [] @@ -517,12 +515,6 @@ export default { }, edit() { - // updatePurchaseOrderApi(this.orderForm).then(response => { - // // this.$modal.msgSuccess("修改成功"); - // // this.open = false; - // this.orderForm = {} - // this.getList(); - // }); }, // 选择油罐添加密度 @@ -567,7 +559,7 @@ export default { }, // 保存订单信息 - saveInventory(){ + async saveInventory(){ let this_ = this if (this_.inventoryNo.inventoryNo == null){ this.$modal.msgSuccess("请先填写盘点号"); @@ -596,7 +588,7 @@ export default { if (this_.inventoryId != null) { // 修改 inventoryForm.id = this_.inventoryId - updateInventoryApi(inventoryForm).then(response=>{ + await updateInventoryApi(inventoryForm).then(response=>{ // 处理列表 // disList.inventoryId= this_.inventoryId diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue index 973adee7c..5062407fa 100644 --- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue @@ -96,7 +96,7 @@ type="text" icon="el-icon-edit" @click="dispose(scope.row)" - >处理单据 + >{{ scope.row.status == 'qrts'?'查看单据':'处理单据' }} diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue index 275274790..dcc57dcc5 100644 --- a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue +++ b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue @@ -92,12 +92,13 @@ - + - - + - - - - - - + + + - + - - - + + - - + - - - + + - - - - - @@ -238,6 +204,90 @@ + + +
+ +
+
+
+

单据号：{{record.orderNo}}

+
+
+
+
+ 操作员工： + {{ record.realName }} +
+
+
+
+ 挂账单位 + {{record.unitName}} +
+
+ 挂账人 + {{record.personCredit}} +
+
+ 联系电话 + {{record.contactMobile}} +
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ + @@ -620,6 +670,7 @@ import { } from "@/api/cashier/hangbill"; import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit"; import {getDicts} from "@/api/dict/data"; +import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/cashier/returnrecord"; export default { name: "credit", @@ -643,6 +694,7 @@ import {getDicts} from "@/api/dict/data"; isPay:true, isPaySuccess:false, loading: false, + drawer: false, // 弹出框标题 title:'', // 支付方式列表 @@ -664,6 +716,8 @@ import {getDicts} from "@/api/dict/data"; form2:{payType:"WECHAT"}, form3:{}, form4:{payType:"WECHAT"}, + // 挂账信息 + record:{}, // 查询参数 queryParams: { page: 1, @@ -673,13 +727,21 @@ import {getDicts} from "@/api/dict/data"; page: 1, pageSize: 10, }, + queryParams1: { + page: 1, + pageSize: 10, + hangBillId:"", + }, // 日期范围 dateRange: [], // 挂账记录列表 hangBillList:[], + // 归还记录列表 + returnRecordList:[], // 总条数 total: 0, total1: 0, + total2: 0, // 是否开启提示框 open:false, open1:false, @@ -693,6 +755,7 @@ import {getDicts} from "@/api/dict/data"; isBatch:false, timer:"", unitName:"", + orderNo:"", // 表单校验 rules: { unitName: [ { required: true, message: "请选择挂账单位", trigger: "blur" }, ], @@ -769,6 +832,42 @@ import {getDicts} from "@/api/dict/data"; this.getLists(); }, methods:{ + getPayMeth(list,val){ + let name = ""; + if (list!=null && list!=""){ + list.forEach(item => { + if (item.dictValue == val){ + name = item.dictLabel + } + }) + } + return name; + }, + // 是否关闭弹框 + handleClose(done) { + done(); + }, + // 归还记录详情弹框 + returnRecord(id){ + this.record = {} + this.drawer = true + hangBillInfo(id).then(response => { + this.record = response.data + }) + this.getRecordList(id,1); + }, + getRecordList(id,val){ + if (val!=1){ + this.queryParams1.page = id + this.queryParams1.hangBillId = this.record.id + }else { + this.queryParams1.hangBillId = id + } + listReturnRecord(this.queryParams1).then(response => { + this.returnRecordList = response.data.records + this.total2 = response.data.total + }) + }, changePayType(val){ this.payType = val }, @@ -778,17 +877,19 @@ import {getDicts} from "@/api/dict/data"; }, // 计算找零金额 changeSeekZero(){ - this.seekZero = this.authCode - this.oilActualPay - this.goodsActualPay + this.seekZero = (this.authCode - this.payAmount).toFixed(2) }, batchSub(){ this.form4.list = JSON.stringify(this.tableList); this.form4.repaidAmount = this.repaidAmount; + this.form4.payType = "WECHAT" this.open4 = true; }, batchReturn(){ this.open3 = true this.repayList = []; this.unitName = "" + this.getLists(); }, getRepayList(){ let result = []; @@ -854,37 +955,48 @@ import {getDicts} from "@/api/dict/data"; this.getList(); }, // 收款 - collection(){ + collection(val){ + if (this.payType=="CASH"){ + if (this.authCode==undefined || this.authCode=="" || this.seekZero<0){ + this.$modal.msgError("请输入正确的金额变化"); + return; + } + } let _this = this; if (this.isBatch){ // 批量归还 _this.form4.repaidAmount = _this.payAmount; _this.form4.authCode = _this.authCode; - _this.form4.orderNo = _this.tableList[0].orderNo; + _this.form4.seekZero = _this.seekZero batchHangBill(_this.form4).then(response => { - if (response.data!=0){ - _this.isPaySuccess = true; - _this.isPay = false; - this.getList(); - } + // 返回订单号信息 + _this.orderNo = response.data }) _this.loading = true; + _this.queryPayStatus(); + let timer = setInterval(function () { + if (_this.isQuery == false) { + _this.loading = false; + _this.isPay = false; + clearInterval(_this.timer); + } + },1000) + setTimeout(function (){ + _this.loading = false; + clearInterval(timer); + },30000) this.open3 = false; this.open4 = false; + this.getLists(); + this.getList(); }else { // 单个归还 _this.form2.repaidAmount = _this.payAmount; _this.form2.authCode = _this.authCode; + _this.form2.seekZero = _this.seekZero editHangBill(this.form2).then(response => { - console.log(response) - if (response.data==null){ - - }else { - if (response.data.payStatus == 'paid'){ - _this.isPaySuccess = true; - _this.isPay = false; - } - } + // 返回订单号信息 + _this.orderNo = response.data }) _this.loading = true; _this.queryPayStatus(); @@ -907,20 +1019,22 @@ import {getDicts} from "@/api/dict/data"; queryPayStatus(){ let _this = this; _this.timer = setInterval(function (){ - queryHangBill({orderNo:_this.form2.orderNo}).then(response => { - if (response.data.payStatus == "unpaid"){ - _this.isQuery = true; - } - if (response.data.payStatus == "paid"){ - _this.isPaySuccess = true; - _this.isQuery = false; - } - if (response.data.payStatus == "payFail"){ - _this.isPaySuccess = false; - _this.isQuery = false; - } + returnRecordByOrderNo({orderNo:_this.orderNo}).then(response => { + response.data.forEach(item => { + if (item.payStatus == "unpaid"){ + _this.isQuery = true; + } + if (item.payStatus == "paid"){ + _this.isPaySuccess = true; + _this.isQuery = false; + } + if (item.payStatus == "payFail"){ + _this.isPaySuccess = false; + _this.isQuery = false; + } + }) }) - },1000) + },1001) }, submitReturn(){ this.isPay = true; @@ -937,8 +1051,10 @@ import {getDicts} from "@/api/dict/data"; submitReturn1(){ this.isPay = true; this.isBatch = true; + this.loading = false; this.payAmount = this.form4.repaidAmount; - this.authCode = this.form4.authCode; + this.authCode = ""; + // this.authCode = this.form4.authCode; if (this.form4.payType!="CASH"){ this.title = "扫码付款"; }else { @@ -954,6 +1070,7 @@ import {getDicts} from "@/api/dict/data"; }, // 归还 repay(id){ + this.payType = "WECHAT" hangBillInfo(id).then( response => { this.open2 = true; this.form2 = response.data @@ -1047,7 +1164,10 @@ import {getDicts} from "@/api/dict/data"; }) }, // 获取列表信息 - getList(){ + getList(val){ + if (val!=undefined){ + this.queryParams.page = val + } listHangBill(this.addDateRange(this.queryParams, this.dateRange)).then( response => { this.hangBillList = response.data.records this.total = response.data.total; diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 5d6205b9b..27a1c890d 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -152,8 +152,20 @@ width="400" trigger="click">
- - + + + + + + + + + + + + +
{{item.name}}
@@ -161,8 +173,8 @@
满{{ item.full }}元，减{{ item.reduce }}元
- - + +
{ - list.push(item.name) - }) if (val){ this.couponAmount = 0 - this.couponDiscount.forEach(item2 => { - this.couponAmount += item2.reduce + this.couponAmount = this.couponDiscount[0].reduce + this.useCouponIds = "" + this.couponIds.forEach(item => { + if (item.name = this.couponDiscount[0].name){ + this.useCouponIds = item.id + } }) + this.checkedCities5 = this.couponDiscount[0].name; }else { + this.useCouponIds = "" this.couponAmount = 0 + this.checkedCities5 = "" } - this.checkedCities5 = val ? list : []; - this.isIndeterminate5 = false; this.isExclusion(); }, handleCheckedCitiesChange5(value) { this.couponAmount = 0; this.couponDiscount.forEach(item => { - let reduces = 0 - for (let i = 0; i < value.length; i++){ - if (item.name == value[i]){ - reduces = item.reduce - } + if (item.name == value){ + this.couponAmount = item.reduce } - this.couponAmount += reduces }) - let checkedCount = value.length; - this.checkAll5 = checkedCount === this.couponDiscount.length; - this.isIndeterminate5 = checkedCount > 0 && checkedCount < this.couponDiscount.length; + this.useCouponIds = "" + this.couponIds.forEach(item => { + if (item.name == value){ + this.useCouponIds = item.id + } + }) + this.checkAll5 = true; this.isExclusion(); }, // 模糊查询商品信息 @@ -1646,10 +1667,13 @@ _this.preferentialData.oilPrice = item1.oilPrice; _this.preferentialData.oilLiters = item1.liters; _this.couponDiscount =[]; + _this.couponIds = [], selectCoupon(_this.preferentialData).then(response => { _this.couponAmount = 0; + _this.couponIds = response.data if (response.data.length>0){ response.data.forEach(item => { + _this.useCouponIds.push(item.id) let discount = {type:item.type,discountType:item.discountType,name:item.name,oilName:item1.oilName,full:0,reduce:0,discount:0} discount.full = item.satisfiedAmount if (item.type==0){ @@ -1688,12 +1712,19 @@ _this.couponDiscount.forEach(item2 => { if (item2.oilName!=discount.oilName) { _this.couponDiscount.push(discount) - _this.checkedCities5.push(item.name) + _this.checkedCities5 = item.name + _this.couponAmount = discount.reduce + } + if (item2.name!=discount.name && item2.oilName==discount.oilName) { + _this.couponDiscount.push(discount) + _this.checkedCities5 = item.name + _this.couponAmount = discount.reduce } }) }else { _this.couponDiscount.push(discount) - _this.checkedCities5.push(item.name) + _this.checkedCities5 = item.name + _this.couponAmount = discount.reduce } } if (item.exclusiveFunction == 0){ @@ -1712,12 +1743,7 @@ _this.exclusion = item.exclusiveFunction }) } - let couponAmount = 0; - _this.couponDiscount.forEach(item2 => { - couponAmount += item2.reduce - _this.checkAll5 = true; - }) - _this.couponAmount = couponAmount + _this.checkAll5 = true; _this.isExclusion(); }) }) @@ -1763,6 +1789,11 @@ // 判断互斥限制 isExclusion(){ if (this.exclusion == 1){ + // 不使用满减 + if (this.isUseBalance){ + this.countAmountFull() + return; + } // 储值卡互斥 if (this.isUseBalance){ this.countAmountUnBalance() @@ -1773,6 +1804,11 @@ } }else if (this.exclusion == 0){ // 满减互斥 + // 不使用储值卡 + if (this.isUseBalance){ + this.countAmountUnBalance() + return; + } if (this.isUseFull){ this.countAmountFull() return; @@ -1848,17 +1884,6 @@ _this.fullReduction = 0 } _this.isExclusion(); - // if (_this.isUseFull){ - // _this.checkAll1 = false; - // _this.fullReduction = 0; - // _this.checkedCities1 = [] - // _this.countAmountFull() - // return; - // }else { - // _this.countAmountBalance() - // return; - // } - // _this.oilActualPay = oilActualPay - _this.oilDiscount - _this.fullReduction - _this.balance }) }) }, @@ -1994,11 +2019,6 @@ this.oilAmount += +item.amount }) - // if (this.select == "元"){ - // this.oilAmount = +this.form.amount + this.oilAmount; - // }else { - // this.oilAmount = this.form.amount + this.oilAmount; - // } this.oilActualPay = this.oilAmount - this.oilDiscount; this.oilTotal = this.oilOrder.length; this.select = "元"; @@ -2174,6 +2194,7 @@ this.map.consumeAmount = this.consumeAmount; this.updateRefuelMoney(); this.map.refuelMoney = JSON.stringify(this.refuelMoney) + this.map.couponId = this.useCouponIds let _this = this; addLJGoods(_this.map).then( response => { From 7ad76afacaf89031308ba25b456131bd676c4ead Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Fri, 24 Nov 2023 09:18:11 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintCashierWeb/src/api/cashier/cardSet.js | 148 +- fuintCashierWeb/src/views/details/index.vue | 3232 +++++++++---------- 2 files changed, 1690 insertions(+), 1690 deletions(-) diff --git a/fuintCashierWeb/src/api/cashier/cardSet.js b/fuintCashierWeb/src/api/cashier/cardSet.js index 320b1a78c..a29f0f1fa 100644 --- a/fuintCashierWeb/src/api/cashier/cardSet.js +++ b/fuintCashierWeb/src/api/cashier/cardSet.js @@ -1,74 +1,74 @@ -// import request from '@/utils/request' -// -// // 分页查询列表 -// export function getList(query) { -// return request({ -// url: 'business/marketingActivity/cardFuelDiesel', -// method: 'get', -// params: query -// }) -// } -// -// // 分页查询列表 -// export function getCountOilTypeApi(query) { -// return request({ -// url: 'business/marketingActivity/cardFuelDiesel/countOilType', -// method: 'get', -// params: query -// }) -// } -// -// // 查询余额券 -// export function getCardValueListApi(query) { -// return request({ -// url: 'business/marketingActivity/cardValue', -// method: 'get', -// params: query -// }) -// } -// -// // 余额支付 -// export function getPrepaidCardTopUpApi(query) { -// return request({ -// url: 'business/marketingActivity/cardValueRecord/prepaidCardTopUp', -// method: 'post', -// data: query -// }) -// } -// -// // 余额插入订单 -// export function getCheckTheStatusOfYourPaymentApi(query) { -// return request({ -// url: 'business/marketingActivity/cardValueRecord/checkTheStatusOfYourPayment?id='+query, -// method: 'get', -// params: query -// }) -// } -// -// -// // 根据字典类型查询字典数据信息 -// export function getDicts(dictType) { -// return request({ -// url: '/system/dict/data/type/' + dictType, -// method: 'get' -// }) -// } -// -// -// // 余额支付 油卡 -// export function getPrepaidFuelTopUpApi(query) { -// return request({ -// url: 'business/marketingActivity/cardFuelRecord/prepaidFuelTopUp', -// method: 'post', -// data: query -// }) -// } -// -// // 余额插入订单 油卡 -// export function getCheckTheStatusOfYourPaymentByFuelApi(query) { -// return request({ -// url: 'business/marketingActivity/cardFuelRecord/checkTheStatusOfYourPaymentByFuel?id='+query, -// method: 'get', -// params: query -// }) -// } +import request from '@/utils/request' + +// 分页查询列表 +export function getList(query) { + return request({ + url: 'business/marketingActivity/cardFuelDiesel', + method: 'get', + params: query + }) +} + +// 分页查询列表 +export function getCountOilTypeApi(query) { + return request({ + url: 'business/marketingActivity/cardFuelDiesel/countOilType', + method: 'get', + params: query + }) +} + +// 查询余额券 +export function getCardValueListApi(query) { + return request({ + url: 'business/marketingActivity/cardValue', + method: 'get', + params: query + }) +} + +// 余额支付 +export function getPrepaidCardTopUpApi(query) { + return request({ + url: 'business/marketingActivity/cardValueRecord/prepaidCardTopUp', + method: 'post', + data: query + }) +} + +// 余额插入订单 +export function getCheckTheStatusOfYourPaymentApi(query) { + return request({ + url: 'business/marketingActivity/cardValueRecord/checkTheStatusOfYourPayment?id='+query, + method: 'get', + params: query + }) +} + + +// 根据字典类型查询字典数据信息 +export function getDicts(dictType) { + return request({ + url: '/system/dict/data/type/' + dictType, + method: 'get' + }) +} + + +// 余额支付 油卡 +export function getPrepaidFuelTopUpApi(query) { + return request({ + url: 'business/marketingActivity/cardFuelRecord/prepaidFuelTopUp', + method: 'post', + data: query + }) +} + +// 余额插入订单 油卡 +export function getCheckTheStatusOfYourPaymentByFuelApi(query) { + return request({ + url: 'business/marketingActivity/cardFuelRecord/checkTheStatusOfYourPaymentByFuel?id='+query, + method: 'get', + params: query + }) +} diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue index d779c5882..0ee67aba4 100644 --- a/fuintCashierWeb/src/views/details/index.vue +++ b/fuintCashierWeb/src/views/details/index.vue @@ -1,1641 +1,1641 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + - - - - - - + + + + + + + + + + + + + From 7e8e0fac037dd2cd94b7e975f31751092b0903dd Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Fri, 24 Nov 2023 10:23:59 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/convenienceStore/damage/index.vue | 2 +- .../views/convenienceStore/purchase/index.vue | 2 +- fuintAdmin/src/views/member/userInfo.vue | 30 +- .../impl/CardFuelRecordServiceImpl.java | 7 +- .../impl/CardValueRecordServiceImpl.java | 3 +- fuintCashierWeb/src/api/staff/client.js | 10 + fuintCashierWeb/src/api/staff/duty.js | 18 ++ fuintCashierWeb/src/api/staff/qrcode.js | 52 ++++ fuintCashierWeb/src/api/staff/staff.js | 61 ++++ fuintCashierWeb/src/api/staff/store.js | 26 ++ .../src/api/staff/user/certifiedmember.js | 61 ++++ .../src/api/staff/user/chainstoreconfig.js | 19 ++ .../src/api/staff/user/fixinglevel.js | 53 ++++ .../src/api/staff/user/sysconfig.js | 9 + fuintCashierWeb/src/api/staff/user/user.js | 78 +++++ .../src/api/staff/user/usergrade.js | 53 ++++ .../src/components/local/selectStaff.vue | 273 ++++++++++++++++++ fuintCashierWeb/src/views/details/index.vue | 32 +- 18 files changed, 761 insertions(+), 28 deletions(-) create mode 100644 fuintCashierWeb/src/api/staff/client.js create mode 100644 fuintCashierWeb/src/api/staff/duty.js create mode 100644 fuintCashierWeb/src/api/staff/qrcode.js create mode 100644 fuintCashierWeb/src/api/staff/staff.js create mode 100644 fuintCashierWeb/src/api/staff/store.js create mode 100644 fuintCashierWeb/src/api/staff/user/certifiedmember.js create mode 100644 fuintCashierWeb/src/api/staff/user/chainstoreconfig.js create mode 100644 fuintCashierWeb/src/api/staff/user/fixinglevel.js create mode 100644 fuintCashierWeb/src/api/staff/user/sysconfig.js create mode 100644 fuintCashierWeb/src/api/staff/user/user.js create mode 100644 fuintCashierWeb/src/api/staff/user/usergrade.js create mode 100644 fuintCashierWeb/src/components/local/selectStaff.vue diff --git a/fuintAdmin/src/views/convenienceStore/damage/index.vue b/fuintAdmin/src/views/convenienceStore/damage/index.vue index 2745dfe37..7b334820b 100644 --- a/fuintAdmin/src/views/convenienceStore/damage/index.vue +++ b/fuintAdmin/src/views/convenienceStore/damage/index.vue @@ -16,7 +16,7 @@ - + - + refuelMoney = new HashMap<>(); // todo 目前没有用id // refuelMoney.put("oilNumberId",cardFuelRecord.getOilNumberId().toString()); +// refuelMoney.put("oilNameId",cardFuelRecord.getType()); refuelMoney.put("type",cardFuelRecord.getType()); refuelMoney.put("oilType",cardFuelRecord.getOilType()); refuelMoney.put("refuelMoney",cardFuelRecord.getIncomeLitres().toString()); @@ -257,7 +260,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { // Double.valueOf(refuelMoney); BigDecimal ref = new BigDecimal(refuelMoney); - BigDecimal inconLitres = new BigDecimal(cardFuelRecord.getIncomeLitres()); + BigDecimal inconLitres = new BigDecimal(cardFuelRecord.getIncomeLitres().toString()); BigDecimal add = ref.add(inconLitres); stringObjectMap.put("refuelMoney",add.toString()); flag = false; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index 174ec2cfc..e56b98c3f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -116,7 +116,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl +
+ + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue index 0ee67aba4..a0ff7b7f1 100644 --- a/fuintCashierWeb/src/views/details/index.vue +++ b/fuintCashierWeb/src/views/details/index.vue @@ -884,8 +884,10 @@ import {ljStoreInfo} from "@/api/cashier/user/store"; import {getDicts} from "@/api/dict/data"; import {getList,getCountOilTypeApi,getCardValueListApi,getPrepaidCardTopUpApi,getCheckTheStatusOfYourPaymentApi,getPrepaidFuelTopUpApi,getCheckTheStatusOfYourPaymentByFuelApi} from "@/api/cashier/cardSet"; import BigNumber from 'bignumber.js'; +import SelectStaff from "@/components/local/selectStaff"; export default { + components: {SelectStaff}, computed: { item() { return item @@ -1195,18 +1197,24 @@ export default { }, handleDataFromChild(data) { this.openStaff = false - this.cardFuelDieselForm= { - mtStaffId: data.mtStaffId, - realName: data.realName, - staffMobile: data.staffMobile, - }, + // this.cardFuelDieselForm= { + // mtStaffId: data.mtStaffId, + // realName: data.realName, + // staffMobile: data.staffMobile, + // }, + // this.cardValueForm = { + // mtStaffId: data.mtStaffId, + // realName: data.realName, + // staffMobile: data.staffMobile, + // } - this.cardValueForm= { - mtStaffId: data.mtStaffId, - realName: data.realName, - staffMobile: data.staffMobile, - }, - console.log('Received data in parent:', data); + this.cardFuelDieselForm.mtStaffId= data.mtStaffId, + this.cardFuelDieselForm.realName= data.realName, + this.cardFuelDieselForm.staffMobile= data.staffMobile, + + this.cardValueForm.mtStaffId= data.mtStaffId, + this.cardValueForm.realName= data.realName, + this.cardValueForm.staffMobile= data.staffMobile }, // 查询参加存油卡油品 @@ -1216,7 +1224,6 @@ export default { if (this.oilTypeList.length > 0) { // 默认选中第一个 this.tabOilType = this.oilTypeList[0].oilType - console.log("this.oilTypeList[0].status",this.oilTypeList[0].status) this.selectOilType(this.oilTypeList[0].status,this.oilTypeList[0].oilType); } }) @@ -1312,6 +1319,7 @@ export default { this.realyPayBills = file.rechargeBalance console.log("this.cardFuelDieselList[index]",this.cardFuelDieselList[index]) console.log("this.cardFuelDieselForm[index]",this.cardFuelDieselForm) + console.log("file",file) }, async collection(){