From a1024967f357353c85c1031aa78e83d04d2fb8c3 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Thu, 27 Nov 2025 17:26:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/procurement/components/calculator.vue   | 29 +++++++----
 .../procurement/components/classification.vue | 48 +++++++++++--------
 pages/procurement/components/purorder.vue     | 22 ++++++---
 pages/procurement/material.vue                |  7 ++-
 pages/procurement/materialcar.vue             | 29 ++++++++---
 5 files changed, 87 insertions(+), 48 deletions(-)

diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index 8cf0a81..cf049e3 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="plsbuy-contain" v-if="show">
+	<view class="plsbuy-contain guodu"  :class="show?'':'unclass'" :style="showbox?'z-index:220':'z-index:-2'">
 		<view class="gys">
 			<view class="tlt">供应商</view>
 			<view class="gssel" @click="gysflag = true">
@@ -133,6 +133,7 @@
 	// 	}
 	// )
 	const cgdwec = ref(false)
+	const showbox = ref(false)
 	watch(()=>cgdwflag.value,
 		()=>{
 			if(cgdwflag.value==true){
@@ -196,6 +197,9 @@
 				}else{
 					jssl()
 				}
+				setTimeout(()=>{
+					showbox.value = true;
+				},50)
 			}else{
 				gysflag.value = false;
 				cgdwflag.value = false;
@@ -204,6 +208,9 @@
 				sx.value = false;
 				gysidnum.value = 0;
 				isZero.value = false;
+				setTimeout(() => {
+					showbox.value = false;
+				}, 400)
 			}
 	})
 	const jssl=()=>{
@@ -337,6 +344,9 @@
 			height: 0 !important;
 		}
 	}
