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

Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf

This commit is contained in:
YeMingfei666 2024-10-29 16:03:17 +08:00
parent 4ae487a0b3 8b0e22e2cd
commit 397f25f0da
19 changed files with 479 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
http/yskApi/http.js
View File

@ -17,13 +17,13 @@ import infoBox from "@/commons/utils/infoBox.js"
import go from '@/commons/utils/go.js'; import go from '@/commons/utils/go.js';
import { reject } from 'lodash'; import { reject } from 'lodash';
// 测试服 // 测试服
// let baseUrl = 'https://admintestpapi.sxczgkj.cn' let baseUrl = 'https://admintestpapi.sxczgkj.cn'
//预发布 //预发布
// let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn' // let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
//正式 //正式
let baseUrl = 'https://cashieradmin.sxczgkj.cn' // let baseUrl = 'https://cashieradmin.sxczgkj.cn'
// 王伟本地测 // 王伟本地测
// let baseUrl = '/ww' // let baseUrl = '/ww'

45
pageConsumables/addConsumables.vue
View File

@ -3,40 +3,40 @@
耗材信息 耗材信息
</view> </view>
<view class="addConsumables"> <view class="addConsumables">
<ul> <view>
<li> <view>
<view> <view>
单位 单位
</view> </view>
<view> <view>
<input type="text" placeholder="请输入单位" v-model="datas.form.conUnit" name="" id=""> <input type="text" placeholder="请输入单位" v-model="datas.form.conUnit" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
耗材名称 耗材名称
</view> </view>
<view> <view>
<input type="text" placeholder="请输入耗材名称" v-model="datas.form.conName" name="" id=""> <input type="text" placeholder="请输入耗材名称" v-model="datas.form.conName" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
耗材价格 耗材价格
</view> </view>
<view> <view>
<input placeholder="请输入耗材价格" type="number" v-model="datas.form.price" name="" id=""> <input placeholder="请输入耗材价格" type="number" v-model="datas.form.price" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
预警值 预警值
</view> </view>
<view> <view>
<input type="text" placeholder="请输入预警值" v-model="datas.form.conWarning" name="" id=""> <input type="text" placeholder="请输入预警值" v-model="datas.form.conWarning" name="" id="">
</view> </view>
</li> </view>
<li style="justify-content: space-between;"> <view style="justify-content: space-between;">
<view> <view>
耗材类型 耗材类型
</view> </view>
@ -44,8 +44,8 @@
{{datas.typelist[datas.nowStatusIndex]}} {{datas.typelist[datas.nowStatusIndex]}}
</view> </view>
<uni-icons type="bottom" size="16"></uni-icons> <uni-icons type="bottom" size="16"></uni-icons>
</li> </view>
</ul> </view>
</view> </view>
<view :style="{height:datas.showStatus?statusHeight:0}" class="tranistion status overflow-hide"> <view :style="{height:datas.showStatus?statusHeight:0}" class="tranistion status overflow-hide">
<view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between" <view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
@ -126,8 +126,8 @@
}) })
return return
} }
console.log(datas.list,'tiaoshi1') console.log(datas.list, 'tiaoshi1')
console.log(datas.list[datas.nowStatusIndex],'tiaoshi1') console.log(datas.list[datas.nowStatusIndex], 'tiaoshi1')
tbConsInfoAddlist([{ tbConsInfoAddlist([{
...datas.form, ...datas.form,
shopId: uni.getStorageSync("shopId"), shopId: uni.getStorageSync("shopId"),
@ -146,17 +146,14 @@
datas.showStatus = false datas.showStatus = false
} }
</script> </script>
<style>
<style scoped lang="less">
page { page {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
ul, </style>
li { <style scoped lang="less">
list-style: none;
padding: 0;
}
.topTitle { .topTitle {
font-weight: 400; font-weight: 400;
@ -174,8 +171,8 @@
padding: 1rpx 24rpx; padding: 1rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
>ul { >view {
>li { >view {
width: 646rpx; width: 646rpx;
height: 84rpx; height: 84rpx;
background: #fcfcfc; background: #fcfcfc;
@ -203,7 +200,7 @@
.bottombutton { .bottombutton {
margin-top: 84rpx; margin-top: 84rpx;
padding: 0 24rpx;
>button { >button {
width: 530rpx; width: 530rpx;
height: 80rpx; height: 80rpx;

35
pageConsumables/addType.vue
View File

@ -1,19 +1,19 @@
<template> <template>
<ul class="addType"> <view class="addType">
<li v-for="item in datas.list"> <view v-for="item in datas.list">
<view class=""> <view class="">
{{item.conTypeName}}<up-icon color="#64A7FE" name="edit-pen" @tap="showoneEvent(item)"></up-icon> {{item.conTypeName}}<up-icon color="#64A7FE" name="edit-pen" @tap="showoneEvent(item)"></up-icon>
</view> </view>
<view class=""> <view class="">
是否启用 是否启用 &nbsp;&nbsp;
<up-switch checked="true" :activeValue="1" :inactiveValue="0" @change="switchChangeEvent($event,item)" <up-switch checked="true" activeValue="1" size="20" inactiveValue="0"
:modelValue="item.status" style="transform:scale(0.7)" /> @change="switchChangeEvent($event,item)" :modelValue="item.status" style="transform:scale(0.7)" />
</view> </view>
</li> </view>
</ul> </view>
<view class="bottombutton"> <view style="margin-top: 100rpx; padding: 0 28rpx;">
<up-button type="primary" style="background-color: #318AFE;color: #fff;margin-top: 100rpx;" <up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="datas.showtwo=true"
@tap="datas.showtwo=true" :plain="true" text="添加"></up-button> :plain="true" text="添加"></up-button>
</view> </view>
<!-- 新增类别 --> <!-- 新增类别 -->
<up-popup :show="datas.showtwo" :round="18" mode="center" @close="close"> <up-popup :show="datas.showtwo" :round="18" mode="center" @close="close">
@ -23,7 +23,7 @@
<span>新增类别</span> <span>新增类别</span>
<up-icon @tap="datas.showtwo=false" name="close-circle-fill"></up-icon> <up-icon @tap="datas.showtwo=false" name="close-circle-fill"></up-icon>
</view> </view>
<view class=""> <view style="margin-bottom: 28rpx;">
耗材类型名称<input type="text" v-model="datas.conTypeName" /> 耗材类型名称<input type="text" v-model="datas.conTypeName" />
</view> </view>
<view class=""> <view class="">
@ -36,13 +36,13 @@
</up-popup> </up-popup>
<!-- 编辑 --> <!-- 编辑 -->
<up-popup :show="datas.showone" :round="18" mode="center" @close="close"> <up-popup :show="datas.showone" :round="18" mode="center" @close="close">
<view class="zhezhaopops" style="height: 466rpx;"> <view class="zhezhaopops">
<view class=""> <view class="">
<span></span> <span></span>
<span>编辑类别</span> <span>编辑类别</span>
<up-icon @tap="datas.showone=false" name="close-circle-fill"></up-icon> <up-icon @tap="datas.showone=false" name="close-circle-fill"></up-icon>
</view> </view>
<view class=""> <view style="margin-bottom: 28rpx;">
耗材类型名称<input type="text" v-model="datas.conTypeName" /> 耗材类型名称<input type="text" v-model="datas.conTypeName" />
</view> </view>
<up-button text="确认" @tap="confirmone" type="primary" class="buttomStyle" shape="circle"></up-button> <up-button text="确认" @tap="confirmone" type="primary" class="buttomStyle" shape="circle"></up-button>
@ -105,7 +105,7 @@
let confirmone = () => { let confirmone = () => {
edittbConsTypeput({ edittbConsTypeput({
...datas.activeData, ...datas.activeData,
conTypeName:datas.conTypeName conTypeName: datas.conTypeName
}).then(res => { }).then(res => {
gettbConsTypeList() gettbConsTypeList()
datas.showone = false datas.showone = false
@ -129,7 +129,6 @@
<style> <style>
page { page {
background-color: #f9f9f9; background-color: #f9f9f9;
padding: 0 28rpx;
} }
</style> </style>
<style scoped lang="less"> <style scoped lang="less">
@ -140,7 +139,9 @@
} }
.addType { .addType {
>li { padding: 0 28rpx;
>view {
height: 104rpx; height: 104rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 10rpx 10rpx 10rpx 10rpx; border-radius: 10rpx 10rpx 10rpx 10rpx;
@ -161,7 +162,7 @@
.zhezhaopops { .zhezhaopops {
padding: 34rpx 32rpx; padding: 34rpx 32rpx;
width: 594rpx; width: 594rpx;
height: 566rpx; // height: 566rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx; border-radius: 18rpx 18rpx 18rpx 18rpx;

26
pageConsumables/addsupplier.vue
View File

@ -1,39 +1,39 @@
<template> <template>
<view class="warehouseEntry"> <view class="warehouseEntry">
<ul> <view>
<li> <view>
<view> <view>
供应商 供应商
</view> </view>
<view> <view>
<input type="text" placeholder="请输入供应商名称" v-model="datas.form.purveyorName" name="" id=""> <input type="text" placeholder="请输入供应商名称" v-model="datas.form.purveyorName" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
联系电话 联系电话
</view> </view>
<view> <view>
<input type="text" placeholder="请输入联系电话" v-model="datas.form.purveyorTelephone" name="" id=""> <input type="text" placeholder="请输入联系电话" v-model="datas.form.purveyorTelephone" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
地址 地址
</view> </view>
<view> <view>
<input type="text" placeholder="请输入地址" v-model="datas.form.address" name="" id=""> <input type="text" placeholder="请输入地址" v-model="datas.form.address" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
备注 备注
</view> </view>
<view> <view>
<input type="text" placeholder="请输入备注" v-model="datas.form.remark" name="" id=""> <input type="text" placeholder="请输入备注" v-model="datas.form.remark" name="" id="">
</view> </view>
</li> </view>
</ul> </view>
</view> </view>
<view class="bottombutton"> <view class="bottombutton">
<up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="sumbit" :plain="true" <up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="sumbit" :plain="true"
@ -101,8 +101,8 @@
padding: 1rpx 24rpx; padding: 1rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
>ul { >view {
>li { >view {
height: 84rpx; height: 84rpx;
background: #fcfcfc; background: #fcfcfc;
border: 2rpx solid #F9F9F9; border: 2rpx solid #F9F9F9;
@ -129,7 +129,7 @@
.bottombutton { .bottombutton {
margin-top: 84rpx; margin-top: 84rpx;
padding: 0 24rpx;
>button { >button {
width: 530rpx; width: 530rpx;
height: 80rpx; height: 80rpx;

26
pageConsumables/editConsumables.vue
View File

@ -3,39 +3,39 @@
耗材信息 耗材信息
</view> </view>
<view class="addConsumables"> <view class="addConsumables">
<ul> <view>
<li> <view>
<view> <view>
单位 单位
</view> </view>
<view> <view>
<input type="text" placeholder="请输入单位" v-model="datas.form.conUnit" name="" id=""> <input type="text" placeholder="请输入单位" v-model="datas.form.conUnit" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
耗材名称 耗材名称
</view> </view>
<view> <view>
<input type="text" placeholder="请输入耗材名称" v-model="datas.form.conName" name="" id=""> <input type="text" placeholder="请输入耗材名称" v-model="datas.form.conName" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
耗材价格 耗材价格
</view> </view>
<view> <view>
<input type="text" placeholder="请输入耗材价格" v-model="datas.form.price" name="" id=""> <input type="text" placeholder="请输入耗材价格" v-model="datas.form.price" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
预警值 预警值
</view> </view>
<view> <view>
<input type="text" placeholder="请输入预警值" v-model="datas.form.conWarning" name="" id=""> <input type="text" placeholder="请输入预警值" v-model="datas.form.conWarning" name="" id="">
</view> </view>
</li> </view>
<!-- <li style="justify-content: space-between;"> <!-- <li style="justify-content: space-between;">
<view> <view>
耗材类型 耗材类型
@ -45,7 +45,7 @@
</view> </view>
<uni-icons type="bottom" size="16"></uni-icons> <uni-icons type="bottom" size="16"></uni-icons>
</li> --> </li> -->
</ul> </view>
</view> </view>
<!-- <view :style="{height:datas.showStatus?statusHeight:0}" class="tranistion status overflow-hide"> <!-- <view :style="{height:datas.showStatus?statusHeight:0}" class="tranistion status overflow-hide">
<view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between" <view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
@ -156,8 +156,8 @@
padding: 1rpx 24rpx; padding: 1rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
>ul { >view {
>li { >view {
width: 646rpx; width: 646rpx;
height: 84rpx; height: 84rpx;
background: #fcfcfc; background: #fcfcfc;
@ -185,7 +185,7 @@
.bottombutton { .bottombutton {
margin-top: 84rpx; margin-top: 84rpx;
padding: 0 24rpx;
>button { >button {
width: 530rpx; width: 530rpx;
height: 80rpx; height: 80rpx;

38
pageConsumables/editsupplier.vue
View File

@ -1,39 +1,39 @@
<template> <template>
<view class="warehouseEntry"> <view class="warehouseEntry">
<ul> <view>
<li> <view>
<view> <view>
供应商 供应商
</view> </view>
<view> <view>
<input type="text" placeholder="请输入供应商名称" v-model="datas.form.purveyorName" name="" id=""> <input type="text" placeholder="请输入供应商名称" v-model="datas.form.purveyorName" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
联系电话 联系电话
</view> </view>
<view> <view>
<input type="text" placeholder="请输入联系电话" v-model="datas.form.purveyorTelephone" name="" id=""> <input type="text" placeholder="请输入联系电话" v-model="datas.form.purveyorTelephone" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
地址 地址
</view> </view>
<view> <view>
<input type="text" placeholder="请输入地址" v-model="datas.form.address" name="" id=""> <input type="text" placeholder="请输入地址" v-model="datas.form.address" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
备注 备注
</view> </view>
<view> <view>
<input type="text" placeholder="请输入备注" v-model="datas.form.remark" name="" id=""> <input type="text" placeholder="请输入备注" v-model="datas.form.remark" name="" id="">
</view> </view>
</li> </view>
</ul> </view>
</view> </view>
<view class="bottombutton"> <view class="bottombutton">
<up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="sumbit" :plain="true" <up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="sumbit" :plain="true"
@ -76,22 +76,20 @@
}) })
} }
</script> </script>
<style>
<style scoped lang="less">
page { page {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
</style>
<style scoped lang="less">
.df() { .df() {
display: flex; display: flex;
align-items: center; align-items: center;
} }
ul,
li {
list-style: none;
padding: 0;
}
.status { .status {
margin: 0 32rpx; margin: 0 32rpx;
@ -111,8 +109,8 @@
padding: 1rpx 24rpx; padding: 1rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
>ul { >view {
>li { >view {
height: 84rpx; height: 84rpx;
background: #fcfcfc; background: #fcfcfc;
border: 2rpx solid #F9F9F9; border: 2rpx solid #F9F9F9;
@ -139,7 +137,7 @@
.bottombutton { .bottombutton {
margin-top: 84rpx; margin-top: 84rpx;
padding: 0 24rpx;
>button { >button {
width: 530rpx; width: 530rpx;
height: 80rpx; height: 80rpx;

28
pageConsumables/index.vue
View File

@ -20,8 +20,8 @@
<view :style="{height: '14px'}"></view> <view :style="{height: '14px'}"></view>
</view> </view>
<ul class="ConsumablesConent" v-if="datas.list.length"> <view class="ConsumablesConent" v-if="datas.list.length">
<li v-for="(item,index) in datas.list" :key="index"> <view v-for="(item,index) in datas.list" :key="index">
<view> <view>
{{item.conName}} {{item.conName}}
<view> {{item.conTypeName}} </view> <view> {{item.conTypeName}} </view>
@ -49,14 +49,14 @@
所属商品: {{ filtersSproductId(item.productId)}} 所属商品: {{ filtersSproductId(item.productId)}}
</view> </view>
<view class=""> <view class="">
<up-button type="primary" color="#999" @tap="toUrl('PAGES_VIEWRECORDS',{item:JSON.stringify(item)})" <up-button shape="circle" type="primary" size="mini" color="#999" @tap="toUrl('PAGES_VIEWRECORDS',{item:JSON.stringify(item)})"
:plain="true" text="查看记录"></up-button> :plain="true" text="查看记录"></up-button>&nbsp;&nbsp;
<up-button type="primary" @click="toggle(item)" :plain="true" text="更多操作"></up-button> <up-button type="primary" shape="circle" size="mini" @click="toggle(item)" :plain="true" text="更多操作"></up-button>
</view> </view>
</view> </view>
</li> </view>
<li style="background-color: rgba(0,0,0,0); height: 200rpx;"></li> <view style="background-color: rgba(0,0,0,0); height: 200rpx;"></view>
</ul> </view>
<view v-else style="text-align: center;"> <view v-else style="text-align: center;">
<image src="./bg.png" style="width: 325rpx;height: 335rpx;" mode=""></image> <image src="./bg.png" style="width: 325rpx;height: 335rpx;" mode=""></image>
<view style="font-size: 28rpx;color: #999;">暂无数据</view> <view style="font-size: 28rpx;color: #999;">暂无数据</view>
@ -254,12 +254,14 @@
go.to(url, d) go.to(url, d)
} }
</script> </script>
<style>
<style scoped lang="less">
page { page {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
</style>
<style scoped lang="less">
ul, ul,
li { li {
list-style: none; list-style: none;
@ -308,7 +310,7 @@
background-color: #f9f9f9; background-color: #f9f9f9;
padding-top: 1rpx; padding-top: 1rpx;
>li { >view {
width: 694rpx; width: 694rpx;
height: 332rpx; height: 332rpx;
background: #FFFFFF; background: #FFFFFF;
@ -369,7 +371,7 @@
width: 128rpx; width: 128rpx;
height: 48rpx; height: 48rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 28rpx 28rpx 28rpx 28rpx; // border-radius: 28rpx 28rpx 28rpx 28rpx;
} }
>button:last-child { >button:last-child {
@ -426,7 +428,7 @@
} }
.operate { .operate {
>li { >view {
height: 88rpx; height: 88rpx;
line-height: 88rpx; line-height: 88rpx;
text-align: center; text-align: center;

32
pageConsumables/inventoryCheck.vue
View File

@ -1,47 +1,47 @@
<template> <template>
<view class="warehouseEntry"> <view class="warehouseEntry">
<ul> <view>
<li> <view>
<view> <view>
账存数量 账存数量
</view> </view>
<view> <view>
{{datas.item.balance}} {{datas.item.balance}}
</view> </view>
</li> </view>
<li> <view>
<view> <view>
实际数量 实际数量
</view> </view>
<view> <view>
<input type="text" v-model="datas.form.balance" placeholder="输入数量" name="" id=""> <input type="text" v-model="datas.form.balance" placeholder="输入数量" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
单价 单价
</view> </view>
<view> <view>
{{datas.item.price}} {{datas.item.price}}
</view> </view>
</li> </view>
<li> <view>
<view> <view>
盈亏数量 盈亏数量
</view> </view>
<view> <view>
{{profitNumber}} {{profitNumber}}
</view> </view>
</li> </view>
<li> <view>
<view> <view>
总盈亏 总盈亏
</view> </view>
<view> <view>
{{profitPrice}} {{profitPrice}}
</view> </view>
</li> </view>
</ul> </view>
</view> </view>
<view class="bottombutton"> <view class="bottombutton">
<up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="toggle" :plain="true" <up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="toggle" :plain="true"
@ -96,7 +96,7 @@
function toggle() { function toggle() {
tbConsInfotbConCheck({ tbConsInfotbConCheck({
stockNumber: datas.item.balance, stockNumber: datas.form.balance,
conInfoId: datas.form.id, conInfoId: datas.form.id,
lpNum: profitNumber._value lpNum: profitNumber._value
}).then(res => { }).then(res => {
@ -168,8 +168,8 @@
padding: 1rpx 24rpx; padding: 1rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
>ul { >view {
>li { >view {
width: 646rpx; width: 646rpx;
height: 84rpx; height: 84rpx;
background: #fcfcfc; background: #fcfcfc;
@ -197,7 +197,7 @@
.bottombutton { .bottombutton {
margin-top: 84rpx; margin-top: 84rpx;
padding: 0 24rpx;
>button { >button {
width: 530rpx; width: 530rpx;
height: 80rpx; height: 80rpx;

52
pageConsumables/outbound.vue
View File

@ -1,54 +1,54 @@
<template> <template>
<view class="warehouseEntry"> <view class="warehouseEntry">
<ul> <view>
<li> <view>
<view> <view>
耗材名称 耗材名称
</view> </view>
<view> <view>
{{datas.item.conName}} {{datas.item.conName}}
</view> </view>
</li> </view>
<li> <view>
<view> <view>
现有库存 现有库存
</view> </view>
<view> <view>
{{datas.item.stockNumber-datas.item.stockConsume}} {{datas.item.stockNumber-datas.item.stockConsume}}
</view> </view>
</li> </view>
<li> <view>
<view> <view>
<text style="color: red;">*</text>出库数量 <text style="color: red;">*</text>出库数量
</view> </view>
<view> <view>
<input type="text" placeholder="请输入数量" v-model="datas.form.list.stockNumber" name="" id=""> <input type="text" placeholder="请输入数量" v-model="datas.form.list.stockNumber" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
<text style="color: red;">*</text>单价 <text style="color: red;">*</text>单价
</view> </view>
<view> <view>
<input type="text" placeholder="请输入单价(元)" v-model="datas.form.list.price" name="" id=""> <input type="text" placeholder="请输入单价(元)" v-model="datas.form.list.price" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
应付金额 应付金额
</view> </view>
<view> <view>
{{datas.form.list.stockNumber*datas.form.list.price|0}} {{datas.form.list.stockNumber*datas.form.list.price|0}}
</view> </view>
</li> </view>
<li> <view>
<view> <view>
实付金额 实付金额
</view> </view>
<view> <view>
<input placeholder="请输入现有库存" type="text" v-model="datas.form.actualPayment" /> <input placeholder="请输入现有库存" type="text" v-model="datas.form.actualPayment" />
</view> </view>
</li> </view>
<!-- <li> <!-- <li>
<view> <view>
总价值 总价值
@ -57,7 +57,7 @@
<input type="text" placeholder="请输入总价值(元)" name="" id=""> <input type="text" placeholder="请输入总价值(元)" name="" id="">
</view> </view>
</li> --> </li> -->
<li style="justify-content: space-between;"> <view style="justify-content: space-between;">
<view> <view>
供应商 供应商
</view> </view>
@ -65,10 +65,11 @@
{{datas.status[nowStatusIndex]}} {{datas.status[nowStatusIndex]}}
</view> </view>
<uni-icons type="bottom" size="16"></uni-icons> <uni-icons type="bottom" size="16"></uni-icons>
<up-button type="text" style="color: #318AFE;width: 64rpx;" @tap="toggle" :plain="true" <view style="color: #318AFE;width: 80rpx;text-align: center;" @tap="toggle">
text="新增"></up-button> 新增
</li> </view>
</ul> </view>
</view>
<view :style="{height:showStatus?statusHeight:0}" class="tranistion status overflow-hide"> <view :style="{height:showStatus?statusHeight:0}" class="tranistion status overflow-hide">
<view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between" <view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
v-for="(item,index) in datas.status" :key="index"> v-for="(item,index) in datas.status" :key="index">
@ -168,7 +169,7 @@
}) })
return return
} }
if(!datas.form.list.price){ if (!datas.form.list.price) {
refs.ctx.$refs.uToastRef.show({ refs.ctx.$refs.uToastRef.show({
type: 'default', type: 'default',
message: "请输入必填项", message: "请输入必填项",
@ -199,18 +200,12 @@
} }
</style> </style>
<style scoped lang="less"> <style scoped lang="less">
.df() { .df() {
display: flex; display: flex;
align-items: center; align-items: center;
} }
ul,
li {
list-style: none;
padding: 0;
}
.status { .status {
margin: 0 32rpx; margin: 0 32rpx;
@ -231,8 +226,8 @@
padding: 20rpx 24rpx; padding: 20rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
>ul { >view {
>li { >view {
width: 646rpx; width: 646rpx;
height: 84rpx; height: 84rpx;
background: #fcfcfc; background: #fcfcfc;
@ -260,6 +255,7 @@
.bottombutton { .bottombutton {
margin-top: 84rpx; margin-top: 84rpx;
padding: 0 24rpx;
>button { >button {
width: 530rpx; width: 530rpx;

49
pageConsumables/paymentSettlement.vue
View File

@ -7,15 +7,15 @@
<view class="xian" v-if="v.value==selected "> </view> <view class="xian" v-if="v.value==selected "> </view>
</view> </view>
</view> </view>
<ul class="paymentSettlement"> <view class="paymentSettlement">
<li :style="{color:datas.activeType==0?'#318AFE':''}" @tap="switchType(0)">全部</li> <view :style="{color:datas.activeType==0?'#318AFE':''}" @tap="switchType(0)">全部</view>
<li :style="{color:datas.activeType==1?'#318AFE':''}" @tap="switchType(1)">进货</li> <view :style="{color:datas.activeType==1?'#318AFE':''}" @tap="switchType(1)">进货</view>
<li :style="{color:datas.activeType==2?'#318AFE':''}" @tap="switchType(2)">退货</li> <view :style="{color:datas.activeType==2?'#318AFE':''}" @tap="switchType(2)">退货</view>
<li :style="{color:datas.activeType==3?'#318AFE':''}" @tap="switchType(3)">未支付</li> <view :style="{color:datas.activeType==3?'#318AFE':''}" @tap="switchType(3)">未支付</view>
<li :style="{color:datas.activeType==4?'#318AFE':''}" @tap="switchType(4)">已付款</li> <view :style="{color:datas.activeType==4?'#318AFE':''}" @tap="switchType(4)">已付款</view>
</ul> </view>
<ul class="supplier"> <view class="supplier">
<li v-for="item in datas.list" :key="item.id"> <view v-for="item in datas.list" :key="item.id">
<view style="position: relative;"> <view style="position: relative;">
<view> <view>
@ -60,13 +60,20 @@
<span>{{dayjs(item.updatedAt).format('YYYY-MM-DD HH:mm:ss')}}</span> <span>{{dayjs(item.updatedAt).format('YYYY-MM-DD HH:mm:ss')}}</span>
</view> </view>
<view> <view>
<up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="datas.PopUp=true;datas.form.id=item.id"
:plain="true" text="付款"></up-button> <!-- <up-button shape="circle" type="primary" size="mini" color="#999" @tap="toUrl('PAGES_VIEWRECORDS',{item:JSON.stringify(item)})"
<up-button type="primary" style="width: 200rpx;" @tap="toUrl(item.id)" :plain="true" text="账单付款记录"> :plain="true" text="查看记录"></up-button>&nbsp;&nbsp;
<up-button type="primary" shape="circle" size="mini" @click="toggle(item)" :plain="true" text="更多操作"></up-button>
-->
<up-button type="primary" size="mini" shape="circle" style="background-color: #318AFE;color: #fff;" @tap="datas.PopUp=true;datas.form.id=item.id"
:plain="true" text="付款"></up-button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<up-button type="primary" size="mini" shape="circle" style="width: 200rpx;" @tap="toUrl(item.id)" :plain="true" text="账单付款记录">
</up-button> </up-button>
</view> </view>
</li> </view>
</ul> </view>
<!-- 取号遮罩层 --> <!-- 取号遮罩层 -->
<up-popup :show="datas.PopUp" :round="18" mode="center" @close="close"> <up-popup :show="datas.PopUp" :round="18" mode="center" @close="close">
<view class="zhezhaopops"> <view class="zhezhaopops">
@ -263,18 +270,12 @@
} }
} }
</script> </script>
<style>
<style scoped lang="less">
page { page {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
</style>
ul, <style scoped lang="less">
li {
list-style: none;
padding: 0;
}
.time-wrapper { .time-wrapper {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
@ -306,7 +307,7 @@
} }
.supplier { .supplier {
>li { >view {
width: 694rpx; width: 694rpx;
height: 550rpx; height: 550rpx;
background: #FFFFFF; background: #FFFFFF;

42
pageConsumables/supplier.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<ul class="supplier"> <view class="supplier">
<li v-for="item in datas.list" :key="item.id"> <view v-for="item in datas.list" :key="item.id">
<view class=""> <view class="">
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<image src="./profile.png" style="width: 64rpx;height: 64rpx;" mode=""></image> <image src="./profile.png" style="width: 64rpx;height: 64rpx;" mode=""></image>
@ -48,14 +48,16 @@
<span>{{item.remark}}</span> <span>{{item.remark}}</span>
</view> </view>
<view class=""> <view class="">
<up-button type="primary" @tap="toUrl('PAGES_EDIT_SUPPLIER',{item:JSON.stringify(item)})" :plain="true" <up-button type="primary" shape="circle" size="mini"
text="编辑"> @tap="toUrl('PAGES_EDIT_SUPPLIER',{item:JSON.stringify(item)})" :plain="true" text="编辑">
</up-button><up-button type="primary" @tap="deleteEvent(item.id)" :plain="true" text="删除"> </up-button>&nbsp;&nbsp;&nbsp;&nbsp;<up-button size="mini" shape="circle" type="primary" @tap="deleteEvent(item.id)"
</up-button><up-button type="primary" style="background-color: #318AFE;color: #fff;" :plain="true" text="删除">
</up-button>&nbsp;&nbsp;&nbsp;&nbsp;<up-button size="mini" shape="circle" type="primary"
style="background-color: #318AFE;color: #fff;"
@tap="toUrl('PAGES_PAYMENT_SETTLEMENT',{id:item.id})" :plain="true" text="结款记录"></up-button> @tap="toUrl('PAGES_PAYMENT_SETTLEMENT',{id:item.id})" :plain="true" text="结款记录"></up-button>
</view> </view>
</li> </view>
</ul> </view>
<view class="bottombutton"> <view class="bottombutton">
<up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="toUrl('PAGES_ADD_SUPPLIER')" <up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="toUrl('PAGES_ADD_SUPPLIER')"
:plain="true" text="添加供应商"></up-button> :plain="true" text="添加供应商"></up-button>
@ -98,18 +100,17 @@
}) })
} }
</script> </script>
<style>
<style scoped lang="less">
page { page {
background-color: #f9f9f9; background-color: #f9f9f9;
padding: 28rpx;
}
ul,
li {
list-style: none;
padding: 0;
} }
</style>
<style scoped lang="less">
// ul,
// li {
// list-style: none;
// padding: 0;
// }
.bottombutton { .bottombutton {
// margin-top: 84rpx; // margin-top: 84rpx;
@ -117,16 +118,19 @@
bottom: 20rpx; bottom: 20rpx;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
width: 90%;
>button { >button {
width: 530rpx; // width: 530rpx;
height: 80rpx; height: 80rpx;
border-radius: 56rpx 56rpx 56rpx 56rpx; border-radius: 56rpx 56rpx 56rpx 56rpx;
} }
} }
.supplier { .supplier {
>li { padding: 28rpx;
>view {
width: 694rpx; width: 694rpx;
// height: 604rpx; // height: 604rpx;
background: #FFFFFF; background: #FFFFFF;

15
pageConsumables/viewrecords.vue
View File

@ -74,8 +74,8 @@
</view> </view>
</view> </view>
</view> </view>
<ul class="viewrecords"> <view class="viewrecords">
<li v-for="item in datas.list" :key="item.id"> <view v-for="item in datas.list" :key="item.id">
<view class=""> <view class="">
<view class=""> <view class="">
{{item.createTime}} {{item.createTime}}
@ -103,8 +103,8 @@
</view> </view>
</view> </view>
</view> </view>
</li> </view>
</ul> </view>
<datePickerview @confirm="datePickerConfirm" ref="datePicker"></datePickerview> <datePickerview @confirm="datePickerConfirm" ref="datePicker"></datePickerview>
</template> </template>
@ -215,11 +215,6 @@
} }
</style> </style>
<style scoped lang="less"> <style scoped lang="less">
ul,
li {
list-style: none;
padding: 0;
}
.viewrecordsType { .viewrecordsType {
height: 100rpx; height: 100rpx;
@ -255,7 +250,7 @@
.viewrecords { .viewrecords {
padding: 0 28rpx; padding: 0 28rpx;
>li { >view {
margin-top: 32rpx; margin-top: 32rpx;
width: 694rpx; width: 694rpx;
height: 284rpx; height: 284rpx;

65
pageConsumables/warehouseEntry.vue
View File

@ -1,74 +1,86 @@
<template> <template>
<view class="warehouseEntry"> <view class="warehouseEntry">
<ul> <view>
<li> <view>
<view> <view>
耗材名称 耗材名称
</view> </view>
<view> <view>
{{datas.item.conName}} {{datas.item.conName}}
</view> </view>
</li> </view>
<li> <view>
<view> <view>
现有库存 现有库存
</view> </view>
<view> <view>
{{datas.item.stockNumber-datas.item.stockConsume}} {{datas.item.stockNumber-datas.item.stockConsume}}
</view> </view>
</li> </view>
<li> <view>
<view> <view>
<text style="color: red;">*</text> 入库数量 <text style="color: red;">*</text> 入库数量
</view> </view>
<view> <view>
<input type="number" placeholder="请输入数量" v-model="datas.form.list.stockNumber" name="" id=""> <input type="number" placeholder="请输入数量" v-model="datas.form.list.stockNumber" name="" id="">
</view> </view>
</li> </view>
<li> <view style="justify-content: space-between;">
<view>
单位
</view>
<view style="width: 54%;" @tap="showStatusToggle">
{{datas.status[nowStatusIndex]}}
</view>
<uni-icons type="bottom" size="16"></uni-icons>
</view>
<view>
<view> <view>
<text style="color: red;">*</text>单价 <text style="color: red;">*</text>单价
</view> </view>
<view> <view>
<input type="number" placeholder="请输入单价(元)" v-model="datas.form.list.price" name="" id=""> <input type="number" placeholder="请输入单价(元)" v-model="datas.form.list.price" name="" id="">
</view> </view>
</li> </view>
<li> <view>
<view> <view>
应付金额 应付金额
</view> </view>
<view> <view>
{{datas.form.list.stockNumber*datas.form.list.price|0}} {{datas.form.list.stockNumber*datas.form.list.price|0}}
</view> </view>
</li> </view>
<li> <view>
<view> <view>
实付金额 实付金额
</view> </view>
<view> <view>
<input placeholder="请输入现有库存" type="text" v-model="datas.form.actualPayment" /> <input placeholder="请输入现有库存" type="text" v-model="datas.form.actualPayment" />
</view> </view>
</li> </view>
<!-- <li> <!-- <view>
<view> <view>
总价值 总价值
</view> </view>
<view> <view>
<input type="text" placeholder="请输入总价值(元)" name="" id=""> <input type="text" placeholder="请输入总价值(元)" name="" id="">
</view> </view>
</li> --> </view> -->
<li style="justify-content: space-between;"> <view style="justify-content: space-between;">
<view> <view>
供应商 供应商
</view> </view>
<view style="width: 54%;" @tap="showStatusToggle"> <view style="width: 375rpx;" @tap="showStatusToggle">
{{datas.status[nowStatusIndex]}} {{datas.status[nowStatusIndex]}}
</view> </view>
<uni-icons type="bottom" size="16"></uni-icons> <uni-icons type="bottom" size="16"></uni-icons>
<up-button type="text" style="color: #318AFE;width: 64rpx;" @tap="toggle" :plain="true" <view style="color: #318AFE;width: 80rpx;text-align: center;" @tap="toggle">
text="新增"></up-button> 新增
</li> </view>
</ul> <!-- <up-button type="text" style="color: #318AFE;" @tap="toggle" :plain="true"
text="新增"></up-button> -->
</view>
</view>
<view :style="{height:showStatus?statusHeight:0}" class="tranistion status overflow-hide"> <view :style="{height:showStatus?statusHeight:0}" class="tranistion status overflow-hide">
<view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between" <view @tap="changeNowStatusIndex(index)" class="u-flex u-p-l-30 lh30 u-p-r-30 u-row-between"
v-for="(item,index) in datas.status" :key="index"> v-for="(item,index) in datas.status" :key="index">
@ -79,7 +91,7 @@
</view> </view>
</view> </view>
<view class="bottombutton"> <view class="bottombutton">
<up-button type="primary" style="background-color: #318AFE;color: #fff;" @tap="sumbit" :plain="true" <up-button type="primary" style="background-color: #318AFE;color: #fff;width: 100%!important;" @tap="sumbit" :plain="true"
text="保存"></up-button> text="保存"></up-button>
<!-- <up-button type="text" style="background-color: #f9f9f9;color: #999;" @tap="toggle" :plain="true" <!-- <up-button type="text" style="background-color: #f9f9f9;color: #999;" @tap="toggle" :plain="true"
text="取消"></up-button> --> text="取消"></up-button> -->
@ -202,6 +214,10 @@
page { page {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
/* .u-button {
width: 64rpx!important;
} */
</style> </style>
<style scoped lang="less"> <style scoped lang="less">
.df() { .df() {
@ -235,8 +251,8 @@
padding: 20rpx 24rpx; padding: 20rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
>ul { >view {
>li { >view {
width: 646rpx; width: 646rpx;
height: 84rpx; height: 84rpx;
background: #fcfcfc; background: #fcfcfc;
@ -264,6 +280,7 @@
.bottombutton { .bottombutton {
margin-top: 84rpx; margin-top: 84rpx;
padding: 0 24rpx;
>button { >button {
width: 530rpx; width: 530rpx;

20
pageLineUp/callRecord.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<ul class="callRecord"> <view class="callRecord">
<li v-for="item in datas.list" :key="item.id"> <view v-for="item in datas.list" :key="item.id">
<view> <view>
<view> <view>
{{item.callNum}} {{item.callNum}}
@ -30,8 +30,8 @@
</view> </view>
</view> </view>
</view> </view>
</li> </view>
</ul> </view>
</template> </template>
<script setup> <script setup>
@ -74,7 +74,11 @@
}) })
} }
</script> </script>
<style>
page {
background: #f9f9f9;
}
</style>
<style scoped lang="less"> <style scoped lang="less">
// * { // * {
// padding: 0; // padding: 0;
@ -82,9 +86,7 @@
// text-decoration: none; // text-decoration: none;
// outline: none; // outline: none;
// } // }
page {
background: #f9f9f9;
}
ul, ul,
li { li {
@ -96,7 +98,7 @@
.callRecord { .callRecord {
>li { >view {
width: 694rpx; width: 694rpx;
height: 166rpx; height: 166rpx;
margin: 32rpx 0; margin: 32rpx 0;

9
pageLineUp/index.vue
View File

@ -83,7 +83,7 @@
<view class=""> <view class="">
手机号码 手机号码
</view> </view>
<view class=""> <view style="margin-bottom: 48rpx;">
<input v-model="datas.phone" type="text" placeholder="填写号码" /> <input v-model="datas.phone" type="text" placeholder="填写号码" />
</view> </view>
<up-button text="确认取号" @tap="callTabletakeNumberEvent" type="primary" class="buttomStyle" <up-button text="确认取号" @tap="callTabletakeNumberEvent" type="primary" class="buttomStyle"
@ -101,7 +101,7 @@
<view class=""> <view class="">
{{datas.showtowData.callNum}} {{datas.showtowData.callNum}}
</view> </view>
<view class=""> <view style="margin-bottom: 48rpx;">
{{datas.showtowData.tableName}} ({{datas.showtowData.tableNote}}) {{datas.showtowData.tableName}} ({{datas.showtowData.tableNote}})
</view> </view>
<up-button text="确认" @tap="confirmtow" type="primary" class="buttomStyle" shape="circle"></up-button> <up-button text="确认" @tap="confirmtow" type="primary" class="buttomStyle" shape="circle"></up-button>
@ -377,7 +377,7 @@
.zhezhaopop { .zhezhaopop {
padding: 34rpx 32rpx; padding: 34rpx 32rpx;
width: 594rpx; width: 594rpx;
height: 668rpx; // height: 668rpx;
background: #FFFFFF; background: #FFFFFF;
// border-radius: 18rpx 18rpx 18rpx 18rpx; // border-radius: 18rpx 18rpx 18rpx 18rpx;
@ -433,13 +433,12 @@
.zhezhaopops { .zhezhaopops {
padding: 34rpx 32rpx; padding: 34rpx 32rpx;
width: 594rpx; width: 594rpx;
height: 508rpx;
background: #FFFFFF; background: #FFFFFF;
// border-radius: 18rpx 18rpx 18rpx 18rpx; // border-radius: 18rpx 18rpx 18rpx 18rpx;
border-radius: 18rpx 18rpx 18rpx 18rpx; border-radius: 18rpx 18rpx 18rpx 18rpx;
>view:first-child { >view:first-child {
border-radius: 18rpx 18rpx 18rpx 18rpx;
.df; .df;
justify-content: space-between; justify-content: space-between;

133
pageSalesSummary/index.vue
View File

@ -59,15 +59,15 @@
</view> </view>
</view> </view>
<view class="table-scroll"> <view class="table-scroll">
<table cellspacing="0"> <!-- <table class="table" cellspacing="0">
<thead> <thead class="thead">
<tr style="background-color: #aebad2;color: #fff;" height='41'> <tr style="background-color: #aebad2;color: #fff;" height='41'>
<th style="width: 540rpx;">商品名称</th> <th style="width: 540rpx;">商品名称</th>
<th style="width: 215rpx;">总数量</th> <th style="width: 215rpx;">总数量</th>
<th>金额</th> <th>金额</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody class="tbody">
<tr v-for="(item,index) in tableList" :key="item.productId"> <tr v-for="(item,index) in tableList" :key="item.productId">
<td style="width: 500rpx;padding-left: 16rpx;"> <td style="width: 500rpx;padding-left: 16rpx;">
<image v-if="index==0" src="../pageTable/index/images/1.png" style="width: 22rpx;height: 30rpx;" <image v-if="index==0" src="../pageTable/index/images/1.png" style="width: 22rpx;height: 30rpx;"
@ -84,6 +84,39 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
-->
<template>
<view class="color-333 u-font-28 bg-gray default-box-padding" style="padding-top:80px;">
<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
<view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
<view class="constantbox">
<view class="constantboxitem">
<view class="head">商品名称</view>
<view class="head">总数量</view>
<view class="head">金额</view>
</view>
<view class="constantboxitem" v-for="(item,index) in tableList" :key="index"
@click="toDetail(item)">
<view class="head" style="padding-left: 16rpx;">
<image v-if="index==0" src="../pageTable/index/images/1.png"
style="width: 22rpx;height: 30rpx;" mode=""></image>
<image v-else-if="index==1" src="../pageTable/index/images/2.png"
style="width: 22rpx;height: 30rpx;" mode=""></image>
<image v-else-if="index==2" src="../pageTable/index/images/3.png"
style="width: 22rpx;height: 30rpx;" mode=""></image>
&nbsp;&nbsp;{{item.productName}}
</view>
<view class="head">{{item.num}}</view>
<view class="head">{{item.salesAmount || '无'}}</view>
</view>
</view>
</view>
</scroll-view>
<!-- <view style="height: 100px;"></view> -->
</view>
</template>
</view> </view>
<view class="bottombtn" @tap="toUrl"> <view class="bottombtn" @tap="toUrl">
更多 <uni-icons type="right" size="16"></uni-icons> 更多 <uni-icons type="right" size="16"></uni-icons>
@ -243,6 +276,71 @@
background: #f6f6f6; background: #f6f6f6;
} }
</style> </style>
<style lang="scss" scoped>
.fixed-top {
padding: 32rpx 28rpx;
z-index: 100;
}
.bottom {
background-color: transparent;
bottom: 84rpx;
left: 28rpx;
right: 28rpx;
}
.table {
border-radius: 12rpx 12rpx 0rpx 0rpx;
overflow: hidden;
font-size: 24rpx;
.constantbox {
.constantboxitem {
display: flex;
.head {
width: 220rpx;
padding: 32rpx 24rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 24rpx;
color: #333333;
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; //溢出不换行
}
.head:nth-child(4) {
width: 300rpx;
}
.head:nth-child(5) {
width: 300rpx;
}
}
.constantboxitem:nth-child(even) {
background: #fff;
}
.constantboxitem:nth-child(odd) {
background: #F7F6FB;
}
.constantboxitem:nth-child(1) {
background: #AEBAD2;
color: #fff;
font-size: 24rpx;
}
}
.item:nth-of-type(2n+1) {
background-color: rgb(249, 249, 249);
}
}
</style>
<style scoped lang="less"> <style scoped lang="less">
.time-wrapper { .time-wrapper {
display: flex; display: flex;
@ -309,18 +407,18 @@
} }
.table-scroll table { .table-scroll .table {
table-layout: fixed; table-layout: fixed;
// width: calc(100% - 10rpx); // width: calc(100% - 10rpx);
} }
.table-scroll thead { .table-scroll .thead {
display: table-row; display: table-row;
background-color: bisque; background-color: bisque;
font-size: 24rpx; font-size: 24rpx;
} }
.table-scroll tbody { .table-scroll .tbody {
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
display: block; display: block;
@ -329,15 +427,15 @@
// width: calc(100% ); // width: calc(100% );
} }
.table-scroll th, // .table-scroll th,
td { // td {
height: 82rpx; // height: 82rpx;
overflow: hidden; // overflow: hidden;
text-overflow: ellipsis; // text-overflow: ellipsis;
width: 250rpx; // width: 250rpx;
// border: 0.7rpx solid red; // // border: 0.7rpx solid red;
border: 0.7rpx solid rgba(126, 155, 212, 0.27); // border: 0.7rpx solid rgba(126, 155, 212, 0.27);
} // }
.bottombtn { .bottombtn {
width: 694rpx; width: 694rpx;
@ -355,3 +453,8 @@
align-items: center; align-items: center;
} }
</style> </style>
<style>
.min-page{
height: 20vh;
}
</style>

90
pageSalesSummary/productSalesRanking.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="table-scroll"> <!-- <view class="table-scroll">
<table cellspacing="0"> <table cellspacing="0">
<thead> <thead>
<tr style="background-color: #aebad2;color: #fff;" height='41'> <tr style="background-color: #aebad2;color: #fff;" height='41'>
@ -16,7 +16,29 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</view> </view> -->
<template>
<view class="color-333 u-font-28 bg-gray default-box-padding" >
<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
<view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
<view class="constantbox">
<view class="constantboxitem">
<view class="head">商品名称</view>
<view class="head">总数量</view>
<view class="head">金额</view>
</view>
<view class="constantboxitem" v-for="(item,index) in tableList" :key="index"
@click="toDetail(item)">
<view class="head">{{item.productName}}</view>
<view class="head">{{item.num}}</view>
<view class="head">{{item.salesAmount || '无'}}</view>
</view>
</view>
</view>
</scroll-view>
<!-- <view style="height: 100px;"></view> -->
</view>
</template>
</template> </template>
<script setup> <script setup>
@ -87,3 +109,67 @@
border: 0.7rpx solid rgba(126, 155, 212, 0.27); border: 0.7rpx solid rgba(126, 155, 212, 0.27);
} }
</style> </style>
<style lang="scss" scoped>
.fixed-top {
padding: 32rpx 28rpx;
z-index: 100;
}
.bottom {
background-color: transparent;
bottom: 84rpx;
left: 28rpx;
right: 28rpx;
}
.table {
border-radius: 12rpx 12rpx 0rpx 0rpx;
overflow: hidden;
font-size: 24rpx;
.constantbox {
.constantboxitem {
display: flex;
.head {
width: 220rpx;
padding: 32rpx 24rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 24rpx;
color: #333333;
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; //溢出不换行
}
.head:nth-child(4) {
width: 300rpx;
}
.head:nth-child(5) {
width: 300rpx;
}
}
.constantboxitem:nth-child(even) {
background: #fff;
}
.constantboxitem:nth-child(odd) {
background: #F7F6FB;
}
.constantboxitem:nth-child(1) {
background: #AEBAD2;
color: #fff;
font-size: 24rpx;
}
}
.item:nth-of-type(2n+1) {
background-color: rgb(249, 249, 249);
}
}
</style>

13
pageUser/index/index.vue
View File

@ -163,16 +163,16 @@
<up-icon @tap="confirm" name="close-circle-fill"></up-icon> <up-icon @tap="confirm" name="close-circle-fill"></up-icon>
</view> </view>
<view style="display: flex;align-items: center;padding: 24rpx;"> <view style="display: flex;align-items: center;padding: 24rpx;">
<image v-if="datas.activeUser.headImg" :src="datas.activeUser.headImg" <image v-if="datas.activeUser?datas.activeUser.headImg:''" :src="datas.activeUser.headImg"
style="width: 52rpx;height: 52rpx;;background-color: #eee;"></image> style="width: 52rpx;height: 52rpx;;background-color: #eee;"></image>
<view style="width: 52rpx;height: 52rpx;;background-color: #eee;" v-else> <view style="width: 52rpx;height: 52rpx;;background-color: #eee;" v-else>
</view> </view>
<view style="margin-left: 12rpx;"> <view style="margin-left: 12rpx;">
<view style="font-weight: 400;font-size: 28rpx;color: #333333;"> <view style="font-weight: 400;font-size: 28rpx;color: #333333;">
{{datas.activeUser.nickName}} {{datas.activeUser?datas.activeUser.nickName:''}}
</view> </view>
<view style="font-weight: 400;font-size: 24rpx;color: #999999;"> <view style="font-weight: 400;font-size: 24rpx;color: #999999;">
当前余额:{{datas.activeUser.amount}} 当前余额:{{datas.activeUser?datas.activeUser.amount:''}}
</view> </view>
</view> </view>
</view> </view>
@ -238,7 +238,7 @@
</view> </view>
</view> </view>
</view> </view>
<up-button text="确认" @tap="callTabletakeNumberEvent" type="primary" class="buttomStyle" <up-button text="确认" @tap="callTabletakeNumberEvent" type="primary" class="buttomStyle"
shape="circle"></up-button> shape="circle"></up-button>
</view> </view>
</up-popup> </up-popup>
@ -718,7 +718,7 @@
.zhezhaopopfour { .zhezhaopopfour {
margin-top: 32rpx; margin-top: 32rpx;
margin-bottom: 48rpx;
>view:nth-child(2) { >view:nth-child(2) {
margin-top: 24rpx; margin-top: 24rpx;
display: flex; display: flex;
@ -750,6 +750,9 @@
margin-top: 48rpx; margin-top: 48rpx;
width: 506rpx; width: 506rpx;
height: 80rpx; height: 80rpx;
/*#ifdef MP*/
padding-top: 48rpx;
/*#endif*/
} }
} }

13
pages/index/components/statistics.vue
View File

@ -1,7 +1,6 @@
<template> <template>
<view class="statistics"> <view class="statistics">
<view class="statisticsBox"> <view class="statisticsBox">
<view class="time-wrapper"> <view class="time-wrapper">
<view v-for="(v, i) in timeList" :key="i" class="timelistbox"> <view v-for="(v, i) in timeList" :key="i" class="timelistbox">
<view class="time-item" @tap="changeTime(v.value)" :class="{ 'time-selected':v.value==selected }"> <view class="time-item" @tap="changeTime(v.value)" :class="{ 'time-selected':v.value==selected }">
@ -13,10 +12,10 @@
<ul class="payList"> <ul class="payList">
<li v-for="item in list" :key="item.id"> <li v-for="item in list" :key="item.id">
<view class=""> <view style="text-align: center;">
{{item.payType}} {{item.payType}}
</view> </view>
<view class=""> <view style="text-align: center;">
{{item.payAmount}} {{item.payAmount}}
</view> </view>
</li> </li>
@ -37,7 +36,7 @@
} from 'vue'; } from 'vue';
import datePickerview from './my-date-pickerview.vue' import datePickerview from './my-date-pickerview.vue'
import { import {
onLoad onShow
} from '@dcloudio/uni-app'; } from '@dcloudio/uni-app';
let selected = ref('today') let selected = ref('today')
let list = ref() let list = ref()
@ -63,7 +62,7 @@
} }
] ]
const currentInstance = getCurrentInstance() const currentInstance = getCurrentInstance()
onLoad((options) => { onShow((options) => {
getlist() getlist()
}); });
@ -99,7 +98,7 @@
endTime, endTime,
}).then((res) => { }).then((res) => {
list.value = res.sale.payCount.slice(0, 4) list.value = res.sale.payCount.slice(0, 4)
emit('totalRevenue',res.sale.incomeAmountAll) emit('totalRevenue', res.sale.incomeAmountAll)
}) })
} }
@ -192,7 +191,7 @@
.payList { .payList {
display: flex; display: flex;
// justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 32rpx; margin-top: 32rpx;