Merge branch 'wwz' of gitee.com:shaanxi-super-shopkeeper_1/cashierdesktop into gyq
This commit is contained in:
commit
6e3a4c5ce3
|
|
@ -22,12 +22,14 @@
|
|||
</div>
|
||||
<!-- 更多 -->
|
||||
<more ref="moreref"></more>
|
||||
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import more from '@/components/more.vue'
|
||||
|
||||
const route = useRoute()
|
||||
const moreref = ref(null)
|
||||
console.log(route.path)
|
||||
|
|
|
|||
|
|
@ -40,16 +40,16 @@
|
|||
设置
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="drawerbox_bo_box_itembox" @click="screenref.show()">
|
||||
<div class="drawerbox_bo_box_itembox" @click="screenref.shows()">
|
||||
<div class="drawerbox_bo_box_icon">
|
||||
<el-icon size="40" style="margin:30px;">
|
||||
<Setting />
|
||||
<Switch />
|
||||
</el-icon>
|
||||
</div>
|
||||
<div class="drawerbox_bo_box_icontext">
|
||||
锁屏
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -63,12 +63,13 @@
|
|||
</div>
|
||||
</el-drawer>
|
||||
</div>
|
||||
<!-- <screen ref="screenref"></screen> -->
|
||||
<screen ref="screenref"></screen>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { useUser } from "@/store/user.js"
|
||||
import screen from '@/components/screen.vue'
|
||||
|
||||
import packageData from '../../package.json'
|
||||
const store = useUser()
|
||||
|
|
@ -96,9 +97,9 @@ defineExpose({
|
|||
|
||||
.boxabsolute {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
bottom: 20px;
|
||||
|
||||
left: 50%;
|
||||
transform: translate(-50%);
|
||||
div {
|
||||
color: #8c9196;
|
||||
text-align: center;
|
||||
|
|
|
|||
|
|
@ -1,29 +1,37 @@
|
|||
<template>
|
||||
<div class="drawerbox">
|
||||
<el-drawer size="50%" :with-header="false" direction="rtl" v-model="dialogVisible" style="padding: 0;">
|
||||
<el-dialog width="400" v-model="dialogVisible" style="padding: 0; " title="以锁屏" :close-on-click-modal="false" :show-close="false">
|
||||
<div class="drawerbox_box">
|
||||
111
|
||||
</div>
|
||||
</el-drawer>
|
||||
<el-input v-model="loginName" placeholder="请输入登录账号" />
|
||||
<el-button style="width: 100%; margin-top: 20px;" type="primary" @click="loginNameclick">确认</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { useUser } from "@/store/user.js"
|
||||
|
||||
import { ElMessage } from 'element-plus'
|
||||
const store = useUser()
|
||||
|
||||
|
||||
const loginName = ref()
|
||||
const loginNameclick = () => {
|
||||
if (loginName.value == store.userInfo.loginName) {
|
||||
dialogVisible.value = false
|
||||
} else {
|
||||
ElMessage({
|
||||
message: '输入错误',
|
||||
type: 'Error',
|
||||
})
|
||||
}
|
||||
}
|
||||
const dialogVisible = ref(false)
|
||||
|
||||
function show() {
|
||||
function shows() {
|
||||
dialogVisible.value = true
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
show
|
||||
shows
|
||||
})
|
||||
|
||||
|
||||
|
|
@ -37,73 +45,6 @@ defineExpose({
|
|||
|
||||
.drawerbox_box {
|
||||
color: #fff;
|
||||
|
||||
.drawerbox_bo_top {
|
||||
padding: 20px 0;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
border-bottom: 1px solid #ccc;
|
||||
|
||||
.drawerbox_bo_top_left {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.drawerbox_bo_top_ring {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.drawerbox_bo_top_ring_tb {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 6px;
|
||||
padding: 6px 10px;
|
||||
|
||||
span {
|
||||
width: 80px;
|
||||
margin-top: 5px;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.drawerbox_bo_box {
|
||||
width: 100%;
|
||||
|
||||
.drawerbox_bo_box_itemb_felx {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
padding: 0 20px;
|
||||
|
||||
.drawerbox_bo_box_itembox:nth-child(1) {
|
||||
margin-left: 0px;
|
||||
|
||||
}
|
||||
|
||||
.drawerbox_bo_box_itembox {
|
||||
width: 20%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
margin-left: 40px;
|
||||
|
||||
.drawerbox_bo_box_icon {
|
||||
border-radius: 6px;
|
||||
background: #2196f3;
|
||||
width: 100px;
|
||||
height: 100px;
|
||||
}
|
||||
|
||||
.drawerbox_bo_box_icontext {
|
||||
margin-top: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -13,8 +13,11 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="demo_tabs_boxitem_onetow">
|
||||
<div style="width: 80%;">{{item.names && item.names.join(',') }}</div>
|
||||
<div style="font-size: 16px; color: #757575;">{{ item.orderNo }}</div>
|
||||
<div>
|
||||
<span>{{item.names && item.names[0] }} </span>
|
||||
<span style="margin-left: 6px;">等{{ item.names && item.names.length }}项</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="demo_tabs_boxitem_tow">
|
||||
|
|
@ -38,7 +41,11 @@ import { dayjs } from 'element-plus'
|
|||
const props = defineProps({
|
||||
ordereData: {
|
||||
type: Object,
|
||||
default: {}
|
||||
default: {
|
||||
list:[{
|
||||
names:[]
|
||||
}]
|
||||
}
|
||||
}
|
||||
})
|
||||
const emit = defineEmits(["emititemboxshow"])
|
||||
|
|
@ -77,6 +84,9 @@ const clickitemboxshow = (e) => {
|
|||
}
|
||||
|
||||
.demo_tabs_boxitem_onetow {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
flex: 1;
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -179,7 +179,9 @@
|
|||
<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)" v-model="item.checked" size="large" />
|
||||
<el-checkbox @change="changezong(item, index, 1)"
|
||||
:disabled="item.status == 'closed' ? false : true" v-model="item.checked"
|
||||
size="large" />
|
||||
<span style="margin-left: 10px;">{{ item.productName }}</span>
|
||||
</div>
|
||||
<div class="recharge_footer_itemright_botton_itemtow">
|
||||
|
|
@ -233,10 +235,9 @@ const payreturnOrderclick = async () => {
|
|||
return false
|
||||
}
|
||||
try {
|
||||
let result = orderDetaildata.value.detailList.map(item => {
|
||||
let obj = {}
|
||||
if (item.checked) {
|
||||
obj = {
|
||||
let arr = orderDetaildata.value.detailList.filter(item => {
|
||||
if (item.checked && item.status == 'closed') {
|
||||
var obj = {
|
||||
id: item.id,
|
||||
orderId: orderDetaildata.value.id,
|
||||
remark: remark.value
|
||||
|
|
@ -244,12 +245,19 @@ const payreturnOrderclick = async () => {
|
|||
}
|
||||
return obj
|
||||
})
|
||||
await payreturnOrder(result)
|
||||
if (arr.length != 0) {
|
||||
await payreturnOrder(arr)
|
||||
changechecked.value = false
|
||||
recharge.value = false
|
||||
asyncorderfindOrder()
|
||||
}else{
|
||||
ElMessage.error('以没有退款项目！')
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const emititemboxshow = async (e) => { //接收子组件值 并赋值给父组件
|
||||
|
|
@ -428,6 +436,7 @@ onMounted(() => {
|
|||
.demo_tabs_boxitem_one {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
|
||||
.demo_tabs_boxitem_oneone {
|
||||
display: flex;
|
||||
margin-left: 20px;
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@
|
|||
</div>
|
||||
<div class="box_content_left_bottom">
|
||||
<el-table :data="infoData.detailList" style="width: 100%;" height="400px">
|
||||
<el-table-column prop="productName" label="商品名称" width="200" />
|
||||
<el-table-column prop="skuName" label="规格名称" width="200" />
|
||||
<el-table-column prop="amount" label="商品数量" width="200" />
|
||||
<el-table-column prop="productName" label="商品名称"/>
|
||||
<el-table-column prop="skuName" label="规格名称"/>
|
||||
<el-table-column prop="amount" label="商品数量"/>
|
||||
<el-table-column prop="num" label="商品金额" />
|
||||
</el-table>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue