From dcea19e301ba4e7b44d6b3c162610dc09d36095d Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 18 Dec 2024 15:44:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=9C=AA=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersales/aftersalesWorkOrderInfo.vue | 3 + .../aftersales/aftersalesWorkOrderend.vue | 65 ++++++++++--------- .../ServiceProviderPrice.vue | 21 +++--- .../Traincostbreakdown.vue | 2 - 4 files changed, 47 insertions(+), 44 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index b4460a67..56e0aecb 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -2937,4 +2937,7 @@ const ResultDetermination = () => { :deep(.el-upload-list__item-thumbnail) { object-fit: inherit; } +:deep(.el-tabs__header){ + background-color: #fdfdfd; +} diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 00381943..a6d2c0c3 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -60,21 +60,21 @@ - + - + - + - + @@ -172,7 +172,7 @@ disabled /> - + - + - +
@@ -670,7 +669,7 @@ > 修改内部责任划分 @@ -726,7 +725,7 @@ multiple filterable default-first-option - collapse-tags-tooltip + collapse-tags-tooltip collapse-tags :max-collapse-tags="3" :reserve-keyword="false" @@ -2946,23 +2945,23 @@ const AppealEstablished = () => { } .selector { width: 100%; + margin: 4px 0; :deep(.el-select) { width: 100%; } } .ProcessingResults { width: 100%; - min-height: 260px; border: 1px solid #ccc; position: relative; - padding: 26px; + padding: 10px; box-sizing: border-box; - margin-top: 3%; + margin-top: 20px; color: #606266; display: flex; flex-direction: column; justify-content: space-between; - margin-bottom: 16px; + margin-bottom: 10px; border-radius: 16px; box-shadow: 0px 0px 6px 0px #00000029; .title { @@ -3064,7 +3063,6 @@ const AppealEstablished = () => { align-items: center; } :deep(.selector) { - margin-bottom: 40px; .is-active { font-weight: bold; } @@ -3078,7 +3076,7 @@ const AppealEstablished = () => { display: flex; justify-content: flex-start; } - :deep(.el-tabs__content){ + :deep(.el-tabs__content) { padding: 0 10px; } } @@ -3449,20 +3447,23 @@ const AppealEstablished = () => { :deep(.PackageInformation) { width: 100%; margin-bottom: 4px; - .is-active{ + .is-active { font-weight: bold; } - .el-tabs__content{ + .el-tabs__content { padding: 0 12px; } + .el-form-item__content { + width: 100% !important; + } } .ResponsibilityBoxS { width: 100%; display: flex; flex-direction: column; - margin-bottom:2px; + margin-bottom: 2px; justify-content: flex-start; - + .leftbox { width: 100%; display: flex; @@ -3472,7 +3473,7 @@ const AppealEstablished = () => { flex-direction: column; align-items: flex-start; flex: none; - width: 16.4%; + width: 18%; } } @@ -3620,7 +3621,7 @@ const AppealEstablished = () => { display: flex; flex-direction: row; align-items: center; - width: 22%; + width: 24%; } } :deep(.el_resj) { @@ -3639,7 +3640,7 @@ const AppealEstablished = () => { :deep(.is-active) { font-weight: bold; } - :deep(.el-tabs__content){ + :deep(.el-tabs__content) { padding: 0 12px; } .el_information { @@ -3673,22 +3674,22 @@ const AppealEstablished = () => { .el-select { width: 100; } - .inpuit_Investigationprocess{ + .inpuit_Investigationprocess { display: flex; flex-direction: row !important; margin: 2px 0; } - .processor_box{ + .processor_box { display: flex; flex-direction: row !important; margin: 2px 0; } - :deep(.el_Responsibilityhandling){ + :deep(.el_Responsibilityhandling) { width: 100%; display: flex; margin: 3px 0; justify-content: space-between; - .el-form-item{ + .el-form-item { margin: 0; } } @@ -3750,6 +3751,9 @@ const AppealEstablished = () => { .is-active { font-weight: bold; } + .el-tabs__content { + padding: 4px 20px !important; + } } .el-endtabs { width: 100%; @@ -3826,4 +3830,7 @@ const AppealEstablished = () => { top: 0; } } +:deep(.el-tabs__header){ + background-color: #fdfdfd; +} diff --git a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue index fd7727ce..d74ec2d0 100644 --- a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue +++ b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue @@ -494,13 +494,6 @@ const Priceconfigurationsubmission = async () => { } const categoryMap = new Map(details.data.map(item => [item.driverId, item])); //这里查找是否已经存在添加过的品类（只能查询当前页） - if (categoryMap.has(form.value.driverId)) { - ElMessage({ - message: '司机已经存在', - type: 'warning', - }); - return; - } let data = { warehouseName: ServiceWarehouse.value.find(res => res.value == form.value.warehouseId)?.label || '', //仓库名称 @@ -570,17 +563,19 @@ const EditTemplate = async row => { rowData.value = row; form.value.warehouseId = row.warehouseId; //仓库 await Getdriver(); + + await GetTemplate(); //获取可用模板 console.log(row); Priceconfiguration.value = true; PriceconfigurationTitle.value = '价格配置(编辑)'; form.value.driverId = row.driverId; //司机 form.value.templateId = row.templateId; - PriceTemplate.value = [ - { - value: row.templateId, - label: row.templateName, - }, - ]; + // PriceTemplate.value = [ + // { + // value: row.templateId, + // label: row.templateName, + // }, + // ]; }; const deleteTemplate = row => { ElMessageBox.confirm('是否确认删除该数据?', '提示', { diff --git a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue index 3a49124c..17a4062d 100644 --- a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue +++ b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue @@ -116,9 +116,7 @@ From 1417ff0cfed7eac56950bc6115fbdd66e3ff92b9 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 18 Dec 2024 16:07:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= =?UTF-8?q?=EF=BC=8C=E4=BB=93=E5=BA=93=E6=89=A9=E5=B1=95=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/warehouse/warehouse/basicdataWarehouse.vue | 7 ++++++- src/views/reportforms/DeliveryDetailsVtwo.vue | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue index 604f0af6..58e7dbd3 100644 --- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue +++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue @@ -70,7 +70,7 @@ From be3e1b6da4e8c6176edefb1b15cc3d85811784ca Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 18 Dec 2024 16:57:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=95=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BB=B7=E6=A0=BC=E5=8F=B8=E6=9C=BA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceProviderPrice.vue | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue index d74ec2d0..a93d0d20 100644 --- a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue +++ b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue @@ -122,7 +122,15 @@ - + { // 网页顶部搜索按钮 const searchChange = () => { // details.search = false; //关闭搜索 - onLoad() + onLoad(); }; -const searchReset=()=>{ - details.query={} - queryTop.value={} +const searchReset = () => { + details.query = {}; + queryTop.value = {}; handleClearTableQuery(details.columnList); - onLoad() -} + onLoad(); +}; // 每页多少条 const sizeChange = val => { details.page.pageSize = val; @@ -477,13 +485,13 @@ const PageOnload = async () => { await MyWarehouseList(); //获取仓库 onLoad(); }; -const AddInfo=()=>{ +const AddInfo = () => { ElMessage({ message: '功能维护', type: 'warning', - }) - return -} + }); + return; +}; //页面初始化方法 PageOnload(); // 价格配置提交 @@ -498,12 +506,12 @@ const Priceconfigurationsubmission = async () => { warehouseName: ServiceWarehouse.value.find(res => res.value == form.value.warehouseId)?.label || '', //仓库名称 warehouseId: form.value.warehouseId, //仓库ID - driverId: form.value.driverId, //司机ID - driverName: driver.value.find(res => res.value == form.value.driverId)?.label || '', //司机名称 templateId: form.value.templateId, //模板ID }; tcloading.value = true; if (PriceconfigurationTitle.value == '价格配置(编辑)') { + data.driverName =driver.value.find(res => res.value == form.value.driverId)?.label || '', //司机名称 + data.driverId = form.value.driverId, //司机ID data.id = rowData.value.id; $_ServiceProviderPriceupdate(data) .then(res => { @@ -524,6 +532,13 @@ const Priceconfigurationsubmission = async () => { tcloading.value = false; }); } else { + data['drivers'] =[] + form.value.driverId.forEach(item => { + data['drivers'].push({ + driverName:driver.value.find(res => res.value == item)?.label || '', + driverId:item, + }) + }) $_ServiceProviderPricesave(data) .then(res => { console.log(res, '提交成功'); @@ -546,7 +561,7 @@ const Priceconfigurationsubmission = async () => { }; // 新增 const Informationadd = () => { - form.value.driverId = ''; + form.value.driverId = []; form.value.warehouseId = ''; form.value.templateId = ''; PriceTemplate.value = []; @@ -563,8 +578,8 @@ const EditTemplate = async row => { rowData.value = row; form.value.warehouseId = row.warehouseId; //仓库 await Getdriver(); - - await GetTemplate(); //获取可用模板 + + await GetTemplate(); //获取可用模板 console.log(row); Priceconfiguration.value = true; PriceconfigurationTitle.value = '价格配置(编辑)'; @@ -639,7 +654,7 @@ const deleteTemplate = row => { margin-right: 0; width: 15%; align-items: flex-start; - .el-form-item__content{ + .el-form-item__content { justify-content: flex-end; } } From bd5b6cf2d88c79835ae4c8c54304e6e0b806b139 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 18 Dec 2024 18:38:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=EF=BC=8C=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E6=95=B0=E5=AD=97=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=80=89=E6=8B=A9=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/pric/tablePric.vue | 26 ++++++++++ .../ServiceProviderPrice.vue | 10 ++-- .../Traincostbreakdown.vue | 48 ++++++++++++++++--- .../WarehousePricingTemplate.vue | 4 +- 4 files changed, 74 insertions(+), 14 deletions(-) diff --git a/src/components/pric/tablePric.vue b/src/components/pric/tablePric.vue index 5f3e7f0c..30904934 100644 --- a/src/components/pric/tablePric.vue +++ b/src/components/pric/tablePric.vue @@ -24,6 +24,8 @@ :controls="false" :value-on-clear="0" placeholder="请输入价格" + :ref="setInputNumberRef(scope.$index, column.prop)" + @focus="handleInputNumberFocus(scope.$index, column.prop)" /> [], }, }); +const inputNumberRefs = ref({}); + +function setInputNumberRef(index, prop) { + return (el) => { + if (el) { + inputNumberRefs.value[`${index}-${prop}`] = el; + } + }; +} + +function handleInputNumberFocus(index, prop) { + const inputNumberRef = inputNumberRefs.value[`${index}-${prop}`]; + if (inputNumberRef) { + // 使用 nextTick 确保 DOM 更新完毕后再执行 + nextTick(() => { + // 获取输入框的原生 DOM 元素 + const inputElement = inputNumberRef.$el.querySelector('input'); + if (inputElement) { + // 全选输入框中的内容 + inputElement.select(); + } + }); + } +} console.log(props.height, 'props'); diff --git a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue index a93d0d20..b409dd63 100644 --- a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue +++ b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue @@ -6,7 +6,7 @@ -
+ 搜 索 @@ -39,9 +39,9 @@ 导出价格 - 导入价格 + > --> 新增 @@ -655,7 +655,7 @@ const deleteTemplate = row => { width: 15%; align-items: flex-start; .el-form-item__content { - justify-content: flex-end; + // justify-content: flex-end; } } } diff --git a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue index 17a4062d..a7e0bb51 100644 --- a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue +++ b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue @@ -8,6 +8,23 @@ + + + + + - + { delete details.query.deliveryDateStart; delete details.query.deliveryDateEnd; } + + if (TopQuery.value.destinationWarehouse?.length) { + details.query.destinationWarehouse = TopQuery.value.destinationWarehouse.join(','); + } else { + delete details.query.destinationWarehouse; + } }; // 网页顶部搜索按钮 const searchChange = () => { + TopSearch(); //顶部搜索条件处理 onLoad(); }; // 清空 @@ -475,8 +498,6 @@ function updateDictionary(targetArray, dictionaryType) { // 页面初始化 const onLoad = async value => { console.log($route, 'route'); - - await TopSearch(); //顶部搜索条件处理 let data = { current: details.page.currentPage, size: details.page.pageSize, @@ -500,9 +521,21 @@ const onLoad = async value => { details.loadingObj.list = false; }); }; - +// 获取仓库 +const MyWarehouseList = () => { + $_getMyWarehouseList().then(res => { + console.log(res, '仓库列表'); + res.data.data.forEach(item => { + warehouseList.value.push({ + value: item.name, + label: item.name, + }); + }); + }); +}; // 页面初始化方法 const PageOnload = () => { + MyWarehouseList(); //获取仓库 onLoad(); //获取列表参数 }; // 页面初始化方法 @@ -538,6 +571,7 @@ const AbnormaladjustmentClick = row => { Abnormaladjustment.value.dialogVisible = true; Abnormaladjustment.value.form = { id, changeAmount, changeNote }; }; + // 异动调整提交 const AbnormaladjustmentSubmit = async () => { if (!Abnormaladjustment.value.form.changeNote) { diff --git a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue index e1e6c2f5..c59ca584 100644 --- a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue +++ b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue @@ -23,7 +23,7 @@ - +