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

商品列表修改，商品修改去掉库存相关东西，增加退菜是否退库存的选项，分类增加退菜是否退库存的选项，店铺增加退菜退库存模式配置，增加退款退菜是否退库存弹窗，增加购物车重复物品提示弹窗

Browse Source
This commit is contained in:
YeMingfei666
2026-04-11 15:31:57 +08:00
parent bc7b6d41f5
commit 2db9f6811a
15 changed files with 3002 additions and 2373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
http/api/cateGory.js
View File

@@ -14,6 +14,16 @@ export function categoryPage(data, urlType = 'product') {
}
})
}
/**
* 获取分类详情
* @returns
*/
export function getCategoryDetail(id, urlType = 'product') {
return request({
url: `${urlType}/admin/prod/category/`+id,
method: "GET",
})
}
/**
* 分类添加

14
http/api/cons.js
View File

@@ -14,7 +14,19 @@ export function getConsPage(data, urlType = 'product') {
}
})
}
/**
* 耗材库存列表接口
* @returns
*/
export function getConsStock(data, urlType = 'product') {
return request({
url: `${urlType}/admin/product/cons/consStock`,
method: "GET",
data: {
...data
}
})
}
/**
* 获取耗材列表
* @returns

65
pageCategory/edit-category/edit-category.vue
View File

@@ -13,15 +13,22 @@
</view>
<view class="">
<uni-forms-item label="分类名称" required name="name">
<uni-easyinput padding-none :placeholderStyle="'font-size:28rpx;'"
:inputBorder="false" v-model="category.name" placeholder="输入分类名称" />
<uni-easyinput padding-none :placeholderStyle="'font-size:28rpx;'" :inputBorder="false"
v-model="category.name" placeholder="输入分类名称" />
</uni-forms-item>
</view>
<view class="">
<uni-forms-item label="退菜是否退库存" required name=" refundMode">
<up-radio-group v-model="category.refundMode" placement="row">
<up-radio v-for="(item, index) in refundModes" :key="index" :label="item.name"
:name="item.value" activeColor="rgb(49, 138, 254)"></up-radio>
</up-radio-group>
</uni-forms-item>
</view>
<template v-if="option.type==='edit'">
<uni-forms-item label="排序" required name="sort">
<uni-easyinput padding-none :placeholderStyle="'font-size:28rpx;'"
:inputBorder="false" v-model="category.sort" type="number"
placeholder="排序越小越靠前" />
<uni-easyinput padding-none :placeholderStyle="'font-size:28rpx;'" :inputBorder="false"
v-model="category.sort" type="number" placeholder="排序越小越靠前" />
</uni-forms-item>
</template>
<uni-forms-item label="">
@@ -34,7 +41,7 @@
</uni-forms-item>
</view>
</uni-forms>
</view>
@@ -42,23 +49,44 @@
<button class="save-btn" hover-class="btn-hover-class" @click="save">保存</button>
</view>
</view>
</view>
</template>
<script setup>
import { reactive, ref } from 'vue';
import {
reactive,
ref
} from 'vue';
import go from '@/commons/utils/go.js';
import infoBox from '@/commons/utils/infoBox.js';
import mySwitch from '@/components/my-components/my-switch'
import myUploadFile from '@/components/my-components/my-upload-file'
import { onLoad, onReady } from '@dcloudio/uni-app';
import { addCategory, putCategory } from '@/http/api/cateGory.js'
import {
onLoad,
onReady
} from '@dcloudio/uni-app';
import {
addCategory,
putCategory
} from '@/http/api/cateGory.js'
const refundModes = [{
name: "退菜退库存",
value: 1
},
{
name: "仅退菜不退库存",
value: 2
},
{
name: "每次询问-退菜后弹窗提示",
value: 3
},
]
// 构造分类的基础数据
const category = reactive({
name: '',
@@ -96,7 +124,7 @@
title: option.type === 'add' ? '添加分类' : '编辑分类'
})
})
/**
* 校验是否有值
* @param {Object} obj
@@ -121,6 +149,7 @@
}
}
}
function validateFunc(key, value) {
if (validateFuncObj.hasOwnProperty(key)) {
const func = validateFuncObj[key]
@@ -137,7 +166,7 @@
resultArr = resultArr.filter(v => !v.pass)
return resultArr
}
/**
* 图片选择
* @param {Object} val
@@ -147,7 +176,7 @@
function onfileChange(val, data, key) {
data[key] = val
}
/**
* 保存
*/
@@ -157,7 +186,7 @@
const formRules = {}
const result = []
result.push(...returnValidateResult(category))
if (result.length) {
return infoBox.showToast(result[0].errMeessage)
}
@@ -178,7 +207,7 @@
uni.$emit('update:pageCategoryIndex')
go.back()
}, 500);
}
</script>

407
pageConsumables/addConsumables.vue
View File

