同步

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

@@ -188,7 +188,9 @@
 			elderId: uni.getStorageSync('NUall').elderId,
 			nuName: uni.getStorageSync('nuName'),
 		}
+		console.log("?????",data)
 		requireTH(data).then(res => {
+			console.log("?????",res)
 			if (res.success) {
 				thshow.value = false;
 				uni.showToast({
@@ -199,7 +201,6 @@
 				thshow.value = false;
 				errmsg.value = res.result?.message ? res.result?.message : res.message
 				openerror.value = true;
-				console.log("?????")
 			}
 		})
 	}

pages/NursingNew/index.vue

@@ -80,7 +80,7 @@
 
 	onMounted(() => {
 		menuIndex.value = -1;
-		nextTick(() => menuIndex.value = 2)
+		nextTick(() => menuIndex.value = 0)
 		
 		isOld.value = 2;
 		uni.getSystemInfoSync(); // 确保 global 注入生效

pages/procurement/addtory.vue

@@ -63,6 +63,7 @@
 		selectType.value = index;
 		pageNo.value = 1;
 		pddlist.value = [];
+		uni.removeStorage({  key: 'valitem'})
 		pandian();
 	}
 	onLoad((e)=>{
@@ -81,6 +82,7 @@
 			pageSize:10
 		}
 		queryPddInfoList(obj).then(res=>{
+			console.log(res.result.records)
 			pddlist.value.push(...res.result.records);
 			status.value = (res.result.total == pddlist.value.length ? 'nomore' : 'loadmore');
 			let s = Math.ceil(res.result.total / 3);

pages/procurement/common/thitem.vue

@@ -348,7 +348,7 @@
 					font-size: 1.6vw;
 					color: #222222;
 					height: 3.1vw;
-					padding-top: 1vw;
+					padding-top: 0.8vw;
 					text-overflow: ellipsis;
 					overflow: hidden;
 					white-space: nowrap;

pages/procurement/common/toryitem.vue

@@ -3,7 +3,7 @@
 		<scroll-view scroll-y="true" class="itembox" scroll-with-animation @scrolltolower="scrolltolower()"
 			enable-back-to-top enable-flex :scroll-top="scrolltop" @scroll="scroll">
 			<defaultr cont="暂无数据" v-if="pddlist.length==0 && listflag" style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
-			<view class="items guodu" v-for="(v,i) in pddlist" :key='i' :class="{'itembord0':v.zk==true,'dczk':v.dczk==true&&v.zk==true}">
+			<view class="items guodu" v-for="(v,i) in pddlist" :key='i' :class="{'itembord0':v.zk==true,'itembord1':v.zk==false,'dczk':v.dczk==true&&v.zk==true,'dczks':v.dczk==true&&v.zk==false}">
 				<view class="speitem guodu">
 					<view class="imgs">
 						<image :src="v?.materialImg?serverUrl+v?.materialImg:'/static/index/procurement/k.png'"
@@ -27,7 +27,7 @@
 						<text>物料单位：</text>
 						{{v?.materialUnits}}
 					</view>
-					<view class="cot" style="white-space: nowrap;display: block;overflow: hidden;text-overflow: ellipsis;height: 1.5vw;">
+					<view class="cot" style="white-space: nowrap;display: block;overflow: hidden;text-overflow: ellipsis;height: 1.7vw;">
 						<text style="display: inline-block;">规格型号：</text>{{v?.specificationModel}}
 					</view>
 					<view class="wltwo">
@@ -47,7 +47,7 @@
 					<text>差额</text> 
 				</view>
 				<view class="pandian" @click="zhankai(v,i)">
-					<image :src="v.zk?'/static/index/procurement/pd1.png':'/static/index/procurement/pd0.png'" mode="aspectFill" v-if="v.pdType==null||v.pdType==''"></image>
+					<image :src="v.zk?'/static/index/procurement/pd1.png':'/static/index/procurement/pd0.png'" mode="aspectFill" v-if="v.pdType==null||v.pdType==''||v.pdType == 3"></image>
 					<image  :src="v.zk?'/static/index/procurement/pd5.png':'/static/index/procurement/pd2.png'" mode="aspectFill" v-if="v.pdType == 1"></image>
 					<image  :src="v.zk?'/static/index/procurement/pd4.png':'/static/index/procurement/pd3.png'" mode="aspectFill" v-if="v.pdType == 2"></image>
 				</view>
@@ -151,14 +151,14 @@
 	const valindex = ref(-1);
 	const zhankai = (v, i) => {
 		let s = Math.ceil((i + 1) / 3);
-		if(valindex.value !=i && valindex.value > -1 &&uni.getStorageSync('valitem')){
+		if(valindex.value !=i && valindex.value > -1 && uni.getStorageSync('valitem') && props.pddType == '1'){
 			emit('tabitem',valindex.value,uni.getStorageSync('valitem'))
 		}
 		valindex.value = i;
 		scrolltop.value = top.value;
 		v.zk = !v.zk;
 		if (v.zk) {
-			uni.setStorageSync('valitem', v);
+			if(props.pddType == '1'){uni.setStorageSync('valitem', v);}
 			setTimeout(() => {
 				v.yczk = v.zk;
 			}, 200)
@@ -302,13 +302,21 @@
 		width: 100%;
 		height: 50vw;
 		display: flex;
-
+		.itembord1 {
+			border-radius: 1.6vw !important;
+			transition: 1s;
+		}
 		.itembord0 {
 			border-radius: 1.6vw 1.6vw 0 0 !important;
 			z-index: 25 !important;
+			transition: .1s;
 		}
 		.dczk{
 			top: -17vw !important;
+			transition: .4s !important;
+		}
+		.dczks{
+			transition: .4s !important;
 		}
 		.itemhei0 {
 			height: 0vw !important;

pages/procurement/components/calculator.vue

@@ -333,7 +333,7 @@
 			return
 		}
 		
-		emit('right', relNumber.value,gysarr.value[gysidnum.value],type.value)
+		emit('right', relNumber.value,gysarr.value[gysidnum.value],type.value,props.caigouobj)
 	}
 	const colse = ()=>{
 		emit('colse')

pages/procurement/inventory.vue

@@ -87,7 +87,7 @@
 
 									</view>
 									<view style="color: #888888;">
-										{{ `[ 王嘉尔 ]` }}
+										[{{ item.pddStartBy}}]
 									</view>
 								</view>
 							</view>
@@ -107,7 +107,7 @@
 										盘点结束
 									</view>
 									<view style="color: #888888;">
-										{{ item.pddType=='2'?`[ 王嘉尔 ]`: `` }}
+										{{ item.pddType=='2'?`[` +item.pddEndBy+ `]`: `` }}
 									</view>
 								</view>
 							</view>
@@ -273,7 +273,6 @@
 	}
 	onShow(()=>{
 		chongzhi()
-		console.log("刷新了")
 	})
 	onMounted(() => {
 		// firstgetqueryCgdList();

pages/procurement/materialcar.vue

@@ -82,7 +82,7 @@
 		suppliers:''
 	 })
 	 const InvoicingList = ref([])
-	 const status = ref('loadmore')
+	 const status = ref('nomore')
 	 const open = ref(0)
 	 onShow(()=>{
 		 InvoicingList.value = [];
@@ -108,9 +108,9 @@
 				item.zk = false;
 				item.scrollleft = 0;
 	 		})
-			// console.log(`最上层`,res.result.records)
+			console.log(`最上层`,res )
 	 		InvoicingList.value.push(...res.result.records);
-	 		status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
+	 		// status.value = (res.result.total == InvoicingList.value.length) ? 'nomore' : 'loadmore';
 	 	})
 	 }
 	 const search = (x : number) => {
@@ -196,17 +196,17 @@
 		}
 		const adfangdou = ref(true);
 		// 防抖
-		const right = (n:number,nm:any,type:Object) => {
+		const right = (n:number,nm:any,type:Object,v:object) => {
 			setTimeout(()=>{
 				if(adfangdou.value){
-					connfig(nm,n,type);
+					connfig(nm,n,type,v);
 					adfangdou.value = false;
 				}
 			},30)
 			
 		}
 		const timers = ref(true)
-		const connfig = (nm:any,num:Number,type:Object) =>{
+		const connfig = (nm:any,num:Number,type:Object,v:object) =>{
 			if(timers.value==false){return}
 			timers.value=false;
 			let dt = {
@@ -225,10 +225,11 @@
 				timers.value=true;
 				if(res.success){
 					setTimeout(()=>{
+						 tihuan(v);
 						addflag.value = false;
-						 form.pageNo=1;
+						 // form.pageNo=1;
-						 InvoicingList.value = [];
+						 // InvoicingList.value = [];
-						 queryInvo();
+						
 					},700)
 					uni.showToast({
 						icon:res.success?'success':'none',
@@ -241,7 +242,23 @@
 				adfangdou.value = true;
 			})
 		}
-		
+		const tihuan = (v)=>{
+			let forms={
+					nuId: uni.getStorageSync('nuId'),
+					wlParamInfo:v.wlMaterialNo,
+				 }
+				queryShoppingCartList(forms).then(res => { 
+					let obj = res.result.records[0];
+					 InvoicingList.value.forEach((item,i)=>{
+					 	if(item.id == obj.id){
+							obj.flag = v.flag;
+							obj.zk = false;
+							obj.scrollleft = 0;
+							InvoicingList.value[i] = obj;
+					 	}
+					 })
+				})
+		}
 		const caigouflag = ref(false)
 		const caigouarr = ref([])
 		const generatedOrder = ref([])