lilei 2 роки тому
батько
коміт
f69917c5cb

+ 10 - 6
pages/replenishmentManage/replenishmentList.vue

@@ -26,13 +26,17 @@
 							</view>
 						</view>
 						<view class="ptools flex align_center justify_between">
-							<view><text>{{item.createDate}}</text></view>
+							<view>
+								<text v-if="item.billState == 'WAIT_CHECK'">出库时间:{{item.outStockTime}}</text>
+								<text v-else-if="item.billState == 'FINISH'">签收时间:{{item.putStockTime}}</text>
+								<text v-else>创建时间:{{item.createDate}}</text>
+							</view>
 							<view class="flex align_center justify_between">
 								<view v-if="item.billState=='WAIT_CONFIRM'||item.billState=='WAIT_OUT_STOCK'">
-									<u-button shape="circle" size="mini" @click.stop="handleCancelOrder(item)" type="error" plain>取消补货单</u-button>
+									<u-button shape="circle" size="mini" @click.stop="handleCancelOrder(item)" type="error" plain>取消</u-button>
 								</view>
 								<view v-if="item.billState=='CANCEL'">
-									<u-button shape="circle" size="mini" @click.stop="handleDelOrder(item)" type="error" plain>删除补货单</u-button>
+									<u-button shape="circle" size="mini" @click.stop="handleDelOrder(item)" type="error" plain>删除</u-button>
 								</view>
 								<view class="print" v-if="item.billState!='CANCEL'&&item.billState!='WAIT_CONFIRM'" @click.stop="print(item)">
 									<u-image :src="`/static/${$config('themePath')}/icon_printer@3x.png`" width="48" height="48"></u-image>
@@ -345,11 +349,11 @@
 			.check-row{
 				 display: flex;
 				 justify-content: space-between;
-				 margin-bottom: 10rpx;
 				 >view{
 					 &:first-child{
-						 color: #222;
-						 font-size: 32rpx;
+						 color: #333;
+						 font-size: 30rpx;
+						 font-weight: bold;
 						 width: 80%;
 					 }
 					 &:last-child{

+ 8 - 13
pages/shelfOrder/listComponent.vue

@@ -3,12 +3,14 @@
 		<scroll-view class="sales-list-con" :style="{height: scrollH+'px'}" scroll-y @scrolltolower="onreachBottom">
 			<view class="sales-list-main">
 				<view class="sales-list-item" v-for="(item, index) in listData" :key="item.id" @click="getDetail(item)">
-					<view class="list-item-tit flex align_center justify_between">
-						<view class="u-line" :style="{background: $config('primaryColor')}"></view>
-						<view class="buyer">{{item.shelfName||'--'}}</view>
-						<view><text :style="{color:item.billState=='CLOSE'?'#ff5500':'#999'}">{{item.billStateDictValue}}</text> 
-						<u-icon name="arrow-right" color="#969da3" size="28"></u-icon>
-					</view>
+					<view class="list-item-tit align_center flex justify_between">
+						<view class="buyer flex">
+							{{item.shelfName||'--'}}
+						</view>
+						<view>
+							<text :style="{color:item.billState=='CLOSE'?'#ff5500':'#999'}">{{item.billStateDictValue}}</text> 
+							<u-icon name="arrow-right" color="#969da3" size="28"></u-icon>
+						</view>
 					</view>
 					<view class="detail-list">
 						<view class="flex align_center justify_between" v-for="de in item.orderBillDetailApiEntityList">
@@ -174,13 +176,6 @@
 						padding-bottom: 18upx;
 						padding-top: 10upx;
 						border-bottom: 1px solid #e4e7ed;
-						.u-line{
-							display: inline-block;
-							width: 6upx;
-							height: 28upx;
-							vertical-align: bottom;
-							border-radius: 5upx;
-						}
 						.buyer{
 							flex-grow: 1;
 							font-size: 28upx;

+ 10 - 2
pages/soldOut/creatOrder.vue

@@ -76,9 +76,14 @@
 			</view>
 			<view v-if="chooseList.length==0">
 				<view class="nodata">
-					暂无产品,请点击 
 					<view>
-						<text @click="toChooseProduct">选择产品</text>
+						<u-image :src="`../../static/${$config('themePath')}/def_no_data@3x.png`" width="180" height="180" border-radius="10"></u-image>
+					</view>
+					<view class="flex">
+						暂无产品,请点击
+						<view>
+							<text @click="toChooseProduct">选择产品</text>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -280,10 +285,13 @@
 		padding: 150rpx 50rpx;
 		text-align: center;
 		display: flex;
+		flex-direction: column;
 		justify-content: center;
+		align-items: center;
 		color: #999;
 		> view{
 			position: relative;
+			padding: 10upx 0;
 			text{
 				color: #00aaff;
 				margin-left: 10rpx;