合并

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

@@ -47,6 +47,20 @@ export const addGwc = (params) => {
 		data: params,
 	})
 }
+export const queryQld = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/qld/queryQld`,
+		method: 'get',
+		data: params,
+	})
+}
+export const queryQldWlInfo = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/qld/queryQldWlInfo`,
+		method: 'get',
+		data: params,
+	})
+}
 
 export const deleteGwcWl = (params) => {
 	return request({

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

@@ -1,21 +1,12 @@
 <template>
-	
-		
 	<view class="buttons-father">
 		<view class="ipt">
-				<input type="text" placeholder="物料名称/物料简拼" />
+			<input type="text" v-model="plzinfo.searchContent" placeholder="请领单号" @confirm="clickconfirm" />
 		</view>
-			<view class="scr">
+		<view class="scr" @click="clickconfirm">
 			检索
 		</view>
-			<view class="shx">
+		<view class="shx" @click="chongzhi">
-				<image src="/static/index/requestform/shaixuan.png" mode="aspectFill"></image>
-				<view class="shx-font">
-					筛选
-				</view>
-
-			</view>
-			<view class="shx">
 			<image src="/static/index/requestform/chongzhi.png" mode="aspectFill"></image>
 			<view class="shx-font">
 				重置
@@ -25,11 +16,12 @@
 	<view class="other-contain">
 		<view class="other-contain-left">
 			<view class="left-selecttype">
-					<view :class="selectType===index?`selecttype-target`: `selecttype`"
+				<view :class="selectType===index?`selecttype-target`: `selecttype`" v-for="(item,index) in tagsarray"
-						v-for="(item,index) in tagsarray" @click="changetype(index)">
+					@click="changetype(index)">
 					{{ item }}
 				</view>
-					<view class="heng-blue" :style="{ left: `${selectType === 0 ? 11.5 : 12 + selectType * 18.5}%` }" ></view>
+				<view class="heng-blue" :style="{ left: `${selectType === 0 ? 11.5 : 12 + selectType * 18.5}%` }">
+				</view>
 			</view>
 			<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
 				@scrolltolower="plsbuytolower" :lower-threshold="400">
@@ -47,14 +39,14 @@
 							请领单号
 						</view>
 						<view class="title-left">
-								{{ v.cgdNo }}
+							{{ v.qldNo }}
 						</view>
 					</view>
 					<view class="pls-card-middle">
 						<view class="middle-heng"></view>
 						<view class="pls-card-middle-one">
 							<view class="middle-title">
-									{{ v.qgDate.replace(/-/g, '.') }}
+								{{ v.tjTime.replace(/-/g, '.') }}
 							</view>
 							<view class="middle-heng-father">
 								<image class="middle-ball-img" src="/static/index/requestform/isok.png" />
@@ -65,53 +57,72 @@
 									待出库
 								</view>
 								<view style="font-size: 25rpx;">
-										{{ "[ " + v.qgBy + " ]" }}
+									{{ "[ " + v.tjByName + " ]" }}
 								</view>
 							</view>
 						</view>
 						<view class="pls-card-middle-one">
-								<view class="middle-title" :style=" v?.cgdType=='9' ?{color:`#FF5757`}:{}">
+							<view class="middle-title"
+								:style=" v?.status === '2' || v?.status === '3' ?{color:`#FF5757`}:{}">
+								{{
+									Number(v.status)>1?
+								  v?.status === '2' 
+								    ? v.zfTime?.slice(0,10).replace(/-/g, '.') 
+								    : v?.status === '3'
+								      ? v.htTime?.slice(0,10).replace(/-/g, '.') 
+								      : v.ckTime?.slice(0,10).replace(/-/g, '.') 
+									  : ""
+								}}
 
-									{{ v?.cgdType=='9' ?v.zfTime?.slice(0,10).replace(/-/g, '.'):v.jhTime?.slice(0,10).replace(/-/g, '.') }}
 							</view>
 							<view class="middle-heng-father">
 
 								<view class="middle-ball" style="background-color: #1083F8;"
-										:style=" v?.cgdType=='9' ?{backgroundColor:`#FF5757`}:{}"
+									:style=" v?.status === '2' || v?.status === '3' ?{backgroundColor:`#FF5757`}:{}"
-										v-if="Number(v.status)<1"></view>
+									v-if="Number(v.status)<4">
+								</view>
 								<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
 							</view>
 							<view class="end-font">
 
-									<view :style=" v?.cgdType=='9' ?{color:`#FF5757`}:{}">
+								<view :style="v?.status === '2' || v?.status === '3' ?{color:`#FF5757`}:{}">
-										{{ v?.cgdType=='9' ?`已作废`:`已出库` }}
+									{{
+									  v?.status === '2' 
+									    ? `已作废`
+									    : v?.status === '3'
+									      ? `已回退`
+									      : `已出库`
+									}}
 
 								</view>
-									<view style="font-size: 25rpx;" v-if="v?.jhBy || v?.zfBy"
+								<view style="font-size: 25rpx;" v-if="Number(v.status)>1"
-										:style=" v?.cgdType=='9' ?{color:`#FF5757`}:{}">
+									:style=" v?.status === '2' || v?.status === '3' ?{color:`#FF5757`}:{}">
-										{{ "[ " +  (v?.cgdType=='9' ?v?.zfBy:v?.jhBy )+ " ]" }}
+									{{ "[ " +   (v?.status === '2' 
+									    ? v?.zfByName
+									    : v?.status === '3'
+									      ? v?.htByName
+									      : v?.ckByName)+ " ]" }}
 								</view>
 							</view>
 						</view>
 						<view class="pls-card-middle-one">
 							<view class="middle-title">
-									{{ Number(v.status)>=2 ? v.wjTime?.slice(0,10).replace(/-/g, '.') :""}}
+								{{ Number(v.status)==5 ? v.shTime?.slice(0,10).replace(/-/g, '.') :""}}
 							</view>
 
 							<view class="middle-heng-father">
 
 								<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
-									<view class="middle-ball"
+								<view class="middle-ball" :style="{backgroundColor: `#E5E5E5`}"
-										:style="{backgroundColor: Number(v.status)==1? ``:`#E5E5E5`}"
+									v-if="Number(v.status)!=5"></view>
-										v-if="Number(v.status)!=2"></view>
 								<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
 							</view>
 							<view class="end-font">
 								<view v-if="v?.cgdType!='9'">
 									已收货
 								</view>
-									<view style="font-size: 25rpx;" v-if=" v.wjBy">
+								<view style="font-size: 25rpx;" v-if="Number(v.status)==5">
-										{{ "[ " + v.wjBy + " ]" }}
+									{{ "[ " + v.shByName + " ]" }}
 								</view>
 							</view>
 						</view>
@@ -120,12 +131,11 @@
 						<view class="end-left">
 							<image class="end-left-img" src="/static/index/requestform/gongyingshang.png" />
 							<view class="end-left-font">
-									{{ v.gysId_dictText }}
+								{{ v.nuName }}
 							</view>
 						</view>
-							<view :class="v?.cgdType=='9' ?`tag-fail`:`tag-success`">
+						<view :class="v?.status === '2' || v?.status === '3' ?`tag-fail`:`tag-success`">
-
+							{{ v.statusText  }}
-								{{ v?.cgdType=='9' ?`已作废`:tagesstatues[Number(v.status)]  }}
 						</view>
 					</view>
 				</view>
@@ -134,9 +144,11 @@
 		<view class="other-contain-right">
 			<scroll-view scroll-y="true" scroll-with-animation class="right-contain">
 				<view class="right-ones">
-						<view class="right-one" v-for="(item,index) in nottrue" :key="index" >
+					<view class="right-one" v-for="(item,index) in rightarray" :key="index">
 						<view class="right-one-left">
-								<image class="left-image" :src=" '/static/zhiniaoku.png'" mode="aspectFill"></image>
+							<image class="left-image"
+								:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
+								mode="aspectFill"></image>
 							<view class="left-tages" style="margin-top: -15rpx;">
 								耗材用品
 							</view>
@@ -146,18 +158,18 @@
 						</view>
 						<view class="right-one-right">
 							<view class="right-title">
-									纸尿裤-拉拉裤... 
+								{{ item.materialInfo.materialName }}
 							</view>
 							<view class="right-setting">
 								规格型号
 							</view>
 							<view class="right-mm">
-									800mm*680mm
+								{{ item.materialInfo.materialNo }}
 							</view>
 							<view class="right-down">
 								<view class="">
 									<view class="right-first-num">
-											20
+										{{ item.qlNum }}
 									</view>
 									<view class="right-first-type">
 										请领数量
@@ -166,7 +178,7 @@
 								<view class="right-shu"></view>
 								<view class="">
 									<view class="right-first-num" style="font-weight: 500;">
-											片
+										{{ item.materialInfo.materialUnits }}
 									</view>
 									<view class="right-first-type">
 										请领单位
@@ -181,19 +193,15 @@
 			</scroll-view>
 		</view>
 	</view>
-
-
-
-	
 </template>
 
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
-	import { queryCgdList } from '@/pages/Warehouse/api/lunpan.js'
+	import { queryQld, queryQldWlInfo } from '../api/api.js'
 
 	const tagsarray = ref(["全部", "待出库", "已出库", "已收货 ", "已作废"])
-	const nottrue = Array(10).fill(null)
+	// const nottrue = Array(10).fill(null)
 
 
 	onMounted(() => {
@@ -204,8 +212,48 @@
 	const selectType = ref(0)
 	const changetype = (index : number) => {
 		selectType.value = index
+		plzinfo.pageNo = 1;
+		plzinfo.canpull = true;
+		lefttarget.value = 0
+		switch (index) {
+			case 0:
+				plzinfo.status = `1,2,4,5`
+				break
+			case 1:
+				plzinfo.status = `1`
+				break
+			case 2:
+				plzinfo.status = `4`
+				break
+			case 3:
+				plzinfo.status = `5`
+				break
+			case 4:
+				plzinfo.status = `2`
+				break
+		}
+		firstgetqueryCgdList()
+	}
+	const clickconfirm = () => {
+		if (chongzhiLock) return
+		chongzhiLock = true
+		plzinfo.pageNo = 1;
+		plzinfo.canpull = true;
+		firstgetqueryCgdList()
+		setTimeout(() => chongzhiLock = false, 500)
+	}
+	let chongzhiLock = false
+
+	const chongzhi = () => {
+		if (chongzhiLock) return
+		chongzhiLock = true
+
+		plzinfo.searchContent = ""
+		changetype(0)
+		firstgetqueryCgdList()
+
+		setTimeout(() => chongzhiLock = false, 500)
 	}
-	const tagesstatues = ["待出库", "已出库", '已收货'];
 	const plsbuy = ref([])
 	const alltotal = ref(0);
 	const lefttarget = ref(0)
@@ -213,31 +261,21 @@
 		pageNo: 1,
 		pageSize: 10,
 		canpull: true,
-		cgdParamInfo: "",
+		searchContent: "",
-		suppliers: "",
+		status: "1,2,4,5",
-		// cgdType: "0,1",
+		elderId: uni.getStorageSync('NUall').elderId,
-		startTime: "",
+		nuId: uni.getStorageSync('nuId')
-		endTime: "",
-		cgBy: "",
-		// nuId: uni.getStorageSync('nuId')
 	})
-	const mobanplzinfo = {
+
-		pageNo: 1,
-		pageSize: 10,
-		canpull: true,
-		cgdParamInfo: "",
-		suppliers: "",
-		// cgdType: "0,1",
-		startTime: "",
-		endTime: "",
-		cgBy: "",
-		// nuId: uni.getStorageSync('nuId')
-	}
 	const nomessageshow = ref(false);
 	const leftscrolltop = ref(0)
+
+	const rightarray = ref([]);
 	const firstgetqueryCgdList = () => {
-		queryCgdList(plzinfo).then((res : any) => {
+		rightarray.value = []
-			// console.log("加载", res.result.records)
+		plsbuy.value = []
+		queryQld(plzinfo).then((res : any) => {
+			console.log("加载", plzinfo, res.result.records)
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
 			if (!res.result.total) {
@@ -245,10 +283,13 @@
 				nomessageshow.value = true;
 			}
 			// console.log("请购单数据呢???", res)
-			// if (res.result.records.length) {
+			if (res.result.records.length) {
-			// 	form.cgdId = plsbuy.value[0].id
 				// queryInvo(0);
-			// }
+				queryQldWlInfo({ qldNo: res.result.records[0].qldNo }).then((element : any) => {
+					console.log("aaaaa", element.result)
+					rightarray.value.push(...element.result)
+				})
+			}
 
 			if (res.result.records.length < plzinfo.pageSize) {
 				plzinfo.canpull = false;
@@ -270,7 +311,7 @@
 	//获得采购单列表
 	const getqueryCgdList = () => {
 		if (!plzinfo.canpull) return
-		queryCgdList(plzinfo).then((res : any) => {
+		queryQld(plzinfo).then((res : any) => {
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
 			if (res.result.records.length < plzinfo.pageSize) {
@@ -282,6 +323,11 @@
 		let num = Math.ceil((index + 1))
 		leftscrolltop.value = (num - 2) * 178.5;
 		lefttarget.value = index;
+		rightarray.value = [];
+		queryQldWlInfo({ qldNo: plsbuy.value[index].qldNo }).then((element : any) => {
+			console.log("aaaaa", element.result)
+			rightarray.value.push(...element.result)
+		})
 		// form.cgdId = plsbuy.value[index].id
 		// form.pageNo = 1
 		// form.canpull = true;
@@ -300,9 +346,11 @@
 		// }
 
 	}
+	const serverUrl = ref("")
 	onLoad(() => {
+		// console.log("查看",uni.getStorageSync('NUall'))
 		firstgetqueryCgdList();
-		// serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
+		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
 		// getSelectList();
 	})
 	// const emit = defineEmits(['changePageNumber']) // 也可以用类型签名（见下面）
@@ -312,7 +360,6 @@
 </script>
 
 <style scoped lang="less">
-
 	.right-container-tem {
 		display: flex;
 
@@ -400,6 +447,16 @@
 				// margin-left: -5rpx;
 			}
 		}
+
+		.scr:active,
+		.shx:active {
+			color: #1083F8;
+			background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
+			border: 1rpx solid #1083F8;
+			transition: .4s;
+			-webkit-transform-style: preserve-3d;
+			-webkit-overflow-scrolling: touch;
+		}
 	}
 
 	.other-contain {
@@ -668,15 +725,18 @@
 			width: 64%;
 			margin-left: 1%;
 			height: 103.5%;
+
 			.right-contain {
 				width: 100%;
 				height: 100%;
 				display: flex;
 				flex-wrap: wrap;
+
 				.right-ones {
 					display: flex;
 					width: 100%;
 					flex-wrap: wrap;
+
 					.right-one {
 						width: 570rpx;
 						height: 261rpx;
@@ -685,17 +745,23 @@
 						background-color: #fff;
 						border-radius: 30rpx;
 						display: flex;
+
 						.right-one-left {
 							height: 100%;
 							width: 40%;
 							display: flex;
 							flex-direction: column;
 							align-items: center;
+
 							.left-image {
-								width: 170rpx;
+								width: 150rpx;
-								height: 170rpx;
+								height: 150rpx;
+								// margin: 15rpx 0;
+								margin-top: 10rpx;
+								margin-bottom: 15rpx;
 								// margin-top: 5rpx;
 							}
+
 							.left-tages {
 								width: 130rpx;
 								height: 43rpx;
@@ -709,36 +775,51 @@
 								font-size: 23rpx;
 							}
 						}
+
 						.right-one-right {
 							height: 100%;
 							width: 60%;
+
 							.right-title {
 								font-size: 34rpx;
 								font-weight: 600;
 								margin-top: 25rpx;
 								color: #222222;
+								width: 300rpx;
+								overflow: hidden;
+								/* 必须 */
+								white-space: nowrap;
+								/* 强制单行 */
+								text-overflow: ellipsis;
+								/* 显示省略号 */
 							}
+
 							.right-setting {
 								color: #888888;
 								margin-top: 5rpx;
 								font-size: 25rpx;
 							}
+
 							.right-mm {
 								color: #555555;
 								font-size: 28rpx;
 							}
+
 							.right-down {
 								display: flex;
 								margin-top: 15rpx;
+
 								.right-first-num {
 									font-size: 35rpx;
 									color: #555555;
 									font-weight: 600;
 								}
+
 								.right-first-type {
 									color: #888888;
 									font-size: 23rpx;
 								}
+
 								.right-shu {
 									width: 2rpx;
 									height: 50rpx;

pages/watch/index.vue

@@ -706,7 +706,7 @@
 		uni.setStorageSync('nuName', filteredMenu.value[savetypeNow.value].nuName);
 		uni.setStorageSync('customerId', filteredMenu.value[savetypeNow.value].elderInfo ? filteredMenu.value[savetypeNow.value].elderInfo?.id : null);
 		uni.setStorageSync('NUall', filteredMenu.value[savetypeNow.value]);
-		// console.log("??????1111", filteredMenu.value[savetypeNow.value])
+		console.log("??????1111", filteredMenu.value[savetypeNow.value])
 		if (!typeNow.value) {
 			uni.navigateTo({
 				url: '/pages/NursingNew/index'

unpackage/dist/dev/.nvue/pages/camera.js

@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };

unpackage/dist/dev/.nvue/pages/fullcamera.js

@@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };