预订显示优化

ghsApp/src/admin/book/itemCustom.vue

@@ -2,7 +2,9 @@
 	<view class="app-content">
 		<view class="ex-page">
             <view class="top-bar">
-                <view style="font-size:30upx;"></view>
+                <view style="font-size:30upx;color:blue;font-weight:bold;margin-left:30upx;padding:10upx 0 10upx 0;" v-if="respond.remainNum && Number(respond.remainNum)>0">
+					{{ respond.remainName }} 剩 {{ respond.remainNum }}份
+				</view>
             </view>
             <scroll-view scroll-y scroll-with-animation class="main-view">
                 <view class="space-view ex-table">
@@ -18,13 +20,13 @@
                         <template v-if="!$util.isEmpty(bookData)">
                             <view v-for="(item, index) in bookData" :key="index" @click="goAction(item)">
                                 <t-tr>
-                                    <t-td><view style="color:#333333;font-size:25upx;width:170upx;text-align:left;height:60upx;display: flex;align-items: center;color:black;">{{item.name}}</view></t-td>
-                                    <t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;color:black;">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
-                                    <t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;color:black;">{{item.onNum?parseFloat(item.onNum):0}}</view></t-td>
-                                    <t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;color:black;">{{item.roadNum?parseFloat(item.roadNum):0}}</view></t-td>
-                                    <t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;color:black;">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
+                                    <t-td><view class="name" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.name}}</view></t-td>
+                                    <t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
+                                    <t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.onNum?parseFloat(item.onNum):0}}</view></t-td>
+                                    <t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.roadNum?parseFloat(item.roadNum):0}}</view></t-td>
+                                    <t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
                                     <t-td>
-										<view style="font-size:24upx;color:#333333;overflow: hidden;width:90upx;color:black;">
+										<view class="custom-item" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">
 											<view>{{ item.customName }}</view>
 											<view v-if="item.seatSn != 0">
 												{{item.seatSn }}号
@@ -39,7 +41,6 @@
             </scroll-view>
 		</view>
 
-
 		<uni-popup ref="actRef" background-color="#fff" type="center" :animation="false" class="class-popup-style" :is-mask-click="false">
 			<view style="max-height:90vh;overflow: scroll;padding:15upx;">
 				<view style="text-align:center;font-size:32upx;font-weight:bold;">{{ currentItem.name ? currentItem.name:'未命名' }}</view>
@@ -115,7 +116,8 @@ export default {
 			itemName:'',
 			customName:'',
 			customId:0,
-			currentItem:null
+			currentItem:null,
+			respond:{remainNum:0,remainName:''}
 		};
 	},
 	onPullDownRefresh() {
@@ -192,9 +194,9 @@ export default {
 		getStatList() {
 			let that = this
 			uni.showLoading()
-
 			getBookItemCustomList({itemId:this.itemId,customId:this.customId}).then(res => {
 				uni.hideLoading()
+				this.respond = res.data
 				if (!this.$util.isEmpty(res.data.list)) {
 					that.bookData = res.data.list
 				}else{
@@ -213,12 +215,28 @@ export default {
 	display: flex;
 	flex-direction: column;
 	.top-bar {
+		font-size:30upx;
 	}
 	.main-view {
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {
 			background-color: #fff;
+			.num{
+				font-size:25upx;height:60upx;display: flex;align-items: center;
+			}
+			.name{
+				font-size:25upx;width:170upx;text-align:left;height:60upx;display: flex;align-items: center;
+			}
+			.custom-item{
+				font-size:24upx;color:#333333;overflow: hidden;width:90upx;
+			}
+			.finish{
+				color:green;font-weight:bold;
+			}
+			.normal{
+				color:black;
+			}
 		}
 		.ex-info {
 			padding: 30upx;

ghsApp/src/admin/item/components/item.vue

@@ -119,8 +119,8 @@ export default {
 	border:2upx solid #cccccc;
 	font-size:24upx;
 	border-radius: 20upx;
-	padding:13upx 22upx 13upx 22upx;
-	margin:0 12upx 0 0;
+	padding:13upx 21upx 13upx 21upx;
+	margin:0 10upx 0 0;
 	float:right;
 	color:#aaa9a9;
 }

ghsApp/src/admin/order/statBook.vue

@@ -7,8 +7,8 @@
 			</view>
 		</view>
 		<view class="top-bar">
-			<button class="admin-button-com middle blue" style="margin-left:80upx;" @click="changeStaff()" v-if="Number(bookSn)>0">
-				{{selectStaff.id == 0 ?'选采购人':selectStaff.name}}
+			<button class="admin-button-com middle blue" style="margin-left:80upx;" @click="changeStaff()">
+				{{selectStaff.id == 0 ?'采购人':selectStaff.name}}
 			</button>
 			<button class="admin-button-com middle blue" style="margin-left:60upx;" @click="modifyBook(0)" v-if="Number(bookSn)>0">结束预订</button>
 			<button class="admin-button-com middle blue" style="margin-left:60upx;" @click="modifyBook(1)" v-else>开启预订</button>
@@ -28,12 +28,17 @@
 					<template v-if="!$util.isEmpty(profile)">
 						<view v-for="(item, index) in profile" :key="index" @click="goAction(item)">
 							<t-tr>
-								<t-td><view style="color:#333333;font-size:26upx;width:160upx;text-align:left;height:60upx;display: flex;align-items: center;color:black;">{{item.name}}</view></t-td>
-								<t-td><view style="color:#333333;font-size:26upx;height:60upx;display: flex;align-items: center;color:black;">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
-								<t-td><view style="color:#333333;font-size:26upx;height:60upx;display: flex;align-items: center;color:black;">{{item.onNum?parseFloat(item.onNum):0}}</view></t-td>
-								<t-td><view style="color:#333333;font-size:26upx;height:60upx;display: flex;align-items: center;color:black;">{{item.remainStockNum?parseFloat(item.remainStockNum):0}}</view></t-td>
-								<t-td><view style="color:#333333;font-size:26upx;height:60upx;display: flex;align-items: center;color:black;">{{item.roadNum?parseFloat(item.roadNum):0}}</view></t-td>
-								<t-td><view style="color:#333333;font-size:26upx;height:60upx;display: flex;align-items: center;color:black;">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
+								<t-td><view class="name" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.name}}</view></t-td>
+								<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
+								<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.onNum?parseFloat(item.onNum):0}}</view></t-td>
+								<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">
+									<text v-if="Number(item.remainStockNum)>0 && (Number(item.bookNum)-Number(item.onNum))>0" style="color:blue;font-weight:bold;">
+										{{item.remainStockNum?parseFloat(item.remainStockNum):0}}
+									</text>
+									<text v-else>{{item.remainStockNum?parseFloat(item.remainStockNum):0}}</text>
+								</view></t-td>
+								<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.roadNum?parseFloat(item.roadNum):0}}</view></t-td>
+								<t-td><view class="num" :class="[item.bookNum == item.onNum ? 'finish' : 'normal']">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
 							</t-tr>
 						</view>
 					</template>
@@ -297,6 +302,18 @@ export default {
 		background-color: #f9fbfc;
 		.space-view {
 			background-color: #fff;
+			.num{
+				font-size:26upx;height:60upx;display: flex;align-items: center;
+			}
+			.name{
+				font-size:26upx;width:160upx;text-align:left;height:60upx;display: flex;align-items: center;
+			}
+			.finish{
+				color:green;font-weight:bold;
+			}
+			.normal{
+				color:black;
+			}
 		}
 		.ex-info {
 			padding: 30upx;

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -50,6 +50,7 @@
 				</template>
 
 				<button class="admin-button-com big default" style="width:55vw;margin-top:30upx;" @click="goBackFn">稍后入库</button>
+				<button class="admin-button-com big default" style="width:55vw;margin-top:30upx;" @click="goDetail">订单详情</button>
 
 			</view>
 		</view>
@@ -246,6 +247,9 @@ export default {
 		},
 		goBackFn() {
 			uni.navigateBack({})
+		},
+		goDetail(){
+			this.pageTo({url: '/pagesPurchase/info?orderSn='+this.info.orderSn,type:2})
 		}
 	}
 };