From c74b77267de5a04a5f92fe054a56af60cd7a9c31 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Thu, 11 Dec 2025 08:39:14 +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

---
 .../component/pleasetake/common/carditem.vue  |  1 -
 .../component/pleasetake/common/htditem.vue   |  6 ++---
 .../component/pleasetake/common/submits.vue   |  2 +-
 .../component/pleasetake/common/takeing.vue   | 26 ++++++++++++++++--
 .../pleasetake/component/takehomep.vue        |  2 --
 pages/procurement/common/takeing.vue          | 27 +++++++++++++++++--
 .../components/inboundoutbound.vue            |  2 +-
 7 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue
index 27525d5..5d8e639 100644
--- a/pages/NursingNew/component/pleasetake/common/carditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/carditem.vue
@@ -307,7 +307,6 @@
 					font-weight: bold;
 					font-size: 1.6vw;
 					color: #222222;
-					height: 3vw;
 					padding-top: 1.3vw;
 					text-overflow: ellipsis;
 					overflow: hidden;
diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue
index 3f60e47..b1caa7d 100644
--- a/pages/NursingNew/component/pleasetake/common/htditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/htditem.vue
@@ -360,9 +360,9 @@
 		}
 	
 		>image {
-			width: 8.5vw;
-			height: 7.5vw;
-			margin: 1.7vw auto 0.25vw;
+			width: 8vw;
+			height: 7vw;
+			margin: 1vw auto 0.25vw;
 		}
 	}
 	
diff --git a/pages/NursingNew/component/pleasetake/common/submits.vue b/pages/NursingNew/component/pleasetake/common/submits.vue
index e30750c..7c72056 100644
--- a/pages/NursingNew/component/pleasetake/common/submits.vue
+++ b/pages/NursingNew/component/pleasetake/common/submits.vue
@@ -75,7 +75,7 @@
 		let now = new Date();
 		let year = now.getFullYear();
 		let month = (now.getMonth() + 1)<10?'0'+(now.getMonth() + 1):(now.getMonth() + 1);
-		let day = now.getDay()<10?'0'+now.getDay():now.getDay();
+		let day = now.getDate()<10?'0'+now.getDate():now.getDate();
 		times.value = year+'.'+month+'.'+day
 	})
 	const wuobj = ref({})
diff --git a/pages/NursingNew/component/pleasetake/common/takeing.vue b/pages/NursingNew/component/pleasetake/common/takeing.vue
index d2ff2a8..8aeaa5f 100644
--- a/pages/NursingNew/component/pleasetake/common/takeing.vue
+++ b/pages/NursingNew/component/pleasetake/common/takeing.vue
@@ -53,7 +53,15 @@
 				<view class="you">
 					<view class="calculator-father">
 						<view v-for="(item,index) in calculatorArray" :key="index">
-							<view  class="calculator-kuai"
+							<view class="calculator-kuai" style="font-size: 33rpx;" v-if="item==`AC`"
+								@click="clickKuai(item,index)">
+								清零
+							</view>
+							<view class="calculator-kuai" v-else-if="item==`AE`"
+								@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
 								@click="clickKuai(item,index)">
 								{{item}}
 							</view>
@@ -158,8 +166,22 @@
 			stringShow.value = toFixed4ByPadStart(relNumber.value)
 			// emit('jjnum',e)
 		}
+		const times = ref(false)
 		const closeIt = () => {
-			emit('right', relNumber.value,props.objtake )
+			if(relNumber.value == 0){
+				uni.showToast({
+					icon:'none',
+					title:"数量不能为0！"
+				})
+				return
+			}
+			if(times.value == false){
+				times.value = true;
+				emit('right', relNumber.value,props.objtake )
+				setTimeout(()=>{
+					times.value = false;
+				},1500)
+			}
 		}
 		function digitCountByString(n) {
 			const s = Math.abs(n).toString();
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index 1aa3fd5..3b804f7 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -128,8 +128,6 @@
 	const status = ref('loadmore')
 	const config = ()=>{
 		queryInvoicingList(form).then(res=>{
-			console.log(res)
-			console.log(form)
 			res.result.records.forEach(item=>{
 				item.zk = false;
 				item.scrollleft = 0;
diff --git a/pages/procurement/common/takeing.vue b/pages/procurement/common/takeing.vue
index 6ffd26c..d245339 100644
--- a/pages/procurement/common/takeing.vue
+++ b/pages/procurement/common/takeing.vue
@@ -53,7 +53,15 @@
 				<view class="you">
 					<view class="calculator-father">
 						<view v-for="(item,index) in calculatorArray" :key="index">
-							<view  class="calculator-kuai"
+							<view class="calculator-kuai" style="font-size: 33rpx;" v-if="item==`AC`"
+								@click="clickKuai(item,index)">
+								清零
+							</view>
+							<view class="calculator-kuai" v-else-if="item==`AE`"
+								@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
 								@click="clickKuai(item,index)">
 								{{item}}
 							</view>
@@ -70,6 +78,7 @@
 				</view>
 			</view>
 		</view>
+		
 	</view>
 </template>
 
@@ -169,8 +178,22 @@
 			stringShow.value = toFixed4ByPadStart(relNumber.value)
 			// emit('jjnum',e)
 		}
+		const times = ref(false)
 		const closeIt = () => {
-			emit('right', relNumber.value,props.objtake )
+			if(relNumber.value == 0){
+				uni.showToast({
+					icon:'none',
+					title:"数量不能为0！"
+				})
+				return
+			}
+			if(times.value == false){
+				times.value = true;
+				emit('right', relNumber.value,props.objtake )
+				setTimeout(()=>{
+					times.value = false;
+				},1500)
+			}
 		}
 		function digitCountByString(n) {
 			const s = Math.abs(n).toString();
diff --git a/pages/procurement/components/inboundoutbound.vue b/pages/procurement/components/inboundoutbound.vue
index c3e966d..38bd911 100644
--- a/pages/procurement/components/inboundoutbound.vue
+++ b/pages/procurement/components/inboundoutbound.vue
@@ -33,7 +33,7 @@
 			<scroll-view scroll-y="true" class="crkscroll" scroll-with-animation @scrolltolower="scrolltolower()">
 				<view class="cgrk" v-for="(v,i) in list" :key='i'>
 					<view>
-						<text>{{v.crkType_dictText}}{{v.crkStatus_dictText}}</text>
+						<text>{{v.crkType_dictText}}-{{v.crkStatus_dictText}}</text>
 						<text>{{v.content}}</text>
 						<text>{{v.createTime}}</text>
 					</view>