合并代码

pages/NursingNew/component/doctorask/doctorask.vue

@@ -789,7 +789,7 @@
 		justify-content: center;
 		align-items: center;
 		min-width: 89.7vw;
-		height: 96vh;
+		height: 97vh;
 		margin-top: 1vw;
 		flex-direction: column;
 		background-color: #fff;

pages/NursingNew/component/index.vue

@@ -821,9 +821,10 @@
 				display: flex;
 				align-items: center;
 				margin-left: 2vw;
-				font-size: 32rpx;
+				font-size: 34rpx;
 				font-weight: 600;
 				border-bottom: 1px solid #F2F2F2;
+				padding-top: 1vw;
 			}
 
 			.top-list {
@@ -1291,6 +1292,7 @@
 				border: 1px solid #F8F8F8;
 				text-align: center;
 				overflow: hidden;
+				border: 2px solid transparent;
 
 				image {
 					width: 2.6vw;
@@ -1362,7 +1364,7 @@
 		.tittop {
 			height: 2vw;
 			font-weight: 400;
-			font-size: 35rpx;
+			font-size: 34rpx;
 			color: #333333;
 			display: flex;
 			align-items: center;
@@ -1458,7 +1460,7 @@
 			.tittop {
 				height: 2vw;
 				font-weight: 400;
-				font-size: 35rpx;
+				font-size: 34rpx;
 				color: #333333;
 				display: flex;
 				align-items: center;

pages/NursingNew/component/leftcontent/serveswipe.vue

@@ -3,7 +3,7 @@
 		<view class="swipeservwe">
 			<view class="swper" v-if="plsbuy.length==0">
 				<view class="photo-father" style="margin-top: 200rpx;">
-					<image class="big-img" style="width: 250rpx;height: 250rpx;margin-top: 0;"
+					<image class="big-img" style="width: 250rpx;height: 250rpx;margin-top: 50rpx;"
 						:src="`/static/index/noorder1.png`" mode="aspectFill" />
 					<view class="big-img-text">
 						暂无服务指令

pages/NursingNew/component/pleasetake/common/addwl.vue

@@ -11,7 +11,7 @@
 				<view class="more-view">
 					<image src="/static/backmore.png" mode="aspectFill" class="more" v-if="Material.length"
 						@click.stop="backmoreopen=!backmoreopen"></image>
-					<image src="/static/nobackmore.png" mode="aspectFill" v-else class="more" ></image>
+					<image src="/static/nobackmore.png" mode="aspectFill" v-else class="more"></image>
 					<view class="more-view-button" @click.stop v-show="backmoreopen">
 
 						<view class="more-whitebutton" @click="moredex = moredex==1?0:1;backmoreopen=false ">
@@ -495,17 +495,18 @@
 					justify-content: center;
 					align-items: center;
 					flex-direction: column;
+					padding-top: 0.5vw;
 
 					.more-whitebutton {
 						width: 74%;
 						height: 50rpx;
 						border-radius: 10rpx;
-						color: #ababab;
+						color: #a7a7a7;
 						display: flex;
 						justify-content: center;
 						align-items: center;
 						font-size: 26rpx;
-						border: 2rpx solid #BFBFBF;
+						border: 2rpx solid #a7a7a7;
 						margin-bottom: 12rpx;
 					}
 
@@ -567,10 +568,10 @@
 			display: inline-block;
 			width: 296rpx;
 			height: 10.7vw;
-			background: #F9F9F9;
+			background: #fff;
 			border-radius: 1.3vw;
 			margin-right: 18rpx;
-
+			border: 1rpx solid #C3C3C3;
 			position: relative;
 
 			.sl {

pages/NursingNew/component/pleasetake/common/carditem.vue

@@ -256,9 +256,9 @@
 		>view {
 			width: 5vw;
 			height: 2.3vw;
-			background: #E3EEF7;
+			background: #fff;
 			border-radius: 1vw;
-			border: 1px solid rgba(3, 133, 250, 0.34);
+			border: 1px solid #1083F8;
 			font-weight: 400;
 			font-size: 1.25vw;
 			color: #1083F8;
@@ -281,30 +281,33 @@
 	}
 
 	.msitem {
-		width: 11.5vw;
+		width: 24vw;
 		height: 100%;
 		position: absolute;
 		top: 0;
 		left: 15vw;
+		// background-color: blue;
 
 		.msitem-item {
-			width: 25vw;
+			width: 24vw;
-			// background-color: red;
 			margin-top: 10rpx;
 			font-size: 33rpx;
-			white-space: nowrap;
+			display: flex;
-			/* 不换行 */
-			overflow: hidden;
-			/* 超出隐藏 */
-			text-overflow: ellipsis;
-			/* 显示 ... */
 
 			.msitem-item-left {
+				width: 190rpx;
 				color: #777777;
 			}
 
 			.msitem-item-right {
-				margin-left: 10rpx;
+				display: inline-block;
+				/* 或 block，看你布局 */
+				width: 400rpx;
+				/* 注意：要有固定宽度，max-width 有时不够稳 */
+				// box-sizing: border-box;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
 			}
 		}
 

pages/NursingNew/component/pleasetake/common/htditem.vue

@@ -478,16 +478,16 @@
 		}
 
 		.imge {
-			width: 8vw;
+			width: 7vw;
-			height: 8vw;
+			height: 7vw;
 			// margin: 0.3vw auto 0.25vw;
-			margin-top: 0.8vw;
+			margin-top: 2vw;
-			margin-bottom: 0.25vw;
+			margin-bottom: 0.8vw;
 			margin-left: 1.2vw;
-			background: #fff;
+			background: red;
-			padding: 0.2vw;
+			// padding: 0.2vw;
 			// padding: 0.5vw;
-			// margin: 0.3vw auto 0.25vw;
+			// margin: 0.7vw auto 0.3vw;
 
 			border-radius: 1.1vw;
 

pages/NursingNew/component/pleasetake/component/requestform.vue

@@ -1266,9 +1266,9 @@
 	.bignomessage{
 		position: fixed;
 		top: 8.5vh;
-		left: 9.4vw;
+		left: 9.2vw;
-		width: 89vw;
+		width: 89.5vw;
-		height: 89vh;
+		height: 89.6vh;
 		z-index: 100;
 		background-color: #fff;
 		display: flex;

pages/NursingNew/component/pleasetake/component/returnorder.vue

@@ -947,9 +947,9 @@
 	.bignomessage{
 		position: fixed;
 		top: 8.5vh;
-		left: 9.4vw;
+		left: 9.2vw;
-		width: 89vw;
+		width: 89.5vw;
-		height: 89vh;
+		height: 89.5vh;
 		z-index: 100;
 		background-color: #fff;
 		display: flex;

pages/Warehouse/finish.vue

@@ -5,7 +5,7 @@
 			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
 		</view>
 		<!-- 没数据了，遮罩 -->
-		<view class="mengban" style="background: #fff;width:100vw;right:0;left:8vw;top: -5vh;height: 110vh;"
+		<view class="mengban" style="background: #fff;width:89.5vw;left: 9vw;top: 0.8vw;height: 97vh;border-radius: 30rpx;"
 			v-if="nomessageshow">
 			<defaultr cont="暂无数据" style="z-index: 999;"></defaultr>
 		</view>

pages/Warehouse/index/component/index.vue

@@ -578,9 +578,10 @@
 				display: flex;
 				align-items: center;
 				margin-left: 2vw;
-				font-size: 32rpx;
+				font-size: 34rpx;
 				font-weight: 600;
 				border-bottom: 1px solid #F2F2F2;
+				padding-top: 1vw;
 			}
 
 			.top-list {
@@ -1297,7 +1298,7 @@
 				border-radius: 1.6vw;
 				margin: 1.5vw 1.5vw 0 0vw;
 				display: inline-block;
-				border: 1px solid #F8F8F8;
+				border: 1px solid transparent;
 				text-align: center;
 				overflow: hidden;
 
@@ -1371,7 +1372,7 @@
 		.tittop {
 			height: 2vw;
 			font-weight: 400;
-			font-size: 35rpx;
+			font-size: 34rpx;
 			color: #333333;
 			display: flex;
 			align-items: center;

pages/Warehouse/picking.vue

@@ -4,7 +4,7 @@
 			:style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
 			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
 		</view>
-		<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0vw;top: -5vh;height: 110vh;"
+		<view class="mengban" style="background: #fff;width:89.5vw;left: 1vw;top: vw;height: 97vh;border-radius: 30rpx;"
 			v-if="nomessageshow">
 			<defaultr cont="暂无数据" style="z-index: 999;"></defaultr>
 		</view>

pages/login/ceshi.nvue

@@ -0,0 +1,199 @@
+<template>
+	<div class="page">
+		<div class="controls">
+			<div class="row">
+				<button class="btn" @click="generate(2000)">生成 2000 项</button>
+				<button class="btn" @click="generate(5000)">生成 5000 项</button>
+				<button class="btn" @click="clearList">清空</button>
+			</div>
+			<div class="row">
+				<text class="stat">FPS: {{fpsDisplay}}</text>
+				<text class="stat">平均帧(ms): {{avgFrameMsDisplay}}</text>
+				<text class="stat">items: {{items.length}}</text>
+			</div>
+			<div class="hint">说明：向下快速滚动列表以测试渲染/滚动性能；nvue 将使用原生渲染。</div>
+		</div>
+
+		<scroll-view class="list" :scroll-y="true" show-scrollbar="true" @scroll="onScroll">
+			<div class="item" v-for="item in items" :key="item.id">
+				<div class="thumb" :style="{backgroundColor: item.color}"></div>
+				<div class="meta">
+					<text class="title">Item #{{item.id}}</text>
+					<text class="desc">这是第 {{item.id}} 个条目，用于增加每个 DOM 的复杂度以测试渲染成本。多行文本强制布局多次换行，模拟真实列表。</text>
+				</div>
+			</div>
+		</scroll-view>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				items: [],
+				// FPS 测量
+				measuring: false,
+				fpsDisplay: 0,
+				avgFrameMsDisplay: 0,
+
+				// 内部用
+				_frames: [],
+				_rafId: null,
+				_idleTO: null
+			}
+		},
+		methods: {
+			generate(n) {
+				// 生成带颜色的占位项（避免网络请求）
+				const list = []
+				for (let i = 0; i < n; i++) {
+					list.push({
+						id: i + 1,
+						color: this._randColor()
+					})
+				}
+				this.items = list
+				// 清除测量结果
+				this.fpsDisplay = 0
+				this.avgFrameMsDisplay = 0
+			},
+			clearList() {
+				this.items = []
+				this.fpsDisplay = 0
+				this.avgFrameMsDisplay = 0
+			},
+			_randColor() {
+				const h = Math.floor(Math.random() * 360)
+				const s = 60 + Math.floor(Math.random() * 20)
+				const l = 55 + Math.floor(Math.random() * 10)
+				return `hsl(${h} ${s}% ${l}%)`
+			},
+
+			// 滚动回调（来自原生 nvue scroll-view）
+			onScroll(e) {
+				// 每次 scroll 事件触发时重置空闲计时器
+				// 开始/继续测量 FPS
+				if (!this.measuring) this._startMeasure()
+				clearTimeout(this._idleTO)
+				this._idleTO = setTimeout(() => {
+					this._stopMeasure()
+				}, 300)
+			},
+
+			_startMeasure() {
+				this.measuring = true
+				this._frames = []
+				const pushFrame = (t) => {
+					this._frames.push(t)
+					// 保持最近 120 帧
+					if (this._frames.length > 120) this._frames.shift()
+					this._rafId = requestAnimationFrame(pushFrame)
+				}
+				this._rafId = requestAnimationFrame(pushFrame)
+			},
+
+			_stopMeasure() {
+				this.measuring = false
+				if (this._rafId) {
+					cancelAnimationFrame(this._rafId)
+					this._rafId = null
+				}
+				// 计算 FPS 与平均帧时长
+				if (this._frames.length < 2) {
+					this.fpsDisplay = 0
+					this.avgFrameMsDisplay = 0
+					return
+				}
+				const intervals = []
+				for (let i = 1; i < this._frames.length; i++) {
+					intervals.push(this._frames[i] - this._frames[i - 1])
+				}
+				const sum = intervals.reduce((a, b) => a + b, 0)
+				const avg = sum / intervals.length
+				const fps = 1000 / avg
+				this.avgFrameMsDisplay = avg.toFixed(2)
+				this.fpsDisplay = Math.round(fps)
+			}
+		}
+	}
+</script>
+
+<style>
+	.page {
+		flex: 1;
+		background-color: #f5f6fa;
+	}
+
+	.controls {
+		padding: 20px;
+		background: #fff;
+	}
+
+	.row {
+		flex-direction: row;
+		align-items: center;
+		margin-bottom: 10px;
+	}
+
+	.btn {
+		padding: 10px 14px;
+		border-radius: 6px;
+		background: #2d8cf0;
+		color: #fff;
+		margin-right: 10px;
+	}
+
+	.stat {
+		margin-right: 14px;
+		font-size: 28px;
+	}
+
+	.hint {
+		color: #888;
+		font-size: 24px;
+		margin-top: 6px;
+	}
+
+	.list {
+		flex: 1;
+	}
+
+	.item {
+		height: 160px;
+		padding: 12px;
+		flex-direction: row;
+		align-items: center;
+		border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+		background: #fff;
+	}
+
+	.thumb {
+		width: 120px;
+		height: 120px;
+		border-radius: 8px;
+		margin-right: 12px;
+	}
+
+	.meta {
+		flex: 1;
+	}
+
+	.title {
+		font-size: 30px;
+		font-weight: bold;
+		margin-bottom: 8px;
+	}
+
+	.desc {
+		font-size: 24px;
+		color: #666;
+		line-height: 32px;
+	}
+
+	/* ensure full-height page in nvue */
+	page,
+	body,
+	.page {
+		height: 100%;
+	}
+</style>

pages/login/newanimationpage.vue

@@ -158,7 +158,7 @@
 	onShow(() => {
 		setTimeout(() => {
 			playall.value = true;
-		}, 1500)
+		}, 2000)
 
 		zyupgrade.value?.check_update();
 		queryPadPageList().then((res => {

pages/procurement/common/thitem.vue

@@ -236,9 +236,9 @@
 		>view {
 			width: 4.5vw;
 			height: 1.8vw;
-			background: #E3EEF7;
+			background: #fff;
 			border-radius: 0.9vw;
-			border: 1px solid rgba(3, 133, 250, 0.34);
+			border: 1px solid #1083F8;
 			font-weight: 400;
 			font-size: 1.1vw;
 			color: #1083F8;

pages/procurement/common/toryitem.vue

@@ -71,7 +71,7 @@
 				</view>
 				<view class="tan guodu" :class="v.zk?'':'itemhei0'">
 					<view class="tbox guodu" :class="v.zk?'':'itemhei0'" :style="v.zk?'':'overflow: hidden'">
-						<torytor :show="v.yczk" :tb="v.dqkcsl" @pddjjnum="pddjjnum" :pdsl="v.pdsl" :idex="i"
+						<torytor :show="v.yczk" :tb="v.dqkcsl" :pz="v.pz" @pddjjnum="pddjjnum" :pdsl="v.pdsl" :idex="i"
 							:pddType='pddType'></torytor>
 						<view class="bpq" v-show="v.yczk">
 							<view class="bp b" @click="v.bz = !v.bz;v.pz = false">
@@ -178,6 +178,11 @@
 	const valindex = ref(-1);
 
 	const havezk = ref(false)
+	// 点击锁
+	const secondlock = ref(false)
+	// 检测上一次点击
+	const savelastvalue = ref(false)
+	
 	const zhankai = (v, i) => {
 
 		let s = Math.ceil((i + 1) / 3);
@@ -186,11 +191,13 @@
 		}
 		valindex.value = i;
 		scrolltop.value = top.value;
-		// scrolltop.value = Math.ceil(i / 2) * 195;
-		// console.log("啥啊",i)
 		v.zk = !v.zk;
+		savelastvalue.value = v.zk
+		if(savelastvalue.value && v.zk){
+			secondlock.value = true;
+		}
 		havezk.value = v.zk
-		// console.log("头疼啊",havezk.value)
+		
 		if (v.zk) {
 			if (props.pddType == '1') { uni.setStorageSync('valitem', v); }
 			setTimeout(() => {
@@ -344,7 +351,7 @@
 		return y <= (h * 1 / 2);
 	}
 	const isbottom = ref(false);
-	// const clicklock = ref(false)
+	const clicklock = ref(false)
 	/** 事件处理示例 */
 	function onTap(e) {
 		const top = isTopHalfApp(e);
@@ -354,23 +361,24 @@
 		}
 		if (havezk.value) {
 			// console.log("top", top, clicklock.value)
-			// if (!clicklock.value) {
+			if (!clicklock.value || secondlock.value ) {
-			// 	if (!top) {
-			// 		isbottom.value = true
-			// 		// console.log("开启了")
-			// 	} else {
-			// 		isbottom.value = false
-			// 	}
-			// 	clicklock.value = true
-			// } 
 				if (!top) {
 					isbottom.value = true
 					// console.log("开启了")
 				} else {
 					isbottom.value = false
 				}
+				clicklock.value = true;
+				secondlock.value = false;
+			} 
+			// if (!top) {
+			// 	isbottom.value = true
+			// 	// console.log("开启了")
+			// } else {
+			// 	isbottom.value = false
+			// }
 		} else {
-			// clicklock.value = false
+			clicklock.value = false
 		}
 
 		// uni.showToast({ title: top ? '上半部分' : '下半部分', icon: 'none' });
@@ -591,13 +599,13 @@
 
 									text {
 										font-weight: 400;
-										font-size: 0.7vw;
+										font-size: 1vw;
 										color: #78B1EB;
 									}
 
 									image {
-										width: 2.3vw;
+										width: 2.8vw;
-										height: 2.3vw;
+										height: 2.8vw;
 									}
 								}
 
@@ -613,8 +621,6 @@
 							width: 100%;
 							padding-left: 2.4vw;
 						}
-
-
 					}
 
 					.gray-bgc {
@@ -622,7 +628,7 @@
 						width: 28vw;
 						height: 12vw;
 						border-radius: 2vw;
-						box-shadow: 0rpx 0rpx 5rpx 0rpx rgba(116, 141, 164, 0.22);
+						box-shadow: 0rpx 0rpx 5rpx 0rpx rgba(116, 141, 164, 0.6);
 						position: absolute;
 						bottom: 3.6vw;
 						left: 1vw;
@@ -668,7 +674,7 @@
 						border-radius: 1.3vw;
 						border: 1px solid rgba(3, 133, 250, 0.34);
 						right: 3.2vw;
-						top: 0vw;
+						top: 1vw;
 						position: absolute;
 						font-weight: 400;
 						font-size: 1.4vw;
@@ -890,7 +896,7 @@
 						justify-content: center;
 						align-items: center;
 						font-weight: 400;
-						font-size: 1.2vw;
+						font-size: 1vw;
 						color: #555555;
 						padding: 0 0.6vw;
 

pages/procurement/common/torytor.vue

@@ -3,16 +3,16 @@
 		<view class="jsuq guodu" v-if="show">
 			<view class="leftsa">
 				<view class="shu">数量</view>
-				<view class="stringShow-kuai">
+				<view :class="pddType!='3'? `stringShow-kuai`:`stringShow-kuai-bad`">
 					<view v-for="(item,index) in stringShow" :key="index">
 						{{item}}
 					</view>
 				</view>
 				<view class="jiajian">
-					<view class="jj" @click="jjnum(-1)" @touchstart="handleTouchStart(-1)" @touchend="handleTouchEnd">
+					<view :class="pddType!='3'? `jj`:`jj-bad`" @click="jjnum(-1)" @touchstart="handleTouchStart(-1)" @touchend="handleTouchEnd">
 						-
 					</view>
-					<view class="jj" @click="jjnum(1)" @touchstart="handleTouchStart(1)" @touchend="handleTouchEnd">
+					<view :class="pddType!='3'? `jj`:`jj-bad`" @click="jjnum(1)" @touchstart="handleTouchStart(1)" @touchend="handleTouchEnd">
 						+
 					</view>
 				</view>
@@ -20,16 +20,16 @@
 			<view class="rigsbt">
 				<view class="calculator-father">
 					<view v-for="(item,index) in calculatorArray" :key="index">
-						<view class="calculator-kuai" v-if="item==`AC`" @click="clickKuai(item,index)">
+						<view :class="pddType!='3'?`calculator-kuai`:`calculator-kuai-bad`" v-if="item==`AC`" @click="clickKuai(item,index)">
 							<image src="/static/cleanone.png" mode="aspectFill"
 								style="width: 50%;height: 50%;margin-left: -5rpx;"></image>
 
 						</view>
-						<view class="calculator-kuai" v-else-if="item==`AE`" style="font-size: 1.2vw;color: #0385FA;"
+						<view :class="pddType!='3'?`calculator-kuai`:`calculator-kuai-bad`" v-else-if="item==`AE`" style="font-size: 1.2vw;color: #0385FA;"
 							@click="clickKuai(item,index)">
 							同步
 						</view>
-						<view class="calculator-kuai" v-else @click="clickKuai(item,index)">
+						<view :class="pddType!='3'?`calculator-kuai`:`calculator-kuai-bad`" v-else @click="clickKuai(item,index)">
 							{{item}}
 						</view>
 
@@ -62,7 +62,10 @@
 		},
 		pddType: {
 			type: String
-		}
+		},
+		// pz:{
+		// 	// type: Boolean
+		// },
 	});
 	watch(() => props.show,
 		() => {
@@ -175,7 +178,7 @@
 		height: 16vw;
 		justify-content: space-between;
 		// background-color: red;
-		margin-top: -2vw;
+		margin-top: -1.5vw;
 
 		.rigsbt {
 			width: 19vw;
@@ -196,7 +199,6 @@
 					display: flex;
 					justify-content: center;
 					align-items: center;
-					// background: url('/static/index/procurement/bt.png') no-repeat;
 					background-color: #F3F5F9;
 					border-radius: 30rpx;
 					background-size: 100% 100%;
@@ -219,6 +221,20 @@
 					width: 5vw;
 					height: 4vw;
 				}
+				.calculator-kuai-bad{
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					background-color: #F3F5F9;
+					color: #999;
+					border-radius: 30rpx;
+					background-size: 100% 100%;
+					font-size: 1.5vw;
+					font-weight: 500;
+					width: 5vw;
+					height: 4vw;
+					opacity: 0.6;
+				}
 			}
 		}
 
@@ -245,9 +261,35 @@
 				height: 3.4vw;
 				background: #F3F5F9;
 				border-radius: 1vw;
+				// color: #999;
+				color: black;
 				border: 1px solid #CBCFD0;
 				justify-content: space-around;
 				box-shadow: 0rpx 0.1vw 0.3vw 0rpx rgba(140, 143, 153, 0.17) inset;
+				opacity: 0.6;
+
+				view {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 1.7vw;
+					font-weight: 500;
+					width: 2.2vw;
+					height: 3.4vw;
+				}
+			}
+			.stringShow-kuai-bad {
+				display: flex;
+				align-items: center;
+				width: 9vw;
+				height: 3.4vw;
+				background: #F3F5F9;
+				border-radius: 1vw;
+				color: #999;
+				border: 1px solid #CBCFD0;
+				justify-content: space-around;
+				box-shadow: 0rpx 0.1vw 0.3vw 0rpx rgba(140, 143, 153, 0.17) inset;
+				opacity: 0.6;
 			
 				view {
 					display: flex;
@@ -260,10 +302,26 @@
 				}
 			}
 			
+
 			.jiajian {
 				display: flex;
 				justify-content: space-between;
 				
+				.jj-bad{
+					width: 4.2vw;
+					height: 4.2vw;
+					margin: 0 1vw;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					color: #999;
+					background: url('/static/index/procurement/bt.png') no-repeat;
+					background-size: 100% 100%;
+					border-radius: 25rpx;
+					font-size: 36rpx;
+					opacity: 0.6;
+				}
+
 				.jj {
 					width: 4.2vw;
 					height: 4.2vw;

pages/procurement/components/Inventory.vue

@@ -246,9 +246,9 @@
 			>view {
 				width: 4.5vw;
 				height: 1.8vw;
-				background: #E3EEF7;
+				background: #fff;
 				border-radius: 0.9vw;
-				border: 1px solid rgba(3, 133, 250, 0.34);
+				border: 1px solid #1083F8;
 				font-weight: 400;
 				font-size: 1.1vw;
 				color: #1083F8;

pages/procurement/components/calculator.vue

@@ -15,8 +15,7 @@
 				:style="`height: ${(gysarr && gysarr.length*8) || 0}vh`">
 				<scroll-view scroll-y="true" class="gysscrol" v-if="gysflag">
 					<view v-for="(v,i) in gysarr" :key='i' :class="gysidnum==i?'acts':''" @click="gysid(i)">
-						<text>{{v.name}}</text>
+						<text class="tab-view">{{ v.name }}</text>
-						<!-- <image src="/static/index/procurement/d.png" mode="aspectFill"></image> -->
 					</view>
 				</scroll-view>
 			</view>
@@ -39,12 +38,13 @@
 
 			</view>
 		</view>
-		<view class="qinggou-font">
+		<view class="tlt" style="width: 96%;margin-top: 30rpx;margin-bottom: 10rpx;">采购数量 <text style="color: red;"
+				v-if="sx==true">超过库存上限！</text></view>
+		<!-- <view class="qinggou-font">
 			采购数量 <text style="color: red;" v-if="sx==true">超过库存上限！</text>
-		</view>
+		</view> -->
 		<view class="stringShow-father">
-			<view class="jj" @click="jjnum(-1)" @touchstart="clickstart(-1)"
+			<view class="jj" @click="jjnum(-1)" @touchstart="clickstart(-1)" @touchend="handleTouchEnd">
-				@touchend="handleTouchEnd">
 				-
 			</view>
 			<view class="stringShow-kuai">
@@ -398,8 +398,8 @@
 		height: 3.3vw;
 		justify-content: space-between;
 		align-items: center;
-		margin: 0.8vw  0;
+		margin: 1.2vw 0;
-		
+		margin-left: 1.1vw;
 		background: #F3F5F9;
 		border-radius: 1.1vw;
 		padding: 0 1vw;
@@ -526,8 +526,7 @@
 
 		>.tanchu {
 			width: 26vw;
-			max-height: 35vh;
+			// max-height: 35vh;
-			background: #FFFFFF;
 			box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(174, 175, 176, 0.35);
 			border-radius: 1.1vw;
 			padding: 0 1vw;
@@ -535,6 +534,7 @@
 			left: 4vw;
 			top: 6.5vw;
 			z-index: 211;
+			background-color: #fff;
 
 			.gysscrol {
 				width: 100%;
@@ -550,20 +550,14 @@
 
 				view {
 					display: flex;
-					justify-content: space-between;
 					align-items: center;
-					// justify-content: center;
 					font-weight: 400;
 					font-size: 1.5vw;
 					color: #666666;
-					height: 8vh;
+					// height: 8vh;
-					// margin-bottom: 1.2vw;
-					// padding-right: 1.5vw;
 					position: relative;
-
+					// padding: 0 30rpx;
-					&:nth-child(1) {
+					margin: 20rpx 0;
-						// margin-top: 1.2vw;
-					}
 
 					image {
 						position: absolute;
@@ -580,7 +574,7 @@
 		}
 
 		.gssel {
-			width: 26vw;
+			width: 27vw;
 			display: flex;
 			height: 3.3vw;
 			justify-content: space-between;
@@ -611,28 +605,21 @@
 				overflow: hidden;
 				text-overflow: ellipsis;
 				font-weight: 400;
-				font-size: 1.6vw;
+				font-size: 1.5vw;
 				color: #555555;
 				line-height: 3.3vw;
 			}
 		}
 
-		.tlt {
+
-			font-weight: bold;
-			font-size: 1.5vw;
-			color: #333333;
-			padding-left: 3vw;
-			font-weight: 400;
-			margin-bottom: 30rpx;
-		}
 	}
 
 	.plsbuy-contain {
 		display: flex;
 		align-items: center;
 		flex-direction: column;
-		width: 34vw;
+		width: 33vw;
-		height: 95vh;
+		height: 91vh;
 		background: rgba(250, 251, 252, 1);
 		overflow: hidden;
 		box-shadow: 0rpx 0rpx 1.6vw 0rpx rgba(136, 141, 153, 0.28);
@@ -646,8 +633,8 @@
 
 
 	.plsbuy-bottom {
-		width: 75%;
+		width: 90%;
-		margin-top: 3vw;
+		margin-top: 0.5vw;
 		height: 7vw;
 		display: flex;
 		justify-content: flex-end;
@@ -667,26 +654,29 @@
 		}
 
 		.quxiao {
-			min-width: 8vw;
+			width: 160rpx;
-			height: 3.8vw;
+			height: 75rpx;
-			background: #EDEDEF;
+			background-color: #ebeced;
-			border-radius: 1.9vw;
-			padding: 0 2vw;
-			margin-left: 1vw;
-			border: 1px solid #EDEDEF;
-			font-size: 1.8vw;
-			font-weight: 400;
 			color: #888888;
-			white-space: nowrap;
 			display: flex;
 			justify-content: center;
 			align-items: center;
+			font-size: 30rpx;
+			border-radius: 40rpx;
 		}
 
 		.plsbuy-bottom-blue {
-			background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
+			width: 160rpx;
-			border: 1px solid rgba(3, 133, 250, 0.34);
+			height: 75rpx;
 			color: #0385FA;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 30rpx;
+			border-radius: 40rpx;
+			border: 1rpx solid #0385FA;
+			background: linear-gradient(to bottom, #E9F4FF, #CAE0F9);
+			margin: 0 40rpx;
 		}
 	}
 
@@ -730,6 +720,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
+		margin-left: 0.8vw;
 
 		.jj {
 			width: 5vw;
@@ -765,7 +756,8 @@
 			border-radius: 1vw;
 			border: 1px solid #CBCFD0;
 			justify-content: space-around;
-			box-shadow: 0rpx 0.1vw 0.3vw 0rpx rgba(140, 143, 153, 0.17) inset;
+			padding: 0 1vw;
+			// box-shadow: 0rpx 0.1vw 0.3vw 0rpx rgba(140, 143, 153, 0.17) inset;
 
 			view {
 				display: flex;
@@ -800,4 +792,21 @@
 		-webkit-transform-style: preserve-3d;
 		-webkit-overflow-scrolling: touch;
 	}
+
+	.tab-view {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		word-break: break-word;
+	}
+
+	.tlt {
+		font-weight: bold;
+		font-size: 34rpx;
+		color: #333333;
+		padding-left: 3vw;
+		font-weight: 400;
+		margin-bottom: 30rpx;
+	}
 </style>

pages/procurement/components/carditem.vue

@@ -269,9 +269,9 @@
 			>view {
 				width: 5.5vw;
 				height: 2.2vw;
-				background: #E3EEF7;
+				background: #fff;
 				border-radius: 0.9vw;
-				border: 1px solid rgba(3, 133, 250, 0.34);
+				border: 1px solid #1083F8;
 				font-weight: 400;
 				font-size: 1.4vw;
 				color: #1083F8;

pages/procurement/components/carlist.vue

@@ -48,13 +48,13 @@
 							<view>
 								<text>采购单位: {{v.wlUnits}}</text>
 							</view>
-							<view style="margin-top: 30rpx;" >
+							<view style="margin-bottom: 0;">
-								<text>供应商: {{v.suppliersName}}</text>
+								<!-- <text>供应商: {{v.suppliersName}}</text> -->
 							</view>
 							<view>
 
 								<view class="three-one">
-									<text style="margin-left: 35rpx;">{{v.kcsl?v.kcsl:'0'}}</text>
+									<text style="margin-left: 42rpx;">{{v.kcsl?v.kcsl:'0'}}</text>
 									<text>库存数量</text>
 									<view class="three-shu">
 
@@ -72,6 +72,10 @@
 									<text>↓ 物料下限</text>
 								</view>
 							</view>
+							<view class="gongyingshang">
+								供应商: {{v.suppliersName}}
+							</view>
+							<!-- 供应商: {{v.suppliersName}} -->
 						</view>
 						<view class="add" @click.stop="clkzk(v,index)">
 							<image class="guodu" :style="v.zk?'transform: rotate(180deg);':''"
@@ -283,7 +287,7 @@
 				width: 7vw;
 				height: 100%;
 				font-weight: 400;
-				font-size: 1.8vw;
+				font-size: 1.6vw;
 				display: flex;
 				justify-content: center;
 				align-items: center;
@@ -367,13 +371,12 @@
 				// margin-top: 0.25vw;
 
 				&:nth-child(7) {
-					width: 25vw;
+					width: 27vw;
-					// height: 2.5vw;
 					display: flex;
-					// justify-content: space-between;
 					position: relative;
-					left: -1.3vw;
+					left: -2vw;
-					top: 3.5vw;
+					margin-bottom: 2vw;
+					// top: 3.5vw;
 
 					.three-one {
 						width: 33%;
@@ -385,7 +388,7 @@
 						// text-align: center;
 						position: relative;
 
-						.three-shu{
+						.three-shu {
 							position: absolute;
 							right: 0;
 							top: 50%;
@@ -394,13 +397,14 @@
 							width: 2rpx;
 							background-color: #dddddd;
 						}
+
 						// background-color: red;
 					}
 
 					text {
 						&:nth-child(1) {
 							font-weight: bold;
-							font-size: 1.7vw;
+							font-size: 1.8vw;
 							color: #555555;
 						}
 
@@ -410,39 +414,17 @@
 							color: #999999;
 							text-align: center;
 						}
-					
-
-					// >view {
-					// 	width: 33%;
-					// 	height: 100%;
-					// 	display: flex;
-					// 	flex-direction: column;
-					// 	position: relative;
-					// 	align-items: center;
-
-					// 	border-right: 2rpx solid #c3c3c3;
-					// 	// background-color: blue;
-					// 	// border: 2rpx solid black;
-
-					// 	// &:nth-child(1) {
-					// 	// 	text-align: center;
-					// 	// }
-					// 	&:nth-child(1) &:nth-child(2),
-					// 	&:nth-child(3),
-					// 	{
-					// 	border-right: 0;
-					// 	text-align: center;
-					// }
-
-
 					}
 				}
 
+
+
 				&:nth-child(2),
 				&:nth-child(3),
 				&:nth-child(4),
 				&:nth-child(5),
 				&:nth-child(6),
+
 				{
 				display: flex;
 				justify-content: space-between;
@@ -460,6 +442,8 @@
 					text-overflow: ellipsis;
 					/* 显示省略号 */
 				}
+
+
 			}
 
 			&:nth-child(6) {
@@ -483,7 +467,7 @@
 				>view {
 					width: 19vw;
 					height: 2vw;
-				font-weight: bold;
+					font-weight: 800;
 					font-size: 1.8vw;
 					color: #222222;
 					text-overflow: ellipsis;
@@ -501,17 +485,36 @@
 		}
 	}
 
-	// .spleft{
+	.gongyingshang {
-	// 	margin-left: -15vw !important;
+		margin-top: -10rpx;
-	// }
+		  width: 500rpx;                /* 你原来的宽度 */
+		  font-size: 1.4vw;         /* 建议不要用 vw 混用 */
+		  line-height: 1.2;            /* 行高（数字形式也可以），用于计算 */
+		  color: #a9a9a9;
+		  font-weight: 400;
+		
+		  /* 多行省略核心 */
+		  display: -webkit-box;
+		  -webkit-box-orient: vertical;
+		  -webkit-line-clamp: 2;
+		  overflow: hidden;
+		  text-overflow: ellipsis;     /* 单行兼容项 */
+		
+		  /* 兼容与保底 */
+		  word-break: break-word;
+		  white-space: normal;         /* 确保允许换行 */
+		  min-width: 0;                /* 如果父容器是 flex 必需 */
+		  max-height: calc(1.4 * 2 * 1em); /* 额外保底（可选） */
+	}
+
 	.speitem {
 		width: 17vw;
 		height: 100%;
 		display: inline-flex;
 		flex-direction: column;
-		justify-content: center;
+		// justify-content: center;
 		position: relative;
-		top: -4vw;
+		top: -8.2vw;
 		// background-color: red;
 
 		.cardp {
@@ -519,7 +522,7 @@
 			padding-left: 1vw;
 			height: 4vw;
 			display: flex;
-			margin-top: 3vw;
+			// margin-top: 3vw;
 			// flex-direction: column;
 			// align-items: center;
 			flex-wrap: wrap;
@@ -556,6 +559,7 @@
 					align-items: center;
 
 				}
+
 				&:nth-child(3) {
 					max-width: 12vw;
 					// color: red;

pages/procurement/components/default.vue

@@ -39,7 +39,7 @@
 		bottom: 0.5vw;
 		left: 0;
 		font-weight: 300;
-		font-size: 1.4vw;
+		font-size: 1.3vw;
 		color: #555555;
 	}
 }

pages/procurement/components/details.vue

@@ -247,9 +247,9 @@
 			>view {
 				width: 4.5vw;
 				height: 1.8vw;
-				background: #E3EEF7;
+				background: #fff;
 				border-radius: 0.9vw;
-				border: 1px solid rgba(3, 133, 250, 0.34);
+				border: 1px solid #1083F8;
 				font-weight: 400;
 				font-size: 1.1vw;
 				color: #1083F8;

pages/procurement/components/purorder.vue

@@ -248,19 +248,21 @@
 <style scoped lang="less">
 	.anniubtn {
 		width: 100%;
-		height: 7vw;
+		height: 4vw;
 		display: flex;
 		justify-content: flex-end;
-		align-items: center;
+		// align-items: center;
+		// background-color: red;
+		padding-top: 1vw;
 
 		.gb {
-			width: 10vw;
+			width: 7vw;
 			background: #EDEDEF;
 			color: #888888;
 		}
 
 		.scsgd {
-			width: 12vw;
+			width: 9vw;
 			background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
 			border: 1px solid rgba(3, 133, 250, 0.34);
 			color: #0385FA;
@@ -273,7 +275,7 @@
 			margin-right: 1.5vw;
 			border-radius: 1.6vw;
 			font-weight: 400;
-			font-size: 1.6vw;
+			font-size: 1.4vw;
 			height: 3.8vw;
 		}
 	}
@@ -302,10 +304,9 @@
 			height: 100%;
 			background: #fff;
 
-
 			.crdcroll {
 				width: 100%;
-				height: calc(90vh - 9.5vw);
+				height: calc(90vh - 7.5vw);
 				margin-top: 1.5vw;
 			}
 

pages/procurement/inventory.vue

@@ -130,7 +130,7 @@
 				</view>
 
 			</scroll-view>
-			<view class="all-nomessage"  v-if="plsbuy.length==0" >
+			<view class="all-nomessage"  v-if="!plsbuy.length" >
 				<image src="/static/index/procurement/que.png" mode="aspectFill"></image>
 				<view>暂无数据</view>
 			</view>
@@ -1265,11 +1265,11 @@
 		color: #999;
 	}
 	.all-nomessage{
-		width: 89vw;
+		width: 89.5vw;
-		height: 55.2vw;
+		height: 56vw;
 		position: fixed;
-		top: 6vw;
+		top: 5.5vw;
-		left: 9.5vw;
+		left: 9.2vw;
 		// transform: translate(-50%,-50%);
 		background-color: #fff;
 		border-radius: 40rpx;

pages/procurement/material.vue

@@ -887,16 +887,16 @@
 			.sl {
 				// min-width: 1.2vw;
 				height: 1.8vw;
-				background: #E3EEF7;
+				background: #fff;
-				border-radius: 40%;
+				border-radius: 50%;
-				border: 1px solid rgba(3, 133, 250, 0.34);
+				border: 1px solid #666;
 				font-weight: 400;
-				font-size: 1.1vw;
+				font-size: 0.9vw;
-				color: #1083F8;
+				color: #666;
 				text-align: center;
 				line-height: 1.75vw;
 				position: absolute;
-				padding: 0 0.8vw;
+				padding: 0 0.6vw;
 				top: 0.8vw;
 				right: 0.8vw;
 			}
@@ -904,9 +904,9 @@
 			.ytj {
 				width: 4.5vw;
 				height: 1.8vw;
-				background: #E3EEF7;
+				background: #fff;
 				border-radius: 0.9vw;
-				border: 1px solid rgba(3, 133, 250, 0.34);
+				border: 1px solid #1083F8;
 				font-weight: 400;
 				font-size: 1.1vw;
 				color: #1083F8;
@@ -1171,17 +1171,18 @@
 					justify-content: center;
 					align-items: center;
 					flex-direction: column;
+					padding-top: 0.5vw;
 
 					.more-whitebutton {
 						width: 74%;
 						height: 50rpx;
 						border-radius: 10rpx;
-						color: #ababab;
+						color: #a7a7a7;
 						display: flex;
 						justify-content: center;
 						align-items: center;
 						font-size: 26rpx;
-						border: 2rpx solid #BFBFBF;
+						border: 2rpx solid #a7a7a7;
 						margin-bottom: 15rpx;
 					}
 

pages/procurement/materialcar.vue

@@ -479,12 +479,12 @@
 		transform: translateY(-50%);
 	}
 	.white-nomessage{
-		width: 89%;
+		width: 89.5%;
-		height: 88%;
+		height: 88.5%;
 		background-color: #fff;
 		position: absolute;
 		top: 9.5%;
-		left: 9.5%;
+		left: 9.2%;
 		border-radius: 30rpx;
 		// z-index: 10;
 	}

pages/procurement/outbound.vue

@@ -31,7 +31,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0vw;top:-5vw;height: 110vh;"
+			<view class="mengban" style="background: #fff;width:89.5vw;left: 1vw;top: vw;height: 97vh;border-radius: 30rpx;"
 				v-if="nomessageshow">
 				<defaultr cont="暂无数据" style="z-index: 999;margin: auto;"></defaultr>
 			</view>
@@ -1189,13 +1189,14 @@
 			width: 65.5%;
 			margin-left: 1%;
 			height: 97%;
+			
 			background-color: #fff;
 			border-radius: 40rpx;
 			position: relative;
 
 			.right-contain {
 				width: 100%;
-				height: 95%;
+				height: 96%;
 				margin-top: 20rpx;
 				display: flex;
 				flex-wrap: wrap;
@@ -1225,9 +1226,9 @@
 
 					.right-one {
 						width: 592rpx;
-						height: 365rpx;
+						height: 366.5rpx;
 						margin-left: 20rpx;
-						margin-bottom: 15rpx;
+						margin-bottom: 20rpx;
 						background-color: #fff;
 						border-radius: 30rpx;
 						display: flex;

pages/procurement/retstock.vue

@@ -1016,8 +1016,8 @@
 		justify-content: center;
 		align-items: center;
 		min-width: 89.7vw;
-		height: 96vh;
+		height: 96.5vh;
-		margin-top: 1vw;
+		margin-top: 0.2vw;
 		flex-direction: column;
 		background-color: #fff;
 		margin-left: 1vw;