From c0a462f4efe194c93fb2d418d5f03f9fbf90af37 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Fri, 26 Dec 2025 10:07:35 +0800
Subject: [PATCH] tj

---
 pages/Warehouse/finish.vue                | 10 ++--
 pages/Warehouse/index/index.vue           | 37 +++++++++++-
 pages/Warehouse/picking.vue               | 29 ++++++----
 pages/procurement/common/thitem.vue       |  4 +-
 pages/procurement/components/carditem.vue | 12 ++--
 pages/procurement/inventory.vue           | 34 ++++++-----
 pages/procurement/material.vue            | 70 +++++++++++------------
 pages/procurement/outbound.vue            |  8 +--
 pages/procurement/retstock.vue            | 11 +---
 9 files changed, 126 insertions(+), 89 deletions(-)

diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index ad8d9e6..1b7e111 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -2033,14 +2033,14 @@
 <style lang="less" scoped>
 	.contain {
 		background-color: rgb(239, 240, 244);
-		width: 100vw;
+		width: 90vw;
 		height: 100vh;
-		padding: 5vh 2vw 0 2vw;
+		padding:1vh 2vw 0 0;
 		display: flex;
 
 		.contain-left {
-			height: 95vh;
-			width: 30%;
+			height:calc(100vh - 3vw);
+			width: 30vw;
 			position: relative;
 			z-index: 99;
 
@@ -2472,7 +2472,7 @@
 		.contain-right {
 			z-index: 1;
 			height: 95vh;
-			width: 70%;
+			width: 60vw;
 			margin-left: 2%;
 			overflow: hidden;
 
diff --git a/pages/Warehouse/index/index.vue b/pages/Warehouse/index/index.vue
index e9ad401..55f889f 100644
--- a/pages/Warehouse/index/index.vue
+++ b/pages/Warehouse/index/index.vue
@@ -1,8 +1,17 @@
 <template>
 	<view>
 		<view class="flex">
-			<leftcontent :list="tabbrarr" @navurl="navurl"></leftcontent>
-			<material></material>
+			<view class="left">
+				<leftcontent :list="tabbrarr" @navurl="navurl"></leftcontent>
+			</view>
+			<view class="boxrt">
+				<material :isShow="ckindex == 1"></material>
+				<picking :isShow="ckindex == 2"></picking>
+				<finish v-if="ckindex == 3"></finish>
+				<outbound v-if="ckindex == 4"></outbound>
+				<retstock v-if="ckindex == 5"></retstock>
+				<inventory :isShow="ckindex == 6"></inventory>
+			</view>
 		</view>
 	</view>
 </template>
@@ -11,6 +20,13 @@
 	 import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue';
 	 import leftcontent from "@/pages/NursingNew/component/leftcontent/leftcontent.vue"
 	 import material from "@/pages/procurement/material.vue";
+	 import picking from "../picking.vue";
+
+	 import finish from "@/pages/Warehouse/finish.vue"
+	 import outbound from "@/pages/procurement/outbound.vue";
+	 import inventory from "@/pages/procurement/inventory.vue";
+	 import retstock from "@/pages/procurement/retstock.vue";
+	 
 	 const tabbrarr = ref([
 	 	{name:'首页',url:'/static/shouye/ck/h0.png',urls:'/static/shouye/ck/h1.png'},
 	 	{name:'采购',url:'/static/shouye/ck/c0.png',urls:'/static/shouye/ck/c1.png'},
@@ -21,7 +37,13 @@
 		{name:'盘点',url:'/static/shouye/ck/p0.png',urls:'/static/shouye/ck/p1.png'},
 	 	{name:'返回',url:'/static/shouye/sy/f0.png',urls:'/static/shouye/sy/f1.png'},
 	 ])
+	 const ckindex = ref(0)
 	 const navurl =(e)=>{
+		 if(e==7){
+			 uni.navigateBack()
+		 }else{
+			 ckindex.value = e;
+		 }
 	 	// changeMenu(e)
 	 }
 </script>
@@ -30,4 +52,13 @@
 .flex{
 	display: flex;
 }
-</style>
+.left{
+	width: 8.2vw;
+	height: 100vh;
+}
+.boxrt{
+	width: calc(100vw - 8.2vw);
+	background: RGBA(239, 240, 244, 1);
+	padding: 2vw 1vw 0 1vw;
+}
+</style>
\ No newline at end of file
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 21819a7..bee974c 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="contain">
+	<view class="contain" v-if="isShow">
 		<view v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata" class="mengban"
 			:style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
 			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
@@ -1046,17 +1046,30 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, onUnmounted } from 'vue';
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, onUnmounted,watch } from 'vue';
 	import { editIzNew, 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 nomessageimge from '@/pages/procurement/components/nomessage.vue';
-
+	const props = defineProps({
+		isShow: {
+			type: Boolean
+		},
+	});
+	watch(
+		() => props.isShow,
+		(newVal, oldVal) => {
+			if (!oldVal && newVal) {
+				firstgetqueryCgdList();
+				getSelectList();
+			}  
+		}
+	)
 
 	const open = ref(0);
 	const typechange = ref(0);
 	const stringjh = ref("")
-	const serverUrl = ref("");
+	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/');
 	const opengaijia = ref(false);
 	const guiling = ref(false);
 	const openjianhuo = ref(false);
@@ -1268,12 +1281,6 @@
 		}, 300)
 	}
 
