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

pages/Warehouse/picking.vue

@@ -339,9 +339,11 @@
 				</view>
 			</view>
 			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation v-if="topbuttontarget==0">
-				<view class="photowall-other-one" v-for="(item,index) in jhdanarr" :key="index" @click="previewImage(item,index,jhdanarr,2)">
-					<image style="width: 100%;height: 70%;border-radius: 30rpx;" 
-					:src="item.jhPic?serverUrl + item.jhPic:'/static/ceshiyaoshan.png'" mode="aspectFill" :lazy-load="true"/>
+				<view class="photowall-other-one" v-for="(item,index) in jhdanarr" :key="index"
+					@click="previewImage(item,index,jhdanarr,2)">
+					<image style="width: 100%;height: 70%;border-radius: 30rpx;"
+						:src="item.jhPic?serverUrl + item.jhPic:'/static/ceshiyaoshan.png'" mode="aspectFill"
+						:lazy-load="true" />
 					<view style="margin-top: 20rpx;">
 						<text style="color: #888888;">
 							上传时间:
@@ -361,9 +363,10 @@
 				</view>
 			</scroll-view>
 			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation v-if="topbuttontarget==1">
-				<view class="photowall-other-one" v-for="(item,index) in suixingdanarr" :key="index" @click="previewImage(item,index,suixingdanarr,1)">
-					<image style="width: 100%;height: 70%;border-radius: 30rpx;" 
-					:src="item.sxdPic?serverUrl + item.sxdPic:'/static/ceshiyaoshan.png'" mode="aspectFill"/>
+				<view class="photowall-other-one" v-for="(item,index) in suixingdanarr" :key="index"
+					@click="previewImage(item,index,suixingdanarr,1)">
+					<image style="width: 100%;height: 70%;border-radius: 30rpx;"
+						:src="item.sxdPic?serverUrl + item.sxdPic:'/static/ceshiyaoshan.png'" mode="aspectFill" />
 					<view style="margin-top: 20rpx;">
 						<text style="color: #888888;">
 							上传时间:
@@ -382,12 +385,9 @@
 					</view>
 				</view>
 				<view class="photowall-other-one" v-if="topbuttontarget==1">
-					<view
-						style="width: 100%;height: 70%;display: flex;flex-direction: column;
+					<view style="width: 100%;height: 70%;display: flex;flex-direction: column;
 						justify-content: center;align-items: center;position: absolute;top:3vw;left: 0;
-						background-color:#fafdff ;border: 1rpx solid #78B1EB;border-radius: 30rpx;"
-						@click="uplod(1)"
-						>
+						background-color:#fafdff ;border: 1rpx solid #78B1EB;border-radius: 30rpx;" @click="uplod(1)">
 						<image style="width: 70rpx;height: 70rpx;margin-bottom: 5rpx;"
 							src="/static/index/warehouse/procurement/picking/addphoto.png" />
 						<view style="color: #78B1EB;">
@@ -395,12 +395,12 @@
 						</view>
 					</view>
 				</view>
-				
+
 			</scroll-view>
 		</view>
-		
-		
-		
+
+
+
 		<view class="contain-left">
 			<view class="left-select-more" v-show="openselect">
 				<view class="more-bottom">
@@ -809,9 +809,9 @@
 								{{showvalue.categoryId_dictText}}
 							</view>
 							<view class="tags-one" v-if="showvalue.typeId_dictText">{{showvalue.typeId_dictText}}</view>
-							<view class="tags-one" v-if="showvalue.medicationId_dictText">
+							<!-- <view class="tags-one" v-if="showvalue.medicationId_dictText">
 								{{showvalue.medicationId_dictText}}
-							</view>
+							</view> -->
 						</view>
 					</view>
 					<view class="right-bottom-right">
@@ -949,8 +949,8 @@
 							{{showvalue.wlUnits}}
 						</view>
 					</view>
-					<scroll-view style="width: 110%;height: 400rpx;display: flex;flex-wrap: wrap;" scroll-y="true" 
-					 scroll-with-animation @scrolltolower="lhjlfy()">
+					<scroll-view style="width: 110%;height: 400rpx;display: flex;flex-wrap: wrap;" scroll-y="true"
+						scroll-with-animation @scrolltolower="lhjlfy()">
 						<view
 							style=" display: inline-block;width: 45%;height: 180rpx;background-color: #F9F9F9;border-radius: 30rpx;margin-right: 2%;margin-top: 20rpx;padding: 0 30rpx;color: #888888;"
 							v-for="(item,index) in lhjlarr" :key="index">
@@ -1004,12 +1004,12 @@
 						</view>
 						<view
 							style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 20rpx;">
-							<image  v-if="statustory=='loading'"
+							<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>
+							<text v-if="statustory=='loading'">上划加载更多</text>
+							<text v-if="statustory=='nomore'">已加载全部~</text>
+							<text v-if="statustory=='loadmore'">加载中~</text>
 						</view>
 					</scroll-view>
 
