From 45ebc799ec32100a4e3ac80992f7be2a44c84c4d Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Wed, 15 Feb 2023 14:57:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BC=A0=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=B0=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/warehouse/detail.vue | 27 +++++++--------------------
 pages/warehouse/info.vue   | 35 +++++++++++------------------------
 pages/warehouse/mana.vue   | 25 ++++++++++++++++++-------
 3 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/pages/warehouse/detail.vue b/pages/warehouse/detail.vue
index fe21533..43685e4 100644
--- a/pages/warehouse/detail.vue
+++ b/pages/warehouse/detail.vue
@@ -76,16 +76,16 @@
 				<text>仓库位置</text> <text>{{detail.warehouseAddress}}</text>
 			</view>
 			<view class="item">
-				<text>仓库容量</text> <text>{{detail.warehouseVolume}}</text>
+				<text>仓库容量</text> <text>{{detail.warehouseVolume}}(m²)</text>
 			</view>
 			<view class="item">
-				<text>仓库类型</text> <text>{{detail.warehouseType}}</text>
+				<text>仓库类型</text> <text>{{detail.warehouseType_dictText}}</text>
 			</view>
 			<view class="item">
-				<text>仓库管理员</text> <text>{{detail.warehouseKeeper}}</text>
+				<text>仓库管理员</text> <text>{{detail.contactPeople}}</text>
 			</view>
 			<view class="item">
-				<text>库管员电话</text> <text>{{detail.warehouseKeeperTelephone}}</text>
+				<text>库管员电话</text> <text>{{detail.contactNumber}}</text>
 			</view>
 		</view>
 
@@ -107,24 +107,11 @@ import request from '@/common/request.js'
 			}
 		},
 		onLoad(options){
-			this.getDetail(options.id)
+			var eventChannel=this.getOpenerEventChannel()
+			eventChannel.on("detail", e=>this.detail=e)
 		},
 		methods:{
-			async getDetail(warehouseId){
-				var res=await request("/api/WarehouseManageApi/querysWarehouseDetails",{
-					params:{warehouseId}
-				})
-				if(res.statu){
-					this.detail=res.data.upper
-					this.list=res.data.lower
-				}else{
-					uni.showModal({
-						title:"提示",
-						content:res.msg||"获取仓库详情失败！",
-						showCancel:false,
-					})
-				}
-			}
+			
 		}
 	}
 </script>
diff --git a/pages/warehouse/info.vue b/pages/warehouse/info.vue
index f1d9089..271f9fd 100644
--- a/pages/warehouse/info.vue
+++ b/pages/warehouse/info.vue
@@ -73,12 +73,17 @@ import request from '@/common/request.js'
 		onLoad(options){
 			this.eventChannel=this.getOpenerEventChannel()
 			this.init()
-			if(options.id){
-				this.getDetail(options.id)
-			}else if(this.$store.getters['userInfo'].roleCode=="baseAdmin"){
-				this.formData.contactPeople=this.$store.getters['userInfo'].realname
-				this.formData.contactNumber=this.$store.getters['userInfo'].phone
-			}
+			this.eventChannel.on("detail", e=>{
+				if(e){
+					this.formData=e
+					this.fields.warehousePic.value=e.warehousePic.join(',')
+					this.fields.warehouseType.value=[e.warehouseType]
+					this.fields.goodsType.value=[e.goodsType]
+				}else if(this.$store.getters['userInfo'].roleCode=="baseAdmin"){
+					this.formData.contactPeople=this.$store.getters['userInfo'].realname
+					this.formData.contactNumber=this.$store.getters['userInfo'].phone
+				}
+			})
 		},
 		methods:{
 			async init(){
@@ -138,24 +143,6 @@ import request from '@/common/request.js'
 					}
 				})
 			},
-			async getDetail(id){
-				var res=await request("/api/WarehouseManageApi/queryById",{
-					params:{id}
-				})
-				if(res.statu){
-					this.formData=res.data
-					this.fields.warehousePic.value=res.data.warehousePic
-					this.formData.warehousePic=res.data.warehousePic?.split?.(",")?.filter?.(v=>v)||[]
-					this.fields.warehouseType.value=[res.data.warehouseType]
-					this.fields.goodsType.value=[res.data.goodsType]
-				}else{
-					uni.showModal({
-						title:"提示",
-						content:res.msg||"获取仓库详情失败！",
-						showCancel:false,
-					})
-				}
-			},
 		},
 	}
 </script>
diff --git a/pages/warehouse/mana.vue b/pages/warehouse/mana.vue
index aff7ef1..29993f4 100644
--- a/pages/warehouse/mana.vue
+++ b/pages/warehouse/mana.vue
@@ -92,7 +92,7 @@
 		<d-search v-model="searchVal.search" @search="clean();search()"/>
 		
 		<scroll-view scroll-y @scrolltolower="search">
-			<view class="card item" v-for="(v,k) in list" :key="k" @click="$u.route({url:'pages/warehouse/detail',params:{id:v.warehouseId}})">
+			<view class="card item" v-for="(v,k) in list" :key="k" @click="toDetail(v)">
 				<view class="img">
 					<u-image width="100%" height="144rpx" radius="16rpx" mode="aspectFill" :src="`${host}/${v.warehousePic[0]}`">
 						<text slot="error" class="plant-xiaopangchetupianjiazaishibai" style="font-size:45rpx"/>
@@ -104,10 +104,10 @@
 					<view class="title">{{v.warehouseName}} <text class="plant-youbian"/></view>
 					<view class="adder">{{v.warehouseAddress}}</view>
 					<view class="data">
-						<text>库存种类：{{v.inventoryCount||0}}种</text> <text>{{v.capacity||0}}㎡</text>
+						<text>库存种类：{{v.inventoryCount||0}}种</text> <text>{{v.warehouseVolume||0}}㎡</text>
 					</view>
 					<view class="btns">
-						<text class="plant-xiugai" @click.stop="toAdd(v.warehouseId)">修改</text>
+						<text class="plant-xiugai" @click.stop="toAdd(v)">修改</text>
 						<text class="plant-shanchu" @click.stop="del(k)">删除</text>
 						<text class="plant-chakan" @click.stop="$u.route({url:'pages/stock/mana',params:{id:v.id, goodsType:({1:'nz',2:'ncp'})[v.goodsType]}})">查看库存</text>
 					</view>
@@ -118,7 +118,7 @@
 	</view>
 </template>
 <script>
-import request,{host} from '@/common/request.js'
+import request,{host} from '@/common/request'
 	export default {
 		data(){
 			return{
@@ -192,13 +192,24 @@ import request,{host} from '@/common/request.js'
 					}
 				})
 			},
-			toAdd(id){
+			toAdd(e){
 				uni.navigateTo({
-					url:`/pages/warehouse/info?id=${id||''}`,
+					url:`/pages/warehouse/info`,
 					events:{update:()=>{
 						this.clean()
 						this.search()
-					}}
+					}},
+					success(res){
+						res.eventChannel.emit("detail", e)
+					}
+				})
+			},
+			toDetail(e){
+				uni.navigateTo({
+					url:"/pages/warehouse/detail",
+					success(res){
+						res.eventChannel.emit('detail', {...e})
+					}
 				})
 			}
 		}