-
-	onLoad(() => {
-		firstgetqueryCgdList();
-		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
-		getSelectList();
-	})
 	const opencgr = ref(false);
 	const opengys = ref(false);
 
@@ -2007,7 +2014,7 @@
 <style lang="less" scoped>
 	.contain {
 		background-color: rgb(239, 240, 244);
-		width: 100vw;
+		width: 90vw;
 		height: 100vh;
 		padding: 5vh 2vw 0 2vw;
 		display: flex;
diff --git a/pages/procurement/common/thitem.vue b/pages/procurement/common/thitem.vue
index 7a4d93a..7542246 100644
--- a/pages/procurement/common/thitem.vue
+++ b/pages/procurement/common/thitem.vue
@@ -444,13 +444,13 @@
 		}
 
 		.fler {
-			width: 31.5vw;
+			width: 28vw;
 			height: 13vw;
 			margin-bottom: 0.9vw;
 			margin-left: 0.5vw;
 
 			.carditem {
-				width: 31vw;
+				width: 26.5vw;
 				height: 13vw;
 				background: rgba(245, 246, 248, 1);
 				border-radius: 1.1vw;
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index fd5f02f..78052e6 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -167,24 +167,24 @@
 
 <style scoped lang="less">
 	.crdcroll {
-		width: 96vw;
+		width: 90vw;
 		height: 70.3vh;
 
 		.box {
-			width: 96vw;
+			width: 90vw;
 			display: grid;
 			grid-template-columns: 1fr 1fr;
 		}
 		.fler {
-			width: 47vw;
+			width: 43vw;
 			height: 15.6vw;
 		}
 	}
 
 	.carditem {
-		width: 47vw;
+		width: 43vw;
 		height: 14.5vw;
-		background: rgba(245, 246, 248, 1);
+		background: rgba(255, 255, 255, 0.9);
 		border-radius: 1.6vw;
 		position: relative;
 		margin-bottom: 1.1vw;
@@ -382,7 +382,7 @@
 		// 	margin-left: -15vw !important;
 		// }
 		.speitem {
-			width: 15vw;
+			width: 13vw;
 			height: 100%;
 			display: inline-flex;
 			flex-direction: column;
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
index dcfddb9..5940452 100644
--- a/pages/procurement/inventory.vue
+++ b/pages/procurement/inventory.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="all-bgc">
+	<view class="all-bgc" v-if="isShow">
 		<view class="buttons-father">
 			<view class="ipt">
 				<input type="text" v-model="plzinfo.pddInfo" placeholder="盘点单号/盘点人/盘点日期" @confirm="clickconfirm" />
@@ -37,12 +37,12 @@
 						新增
 					</view>
 				</view>
-				<view class="contain-right-button" @click="goback">
+				<!-- <view class="contain-right-button" @click="goback">
 					<image class="buttont-img" style="margin-top: 4rpx;" src="/static/index/purchaseorder/back.png" />
 					<view class="button-font">
 						返回
 					</view>
-				</view>
+				</view> -->
 			</view>
 
 			<!-- <nomessage cont="暂无数据" :show="nomessageshow" /> -->
@@ -266,21 +266,26 @@
 	const addshow = ref(false)
 	const tagsarray = ref(["全部", "盘点中", "已完成"])
 	const cgrlist = ref([]);
-
+	const props = defineProps({
+		isShow: {
+			type: Boolean
+		},
+	});
+	watch(
+		() => props.isShow,
+		(newVal, oldVal) => {
+			if (!oldVal && newVal) {
+				chongzhi()
+				 getSelectList();
+			}  
+		}
+	)
 
 	const getSelectList = () => {
 		queryPddStartByList({ nuId: uni.getStorageSync('nuId') }).then((res : any) => {
 			cgrlist.value = res.result;
-
 		})
 	}
-	onShow(() => {
-		chongzhi()
-	})
-	onMounted(() => {
-		// firstgetqueryCgdList();
-		getSelectList();
-	})
 	type datetype = {
 		start : string,
 		end : string
@@ -562,8 +567,8 @@
 <style scoped lang="less">
 	.all-bgc {
 		background-color: rgb(239, 240, 244);
-		padding-left: 2vw;
-		padding-top: 5.5vh;
+		padding-left: 1vw;
+		padding-top:2vh;
 	}
 
 	.buttons-father {
@@ -847,6 +852,7 @@
 								color: #FF5757;
 								border: 2rpx solid #FF5757;
 								margin-left: 5rpx;
+								margin-right: 5rpx;
 								border-radius: 5rpx;
 							}
 						}
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 1257830..f56d7f3 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -1,6 +1,6 @@
 <template>
-	<view>
-		<view class="serchs guodu" :style="tx?'':'width:95vw'">
+	<view  v-if="isShow">
+		<view class="serchs guodu" :style="tx?'':'width:90vw'">
 			<view class="ipt">
 				<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo" @confirm="search" />
 				<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
@@ -20,17 +20,17 @@
 				<image src="/static/index/procurement/cz.png" mode="aspectFill"></image>
 				重置
 			</view>
-			<view class="back guodu" @click="uni.navigateBack()">
+			<!-- <view class="back guodu" @click="uni.navigateBack()">
 				<image src="/static/index/procurement/bk.png" mode="aspectFill"></image>
 				返回
-			</view>
+			</view> -->
 		</view>
 		<view class="kcyj">
 			<view class="kjlt" @click="tx=!tx">
 				库存预警
 			</view>
 			<scroll-view scroll-x="true" class="kcscrol guodu"
-				:style="tx?(qb?'width:46.4vw':'width:55.4vw') : (qb?'width:77.4vw':'width:86.4vw') "
+				:style="tx?(qb?'width:38.2vw':'width:47.2vw') : (qb?'width:71.2vw':'width:80.2vw') "
 				scroll-with-animation :scroll-left="scrollleft" @scroll="onScroll" @scrolltolower="scrolltolower(1)">
 				<view class="yjbox" v-for="(v,i) in Material" :key="i" @click="clickaddcar(v,i)">
 					<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
@@ -128,7 +128,7 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick,  defineComponent, inject } from 'vue';
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick,  defineComponent, inject ,watch} from 'vue';
 	import { queryInvoicingList, queryWlInfoByWlId, addShoppingCartList, queryShoppingCartList,queryCgdWaringList,queryCrkInfoNumList } from './api/lunpan.js'
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import calculator from './components/calculator.vue'
@@ -139,7 +139,7 @@
 	import inboundoutbound from './components/inboundoutbound.vue'
 	import addall from './components/addall.vue'
 	import defaultr from './components/default.vue'
-	const tx = ref(true)
+	const tx = ref(false)
 
 	const qb = ref(false)
 	const addflag = ref(false)
@@ -157,7 +157,7 @@
 	const openerror = ref(false)
 	const errmsg = ref('')
 	const scrolltop = ref(0)
-	const serverUrl = ref('')
+	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const form = reactive({
 		nuId: uni.getStorageSync('nuId'),
 		pageNo: 1,
@@ -181,24 +181,31 @@
 	})
 	const classication = ref<InstanceType<typeof ChildComponent>>()
 	const timeout = ref(false)
-	onLoad(() => {
-		setTimeout(()=>{
-			timeout.value = true
-		},500)
-		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
-	})
-	onShow(() => {
-		form.pageNo = 1;
-		warn.pageNo = 1;
-		Material.value = [];
-		InvoicingList.value = [];
-		moredex.value = 0;
-		shoppcar();
-		getWaringMaterial()
-		nextTick(() => {
-			chongzhi()
-		})
-	})
+	const props = defineProps({
+		isShow: {
+			type: Boolean
+		},
+	});
+	watch(
+		() => props.isShow,
+		(newVal, oldVal) => {
+			if (!oldVal && newVal) {
+				 form.pageNo = 1;
+				 warn.pageNo = 1;
+				 Material.value = [];
+				 InvoicingList.value = [];
+				 moredex.value = 0;
+				 shoppcar();
+				 getWaringMaterial()
+				 nextTick(() => {
+				 	chongzhi()
+				 })
+				 setTimeout(()=>{
+				 	timeout.value = true
+				 },500)
+			}  
+		}
+	) 
 	const Material = ref([])
 
 	const getWaringMaterial = () => {
@@ -519,7 +526,7 @@
 	}
 
 	.listcard {
-		width: 100%;
+		width: 90vw;
 		height: 70.3vh;
 		margin-top: 1vw;
 
@@ -782,7 +789,7 @@
 				display: inline-block;
 				width: 14vw;
 				height: 10vw;
-				background: rgba(255, 255, 255, 0.5);
+				background: rgba(255, 255, 255, 0.9);
 				border-radius: 1.1vw;
 				margin-right: 0.6vw;
 				position: relative;
@@ -1000,11 +1007,4 @@
 			letter-spacing: -0.05em; /* 负值 = 字符之间更近 */
 		}
 	}
-</style>
-<style>
-	page {
-		background: RGBA(239, 240, 244, 1);
-		padding: 2vw;
-		box-sizing: border-box;
-	}
 </style>
\ No newline at end of file
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index 5a27f02..9f06310 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -35,12 +35,12 @@
 						回退
 					</view>
 				</view>
-				<view class="contain-right-button" @click="goback">
+				<!-- <view class="contain-right-button" @click="goback">
 					<image class="buttont-img" style="margin-top: 4rpx;" src="/static/index/purchaseorder/back.png" />
 					<view class="button-font">
 						返回
 					</view>
-				</view>
+				</view> -->
 			</view>
 
 			<nomessage cont="暂无数据" :show="nomessageshow" />
@@ -636,8 +636,8 @@
 	.all-bgc {
 		background-color: rgb(239, 240, 244);
 		// padding: 2vw;
-		padding-left: 2vw;
-		padding-top: 5.5vh;
+		padding-left: 1vw;
+		padding-top: 1.5vh;
 	}
 
 	.right-container-tem {
diff --git a/pages/procurement/retstock.vue b/pages/procurement/retstock.vue
index c8e5a40..b382f2f 100644
--- a/pages/procurement/retstock.vue
+++ b/pages/procurement/retstock.vue
@@ -587,7 +587,7 @@
 		margin-top: 1vw;
 
 		.rightscr {
-			width: 65vw;
+			width: 57vw;
 			height: 100%;
 			background: #F9F9F9;
 			border-radius: 1.6vw;
@@ -601,7 +601,7 @@
 	}
 
 	.serchs {
-		width: 96vw;
+		width: 90vw;
 		height: 3.3vw;
 		border-radius: 1.6vw;
 		display: flex;
@@ -825,12 +825,5 @@
 		}
 
 
-	}
-</style>
-<style>
-	page {
-		background: RGBA(239, 240, 244, 1);
-		padding: 2vw;
-		box-sizing: border-box;
 	}
 </style>
\ No newline at end of file