耗材问题修复

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;

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;

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"