zhangyuewww 3 years ago
parent
commit
712650ce1d

+ 35 - 4
pageA/freightTransport/record/payrecord.vue

@@ -74,12 +74,12 @@
 					<view style='flex:1;text-align:right;'>
 					<view style='flex:1;text-align:right;'>
 						<text>{{item.reciveNetWeight}}</text>
 						<text>{{item.reciveNetWeight}}</text>
 						<text class='type send'>发</text>
 						<text class='type send'>发</text>
-						<view class='weightnotes'>查看磅单</view>
+						<view class='weightnotes'  @click="viewPoundList(0,item)">查看磅单</view>
 					</view>
 					</view>
 					<view style='flex:1;text-align:right;'>
 					<view style='flex:1;text-align:right;'>
 						<text>{{item.dispatchNetWeight}}</text>
 						<text>{{item.dispatchNetWeight}}</text>
-						<text class='type send'></text>
-						<view class='weightnotes'>查看磅单</view>
+						<text class='type send'></text>
+						<view class='weightnotes' @click="viewPoundList(1,item)">查看磅单</view>
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
@@ -289,7 +289,16 @@
 				</view>
 				</view>
 			</u-modal>
 			</u-modal>
 		</view>
 		</view>
-		
+		<u-modal v-model="isShowFViewPoundList" title="磅单(发)" show-cancel-button=true>
+			<view v-if="dataList.collectionScreenshot==''||dataList.collectionScreenshot==null" class="noimg">
+				暂未上传磅单</view>
+			<view v-else><img :src="dataList.collectionScreenshot" alt="" class="img"></view>
+		</u-modal>
+		<u-modal v-model="isShowSViewPoundList" title="磅单(收)" show-cancel-button=true>
+			<view v-if="dataList.reciveCollectionScreenshot==''||dataList.reciveCollectionScreenshot==null" class="noimg">
+				暂未上传磅单</view>
+			<view v-else><img :src="dataList.reciveCollectionScreenshot" alt="" class="img"></view>
+		</u-modal>
 		<view class='footer'>
 		<view class='footer'>
 			<button class="btn" @click="commit()">添加收货人</button>
 			<button class="btn" @click="commit()">添加收货人</button>
 		</view>
 		</view>
@@ -306,6 +315,8 @@
 		name: "business",
 		name: "business",
 		data() {
 		data() {
 			return {
 			return {
+				isShowFViewPoundList: false,
+				isShowSViewPoundList: false,
 				freightDeductionAmount: 0,
 				freightDeductionAmount: 0,
 				money: 0,
 				money: 0,
 				ductPayment: 0,
 				ductPayment: 0,
@@ -377,6 +388,16 @@
 					}
 					}
 				}
 				}
 			},
 			},
