From fd7ba23c8cdf550ee6d230c169a5415f88cbb6b5 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 12 Dec 2024 18:55:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Financialreview.vue | 9 +++++-- .../ServiceProviderPrice.vue | 25 +++++++++++++++---- .../Traincostbreakdown.vue | 9 +------ .../WarehouseDeliveryCost.vue | 1 + .../WarehousePricingTemplate.vue | 20 ++++++++++----- 5 files changed, 43 insertions(+), 21 deletions(-) diff --git a/src/views/cost/Deliverycostmanagement/Financialreview.vue b/src/views/cost/Deliverycostmanagement/Financialreview.vue index f5266891..2e4682c2 100644 --- a/src/views/cost/Deliverycostmanagement/Financialreview.vue +++ b/src/views/cost/Deliverycostmanagement/Financialreview.vue @@ -164,8 +164,7 @@ import { $_expenseDispatchFinancialReview, } from '@/api/storagecost/index.js'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 -import { processRowProperty, setNodeHeight } from '@/utils/util'; -import functions from '@/utils/functions.js'; +import { processRowProperty, setNodeHeight,handleClearTableQuery } from '@/utils/util'; import { ElMessageBox, ElMessage } from 'element-plus'; import { downloadXls } from '@/utils/util'; import { useStore } from 'vuex'; @@ -326,6 +325,12 @@ const currentChange = val => { const searchChangeS = () => { onLoad(); }; +// 清空 +const searchReset = () => { + details.query = {}; + handleClearTableQuery(details.columnList); + onLoad(); +}; // 顶部搜索 const searchHide = () => { console.log(details); diff --git a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue index d9441f41..1dc0d539 100644 --- a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue +++ b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue @@ -163,8 +163,7 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue'; import { columnList } from '@/option/storagecost/ServiceProviderPrice.js'; import { getDictionaryBiz } from '@/api/system/dict'; //字典 -import { processRowProperty, setNodeHeight } from '@/utils/util'; -import functions from '@/utils/functions.js'; +import { processRowProperty, setNodeHeight,handleClearTableQuery } from '@/utils/util'; import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; //司机信息 import { $_getMyWarehouseList, @@ -333,8 +332,15 @@ const selectionChange = list => { }; // 网页顶部搜索按钮 const searchChange = () => { - details.search = false; //关闭搜索 + // details.search = false; //关闭搜索 + onLoad() }; +const searchReset=()=>{ + details.query={} + queryTop.value={} + handleClearTableQuery(details.columnList); + onLoad() +} // 每页多少条 const sizeChange = val => { details.page.pageSize = val; @@ -471,7 +477,13 @@ const PageOnload = async () => { await MyWarehouseList(); //获取仓库 onLoad(); }; - +const AddInfo=()=>{ + ElMessage({ + message: '功能维护', + type: 'warning', + }) + return +} //页面初始化方法 PageOnload(); // 价格配置提交 @@ -628,10 +640,13 @@ const deleteTemplate = row => { width: 100%; display: flex; justify-content: space-between; - .el-btn { + :deep(.el-btn) { margin-right: 0; width: 15%; align-items: flex-start; + .el-form-item__content{ + justify-content: flex-end; + } } } diff --git a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue index 9e6cab51..3a49124c 100644 --- a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue +++ b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue @@ -156,7 +156,7 @@ style="width: 100%" :rows="4" type="textarea" - placeholder="请填写结算备注(必填)" + placeholder="请填写结算备注" /> @@ -579,13 +579,6 @@ const confirmation = row => { }; // 结算确定 const SettlementconfirmationSubmit = async row => { - if (!Confirmsettlement.value.form.settlementNote) { - ElMessage({ - message: '请填写结算备注', - type: 'warning', - }); - return; - } try { Confirmsettlement.value.loading = true; let Submit = { diff --git a/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue b/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue index 48c05f19..d0fb49ad 100644 --- a/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue +++ b/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue @@ -413,6 +413,7 @@ const searchReset = () => { item.values = ''; }); details.query = {}; + queryTop.value={} onLoad(); }; // 结算时间跳转 diff --git a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue index 555fae82..e1e6c2f5 100644 --- a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue +++ b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue @@ -7,7 +7,7 @@
- + - + { const searchChange = () => { onLoad(); }; +// 清空 +const searchReset=()=>{ + queryTop.value = {}; + details.query = {}; + handleClearTableQuery(details.columnList); + onLoad(); +} // 每页多少条 const sizeChange = val => { details.page.pageSize = val; @@ -426,10 +431,13 @@ const lyadded = () => { width: 100%; display: flex; justify-content: space-between; - .el-btn { + :deep(.el-btn) { margin-right: 0; width: 15%; align-items: flex-start; + .el-form-item__content{ + justify-content: flex-end; + } } } From ec4b79578cfa177995a06577a5348c5c39eb72ac Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 13 Dec 2024 11:37:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E7=AD=BE=E5=8C=85=E4=BB=B6=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/distrilbutionBillLading.vue | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index a1d31bb7..7fb8ed4a 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -2536,7 +2536,13 @@ export default { if (_check.length) { this.$refs.orderChooseTable.handleCheckSelect(_check); } else { - this.$refs.orderChooseTable.handleCheckSelect(data.records); + console.log(data.records, 'data.records'); + let _list = data.records.filter(item => { + return item.orderPackageStatusName !== '已签收'; + }); + console.log(_list, '_lsit'); + + this.$refs.orderChooseTable.handleCheckSelect(_list); } console.log(this.order.selectList, '已经回显的值'); this.selectionClear(); @@ -3530,10 +3536,10 @@ export default { console.log('执行了二次操作'); const data = res.data.data; this.dataList = data.records; - if(this.dataList?.length){ + if (this.dataList?.length) { this.dataList.forEach(i => { - i.reservationNum = i.handQuantity; - }) + i.reservationNum = i.handQuantity; + }); } this.loading = false; From 11ad2a6051dea6a85a05a130e85728f784113093 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 13 Dec 2024 15:22:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/index/top/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index 02aeb291..c62dfd55 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -13,7 +13,7 @@
- +
From 5dcf1b1971af8d15e4083572273941872f4b6420 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 13 Dec 2024 15:25:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/desk/notice.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue index ddcec6f4..8f671c9c 100644 --- a/src/views/desk/notice.vue +++ b/src/views/desk/notice.vue @@ -27,7 +27,7 @@ plain v-if="permission.notice_delete" @click="handleDelete" - >删 除 + >批 量 删 除