库存显示优化

ghsApp/src/admin/shop/myShop.vue

@@ -12,7 +12,9 @@
 						<t-tr v-for="(item, inIndex) in shopData.list" :key="inIndex">
 							<t-td>
 								<view style="color:black;font-size:30upx;">
-									<text style="margin-left:10upx;">{{item.shopName}}</text>
+								{{item.merchantName}}
+								<text v-if="item.shopName == '首店'"></text>
+								<text v-else style="margin-left:10upx;">{{item.shopName}}</text>
 								</view>
 							</t-td>
 							<t-td><button class="admin-button-com middle blue" style="margin-left:30upx;" @click="selectShopFn(item.id)">进入此店</button></t-td>

ghsApp/src/admin/stat/stock.vue

@@ -5,20 +5,21 @@
 				<view style="padding:0 0upx 0 20upx;" >
 					<button class="admin-button-com middle blue" 
 					style="background-color:green;border:1upx solid green;margin-right:60upx;"
-					@click="allOutSelectShop(1)">全部出库并入库到</button>
+					@click="allOutSelectShop(1)">全部调拨出库</button>
 					<button class="admin-button-com middle default" @click="clearAll()">清空全部库存</button>
 				</view>
 			</view>
-			<view class="top-bar" style="margin-left:110upx;">实时</view>
+			<view class="top-bar" style="margin-left:80upx;">实时库存</view>
 			<scroll-view scroll-y scroll-with-animation class="main-view">
 				<view class="space-view ex-table">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<t-tr header>
-							<t-th><view style="width:240upx;text-align:left;">花材</view></t-th>
+							<t-th><view style="width:200upx;text-align:left;">花材</view></t-th>
 							<t-th>库存</t-th>
-							<t-th>大客价</t-th>
-							<t-th>批发价</t-th>
-							<t-th>零售价</t-th>
+							<t-th>路上</t-th>
+							<t-th>大客</t-th>
+							<t-th>批发</t-th>
+							<t-th>零售</t-th>
 							<t-th><view @click="clearAllStock()">成本</view></t-th>
 						</t-tr>
 						<block v-if="!$util.isEmpty(classItemData)">
@@ -26,50 +27,55 @@
 								<block v-if="classItem.child && !$util.isEmpty(classItem.child)">
 									<t-tr>
 										<t-td>
-											<text style="color:#3385FF;font-weight:bold;width:280upx;text-align:left;">
+											<text style="color:#3385FF;font-weight:bold;width:200upx;text-align:left;">
 												{{ classItem.className }}
 											</text>
 										</t-td>
 										<t-td></t-td>
 										<t-td></t-td>
+										<t-td></t-td>
+										<t-td></t-td>
+										<t-td></t-td>
+										<t-td></t-td>
 									</t-tr>
 									<template v-if="classItem.child && !$util.isEmpty(classItem.child)">
 										<block v-for="(productItem, productIndex) in classItem.child" :key="productIndex">
 											<t-tr>
 												<t-td>
-													<view style="width:240upx;text-align:left;color:#333333;font-size:30upx;
-													overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" 
-													@click="pageTo({url:'/admin/item/detail',query:{id: productItem.id}})">
+													<view style="width:200upx;text-align:left;color:#333333;font-size:29upx; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @click="pageTo({url:'/admin/item/detail?id='+productItem.id})">
 														{{productItem.name}}
 													</view>
 												</t-td>
 												<t-td>
-												<view style="color:#333333;font-weight:bold;font-size:30upx;" 
-												@click="pageTo({url:'/admin/item/detail',query:{id: productItem.id}})">
-												{{productItem.stock?parseFloat(productItem.stock):0}}
-												</view>
+													<view style="color:#333333;font-weight:bold;font-size:29upx;" @click="pageTo({url:'/admin/item/detail?id='+productItem.id})">
+														{{productItem.stock?parseFloat(productItem.stock):0}}
+													</view>
+												</t-td>
+												<t-td>
+													<text v-if="Number(productItem.onStock)>0" style="color:#0a97a9;font-size:30upx; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @click="pageTo({url:'/admin/item/detail?id='+productItem.id,})">
+														{{productItem.onStock}}
+													</text>
+													<text v-else  style="color:#0a97a9;font-size:30upx; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @click="pageTo({url:'/admin/item/detail?id='+productItem.id,})">
+														-
+													</text>
 												</t-td>
 												<t-td>
-													<view style="font-size:30upx;" 
-													@click="pageTo({url:'/admin/item/detail',query:{id: productItem.id}})">
+													<view style="font-size:28upx;" @click="pageTo({url:'/admin/item/detail?id='+productItem.id})">
 														¥{{productItem.hjPrice?parseFloat(productItem.hjPrice):0}}
 													</view>
 												</t-td>
 												<t-td>
-													<view style="color:#333333;font-weight:bold;font-size:30upx;" 
-													@click="pageTo({url:'/admin/item/detail',query:{id: productItem.id}})">
+													<view style="color:#3385FF;font-size:30upx;" @click="pageTo({url:'/admin/item/detail?id='+productItem.id})">
 														¥{{productItem.price?parseFloat(productItem.price):0}}
 													</view>
 												</t-td>
 												<t-td>
-													<view style="font-size:30upx;" 
-													@click="pageTo({url:'/admin/item/detail',query:{id: productItem.id}})">
+													<view style="font-size:28upx;" @click="pageTo({url:'/admin/item/detail?id='+productItem.id})">
 														¥{{productItem.skPrice?parseFloat(productItem.skPrice):0}}
 													</view>
 												</t-td>
 												<t-td>
-													<view style="font-size:30upx;" 
-													@click="pageTo({url:'/admin/item/detail',query:{id: productItem.id}})">
+													<view style="font-size:28upx;color:red;" @click="pageTo({url:'/admin/item/detail?id='+productItem.id})">
 														¥{{productItem.cost?parseFloat(productItem.cost):0}}
 													</view>
 												</t-td>

ghsApp/src/pagesOrder/detail.vue

@@ -17,7 +17,7 @@
 				<view style="position: relative;">
 					<i @click.stop="callUp(detailInfo.customMobile)" class="iconfont icondianhua1"></i>
 					<i @click.stop="navigateTo(detailInfo.lat,detailInfo.long,detailInfo.customName)" class="iconfont icondianhua" style="font-size:53upx;margin-left:40upx;margin-right:25upx;color:#3385ff;"></i>
-					<button class="admin-button-com bule" @click.stop="copyCustom(detailInfo)" style="position: absolute;right:25upx;top:70upx;width:140upx;height:80upx;line-height:60upx;">复制</button>
+					<button class="admin-button-com bule" @click.stop="copyCustom(detailInfo)" style="position: absolute;right:25upx;top:75upx;width:140upx;height:70upx;line-height:50upx;">复制</button>
 				</view>
 			</view>
 
@@ -719,7 +719,7 @@ export default {
 			if (!this.$util.isEmpty(detailInfo.showAddress) && address != detailInfo.showAddress){
 				address += "（"+detailInfo.showAddress+"）"
 			}
-			let val = address+"\n"+customName+" "+customMobile
+			let val = address+" "+customName+"\n"+customSuper+" "+customMobile
 			const self = this
 			uni.setClipboardData({ data: val, success: function() { self.$msg("复制成功") } })
 		},