czg_team
/
cashier_desktop
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wwz' of e.coding.net:g-cphe0354/pczhuomianduan/cashierdesktop into gyq

This commit is contained in:
gyq 2024-04-03 15:58:04 +08:00
parent 07d7df0416 fae65b2e2a
commit a57b45160e
2 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/views/order/index.vue
View File

@ -100,7 +100,7 @@
type="primary" @click="recharge = true">退单</el-button>
<div class="orderbox_right_buttonbutton">
<!-- // -->
<el-button @click="print('normal')" style="width: 45%;" type="">重打收銀打票</el-button>
<el-button @click="print('normal')" style="width: 45%;" type="">重打收银打票</el-button>
<el-button @click="print('one')" style="width: 45%;" type="">重打出品小票</el-button>
</div>
</div>
@ -176,7 +176,9 @@
<!-- <span>优惠：￥0.00</span> -->
<span>包装费：￥{{ orderDetaildata.packFee }}</span>
<!-- <span>可退款：￥{{ orderDetaildata.packFee }}</span> -->
<!-- <el-icon class="icon">
<ShoppingBag />
</el-icon> -->
</div>
</div>
<div class="recharge_footer_itemright_botton">
@ -187,13 +189,17 @@
<div class="recharge_footer_itemright_botton_item"
v-for="(item, index) in orderDetaildata.detailList" :key="index">
<div class="recharge_footer_itemright_botton_itemone">
<el-checkbox @change="changezong(item, index, 1)"
<el-checkbox @change="changezong(item, index, 1, 'quan')"
:disabled="item.status == 'refund' ? true : false" v-model="item.checked"
size="large" />
<span style="margin-left: 10px;">{{ item.productName }}</span>
</div>
<div class="recharge_footer_itemright_botton_itemtow">
{{ item.num }}
<!-- {{ item.num }} -->
<el-input-number v-model="item.num" :min="1" size="small"
:disabled="item.status == 'refund' ? true : false" :max="item.maxnum"
@change="(currentValue, oldValue) => changezong(item, index, 1, 'num', currentValue, oldValue)" />
<!-- @change="changezong(item, index, 1, 'num')" -->
</div>
<div class="recharge_footer_itemright_botton_itemthere">
￥{{ item.price }}
@ -203,7 +209,7 @@
<div class="recharge_footer_itemright_botton_box">
<div class="recharge_footer_itemright_botton_boxone">
<div class="recharge_footer_itemright_botton_boxoneabsolute">退单金额：</div>
<div class="recharge_footer_itemright_botton_boxonetext">￥{{ refundamount }}</div>
<div class="recharge_footer_itemright_botton_boxonetext">￥{{ refundamount > 0 ? refundamount : '0.00' }}</div>
</div>
<div class="recharge_footer_itemright_botton_boxtow">
<el-button type="primary" style="width: 100%; height: 100%;" :loading="buttonloading"
@ -243,7 +249,7 @@ const handlerecharge = () => { //退单切换
const buttonloading = ref() //loading
const payreturnOrderclick = lodash.debounce( async () => { //搜索手机号
const payreturnOrderclick = lodash.debounce(async () => { //搜索手机号
buttonloading.value = true
if (refundamount.value == 0) {
buttonloading.value = false
@ -256,7 +262,8 @@ const payreturnOrderclick = lodash.debounce( async () => { //搜索手机号
var obj = {
id: item.id,
orderId: orderDetaildata.value.id,
remark: remark.value
remark: remark.value,
num: item.num
}
}
return obj
@ -313,6 +320,8 @@ const emititemboxshow = async (e) => { //接收子组件值 并赋值给父组
orderDetaildata.value = res
orderDetaildata.value.detailList.forEach((e) => {
e.checked = false
e.maxnum = e.num // 添加最大数量
e.zongprice = (e.priceAmount / e.maxnum).toFixed(2)
})
changechecked.value = false //清空全选
refundamount.value = 0 //退款金额清0
@ -328,13 +337,30 @@ const changechecked = ref(false) //全选
const refundamount = ref(0)//退款金额
const changezong = (e, b, c) => {
const changezong = (e, b, c, d, currentValue, oldValue) => {
console.log(e)
if (c == 1) {
if (e.checked) {
refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) + (Number(e.num) * Number(e.price))) })
} else {
refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) - (Number(e.num) * Number(e.price))) })
if (d == 'num' && e.checked) {
orderDetaildata.value.detailList.forEach((item, a, b) => {
if (item.id == e.id) {
if (currentValue > oldValue) {
refundamount.value = (Number(refundamount.value) + (Number(currentValue - oldValue) * Number(item.zongprice))).toFixed(2)
} else {
refundamount.value = (Number(refundamount.value) + (Number(currentValue - oldValue) * Number(item.zongprice))).toFixed(2)
}
}
})
}
if (d == 'quan') {//这是选择选项
if (e.checked) {
console.log(Number(refundamount.value), Number(e.num) * Number(e.zongprice))
refundamount.value = ((Number(refundamount.value) + (Number(e.num) * Number(e.zongprice)))).toFixed(2)
} else {
refundamount.value = ((Number(refundamount.value) - (Number(e.num) * Number(e.zongprice)))).toFixed(2)
}
}
if (orderDetaildata.value.detailList.every(item => item.checked == true)) {//判断是否全选
changechecked.value = true
} else {
@ -343,13 +369,12 @@ const changezong = (e, b, c) => {
} else {
refundamount.value = 0
orderDetaildata.value.detailList.forEach((e, a, b) => {
console.log(e, refundamount.value)
if (changechecked.value) {
if (e.status == 'refund') {
e.checked = false
} else {
e.checked = true
refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) + (Number(e.num) * Number(e.price))) })
refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) + (Number(e.num) * Number(e.zongprice))) })
}
} else {
@ -633,23 +658,25 @@ onMounted(() => {
.recharge_footer_itemright_botton_item {
display: flex;
justify-content: flex-start;
justify-content: space-around;
align-items: center;
border-bottom: 1px solid #ccc;
.recharge_footer_itemright_botton_itemone {
width: 60%;
flex: 2;
display: flex;
justify-content: flex-start;
align-items: center;
}
.recharge_footer_itemright_botton_itemtow {
width: 20%;
flex: 1;
}
.recharge_footer_itemright_botton_itemthere {
width: 20%;
flex: 1;
text-align: right;
}
}
}

2
src/views/work/index.vue
View File

@ -81,7 +81,7 @@
交班时间：
</div>
<div class="box_content_right_tiemright">
{{ dayjs(infoData.loginOutTime).format("YYYY-MM-DD") }}
{{ dayjs(infoData.loginOutTime).format("YYYY-MM-DD HH:mm:ss") }}
</div>
</div>
<div class="box_content_right_tiem">