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

Merge branch 'wwz' of gitee.com:shaanxi-super-shopkeeper_1/cashierdesktop into gyq

This commit is contained in:
gyq 2024-03-16 13:44:53 +08:00
parent d222e76576 9a45998a65
commit f36af706d6
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/order/components/add.vue
View File

@ -32,8 +32,9 @@
</div>
<div style="color:#ff9e01;">
<span v-if="item.status == 'pending'">挂单</span>
<span style="color: red;" v-if="item.status == 'refund'">退单</span>
<span style="color:#21c36b;" v-if="item.status == 'closed'">订单完成</span>
<span style="color: red;" v-if="item.status == 'refund' && item.orderType == 'return'">退单</span>
<span style="color:#21c36b;"
v-if="item.orderType != 'return' && (item.status == 'closed' || item.status == 'refund')">订单完成</span>
</div>
</div>
</div>
@ -75,6 +76,7 @@ const clickitemboxshow = (e) => {
justify-content: space-between;
border-bottom: 1px solid #ccc;
position: relative;
.demo_tabs_boxitem_oneyt {
position: absolute;
top: 20%;

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

@ -69,8 +69,10 @@
</div>
<div class="orderbox_right_top" style="margin-top: 20px; border-bottom: 2px solid #ccc;">
<span style="font-size: 16px;" v-if="orderDetaildata.status == 'pending'">挂单</span>
<span style="font-size: 16px; color: red;" v-if="orderDetaildata.status == 'refund'">退单</span>
<span style="font-size: 16px; color:#21c36b;" v-if="orderDetaildata.status == 'closed'">订单完成</span>
<span style="font-size: 16px; color: red;"
v-if="orderDetaildata.status == 'refund' && orderDetaildata.orderType == 'return'">退单</span>
<span style="font-size: 16px; color:#21c36b;"
v-if="orderDetaildata.orderType != 'return' && (orderDetaildata.status == 'refund' || orderDetaildata.status == 'closed')">订单完成</span>
</div>
<div class="orderbox_right_top" style="margin-top: 20px;">
<span>商品明细</span>
@ -84,7 +86,7 @@
</div>
<div class="orderbox_right_list_item" style="margin-top: 20px;"
v-for="(item, index) in orderDetaildata.detailList" :key="index">
<div>{{ item.productName }}-{{ item.productSkuName }}</div>
<div>{{ item.productName }} {{ item.productSkuName }}</div>
<div style="text-align: center;">{{ item.num }}</div>
<div style="text-align: center;">{{ item.price }}</div>
<div v-if="item.status == 'refund'"><span
@ -93,8 +95,9 @@
</div>
</div>
<div class="orderbox_right_button">
<el-button style="width: 100%;" v-if="orderDetaildata.status != 'refund'" type="primary"
@click="recharge = true">退单</el-button>
<el-button style="width: 100%;"
v-if="orderDetaildata.orderType != 'return' && (orderDetaildata.status == 'refund' || orderDetaildata.status == 'closed')"
type="primary" @click="recharge = true">退单</el-button>
<div class="orderbox_right_buttonbutton">
<!-- // -->
<el-button @click="print('normal')" style="width: 45%;" type="">重打收銀打票</el-button>
@ -244,6 +247,7 @@ const buttonloading = ref() //loading
const payreturnOrderclick = async () => {
buttonloading.value = true
if (refundamount.value == 0) {
buttonloading.value = false
ElMessage.error('退款金额不能为0！')
return false
}
@ -258,8 +262,9 @@ const payreturnOrderclick = async () => {
}
return obj
})
arr = arr.filter(item => { return item && item })
if (arr.length != 0) {
await payreturnOrder(arr.filter(item => { return item && item }))
await payreturnOrder(arr)
changechecked.value = false
recharge.value = false
itemboxshow.value = false
@ -331,7 +336,7 @@ const changezong = (e, b, c) => {
} else {
refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) - (Number(e.num) * Number(e.price))) })
}
if (orderDetaildata.value.detailList.every(item => item.checked == true || item.status == 'refund')) {//判断是否全选
if (orderDetaildata.value.detailList.every(item => item.checked == true)) {//判断是否全选
changechecked.value = true
} else {
changechecked.value = false