From cfed8ea183bd518529000c17d977ecca1b889443 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 5 Nov 2024 10:33:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageConsumables/editConsumables.vue |  10 ++++---
 pageConsumables/index.vue           |  39 +++++++++++++++++++++++++---
 pageConsumables/time.png            | Bin 0 -> 501 bytes
 pageConsumables/viewrecords.vue     |   6 ++++-
 pageStaff/addstaff.vue              |   8 +++---
 pages/shopSetUp/index.vue           |   2 +-
 6 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 pageConsumables/time.png

diff --git a/pageConsumables/editConsumables.vue b/pageConsumables/editConsumables.vue
index 759bda4..e548a7b 100644
--- a/pageConsumables/editConsumables.vue
+++ b/pageConsumables/editConsumables.vue
@@ -25,7 +25,7 @@
 					耗材价格
 				</view>
 				<view>
-					<input class="uni-input" placeholder="请输入耗材价格" type="number" v-model="datas.form.price" >
+					<input class="uni-input" placeholder="请输入耗材价格" type="number" v-model="datas.form.price">
 				</view>
 			</view>
 			<view>
@@ -33,7 +33,7 @@
 					预警值
 				</view>
 				<view>
-					<input type="text" placeholder="请输入预警值" v-model="datas.form.conWarning" name="" id="">
+					<input type="number" placeholder="请输入预警值" v-model="datas.form.conWarning" name="" id="">
 				</view>
 			</view>
 			<!-- <li style="justify-content: space-between;">
