Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages/NursingNew/component/pleasetake/api/api.js

@@ -69,4 +69,11 @@ export const deleteGwcWl = (params) => {
 		data: params,
 	})
 }
+export const queryMaterialInfo = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/qld/queryMaterialInfo`,
+		method: 'get',
+		data: params,
+	})
+}
 

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

@@ -6,7 +6,7 @@
 				<view class="mhao" v-if="Material.length>0">{{Material.length}}</view>
 			</view>
 			<scroll-view scroll-x="true" class="kcscrol guodu"
-				scroll-with-animation :scroll-top="scrollleft" >
+				scroll-with-animation :scroll-top="scrollleft"  :style="qb?'width:calc(100% - 21.8vw)':'width:calc(100% - 10vw)' ">
 				<view class="yjbox" v-for="(v,i) in Material" :key="i" @click="clickaddcar(v,i)">
 					<image :src="v.materialInfo.materialImg?serverUrl+v.materialInfo.materialImg:'/static/index/procurement/k.png'"
 						mode="aspectFill"></image>
@@ -15,7 +15,7 @@
 				</view>
 				<defaultr cont="暂无数据" v-if="Material.length==0&&timeout" style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
 			</scroll-view>
-			<view class="kjlt more guodu" :style="qb?'width:11.2vw':'' ">
+			<view class="kjlt more guodu" :style="qb?'width:15vw':'' ">
 				<view @click="qb=!qb;moredex=0" class="righ0">
 					{{!qb?'更多':'收起'}}
 					<image class="guodu" :style="qb?'transform: rotate(180deg);':''"
@@ -37,6 +37,7 @@
 
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive } from 'vue';
+	import defaultr from './default.vue'
 	const props = defineProps({
 		Material:{
 			type:Array,
@@ -147,6 +148,11 @@
 					right: 8.5vw;
 					z-index: 2;
 				}
+				
+				&:nth-child(4) {
+					right: 12.3vw;
+					z-index: 2;
+				}
 			}
 
 			.avt {

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

@@ -26,7 +26,7 @@
 					<view>
 						<view>
 							请领数量
-							<text>{{objtake.qlNum?objtake.qlNum:'--'}}</text>
+							<text>{{wuobj.qlNum?wuobj.qlNum:'0'}}</text>
 						</view>
 						<view>
 							请领单位
@@ -34,7 +34,7 @@
 						</view>
 						<view>
 							累计请领
-							<text>{{objtake.materialNo}}</text>
+							<text>{{wuobj.wlNum?wuobj.wlNum:0}}</text>
 						</view>
 					</view>
 					
@@ -54,6 +54,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive } from 'vue';
+	import { queryMaterialInfo} from '../api/api.js'
 	const props = defineProps({
 		objtake: {
 			type: Object,
@@ -63,6 +64,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 			type: Boolean
 		} 
 	})
+	const wuobj = ref({})
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const emit = defineEmits([ 'fill' ,'qingling'])
 	const showbox = ref(false)
@@ -70,6 +72,15 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 		()=>{
 			console.log(props.objtake)
 			if(props.show==true){
+				let obj = {
+					nuId:uni.getStorageSync('nuId'),
+					elderId:uni.getStorageSync('NUall').id,
+					wlId:props.objtake.wlId
+				}
+				queryMaterialInfo(obj).then(res=>{
+					console.log(res)
+					wuobj.value = res.result
+				})
 				setTimeout(()=>{
 					showbox.value = true
 				},50)