dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:2e0aa8c6933ab2e027f6de33d702fbb8d5bbf79b
Branches Tags
dianliang:main
dianliang:master
..
compare: dianliang:3c45824e10c8776b5e8689b3d1376534499d391b
Branches Tags
dianliang:main
dianliang:master

No commits in common. "2e0aa8c6933ab2e027f6de33d702fbb8d5bbf79b" and "3c45824e10c8776b5e8689b3d1376534499d391b" have entirely different histories.
2e0aa8c693 ... 3c45824e10

2 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml
View File

@ -142,7 +142,7 @@
<select id="getInfoByStoreId" resultType="com.fuint.business.printer.entity.PrintDeviceInfo"> <select id="getInfoByStoreId" resultType="com.fuint.business.printer.entity.PrintDeviceInfo">
select select
id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ,acquiesce from print_device_info id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ,acquiesce from print_device_info
where store_id = #{storeId} and acquiesce = 0 order by create_time ASC limit 1 where store_id = #{storeId} and acquiesce = true limit 1
</select> </select>
<!--新增所有列--> <!--新增所有列-->

11
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

@ -186,7 +186,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: #fe8c4a" size="mini" class="makeupticket" <div style="color: #fe8c4a" size="mini"
@click="getOrdersInfo(scope.row.id)" @click="getOrdersInfo(scope.row.id)"
type="text" plain round type="text" plain round
>详情 >详情
@ -195,13 +195,13 @@
<!-- @click="getOrdersInfo2(scope.row.id)"--> <!-- @click="getOrdersInfo2(scope.row.id)"-->
<!-- type="text" plain round>详情2--> <!-- type="text" plain round>详情2-->
<!-- </el-button>--> <!-- </el-button>-->
<div style="color: #fe8c4a" size="mini" class="makeupticket" <div style="color: #fe8c4a" size="mini"
v-if="scope.row.status === 'paid'" v-if="scope.row.status === 'paid'"
@click="patchwork(scope.row)" @click="patchwork(scope.row)"
type="text" plain round type="text" plain round
>补打小票 >补打小票
</div> </div>
<div style="color: #fe8c4a" size="mini" class="makeupticket" <div style="color: #fe8c4a" size="mini"
v-if="scope.row.status === 'paid'" v-if="scope.row.status === 'paid'"
@click="refHandleRefund(scope.row.id)" @click="refHandleRefund(scope.row.id)"
type="text" plain round type="text" plain round
@ -1024,14 +1024,13 @@ export default {
if (order.oilCardAmount) { if (order.oilCardAmount) {
oilCardAmount += order.oilCardAmount oilCardAmount += order.oilCardAmount
} }
console.log(22222222222)
let o = { let o = {
oilName: this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum), oilName: this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum),
amount: order.orderAmount.toString(), amount: order.orderAmount.toString(),
// amount : order.oilPayAmount.toString(), // amount : order.oilPayAmount.toString(),
oilNum: order.oilNum.toString(), oilNum: order.oilNum.toString(),
payUser:order.payUser, payUser:order.payUser.toString(),
orderNo:order.orderNo orderNo:order.orderNo.toString()
} }
oilOrderR.push(o) oilOrderR.push(o)
}) })