From cdfd4b74b7617ba6c7be73f6c6322638f88eb960 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Mon, 8 Dec 2025 17:30:45 +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 | 15 ++++-----------
 pages/procurement/material.vue              |  1 +
 pages/procurement/retstock.vue              | 15 ++++++++++++---
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index d8ebebe..5e9fb7c 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -156,7 +156,7 @@
 		()=>props.show,
 		()=>{
 			if(props.show){
-				// console.log(props.caigouobj)
+				console.log(props.caigouobj)
 				let a = [
 					{
 						multiUnitType:1,
@@ -172,17 +172,16 @@
 					},
 					{
 						multiUnitType:3,
-						price:props.caigouobj.unitPrice,
+						price:props.caigouobj.unitPrice?props.caigouobj.unitPrice:props.caigouobj.referenceUnitPrice,
 						unit:props.caigouobj.materialUnits,
 						num:1
 					}
 				];
-				
 				if(props.caigouobj.wlUnits){
 					type.value = a.find(item=>
 						item.unit == props.caigouobj.wlUnits
 					);
-					// console.log(props.caigouobj.wlUnits,type.value)
+					console.log(props.caigouobj.wlUnits,type.value)
 				}else{
 					type.value = a.find(item=>
 						item.multiUnitType == props.caigouobj.multiUnitType
@@ -191,15 +190,13 @@
 				
 				cgdwarr.value = []
 				downslength.value = 0;
-				// console.log("a",a)
 				a.forEach((element:any)=>{
 					if(element.unit&&element.num){
 						cgdwarr.value.push(element)
-						// console.log("!!!!",element)
 					}
 				})
 				
-				// console.log("a",a)
+				console.log("a",a)
 				let n = [];
 				let id = [];
 				gysarr.value = [];
@@ -255,10 +252,7 @@
 		console.log(sx.value,num,bl)
 	}
 	const cd =(v,i)=>{
-		
-		// return
 		type.value = v;
-		// console.log("cd",type.value,cgdwarr.value)
 		cgdwflag.value = false;
 		cgdwec.value = false;
 		jssl()
@@ -340,7 +334,6 @@
 			return
 		}
 		
-	
 		emit('right', relNumber.value,gysarr.value[gysidnum.value],type.value)
 	}
 	const colse = ()=>{
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 6ea81ba..596e49a 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -356,6 +356,7 @@
 		caigouobj.value.Limitnum += e;
 	}
 	const right = (n : number, nm : any, type : Object) => {
+		console.log(nm, n, type)
 		// let d = Number(caigouobj.value.upperLimit)-Number(caigouobj.value.kcsl)
 
 		// if(d>=n){
diff --git a/pages/procurement/retstock.vue b/pages/procurement/retstock.vue
index 14fa860..4830089 100644
--- a/pages/procurement/retstock.vue
+++ b/pages/procurement/retstock.vue
@@ -85,7 +85,7 @@
 		</view>
 		<tanchuang @back="tanshow = false" :show="tanshow" font="确定将该物料从本次请领清单中移除吗？" @right="del"></tanchuang>
 		<submits :show="subshow" :list="addMaterial" @fill="subshow = false" :thdt="tharrlist[cardindex]" @config="tijiao"></submits>
-		<view class="thdfed" @click="uni.navigateTo({ url:'/pages/procurement/authorization' })">
+		<view class="thdfed" @click="uni.navigateTo({ url:'/pages/procurement/authorization' })"  v-if="carnum>0">
 			<image src="/static/index/procurement/thd.png" mode="aspectFill"></image>
 			<text v-if="carnum>0">{{carnum>99?'99+':carnum}}</text>
 		</view>
@@ -112,6 +112,17 @@
 	onMounted(() => {
 		thlist()
 	})
+	onShow(()=>{
+		let forms = {
+		pageNo: 1,
+		pageSize: 10,
+		status:3,
+		searchContent: '' 
+	}
+		thdList(forms).then(res => {
+			carnum.value = res.result.total;
+		})
+	})
 	const submit = () => {
 		cardcon(tharrlist.value[cardindex.value], cardindex.value);
 		nextTick(() => {
@@ -182,9 +193,7 @@
 	const tharrlist = ref([])
 	const thlist = () => {
 		thdList(form).then(res => {
-			console.log(form)
 			tharrlist.value.push(...res.result.records);
-			carnum.value = res.result.total;
 			status.value = res.result.total == tharrlist.value.length ? 'nomore' : 'loadmore';
 			if (form.pageNo == 1) {
 				cardcon(tharrlist.value[cardindex.value], cardindex.value);