Merge remote-tracking branch 'origin/main'

SC-web/src/views/scm/basicInformation/tradeupload/Form.vue

@@ -7,17 +7,17 @@
 				<template v-if="!loading">
 					<el-col :span="12">
 						<el-form-item label="磅单上传" prop="poundPictures">
-							<JNPF-UploadImg2 v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1"
+							<JNPF-UploadImg2B v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1"
 								@change="imgChange" ref="poundUpload">
 
-							</JNPF-UploadImg2>
+							</JNPF-UploadImg2B>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="车辆图片" prop="vehiclePictures">
-							<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
+							<JNPF-UploadImgB v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
 
-							</JNPF-UploadImg>
+							</JNPF-UploadImgB>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">