+	.unclass {
+		opacity: 0 !important;
+	}
 	.cgdw{
 		width: 24.3vw;
 		display: flex;
@@ -344,7 +354,7 @@
 		justify-content: space-between;
 		align-items: center;
 		margin :0.8vw auto 0;
-		background: #F8F8FA;
+		background: #F3F5F9;
 		border-radius: 1.65vw;
 		padding: 0 1vw;
 		position: relative;
@@ -429,6 +439,7 @@
 			align-items: center;
 			justify-content: space-between;
 			white-space: nowrap;
+			height: 3.3vw;
 			view{
 				width: 8.6vw;
 				font-weight: 400;
@@ -455,8 +466,8 @@
 			border-radius: 1.1vw;
 			padding: 0 1.4vw;
 			position: absolute;
-			right: 1vw;
-			top: 7vw;
+			left: 3vw;
+			top: 6.5vw;
 			z-index: 211;
 			.gysscrol{
 				width: 100%;
@@ -499,7 +510,7 @@
 			justify-content: space-between;
 			align-items: center;
 			margin :0.8vw auto 0;
-			background: #F8F8FA;
+			background: #F3F5F9;
 			border-radius: 1.65vw;
 			padding: 0 1vw;
 			text{
@@ -546,7 +557,6 @@
 		top: 2.5vw;
 		left: 32vw;
 		position: fixed;
-		z-index: 200;
 		padding:1.5vw 1vw;
 	}
 
@@ -581,7 +591,7 @@
 	}
 
 	.calculator-father {
-		width: 24vw;
+		width: 25vw;
 		height: 45vh;
 		margin :0 auto 0;
 		flex-wrap: wrap;
@@ -614,6 +624,7 @@
 		margin-top:0.5vw;
 		display: flex;
 		align-items: center;
+		justify-content: center;
 		.jj{
 			width: 5vw;
 			height: 5vw;
@@ -640,7 +651,7 @@
 		.stringShow-kuai {
 			display: flex;
 			align-items: center;
-			width: 18.5vw;
+			width: 11.5vw;
 			height: 5vw;
 			background: #F3F5F9;
 			border-radius: 1vw;
@@ -653,7 +664,7 @@
 				align-items: center;
 				font-size: 42rpx;
 				font-weight: 500;
-				width:3.5vw;
+				width:2.5vw;
 				height: 5vw;
 			} 
 		}
diff --git a/pages/procurement/components/classification.vue b/pages/procurement/components/classification.vue
index ac0b37b..60a32e6 100644
--- a/pages/procurement/components/classification.vue
+++ b/pages/procurement/components/classification.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="ifclass guodu" :class="show?'':'unclass'">
+		<view class="ifclass guodu" :class="show?'':'unclass'" :style="showbox?'z-index:220':'z-index:-2'">
 			<view class="gyss">
 				<view class="lef">供 应 商</view>
 				<view class="set" @click="selt = !selt">
@@ -74,6 +74,8 @@
 
 	const serverUrl = ref('');
 	const selt = ref(false);
+	const showbox = ref(false);
+	
 	const emit = defineEmits(['confirm'])
 	const typescroll = (e : number, i : number, v : object) => {
 		if (e == 1) {
@@ -200,7 +202,14 @@
 		() => props.show,
 		() => {
 			if (props.show == false) {
-				selt.value = false
+				selt.value = false;
+				setTimeout(()=>{
+					showbox.value = false;
+				},400)
+			}else{
+				setTimeout(() => {
+					showbox.value = true;
+				}, 50)
 			}
 		})
 		const xiala = ()=>{
@@ -231,8 +240,8 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-		z-index:125;
-		background: RGBA(239, 240, 244, 0.55);
+		z-index:221;
+		background: RGBA(239, 240, 244, 0);
 	}
 	.gyss {
 		width: 100%;
@@ -247,8 +256,8 @@
 		}
 
 		.xuze {
-			width: 23vw;
-			height: calc(85vh - 22vw);
+			width: 32vw;
+			height: calc(85vh - 20vw);
 			background: #fff;
 			border-radius: 1.6vw;
 			box-shadow: 0rpx 0rpx 1.3vw 0rpx rgba(163, 167, 182, 0.16);
@@ -259,7 +268,7 @@
 
 			.gysscrol {
 				width: 100%;
-				height: calc(85vh - 24vw);
+				height: calc(85vh - 20vw);
 
 				.acts {
 					color: #0385FA !important;
@@ -336,7 +345,7 @@
 	}
 
 	.unclass {
-		top: -86vh !important;
+		opacity: 0 !important;
 	}
 
 	.ifclass {
@@ -349,7 +358,7 @@
 		border-radius: 1.6vw;
 		top: 10vh;
 		left: 32vw;
-		padding: 2.5vw 3vw;
+		padding: 2.5vw 2.5vw;
 
 		.btnbotm {
 			width: 100%;
@@ -394,29 +403,26 @@
 			justify-content: space-around;
 
 			.scrl1 {
-				width: 9vw;
-
-				view {
-					width: 8.8vw;
-				}
-
+				width: 10vw;
 			}
 
 			.scrl2,
 			.scrl3 {
-				width: 8vw;
-
+				width: 10vw;
+				display: flex;
+				justify-content: flex-end;
 				view {
-					width: 7.7vw;
+					width: 8vw;
+					margin-left: 1vw;
 				}
 			}
-
 			.scroll-Y {
-				width: 8.5vw;
+				width: 10vw;
 				height: calc(85vh - 23vw);
 
 				view {
-					width: 100%;
+					min-width: 8.5vw;
+					max-width: 10vw;
 					height: 3.8vw;
 					background: #F5F5F8; 
 					border-radius: 1.9vw;
diff --git a/pages/procurement/components/purorder.vue b/pages/procurement/components/purorder.vue
index 567e206..790d402 100644
--- a/pages/procurement/components/purorder.vue
+++ b/pages/procurement/components/purorder.vue
@@ -202,11 +202,20 @@
 		() => props.show,
 		() => {
 			if (props.show == true) {
-				console.log(props.arrlist)
-				generatedPurchaseViewOrder(props.arrlist).then(res => {
-					console.log(res.result)
-					generatedOrder.value = res.result;
-				})
+				generatedOrder.value = props.arrlist;
+				return
+				// console.log(props.arrlist)
+				// generatedPurchaseViewOrder(props.arrlist).then(res => {
+				// 	console.log(res.result)
+				// 	if(res.success){
+				// 		generatedOrder.value = res.result;
+				// 	}else{
+				// 		uni.showToast({
+				// 			title:res.message,
+				// 			icon:'none'
+				// 		})
+				// 	}
+				// })
 			}
 		}
 	)
@@ -234,7 +243,7 @@
 		timerflag.value = false;
 		generatedPurchaseOrder(generatedOrder.value).then(res => {
 			uni.showToast({
-				icon: res.success ? 'success' : 'error',
+				icon: res.success ? 'success' : 'none',
 				title: res.message
 			})
 			setTimeout(() => {
@@ -243,7 +252,6 @@
 					timerflag.value = true;
 				}
 			}, 700)
-
 		})
 	}
 </script>
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 2dcce49..5ba8225 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -650,9 +650,8 @@
 						margin-top: 10px;
 					}
 				}
-
 				&:nth-child(2) {
-					right: 4.5vw;
+					right: 4.2vw;
 					z-index: 3;
 				}
 
@@ -754,7 +753,7 @@
 			input {
 				width: 25vw;
 				height: 3.3vw;
-				font-size: 1.5vw;
+				font-size: 1.4vw;
 				padding-left: 1.6vw;
 				
 			}
@@ -797,7 +796,7 @@
 			align-items: center;
 			width: 7.3vw;
 			height: 3.3vw;
-			margin: 0 0 0 1.2vw;
+			margin: 0 0 0 0.7vw;
 			background: rgba(255, 255, 255, 0.6);
 			border: 1px solid #D9DADC;
 			color: #555555;
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index 903a679..a6778ec 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -50,14 +50,14 @@
 		<view class="mengban" v-if="addflag" @click="addflag = false"></view>
 		<calculator :show="addflag"  :caigouobj="caigouobj"  @colse="addflag = false" @right="right"></calculator>
 		<view class="mengban" v-if="caigouflag" @click="caigouflag = false"></view>
-		<purorder :arrlist="caigouarr" :show="caigouflag" @cloe="caigouflag = false" @config="configr"></purorder>
+		<purorder :arrlist="generatedOrder" :show="caigouflag" @cloe="caigouflag = false" @config="configr"></purorder>
 	</view>
 </template>
 
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps ,defineComponent} from 'vue';
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
-	import {eddShoppingCartList, queryShoppingCartList, getGwcMaterialTreeData, queryNuInfoByNuId, updateKfstatus,deleteQgInfoById,emptiedQgInfo ,queryWlInfoByWlId,generatedPurchaseOrder,generatedPurchaseViewOrder } from './api/lunpan.js'
+	import {generatedPurchaseViewOrder,eddShoppingCartList, queryShoppingCartList, getGwcMaterialTreeData, queryNuInfoByNuId, updateKfstatus,deleteQgInfoById,emptiedQgInfo ,queryWlInfoByWlId,generatedPurchaseOrder } from './api/lunpan.js'
 	import carlist from './components/carlist.vue';
 	import tanchuang from './components/tanchuang.vue';
 	import classification from './components/classification.vue'
@@ -82,6 +82,7 @@
 	 const status = ref('loading')
 	 const open = ref(0)
 	 onShow(()=>{
+		 InvoicingList.value = [];
 		 queryInvo()
 	 })
 	 const classication = ref<InstanceType<typeof ChildComponent>>()
@@ -227,8 +228,11 @@
 		}
 		const caigouflag = ref(false)
 		const caigouarr = ref([])
+		const generatedOrder = ref([])
 		const caigouclk =()=>{
+			uni.showLoading()
 			let arr = [];
+			caigouarr.value = [];
 			InvoicingList.value.forEach(item=>{
 				if(item.flag){
 					arr.push(item)
@@ -242,7 +246,18 @@
 				})
 				return
 			}
-			caigouflag.value = true;
+			generatedPurchaseViewOrder(caigouarr.value).then(res=>{
+				if(res.success){
+					generatedOrder.value = res.result;
+					caigouflag.value = true;
+					uni.hideLoading();
+				}else{
+					uni.showToast({
+						title:res.message,
+						icon:'none'
+					})
+				}
+			})
 		}
 </script>
 
@@ -280,7 +295,7 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				margin-left:0.6vw;
+				margin-left:0.7vw;
 				color: #555555;
 				border: 1px solid #D9DADC;
 				image {
@@ -307,7 +322,7 @@
 			input {
 				width: 25vw;
 				height: 3.3vw;
-				font-size: 1.5vw;
+				font-size: 1.4vw;
 				padding-left: 1.6vw;
 				
 			}
@@ -347,7 +362,7 @@
 			align-items: center;
 			width: 7.3vw;
 			height: 3.3vw;
-			margin: 0 0 0 1.2vw;
+			margin: 0 0 0 0.7vw;
 			background: rgba(255, 255, 255, 1);
 			border: 1px solid #D9DADC;
 			color: #555555;
@@ -370,7 +385,7 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			margin: 0 0 0 1.2vw;
+			margin: 0 0 0 0.7vw;
 			color: #555555;
 		
 			image {