From 968160df9e88f1498bb8e66b0aff3d4be891bb1a Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 17 Dec 2024 10:25:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrderAdd.vue | 3 +++ .../aftersales/aftersalesWorkOrderAddCopy.vue | 5 ++--- .../aftersales/aftersalesWorkOrderAddTemp.vue | 2 -- .../aftersales/aftersalesWorkOrderInfoEnxt.vue | 3 +++ .../aftersales/aftersalesWorkOrderInfoTemp.vue | 3 +++ .../aftersales/aftersalesWorkOrdermodify.vue | 6 +++--- .../aftersales/aftersalesWorkOrdermodifyTemp.vue | 3 +++ src/views/basic/forklift/basicForklift.vue | 4 ++-- src/views/basic/forklift/basicForklift2.vue | 4 ++-- src/views/basic/pda/basicPdatt.vue | 3 +++ .../storagecost/Transferwarehousestatistics.vue | 15 +++++++++++---- src/views/datadetail/ToolUpdate.vue | 3 +++ src/views/distribution/artery/VehicleNodeImgs.vue | 6 +++--- .../distribution/artery/directGoMarketDetails.vue | 3 +++ 14 files changed, 44 insertions(+), 19 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index f81cb350..606f8e86 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -1204,6 +1204,9 @@ const beforeAvatarUpload = async rawFile => { if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') { ElMessage.error('只能上传格式为PNG/JPG的图片!'); return false; + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); + return false; } const res = await compressImageBlob(rawFile); return res; diff --git a/src/views/aftersales/aftersalesWorkOrderAddCopy.vue b/src/views/aftersales/aftersalesWorkOrderAddCopy.vue index e95c8877..54a9ff2f 100644 --- a/src/views/aftersales/aftersalesWorkOrderAddCopy.vue +++ b/src/views/aftersales/aftersalesWorkOrderAddCopy.vue @@ -751,8 +751,8 @@ const beforeAvatarUpload = async rawFile => { if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') { ElMessage.error('图片格式只能为 png/jpg!'); return false; - } else if (rawFile.size / 1024 / 1024 > 10) { - ElMessage.error('图片大小不能大于10MB!'); + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); return false; } const res = await compressImageBlob(rawFile); @@ -2261,5 +2261,4 @@ const isShowFormItem4 = computed(() => { .page_loading { height: 100%; } - diff --git a/src/views/aftersales/aftersalesWorkOrderAddTemp.vue b/src/views/aftersales/aftersalesWorkOrderAddTemp.vue index 3f91ba8e..df205a6b 100644 --- a/src/views/aftersales/aftersalesWorkOrderAddTemp.vue +++ b/src/views/aftersales/aftersalesWorkOrderAddTemp.vue @@ -1998,8 +1998,6 @@ const isShowFormItem4 = computed(() => { } } .ResponsibilityBox { - - width: 100%; display: flex; flex-direction: column; diff --git a/src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue b/src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue index 5fcbefa0..ef5facd4 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue @@ -931,6 +931,9 @@ const beforeAvatarUpload = async rawFile => { if (!_whiteArr.includes(_name.toLocaleLowerCase())) { ElMessage.warning('请上传png、jpg、jpeg的类型图片'); return false; + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); + return false; } const res = await compressImageBlob(rawFile); return res; diff --git a/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue b/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue index fb93ac76..bcb95692 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue @@ -906,6 +906,9 @@ const beforeAvatarUpload = async rawFile => { if (!_whiteArr.includes(_name.toLocaleLowerCase())) { ElMessage.warning('请上传png、jpg、jpeg的类型图片'); return false; + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); + return false; } const res = await compressImageBlob(rawFile); return res; diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue index 3a92fdd4..939c3c61 100644 --- a/src/views/aftersales/aftersalesWorkOrdermodify.vue +++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue @@ -1544,7 +1544,7 @@ const Responsemoval = index => { }; const calculateMaxValues = () => { - return + return; // 计算每个输入框剩余最大值 let data = form.value.responsibilitiesList; let totalUsed = data.reduce((acc, item) => acc + item.responsibilityRatio, 0); @@ -1611,8 +1611,8 @@ const beforeAvatarUpload = async rawFile => { if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') { ElMessage.error('只能上传格式为PNG/JPG的图片!'); return false; - } else if (rawFile.size / 1024 / 1024 > 3) { - ElMessage.error('图片大小不能大于3MB!'); + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); return false; } const res = await compressImageBlob(rawFile); diff --git a/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue b/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue index 2a9490a5..efe33ad9 100644 --- a/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue +++ b/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue @@ -1017,6 +1017,9 @@ const beforeAvatarUpload = async rawFile => { if (_nameArr.length === 0) { ElMessage.warning('异常类型文件'); return false; + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); + return false; } const _name = _nameArr[_nameArr.length - 1]; diff --git a/src/views/basic/forklift/basicForklift.vue b/src/views/basic/forklift/basicForklift.vue index 07e8b0cd..71178b28 100644 --- a/src/views/basic/forklift/basicForklift.vue +++ b/src/views/basic/forklift/basicForklift.vue @@ -998,8 +998,8 @@ export default { if (rawFile.type !== 'image/png') { ElMessage.error('图片格式只能为image/png!'); return false; - } else if (rawFile.size / 1024 / 1024 > 2) { - ElMessage.error('图片大小不能大于2MB!'); + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); return false; } const res = await compressImageBlob(rawFile); diff --git a/src/views/basic/forklift/basicForklift2.vue b/src/views/basic/forklift/basicForklift2.vue index 2f8d904b..8829144e 100644 --- a/src/views/basic/forklift/basicForklift2.vue +++ b/src/views/basic/forklift/basicForklift2.vue @@ -696,8 +696,8 @@ export default { if (rawFile.type !== 'image/png') { ElMessage.error('图片格式只能为image/png!'); return false; - } else if (rawFile.size / 1024 / 1024 > 2) { - ElMessage.error('图片大小不能大于2MB!'); + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); return false; } const res = await compressImageBlob(rawFile); diff --git a/src/views/basic/pda/basicPdatt.vue b/src/views/basic/pda/basicPdatt.vue index 5896711c..368d13bd 100644 --- a/src/views/basic/pda/basicPdatt.vue +++ b/src/views/basic/pda/basicPdatt.vue @@ -803,6 +803,9 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => { if (!_whiteArr.includes(_name.toLocaleLowerCase())) { ElMessage.warning('请上传png、jpg、jpeg的类型图片'); return false; + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); + return false; } const res = await compressImageBlob(rawFile); return res; diff --git a/src/views/cost/storagecost/Transferwarehousestatistics.vue b/src/views/cost/storagecost/Transferwarehousestatistics.vue index 4a821b64..f2bfab85 100644 --- a/src/views/cost/storagecost/Transferwarehousestatistics.vue +++ b/src/views/cost/storagecost/Transferwarehousestatistics.vue @@ -179,7 +179,11 @@ class="el_Abnormalsettlement" >
- +

结算单号:{{ Abnormalsettlement.form.settlementCode }}

结算状态:【{{ Abnormalsettlement.form.settlementStatus }}】

@@ -265,7 +269,7 @@ type="primary" @click="AbnormalsettlementSubmit" :disabled="Abnormalsettlement.loading" - v-if="Abnormalsettlement.form.settlementStatus !='已结算'" + v-if="Abnormalsettlement.form.settlementStatus != '已结算'" > 确定 @@ -622,6 +626,9 @@ const beforeAvatarUpload = async rawFile => { if (!allowedTypes.includes(rawFile.type)) { ElMessage.error('只能上传格式为PNG/JPG/GIF/WebP/SVG的图片!'); return false; + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); + return false; } const res = await compressImageBlob(rawFile); return res; @@ -939,10 +946,10 @@ const exportExcel = () => { margin: 10px; } } -.el-fr-d{ +.el-fr-d { display: flex; width: 100%; - .el-btn{ + .el-btn { margin: 0; align-items: flex-start; } diff --git a/src/views/datadetail/ToolUpdate.vue b/src/views/datadetail/ToolUpdate.vue index c0392b72..eca75437 100644 --- a/src/views/datadetail/ToolUpdate.vue +++ b/src/views/datadetail/ToolUpdate.vue @@ -315,6 +315,9 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => { if (!_whiteArr.includes(_name.toLocaleLowerCase())) { ElMessage.warning('请上传png、jpg、jpeg的类型图片'); return false; + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); + return false; } const res = await compressImageBlob(rawFile); return res; diff --git a/src/views/distribution/artery/VehicleNodeImgs.vue b/src/views/distribution/artery/VehicleNodeImgs.vue index f6c6bbd6..a99b321a 100644 --- a/src/views/distribution/artery/VehicleNodeImgs.vue +++ b/src/views/distribution/artery/VehicleNodeImgs.vue @@ -563,14 +563,14 @@ const handleBeforeUpload = async (file, item) => { console.log('item :>> ', item); const isJPG = file.type === 'image/jpeg'; const isPNG = file.type === 'image/png'; - const isLt2M = file.size / 1024 / 1024 < 2; + const isLt4M = file.size / 1024 / 1024 < 4; if (!isJPG && !isPNG) { ElMessage.warning('上传图片只能是 JPG 或 PNG 格式!'); return false; } - if (!isLt2M) { - ElMessage.warning('上传图片大小不能超过 2MB!'); + if (!isLt4M) { + ElMessage.warning('上传图片大小不能超过 4MB!'); return false; } item.loading = true; diff --git a/src/views/distribution/artery/directGoMarketDetails.vue b/src/views/distribution/artery/directGoMarketDetails.vue index 4dd2916c..7d7677fe 100644 --- a/src/views/distribution/artery/directGoMarketDetails.vue +++ b/src/views/distribution/artery/directGoMarketDetails.vue @@ -1130,6 +1130,9 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => { if (!_whiteArr.includes(_name.toLocaleLowerCase())) { ElMessage.warning('请上传png、jpg、jpeg的类型图片'); return false; + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); + return false; } const res = await compressImageBlob(rawFile); return res; From f526a4cbc1138da5160619b212ecffcfa9b8bcc5 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 17 Dec 2024 13:51:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/pda/basicPda2.vue | 4 +- src/views/basicdata/brand/basicBrand.vue | 6 +- src/views/basicdata/brand/basicClientFrom.vue | 4 +- .../driverArtery/basicdataDriverArteryAdd.vue | 6 +- src/views/reportforms/ConsigneeReport.vue | 64 +++++++++++++++++-- .../SalesDepartmentIncomeReport.vue | 59 +++++++++++++++-- 6 files changed, 121 insertions(+), 22 deletions(-) diff --git a/src/views/basic/pda/basicPda2.vue b/src/views/basic/pda/basicPda2.vue index 93dcd62d..1a1a8d48 100644 --- a/src/views/basic/pda/basicPda2.vue +++ b/src/views/basic/pda/basicPda2.vue @@ -571,8 +571,8 @@ export default { if (rawFile.type !== 'image/png') { ElMessage.error('图片格式只能为image/png!'); return false; - } else if (rawFile.size / 1024 / 1024 > 2) { - ElMessage.error('图片大小不能大于2MB!'); + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); return false; } const res = await compressImageBlob(rawFile); diff --git a/src/views/basicdata/brand/basicBrand.vue b/src/views/basicdata/brand/basicBrand.vue index f827542c..089af12b 100644 --- a/src/views/basicdata/brand/basicBrand.vue +++ b/src/views/basicdata/brand/basicBrand.vue @@ -376,13 +376,13 @@ export default { const isJPEG = file.type === 'image/jpeg'; const isJPG = file.type === 'image/jpg'; const isPNG = file.type === 'image/png'; - const isLt2M = file.size / 1024 / 1024 < 2; + const isLt2M = file.size / 1024 / 1024 < 4; if (!isJPEG && !isJPG && !isPNG) { this.$message.error('上传头像图片是 JPG | JPEG | PNG 格式!'); } - if (!isLt2M) { - this.$message.error('上传头像图片大小不能超过 2MB!'); + if (!isLt4M) { + this.$message.error('上传头像图片大小不能超过 4MB!'); } return (isJPG || isJPEG || isPNG) && isLt2M; }, diff --git a/src/views/basicdata/brand/basicClientFrom.vue b/src/views/basicdata/brand/basicClientFrom.vue index 1ea2c936..1d85ece2 100644 --- a/src/views/basicdata/brand/basicClientFrom.vue +++ b/src/views/basicdata/brand/basicClientFrom.vue @@ -677,8 +677,8 @@ export default { if (rawFile.type !== 'image/png') { ElMessage.error('图片格式只能为image/png!'); return false; - } else if (rawFile.size / 1024 / 1024 > 2) { - ElMessage.error('图片大小不能大于2MB!'); + } else if (rawFile.size / 1024 / 1024 > 4) { + ElMessage.error('图片大小不能大于4MB!'); return false; } const res = await compressImageBlob(rawFile); diff --git a/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue b/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue index 884efb06..b3642f2b 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue @@ -611,14 +611,14 @@ export default { try { const isJPG = file.type === 'image/jpeg'; const isPNG = file.type === 'image/png'; - const isLt2M = file.size / 1024 / 1024 < 2; + const isLt4M = file.size / 1024 / 1024 < 4; if (!isJPG && !isPNG) { this.$message.error('上传图片只能是 JPG 或 PNG 格式!'); return false; } - if (!isLt2M) { - this.$message.error('上传图片大小不能超过 2MB!'); + if (!isLt4M) { + this.$message.error('上传图片大小不能超过 4MB!'); return false; } item.loading = true; diff --git a/src/views/reportforms/ConsigneeReport.vue b/src/views/reportforms/ConsigneeReport.vue index 79a56ab9..b9ffc700 100644 --- a/src/views/reportforms/ConsigneeReport.vue +++ b/src/views/reportforms/ConsigneeReport.vue @@ -3,15 +3,17 @@
+ - + - - + + + + - + + + + + + + @@ -192,6 +229,7 @@ import { } from '@/utils/util'; import { useRouter } from 'vue-router'; import { ElMessage, ElMessageBox } from 'element-plus'; +import { getListName } from '@/api/basicdata/basicdataVehicle'; import { columnList } from '@/option/reportforms/ConsigneeReport'; // 获取路由实例 @@ -262,6 +300,8 @@ const details = reactive({ brandOptions: [], /** 事业线 */ businessLineOption: [], + /** 仓库 */ + warehouseOption: [], /** 弹出层显示 */ popUpShow: {}, /** 全屏 */ @@ -356,6 +396,18 @@ const handleFindBrand = async () => { } }; +/** 初始化请求仓库数据 */ +getListName({ name: '' }).then(res => { + const { code, data } = res.data; + if (code !== 200 || getObjType(data) !== 'array') return; + details.warehouseOption = data.map(val => { + return { + dictKey: val.id, + dictValue: val.name, + }; + }); +}); + /** 查询事业线 */ const handleFindbusinessLine = async () => { try { diff --git a/src/views/reportforms/SalesDepartmentIncomeReport.vue b/src/views/reportforms/SalesDepartmentIncomeReport.vue index 2a133555..7d4b5532 100644 --- a/src/views/reportforms/SalesDepartmentIncomeReport.vue +++ b/src/views/reportforms/SalesDepartmentIncomeReport.vue @@ -5,13 +5,14 @@
- + - - + + + + - + + + @@ -192,6 +224,7 @@ import { } from '@/utils/util'; import { useRouter } from 'vue-router'; import { ElMessage, ElMessageBox } from 'element-plus'; +import { getListName } from '@/api/basicdata/basicdataVehicle'; import { columnList } from '@/option/reportforms/SalesDepartmentIncomeReport'; // 获取路由实例 @@ -262,6 +295,8 @@ const details = reactive({ brandOptions: [], /** 事业线 */ businessLineOption: [], + /** 仓库 */ + warehouseOption: [], /** 弹出层显示 */ popUpShow: {}, /** 全屏 */ @@ -356,6 +391,18 @@ const handleFindBrand = async () => { } }; +/** 初始化请求仓库数据 */ +getListName({ name: '' }).then(res => { + const { code, data } = res.data; + if (code !== 200 || getObjType(data) !== 'array') return; + details.warehouseOption = data.map(val => { + return { + dictKey: val.id, + dictValue: val.name, + }; + }); +}); + /** 查询事业线 */ const handleFindbusinessLine = async () => { try {