+			// 查看磅单
+			viewPoundList(type,val) {
+				if (type == 0) {
+					this.dataList.collectionScreenshot=val.collectionScreenshot
+					this.isShowFViewPoundList = true
+				} else {
+					this.dataList.reciveCollectionScreenshot=val.reciveCollectionScreenshot
+					this.isShowSViewPoundList = true
+				}
+			},
 			confirmFreight(flag, val) {
 			confirmFreight(flag, val) {
 				if (flag == 1) {
 				if (flag == 1) {
 					val.money = parseInt(this.money);
 					val.money = parseInt(this.money);
@@ -1122,4 +1143,14 @@
 		display: flex;
 		display: flex;
 		flex-direction: row;
 		flex-direction: row;
 	}
 	}
+	
+	.noimg {
+		margin-top: 20rpx;
+		text-align: center;
+	}
+	
+	.img {
+		width: 300px;
+		height: 300px;
+	}
 </style>
 </style>

+ 20 - 17
pageA/freightTransport/record/sendrecord.vue

@@ -69,22 +69,12 @@
 					<view style='flex:1;text-align:right;'>
 					<view style='flex:1;text-align:right;'>
 						<text>{{item.reciveNetWeight}}</text>
 						<text>{{item.reciveNetWeight}}</text>
 						<text class='type send'>发</text>
 						<text class='type send'>发</text>
-						<view class='weightnotes' @click="viewPoundList(0)">查看磅单</view>
-						<u-modal v-model="isShowFViewPoundList" title="磅单(发)" show-cancel-button=true>
-							<view v-if="item.collectionScreenshot==''||item.collectionScreenshot==null" class="noimg">
-								暂未上传磅单</view>
-							<img :src="item.collectionScreenshot" alt="" class="img">
-						</u-modal>
+						<view class='weightnotes' @click="viewPoundList(0,item)">查看磅单</view>
 					</view>
 					</view>
 					<view style='flex:1;text-align:right;'>
 					<view style='flex:1;text-align:right;'>
 						<text>{{item.dispatchNetWeight}}</text>
 						<text>{{item.dispatchNetWeight}}</text>
 						<text class='type send'>收</text>
 						<text class='type send'>收</text>
-						<view class='weightnotes' @click="viewPoundList(1)">查看磅单</view>
-						<u-modal v-model="isShowSViewPoundList" title="磅单(收)" show-cancel-button=true>
-							<view v-if="item.reciveCollectionScreenshot==''||item.reciveCollectionScreenshot==null"
-								class="noimg">暂未上传磅单</view>
-							<img :src="item.reciveCollectionScreenshot" alt="" class="img">
-						</u-modal>
+						<view class='weightnotes' @click="viewPoundList(1,item)">查看磅单</view>
 					</view>
 					</view>
 
 
 				</view>
 				</view>
@@ -211,11 +201,19 @@
 				</view>
 				</view>
 			</u-modal>
 			</u-modal>
 		</view>
 		</view>
+		<u-modal v-model="isShowFViewPoundList" title="磅单(发)" show-cancel-button=true>
+			<view v-if="dataList.collectionScreenshot==''||dataList.collectionScreenshot==null" class="noimg">
+				暂未上传磅单</view>
+			<view v-else><img :src="dataList.collectionScreenshot" alt="" class="img"></view>
+		</u-modal>
+		<u-modal v-model="isShowSViewPoundList" title="磅单(收)" show-cancel-button=true>
+			<view v-if="dataList.reciveCollectionScreenshot==''||dataList.reciveCollectionScreenshot==null" class="noimg">
+				暂未上传磅单</view>
+			<view v-else><img :src="dataList.reciveCollectionScreenshot" alt="" class="img"></view>
+		</u-modal>
 		<view class='footer'>
 		<view class='footer'>
 			<button class="btn" @click="commit()">添加发车信息</button>
 			<button class="btn" @click="commit()">添加发车信息</button>
 		</view>
 		</view>
-
-
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -253,7 +251,9 @@
 					dispatchNetWeight:"",
 					dispatchNetWeight:"",
 					freightEdPayable:"",
 					freightEdPayable:"",
 					freightIngPayable:"",
 					freightIngPayable:"",
-					freightEdPayable:""
+					freightEdPayable:"",
+					collectionScreenshot:"",
+					reciveCollectionScreenshot:""
 				}
 				}
 			}
 			}
 		},
 		},
@@ -289,10 +289,12 @@
 				})
 				})
 			},
 			},
 			// 查看磅单
 			// 查看磅单
-			viewPoundList(type) {
+			viewPoundList(type,val) {
 				if (type == 0) {
 				if (type == 0) {
+					this.dataList.collectionScreenshot=val.collectionScreenshot
 					this.isShowFViewPoundList = true
 					this.isShowFViewPoundList = true
 				} else {
 				} else {
+					this.dataList.reciveCollectionScreenshot=val.reciveCollectionScreenshot
 					this.isShowSViewPoundList = true
 					this.isShowSViewPoundList = true
 				}
 				}
 			},
 			},
@@ -967,6 +969,7 @@
 	}
 	}
 
 
 	.img {
 	.img {
-		margin-top: 20rpx;
+		width: 300px;
+		height: 300px;
 	}
 	}
 </style>
 </style>