@@ -1091,7 +1091,7 @@
 
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps, onUnmounted } from 'vue';
-	import { queryPickingRecordList,queryJhzpList,addSxd,querySxdList,queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice, pickingInfo } from './api/lunpan.js'
+	import { queryPickingRecordList, queryJhzpList, addSxd, querySxdList, queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice, pickingInfo } from './api/lunpan.js'
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import calendar from '@/component/public/calendar.vue'
 	import superpicker from '@/component/public/superpicker.vue'
@@ -1488,20 +1488,20 @@
 	const lhjlarr = ref([])
 	const lhjpageNo = ref(1)
 	const statustory = ref('loading')
-	const lhjilu = () =>{
+	const lhjilu = () => {
 		let obj = {
-			cgdId:showvalue.value.cgdId,
-			wlId:showvalue.value.wlId,
+			cgdId: showvalue.value.cgdId,
+			wlId: showvalue.value.wlId,
 			pageNo: lhjpageNo.value,
 			pageSize: 10,
 		}
-		queryPickingRecordList(obj).then(res=>{
+		queryPickingRecordList(obj).then(res => {
 			lhjlarr.value.push(...res.result.records)
-			statustory.value = (res.result.total == lhjlarr.value.length || res.result.records.length==0 ? 'nomore' : 'loadmore')
+			statustory.value = (res.result.total == lhjlarr.value.length || res.result.records.length == 0 ? 'nomore' : 'loadmore')
 		})
 	}
-	const lhjlfy =()=>{
-		if(statustory.value == 'nomore' ){return}
+	const lhjlfy = () => {
+		if (statustory.value == 'nomore') { return }
 		lhjpageNo.value++;
 		lhjilu()
 	}
@@ -1600,14 +1600,14 @@
 	const donghuaopo = ref(false)
 	const suixingdanarr = ref([])
 	const jhdanarr = ref([])
-	
+
 	const donghuastart = (index : number) => {
-		if(index==1){
+		if (index == 1) {
 			sxdarr()
-		}else{
+		} else {
 			JhzpList()
 		}
-		
+
 		topbuttontarget.value = index;
 		donghuaopo.value = false;
 		setTimeout(() => {
@@ -1615,26 +1615,26 @@
 		}, 100)
 	}
 	const Jhz = ref(1)
-	 const JhzpList =()=>{
-		 let obj = {
-		 	cgdId:plsbuy.value[lefttarget.value].id,
-		 }
-		 queryJhzpList(obj).then(res=>{
-			jhdanarr.value=res.result
-		 })
-	 }
-	const sxdarr = ()=>{
+	const JhzpList = () => {
 		let obj = {
-			cgdId:plsbuy.value[lefttarget.value].id,
-			pageNo:1,
-			pageSize:-1
+			cgdId: plsbuy.value[lefttarget.value].id,
 		}
-		querySxdList(obj).then(res=>{
+		queryJhzpList(obj).then(res => {
+			jhdanarr.value = res.result
+		})
+	}
+	const sxdarr = () => {
+		let obj = {
+			cgdId: plsbuy.value[lefttarget.value].id,
+			pageNo: 1,
+			pageSize: -1
+		}
+		querySxdList(obj).then(res => {
 			console.log(res.result.records)
 			suixingdanarr.value = res.result.records
 		})
 	}
-	const sxdupld = (e)=>{
+	const sxdupld = (e) => {
 		let now = new Date();
 		let year = now.getFullYear();
 		let month = now.getMonth() + 1;
@@ -1643,15 +1643,15 @@
 			filePath: e,
 			name: 'file',
 			formData: {
-				biz: 'sxdPic/'+year+'/'+month
+				biz: 'sxdPic/' + year + '/' + month
 			},
 			header: {
 				'X-Access-Token': uni.getStorageSync('token')
 			},
 			success: res => {
 				const data = JSON.parse(res.data)
-				addSxd({sxdPic:data.message,cgdId:plsbuy.value[lefttarget.value].id}).then(resd=>{
-					if(resd.success){
+				addSxd({ sxdPic: data.message, cgdId: plsbuy.value[lefttarget.value].id }).then(resd => {
+					if (resd.success) {
 						sxdarr()
 					}
 				})
@@ -1663,7 +1663,7 @@
 	}
 	// 上传
 	const albumlist = ref([])
-	const uplod = (type:number) => {
+	const uplod = (type : number) => {
 		uni.chooseImage({
 			count: 1, //默认9
 			sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
@@ -1674,53 +1674,53 @@
 					src: JSON.parse(ar)[0],
 					quality: 60,
 					success: res => {
-						if(!type){
+						if (!type) {
 							albumlist.value.push(res.tempFilePath)
-						}else if(type==1){
+						} else if (type == 1) {
 							sxdupld(res.tempFilePath)
 							console.log(res.tempFilePath)
 						}
-						
+
 					}
 				})
 			}
 		});
 	}
 	// 预览
-	const previewImage = (v, i, arr ,n) => {
-		if(n==1){
+	const previewImage = (v, i, arr, n) => {
+		if (n == 1) {
 			let u = []
-			arr.forEach(e=>{
-				u.push(serverUrl.value+e.sxdPic)
+			arr.forEach(e => {
+				u.push(serverUrl.value + e.sxdPic)
 			})
 			uni.previewImage({
 				current: i,
 				urls: u,
-				showmenu:false,
+				showmenu: false,
 				longPressActions: {
 					itemList: [],
 				}
 			})
 		}
-		else if(n==2){
+		else if (n == 2) {
 			let u = []
-			arr.forEach(e=>{
-				u.push(serverUrl.value+e.jhPic)
+			arr.forEach(e => {
+				u.push(serverUrl.value + e.jhPic)
 			})
 			uni.previewImage({
 				current: i,
 				urls: u,
-				showmenu:false,
+				showmenu: false,
 				longPressActions: {
 					itemList: [],
 				}
 			})
 		}
-		else{
+		else {
 			uni.previewImage({
 				current: i,
 				urls: arr,
-				showmenu:false,
+				showmenu: false,
 				longPressActions: {
 					itemList: [],
 				}
@@ -1825,8 +1825,8 @@
 		})
 	}
 	const addupimg = ref([])
-	const sctp = (e : number ) => {
-		if (albumlist.value.length == 0 ) {
+	const sctp = (e : number) => {
+		if (albumlist.value.length == 0) {
 			fag(e)
 			return
 		}
@@ -1839,7 +1839,7 @@
 				filePath: item,
 				name: 'file',
 				formData: {
-					biz: 'jhPic/'+year+'/'+month
+					biz: 'jhPic/' + year + '/' + month
 				},
 				header: {
 					'X-Access-Token': uni.getStorageSync('token')
@@ -3127,14 +3127,14 @@
 
 		.photowall-other {
 			width: 110%;
-			height:67vh;
+			height: 67vh;
 			display: flex;
 			margin-top: 40rpx;
-			
+
 			.photowall-other-one {
 				width: 28.5%;
 				height: 400rpx;
-				margin-right:3vw;
+				margin-right: 3vw;
 				margin-bottom: 3%;
 				border-radius: 30rpx;
 				display: inline-block;

pages/Warehouse/purchaseorder.vue

@@ -495,8 +495,22 @@
 		}
 
 	}
+	
 	const search = () => {
-		// if (!searchValue.value) return
+		// plzinfo.pageNo = 1;
+		// plsbuy.value = [];
+		// queryCgdList(plzinfo).then((res : any) => {
+		// 	plsbuy.value.push(...res.result.records)
+			
+		// 	if (res.result.records.length) {
+		// 		form.cgdId = plsbuy.value[0].id
+		// 		queryInvo();
+		// 	}
+		// 	if (res.result.records.length < plzinfo.pageSize) {
+		// 		plzinfo.canpull = false;
+		// 	}
+		// })
+		if (!searchValue.value) return
 		form.pageNo = 1;
 		InvoicingList.value = [];
 		middletarget.value = 0;

pages/procurement/purchaseorder.vue

@@ -3,10 +3,10 @@
 		<view v-show="moreindex!=-1" class="mengban" @click="moreindex=-1"></view>
 		<view class="contain-left">
 			<view class="title-input-father">
-				<input class="title-input" type="text" v-model="searchValue" maxlength="15" placeholder="采购单号/采购日期/供应商"
-					@confirm="search()" />
-				<image v-show="searchValue" class="title-input-img" src="@/static/x.png"
-					@click="searchValue='';search()" />
+				<input class="title-input" type="text" v-model="plzinfo.cgdParamInfo" maxlength="15"
+					placeholder="采购单号/采购日期/供应商" @confirm="search()" />
+				<image v-show="plzinfo.cgdParamInfo" class="title-input-img" src="@/static/x.png"
+					@click="plzinfo.cgdParamInfo=``;search()" />
 				<view class="title-input-button" @click="search()">
 					检索
 				</view>
@@ -45,68 +45,103 @@
 						<view class="pls-card-middle">
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
-									{{ v.createTime?.split(' ')[0] }}
+									{{ v.qgDate }}
 								</view>
 								<view class="middle-heng-father">
 									<view class="middle-heng"
 										style="border-top-left-radius: 20rpx;border-bottom-left-radius: 20rpx;"></view>
-									<view class="middle-heng" v-if="Number(v.status)<3 "
-										style="border-radius: 20rpx;background-color: #1083F8;"></view>
-									<view class="middle-ball"
-										:style="Number(v.status)<3?{backgroundColor: `#1083F8`}:{} "></view>
+									<view class="middle-heng" style="border-radius: 20rpx;background-color: #1083F8;">
+									</view>
+									<!-- <view class="middle-heng" v-if="Number(v.status)<3 "
+											style="border-radius: 20rpx;background-color: #1083F8;"></view> -->
+									<!-- <view class="middle-ball"
+										:style="Number(v.status)<3?{backgroundColor: `#1083F8`}:{} "></view> -->
+									<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
 								</view>
 								<view class="end-font">
-									<view class="" :style="Number(v.status)<3?{color: `#1083F8`}:{} ">
+									<!-- <view class="" :style="Number(v.status)<3?{color: `#1083F8`}:{} ">
+										采购
+									</view> -->
+									<view class="" :style="{color: `#1083F8`}">
 										采购
 									</view>
-									<view class="">
-										[ {{ v.createBy_dictText }} ]
+									<view style="font-size: 25rpx;">
+										{{ "[ " + v.qgBy + " ]" }}
 									</view>
 								</view>
 							</view>
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
+									{{ v.jhTime?.slice(0,10) }}
 								</view>
 								<view class="middle-heng-father">
 									<view class="middle-heng"></view>
-									<view class="middle-heng" v-if="Number(v.status)<3 && Number(v.status)>0 "
+									<!-- <view class="middle-heng"
+										style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
+									</view> -->
+									<view class="middle-heng" v-if="Number(v.status)>0"
 										style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
 									</view>
 									<view class="middle-ball"
-										:style="Number(v.status)<3 && Number(v.status)>0?{backgroundColor: `#1083F8`}:{} ">
+										:style="Number(v.status)>0?{backgroundColor: `#1083F8`}:{} ">
+									</view>
+									<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
+									<view class="middle-ball"
+										:style="Number(v.status)>0?{backgroundColor: `#1083F8`}:{} ">
 									</view>
 								</view>
 								<view class="end-font">
-									<view class=""
-										:style="Number(v.status)<3 && Number(v.status)>0?{color: `#1083F8`}:{} ">
+									<view class="" :style="Number(v.status)>0?{color: `#1083F8`}:{}">
 										拣货
 									</view>
-									<view class="">
+									<view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.jhBy">
+										{{ "[ " + v.jhBy + " ]" }}
 									</view>
 								</view>
 							</view>
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
+									{{ v.wjTime?.slice(0,10) }}
 								</view>
 								<view class="middle-heng-father">
-									<view class="middle-heng"
-										style="border-top-right-radius: 20rpx;border-bottom-right-radius: 20rpx;">
-									</view>
-									<view class="middle-heng" v-if="Number(v.status)<3 && Number(v.status)>1 "
+									<view class="middle-heng"></view>
+									<!-- <view class="middle-heng"
+										style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
+									</view> -->
+									<view class="middle-heng" v-if="Number(v.status)>1"
 										style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
 									</view>
 									<view class="middle-ball"
-										:style="Number(v.status)<3 && Number(v.status)>1?{backgroundColor: `#1083F8`}:{} ">
+										:style="Number(v.status)>1?{backgroundColor: `#1083F8`}:{} ">
+									</view>
+									<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
+									<view class="middle-ball"
+										:style="Number(v.status)>1?{backgroundColor: `#1083F8`}:{} ">
 									</view>
 								</view>
 								<view class="end-font">
-									<view class=""
-										:style="Number(v.status)<3 && Number(v.status)>1?{color: `#1083F8`}:{} ">
+									<view class="" :style="Number(v.status)>1?{color: `#1083F8`}:{}">
+										完结
+									</view>
+									<view style="font-size: 25rpx;" v-if="Number(v.status)>0 && v.jhBy">
+										{{ "[ " + v.wjBy + " ]" }}
+									</view>
+								</view>
+								<!-- <view class="middle-heng-father">
+									<view class="middle-heng"
+										style="border-top-right-radius: 20rpx;border-bottom-right-radius: 20rpx;">
+									</view>
+							
+									<view class="middle-ball">
+									</view>
+								</view>
+								<view class="end-font">
+									<view class="">
 										完结
 									</view>
 									<view class="">
 									</view>
-								</view>
+								</view> -->
 							</view>
 						</view>
 						<view class="pls-card-end">
@@ -116,8 +151,12 @@
 									{{ v.gysName }}
 								</view>
 							</view>
-							<view :class="v?.cgdType=='9' ?`tag-fail`:`tag-success`">
+							<!-- <view :class="v?.cgdType=='9' ?`tag-fail`:`tag-success`">
 								{{ v?.cgdType=='9' ?`已作废`:`已确定` }}
+							</view> -->
+							<view :class="v?.cgdType=='9' ?`tag-fail`:`tag-success`">
+								
+								{{ v?.cgdType=='9' ?`已作废`:tagesstatues[Number(v.status)]  }}
 							</view>
 						</view>
 					</view>
@@ -127,7 +166,8 @@
 		<view class="white-zhezhao"></view>
 		<view class="contain-right">
 			<view class="contain-right-title">
-				<view class="contain-right-button" style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;"  @click="ification=true">
+				<view class="contain-right-button" style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;"
+					@click="ification=true">
 					<image class="buttont-img" src="/static/index/purchaseorder/select.png" />
 					<view class="button-font">
 						筛选
@@ -141,7 +181,7 @@
 				</view>
 			</view>
 			<view class="contain-right-middle">
-				<scroll-view scroll-y="true" class="middle-Y" >
+				<scroll-view scroll-y="true" class="middle-Y">
 					<view class="middle-Y-father">
 						<view class="middle-one" v-for="(v,i) in InvoicingList" :key='i'
 							:style="{border: middletarget === i? '4rpx dashed #1083F8': '4rpx solid transparent'}"
@@ -179,9 +219,9 @@
 							<view class="tags-one">
 								{{ showvalue?.typeId_dictText }}
 							</view>
-							<view class="tags-one">
+							<!-- <view class="tags-one">
 								{{ showvalue?.tagName }}
-							</view>
+							</view> -->
 
 						</view>
 					</view>
@@ -356,7 +396,8 @@
 			</view>
 		</view>
 		<view class="mengban" v-if="ification" @click="ification = false"></view>
-		<classification @confirm="confirm" :show="ification" :typenum="2" :cgdId="plsbuy[lefttarget]?.id"></classification>
+		<classification @confirm="confirm" :show="ification" :typenum="2" :cgdId="plsbuy[lefttarget]?.id">
+		</classification>
 	</view>
 </template>
 
@@ -371,7 +412,7 @@
 		firstgetqueryCgdList();
 		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
 	})
-
+	const tagesstatues = ["待入库", "待完结", "已完结"];
 	const searchValue = ref("");
 	const middletarget = ref(0);
 
@@ -392,7 +433,7 @@
 	const firstgetqueryCgdList = () => {
 		queryCgdList(plzinfo).then((res : any) => {
 			plsbuy.value.push(...res.result.records)
-			// console.log("zzzz", plsbuy.value)
+			console.log("zzzz", plsbuy.value)
 			if (res.result.records.length) {
 				form.cgdId = plsbuy.value[0].id
 				queryInvo();
@@ -404,13 +445,13 @@
 
 		})
 	}
-	const confirm =(e:any)=>{
+	const confirm = (e : any) => {
 		form.categoryId = e.categoryId;
 		form.typeId = e.typeId;
 		form.medicationId = e.medicationId;
 		form.suppliers = e.suppliers;
 		form.cgdId = e.cgdId;
-		form.pageNo=1;
+		form.pageNo = 1;
 		InvoicingList.value = [];
 		queryInvo();
 		ification.value = false
@@ -462,7 +503,7 @@
 		typeId: '',
 		medicationId: '',
 		wlParamInfo: '',
-		suppliers:'',
+		suppliers: '',
 		cgdId: "",
 		isWaring: 0,
 		canpull: true,
@@ -487,12 +528,13 @@
 	const InvoicingList = ref([])
 	const queryInvo = () => {
 		queryCgdInfoList(form).then(res => {
-			console.log(res.result.records)
+			// console.log(res.result.records)
+			InvoicingList.value = [];
 			InvoicingList.value.push(...res.result.records);
 			clickmiddle(middletarget.value);
 		})
 	}
- 
+
 	const search = () => {
 		// if (!searchValue.value) return
 		form.pageNo = 1;
@@ -501,7 +543,7 @@
 		// form.wlParamInfo = searchValue.value;
 		// form.cgdId = plsbuy.value[lefttarget.value].id
 		// queryInvo();
-		
+
 		plzinfo.pageNo = 1;
 		plsbuy.value = [];
 		queryCgdList(plzinfo).then((res : any) => {
@@ -562,7 +604,7 @@
 	const badshow = ref(false);
 	const donghuacs = ref(false)
 	const bebad = (v) => {
-		if(Number(v.status)==1){
+		if (Number(v.status) == 1) {
 			setTimeout(() => {
 				uni.showToast({
 					title: '只有采购阶段的单据才能作废',

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

@@ -1,6 +1,6 @@
 import { _ as _export_sfc, f as formatAppLog, r as requireNativePlugin } from "../_plugin-vue_export-helper.js";
 import { resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeStyle, createVNode } from "vue";
-const _style_0 = { "center-column": { "": { "width": 800, "height": 600, "overflow": "hidden" } } };
+const _style_0 = { "center-column": { "": { "width": 800, "height": 500, "overflow": "hidden" } } };
 const _sfc_main = {
   data() {
     return {
@@ -556,12 +556,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, [
     createElementVNode("div", {
       class: "center-column",
-      style: normalizeStyle({ height: $data.isshow ? "600px" : "0px" })
+      style: normalizeStyle({ height: $data.isshow ? "500px" : "0px" })
     }, [
       createVNode(_component_MonitorView, {
         ref: "monitor",
         init: "5",
-        style: { "width": "800px", "height": "600px" },
+        style: { "width": "800px", "height": "500px" },
         onOnTel: $options.handleTelEvent,
         onOnSnapShot: $options.handleSnapShotEvent,
         onOnRecord: $options.handleRecordEvent,

unpackage/dist/build/app-plus/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__FB2D473",
   "name": "护理单元",
   "version": {
-    "name": "1.0.008",
-    "code": 10008
+    "name": "1.0.009",
+    "code": 10009
   },
   "description": "护理单元",
   "developer": {

unpackage/dist/build/app-plus/pages/assess/index.css

@@ -1 +1 @@
-.calendar[data-v-0bf11501]{padding:16px}.header[data-v-0bf11501]{display:flex;flex-direction:column}.header-title[data-v-0bf11501]{display:flex;justify-content:space-between;align-items:center}.year-month[data-v-0bf11501]{font-size:18px;font-weight:700;margin-bottom:8px}.botton-father[data-v-0bf11501]{display:flex;margin-top:-.625rem}.click-button[data-v-0bf11501]{padding:.3125rem;width:3.75rem;font-size:.78125rem;height:1.25rem;margin-right:.3125rem;display:flex;justify-content:center;align-items:center;color:#fff;background-color:#888;border-radius:.3125rem}.weekdays[data-v-0bf11501]{display:flex;background-color:#e9e7fc;border-radius:.9375rem;padding:.3125rem}.weekday[data-v-0bf11501]{flex:1;text-align:center}.days[data-v-0bf11501]{display:flex;flex-wrap:wrap;padding:.3125rem}.day-cell[data-v-0bf11501]{width:2.29688rem;height:2.51563rem;text-align:center;padding-top:.25rem;padding-bottom:.25rem;box-sizing:border-box}.day-cell.prev-month .gregorian[data-v-0bf11501],.day-cell.next-month .gregorian[data-v-0bf11501]{color:#ccc}.day-cell.selected[data-v-0bf11501]{background-color:#0b98dc;border-radius:.3125rem}.day-cell.selected .gregorian[data-v-0bf11501],.day-cell.selected .lunar[data-v-0bf11501]{color:#fff}.gregorian[data-v-0bf11501]{font-size:14px}.lunar[data-v-0bf11501]{font-size:10px;color:#888}.backgroundContainer[data-v-65a124ce]{position:relative;width:100%;height:100vh;background-image:url(../../static/index/lightbgcnew.png);background-size:cover;background-position:center center;overflow:hidden}.assess-title[data-v-65a124ce]{margin-top:1.875rem;width:100%;height:1.875rem;display:flex;align-items:center;justify-content:space-between}.assess-title .right-icons[data-v-65a124ce]{display:flex;align-items:center;float:right;height:2.1875rem;margin-right:1.25rem}.assess-title .right-icons .right-icons-font[data-v-65a124ce]{margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-font-dark[data-v-65a124ce]{color:#fff;margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-img[data-v-65a124ce]{width:2.5rem;height:2.5rem;margin-left:.3125rem;margin-right:.3125rem;margin-top:-.625rem}.assess-title .right-icons .right-icons-img-icon[data-v-65a124ce]{width:1.875rem;height:2.5rem;margin-left:.25rem}.assess-title .left-icons[data-v-65a124ce]{display:flex;margin-left:1.25rem}.assess-title .left-icons .left-icons-img[data-v-65a124ce]{width:2.1875rem;height:2.1875rem}.assess-title .left-icons .right-icons-font[data-v-65a124ce]{font-weight:700;font-size:1.09375rem;margin-left:.3125rem;margin-top:.3125rem}.assess-title .left-icons .right-icons-text[data-v-65a124ce]{font-size:1.09375rem;margin-top:.3125rem}.assess-another[data-v-65a124ce]{width:100%;height:calc(100vh - 3.75rem);margin-top:.3125rem;display:flex;margin-left:1.5625rem}.assess-another .left-contain[data-v-65a124ce]{height:100%;width:18.75rem}.assess-another .left-contain .calendar[data-v-65a124ce]{width:100%;height:20.3125rem;background:linear-gradient(to top,#f4f3ff,#fff,#ecefff);border-radius:.78125rem}
+.calendar[data-v-02393a84]{padding:16px;background:#fff;border-radius:.9375rem;box-shadow:0 2px 6px rgba(0,0,0,.1);margin:0 auto}.header[data-v-02393a84]{width:100%;display:flex;flex-direction:column}.header-title[data-v-02393a84]{width:100%;display:flex;justify-content:space-between;align-items:center;margin-bottom:.3125rem}.year-month[data-v-02393a84]{font-size:18px;font-weight:700}.weekdays[data-v-02393a84]{display:flex;background-color:#f8f8fa;border-radius:.5625rem;padding:.25rem;margin-top:.25rem}.weekday[data-v-02393a84]{flex:1;text-align:center;font-size:12px}.days[data-v-02393a84]{display:flex;flex-wrap:wrap;padding:.25rem 0}.day-cell[data-v-02393a84]{width:calc(100% / 7);height:2.4375rem;text-align:center;padding-top:.25rem;box-sizing:border-box;position:relative}.day-cell.prev-month .gregorian[data-v-02393a84],.day-cell.next-month .gregorian[data-v-02393a84]{color:#ccc}.day-cell.in-range[data-v-02393a84]{background-color:#e6f7ff}.day-cell.start[data-v-02393a84],.day-cell.end[data-v-02393a84]{background-color:#0b98dc;border-radius:.25rem}.day-cell.start .gregorian[data-v-02393a84],.day-cell.end .gregorian[data-v-02393a84],.day-cell.start .lunar[data-v-02393a84],.day-cell.end .lunar[data-v-02393a84]{color:#fff}.gregorian[data-v-02393a84]{font-size:14px}.lunar[data-v-02393a84]{font-size:10px;color:#888}.head-left[data-v-02393a84]{width:3.125rem;display:flex;justify-content:space-between}.head-left .head-img[data-v-02393a84]{width:1.25rem;height:1.25rem}.backgroundContainer[data-v-65a124ce]{position:relative;width:100%;height:100vh;background-image:url(../../static/index/lightbgcnew.png);background-size:cover;background-position:center center;overflow:hidden}.assess-title[data-v-65a124ce]{margin-top:1.875rem;width:100%;height:1.875rem;display:flex;align-items:center;justify-content:space-between}.assess-title .right-icons[data-v-65a124ce]{display:flex;align-items:center;float:right;height:2.1875rem;margin-right:1.25rem}.assess-title .right-icons .right-icons-font[data-v-65a124ce]{margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-font-dark[data-v-65a124ce]{color:#fff;margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-img[data-v-65a124ce]{width:2.5rem;height:2.5rem;margin-left:.3125rem;margin-right:.3125rem;margin-top:-.625rem}.assess-title .right-icons .right-icons-img-icon[data-v-65a124ce]{width:1.875rem;height:2.5rem;margin-left:.25rem}.assess-title .left-icons[data-v-65a124ce]{display:flex;margin-left:1.25rem}.assess-title .left-icons .left-icons-img[data-v-65a124ce]{width:2.1875rem;height:2.1875rem}.assess-title .left-icons .right-icons-font[data-v-65a124ce]{font-weight:700;font-size:1.09375rem;margin-left:.3125rem;margin-top:.3125rem}.assess-title .left-icons .right-icons-text[data-v-65a124ce]{font-size:1.09375rem;margin-top:.3125rem}.assess-another[data-v-65a124ce]{width:100%;height:calc(100vh - 3.75rem);margin-top:.3125rem;display:flex;margin-left:1.5625rem}.assess-another .left-contain[data-v-65a124ce]{height:100%;width:18.75rem}.assess-another .left-contain .calendar[data-v-65a124ce]{width:100%;height:20.3125rem;background:linear-gradient(to top,#f4f3ff,#fff,#ecefff);border-radius:.78125rem}

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
 };

unpackage/resources/__UNI__FB2D473/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.008","code":10008},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Camera":{},"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.009","code":10009},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Camera":{},"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}

unpackage/resources/__UNI__FB2D473/www/pages/assess/index.css

@@ -1 +1 @@
-.calendar[data-v-0bf11501]{padding:16px}.header[data-v-0bf11501]{display:flex;flex-direction:column}.header-title[data-v-0bf11501]{display:flex;justify-content:space-between;align-items:center}.year-month[data-v-0bf11501]{font-size:18px;font-weight:700;margin-bottom:8px}.botton-father[data-v-0bf11501]{display:flex;margin-top:-.625rem}.click-button[data-v-0bf11501]{padding:.3125rem;width:3.75rem;font-size:.78125rem;height:1.25rem;margin-right:.3125rem;display:flex;justify-content:center;align-items:center;color:#fff;background-color:#888;border-radius:.3125rem}.weekdays[data-v-0bf11501]{display:flex;background-color:#e9e7fc;border-radius:.9375rem;padding:.3125rem}.weekday[data-v-0bf11501]{flex:1;text-align:center}.days[data-v-0bf11501]{display:flex;flex-wrap:wrap;padding:.3125rem}.day-cell[data-v-0bf11501]{width:2.29688rem;height:2.51563rem;text-align:center;padding-top:.25rem;padding-bottom:.25rem;box-sizing:border-box}.day-cell.prev-month .gregorian[data-v-0bf11501],.day-cell.next-month .gregorian[data-v-0bf11501]{color:#ccc}.day-cell.selected[data-v-0bf11501]{background-color:#0b98dc;border-radius:.3125rem}.day-cell.selected .gregorian[data-v-0bf11501],.day-cell.selected .lunar[data-v-0bf11501]{color:#fff}.gregorian[data-v-0bf11501]{font-size:14px}.lunar[data-v-0bf11501]{font-size:10px;color:#888}.backgroundContainer[data-v-65a124ce]{position:relative;width:100%;height:100vh;background-image:url(../../static/index/lightbgcnew.png);background-size:cover;background-position:center center;overflow:hidden}.assess-title[data-v-65a124ce]{margin-top:1.875rem;width:100%;height:1.875rem;display:flex;align-items:center;justify-content:space-between}.assess-title .right-icons[data-v-65a124ce]{display:flex;align-items:center;float:right;height:2.1875rem;margin-right:1.25rem}.assess-title .right-icons .right-icons-font[data-v-65a124ce]{margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-font-dark[data-v-65a124ce]{color:#fff;margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-img[data-v-65a124ce]{width:2.5rem;height:2.5rem;margin-left:.3125rem;margin-right:.3125rem;margin-top:-.625rem}.assess-title .right-icons .right-icons-img-icon[data-v-65a124ce]{width:1.875rem;height:2.5rem;margin-left:.25rem}.assess-title .left-icons[data-v-65a124ce]{display:flex;margin-left:1.25rem}.assess-title .left-icons .left-icons-img[data-v-65a124ce]{width:2.1875rem;height:2.1875rem}.assess-title .left-icons .right-icons-font[data-v-65a124ce]{font-weight:700;font-size:1.09375rem;margin-left:.3125rem;margin-top:.3125rem}.assess-title .left-icons .right-icons-text[data-v-65a124ce]{font-size:1.09375rem;margin-top:.3125rem}.assess-another[data-v-65a124ce]{width:100%;height:calc(100vh - 3.75rem);margin-top:.3125rem;display:flex;margin-left:1.5625rem}.assess-another .left-contain[data-v-65a124ce]{height:100%;width:18.75rem}.assess-another .left-contain .calendar[data-v-65a124ce]{width:100%;height:20.3125rem;background:linear-gradient(to top,#f4f3ff,#fff,#ecefff);border-radius:.78125rem}
+.calendar[data-v-02393a84]{padding:16px;background:#fff;border-radius:.9375rem;box-shadow:0 2px 6px rgba(0,0,0,.1);margin:0 auto}.header[data-v-02393a84]{width:100%;display:flex;flex-direction:column}.header-title[data-v-02393a84]{width:100%;display:flex;justify-content:space-between;align-items:center;margin-bottom:.3125rem}.year-month[data-v-02393a84]{font-size:18px;font-weight:700}.weekdays[data-v-02393a84]{display:flex;background-color:#f8f8fa;border-radius:.5625rem;padding:.25rem;margin-top:.25rem}.weekday[data-v-02393a84]{flex:1;text-align:center;font-size:12px}.days[data-v-02393a84]{display:flex;flex-wrap:wrap;padding:.25rem 0}.day-cell[data-v-02393a84]{width:calc(100% / 7);height:2.4375rem;text-align:center;padding-top:.25rem;box-sizing:border-box;position:relative}.day-cell.prev-month .gregorian[data-v-02393a84],.day-cell.next-month .gregorian[data-v-02393a84]{color:#ccc}.day-cell.in-range[data-v-02393a84]{background-color:#e6f7ff}.day-cell.start[data-v-02393a84],.day-cell.end[data-v-02393a84]{background-color:#0b98dc;border-radius:.25rem}.day-cell.start .gregorian[data-v-02393a84],.day-cell.end .gregorian[data-v-02393a84],.day-cell.start .lunar[data-v-02393a84],.day-cell.end .lunar[data-v-02393a84]{color:#fff}.gregorian[data-v-02393a84]{font-size:14px}.lunar[data-v-02393a84]{font-size:10px;color:#888}.head-left[data-v-02393a84]{width:3.125rem;display:flex;justify-content:space-between}.head-left .head-img[data-v-02393a84]{width:1.25rem;height:1.25rem}.backgroundContainer[data-v-65a124ce]{position:relative;width:100%;height:100vh;background-image:url(../../static/index/lightbgcnew.png);background-size:cover;background-position:center center;overflow:hidden}.assess-title[data-v-65a124ce]{margin-top:1.875rem;width:100%;height:1.875rem;display:flex;align-items:center;justify-content:space-between}.assess-title .right-icons[data-v-65a124ce]{display:flex;align-items:center;float:right;height:2.1875rem;margin-right:1.25rem}.assess-title .right-icons .right-icons-font[data-v-65a124ce]{margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-font-dark[data-v-65a124ce]{color:#fff;margin-left:.3125rem;margin-right:.3125rem;font-size:1.09375rem;margin-top:-.46875rem}.assess-title .right-icons .right-icons-img[data-v-65a124ce]{width:2.5rem;height:2.5rem;margin-left:.3125rem;margin-right:.3125rem;margin-top:-.625rem}.assess-title .right-icons .right-icons-img-icon[data-v-65a124ce]{width:1.875rem;height:2.5rem;margin-left:.25rem}.assess-title .left-icons[data-v-65a124ce]{display:flex;margin-left:1.25rem}.assess-title .left-icons .left-icons-img[data-v-65a124ce]{width:2.1875rem;height:2.1875rem}.assess-title .left-icons .right-icons-font[data-v-65a124ce]{font-weight:700;font-size:1.09375rem;margin-left:.3125rem;margin-top:.3125rem}.assess-title .left-icons .right-icons-text[data-v-65a124ce]{font-size:1.09375rem;margin-top:.3125rem}.assess-another[data-v-65a124ce]{width:100%;height:calc(100vh - 3.75rem);margin-top:.3125rem;display:flex;margin-left:1.5625rem}.assess-another .left-contain[data-v-65a124ce]{height:100%;width:18.75rem}.assess-another .left-contain .calendar[data-v-65a124ce]{width:100%;height:20.3125rem;background:linear-gradient(to top,#f4f3ff,#fff,#ecefff);border-radius:.78125rem}