diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 9590dc79..06dbf1b4 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -958,4 +958,8 @@ defineExpose({ handleCheckSelect, handleClearSelect }); @extend .scorll; } } +.el-select__selected-item{ + font-weight: initial; + font-size: 12px; +} diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index eea5332e..0c51ccc4 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -1908,6 +1908,13 @@ export default { } if (res.code !== 200) return this.$message.warning('上传失败'); this.$message.success('上传成功'); + if (this.Fileverification) { + // 文件校验弹窗 + this.loadingObj.UploadLoadong = false; + // 文件校验 + } else { + this.loadingObj.UploadLoadong = false; + } if (this.loadingObj.submitLoading) { onLoad(this.page); } diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue index 25e9f195..967b21df 100644 --- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue +++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue @@ -124,7 +124,7 @@ /> - + { let data = { ...Addform.value, }; - // 处理图片 let imgURl = []; - const isValid = Addform.value.paymentCodeUrl.every(item => { - if (item.url && !item.response) { - // 这里是回显的图片 - imgURl.push(item.url); - return true; - } - if (item.response?.code === 200 && item.response.data?.link) { - // 这里是最新上传的图片 - imgURl.push(item.response.data.link); - return true; - } - return false; - }); - - if (!isValid) { - ElMessage({ - message: '图片上传错误,请移除图片重新上传', - type: 'warning', - plain: true, + if (Addform.value.paymentCodeUrl?.length) { + const isValid = Addform.value.paymentCodeUrl.every(item => { + if (item.url && !item.response) { + // 这里是回显的图片 + imgURl.push(item.url); + return true; + } + if (item.response?.code === 200 && item.response.data?.link) { + // 这里是最新上传的图片 + imgURl.push(item.response.data.link); + return true; + } + return false; }); - return; - } + if (!isValid) { + ElMessage({ + message: '图片上传错误,请移除图片重新上传', + type: 'warning', + plain: true, + }); + return; + } + data.paymentCodeUrl = imgURl.join(','); + }else{ + delete data.paymentCodeUrl + } data.warehouseAddress = Addform.value.address[2]; //地址 console.log(Addform.value, 'Addform.value'); - data.daterange[0] = dayjs(data.daterange[0]).format('YYYY-MM-DD'); - data.daterange[1] = dayjs(data.daterange[1]).format('YYYY-MM-DD'); - data.paymentCodeUrl = imgURl.join(','); + if (data.daterange?.length) { + data.daterange[0] = dayjs(data.daterange[0]).format('YYYY-MM-DD'); + data.daterange[1] = dayjs(data.daterange[1]).format('YYYY-MM-DD'); + }else{ + delete data.daterange + } data.administrativeAreas = data.administrativeAreas.join(','); - data.startDate = Addform.value['daterange'][0]; - data.endDate = Addform.value['daterange'][1]; + if (Addform.value.daterange?.length) { + data.startDate = Addform.value['daterange'][0]; + data.endDate = Addform.value['daterange'][1]; + } + data.provinceCode = Addform.value['addressInfo'][0]; //仓库地区-省 data.cityCode = Addform.value['addressInfo'][1]; //仓库地区-市 data.code = Addform.value['addressInfo'][2]; //仓库地区-区