同步

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

@@ -950,7 +950,7 @@
 								width: 140rpx;
 								height: 140rpx;
 								margin-top: 10rpx;
-								margin-bottom: 15rpx;
+								margin-bottom: 0.2vw;
 								padding: 0.2vw;
 								border-radius: 1.1vw;
 								background: #f8f8f8;
@@ -969,7 +969,7 @@
 								align-items: center;
 								color: #555555;
 								border: 1rpx solid #D2D2D2;
-								margin-top:0.2vw;
+								margin-bottom:0.2vw;
 								font-size: 19rpx;
 							}
 						}

pages/NursingNew/component/pleasetake/component/takehomep.vue

@@ -194,7 +194,7 @@
 			if (res.success) {
 				thshow.value = false;
 				uni.showToast({
-					icon: 'none',
+					icon: 'success',
 					title: res.message
 				})
 			} else {

pages/Warehouse/picking.vue

@@ -1041,6 +1041,7 @@
 		<tanchuang :show="badshow" font="确定要作废这个采购单吗" @back="badshow=false;" @right="zuofei"> </tanchuang>
 		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del()"> </tanchuang>
 		<tanchuang :show="open==2" font="是否销账此物料？" @back="open = 0" @right="sctp(1)"> </tanchuang>
+		<errorshow :show="openerror" :font="errmsg" @close="openerror=false"  />
 	</view>
 </template>
 
@@ -1814,6 +1815,8 @@
 		stringjh.value = toFixed4ByPadStart(showvalue.value.num)
 	}
 	// 
+	const openerror = ref(false)
+	const errmsg = ref('')
 	const fag = (e) => {
 		let str = '';
 		addupimg.value.forEach(item => {
@@ -1830,11 +1833,11 @@
 		pickingInfo(obj).then(res => {
 			console.log(`入参`, obj)
 			console.log(`返回`, res)
-			uni.showToast({
-				icon: 'none',
-				title: res.message ? res.message : '操作成功'
-			})
 			if (res.success) {
+				uni.showToast({
+					icon: res.success?'success':'none',
+					title: res.message ? res.message : '操作成功'
+				})
 				plsbuy.value[lefttarget.value].totalPrice = res.result.cgdTotalPrice
 				albumlist.value = [];
 				addupimg.value = [];
@@ -1842,7 +1845,12 @@
 				open.value = 0;
 				form.cgdId = plsbuy.value[lefttarget.value].id;
 				plsbuy.value[lefttarget.value] = res.result.cgdInfo;
-				queryInvo(middletarget.value)
+				setTimeout(()=>{
+					queryInvo(middletarget.value)
+				},700)
+			}else{
+				errmsg.value = res.message;
+				openerror.value = true;
 			}
 		})
 	}

pages/procurement/common/pddsub.vue

@@ -145,7 +145,7 @@
 			if(res.success){
 				uni.showToast({
 					icon:'success',
-					title:res.message
+					title:res.message?res.message:'提交成功'
 				})
 				emit('close');
 				setTimeout(()=>{

pages/procurement/inventory.vue

@@ -45,11 +45,11 @@
 				</view>
 			</view>
 
-			<nomessage cont="暂无数据" :show="nomessageshow" />
-			<view class="zhedang" v-if="nomessageshow"></view>
+			<!-- <nomessage cont="暂无数据" :show="nomessageshow" /> -->
+			<!-- <view class="zhedang" v-if="nomessageshow"></view> -->
 		</view>
 
-		<view class="all-contain" v-show=" !nomessageshow">
+		<view class="all-contain">
 			<scroll-view scroll-y="true" scroll-with-animation class="all-scroll" :scroll-top="leftscrolltop"
 				@scrolltolower="plsbuytolower" :lower-threshold="200">
 				<view class="scroll-items">
@@ -724,7 +724,7 @@
 		right: 0;
 		top: 0;
 		height: 500rpx;
-		background-color: #fff;
+		// background-color: #fff;
 	}
 
 	.left-selecttype {

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,8 +1,8 @@
 {
-  "hash": "63b19973",
-  "configHash": "f0a71f11",
-  "lockfileHash": "e88c1aa2",
-  "browserHash": "b680c5d4",
+  "hash": "9e248234",
+  "configHash": "17f5f5b6",
+  "lockfileHash": "285de26d",
+  "browserHash": "f287ed85",
   "optimized": {},
   "chunks": {}
 }