Browse Source

bug 修复

lilei 2 năm trước cách đây
mục cha
commit
13e8c903fd

+ 17 - 3
pages/digitalShelf/orderList.vue

@@ -19,10 +19,13 @@
 									<view class="times">{{item.createDate}}</view>
 									<view class="times">{{item.createDate}}</view>
 								</view>
 								</view>
 								 <view class="check-row flex align-center">
 								 <view class="check-row flex align-center">
-									 <view class="carImage flex align-center">
-										 <u-image :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
+									 <view class="carImage">
+										 <u-image v-if="!item.billSource" :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
+										 <u-image v-if="item.billSource=='qr_code'" src="/static/qrcode.png" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
+										 <u-image v-if="item.billSource=='bar_code'" src="/static/barcode.png" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+										 <u-image v-if="item.billSource=='product_code'" src="/static/tag.png" border-radius="30" width="100" height="100" bg-color="#333" ></u-image> 
 									 </view>
 									 </view>
-									 <view>
+									 <view v-if="!item.billSource">
 										 <view class="carModel flex align-center" v-if="item.vehicleNumber" >
 										 <view class="carModel flex align-center" v-if="item.vehicleNumber" >
 										 	<view><carNo color="#0055ff" :val="item.vehicleNumber"></carNo></view>
 										 	<view><carNo color="#0055ff" :val="item.vehicleNumber"></carNo></view>
 											<text style="margin-left: 20rpx;" v-if="item.vehicleModel">{{item.vehicleModel.split(' ')[0]}}</text>
 											<text style="margin-left: 20rpx;" v-if="item.vehicleModel">{{item.vehicleModel.split(' ')[0]}}</text>
@@ -35,6 +38,14 @@
 											  <text v-if="item.vin" @click.stop="copyVin(item.vin)">复制</text>
 											  <text v-if="item.vin" @click.stop="copyVin(item.vin)">复制</text>
 										  </view>
 										  </view>
 									 </view>
 									 </view>
+									 <view v-else>
+										  <view class="pcode flex">
+											 <text>{{item.shelfOrderDetailList[0].productCode}}</text>
+										  </view>
+										  <view class="carModel flex">
+											  <text>{{item.shelfOrderDetailList[0].productName}}</text>
+										  </view>
+									 </view>
 								 </view>
 								 </view>
 								 <view class="check-row">
 								 <view class="check-row">
 									 <view class="nums">
 									 <view class="nums">
@@ -315,6 +326,9 @@
 						}
 						}
 					}
 					}
 					> view{
 					> view{
+						.pcode{
+							margin-bottom: 10rpx;
+						}
 						.carModel{
 						.carModel{
 							color: #222222;
 							color: #222222;
 							font-size: 32upx;
 							font-size: 32upx;

+ 7 - 2
pages/digitalShelf/settlementManage/settlementAyDetail.vue

@@ -24,10 +24,13 @@
 				 	</view>
 				 	</view>
 				 	<view class="flex align_center">
 				 	<view class="flex align_center">
 				 		<view class="carImage flex flex_column justify_center">
 				 		<view class="carImage flex flex_column justify_center">
-				 			<u-image :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
+							<u-image v-if="!item.billSource" :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+							<u-image v-if="item.billSource=='qr_code'" src="/static/qrcode.png" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
+							<u-image v-if="item.billSource=='bar_code'" src="/static/barcode.png" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+							<u-image v-if="item.billSource=='product_code'" src="/static/tag.png" border-radius="30" width="100" height="100" bg-color="#333" ></u-image>
 				 		</view>
 				 		</view>
 				 		<view class="carModel">
 				 		<view class="carModel">
-				 		  {{item.vehicleModel}}
+				 		  {{!item.billSource ? item.vehicleModel : item.shelfOrderDetailList[0].productName}}
 				 		</view>
 				 		</view>
 						<view class="price">¥{{item.settleAmount}}</view>
 						<view class="price">¥{{item.settleAmount}}</view>
 				 	</view>
 				 	</view>
@@ -255,6 +258,8 @@
 				}
 				}
 				.orderNo{
 				.orderNo{
 					font-size: 24rpx;
 					font-size: 24rpx;
+					flex-grow: 1;
+					width: 60%;
 				}
 				}
 			}
 			}
 		}
 		}

+ 7 - 2
pages/digitalShelf/settlementManage/settlementSxDetail.vue

@@ -34,10 +34,13 @@
 				 	</view>
 				 	</view>
 				 	<view class="flex align_center">
 				 	<view class="flex align_center">
 				 		<view class="carImage flex flex_column justify_center">
 				 		<view class="carImage flex flex_column justify_center">
-				 			<u-image :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
+							<u-image v-if="!item.billSource" :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+							<u-image v-if="item.billSource=='qr_code'" src="/static/qrcode.png" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
+							<u-image v-if="item.billSource=='bar_code'" src="/static/barcode.png" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+							<u-image v-if="item.billSource=='product_code'" src="/static/tag.png" border-radius="30" width="100" height="100" bg-color="#333" ></u-image> 
 				 		</view>
 				 		</view>
 				 		<view class="carModel">
 				 		<view class="carModel">
-				 			{{item.vehicleModel}}
+				 			{{!item.billSource ? item.vehicleModel : item.shelfOrderDetailList[0].productName}}
 				 		</view>
 				 		</view>
 						<view class="price">¥{{item.settleAmount}}</view>
 						<view class="price">¥{{item.settleAmount}}</view>
 				 	</view>
 				 	</view>
@@ -268,6 +271,8 @@
 				}
 				}
 				.orderNo{
 				.orderNo{
 					font-size: 28rpx;
 					font-size: 28rpx;
+					flex-grow: 1;
+					width: 60%;
 				}
 				}
 			}
 			}
 		}
 		}

