采购冲突

pages/Warehouse/api/lunpan.js

@@ -58,6 +58,42 @@ export const queryWlInfoByWlId = (params) => {
 		data: params,
 	})
 } 
+export const addShoppingCartList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/addShoppingCartList`,
+		method: 'post',
+		data: params,
+	})
+} 
+export const queryShoppingCartList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryShoppingCartList`,
+		method: 'get',
+		data: params,
+	})
+} 
+export const generatedPurchaseOrder = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/generatedPurchaseOrder`,
+		method: 'post',
+		data: params,
+	})
+}
+export const generatedPurchaseViewOrder = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/generatedPurchaseViewOrder`,
+		method: 'post',
+		data: params,
+	})
+}
+export const deleteQgInfoById = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/deleteQgInfoById`,
+		method: 'DELETE',
+		data: params,
+	})
+}
+
 // 作废
 export const voidedCgdMain = (params) => {
 	return request({
@@ -65,4 +101,4 @@ export const voidedCgdMain = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+} 

pages/Warehouse/procurecart.vue

@@ -8,9 +8,9 @@
 					<view class="boxibigtem" v-for="(v,i) in InvoicingList" :key='i'
 						:class="{'yujing':Number(v.lowerLimit)>=Number(v.kcsl),'active':shopitem==i}"
 						@click="shopclick(i,2)">
-						<view>{{v.materialName}}</view>
-						<view>规格型号: {{v.specificationModel}}</view>
-						<view>采购单位： {{v.materialUnits}}</view>
+						<view>{{v.wlName}}</view>
+						<view>规格型号: {{v.wlSpecificationModel}}</view>
+						<view>采购单位： {{v.wlUnits}}</view>
 						<view>
 							<view class="carditem" :class="{'hl':v.tagType==1,'yl':v.tagType==2,'bj':v.tagType>2}">
 								<image src="/static/index/warehouse/procurement/hl.png" mode="aspectFill"
@@ -50,9 +50,9 @@
 					<view class="boxitem" v-for="(v,i) in InvoicingList" :key='i'
 						:class="{'yujing':Number(v.lowerLimit)>=Number(v.kcsl),'active':shopitem==i}"
 						@click="shopclick(i)">
-						<view>{{v.materialName}}</view>
-						<view>规格型号: {{v.specificationModel}}</view>
-						<view>采购单位： {{v.materialUnits}}</view>
+						<view>{{v.wlName}}</view>
+						<view>规格型号: {{v.wlSpecificationModel}}</view>
+						<view>采购单位： {{v.wlUnits}}</view>
 						<view>库存数量： {{v.kcsl}}</view>
 						<view>
 							<view class="carditem" :class="{'hl':v.tagType==1,'yl':v.tagType==2,'bj':v.tagType>2}">
@@ -72,10 +72,10 @@
 						</view>
 						<view class="dbgys">
 							<view>
-								<view>采购数量：<text>50</text></view>
-								<view>供应商：长春市天林商贸有限公司</view>
+								<view>采购数量：<text>{{v.purchaseQuantity}}</text></view>
+								<view>供应商：{{v.suppliersName}}</view>
 							</view>
-							<view :class="v.flag?'act':''">
+							<view :class="v.flag?'act':''" @click.stop="xuanzhong(v)">
 								<image src="/static/index/warehouse/procurement/d.png" mode="aspectFill" v-if="v.flag"></image>
 								<image src="/static/index/warehouse/procurement/da.png" mode="aspectFill" v-else></image>
 							</view>
@@ -161,9 +161,8 @@
 					<view class="anmikc">
 						<view v-for="(v,i) in animArray" :key="i" @click="admiclick(i)">
 							<view>
-								<image :src="v.imgurl" mode="aspectFill" v-if="anmidex!=i"></image>
 								<donghua width="2vw" height="2vw" :links="v.url" :playing="i === anmidex"
-									v-show="i === anmidex" class="donghua" />
+									 class="donghua" />
 							</view>
 
 							<text>
@@ -186,77 +185,81 @@
 		</view>
 		<view class="mengban" v-if="wlxq" @click="qingkong"></view>
 		<view class="wuliao guodu" :class="wlxq?'':'uncrkcard'">
-			<view class="name">纸尿裤-拉拉裤纸尿裤-拉拉裤纸尿裤-拉拉裤纸尿裤-拉拉裤</view>
+			<view class="name">{{wuliaoobj.materialName}}</view>
 			<view class="znk tp">
-				<image :src=" '/static/index/warehouse/procurement/k.png'" mode="aspectFill"></image>
+				<image class="crkcard-img"
+					:src="wuliaoobj.materialImg?serverUrl + wuliaoobj.materialImg : '/static/index/warehouse/procurement/k.png'"
+					mode="aspectFill"></image>
 			</view>
 			<view class="life">
-				<view>生活用品</view>
-				<view>照护用品</view>
+				<view v-if="wuliaoobj.categoryName">{{wuliaoobj.categoryName}}</view>
+				<view v-if="wuliaoobj.typeName">{{wuliaoobj.typeName}}</view>
+				<view v-if="wuliaoobj.medicationName">{{wuliaoobj.medicationName}}</view>
 			</view>
 			<view class="zil">
-				物料编码: ZHYP044
+				物料编码: {{ wuliaoobj.materialNo }}
 			</view>
 			<view class="zil">
-				规格型号: XL800mm*690mm
+				规格型号:  {{ wuliaoobj.specificationModel }}
 			</view>
 			<view class="zil">
-				物料小类: ZHYP044
+				物料小类: {{wuliaoobj.tagName}}
 			</view>
 			<view class="zil">
-				物料单位: 片
+				物料单位: {{wuliaoobj.materialUnits}}
 			</view>
 			<view class="zil">
-				医保报销: 是
+				医保报销: {{ wuliaoobj.izYbbxName }}
 			</view>
 			<view class="zil">
-				机构优惠: 否
+				机构优惠: {{ wuliaoobj.izJgyhName }}
 			</view>
 			<view class="dibu">
 				<view>
-					<text>853</text>
+					<text>{{ wuliaoobj.kcsl }}</text>
 					<text>库存数量</text>
 				</view>
 				<view>
-					<text>4000</text>
+					<text>{{ wuliaoobj.upperLimit }}</text>
 					<text>物料上限 <text class="l"> ↑</text></text>
 				</view>
 				<view style="align-items: end;">
-					<text>4000</text>
+					<text>{{ wuliaoobj.lowerLimit }}</text>
 					<text><text class="f">↓ </text>物料下限 </text>
 				</view>
 			</view>
 		</view>
+		
 		<view class="mengban" v-if="cgd" @click="qingkong"></view>
 		<view class="caigoudan guodu" :class="cgd?'':'uncgd'">
 			<view class="title">采购单</view>
 			<scroll-view scroll-y="true" class="cgdscroll">
-				<view class="cardcd">
-					<view class="gys">供应商:长春市天林商贸有限公司</view>
+				<view class="cardcd" v-for="(v,i) in generatedOrder" :key='i'>
+					<view class="gys">供应商:{{v.suppliersName}}</view>
 					<view class="cgdh">
-						<view>采购单号:A0120251010001</view>
+						<view>采购单号:{{v.cgdNo}}</view>
 						<view>采购人:梁嘉豪 </view>
 						<view>采购金额：<text>1356.82</text></view>
 					</view>
 					
-					<view class="boxitem" v-for="(v,i) in InvoicingList" :key='i'  >
-						<view>{{v.materialName}}</view>
-						<view>规格型号: {{v.specificationModel}}</view>
-						<view>采购单位： {{v.materialUnits}}</view>
-						<view>库存数量： {{v.kcsl}}</view>
+					<view class="boxitem" v-for="(f,l) in v.cgdInfoList" :key='i'  >
+						<view>{{f.materialName}}</view>
+						<view>规格型号: {{f.specificationModel}}</view>
+						<view>采购单位： {{f.materialUnits}}</view>
+						<view>库存数量： {{f.kcsl}}</view>
 						<view>
-							<view class="carditem" :class="{'hl':v.tagType==1,'yl':v.tagType==2,'bj':v.tagType>2}">
+							<view class="carditem" :class="{'hl':f.tagType==1,'yl':f.tagType==2,'bj':f.tagType>2}">
 								<image src="/static/index/warehouse/procurement/hl.png" mode="aspectFill"
-									v-if="v.tagType==1"></image>
+									v-if="f.tagType==1"></image>
 								<image src="/static/index/warehouse/procurement/yl.png" mode="aspectFill"
-									v-if="v.tagType==2"></image>
+									v-if="f.tagType==2"></image>
 								<image src="/static/index/warehouse/procurement/bj.png" mode="aspectFill"
-									v-if="v.tagType>2"></image>
-								{{v.tagName}}
+									v-if="f.tagType>2"></image>
+								{{f.tagName}}
 							</view>
 							<view class="znk">
 								<image
-									:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
+									:src="f.materialImg?serverUrl + f.materialImg : '/static/index/warehouse/procurement/k.png'"
 									mode="aspectFill"></image>
 							</view>
 						</view>
@@ -279,7 +282,7 @@
 
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
-	import { queryInvoicingList, getMaterialTreeData, queryNuInfoByNuId, updateKfstatus } from './api/lunpan.js'
+	import { queryShoppingCartList, getMaterialTreeData, queryNuInfoByNuId, updateKfstatus ,queryWlInfoByWlId,generatedPurchaseOrder,generatedPurchaseViewOrder } from './api/lunpan.js'
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import shadowview from './components/ShadowView.vue';
 	import calculator from './components/calculator.vue';
@@ -287,7 +290,8 @@
 	const InvoicingList = ref([]);
 	const TreeData = ref([]);
 	const cellobj = ref({});
-
+	
+	const wuliaoobj = ref({});
 	const serverUrl = ref('');
 	const scrolltop = ref(0)
 	const shopitem = ref(0)
@@ -330,7 +334,10 @@
 			}
 		})
 	}
-	const shopclick = (i : number, k : number) => {
+	const shopclick = (i : number, k : number,flag:boolean) => {
+		if(i==shopitem.value&&!flag){
+			InvoicingList.value[shopitem.value].flag = !InvoicingList.value[shopitem.value].flag;
+		}
 		if (k == 2) {
 			let num = Math.ceil((i + 1) / 2)
 			scrolltop.value = (num - 2) * 270;
@@ -342,6 +349,9 @@
 		}
 
 	}
+	const xuanzhong = (o:any)=>{
+		o.flag = !o.flag
+	}
 
 	const typescroll = (e : number, i : number, v : object) => {
 		if (e == 1) {
@@ -438,7 +448,7 @@
 		scrollnum.value = e.detail.scrollTop;
 	}
 	const queryInvo = () => {
-		queryInvoicingList(form).then(res => {
+		queryShoppingCartList(form).then(res => { 
 			res.result.records.forEach((item,i)=>{
 				item.flag = false
 				if(i==0){
@@ -470,7 +480,7 @@
 					break;
 				case 4:
 					// 扫描
-
+					InvoicingList.value[shopitem.value].flag = !InvoicingList.value[shopitem.value].flag;
 					break;
 				case 5:
 					// 返回
@@ -482,28 +492,28 @@
 				default:
 					break;
 			}
-			shopclick(shopitem.value, 2)
+			shopclick(shopitem.value, 2,true)
 		} else {
 			switch (type) {
 				case 0:
 					// 上
-					shopitem.value = shopitem.value < 2 ? shopitem.value = 0 : shopitem.value - 3
+					shopitem.value = shopitem.value < 3 ? shopitem.value = 0 : shopitem.value - 3
 					break;
 				case 1:
 					// →
-					shopitem.value = shopitem.value > InvoicingList.value.length ? shopitem.value = 0 : shopitem.value + 1
+					shopitem.value = shopitem.value >= InvoicingList.value.length-1 ? shopitem.value = 0 : shopitem.value + 1
 					break;
 				case 2:
 					// 下
-					shopitem.value = shopitem.value > InvoicingList.value.length ? shopitem.value = 0 : shopitem.value + 3
+					shopitem.value = shopitem.value >= InvoicingList.value.length-3 ? shopitem.value = InvoicingList.value.length-1 : shopitem.value + 3
 					break;
 				case 3:
-					shopitem.value = shopitem.value == 0 ? shopitem.value = InvoicingList.value.length : shopitem.value - 1
+					shopitem.value = shopitem.value == 0 ? shopitem.value = InvoicingList.value.length-1 : shopitem.value - 1
 					// ←
 					break;
 				case 4:
 					// 扫描
-
+					InvoicingList.value[shopitem.value].flag = !InvoicingList.value[shopitem.value].flag;
 					break;
 				case 5:
 					// 返回
@@ -515,7 +525,7 @@
 				default:
 					break;
 			}
-			shopclick(shopitem.value, 0)
+			shopclick(shopitem.value, 0,true)
 		}
 
 	}
@@ -529,6 +539,7 @@
 		})
 	}
 	const anmidex = ref(-1)
+	const generatedOrder = ref([])
 	const admiclick = (i : number) => {
 		if (anmidex.value == 2) {
 			anmidex.value = -1
@@ -543,13 +554,24 @@
 					break;
 				case 1:
 					let arr = [];
+					InvoicingList.value.forEach(item=>{
+						if(item.flag){
+							arr.push(item)
+						}
+					})
+					console.log(arr)
+					generatedPurchaseViewOrder(arr).then(res=>{
+						console.log(res)
+						generatedOrder.value = res.result
+					})
 					 cgd.value = true
 					break;
 				case 2:
-					 wlxq.value = true
+					queryWlInfo();
 					break;
 				case 3:
 					
+					
 					break;
 				case 4:
 					 
@@ -565,18 +587,29 @@
 			}
 		}
 	}
+	// 物料详情
+	const queryWlInfo = ()=>{
+		let obj = {
+			wlId:InvoicingList.value[shopitem.value].wlId,
+			nuId:form.nuId
+		}
+			queryWlInfoByWlId(obj).then(res=>{
+				wuliaoobj.value = res.result;
+				wlxq.value = true
+			})
+	}
 	const animArray = ref([
 		{
 			url: genPaths(
-				'/static/index/warehouse/procurement/store',
-				'store0',
+				'/static/index/warehouse/procurement/select',
+				'select',
 				8,    // 张数
 				'png',
 				1,     // 起始索引为 1
 				false  // 不补零
 			),
 			name: '选择/取消',
-			imgurl: '/static/index/warehouse/procurement/store/store01.png'
+			imgurl: '/static/index/warehouse/procurement/select/select1.png'
 		},
 		{
 			url: genPaths(
@@ -604,27 +637,27 @@
 		},
 		{
 			url: genPaths(
-				'/static/index/warehouse/procurement/bound',
-				'bound0',
-				11,    // 张数
+				'/static/index/warehouse/procurement/del',
+				'del',
+				9,    // 张数
 				'png',
 				1,     // 起始索引为 1
 				false  // 不补零
 			),
 			name: '删除',
-			imgurl: '/static/index/warehouse/procurement/bound/bound01.png'
+			imgurl: '/static/index/warehouse/procurement/del/del1.png'
 		},
 		{
 			url: genPaths(
-				'/static/index/warehouse/procurement/Cart',
-				'Cart0',
-				10,    // 张数
+				'/static/index/warehouse/procurement/dele',
+				'del',
+				8,    // 张数
 				'png',
 				1,     // 起始索引为 1
 				false  // 不补零
 			),
 			name: '清空',
-			imgurl: '/static/index/warehouse/procurement/Cart/Cart01.png'
+			imgurl: '/static/index/warehouse/procurement/dele/del1.png'
 		}
 	])
 </script>
@@ -827,13 +860,13 @@
 		bottom: 11vw;
 		right: 1.5vw;
 		z-index: 103;
-		padding: 4vw 2.2vw 2vw;
+		padding: 2vw 2.2vw 2vw;
 
 		.dibu {
 			width: 100%;
 			display: flex;
 			justify-content: space-between;
-			margin: 2vw auto 0;
+			margin: 3vw auto 0;
 
 			view {
 				width: 4vw;
@@ -1260,11 +1293,11 @@
 				margin: 0 1.3vw 1.2vw 0;
 				border: 2px dashed #fff;
 				display: inline-block;
-				padding:1.5vw 2.3vw 2.3vw;
+				padding:1vw 2.3vw 2.3vw;
 				position: relative;
 				.dbgys{
 					width: 100%;
-					height: 4.3vw;
+					height: 5.3vw;
 					position: absolute;
 					left: 0;
 					bottom: 0vw;
@@ -1272,8 +1305,9 @@
 					border-radius:0 0 1.6vw 1.6vw;
 					border: 2px solid rgba(239, 240, 244, 1);
 					display: flex;
-					padding: 0.6vw  1.5vw;
+					padding: 0.4vw  1.5vw 0;
 					justify-content: space-between;
+					align-items: center;
 					.act{
 						background: rgba(231, 240, 251, 1) !important;
 						border: 1px solid rgba(0, 118, 214, 1) !important;
@@ -1300,6 +1334,7 @@
 							font-weight: 400;
 							font-size: 1vw;
 							color: #888888;
+							width: 14vw;
 							text{
 								font-weight: bold;
 								font-size: 1.4vw;
@@ -1362,7 +1397,7 @@
 						height: 7vw;
 						position: absolute;
 						right: 1vw;
-						bottom: 4.3vw;
+						bottom: 5.3vw;
 
 						image {
 							width: 100%;

pages/Warehouse/procurement.vue

@@ -153,10 +153,8 @@
 
 					<view class="anmikc">
 						<view v-for="(v,i) in animArray" :key="i" @click="admiclick(i)">
-							<view>
-								<image :src="v.imgurl" mode="aspectFill" v-if="anmidex!=i"></image>
-								<donghua width="2vw" height="2vw" :links="v.url" :playing="i === anmidex"
-									v-show="i === anmidex" class="donghua" />
+							<view> 
+								<donghua width="2vw" height="2vw" :links="v.url" :playing="i === anmidex"  class="donghua" />
 							</view>
 
 							<text>
@@ -182,26 +180,34 @@
 		<view class="rigbot guodu" :class="gys?'':'unrigbot'">
 			<view>
 				供应商
-				<text>选择</text>
+				<text  @click="gysflag = true">选择</text>
 			</view>
-			<view>
-				请选择供应商
+			<view @click="gysflag = true">
+				 {{gysarr[gysidnum]?.name}}
 			</view>
 			<view>
 				<text>采购数量</text>
-				<view class="jj">
+				<view class="jj" @click="jjnum(-1)">
 					-
 				</view>
 				<view class="num" @click="colse">
-					1500
+					{{caigouobj.Limitnum}}
 				</view>
-				<view class="jj">
+				<view class="jj" @click="jjnum(1)">
 					+
 				</view>
 			</view>
+			<view class="tanchu" v-if="gysflag">
+				<scroll-view scroll-y="true" class="gysscrol">
+					<view v-for="(v,i) in gysarr" :key='i' :class="gysidnum==i?'acts':''" @click="gysid(i)">
+						<text>{{v.name}}</text>
+						<image src="/static/index/warehouse/procurement/d.png" mode="aspectFill"></image>
+					</view>
+				</scroll-view>
+			</view>
 		</view>
 		<view class="shuru guodu" :class="gysnum?'':'unrigbot'">
-			<calculator :translateNumber="0" @colse="colse"></calculator>
+			<calculator :translateNumber="0" @colse="colse" @right="right"></calculator>
 		</view>
 		<view class="cgou guodu" :class="gys?'':'uncg'">
 			<view class="topcont">
@@ -211,42 +217,42 @@
 					</view>
 					<view class="rightcont">
 						<view>
-							<text>纸尿裤-拉拉裤纸尿裤-拉拉裤拉拉裤拉拉裤拉拉裤拉拉裤</text>
+							<text>{{caigouobj.materialName}}</text>
 							<view class="swsh guodu" :class="shyp?'act':''" @click="switchshyp">
 								<view class="guodu"></view>
 							</view>
 						</view>
 						<view>
-							<view>物料编码: ZHYP044</view>
-							<text>物料小类: ZHYP044</text>
+							<view>物料编码: {{caigouobj.materialNo}}</view>
+							<text>物料小类: {{caigouobj.tagName}}</text>
 						</view>
 						<view>
-							<view>规格型号: XL800mm*690mm</view>
-							<text>物料单位: 片</text>
+							<view>规格型号: {{ caigouobj.specificationModel }}</view>
+							<text>物料单位: {{ caigouobj.materialUnits}}</text>
 						</view>
 						<view>
-							<view>医保报销: 是</view>
-							<text>机构优惠: 否</text>
+							<view>医保报销: {{ caigouobj.izYbbxName }}</view>
+							<text>机构优惠: {{ caigouobj.izJgyhName }}</text>
 						</view>
 
 					</view>
 				</view>
 				<view class="life">
 					<view>
-						<view>生活用品</view>
-						<view>照护用品</view>
+						<view v-if="caigouobj.categoryId_dictText">{{caigouobj.categoryId_dictText}}</view>
+						<view v-if="caigouobj.categoryId_dictText">{{caigouobj.typeId_dictText}}</view>
 						<view>
-							<text>853</text>
+							<text>{{caigouobj.kcsl}}</text>
 							<text>库存数量</text>
 						</view>
 					</view>
 					<view>
 						<view>
-							<text>4000</text>
+							<text>{{caigouobj.upperLimit}}</text>
 							<text>物料上限 <text class="l"> ↑</text></text>
 						</view>
 						<view>
-							<text style="text-align: right;">4000</text>
+							<text style="text-align: right;">{{caigouobj.lowerLimit}}</text>
 							<text><text class="f">↓ </text>物料下限 </text>
 						</view>
 					</view>
@@ -255,25 +261,25 @@
 			<view class="gyscont">
 				<view>
 					<text>供应商：</text>
-					<text> 长春市天林商贸有限公司</text>
+					<text> {{gysarr[gysidnum]?.name}}</text>
 				</view>
 				<view>
 					<text>采购数量</text>
-					<view class="jj">
+					<view class="jj" @click="jjnum(-1)">
 						-
 					</view>
 					<view class="num">
-						1500
+						{{caigouobj.Limitnum}}
 					</view>
-					<view class="jj">
+					<view class="jj" @click="jjnum(1)">
 						+
 					</view>
 				</view>
 			</view>
 			<view class="tj">
-				<text @click="qingkong">确定</text>
+				<text @click="connfig">确定</text>
 				<text>
-					采购数量：1500
+					采购数量： {{caigouobj.Limitnum}}
 				</text>
 			</view>
 		</view>
@@ -324,43 +330,46 @@
 		</view>
 		<view class="mengban" v-if="wlxq" @click="qingkong"></view>
 		<view class="wuliao guodu" :class="wlxq?'':'uncrkcard'">
-			<view class="name">纸尿裤-拉拉裤纸尿裤-拉拉裤纸尿裤-拉拉裤纸尿裤-拉拉裤</view>
+			<view class="name">{{wuliaoobj.materialName}}</view>
 			<view class="znk tp">
-				<image :src=" '/static/index/warehouse/procurement/k.png'" mode="aspectFill"></image>
+				<image class="crkcard-img"
+					:src="wuliaoobj.materialImg?serverUrl + wuliaoobj.materialImg : '/static/index/warehouse/procurement/k.png'"
+					mode="aspectFill"></image>
 			</view>
 			<view class="life">
-				<view>生活用品</view>
-				<view>照护用品</view>
+				<view v-if="wuliaoobj.categoryName">{{wuliaoobj.categoryName}}</view>
+				<view v-if="wuliaoobj.typeName">{{wuliaoobj.typeName}}</view>
+				<view v-if="wuliaoobj.medicationName">{{wuliaoobj.medicationName}}</view>
 			</view>
 			<view class="zil">
-				物料编码: ZHYP044
+				物料编码: {{ wuliaoobj.materialNo }}
 			</view>
 			<view class="zil">
-				规格型号: XL800mm*690mm
+				规格型号:  {{ wuliaoobj.specificationModel }}
 			</view>
 			<view class="zil">
-				物料小类: ZHYP044
+				物料小类: {{wuliaoobj.tagName}}
 			</view>
 			<view class="zil">
-				物料单位: 片
+				物料单位: {{wuliaoobj.materialUnits}}
 			</view>
 			<view class="zil">
-				医保报销: 是
+				医保报销: {{ wuliaoobj.izYbbxName }}
 			</view>
 			<view class="zil">
-				机构优惠: 否
+				机构优惠: {{ wuliaoobj.izJgyhName }}
 			</view>
 			<view class="dibu">
 				<view>
-					<text>853</text>
+					<text>{{ wuliaoobj.kcsl }}</text>
 					<text>库存数量</text>
 				</view>
 				<view>
-					<text>4000</text>
+					<text>{{ wuliaoobj.upperLimit }}</text>
 					<text>物料上限 <text class="l"> ↑</text></text>
 				</view>
 				<view style="align-items: end;">
-					<text>4000</text>
+					<text>{{ wuliaoobj.lowerLimit }}</text>
 					<text><text class="f">↓ </text>物料下限 </text>
 				</view>
 			</view>
@@ -370,7 +379,7 @@
 
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
-	import { queryInvoicingList, getMaterialTreeData, queryNuInfoByNuId, updateKfstatus } from './api/lunpan.js'
+	import { queryInvoicingList, getMaterialTreeData, queryNuInfoByNuId, updateKfstatus,queryWlInfoByWlId,addShoppingCartList } from './api/lunpan.js'
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import shadowview from './components/ShadowView.vue';
 	import calculator from './components/calculator.vue';
@@ -378,6 +387,7 @@
 	const InvoicingList = ref([]);
 	const TreeData = ref([]);
 	const cellobj = ref({});
+	const wuliaoobj = ref({});
 
 	const serverUrl = ref('');
 	const scrolltop = ref(0)
@@ -496,6 +506,14 @@
 	const colse = () => {
 		gysnum.value = !gysnum.value
 	}
+	const right = (n:number) => {
+		let d = Number(caigouobj.value.upperLimit)-Number(caigouobj.value.kcsl)
+		if(d>=n){
+			caigouobj.value.Limitnum = n;
+			gys.value = false;
+		}
+	}
+	
 	const cell = () => {
 		queryNuInfoByNuId(form).then(res => {
 			cellobj.value = res.result;
@@ -619,7 +637,16 @@
 			return `${base}/${prefix}${idx}.${ext}`
 		})
 	}
+	const jjnum = (e:number) =>{
+		let n = Number(caigouobj.value.upperLimit)-Number(caigouobj.value.kcsl)
+		if(n==caigouobj.value.Limitnum&&e==1){return}
+		if(caigouobj.value.Limitnum==1&&e==-1){return}
+		caigouobj.value.Limitnum+=e;
+	}
 	const anmidex = ref(-1)
+	const caigouobj = ref({})
+	const gysarr = ref([])
+	
 	const admiclick = (i : number) => {
 		if(i==5){
 			uni.navigateTo({
@@ -635,6 +662,15 @@
 				case 0:
 					break;
 				case 1:
+					caigouobj.value = InvoicingList.value[shopitem.value];
+					caigouobj.value.Limitnum =  Number(caigouobj.value.upperLimit)-Number(caigouobj.value.kcsl);
+					let n = [];
+					let id = [];
+					n = caigouobj.value.suppliers_dictText.split(/[, ]+/);
+					id = caigouobj.value.suppliers.split(/[, ]+/);
+					n.forEach((item,i)=>{
+						gysarr.value.push({'name':item,'id':id[i]})
+					})
 					gys.value = true
 					break;
 				case 2:
@@ -644,7 +680,14 @@
 				
 					break;
 				case 3:
+				let obj = {
+					wlId:InvoicingList.value[shopitem.value].wlId,
+					nuId:form.nuId
+				}
+				queryWlInfoByWlId(obj).then(res=>{
+					wuliaoobj.value = res.result;
 					wlxq.value = true
+				})
 					break;
 				case 4:
 					crk.value = true
@@ -660,6 +703,30 @@
 			}
 		}
 	}
+	const gysidnum = ref(0)
+	const gysflag = ref(false)
+	const gysid = (i:number)=>{
+		gysidnum.value = i;
+		gysflag.value = false;
+	}
+	const connfig = () =>{
+		let dt = {
+			nuId:form.nuId,
+			purchaseQuantity:caigouobj.value.Limitnum,
+			suppliersId:gysarr.value[gysidnum.value].id,
+			suppliersName:gysarr.value[gysidnum.value].name,
+			wlId:caigouobj.value.wlId
+		}
+		addShoppingCartList([dt]).then(res=>{
+			uni.showToast({
+				icon:res.success?'success':'error',
+				title:res.message
+			})
+			if(res.success){
+				qingkong()
+			}
+		})
+	}
 	const animArray = ref([
 		{
 			url: genPaths(
@@ -747,13 +814,13 @@
 		bottom: 11vw;
 		right: 1.5vw;
 		z-index: 103;
-		padding: 4vw 2.2vw 2vw;
+		padding: 2vw 2.2vw 2vw;
 
 		.dibu {
 			width: 100%;
 			display: flex;
 			justify-content: space-between;
-			margin: 2vw auto 0;
+			margin: 3vw auto 0;
 
 			view {
 				width: 4vw;
@@ -1046,7 +1113,7 @@
 	}
 
 	.rigbot {
-		width: 24.5vw;
+		width: 25.5vw;
 		height: 13vw;
 		background: #FFFFFF;
 		border-radius: 1.6vw;
@@ -1058,10 +1125,50 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
-
-		view {
+		
+		>.tanchu{
+			width: 22vw;
+			height: 7vw;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(174,175,176,0.35);
+			border-radius: 1.1vw;
+			padding: 0 1.4vw;
+			position: absolute;
+			right: 1.2vw;
+			bottom: 1.2vw;
+			.gysscrol{
+				width: 100%;
+				height: 7vw;
+				.acts{
+					color: #0385FA !important;
+					image{
+						display: block;
+					}
+				}
+				view{
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					font-weight: 400;
+					font-size: 1vw;
+					color: #666666;
+					margin-bottom: 0.9vw;
+					&:nth-child(1){
+						margin-top: 0.9vw;
+					}
+					image{
+						width: 1vw !important;
+						height: 0.7vw !important;
+						display: none;
+					}
+				}
+			}
+			
+		}
+		>view {
 			display: flex;
 			align-items: center;
+			
 
 			&:nth-child(3) {
 				align-items: center;
@@ -1109,7 +1216,7 @@
 			}
 
 			&:nth-child(2) {
-				width: 21.6vw;
+				width: 100%;
 				height: 3.0vw;
 				background: rgba(85, 85, 85, 0.1);
 				border-radius: 1.0vw;

pages/Warehouse/purchaseorder.vue

@@ -240,6 +240,7 @@
 					</view>
 					<view class="bottom-card-bian"></view>
 				</view>
+				
 				<view class="bottom-card">
 					<view class="bottom-card-font">
 						{{ savedetail.lowerLimit }}

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

@@ -591,7 +591,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/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app/pages/camera.nvue"]]);
 export {
   camera as default
 };

unpackage/dist/dev/app-plus/pages/Warehouse/procurecart.css

@@ -343,13 +343,13 @@ to {
   bottom: 11vw;
   right: 1.5vw;
   z-index: 103;
-  padding: 4vw 2.2vw 2vw;
+  padding: 2vw 2.2vw 2vw;
 }
 .wuliao .dibu[data-v-29da2345] {
   width: 100%;
   display: flex;
   justify-content: space-between;
-  margin: 2vw auto 0;
+  margin: 3vw auto 0;
 }
 .wuliao .dibu uni-view[data-v-29da2345] {
   width: 4vw;
@@ -708,12 +708,12 @@ to {
   margin: 0 1.3vw 1.2vw 0;
   border: 2px dashed #fff;
   display: inline-block;
-  padding: 1.5vw 2.3vw 2.3vw;
+  padding: 1vw 2.3vw 2.3vw;
   position: relative;
 }
 .box .lefts .boxitem .dbgys[data-v-29da2345] {
   width: 100%;
-  height: 4.3vw;
+  height: 5.3vw;
   position: absolute;
   left: 0;
   bottom: 0vw;
@@ -721,8 +721,9 @@ to {
   border-radius: 0 0 1.6vw 1.6vw;
   border: 2px solid #eff0f4;
   display: flex;
-  padding: 0.6vw 1.5vw;
+  padding: 0.4vw 1.5vw 0;
   justify-content: space-between;
+  align-items: center;
 }
 .box .lefts .boxitem .dbgys .act[data-v-29da2345] {
   background: #e7f0fb !important;
@@ -749,6 +750,7 @@ to {
   font-weight: 400;
   font-size: 1vw;
   color: #888888;
+  width: 14vw;
 }
 .box .lefts .boxitem .dbgys > uni-view:nth-child(1) uni-text[data-v-29da2345] {
   font-weight: bold;
@@ -798,7 +800,7 @@ to {
   height: 7vw;
   position: absolute;
   right: 1vw;
-  bottom: 4.3vw;
+  bottom: 5.3vw;
 }
 .box .lefts .boxitem > uni-view .znk uni-image[data-v-29da2345] {
   width: 100%;

unpackage/dist/dev/app-plus/pages/Warehouse/procurement.css

@@ -276,13 +276,13 @@ to {
   bottom: 11vw;
   right: 1.5vw;
   z-index: 103;
-  padding: 4vw 2.2vw 2vw;
+  padding: 2vw 2.2vw 2vw;
 }
 .wuliao .dibu {
   width: 100%;
   display: flex;
   justify-content: space-between;
-  margin: 2vw auto 0;
+  margin: 3vw auto 0;
 }
 .wuliao .dibu uni-view {
   width: 4vw;
@@ -521,7 +521,7 @@ to {
   right: -25vw !important;
 }
 .rigbot {
-  width: 24.5vw;
+  width: 25.5vw;
   height: 13vw;
   background: #FFFFFF;
   border-radius: 1.6vw;
@@ -534,22 +534,60 @@ to {
   flex-direction: column;
   justify-content: space-between;
 }
-.rigbot uni-view {
+.rigbot > .tanchu {
+  width: 22vw;
+  height: 7vw;
+  background: #FFFFFF;
+  box-shadow: 0 0 0.5vw 0 rgba(174, 175, 176, 0.35);
+  border-radius: 1.1vw;
+  padding: 0 1.4vw;
+  position: absolute;
+  right: 1.2vw;
+  bottom: 1.2vw;
+}
+.rigbot > .tanchu .gysscrol {
+  width: 100%;
+  height: 7vw;
+}
+.rigbot > .tanchu .gysscrol .acts {
+  color: #0385FA !important;
+}
+.rigbot > .tanchu .gysscrol .acts uni-image {
+  display: block;
+}
+.rigbot > .tanchu .gysscrol uni-view {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-weight: 400;
+  font-size: 1vw;
+  color: #666666;
+  margin-bottom: 0.9vw;
+}
+.rigbot > .tanchu .gysscrol uni-view:nth-child(1) {
+  margin-top: 0.9vw;
+}
+.rigbot > .tanchu .gysscrol uni-view uni-image {
+  width: 1vw !important;
+  height: 0.7vw !important;
+  display: none;
+}
+.rigbot > uni-view {
   display: flex;
   align-items: center;
 }
-.rigbot uni-view:nth-child(3) {
+.rigbot > uni-view:nth-child(3) {
   align-items: center;
   white-space: nowrap;
 }
-.rigbot uni-view:nth-child(3) uni-text {
+.rigbot > uni-view:nth-child(3) uni-text {
   font-weight: 400;
   font-size: 1.1vw;
   color: #555555;
   white-space: nowrap;
   margin-right: 1.2vw;
 }
-.rigbot uni-view:nth-child(3) .jj {
+.rigbot > uni-view:nth-child(3) .jj {
   width: 3.5vw;
   height: 3.5vw;
   background: rgba(85, 85, 85, 0.1);
@@ -561,13 +599,13 @@ to {
   position: relative;
   padding: 0 !important;
 }
-.rigbot uni-view:nth-child(3) .jj:active {
+.rigbot > uni-view:nth-child(3) .jj:active {
   content: '';
   width: 3.5vw;
   height: 3.5vw;
   background: linear-gradient(-61deg, #EAF5FF, #CBE7FF) !important;
 }
-.rigbot uni-view:nth-child(3) .num {
+.rigbot > uni-view:nth-child(3) .num {
   width: 6.5vw;
   height: 3.5vw;
   border-radius: 1vw;
@@ -577,20 +615,20 @@ to {
   align-items: center;
   margin: 0 0 0 1vw;
 }
-.rigbot uni-view:nth-child(2) {
-  width: 21.6vw;
+.rigbot > uni-view:nth-child(2) {
+  width: 100%;
   height: 3vw;
   background: rgba(85, 85, 85, 0.1);
   border-radius: 1vw;
   padding-left: 1.5vw;
 }
-.rigbot uni-view:nth-child(1) {
+.rigbot > uni-view:nth-child(1) {
   justify-content: space-between;
   font-weight: 400;
   font-size: 1.1vw;
   color: #555555;
 }
-.rigbot uni-view:nth-child(1) uni-text {
+.rigbot > uni-view:nth-child(1) uni-text {
   width: 5.2vw;
   height: 2.2vw;
   display: inline-block;

unpackage/dist/dev/app-plus/pages/camera.js

@@ -63,7 +63,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
     }
   });
 
-  // ../../../../hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
+  // ../../../../项目/hldy_app/unpackage/dist/dev/.nvue/pages/camera.js
   var import_vue = __toESM(require_vue());
   function requireNativePlugin(name) {
     return weex.requireModule(name);
@@ -657,7 +657,7 @@ if (typeof uni !== 'undefined' && uni && uni.requireGlobal) {
       )
     ]);
   }
-  var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app/pages/camera.nvue"]]);
+  var camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/\u9879\u76EE/hldy_app/pages/camera.nvue"]]);
 
   // <stdin>
   var webview = plus.webview.currentWebview();