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; + } } }