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

10.11

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-10-11 14:52:33 +08:00
parent 6651516ee7
commit e7af9f6b53
7 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuintAdmin/src/views/handover/HandoverDetails.vue
View File

@ -26,12 +26,9 @@
:label="option.realName"
:value="option.id"
:disabled="queryParams.status === '统一交班'"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="flex-container" style="float: right">
<el-button type="primary" icon="el-icon-search" :disabled="!isSearch" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@ -278,8 +275,6 @@
<div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
@ -297,8 +292,6 @@
<div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>

2
fuintAdmin/src/views/handover/HandoverRecord.vue
View File

@ -10,7 +10,7 @@ export default {
return {
// 查看详情
openSeeDetails:false,
// 交易明细
// 170px
openTransactionDetail:false,
// 商品汇总
openGoodsSum:false,

2
fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
View File

@ -100,7 +100,7 @@
<div>{{orderSummary.sumnum}}</div>
</div>
<div class="xxing"></div>
<div style="overflow: auto; height: 35vh;scrollbar-width: none; ">
<div style="overflow: auto; height: 32vh;scrollbar-width: none; ">
<div class="for-box">
<div class="for-title">
<div class="x-"></div>

9
fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
View File

@ -488,14 +488,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="归还方式" prop="payType">
<!-- <el-radio-group v-model="form2.payType"-->
<!-- @click="returnMethod">-->
<!-- <el-radio v-for="item in payList"-->
<!-- :key="item.dictValue"-->
<!-- :value="item.dictValue"-->
<!-- :label="item.dictValue" border>{{ item.dictLabel }}</el-radio>-->
<!-- </el-radio-group>-->
<el-radio v-model="payType" v-for="item in payList"
<el-radio style="margin-left: 0px;margin-bottom: 10px" v-model="payType" v-for="item in payList"
:key="item.dictValue" :value="item.dictValue"
v-if="item.dictValue!='APPLET_CODE'"
:label="item.dictValue"

3
fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue
View File

@ -375,9 +375,10 @@ export default {
margin: 0px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 0px 15px;
padding: 15px;
border-bottom: 1px solid #eceff1;
padding-bottom: 0px;
height: 64px;
}
.cont_box{

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

@ -181,23 +181,23 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button style="color: #fe8c4a" size="mini"
<div style="color: #fe8c4a" size="mini"
@click="getOrdersInfo(scope.row.id)"
type="text" plain round>详情
</el-button>
</div>
<!-- <el-button style="color: #fe8c4a" size="mini"-->
<!-- @click="getOrdersInfo2(scope.row.id)"-->
<!-- type="text" plain round>详情2-->
<!-- </el-button>-->
<el-button style="color: #fe8c4a" size="mini"
<div style="color: #fe8c4a" size="mini"
@click="patchwork(scope.row)"
type="text" plain round>补打小票
</el-button>
<el-button style="color: #fe8c4a" size="mini"
</div>
<div style="color: #fe8c4a" size="mini"
v-if="scope.row.status === 'paid'"
@click="refHandleRefund(scope.row.id)"
type="text" plain round>退款
</el-button>
</div>
</template>
</el-table-column>

4
fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
View File

@ -173,10 +173,10 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button size="mini" type="text" icon="el-icon-edit">更多操作</el-button>-->
<el-button style="width: 60px" size="mini"
<div style="width: 60px;color: #ff8c4b;margin: 0 auto"
@click="patchwork(scope.row)"
type="primary" plain round>补打
</el-button>
</div>
<!-- <el-button style="width: 60px" size="mini"-->
<!-- @click="handleRefund(scope.row.id)"-->
<!-- type="danger" plain round>退款</el-button>-->