@@ -18,6 +18,12 @@
<view>预警值</view>
<view><input type="number" placeholder="请输入预警值" v-model="datas.form.conWarning" name="" id="" /></view>
</view>
<view>
<view>是否检测耗材</view>
<up-switch size="20" :inactive-value="0" :active-value="1" v-model="datas.form.isStock"></up-switch>
</view>
<view v-if="!datas.form.id" style="justify-content: space-between">
<view>耗材类型</view>
<view style="width: 54%" @tap="datas.show = !datas.show">
@@ -55,7 +61,8 @@
<view class="label">默认入库单位</view>
<view class="ipt">
<u-radio-group v-model="datas.form.defaultUnit">
<u-radio :name="item" :label="item" v-for="(item, index) in unitList" :key="index"></u-radio>
<u-radio :name="item" :label="item" v-for="(item, index) in unitList"
:key="index"></u-radio>
</u-radio-group>
</view>
</view>
@@ -63,226 +70,252 @@
</view>
</template>
<view class="bottombutton">
<up-button type="primary" style="background-color: #318afe; color: #fff" @tap="sumbit" :plain="true" text="保存"></up-button>
<up-button type="primary" style="background-color: #318afe; color: #fff" @tap="sumbit" :plain="true"
text="保存"></up-button>
</view>
<up-picker :show="datas.show" :columns="datas.typeList" keyName="name" @cancel="datas.show = false" @confirm="confirmConsGroup"></up-picker>
<up-picker :show="datas.show" :columns="datas.typeList" keyName="name" @cancel="datas.show = false"
@confirm="confirmConsGroup"></up-picker>
<!-- 消息提示 -->
<up-toast ref="uToastRef"></up-toast>
<u-picker :show="unitShow" :columns="unitList"></u-picker>
</template>
<script setup>
import { ref, reactive } from 'vue';
import { onLoad } from '@dcloudio/uni-app';
import {
ref,
reactive
} from 'vue';
import {
onLoad
} from '@dcloudio/uni-app';
import { getConsGrpupList, addCons, editCons } from '@/http/api/cons.js';
import {
getConsGrpupList,
addCons,
editCons
} from '@/http/api/cons.js';
let datas = reactive({
show: false,
form: {
conUnit: '',
conName: '',
price: '',
conWarning: 999,
consGroupId: null,
conUnitTwo: '', // 第二单位
conUnitTwoConvert: '', // 第二单位转换数量
defaultUnit: ''
},
consGroupName: '',
typeList: []
});
onLoad((options) => {
if (options && options.item) {
let obj = JSON.parse(decodeURIComponent(options.item));
datas.form = obj;
unitList.value = [];
if (datas.form.conUnit !== '') {
unitList.value.push(datas.form.conUnit);
}
if (datas.form.conUnitTwo !== '') {
unitList.value.push(datas.form.conUnitTwo);
}
console.log('datas.form', datas.form);
console.log('unitList.value', unitList.value);
} else {
gettbConsTypeList();
}
uni.setNavigationBarTitle({
title: !datas.form.id ? '添加耗材' : '编辑耗材'
let datas = reactive({
show: false,
form: {
conUnit: '',
conName: '',
price: '',
conWarning: 999,
consGroupId: null,
conUnitTwo: '', // 第二单位
conUnitTwoConvert: '', // 第二单位转换数量
defaultUnit: '',
isStock: 1,
},
consGroupName: '',
typeList: []
});
});
/**
* 获取耗材类别
*/
let gettbConsTypeList = () => {
getConsGrpupList({
page: 1,
size: 30
}).then((res) => {
datas.typeList = [res];
onLoad((options) => {
if (options && options.item) {
let obj = JSON.parse(decodeURIComponent(options.item));
datas.form = obj;
unitList.value = [];
if (datas.form.conUnit !== '') {
unitList.value.push(datas.form.conUnit);
}
if (datas.form.conUnitTwo !== '') {
unitList.value.push(datas.form.conUnitTwo);
}
console.log('datas.form', datas.form);
console.log('unitList.value', unitList.value);
} else {
gettbConsTypeList();
}
uni.setNavigationBarTitle({
title: !datas.form.id ? '添加耗材' : '编辑耗材'
});
});
};
function confirmConsGroup(e) {
datas.show = false;
datas.form.consGroupId = e.value[0].id;
datas.consGroupName = e.value[0].name;
}
/**
* 获取耗材类别
*/
let gettbConsTypeList = () => {
getConsGrpupList({
page: 1,
size: 30
}).then((res) => {
datas.typeList = [res];
});
};
let sumbit = async () => {
let conUnitdata = datas.form.conUnit.replace(/(^\s*)|(\s*$)/g, '');
if (!conUnitdata) {
uni.$utils.showToast('单位不能为空');
return;
function confirmConsGroup(e) {
datas.show = false;
datas.form.consGroupId = e.value[0].id;
datas.consGroupName = e.value[0].name;
}
if (!datas.form.price) {
uni.$utils.showToast('价格不能为空');
return;
}
if (!datas.form.consGroupId) {
uni.$utils.showToast('耗材类型不能为空');
return;
}
if (!datas.form.id) {
await addCons({ ...datas.form });
} else {
await editCons({ ...datas.form });
}
uni.navigateBack();
};
// 显示选择单位
const unitShow = ref(false);
// 单位列表
const unitList = ref([]);
let sumbit = async () => {
let conUnitdata = datas.form.conUnit.replace(/(^\s*)|(\s*$)/g, '');
if (!conUnitdata) {
uni.$utils.showToast('单位不能为空');
return;
}
if (!datas.form.price) {
uni.$utils.showToast('价格不能为空');
return;
}
if (!datas.form.consGroupId) {
uni.$utils.showToast('耗材类型不能为空');
return;
}
if (!datas.form.id) {
await addCons({
...datas.form
});
} else {
await editCons({
...datas.form
});
}
uni.navigateBack();
};
// 显示选择单位
const unitShow = ref(false);
// 单位列表
const unitList = ref([]);
</script>
<style>
page {
background-color: #f9f9f9;
}
page {
background-color: #f9f9f9;
}
</style>
<style scoped lang="less">
.topTitle {
font-weight: 400;
font-size: 32rpx;
color: #333333;
margin: 32rpx 28rpx;
}
.topTitle {
font-weight: 400;
font-size: 32rpx;
color: #333333;
margin: 32rpx 28rpx;
}
.addConsumables {
width: 694rpx;
background: #ffffff;
border-radius: 18rpx 18rpx 18rpx 18rpx;
margin: 32rpx;
padding: 24rpx;
box-sizing: border-box;
.addConsumables {
width: 694rpx;
background: #ffffff;
border-radius: 18rpx 18rpx 18rpx 18rpx;
margin: 32rpx;
padding: 24rpx;
box-sizing: border-box;
> view {
> view {
width: 646rpx;
height: 84rpx;
background: #fcfcfc;
border: 2rpx solid #f9f9f9;
margin-top: 32rpx;
.df;
> view:first-child {
width: 190rpx;
>view {
>view {
width: 646rpx;
height: 84rpx;
line-height: 84rpx;
// text-align: left;
padding-left: 24rpx;
background: #f9f9f9;
border-radius: 8rpx 0rpx 0rpx 8rpx;
background: #fcfcfc;
border: 2rpx solid #f9f9f9;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 32rpx;
color: #333333;
margin-top: 32rpx;
.df;
>view:first-child {
width: 240rpx;
height: 84rpx;
line-height: 84rpx;
// text-align: left;
padding-left: 24rpx;
background: #f9f9f9;
border-radius: 8rpx 0rpx 0rpx 8rpx;
border: 2rpx solid #f9f9f9;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 32rpx;
color: #333333;
}
}
}
}
}
.bottombutton {
margin-top: 84rpx;
padding: 0 24rpx;
.bottombutton {
margin-top: 84rpx;
padding: 0 24rpx;
> button {
width: 530rpx;
height: 80rpx;
border-radius: 56rpx 56rpx 56rpx 56rpx;
}
}
.status {
margin: 0 32rpx;
position: absolute;
// top: 100%;
left: 0;
right: 0;
z-index: 10;
background-color: #fff;
}
.df() {
display: flex;
align-items: center;
}
.tips-wrap {
--pColor: #e6a23c;
--iColor: #fdf6ec;
padding: 0 28upx;
.content {
display: flex;
align-items: center;
padding: 28upx;
background-color: var(--iColor);
.info {
display: flex;
flex-direction: column;
padding-left: 10px;
gap: 8upx;
.t1 {
font-size: 32upx;
color: var(--pColor);
}
.t2 {
font-size: 24upx;
color: var(--pColor);
}
>button {
width: 530rpx;
height: 80rpx;
border-radius: 56rpx 56rpx 56rpx 56rpx;
}
}
}
.form-wrap {
padding: 28upx 28upx 0;
.form {
padding: 28upx;
.status {
margin: 0 32rpx;
position: absolute;
// top: 100%;
left: 0;
right: 0;
z-index: 10;
background-color: #fff;
border-radius: 16upx;
}
.row {
height: 84upx;
.df() {
display: flex;
gap: 20upx;
align-items: center;
background-color: #fcfcfc;
padding: 0 20upx;
&:not(:last-child) {
margin-bottom: 28upx;
}
.label {
font-size: 32upx;
color: #333;
}
.ipt {
flex: 1;
}
.tips-wrap {
--pColor: #e6a23c;
--iColor: #fdf6ec;
padding: 0 28upx;
.content {
display: flex;
align-items: center;
padding: 28upx;
background-color: var(--iColor);
.info {
display: flex;
flex-direction: column;
padding-left: 10px;
gap: 8upx;
.t1 {
font-size: 32upx;
color: var(--pColor);
}
.t2 {
font-size: 24upx;
color: var(--pColor);
}
}
}
}
}
</style>
.form-wrap {
padding: 28upx 28upx 0;
.form {
padding: 28upx;
background-color: #fff;
border-radius: 16upx;
}
.row {
height: 84upx;
display: flex;
gap: 20upx;
align-items: center;
background-color: #fcfcfc;
padding: 0 20upx;
&:not(:last-child) {
margin-bottom: 28upx;
}
.label {
font-size: 32upx;
color: #333;
}
.ipt {
flex: 1;
}
}
}
</style>

73
pageConsumables/warehouseEntry.vue
View File

@@ -11,26 +11,26 @@
</view>
<view>
<view> <text style="color: red;">*</text> 入库时间 </view>
<view >
<up-datetime-picker
hasInput
v-model="datas.form.inOutDate"
mode="date"
></up-datetime-picker>
<view>
<up-datetime-picker hasInput v-model="datas.form.inOutDate" mode="date"></up-datetime-picker>
</view>
</view>
<view>
<view> <text style="color: red;">*</text> 入库数量 </view>
<view> <input type="number" placeholder="请输入数量" v-model="datas.form.bodyList.inOutNumber" @change="datas.form.bodyList.inOutNumber = $utils.isNumber(datas.form.bodyList.inOutNumber)" name="" id=""> </view>
<view> <input type="number" placeholder="请输入数量" v-model="datas.form.bodyList.inOutNumber"
@change="datas.form.bodyList.inOutNumber = $utils.isNumber(datas.form.bodyList.inOutNumber)"
name="" id=""> </view>
</view>
<view>
<view> <text style="color: red;">*</text>单价 </view>
<view> <input type="number" placeholder="请输入单价(元)" v-model="datas.form.bodyList.purchasePrice" @change="datas.form.bodyList.purchasePrice = $utils.isMoney(datas.form.bodyList.purchasePrice)" name="" id=""> </view>
<view> <input type="number" placeholder="请输入单价(元)" v-model="datas.form.bodyList.purchasePrice"
@change="datas.form.bodyList.purchasePrice = $utils.isMoney(datas.form.bodyList.purchasePrice)"
name="" id=""> </view>
</view>
<view style="justify-content: space-between;">
<view> 单位 </view>
<view> <input type="text" placeholder="请输入单位" v-model="datas.form.bodyList.conUnit" name="" id=""> </view>
<view> <input type="text" placeholder="请输入单位" v-model="datas.form.bodyList.conUnit" name="" id="">
</view>
</view>
<view>
<view> 应付金额 </view>
@@ -43,7 +43,8 @@
<view style="justify-content: space-between;align-items: center;">
<view> 供应商 </view>
<picker @change="changeNowStatusIndex" :value="nowStatusIndex" :range="datas.status">
<view class="color-333" style="height: 84rpx;line-height: 84rpx;">{{datas.status[nowStatusIndex]}}</view>
<view class="color-333" style="height: 84rpx;line-height: 84rpx;">{{datas.status[nowStatusIndex]}}
</view>
</picker>
<uni-icons type="bottom" size="16"></uni-icons>
<view style="color: #318AFE;width: 80rpx;text-align: center;" @tap="toggle"> 新增 </view>
@@ -57,21 +58,32 @@
<up-button type="primary" style="background-color: #318AFE;color: #fff;width: 100%!important;" @tap="sumbit"
:plain="true" text="保存"></up-button>
</view>
<!-- 消息提示 -->
<up-toast ref="uToastRef"></up-toast>
</template>
<script setup>
import { ref, computed, reactive } from 'vue';
import { onShow, onLoad } from '@dcloudio/uni-app';
import {
ref,
computed,
reactive
} from 'vue';
import {
onShow,
onLoad
} from '@dcloudio/uni-app';
import go from '@/commons/utils/go.js';
import dayjs from 'dayjs';
import { getVendorPage } from '@/http/api/vendor.js';
import { consStockIn } from '@/http/api/cons.js';
import {
getVendorPage
} from '@/http/api/vendor.js';
import {
consStockIn
} from '@/http/api/cons.js';
let showStatus = ref(false)
let datas = reactive({
show: false,
@@ -89,13 +101,13 @@
},
item: ""
})
onLoad((options) => {
console.log(options)
datas.item = JSON.parse(options.item)
datas.form = Object.assign(datas.form, datas.item)
// 单位列表
datas.unitList = [ datas.form.conUnit, datas.form.conUnitTwo]
datas.unitList = [datas.form.conUnit, datas.form.conUnitTwo]
datas.form.bodyList.unit = datas.form.defaultUnit
datas.form.bodyList.conName = datas.form.conName
datas.form.bodyList.unitName = datas.form.unitName
@@ -107,7 +119,7 @@
function toggle() {
go.to('PAGES_ADD_SUPPLIER')
}
/**
* 获取供应商列表
*/
@@ -122,9 +134,9 @@
})
})
}
let nowStatusIndex = ref(0)
/**
* 入库时间
* @param {Object} i
@@ -132,7 +144,7 @@
function inOutDateChange(i) {
datas.inOutDate = dayjs(datas.form.inOutDate).format('YYYY-MM-DD')
}
/**
* 供应商选择
* @param {Object} i
@@ -153,14 +165,15 @@
uni.$utils.showToast("请输入必填项")
return
}
datas.form.bodyList.conId = datas.item.id
datas.form.bodyList = [datas.form.bodyList]
datas.form.inOutDate = dayjs(datas.form.inOutDate).format('YYYY-MM-DD')
consStockIn({
...datas.form,
// 供应商id
vendorId: datas.list[nowStatusIndex.value].id,
vendorId: datas.list[nowStatusIndex.value]?datas.list[nowStatusIndex.value].id:'',
amountPayable: datas.form.bodyList[0].inOutNumber * datas.form.bodyList[0].purchasePrice,
}).then(res => {
uni.$utils.showToast("保存成功")
@@ -168,7 +181,7 @@
go.back()
}, 1000)
})
},1000)
}, 1000)
// 获取供应商
const statusHeight = computed(() => {
return 30 * datas.status.length + 14 + 'px'
@@ -194,9 +207,11 @@
list-style: none;
padding: 0;
}
::v-deep.u-input{
border: none!important;
::v-deep.u-input {
border: none !important;
}
.status {
margin: 0 32rpx;
position: absolute;

2
pageMarket/packagePopularize/selectGoods.vue
View File

@@ -42,7 +42,7 @@ async function getProductListAjax() {
mask: true
});
const res = await getProductList();
list.value = res;
list.value = res.productList;
} catch (error) {
console.log(error);
}

2576
pageProduct/add-Product/add-Product.vue
View File

File diff suppressed because it is too large Load Diff

95
pageProduct/add-Product/components/edit-haocai.vue
View File

@@ -1,6 +1,7 @@
<template>
<view>
<view class="default-box-padding bg-fff border-r-18">
<view class="font-bold u-m-b-32">绑定耗材</view>
<view class="u-flex u-row-between">
<view>商品名称</view>
</view>
@@ -38,14 +39,14 @@
</view>
<view class="u-flex u-m-t-16 u-font-24" v-if="item.stockNumber">
<view class="xuhao">
</view>
<view class="u-flex u-flex-1 u-p-l-32 gap-20">库存：{{item.stockNumber}}
{{item.conUnit}}
</view>
</view>
</view>
</view>
</view>
<view class="u-flex">
@@ -53,17 +54,34 @@
<up-icon :size="18" color="#318AFE" name="plus-circle-fill"></up-icon>
<view class="u-m-l-16">添加耗材</view>
</view>
</view>
</view>
</view>
<view class="default-box-padding bg-fff border-r-18 u-flex u-row-between u-m-t-32">
<view>当某个耗材的使用库存不足时，商品自动售罄。</view>
<view class="default-box-padding bg-fff border-r-18 u-m-t-32">
<view class="up-border-bottom u-p-b-32">
<view class="u-flex u-row-between ">
<view class="font-bold"> 自动售罄</view>
<up-switch :size="16" v-model="isAutoSoldStock" :inactive-value="0" :active-value="1"></up-switch>
</view>
<view class=" u-m-t-10">当某个耗材的使用库存不足时，商品自动售罄。</view>
</view>
<view class=" u-p-t-32">
<view class="">
<view class="font-bold u-m-b-16"> 退菜是否退库存</view>
<up-radio-group v-model="refundMode">
<up-radio v-for="(item,index) in tuiStockTypes" :key="index" :label="item.label"
:name="item.key"></up-radio>
</up-radio-group>
<view class="color-red u-m-t-10">当前店铺退菜退库存规则：跟随商品分类</view>
</view>
</view>
</view>
<view class="bottom">
<my-button type="primary" shape="circle" font-weight="700" @click="save">保存</my-button>
<my-button type="primary" shape="circle" font-weight="700" @click="save">保存</my-button>
<my-button bgColor="#F9F9F9" shape="circle" color="#999" @click="cancel">取消</my-button>
</view>
@@ -72,16 +90,43 @@
</template>
<script setup>
import { ref, reactive, watch, computed, onMounted } from 'vue';
import {
ref,
reactive,
watch,
computed,
onMounted
} from 'vue';
import infoBox from '@/commons/utils/infoBox.js'
import chooseHaocai from './choose-haocai.vue';
import chooseDanwei from './choose-danwei.vue';
import { hasPermission } from '@/commons/utils/hasPermission.js';
import { getConsList } from '@/http/api/cons.js';
import { productBindCons } from '@/http/api/product.js';
import {
hasPermission
} from '@/commons/utils/hasPermission.js';
import {
getConsList
} from '@/http/api/cons.js';
import {
productBindCons
} from '@/http/api/product.js';
const tuiStockTypes = ref([{
label: '退菜退库存',
key: 1
},
{
label: '仅退菜不退库存',
key: 2
},
{
label: '每次询问-退菜后弹窗提示，可手动选择',
key: 3
},
])
const isAutoSoldStock=defineModel('isAutoSoldStock',0)
const refundMode=defineModel('refundMode',1)
const emits = defineEmits(['cancel', 'updateGoods'])
const props = defineProps({
@@ -91,27 +136,30 @@
return {
consList: [],
skuList: [],
type: ''
type: '',
isAutoSoldStock:0,
isRefundStock:1,
}
}
}
})
const pageData = reactive({
isBindGuige: false, //是否绑定至规格
isBindGuige: false, //是否绑定至规格
})
let haoCaiList = ref([])
let $haocaiMap = reactive({})
const skuList = ref(props.goods.skuList)
const consList = ref(props.goods.consList||[])
const consList = ref(props.goods.consList || [])
watch(() => props.goods.consList, (newval) => {
consList.value = newval
})
watch(() => props.goods.skuList, (newval) => {
skuList.value = newval
})
onMounted(() => {
init()
})
@@ -126,16 +174,16 @@
}
haoCaiList.value = res
})
}
/**
* 取消耗材绑定
*/
function cancel() {
emits('cancel')
}
/**
* 耗材选择
* @param {Object} newval
@@ -157,7 +205,7 @@
surplusStock: ''
})
}
/**
* 删除商品耗材
* @param {Object} index
@@ -207,7 +255,6 @@
emits('updateGoods')
infoBox.showToast('修改成功')
}
</script>
<style lang="scss" scoped>

11
pageProduct/add-Product/components/link-goods.vue Normal file
View File

@@ -0,0 +1,11 @@
<template>
<view>
<view></view>
</view>
</template>
<script setup>
</script>
<style lang="scss" scoped>
</style>

4
pageProduct/index/components/goods.vue
View File

@@ -6,10 +6,10 @@
<text class="">排序</text>
<text class="u-m-l-20">{{data.sort}}</text>
</view>
<view class="color-333 u-m-l-42 u-flex">
<!-- <view class="color-333 u-m-l-42 u-flex">
<text class="stock u-m-l-4">库存:{{data.stockNumber}}</text>
<up-icon @click="editStock" name="edit-pen" :size="16" :color="$utils.ColorMain"></up-icon>
</view>
</view> -->
</view>
<view>
<!-- <text class="u-font-28 color-666" @click="changePrice">改价</text> -->

1306
pages/shopSetUp/index.vue
View File

File diff suppressed because it is too large Load Diff

76
pagesCreateOrder/index/components/list-goods-item.vue
View File

@@ -3,7 +3,9 @@
<up-image :src="data.coverImg" mode="aspectFill" :width="img.width" :height="img.height"></up-image>
<view class="info u-flex u-row-between u-col-top u-flex-col">
<view class="limit-discount" v-if="is_time_discount">限时折扣</view>
<view class="nowStockerNumber" v-if="nowStockerNumber<=10">
剩余库存：{{nowStockerNumber}}
</view>
<view>
<view>
<text class="up-line-1">{{ data.name }}</text>
@@ -32,7 +34,7 @@
<image src="/pagesCreateOrder/static/images/icon-reduce.svg" class="icon" mode="">
</image>
</view>
<view class="u-font-32" >
<view class="u-font-32">
{{ data.chooseNumber.toFixed(2) }}
</view>
@@ -56,7 +58,7 @@
<view class="isSellout" v-else-if="data.isSoldStock == 1">
<image class="isSellout_icon" src="/pagesCreateOrder/static/images/no-sold.svg" mode=""></image>
</view>
<view class="isSellout" v-else-if="data.isStock == 1 && data.stockNumber <= 0">
<view class="isSellout" v-else>
<image class="isSellout_icon" src="/pagesCreateOrder/static/images/no-stock.svg" mode=""></image>
</view>
</template>
@@ -107,6 +109,10 @@
return {};
},
},
consStockList: {
type: Array,
default:[]
}
});
//判断是否是时间折扣商品
@@ -156,12 +162,64 @@
return false;
}
return (
(item.isStock == 1 && item.stockNumber <= 0) ||
!consStockisFull(item) ||
item.isSoldStock == 1 ||
item.isSale == 0 ||
!isProductAvailable(item.days, item.startTime, item.endTime)
);
});
const stockNumber=computed(()=>{
})
// 1. 筛选匹配的耗材列表
const conslist=computed(()=>{
if(props.consStockList.length<=0){
return []
}
return props.consStockList.filter(v => {
return props.data.consList.find(i =>{
return i.consInfoId == v.consId
});
});
})
// 2. 找到 stockNumber 最小的那一项
const minConsItem=computed(()=>{
if(conslist.value.length<=0){
return null
}
return conslist.value.reduce((prev, current) => {
return prev.stockNumber < current.stockNumber ? prev : current;
});
})
// 3. 找到和 minItem 的 consId 一样的那个消耗配置项
const targetCons=computed(()=>{
if(!minConsItem.value){
return null
}
return props.data.consList.find(i => i.consInfoId == minConsItem.value.consId);
})
const nowStockerNumber=computed(()=>{
if(!targetCons.value||!minConsItem.value){
return 9999
}
return Math.floor(minConsItem.value.stockNumber/targetCons.value.surplusStock)
})
function consStockisFull(item) {
// 无数据直接返回 true（或按你需求返回 false）
if (!conslist.value.length) return true;
if(!minConsItem.value)return true;
if(!targetCons.value) return true;
// 4. 判断：最小库存 > 每份消耗库存 → 返回 true，否则 false
if (nowStockerNumber.value>=1) {
return true;
} else {
return false;
}
}
// 判断商品是否在可售时间内
function isProductAvailable(sellDaysStr, startTimeStr, endTimeStr) {
// 将后端返回的字符串转换为数组
@@ -306,4 +364,14 @@
color: rgba(255, 255, 255, 0.8);
text-decoration: line-through;
}
.nowStockerNumber{
position: absolute;
left: 24rpx;
bottom: 80rpx;
background-color: rgba(255, 255, 255, .8);
color: red;
padding: 4rpx 8rpx;
font-size: 24rpx;
border-radius: 4rpx ;
}
</style>

276
pagesCreateOrder/index/index.vue
View File

@@ -36,9 +36,7 @@
</view>
</scroll-view>
<scroll-view :scroll-top="data.scrollRightTop" scroll-y scroll-with-animation class="right-box"
@scroll="rightScroll"
@scrolltoupper="scrolltoupper"
>
@scroll="rightScroll" @scrolltoupper="scrolltoupper">
<view class="page-view u-p-l-24">
<view class="list-tight-top">
<template v-if="lingshi.show">
@@ -62,7 +60,7 @@
<view class="item-container">
<view class="thumb-box" v-for="(goodsItem, goodsIndex) in item.foods" :key="goodsIndex">
<list-goods-item :limitTimeDiscount="data.limitTimeDiscount"
@chooseGuige="chooseGuige($event, index)"
:consStockList="consStockList" @chooseGuige="chooseGuige($event, index)"
@add="goodsUpdate($event, index, true)"
@reduce="goodsUpdate($event, index, false)" @tapweigh="tapweigh($event, index)"
:index="goodsIndex" :data="goodsItem"></list-goods-item>
@@ -81,8 +79,8 @@
<view class="u-flex u-m-t-20 u-flex-wrap u-row-between">
<view class="u-m-b-30" v-for="(goodsItem, goodsIndex) in searchResult" :key="goodsIndex">
<list-goods-item :img="{ width: '330rpx', height: '330rpx' }"
:limitTimeDiscount="data.limitTimeDiscount"
@chooseGuige="chooseGuige(goodsItem.goodsIndex, goodsItem.index)"
:consStockList="consStockList" :limitTimeDiscount="data.limitTimeDiscount"
@chooseGuige="chooseGuige(goodsItem.goodsIndex, goodsItem.index)"
@add="searchGoodsUpdate(goodsItem, goodsIndex, true)"
@reduce="searchGoodsUpdate(goodsItem, goodsIndex, false)"
@tapweigh="tapweigh(goodsItem.goodsIndex, goodsItem.index)"
@@ -98,8 +96,7 @@
<view class="bottom w-full">
<my-car :isCreateOrderToDetail="isCreateOrderToDetail" @updateNumber="carsNumberChange" :table="data.table"
:data="cars" :orderInfo="data.orderInfo" :limitTimeDiscount="data.limitTimeDiscount"
@changeNumber="goodsChangeNumber"
@clear="cleaCart"></my-car>
@changeNumber="goodsChangeNumber" @clear="cleaCart"></my-car>
</view>
<!-- 套餐选择规格 -->
<taocanModel ref="taocanModelRef" @confirm="taocanConfirm" :goodsData="selGoods"></taocanModel>
@@ -115,9 +112,10 @@
<text>历史订单</text>
<text class="num">{{ data.historyOrderNum }}</text>
</view>
<!-- 修改购物车数量 -->
<popupChangeNumber v-model="popupChangeNumberData.show" :goods="popupChangeNumberData.data" @confirm="carsNumberChange"></popupChangeNumber>
<popupChangeNumber v-model="popupChangeNumberData.show" :goods="popupChangeNumberData.data"
@confirm="carsNumberChange"></popupChangeNumber>
</view>
</template>
<script setup>
@@ -144,12 +142,12 @@
stickCount
} from '@/http/api/product/stick.js'
import popupChangeNumber from './components/popup-change-number.vue'
const popupChangeNumberData=reactive({
show:false,
data:null
const popupChangeNumberData = reactive({
show: false,
data: null
})
import guigeModel from "./components/guige";
import taocanModel from "./components/taocanModel.vue";
import weighItem from "./components/weigh.vue";
@@ -174,8 +172,8 @@
limitTimeDiscount
} from "@/http/api/market/limitTimeDiscount.js";
provide("yskUtils", yskUtils);
const shopInfo = reactive({}) ;
Object.assign(shopInfo,uni.getStorageSync("shopInfo"))
const shopInfo = reactive({});
Object.assign(shopInfo, uni.getStorageSync("shopInfo"))
provide("shopInfo", uni.getStorageSync("shopInfo"));
import {
@@ -196,6 +194,9 @@
cancelOrder,
rmPlaceOrder,
} from "@/http/api/order.js";
import {
getConsStock
} from '@/http/api/cons.js'
const modal = reactive({
key: "",
@@ -293,7 +294,7 @@
})
);
}
// init()
xiadanClick();
@@ -349,6 +350,24 @@
let $originGoods = [];
let $category = [];
const consStockList = ref([])
function getCons() {
return new Promise((resolve, reject) => {
try {
getConsStock({
shopId: uni.getStorageSync("shopInfo").id
}).then(res => {
consStockList.value = res || []
console.log('consStockList', consStockList.value);
resolve()
})
} catch (err) {
reject()
}
})
}
async function init() {
if (option.type == "add") {
setTabBar($category, $originGoods, []);
@@ -356,7 +375,7 @@
let shopInfoRes = await getShopInfo({
id: uni.getStorageSync("shopInfo").id
});
Object.assign(shopInfo,shopInfoRes)
Object.assign(shopInfo, shopInfoRes)
uni.setStorageSync("shopInfo", shopInfoRes);
// 获取分类数据
let categoryRes = await categoryPage({
@@ -364,6 +383,8 @@
size: 300
});
$category = categoryRes.records;
// 获取耗材数据
await getCons()
// 获取商品数据
const goodsRes = await getGoods();
const goods = goodsRes.filter((v) => {
@@ -386,7 +407,9 @@
initCart();
}
const allHistoryOrder=ref([])
/**
* 获取订单详情
*/
@@ -409,13 +432,13 @@
console.log("data.historyOrder===", data.historyOrder);
let allHistoryOrder = data.historyOrder.map((item) => {
allHistoryOrder.value = data.historyOrder.map((item) => {
return [...item.info];
});
}).flat();
// console.log('allHistoryOrder===', allHistoryOrder.flat());
data.historyOrderNum = 0;
allHistoryOrder.flat().map((item) => {
allHistoryOrder.value.map((item) => {
data.historyOrderNum += item.num;
});
// console.log('data.historyOrderNum===', data.historyOrderNum);
@@ -741,7 +764,22 @@
}
// initCart()
}
// 封装成 Promise 的确认弹窗
const showConfirmModal = (title, content) => {
return new Promise((resolve) => {
uni.showModal({
title: title,
content: content,
showCancel: true,
cancelText: '取消添加',
confirmText: '继续',
success(res) {
// 确认返回 true，取消/关闭返回 false
resolve(res.confirm === true);
}
});
});
};
/**
* 菜品操作
* @param {Object} foodsindex
@@ -800,6 +838,29 @@
//更新
let cartItem = cars[goodsInCarIndex];
let number = isAdd ? cartItem.number + 1 : +cartItem.number - 1;
if(isAdd){
if (number == 2 ) {
// 等待用户点击
const isConfirm = await showConfirmModal(
'购物车已有该商品，请确认是否重复',
'菜名名称：《' + $goods.name + '》'
);
if (!isConfirm) {
return
}
}
if(allHistoryOrder.value.find(v=>v.productId==$goods.id)){
// 等待用户点击
const isConfirm = await showConfirmModal(
'该商品已下单过，请确认是否重复',
'菜名名称：《' + $goods.name + '》'
);
if (!isConfirm) {
return
}
}
}
if (!isAdd) {
if (number === 0 || number < suitNum) {
//移除
@@ -828,6 +889,7 @@
data.isGoodsAdd = false;
setSearchGoods(searchGoodsIndex, number);
} else {
// 不影响之前的代码 称重suit单独处理
if ($goods.type == "weight" && showCurrentInput) {
suitNum = showCurrentInput;
@@ -839,6 +901,16 @@
return;
}
}
if(allHistoryOrder.value.find(v=>v.productId==$goods.id)){
// 等待用户点击
const isConfirm = await showConfirmModal(
'该商品已下单过，请确认是否重复',
'菜名名称：《' + $goods.name + '》'
);
if (!isConfirm) {
return
}
}
// 套餐和单规格
if ($goods.groupType != 1) {
//增加
@@ -858,17 +930,17 @@
return;
}
}
function goodsChangeNumber(e){
function goodsChangeNumber(e) {
console.log(e);
popupChangeNumberData.data=e;
popupChangeNumberData.show=true
popupChangeNumberData.data = e;
popupChangeNumberData.show = true
}
/**
* socket通知购物车商品数量修改处理
*/
@@ -937,8 +1009,7 @@
tabbarItem.foods.find((v) => v.id == e.goods.product_id);
}
});
$sku = !e.goods.product_id ?
{
$sku = !e.goods.product_id ? {
suitNum: 1
} :
$goods.skuList.find((v) => v.id == e.goods.sku_id);
@@ -1018,13 +1089,22 @@
* @param {Object} skuList
*/
function returnSelGoodsSkuList(selectSpecInfo) {
// 👇 修复：如果是字符串，转成对象
if (typeof selectSpecInfo === 'string') {
selectSpecInfo = JSON.parse(selectSpecInfo);
}
let specInfo = [];
console.log('selectSpecInfo', selectSpecInfo);
for (var key in selectSpecInfo) {
console.log('key', key); // 现在会正确打印：口味、汤
specInfo.push({
name: key,
value: selectSpecInfo[key],
});
}
let result = specInfo.map((v, index) => {
return {
...v,
@@ -1062,9 +1142,31 @@
} = res;
let carGoods = cars[index];
let cartId = carGoods.id;
let newNumber = carGoods.number * 1 + suitNum;
let suitNum = goods.skuList[0].suitNum || 1;
let newNumber = carGoods.number * 1 + suitNum;
if (newNumber == 2&&carGoods.number<newNumber) {
// 等待用户点击
const isConfirm = await showConfirmModal(
'请确认当前菜品是否已上菜?',
'菜名名称：《' + goods.name + '》'
);
if (!isConfirm) {
return
}
if(allHistoryOrder.value.find(v=>v.productId==goods.id)){
// 等待用户点击
const isConfirm = await showConfirmModal(
'该商品已下单过，请确认是否重复',
'菜名名称：《' + goods.name + '》'
);
if (!isConfirm) {
return
}
}
}
editCart({
id: cartId,
number: newNumber,
@@ -1079,6 +1181,17 @@
);
data.isGoodsAdd = false;
} else {
if(allHistoryOrder.value.find(v=>v.productId==goods.id)){
// 等待用户点击
const isConfirm = await showConfirmModal(
'该商品已下单过，请确认是否重复',
'菜名名称：《' + goods.name + '》'
);
if (!isConfirm) {
return
}
}
//添加
editCart({
number: suitNum,
@@ -1106,8 +1219,7 @@
return carsGoods.sku_id == sku_id && carsGoods.product_id == product_id;
});
const carGoods = cars[goodsInCarIndex];
return carGoods ?
{
return carGoods ? {
index: goodsInCarIndex,
carGoods,
} :
@@ -1359,39 +1471,39 @@
function toStick() {
uni.chooseImage({
count: 1, //默认9
sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
sourceType: ["album", "camera "],
success: async function (res) {
uni.showLoading({
title: "上传中",
});
console.log(res);
const fileRes = await stickCount(res.tempFiles[0]);
console.log(fileRes)
uni.hideLoading();
if (fileRes) {
uni.setStorageSync('stickData',{
table:data.table,
orderInfo:data.orderInfo,
limitTimeDiscount:data.limitTimeDiscount
})
go.to("PAGES_CREATE_ORDER_STICK", {
tableCode: data.table.tableCode,
number:fileRes,
isCreateOrderToDetail:isCreateOrderToDetail.value,
count: 1, //默认9
sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
sourceType: ["album", "camera "],
success: async function(res) {
uni.showLoading({
title: "上传中",
});
} else {
uni.showToast({
title: "上传失败",
icon: "none",
});
}
},
console.log(res);
const fileRes = await stickCount(res.tempFiles[0]);
console.log(fileRes)
uni.hideLoading();
if (fileRes) {
uni.setStorageSync('stickData', {
table: data.table,
orderInfo: data.orderInfo,
limitTimeDiscount: data.limitTimeDiscount
})
go.to("PAGES_CREATE_ORDER_STICK", {
tableCode: data.table.tableCode,
number: fileRes,
isCreateOrderToDetail: isCreateOrderToDetail.value,
});
} else {
uni.showToast({
title: "上传失败",
icon: "none",
});
}
},
});
}
/**
@@ -1425,7 +1537,7 @@
* @param {Object} index
*/
async function swichMenu(index) {
if (data.arr.length !=data.tabbar.length) {
if (data.arr.length != data.tabbar.length) {
await getMenuItemTop();
}
if (index == data.current) return;
@@ -1438,10 +1550,10 @@
// data.current = index;
// leftMenuStatus(index);
// });
data.scrollRightTop = data.arr[index] + data.topZhanwei;
console.log('scrollRightTop',data.scrollRightTop );
console.log('scrollRightTop', data.scrollRightTop);
data.current = index;
leftMenuStatus(index);
}
@@ -1518,29 +1630,29 @@
arr.push(rect.top - rects[0].top);
});
data.arr = arr;
console.log('每一项高度',data.arr);
console.log('每一项高度', data.arr);
resolve();
})
.exec();
});
}
function scrolltoupper(){
function scrolltoupper() {
data.current = 0;
}
/**
* 右边菜单滚动
* @param {Object} e
*/
async function rightScroll(e) {
data.oldScrollTop = e.detail.scrollTop;
if(e.detail.scrollTop<=0||e.detail.scrollTop<data.arr[1]){
if (e.detail.scrollTop <= 0 || e.detail.scrollTop < data.arr[1]) {
data.current = 0;
isTabClickOver = true;
return
return
}
if (data.arr.length == 0) {
await getMenuItemTop();

215
pagesOrder/detail/components/tuicai.vue
View File

@@ -1,65 +1,87 @@
<template>
<my-model title="退菜" ref="model" @close="onModelClose" @open="onModelOpen">
<template #desc>
<view class="u-p-30 u-text-left">
<view>
{{data.productName}}
</view>
<view class="u-flex u-m-t-32" :class="{'gray':data.productId=='-999'}">
<up-number-box :min="0" :max="maxNum" :buttonSize="44" v-model="number" integer
:disabled="data.productId=='-999'">
<template #minus>
<view class="minus number-box-btn"></view>
</template>
<template #input>
<view class="u-flex-1 u-row-center u-text-center input">
<up-input :disabled="data.productId=='-999'" @change="parseIntNumber($event,false)"
@blur="parseIntNumber($event,true)" v-model="number" border="none"
type="digit"></up-input>
</view>
</template>
<template #plus>
<view class="plus number-box-btn">
<up-icon v-if="data.productId=='-999'" name="plus" color="#ccc" size="16"
bold></up-icon>
<up-icon v-else name="plus" color="#999" size="16" bold></up-icon>
</view>
</template>
</up-number-box>
</view>
<view class="u-m-t-32">
<view class="u-font-24">
<text class="color-999">退菜理由</text>
<text class="color-red">*</text>
<view>
<my-model title="退菜" ref="model" @close="onModelClose" @open="onModelOpen">
<template #desc>
<view class="u-p-30 u-text-left">
<view>
{{data.productName}}
</view>
<view class="u-flex u-flex-wrap u-m-t-24">
<view class="u-flex u-m-r-16 u-m-b-16" v-for="(item,index) in tags" :key="index">
<up-tag @click="changeTagSel(item)" :text="item.label" plain borderColor="#E6FOFF"
color="#318AFE" v-if="item.checked"> </up-tag>
<up-tag @click="changeTagSel(item)" borderColor="#E5E5E5" color="#666" :text="item.label"
plain v-else> </up-tag>
<view class="u-flex u-m-t-32" :class="{'gray':data.productId=='-999'}">
<up-number-box :min="0" :max="maxNum" :buttonSize="44" v-model="number" integer
:disabled="data.productId=='-999'">
<template #minus>
<view class="minus number-box-btn"></view>
</template>
<template #input>
<view class="u-flex-1 u-row-center u-text-center input">
<up-input :disabled="data.productId=='-999'" @change="parseIntNumber($event,false)"
@blur="parseIntNumber($event,true)" v-model="number" border="none"
type="digit"></up-input>
</view>
</template>
<template #plus>
<view class="plus number-box-btn">
<up-icon v-if="data.productId=='-999'" name="plus" color="#ccc" size="16"
bold></up-icon>
<up-icon v-else name="plus" color="#999" size="16" bold></up-icon>
</view>
</template>
</up-number-box>
</view>
<view class="u-m-t-32">
<view class="u-font-24">
<text class="color-999">退菜理由</text>
<text class="color-red">*</text>
</view>
<view class="u-flex u-flex-wrap u-m-t-24">
<view class="u-flex u-m-r-16 u-m-b-16" v-for="(item,index) in tags" :key="index">
<up-tag @click="changeTagSel(item)" :text="item.label" plain borderColor="#E6FOFF"
color="#318AFE" v-if="item.checked"> </up-tag>
<up-tag @click="changeTagSel(item)" borderColor="#E5E5E5" color="#666"
:text="item.label" plain v-else> </up-tag>
</view>
</view>
<view class="u-m-t-24">
<up-textarea v-model="form.note" placeholder="备注"></up-textarea>
</view>
</view>
<view class="u-m-t-24">
<up-textarea v-model="form.note" placeholder="备注"></up-textarea>
</view>
</template>
<template #btn>
<view class="u-p-t-18 u-p-l-30 u-p-r-30 u-p-b-10">
<my-button box-shadow shape="circle" @tap="confirm">确认退菜</my-button>
<view class="u-m-t-10">
<my-button @tap="onModelClose" shape="circle" bgColor="#fff" type="cancel"
box-shadow>取消</my-button>
</view>
</view>
</view>
</template>
<template #btn>
<view class="u-p-t-18 u-p-l-30 u-p-r-30 u-p-b-10">
<my-button box-shadow shape="circle" @tap="confirm">确认退菜</my-button>
<view class="u-m-t-10">
<my-button @tap="onModelClose" shape="circle" bgColor="#fff" type="cancel" box-shadow>取消</my-button>
</template>
</my-model>
<up-modal :show="confirmModal.show" title="提示" @close="confirmModalClose" @cancel="confirmModalClose"
@confirm="confirmModalConfirm" showCancelButton>
<view>
<view>
<up-radio-group v-model="confirmModal.selRefundStock">
<up-radio v-for="(item,index) in confirmModal.refundStocks" :key="index" :label="item.name"
:name="item.key"></up-radio>
</up-radio-group>
</view>
</view>
</up-modal>
</view>
</template>
</my-model>
</template>
<script setup>
import { reactive, ref, watch } from 'vue';
import {
reactive,
ref,
watch
} from 'vue';
import infoBox from '@/commons/utils/infoBox.js'
const emits = defineEmits(['update:show', 'confirm'])
const props = defineProps({
@@ -76,6 +98,22 @@
default: false
}
})
const confirmModal = reactive({
show: false,
selRefundStock: false,
refundStocks: [{
name: '已上菜(仅退菜不退库存)',
key: false
}, {
name: '未上菜(退菜后退库存)',
key: true,
}]
})
function confirmModalClose() {
confirmModal.show = false
confirmModal.selRefundStock = false
}
const form = reactive({
note: ''
})
@@ -83,7 +121,7 @@
let modelShow = ref(props.show)
let number = ref(0)
let maxNum = ref(0)
const tags = ref([{
label: "点错",
checked: false
@@ -109,14 +147,14 @@
close()
}
})
function parseIntNumber(val, isNow) {
console.log(val)
let newval = val * 1
if (newval > props.data.num - props.data.returnNum) {
newval = props.data.num - props.data.returnNum
}
if (isNow) {
number.value = newval * 1
return
@@ -129,7 +167,7 @@
function changeTagSel(item) {
item.checked = !item.checked
}
function toggleModelShow(show) {
modelShow.value = show ? true : false
}
@@ -157,11 +195,51 @@
})
form.note = ''
}
import {
getProductDetail
} from '@/http/api/product.js'
import {
getCategoryDetail
} from '@/http/api/cateGory.js'
async function getGoodsCategory(goods) {
const res = await getProductDetail(goods.productId)
if (res) {
console.log('res', res);
const res1 = await getCategoryDetail(res.categoryId)
return res1
}
uni.showToast({
title: '获取该商品信息数据失败',
icon: 'none'
})
return null
}
function confirmModalConfirm() {
refundGoods()
confirmModalClose()
}
function refundGoods() {
const selTag = tags.value.filter(item => item.checked).map(item => item.label).join(",")
const note = selTag + (form.note.length > 0 ? "," + form.note : "");
let par = {
orderId: props.data.orderId,
refundAmount: number.value * props.data.unitPrice,
refundReason: note,
refundStock: confirmModal.selRefundStock,
refundDetails: [{
id: props.data.id,
returnAmount: number.value * props.data.unitPrice,
num: number.value,
}],
}
emits('confirm', par)
}
/**
* 确认退菜
*/
function confirm() {
async function confirm() {
const selTag = tags.value.filter(item => item.checked).map(item => item.label).join(",")
const note = selTag + (form.note.length > 0 ? "," + form.note : "");
console.log({
@@ -171,17 +249,22 @@
if (!note) {
return infoBox.showToast("请输入退菜原因");
}
let par = {
orderId: props.data.orderId,
refundAmount: number.value * props.data.unitPrice,
refundReason: note,
refundDetails: [{
id: props.data.id,
returnAmount: number.value * props.data.unitPrice,
num: number.value,
}],
const shopInfo = uni.getStorageSync('shopInfo')
if (shopInfo.refundMode == 1) {
const res = await getGoodsCategory(props.data)
if (res.refundMode === 3) {
confirmModal.show = true
return
}
}
emits('confirm', par)
if (shopInfo.refundMode == 2) {
const res = await getProductDetail(props.data.productId)
if (res.refundMode === 3) {
confirmModal.show = true
return
}
}
refundGoods()
}
</script>

245
pagesOrder/tuikuan/tuikuan.vue
View File

@@ -2,16 +2,19 @@
<view class="min-page bg-gray u-p-30">
<view class="bg-fff u-p-l-30 u-p-r-30 ">
<view class="myTabs u-m-t-20">
<my-tabs :list="pageData.tabsList" :modelValue="pageData.tabsIndex" :textKey="'label'" @change="tabsChange"></my-tabs>
<my-tabs :list="pageData.tabsList" :modelValue="pageData.tabsIndex" :textKey="'label'"
@change="tabsChange"></my-tabs>
</view>
</view>
<view v-if="pageData.tabsIndex == 2" class="bg-fff u-p-24 border-r-12 u-flex u-row-between" style="margin-top: 30rpx;">
<up-input type="digit" placeholder="请输入退款金额" @change="parseIntNumber($event)" border="surround" v-model="pageData.modify" >
<view v-if="pageData.tabsIndex == 2" class="bg-fff u-p-24 border-r-12 u-flex u-row-between"
style="margin-top: 30rpx;">
<up-input type="digit" placeholder="请输入退款金额" @change="parseIntNumber($event)" border="surround"
v-model="pageData.modify">
<template #prefix>
<up-text text="￥" margin="0 3px 0 0" type="tips" ></up-text>
</template>
</up-input>
<up-text text="￥" margin="0 3px 0 0" type="tips"></up-text>
</template>
</up-input>
</view>
<view class="u-m-t-24 u-font-24 u-font-24">
<text class="color-red">*</text>
@@ -27,7 +30,7 @@
</view>
<template v-if="item.productId=='-999'">
<view class="u-flex">
<view class="color-red" >￥{{item.priceAmount}}</view>
<view class="color-red">￥{{item.priceAmount}}</view>
<view class="u-flex u-m-l-32 u-col-center">
<view class="u-m-l-28 u-m-r-28">x{{item.number}}</view>
</view>
@@ -47,33 +50,33 @@
</view>
</view>
<template v-if="!option.userCouponId">
<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between" >
<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between">
<view>支付金额</view>
<view>
{{to2(orderDetail.info.payAmount)}}元
</view>
</view>
<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between" >
<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between">
<view>剩余可退金额</view>
<view class="color-red">
{{to2(orderDetail.info.payAmount - orderDetail.info.refundAmount)}}元
</view>
</view>
<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between" >
<view class="bg-fff u-m-t-32 u-p-24 border-r-12 u-flex u-row-between">
<view>退款金额</view>
<view class="color-red">
{{to2(pageData.tabsIndex == 1 ? alltuikuanPrice : (pageData.tabsIndex == 2 ? pageData.modify : tuikuanPrice))}}元
</view>
</view>
</template>
<!-- <view class="bg-fff u-p-24 border-r-12 u-m-t-32">
<view>退回优惠券</view>
<view class="u-font-24 color-999 u-m-t-16" v-if="!option.userCouponId">
该订单未使用优惠券
</view>
</view> -->
<view class="bg-fff u-p-24 border-r-12 u-m-t-32">
<view>
<text class="color-red">*</text>
@@ -96,35 +99,67 @@
:color="$utils.ColorMain"></up-button>
</view>
<confirmRefundPopup ref="refundPopup" />
<up-modal :show="confirmModal.show" title="提示" @close="confirmModalClose" @cancel="confirmModalClose"
@confirm="confirmModalConfirm" showCancelButton>
<view>
<view>
<up-radio-group v-model="confirmModal.selRefundStock">
<up-radio v-for="(item,index) in confirmModal.refundStocks" :key="index" :label="item.name"
:name="item.key"></up-radio>
</up-radio-group>
</view>
</view>
</up-modal>
</view>
</template>
<script setup>
import { computed, reactive, ref, watch } from 'vue';
import { onLoad, onShow } from '@dcloudio/uni-app';
import {
computed,
reactive,
ref,
watch
} from 'vue';
import {
onLoad,
onShow
} from '@dcloudio/uni-app';
import confirmRefundPopup from './components/confirmRefundPopup.vue';
import {hasPermission} from '@/commons/utils/hasPermission.js'
import { refundOrder } from '@/http/api/order.js'
import { mathFloorPrice } from '@/commons/utils/goodsUtil.js'
import {
hasPermission
} from '@/commons/utils/hasPermission.js'
import {
refundOrder
} from '@/http/api/order.js'
import {
mathFloorPrice
} from '@/commons/utils/goodsUtil.js'
let note = ref('')
const tuikuan = reactive({
list: ['点错', '数量点错', '客人要求', '协商退费'],
sel: -1
})
const pageData = reactive({
tabsList: [
{label: '部分退款', value: 0},
{label: '全部退款', value: 1},
{label: '自定义退款', value: 2},
tabsList: [{
label: '部分退款',
value: 0
},
{
label: '全部退款',
value: 1
},
{
label: '自定义退款',
value: 2
},
],
tabsIndex: 0,
modify: '',
})
const option=reactive({
productId:'-999'
const option = reactive({
productId: '-999'
})
const orderDetail = reactive({
goodsList: [],
@@ -134,46 +169,47 @@
}
})
const refundPopup = ref(null);
onLoad((opt) => {
orderDetail.info = JSON.parse(opt.orderInfo)
orderDetail.goodsList = JSON.parse(opt.goodsList)
option.productId = orderDetail.goodsList[0].productId
option.orderId = orderDetail.goodsList[0].orderId
})
/**
* tabs切换
* @param {Object} i
*/
function tabsChange(i) {
pageData.tabsIndex = pageData.tabsList[i].value
if( pageData.tabsIndex == 0){ // 部分退款
if (pageData.tabsIndex == 0) { // 部分退款
orderDetail.goodsList.map(v => {
v.number = '0.00'
})
}
if( pageData.tabsIndex == 1){ // 全部退款
if (pageData.tabsIndex == 1) { // 全部退款
orderDetail.goodsList.map(v => {
v.number = v.num.toFixed(2)
})
}
if( pageData.tabsIndex == 2){ // 自定义退款
if (pageData.tabsIndex == 2) { // 自定义退款
orderDetail.goodsList.map(v => {
v.number = '0.00'
})
}
}
function changeTuiKuanSel(i) {
tuikuan.sel = i
}
function parseIntNumber (e) {
if ( e > (orderDetail.info.payAmount - orderDetail.info.refundAmount) ) {
setTimeout(()=>{
function parseIntNumber(e) {
if (e > (orderDetail.info.payAmount - orderDetail.info.refundAmount)) {
setTimeout(() => {
pageData.modify = (orderDetail.info.payAmount - orderDetail.info.refundAmount).toFixed(2)
},100)
}
}, 100)
}
}
/**
* 菜品总数量
@@ -183,7 +219,7 @@
return prve + cur.num * 1
}, 0)
})
/**
* 退款菜品总数量
*/
@@ -192,49 +228,49 @@
return prve + cur.number * 1
}, 0)
})
/**
* 退款总金额
*/
*/
const tuikuanPrice = computed(() => {
return orderDetail.goodsList.reduce((prve, cur) => {
const n= mathFloorPrice(cur.number * cur.unitPrice,cur)
const n = mathFloorPrice(cur.number * cur.unitPrice, cur)
return (parseFloat(prve) + parseFloat(n)).toFixed(2)
}, 0)
})
/**
* 剩余退款金额
*/
*/
const surplusRefundPrice = computed(() => {
return orderDetail.info.payAmount - orderDetail.goodsList.reduce((prve, cur) => {
const n = parseFloat( mathFloorPrice(cur.refundNum * cur.unitPrice,cur))
return (parseFloat(prve) + parseFloat(n)).toFixed(2)*1
const n = parseFloat(mathFloorPrice(cur.refundNum * cur.unitPrice, cur))
return (parseFloat(prve) + parseFloat(n)).toFixed(2) * 1
}, 0)
})
/**
* 退款总金额
*/
*/
const alltuikuanPrice = computed(() => {
return orderDetail.info.payAmount - orderDetail.goodsList.reduce((prve, cur) => {
const n = parseFloat( mathFloorPrice(cur.refundNum * cur.unitPrice,cur))
return (parseFloat(prve) + parseFloat(n)).toFixed(2)*1
const n = parseFloat(mathFloorPrice(cur.refundNum * cur.unitPrice, cur))
return (parseFloat(prve) + parseFloat(n)).toFixed(2) * 1
}, 0)
})
function to2(n) {
return Number(n).toFixed(2);
}
function changeItem(item, step) {
if( item.num <= 0){
if (item.num <= 0) {
return
}
if(item.productId=='-999'){
if (item.productId == '-999') {
return
}
if( pageData.tabsIndex != 0) {
if (pageData.tabsIndex != 0) {
return;
}
let newval = item.number * 1 + step * 1;
@@ -249,65 +285,126 @@
item.number = newval.toFixed(2);
pageData.tabsIndex = totalNumber.value == tuikuanNumber.value ? 1 : 0;
}
/**
* 确认退款
*/
let params;
async function tuikuanConfirm() {
const canTuikuan=await hasPermission('允许退款')
if(!canTuikuan){
const canTuikuan = await hasPermission('允许退款')
if (!canTuikuan) {
return uni.$utils.showToast('您没有退款权限')
}
if (pageData.tabsIndex != 2&&tuikuanNumber.value <= 0) {
if (pageData.tabsIndex != 2 && tuikuanNumber.value <= 0) {
return uni.$utils.showToast('退款商品数量不能为0！')
}
const selTag=tuikuan.list[tuikuan.sel]
const noteResult=`${selTag?selTag:''}${note.value?(','+note.value):''}`
const selTag = tuikuan.list[tuikuan.sel]
const noteResult = `${selTag?selTag:''}${note.value?(','+note.value):''}`
if (!noteResult) {
return uni.$utils.showToast('请输入或选择退款原因！')
}
params = {
orderId: option.orderId,
refundReason: noteResult,
refundDetails: orderDetail.goodsList.filter(v=>v.number*1).map(v=>{
refundStock: confirmModal.selRefundStock,
refundDetails: orderDetail.goodsList.filter(v => v.number * 1).map(v => {
return {
id:v.id,
id: v.id,
returnAmount: v.number * 1 * v.unitPrice,
num: v.number * 1
}
})
}
if( pageData.tabsIndex == 2){
if (pageData.tabsIndex == 2) {
params.modify = true
params.refundAmount = (pageData.modify*1).toFixed(2)
params.refundAmount = (pageData.modify * 1).toFixed(2)
} else {
params.modify = false
params.refundAmount = pageData.tabsIndex == 1 ? alltuikuanPrice.value : tuikuanPrice.value
}
if ( pageData.tabsIndex == 2 && params.refundAmount > orderDetail.info.payAmount){
if (pageData.tabsIndex == 2 && params.refundAmount > orderDetail.info.payAmount) {
return uni.$utils.showToast('退款金额不能大于付款金额！')
}
if( uni.getStorageSync("shopInfo").isReturnPwd == 1){
if (uni.getStorageSync("shopInfo").isReturnPwd == 1) {
refundPopup.value.open(params.refundAmount, refundPost);
return;
}
refundPost()
refundPost()
}
async function refundPost (payPassword) {
if( payPassword ){
import {
getProductList,
getCategoryList
} from '@/http/api/product.js'
const confirmModal = reactive({
show: false,
selRefundStock: false,
payPassword: '',
refundStocks: [{
name: '已上菜(仅退菜不退库存)',
key: false
}, {
name: '未上菜(退菜后退库存)',
key: true,
}]
})
function confirmModalClose() {
confirmModal.show = false
confirmModal.selRefundStock = false
confirmModal.payPassword = ''
}
function confirmModalConfirm() {
refundSubmit(confirmModal.payPassword)
confirmModalClose()
}
async function refundSubmit(payPassword) {
if (payPassword) {
params.pwd = payPassword
}
params.refundStock = confirmModal.selRefundStock
await refundOrder(params)
uni.$utils.showToast('退款请求提交成功')
setTimeout(()=>{
uni.navigateBack({delta:1})
},500)
setTimeout(() => {
uni.navigateBack({
delta: 1
})
}, 500)
}
async function refundPost(payPassword) {
confirmModal.payPassword = confirmModal.payPassword
const shopInfo = uni.getStorageSync('shopInfo')
if (pageData.tabsIndex != 2) {
if (shopInfo.refundMode == 1) {
const res = await getCategoryList()
for (let goods of res) {
if (goods.refundMode == 3) {
confirmModal.show = true
return
}
}
}
if (shopInfo.refundMode == 2) {
const res = await getProductList()
for (let goods of res) {
console.log(goods);
if (goods.refundMode == 3) {
confirmModal.show = true
return
}
}
}
}
refundSubmit(payPassword)
}
</script>
<style lang="scss" scoped>