更改

pages/NursingNew/component/pleasetake/common/tijiao.vue

@@ -4,6 +4,11 @@
 			<view class="title">
 				请领详情
 			</view>
+			<view class="contect">
+				<view class="contect-ones">
+					请领区域：护理单元01
+				</view>
+			</view>
 		</view>
 
 		<view class="mengban" v-if="show" @click="() => emit('back')"></view>
@@ -103,4 +108,12 @@
 		font-weight: 600;
 		border-bottom: 2rpx solid #E5E5E5;
 	}
+	.contect{
+		margin: 4vh 0;
+		.contect-ones{
+			color: #888888;
+			width: 33%;
+			font-size: 30rpx;
+		}
+	}
 </style>

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

@@ -332,7 +332,7 @@
 	const firstgetqueryCgdList = () => {
 		queryQld(plzinfo).then((res : any) => {
 			transition.value = true;
-			console.log("kankan",plzinfo,res)
+			// console.log("kankan",plzinfo,res)
 			if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
 				nomessageshow.value = true;
 				return
@@ -624,7 +624,7 @@
 
 			.left-menu-scroll {
 				margin-top: 3%;
-				height: 94%;
+				height: 91%;
 				width: 100%;
 				// position: relative;
 				// overflow: auto;

pages/NursingNew/component/pleasetake/component/returnorder.vue

@@ -21,7 +21,7 @@
 		<view class="button-tilte">
 			回退单
 		</view>
-		<view class="right-button-father">
+		<view class="right-button-father" v-if="!nomessageshow">
 			<view class="right-button" @click="badshow=true">
 				<image src="/static/index/warehouse/procurement/picking/bebad.png" />
 				<view>
@@ -224,6 +224,7 @@
 					style="width: 30%;height: 30%;position: absolute;">
 				</defaultr>
 			</scroll-view>
+			
 		</view>
 	</view>
 </template>
@@ -352,11 +353,12 @@
 				nomessageshow.value = true;
 				return
 			}
+		
 			cannomessage.value = false
 			plsbuy.value = []
 			plsbuy.value.push(...res.result.records)
-			console.log("入参", plzinfo)
+			// console.log("入参", plzinfo)
-			console.log("查看数组", res.result.records)
+			// console.log("查看数组", res.result.records)
 			alltotal.value = res.result.total
 
 			// console.log("请购单数据呢???", res)
@@ -646,12 +648,8 @@
 
 			.left-menu-scroll {
 				margin-bottom: 3%;
-				height: 94%;
+				height: 100%;
 				width: 100%;
-				// position: relative;
-				// overflow: auto;
-
-				// background-color: red;
 				.pls-card {
 					width: 98%;
 					height: 25.3vh;

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

@@ -100,7 +100,7 @@
 			elderId:form.elderId
 		}
 		queryGwcInfo(obj).then(res=>{
-			console.log(res,obj)
+			// console.log(res,obj)
 			addMaterial.value = res.result
 		})
 	}
@@ -198,7 +198,7 @@
 	}
 	const objtake = ref({})
 	const comfig=(v,i,t)=>{
-		console.log(v,i,t)
+		// console.log(v,i,t)
 		switch (t){
 			case 0:
 				objtake.value = v;

pages/Warehouse/picking.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="contain">
 		<view
-			v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata || opencgr || opengys"
+			v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata"
 			class="mengban" :style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
 			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
 		</view>
@@ -255,7 +255,6 @@
 				<view class="gray-input" style="width:12vw;">
 					<text v-for="(v,i) in stringjh" :key="i">{{v}}</text>
 				</view>
-				<!-- <text></text>{{showvalue.num}} -->
 				<view class="gray-button" @click="jjnum(1)" @longpress="handleTouchStart(1)" @touchend="handleTouchEnd">
 					+
 				</view>
@@ -414,8 +413,6 @@
 			</scroll-view>
 		</view>
 
-
-
 		<view class="contain-left">
 			<view v-show="openselect" class="mengban" style="background: transparent;" @click="openselect=false"></view>
 			<view class="left-select-more" v-show="openselect">
@@ -428,7 +425,6 @@
 						<text style="font-size: 25rpx;margin-top: 5rpx;" v-if="alltotal>=99">
 							(99+采购单)
 						</text>
-
 					</view>
 				</view>
 				<view class="more-title">
@@ -449,7 +445,6 @@
 					</view>
 				</view>
 
-
 				<view class="more-time">
 					采购日期
 				</view>
@@ -591,8 +586,6 @@
 								</view>
 
 								<view class="middle-heng-father">
-
-									<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
 									<view class="middle-ball" :style="{backgroundColor: `#E5E5E5`}"
 										v-if="Number(v.status)!=2"></view>
 									<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
@@ -628,7 +621,6 @@
 				<view class="left-top-tags">
 					<view class="wuliao-title">
 						物料信息
-						<!-- <view class="wuliao-heng"></view> -->
 					</view>
 				</view>
 				<view :class=" `contain-right-button`" @click="donghuastart(0)" style="width: 10vw;">
@@ -670,7 +662,6 @@
 							<image class="middle-img"
 								:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
 								mode="aspectFill"></image>
-							<!-- <image class="middle-img" :src=" '/static/zhiniaoku.png'" mode="aspectFill"></image> -->
 							<view class="middle-right">
 								<view class="right-title">
 									{{ v.wlName }}
@@ -802,15 +793,6 @@
 							<view class="title-left">
 								{{showvalue.wlName}}
 							</view>
-							<!-- <view class="title-right">
-								<text
-									style="position: absolute;top: 8rpx;left: -35rpx;font-weight: 300;font-size: 28rpx;">
-									￥
-								</text>
-								<view style="color: #555555;">
-									{{Number(showvalue.totalPrice).toFixed(2) }}
-								</view>
-							</view> -->
 						</view>
 						<view class="bottom-right-middle">
 							<view class="middle-onecard">
@@ -860,7 +842,6 @@
 								</view>
 								<view class="gray-heng"></view>
 							</view>
-							<!-- <view class="gray-heng"></view> -->
 							<view class="middle-onecard">
 								<view class="threeone">
 									<view class="gray-text">
@@ -888,7 +869,6 @@
 								</view>
 								<view class="gray-heng"></view>
 							</view>
-							<!-- <view class="gray-heng"></view> -->
 							<view class="middle-onecard">
 								<view class="threeone">
 									<view class="gray-text">
@@ -987,16 +967,6 @@
 								</view>
 							</view>
 						</view>
-						<!-- <view
-							style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 20rpx;"
-							v-if="lhjlarr.length">
-							<image v-if="statustory=='loading'"
-								style="width: 25rpx;height: 25rpx;margin-right: 10rpx;margin-top: 5rpx;margin-left: -10rpx;"
-								src="/static/index/warehouse/procurement/picking/loading.png" />
-							<text v-if="statustory=='loading'">上划加载更多</text>
-							<text v-if="statustory=='nomore'">已加载全部~</text>
-							<text v-if="statustory=='loadmore'">加载中~</text>
-						</view> -->
 
 					</scroll-view>
 					<view style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 40rpx;"
@@ -1179,6 +1149,7 @@
 	const filteredCgrList = ref([]);
 
 	const closefilteredCgrList = () => {
+		console.log("?????????")
 		filteredCgrList.value = [];
 		cgrvalue.value = plzinfo.cgBy;
 	}
@@ -1497,7 +1468,7 @@
 		middletarget.value = index;
 		showvalue.value = InvoicingList.value[index];
 		showvalue.value.jianhuobtn = false;
-		Invoiscroll.value = (index - 2) * 205;
+		Invoiscroll.value = (index - 2) * 172;
 		if (Number(showvalue.value.status) == 0 || (Number(showvalue.value.status) > 0 && Number(showvalue.value.wrksl) > 0)) {
 			showvalue.value.maxnum = (showvalue.value.rksl == 0 && showvalue.value.wrksl == 0 && showvalue.value.xzsl == 0) ? showvalue.value.purchaseQuantity : showvalue.value.wrksl
 			showvalue.value.num = showvalue.value.maxnum;
@@ -2524,21 +2495,19 @@
 				margin-top: 20rpx;
 
 				.middle-Y {
-					width: 100%;
+					width: 97%;
 					height: 100%;
+					margin-left: 3%;
 
 					.middle-Y-father {
 						display: flex;
-						// flex-wrap: wrap;
+						
-						// width: 100%;
-						padding-left: 20rpx;
-
 						.middle-one {
 							min-width: 325rpx;
 							height: 450rpx;
 							background-color: #F9F9F9;
 							border-radius: 30rpx;
-							margin-left: 20rpx;
+							margin-right: 20rpx;
 							margin-bottom: 30rpx;
 							display: flex;
 							flex-direction: column;

pages/Warehouse/warehome.vue

@@ -4,7 +4,7 @@
 			<image class="all-home" src="/static/index/warehouse/newhome/setting.png" mode="aspectFit"></image>
 		</view>
 		<view class="right-title">
-			<image class="title-imge" src="/static/index/indeximage.png" mode="aspectFit"></image>
+			<image class="title-imge" src="/static/home.png" mode="aspectFit"></image>
 			<view class="title-font">
 				{{ uni.getStorageSync('nuName') }}
 			</view>
@@ -609,12 +609,13 @@
 		display: flex;
 		align-items: center;
 		.title-imge{
-			width: 2vw;
+			width: 1.8vw;
-			height: 2vw;
+			height: 1.8vw;
+			margin-right: 0.5vw;
 			// margin-top: -0.3vw;
 		}
 		.title-font{
-			font-size: 30rpx;
+			font-size: 32rpx;
 			// margin-left: 3vw;
 			font-weight: 600;
 			

pages/login/login.vue

@@ -191,7 +191,7 @@
 		return typeof str === 'string' && str.length === 11;
 	}
 	const jumpTo = (url : string) => {
-		uni.redirectTo({
+		uni.navigateTo({
 			url: url
 		});
 	}

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,16 +172,17 @@
 					},
 					{
 						multiUnitType:3,
-						price:props.caigouobj.referenceUnitPrice,
+						price:props.caigouobj.unitPrice,
 						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
@@ -190,13 +191,15 @@
 				
 				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 = [];
@@ -252,7 +255,10 @@
 		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()
@@ -334,6 +340,7 @@
 			return
 		}
 		
+	
 		emit('right', relNumber.value,gysarr.value[gysidnum.value],type.value)
 	}
 	const colse = ()=>{

pages/procurement/material.vue

@@ -379,6 +379,7 @@
 			return
 		}
 		timers.value = false;
+		
 		let dt = {
 			nuId: form.nuId,
 			purchaseQuantity: num,
@@ -390,6 +391,8 @@
 			referenceUnitPrice: type.price,
 			dhbl: type.num
 		}
+		console.log("注意",dt)
+	
 		addShoppingCartList([dt]).then(res => {
 			if(res.success){
 				uni.showToast({

pages/procurement/materialcar.vue

@@ -3,7 +3,7 @@
 		<view class="serchs">
 			<view class="leftbtn">
 				<view class="ipt">
-					<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo"  @confirm="search()"/>
+					<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo"  @confirm="search(0)"/>
 					<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
 						@click="search(0)"></image>
 				</view>
@@ -108,7 +108,7 @@
 				item.zk = false;
 				item.scrollleft = 0;
 	 		})
-			console.log(res.result.records)
+			// console.log(`最上层`,res.result.records)
 	 		InvoicingList.value.push(...res.result.records);
 	 		status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
 	 	})
@@ -121,8 +121,9 @@
 	 }
 	 
 	 const addcartory =(e:any)=>{
-	 	console.log(e)
+	 	console.log(`eeeeeeeeeee`,e)
 	 	 caigouobj.value = e;
+		 
 	 	 addflag.value = true;
 	 }
 	 const confirm =(e:any)=>{
@@ -194,7 +195,10 @@
 			})
 		}
 		const right = (n:number,nm:any,type:Object) => {
-			connfig(nm,n,type)
+			setTimeout(()=>{
+				connfig(nm,n,type)
+			},30)
+			
 		}
 		const timers = ref(true)
 		const connfig = (nm:any,num:Number,type:Object) =>{
@@ -213,7 +217,8 @@
 				dhbl:type.num
 			}
 			 
-			console.log(dt)
+			console.log(`111111111111111111111111111111`,dt)
+			
 			eddShoppingCartList(dt).then(res=>{
 				timers.value=true;
 				if(res.success){
@@ -256,6 +261,7 @@
 				return
 			}
 			generatedPurchaseViewOrder(caigouarr.value).then(res=>{
+				console.log("11111",caigouarr.value,res)
 				if(res.success){
 					generatedOrder.value = res.result;
 					caigouflag.value = true;

pages/watch/index.vue

@@ -232,7 +232,7 @@
 
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, reactive } from 'vue';
-	import { onShow, onLoad, onHide } from "@dcloudio/uni-app"
+	import { onShow, onLoad, onHide,onBackPress } from "@dcloudio/uni-app"
 	import { movedirection, queryPadPageList } from './api/lunpan.js'
 	import joysticknew from '@/component/public/newgame/joysticknew.vue';
 
@@ -240,6 +240,10 @@
 	onLoad(() => {
 		cameraArray.value = cameraSmall;
 	})
+	// 我这么写是为了防止安卓组件被销毁
+	onBackPress(() => {
+	  return true; // 禁止返回
+	})
 	const zyupgrade = ref(null);
 	const menuIndex = ref(-1);
 	const typeNow = ref(-1);