@@ -110,6 +110,9 @@
 	let sumbit = () => {
 		tbConsTypeput([{
 			...datas.form,
+			status: datas.form.status * 1,
+			isCheck: datas.form.isCheck * 1,
+			conWarning: datas.form.conWarning * 1,
 			shopId: uni.getStorageSync("shopId"),
 			conTypeId: datas.list[datas.nowStatusIndex].id,
 			id: datas.form.id
@@ -132,8 +135,6 @@
 	}
 </style>
 <style scoped lang="less">
- 
-
 	ul,
 	li {
 		list-style: none;
@@ -186,6 +187,7 @@
 	.bottombutton {
 		margin-top: 84rpx;
 		padding: 0 24rpx;
+
 		>button {
 			width: 530rpx;
 			height: 80rpx;
diff --git a/pageConsumables/index.vue b/pageConsumables/index.vue
index 41cf2d5..bbf34e2 100644
--- a/pageConsumables/index.vue
+++ b/pageConsumables/index.vue
@@ -45,8 +45,9 @@
 				</view>
 			</view>
 			<view>
-				<view class="">
-					所属商品: {{ filtersSproductId(item.product)}}
+				<view style="background-color: #fff;" @tap="show=true;showData = filtersSproductId(item.product)">
+					所属商品:
+					{{ filtersSproductId(item.product).length>7?filtersSproductId(item.product).substring(0,6)+'...':filtersSproductId(item.product)}}
 				</view>
 				<view class="">
 					<up-button shape="circle" type="primary" size="mini" color="#999"
@@ -73,6 +74,19 @@
 	</view>
 	<my-action-sheet @itemClick="sheetClick" ref="refMoreSheet" :list="actionSheet.list"></my-action-sheet>
 	<my-reportDamage ref="reportDamage" title="耗材报损" :item="report.data" @affirm="affirm"></my-reportDamage>
+
+	<up-popup :show="show" :round="18" mode="center" >
+		<view class="zhezhaopop">
+			<view class="">
+				<span></span>
+				<span></span>
+				<up-icon @tap="show=false" name="close-circle-fill"></up-icon>
+			</view>
+			<view class="">
+				{{showData}}
+			</view>
+		</view>
+	</up-popup>
 </template>
 
 <script setup>
@@ -98,6 +112,8 @@
 	} from '@/http/yskApi/requestAll.js';
 	let reportDamage = ref(null)
 	let refMoreSheet = ref(null)
+	let show = ref(false)
+	let showData = ref()
 	const report = reactive({
 		data: {
 			// thumbnail: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240918/a17a62b7b55a4b65a2a2542050672b34.png',
@@ -251,7 +267,6 @@
 			// const productName = ele.slice(startIndex + 1, ele.length)
 			str = ele.name + ',' + str
 		})
-
 		return str
 	}
 	let toUrl = (url, d) => {
@@ -450,6 +465,24 @@
 		background-color: #fff;
 	}
 
+	.zhezhaopop {
+		padding: 34rpx 32rpx;
+		width: 594rpx;
+
+		>view:first-child {
+
+			.df;
+			justify-content: space-between;
+
+			>span:nth-child(2) {
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #333333;
+			}
+		}
+
+	}
 
 	.df() {
 		display: flex;
diff --git a/pageConsumables/time.png b/pageConsumables/time.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f07e7137909e0b124bf63293fd9e4db4c3b30a4
GIT binary patch
literal 501
zcmV<R0Sf+!P)<h;3K|Lk000e1NJLTq001HY001Be1^@s6caN&c00001b5ch_0Itp)
z=>Px$uSrBfR9Hvtm%A?oK@^9-`!DDu3Y`v#NQeT_Qfj;k5pFG_MX3;_kZ3$2QD{)3
z5kwG)Mx)bF>6s%l$;o6lyK`q(HaDi3%;WsdH*<Do&(x?$sa1r7ydbN<iiKV?wX~&N
z07Du5!)DH9)`HVOI)M?O7ihI2&Y>@wxBm%vFq-GUrw^6{G7aoytsr9j9ashqwT2IJ
z08B<W2{9c2uAPAf83j&5lp^Q80DZuh=xC5FpdKk6YCZ?-`XG-$cc@b2{2gGy2l-Z_
za^%V^a_ptZ3H<e?L!&|R-Y<>7%5nb((K{ElBXXq=TD2=v>nq+lN$Zzig1(KTL5lj<
zG!KZ5vkQ%@-B?n;gr%_1G;&PSY@$L_84#CqI3Tyxq5WbXwIfAlXw3ssi3{ydKh`&(
z-FoZ*UW@duv?O0$x9ub2XTnbdBw?1sS;`WyQ4+`p&|<Y0flVJ|-aH+)Rl;%yoB+24
z0m<`3RzIusx`1aNMB4Wzf$k~DahA*su<s@%Wn#y`c$P}!xV&kmv_@J=DBsE$&=0gl
rI(6pq(z~%Qy)$34%-l4HzcL^{Fa(DoY%wNs00000NkvXXu0mjfXCT=%

literal 0
HcmV?d00001

diff --git a/pageConsumables/viewrecords.vue b/pageConsumables/viewrecords.vue
index 1c52869..f8f0883 100644
--- a/pageConsumables/viewrecords.vue
+++ b/pageConsumables/viewrecords.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="viewrecordsType">
+	<!-- 	<view class="viewrecordsType">
 		<view style="display: flex;align-items: center;" @tap="popPu">
 			筛选时间<up-icon style="transform: rotate(90deg);" name="play-right-fill" size="12"></up-icon>
 		</view>
@@ -7,6 +7,10 @@
 			{{datas.statusTitle}} <up-icon style="transform: rotate(90deg);" name="play-right-fill" size="12"></up-icon>
 		</view>
 
+	</view> -->
+	<view style="position: fixed;right: 50rpx;top: 80vh;background-color: #fff;border-radius: 50%;width: 65rpx;height: 65rpx;display: flex;align-items: center;justify-content: center;">
+		<image src="./time.png" style="width: 50rpx;height: 50rpx;" @tap="popPu"
+			mode=""></image>
 	</view>
 	<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"
diff --git a/pageStaff/addstaff.vue b/pageStaff/addstaff.vue
index bde3596..bbe2b3a 100644
--- a/pageStaff/addstaff.vue
+++ b/pageStaff/addstaff.vue
@@ -139,6 +139,7 @@
 
 	function gettbPlussShopStaffDetail(id) {
 		tbPlussShopStaffDetail(id).then(res => {
+			console.log(res,'编辑员工后的提示')
 			datas.formData = res
 			if (datas.rolesList) {
 				let rolefilter = datas.rolesList.filter(ele => ele.id == res.roleId)
@@ -266,9 +267,10 @@
 		font-weight: 500;
 		font-size: 32rpx;
 		color: #FFFFFF;
-		margin-top: 50rpx;
-		margin-left: 50%;
-		transform: translateX(-50%);
+		margin: 0 auto;
+		// margin-top: 50rpx;
+		// margin-left: 50%;
+		// transform: translateX(-50%);
 	}
 
 	.bottomBotton2 {
diff --git a/pages/shopSetUp/index.vue b/pages/shopSetUp/index.vue
index d4c8558..91a8e60 100644
--- a/pages/shopSetUp/index.vue
+++ b/pages/shopSetUp/index.vue
@@ -46,7 +46,7 @@
 		<view class="right">	
 			<view>
 				<up-checkbox-group><up-checkbox label="免桌位费" v-model:checked="vdata.isTableFee"  activeColor="#0FC161" shape="circle" @change="isTableFeeChange"> </up-checkbox></up-checkbox-group>
-			</view></up-icon>
+			</view>
 		</view>
 	</view>
 	<view class="page-cell m">