合并

pages/procurement/common/thitem.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<scroll-view scroll-y="true" class="itembox" scroll-with-animation @scrolltolower="scrolltolower()" enable-back-to-top>
+		<scroll-view scroll-y="true" class="itembox" scroll-with-animation @scrolltolower="scrolltolower()"
+			enable-back-to-top>
 			<view class="box">
 				<view class="fler" v-for="(v,index) in InvoicingList" :key="index">
 					<scroll-view class="carditem guodu" @touchend="handleTouchEnd($event,v,index)"
@@ -10,7 +11,8 @@
 							<image src="/static/index/procurement/zd.png" mode="aspectFill"></image>
 						</view>
 						<view class="speitem guodu">
-							<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
+							<image
+								:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
 								mode="aspectFill">
 							</image>
 							<view class="cardp">
@@ -39,9 +41,14 @@
 						</view>
 						<view class="add">
 							<view v-if="v.isAdd==1">已添加</view>
+
 							<!-- <image v-if="v.isAdd!=1" :src="'/static/index/procurement/+.png'" mode="aspectFill"></image>
 							<image v-if="v.isAdd==1" :src="'/static/index/procurement/-.png'" mode="aspectFill"></image> -->
 						</view>
+						<view class="nextadd" @click.stop="clkzk(v,index)">
+							<image class="guodu" :style="v.zk?'transform: rotate(180deg);':''"
+								:src="'/static/index/procurement/l.png'" mode="aspectFill"></image>
+						</view>
 						<view class="zkadd guodu" v-if="status<2">
 							<view @click.stop="comfig(v,index,1)" @touchend.stop>
 								添加物料
@@ -49,7 +56,8 @@
 						</view>
 					</scroll-view>
 				</view>
-				<defaultr cont="暂无数据" v-if="InvoicingList.length==0 " style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
+				<defaultr cont="暂无数据" v-if="InvoicingList.length==0 "
+					style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
 			</view>
 		</scroll-view>
 		<taking :show="tuihuoshow" :objtake="tuihuoobj" @fill="tuihuoshow = false" @right="right"></taking>
@@ -81,6 +89,25 @@
 	const pageX = ref(0);
 	const pageY = ref(0);
 	const ones = ref(true)
+	const clkzk = (v : any, i : number) => {
+		if(v.zk==true){
+			v.zk = false;
+			v.scrollleft =0.01
+			setTimeout(()=>{
+				v.scrollleft = 0
+			},20)
+			
+		}else{
+			v.zk = true;
+			v.scrollleft =149.99
+			setTimeout(()=>{
+				v.scrollleft = 150;
+			},20)
+			
+		}
+		solleft(v,i)
+		 
+	}
 	const touchstart = (event : any, v : any, i : number) => {
 		caigouobj.value = v;
 		pageX.value = event.changedTouches[0].pageX;
@@ -171,10 +198,12 @@
 		position: absolute;
 		top: 0;
 		right: -9vw;
+
 		view:active {
 			background: rgba(85, 166, 249, 1) !important;
 			color: #FFFFFF !important;
 		}
+
 		>view {
 			width: 3.6vw;
 			height: 100%;
@@ -200,6 +229,7 @@
 		position: absolute;
 		top: 0;
 		right: 0.8vw;
+
 		>view {
 			width: 4.5vw;
 			height: 1.8vw;
@@ -225,12 +255,14 @@
 			right: 0vw;
 		}
 	}
+
 	.msitem {
 		width: 11vw;
 		height: 100%;
 		position: absolute;
 		top: 0;
 		left: 10vw;
+
 		>view {
 			margin-top: 0vw;
 
@@ -239,6 +271,7 @@
 				height: 3.4vw;
 				display: flex;
 				justify-content: space-between;
+
 				>view {
 					width: 50%;
 					height: 100%;
@@ -247,14 +280,17 @@
 					position: relative;
 					margin-top: 1vw;
 					white-space: nowrap;
+
 					&:nth-child(1) {
 						padding-right: 1.7vw;
 						align-items: flex-start;
 					}
+
 					&:nth-child(2) {
 						padding-left: 1.7vw;
 						align-items: flex-start;
 					}
+
 					&:nth-child(1)::after {
 						content: '';
 						position: absolute;
@@ -287,6 +323,7 @@
 				justify-content: space-between;
 				flex-direction: column;
 				margin-top: 0.1vw;
+
 				view {
 					font-size: 1.4vw;
 					color: #888888;
@@ -319,6 +356,7 @@
 			}
 		}
 	}
+
 	.zding {
 		width: 4.6vw;
 		height: 4.6vw;
@@ -326,11 +364,13 @@
 		left: 0;
 		top: 0;
 		z-index: 11;
+
 		image {
 			width: 100%;
 			height: 100%;
 		}
 	}
+
 	.speitem {
 		width: 10vw;
 		height: 100%;
@@ -339,6 +379,7 @@
 		position: absolute;
 		top: 0;
 		left: 0;
+
 		.cardp {
 			width: 8vw;
 			height: 4.2vw;
@@ -347,6 +388,7 @@
 			align-items: center;
 			justify-content: center;
 			flex-direction: column;
+
 			view {
 				min-width: 5.5vw;
 				height: 1.8vw;
@@ -378,6 +420,7 @@
 		padding: 1vw 0.5vw 1vw;
 
 		background: #fff;
+
 		.box {
 			width: 100%;
 			display: flex;
@@ -385,11 +428,13 @@
 			// display: grid;
 			// grid-template-columns: 1fr 1fr;
 		}
+
 		.fler {
 			width: 31.5vw;
 			height: 13vw;
 			margin-bottom: 0.9vw;
 			margin-left: 0.5vw;
+
 			.carditem {
 				width: 31vw;
 				height: 13vw;
@@ -400,4 +445,45 @@
 			}
 		}
 	}
+
+	.nextadd {
+		position: absolute;
+		right: 0;
+		top: -2vw;
+		width: 6vw;
+		height: 17vw;
+		display: inline-flex;
+		justify-content: center;
+		align-items: center;
+
+
+		>view {
+			width: 4.5vw;
+			height: 1.9vw;
+			background: #E3EEF7;
+			border-radius: 0.9vw;
+			border: 1px solid rgba(3, 133, 250, 0.34);
+			font-weight: 400;
+			font-size: 1.1vw;
+			color: #1083F8;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			position: absolute;
+			top: 0vw;
+			right: 0vw;
+		}
+
+		image {
+			width: 3vw;
+			height: 3vw;
+
+		}
+	}
+
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
 </style>

pages/procurement/components/carlist.vue

@@ -108,13 +108,7 @@
 	}
 	const caigouobj = ref({})
 	const clkzk = (v : any, i : number) => {
-		// caigouobj.value = v;
+
-		// caigouobj.value.Limitnum = Number(caigouobj.value?.upperLimit) - Number(caigouobj.value.kcsl);
-		// caigouobj.value.index = i;
-		// caigouobj.value.yj = false;
-		// let n = caigouobj.value.suppliers_dictText.split(/[, ]+/);
-		// let id = caigouobj.value.suppliers.split(/[, ]+/);
-		// let obj = {id:id[0],name:n[0]}
 		if(v.zk==true){
 			v.zk = false;
 			v.scrollleft = 0