+ 23 - 17
pages/digitalShelf/settlementRecord/settlementDetail.vue

@@ -24,30 +24,36 @@
 					 <!-- 列表 -->
 					 <!-- 列表 -->
 					 <view class="ds-list" v-for="item in list" :key="item.id" @click="viewDetail(item)">
 					 <view class="ds-list" v-for="item in list" :key="item.id" @click="viewDetail(item)">
 					 	<view class="flex align-center">
 					 	<view class="flex align-center">
-							<view class="orderNo">
-								{{item.shelfOrderNo}}
-							</view>
+							<view class="orderNo">{{item.shelfOrderNo}}</view>
 					 		<view class="time">{{item.createDate}}</view>
 					 		<view class="time">{{item.createDate}}</view>
 					 	</view>
 					 	</view>
 					 	<view class="flex align_center">
 					 	<view class="flex align_center">
 					 		<view class="carImage flex flex_column">
 					 		<view class="carImage flex flex_column">
-					 			<u-image :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
+								<u-image v-if="!item.billSource" :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+								<u-image v-if="item.billSource=='qr_code'" src="/static/qrcode.png" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
+								<u-image v-if="item.billSource=='bar_code'" src="/static/barcode.png" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+								<u-image v-if="item.billSource=='product_code'" src="/static/tag.png" border-radius="30" width="100" height="100" bg-color="#333" ></u-image> 
 					 		</view>
 					 		</view>
-					 		<view style="flex-grow: 1;">
-								<!-- <view class="flex" v-if="item.vehicleNumber">
-									<carNo color="#0055ff" :val="item.vehicleNumber"></carNo>
-								</view> -->
-					 		  <view class="carModel flex align_center">
-					 			  {{item.vehicleModel}}
-								  <view class="price">
-								  	¥{{item.settleAmount}}
+					 		<view style="flex-grow: 1;" v-if="!item.billSource">
+								  <view class="carModel flex align_center">
+									  {{item.vehicleModel}}
+									  <view class="price">
+										¥{{item.settleAmount}}
+									  </view>
+								  </view>
+								  <view class="carVin flex">
+									  <view>VIN码:{{item.vin||'暂无'}}</view>
+									  <text v-if="item.vin" @click.stop="copyVin(item.vin)">复制</text>
 								  </view>
 								  </view>
-					 		  </view>
-							  <view class="carVin flex">
-								  <view>VIN码:{{item.vin||'暂无'}}</view>
-								  <text v-if="item.vin" @click.stop="copyVin(item.vin)">复制</text>
-							  </view>
 					 		</view>
 					 		</view>
+							<view v-else>
+								  <view class="pcode flex">
+									 <text>{{item.shelfOrderDetailList[0].productCode}}</text>
+								  </view>
+								  <view class="carModel flex">
+									  <text>{{item.shelfOrderDetailList[0].productName}}</text>
+								  </view>
+							</view>
 					 	</view>
 					 	</view>
 					 </view>
 					 </view>
 					 <view style="padding: 20upx;">
 					 <view style="padding: 20upx;">

+ 3 - 1
pages/index/index.vue

@@ -362,6 +362,7 @@
 			// 选择取货方式
 			// 选择取货方式
 			clickAction(index){
 			clickAction(index){
 				const shelfSn = this.hasShelf.shelfSn
 				const shelfSn = this.hasShelf.shelfSn
+				const _this = this
 				// 扫描
 				// 扫描
 				if(index == 0){
 				if(index == 0){
 					uni.scanCode({
 					uni.scanCode({
@@ -385,8 +386,9 @@
 								if(res.status == 200 && res.data){
 								if(res.status == 200 && res.data){
 									if(res.data.currentInven){
 									if(res.data.currentInven){
 										const params = Object.assign({shelfSn: shelfSn, billSource: res.scanType == 'QR_CODE' ? 'qr_code': 'bar_code'},res.data)
 										const params = Object.assign({shelfSn: shelfSn, billSource: res.scanType == 'QR_CODE' ? 'qr_code': 'bar_code'},res.data)
+										_this.$store.state.vuex_tempData = params
 										uni.navigateTo({
 										uni.navigateTo({
-											url: '/pages/queryByCode/confirmQh?data='+ encodeURIComponent(JSON.stringify(res.data))
+											url: '/pages/queryByCode/confirmQh'
 										})
 										})
 									}else{
 									}else{
 										uni.showModal({
 										uni.showModal({

+ 6 - 14
pages/queryByCode/confirmQh.vue

@@ -69,20 +69,12 @@
 						 	url: "/pages/digitalShelf/orderDetail?shelfOrderSn="+res.data.shelfOrderSn
 						 	url: "/pages/digitalShelf/orderDetail?shelfOrderSn="+res.data.shelfOrderSn
 						 })
 						 })
 					 }else{
 					 }else{
-						 if(res.errCode == 'VALIDATE_STOCK_LACK'){
-							 uni.showModal({
-							 	title: '以下产品库存不足',
-							 	content: res.message,
-							 	confirmText: '知道了',
-							 	showCancel: false,
-							 })
-						 }else{
-							 uni.showToast({
-							 	icon:'none',
-								title: res.message,
-								duration: 4000
-							 })
-						 }
+						 uni.showModal({
+						 	title: res.errCode == 'VALIDATE_STOCK_LACK' ? '以下产品库存不足' : '提示',
+						 	content: res.message,
+						 	confirmText: '知道了',
+						 	showCancel: false
+						 })
 					 }
 					 }
 					this.loading = false
 					this.loading = false
 				 })
 				 })

BIN
static/barcode.png


BIN
static/qrcode.png


BIN
static/tag.png