From 7bf0c8756534707bfddc469ac11938dd3cf3a3f5 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 13 Aug 2024 09:21:12 +0800
Subject: [PATCH] =?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/api/storagecost/index.js                  |  35 ++-
 src/components/pric/tablePric.vue             |   8 +-
 .../storagecost/ServiceProviderPrice.js       |  34 +--
 .../DeliveryCostPricingTemplate.vue           |   9 +-
 .../Deliverymaintenancecosts.vue              | 180 ++++++-----
 .../ServiceProviderPrice.vue                  | 279 ++++++++++++++++--
 .../WarehousePricingTemplate.vue              |  12 +-
 7 files changed, 442 insertions(+), 115 deletions(-)

diff --git a/src/api/storagecost/index.js b/src/api/storagecost/index.js
index fd2beba2..1dd54c89 100644
--- a/src/api/storagecost/index.js
+++ b/src/api/storagecost/index.js
@@ -285,4 +285,37 @@ export const $_expenseDispatchPriceOverZoneremove = params => {
     method: 'post',
     params,
   });
-};
\ No newline at end of file
+};
+// 配送-服务商配置价格-列表
+export const $_ServiceProviderPrice = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceService/page',
+    method: 'get',
+    params,
+  });
+};
+// 配送-服务商配置价格-新增
+export const $_ServiceProviderPricesave = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceService/save',
+    method: 'post',
+    data,
+  });
+};
+// 配送-服务商配置价格-修改
+export const $_ServiceProviderPriceupdate = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceService/update',
+    method: 'post',
+    data,
+  });
+};
+
+// 获取司机(当前仓库)
+export const $_getDriverList = params => {
+  return request({
+    url: '/api/logpm-basicdata/driverArtery/selectList',
+    method: 'get',
+    params,
+  });
+};
diff --git a/src/components/pric/tablePric.vue b/src/components/pric/tablePric.vue
index 26b40ac7..5f3e7f0c 100644
--- a/src/components/pric/tablePric.vue
+++ b/src/components/pric/tablePric.vue
@@ -4,6 +4,8 @@
     border
     :style="{ width: '100%', maxHeight: height + 'px' }"
     class="el_row_table"
+    v-loading="loading"
+    element-loading-text="Loading..."
   >
     <template v-for="column in Surcharge" :key="column.prop">
       <el-table-column
@@ -101,6 +103,10 @@ const props = defineProps({
     type: Array,
     required: true,
   },
+  loading: {
+    required: false,
+    default: false,
+  },
   Surcharge: {
     type: Array,
     required: true,
@@ -110,7 +116,7 @@ const props = defineProps({
     default: () => [],
   },
 });
-console.log(props.height,'props');
+console.log(props.height, 'props');
 </script>
 
 <style scoped lang="scss">
diff --git a/src/option/storagecost/ServiceProviderPrice.js b/src/option/storagecost/ServiceProviderPrice.js
index f4907193..71255886 100644
--- a/src/option/storagecost/ServiceProviderPrice.js
+++ b/src/option/storagecost/ServiceProviderPrice.js
@@ -7,7 +7,7 @@ export const columnList = [
       fixed: true,
     },
     {
-      prop: 'xh',
+      prop: '',
       label: '序号',
       type: 12,
       values: '',
@@ -15,8 +15,8 @@ export const columnList = [
       fixed: true,
     },
     {
-      prop: 'a1',
-      label: '承运方名称',
+      prop: 'driverName',
+      label: '司机',
       type: 2,
       values: '',
       width: '150',
@@ -26,7 +26,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a2',
+      prop: 'warehouseName',
       label: '服务仓',
       type: 2,
       values: '',
@@ -36,21 +36,11 @@ export const columnList = [
       sortable: true,
       head: false,
     },
+
     {
-      prop: 'a3',
-      label: '维护状态',
-      type: 1,
-      values: '',
-      width: '150',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'a4',
+      prop: 'templateName',
       label: '承运方计价模板',
-      type: 1,
+      type: 2,
       values: '',
       width: '150',
       checkarr: [],
@@ -59,9 +49,9 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a5',
+      prop: 'updateTime',
       label: '修改时间',
-      type: 1,
+      type: 4,
       values: '',
       width: '150',
       checkarr: [],
@@ -70,9 +60,9 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a6',
+      prop: 'createUserName',
       label: '修改人',
-      type: 3,
+      type: 1,
       values: '',
       width: '150',
       checkarr: [ ],
@@ -82,7 +72,7 @@ export const columnList = [
     },
     
     {
-      prop: 'createUserName',
+      prop: '',
       label: '操作',
       type: 6,
       values: '',
diff --git a/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue b/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue
index 7a4a6c74..e192463f 100644
--- a/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue
+++ b/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="content">
+  <div class="content"  v-loading="loading"
+  element-loading-text="Loading...">
     <!-- 配置计价规则 -->
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="商配" :name="1"></el-tab-pane>
@@ -174,6 +175,7 @@ console.log(props, '来自父页面参数');
 const $route = useRoute(); //获取地址栏参数
 const copyform = ref({});
 const State = ref(false); //是否有数据
+const loading=ref(false)
 const form = ref({
   ynSurcharge: 0, //是否有附加费
   ynChargedKilometer: 0, //是否公里数计费
@@ -247,6 +249,7 @@ const onLoad = () => {
     // } else {
     //   data.templateId = '1821740515451240449';
     // }
+    loading.value=true;
     $_expenseDispatchPriceRuledetail(data).then(res => {
       console.log(res, '详情');
       if (res.data.code == 200) {
@@ -258,6 +261,10 @@ const onLoad = () => {
         }
         console.log(State.value,'状态');
       }
+    }).catch((error)=>{
+      console.log(error);
+    }).finally(()=>{
+      loading.value=false;
     });
   }
 };
diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
index 509e46c2..6beb7d79 100644
--- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
+++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
@@ -11,6 +11,7 @@
         :Surcharge="dispatchSubjoinCategory"
         @focus="handleRowFocus"
         @search="search"
+        :loading="Pageloading"
       >
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
@@ -161,7 +162,7 @@
             ><el-icon><Plus /></el-icon>新增</el-button
           >
           <SurchargeTable
-            :SurchargeData="form.Oversizedbilling"
+            :SurchargeData="OversizedbillingData"
             :Surcharge="Oversizedbilling"
             @focus="handleRowFocus"
             @search="search"
@@ -239,11 +240,11 @@
       </template>
     </el-dialog>
   </div>
-  <div class="footer">
+  <!-- <div class="footer">
     <el-button type="primary" @click="preservation"
       >保存<el-icon><Promotion /></el-icon
     ></el-button>
-  </div>
+  </div> -->
 </template>
 <script>
 // 缓存要引入当前页面地址
@@ -277,6 +278,7 @@ const props = defineProps({
   templateData: Object,
 });
 console.log(props, '来自父页面参数');
+const Pageloading = ref(false);
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
@@ -290,6 +292,7 @@ const formLoad = ref({});
 const optionsVehicle = ref([]);
 const copyform = ref({});
 const dispatchSubjoinCategoryData = ref([]); //列表
+const OversizedbillingData = ref([]);
 const loading = ref(false); //页面loading
 const form = ref({
   kilometerCost: 0, //公里数单价
@@ -583,7 +586,6 @@ const GetCategory = () => {
     $_expenseDispatchPriceUnit(data).then(async res => {
       console.log(res, '品类');
       if (res.data.code == 200) {
-        loading.value=false;
         // 使用 reduce 方法进行分组
         let groupingData = await grouping(res.data.data.records);
         console.log(groupingData, '分好组的数据');
@@ -607,7 +609,8 @@ const GetCategory = () => {
         });
         let flattenedData = Object.values(groupingData).flat(); //展平添加到附加费里面
         console.log(flattenedData, '附加费');
-        Categorystatistics(flattenedData, form.value.asurcharge, 2);
+        await Categorystatistics(flattenedData, form.value.asurcharge, 2);
+        loading.value = false;
       }
     });
   }
@@ -635,8 +638,8 @@ const configurationdetails = row => {
         form.value.fuelCost = scope.fuelCost; //油费
         console.log(scope, '详情参数');
         // 超区区域计费
-        form.value.Oversizedbilling = [];
-        console.log(form.value.Oversizedbilling, 'form.value.Oversizedbilling');
+        OversizedbillingData.value = [];
+        console.log(OversizedbillingData.value, 'OversizedbillingData.value');
         if (scope.overZoneList?.length) {
           scope.overZoneList.forEach((item, index) => {
             let _data = {
@@ -650,10 +653,10 @@ const configurationdetails = row => {
               loading: false,
               id: item.id,
             };
-            form.value.Oversizedbilling.push(_data);
+            OversizedbillingData.value.push(_data);
           });
         }
-        console.log(form.value.Oversizedbilling, 'form.value.Oversizedbilling');
+        console.log(OversizedbillingData.value, 'OversizedbillingData.value');
         // 使用 reduce 方法进行分组
         let groupingData = await grouping(scope.priceList);
         console.log(groupingData, '分好组的数据');
@@ -677,13 +680,15 @@ const configurationdetails = row => {
         });
         let flattenedData = Object.values(groupingData).flat(); //展平添加到附加费里面
         console.log(flattenedData, '附加费');
-        Categorystatistics(res.data.data.addPriceList, form.value.asurcharge, 2);
+        await Categorystatistics(res.data.data.addPriceList, form.value.asurcharge, 2);
+        loading.value = false;
       }
     }
   });
 };
 // 车型编辑
 const EditRules = row => {
+  loading.value = true;
   dialogtitle.value = '编辑';
   console.log(row, 'row====>');
   editID.value = row.id;
@@ -696,16 +701,22 @@ const newlyadded = async row => {
   dialogtitle.value = '新增';
   // let _dispatchSubjoinCategoryDatacopy = deepClone(dispatchSubjoinCategoryData.value) ;
   form.value = await deepClone(copyform.value);
+  OversizedbillingData.value=[]
   form.value.dialogPricingrules = true; //开启车型配置规则弹窗
   GetCategory(); //获取品类
 };
 // 提交结果数据
 const Pricingrules = () => {
-  if(loading.value){
-    return
-  }  
-  if(localStorag)
-  console.log(form.value);
+  if (loading.value) {
+    return;
+  }
+  if (!form.value.carModel) {
+    ElMessage({
+      message: '请选择车型',
+      type: 'warning',
+    });
+    return;
+  }
   // 新增提交
   if (dialogtitle.value == '新增') {
     submission();
@@ -740,7 +751,7 @@ const Categoryprocessing = (value, data, type) => {
 // 附加费处理
 // 超区计费处理
 const Oversizedbillingprocessing = (value, data) => {
-  form.value.Oversizedbilling.forEach(item => {
+  OversizedbillingData.value.forEach(item => {
     let _data = {
       province: item.region[0], //省
       city: item.region[1], //市
@@ -796,19 +807,27 @@ const submission = async () => {
       2
     );
     // 超区区域计费处理
-    await Oversizedbillingprocessing(form.value.Oversizedbilling, data['overZoneList']);
+    await Oversizedbillingprocessing(OversizedbillingData.value, data['overZoneList']);
     console.log(data, '要提交的数据');
-    $_expenseDispatchPricesave(data).then(res => {
-      console.log(res, '提交成功');
-      if (res.data.code == 200) {
-        ElMessage({
-          message: res.data.msg,
-          type: 'success',
-        });
-        form.value.dialogPricingrules = false; //开启车型配置规则弹窗
-        onLoad();
-      }
-    });
+    loading.value = true;
+    $_expenseDispatchPricesave(data)
+      .then(res => {
+        console.log(res, '提交成功');
+        if (res.data.code == 200) {
+          ElMessage({
+            message: res.data.msg,
+            type: 'success',
+          });
+          form.value.dialogPricingrules = false; //开启车型配置规则弹窗
+          onLoad();
+        }
+      })
+      .catch(error => {
+        console.log(error);
+      })
+      .finally(() => {
+        loading.value = false;
+      });
   }
 };
 //修改提交
@@ -855,7 +874,7 @@ const Pricingrulesupdate = () => {
     2
   );
   // 超区区域计费处理
-  Oversizedbillingprocessing(form.value.Oversizedbilling, data['overZoneList']);
+  Oversizedbillingprocessing(OversizedbillingData.value, data['overZoneList']);
   console.log(data, '要提交的数据');
 
   $_expenseDispatchPriceupdate(data).then(res => {
@@ -881,33 +900,47 @@ const Oversizedbillingadd = () => {
     options: [...regionList.value],
     loading: false,
   };
-  form.value.Oversizedbilling.push(_data);
-  form.value.Oversizedbilling.forEach((item, index) => {
+  OversizedbillingData.value.push(_data);
+  OversizedbillingData.value.forEach((item, index) => {
     item.index = index + 1;
   });
 };
 // 删除超区区域计费
 const Oversizedbillingdel = row => {
-  if (row.id) {
-    let data = {
-      ids: row.id,
-    };
-    $_expenseDispatchPriceOverZoneremove(data).then(res => {
-      if (res.data.code == 200) {
-        console.log(row, '删除超区费');
-        let indexToRemove = form.value.Oversizedbilling.findIndex(item => item.index === row.index);
+  ElMessageBox.confirm('是否确认删除?', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      if (row.id) {
+        let data = {
+          ids: row.id,
+        };
+        $_expenseDispatchPriceOverZoneremove(data).then(res => {
+          if (res.data.code == 200) {
+            ElMessage({
+              message: res.data.msg,
+              type: 'success',
+            });
+            console.log(row, '删除超区费');
+            let indexToRemove = OversizedbillingData.value.findIndex(
+              item => item.index === row.index
+            );
+            if (indexToRemove !== -1) {
+              OversizedbillingData.value.splice(indexToRemove, 1);
+            }
+            console.log(res, '删除成功');
+          }
+        });
+      } else {
+        let indexToRemove = OversizedbillingData.value.findIndex(item => item.index === row.index);
         if (indexToRemove !== -1) {
-          form.value.Oversizedbilling.splice(indexToRemove, 1);
+          OversizedbillingData.value.splice(indexToRemove, 1);
         }
-        console.log(res, '删除成功');
       }
-    });
-  } else {
-    let indexToRemove = form.value.Oversizedbilling.findIndex(item => item.index === row.index);
-    if (indexToRemove !== -1) {
-      form.value.Oversizedbilling.splice(indexToRemove, 1);
-    }
-  }
+    })
+    .catch(() => {});
 };
 
 // 字典公共函数
@@ -927,10 +960,10 @@ function updateDictionary(targetArray, dictionaryType) {
 const GetRegion = () => {
   $_ObtainRegion().then(res => {
     console.log(res, '地区。。。');
-    console.log(form.value.Oversizedbilling, 'form.value.Oversizedbilling');
+    console.log(OversizedbillingData.value, 'OversizedbillingData.value');
     if (res.data.code === 200) {
       regionList.value = res.data.data;
-      form.value.Oversizedbilling.forEach(item => {
+      OversizedbillingData.value.forEach(item => {
         item['options'] = res.data.data;
       });
     }
@@ -938,7 +971,9 @@ const GetRegion = () => {
 };
 
 const onLoad = async () => {
-  copyform.value = await deepClone(form.value);
+  if(!Object.keys(copyform.value).length){
+    copyform.value = await deepClone(form.value);
+  }
   console.log(copyform.value, 'copyform.value');
   if ($route.query.id || props.templateData.id) {
     console.log('执行了');
@@ -947,26 +982,31 @@ const onLoad = async () => {
       type: activeName.value,
       templateId: $route.query.id || props.templateData.id,
     };
-
-    $_expenseDispatchPricepage(data).then(res => {
-      console.log(res, '车型');
-      if (res.data.code == 200) {
-        dispatchSubjoinCategoryData.value = [];
-        let _data = {};
-        if (res.data.data.records?.length) {
-          res.data.data.records.forEach((item, index) => {
-            _data = {
-              index: index + 1,
-              carModel: item.carModel,
-              options: [...optionsVehicle.value],
-              loading: false,
-              id: item.id,
-            };
-            dispatchSubjoinCategoryData.value.push(_data);
-          });
+    Pageloading.value = true;
+    $_expenseDispatchPricepage(data)
+      .then(res => {
+        console.log(res, '车型');
+        if (res.data.code == 200) {
+          dispatchSubjoinCategoryData.value = [];
+          let _data = {};
+          if (res.data.data.records?.length) {
+            res.data.data.records.forEach((item, index) => {
+              _data = {
+                index: index + 1,
+                carModel: item.carModel,
+                options: [...optionsVehicle.value],
+                loading: false,
+                id: item.id,
+              };
+              dispatchSubjoinCategoryData.value.push(_data);
+            });
+          }
         }
-      }
-    });
+      })
+      .catch(error => {})
+      .finally(() => {
+        Pageloading.value = false;
+      });
   }
 };
 // 页面初始化
diff --git a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue
index a30a825e..8833bbe8 100644
--- a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue
+++ b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue
@@ -37,7 +37,13 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <el-button type="primary" @click="AddInfo"
-              ><el-icon><Plus /></el-icon>导出</el-button
+              ><el-icon><Download /></el-icon>导出价格</el-button
+            >
+            <el-button type="primary" @click="AddInfo"
+              ><el-icon><Upload /></el-icon>导入价格</el-button
+            >
+            <el-button type="primary" @click="Informationadd"
+              ><el-icon><Plus /></el-icon>新增</el-button
             >
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -65,7 +71,7 @@
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
-              <div class="ElBtnClass"></div>
+              <el-text size="small" @click="EditTemplate(slotProps.scope.row)">编 辑</el-text>
             </template>
           </template>
         </tablecmt>
@@ -90,6 +96,56 @@
         </div>
       </el-row>
     </div>
+    <el-dialog v-model="Priceconfiguration" :title="PriceconfigurationTitle" width="30%">
+      <el-form
+        :model="form"
+        label-width="auto"
+        v-loading="tcloading"
+        element-loading-text="Loading..."
+      >
+        <el-form-item label="服务仓:">
+          <el-select
+            @change="changServiceWarehouse"
+            v-model="form.warehouseId"
+            placeholder="请选择服务仓"
+          >
+            <el-option
+              v-for="item in ServiceWarehouse"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              :disabled="item.disabled"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="司机:">
+          <el-select v-model="form.driverId" placeholder="请选择司机">
+            <el-option
+              v-for="item in driver"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="价格模板:">
+          <el-select v-model="form.templateId" placeholder="请选择价格模板">
+            <el-option
+              v-for="item in PriceTemplate"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="Priceconfiguration = false">取消</el-button>
+          <el-button type="primary" @click="Priceconfigurationsubmission">提交</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
@@ -107,7 +163,15 @@ 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 { $_getMyWarehouseList } from '@/api/storagecost/index.js';
+import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; //司机信息
+import {
+  $_getMyWarehouseList,
+  $_ServiceProviderPrice,
+  $_ServiceProviderPricesave,
+  $_WarehousePricingTemplate,
+  $_getDriverList,
+  $_ServiceProviderPriceupdate,
+} from '@/api/storagecost/index.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
@@ -116,7 +180,16 @@ const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
 const warehouseList = ref([]);
-const queryTop=ref({})
+const PriceconfigurationTitle = ref('价格配置(新增)');
+const form = ref({});
+const rowData = ref({});
+const ServiceWarehouse = ref([]); //服务仓
+const driver = ref([]); //司机
+const tcloading = ref(false);
+const PriceTemplate = ref([]); //价格模板
+const Priceconfiguration = ref(false);
+const WarehouseId = ref('');
+const queryTop = ref({});
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -159,7 +232,7 @@ const details = reactive({
   columnList,
 
   /** 列表数据 */
-  data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -221,7 +294,7 @@ const showdrawer = _flag => {
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
-  test(details.query);
+  onLoad();
 };
 // 实例函数
 const test = val => {};
@@ -235,6 +308,7 @@ const timesc = (index, row) => {
   if (!index) {
     delete details.query[row.prop];
   }
+  onLoad();
 };
 
 /** 表格表头输入框搜索 */
@@ -244,6 +318,7 @@ const btnsc = val => {
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
   processRowProperty(index, row, details);
+  onLoad();
 };
 /** 表格表头复选框选择 */
 const selectionChange = list => {
@@ -256,15 +331,18 @@ const searchChange = () => {
 };
 // 每页多少条
 const sizeChange = val => {
-  page.value.pageSize = val;
+  details.page.pageSize = val;
+  onLoad();
 };
 /** 页码改变执行的回调 */
 const currentChange = val => {
-  page.value.currentPage = val;
+  details.page.currentPage = val;
+  onLoad();
 };
+
 // 刷新按钮
 const searchChangeS = () => {
-  details.search = false; //关闭搜索
+  onLoad();
 };
 // 顶部搜索
 const searchHide = () => {
@@ -285,27 +363,194 @@ function updateDictionary(targetArray, dictionaryType) {
     });
   });
 }
+
+// 禁止选择的仓库
+const disabledWarehouse = () => {
+  let WarehouseName = localStorage.getItem('WarehouseName');
+  console.log(WarehouseName, 'WarehouseName');
+  if (WarehouseName != 'undefined') {
+    let data = ServiceWarehouse.value.find(res => res.label == WarehouseName);
+    console.log(data, 'data====');
+    WarehouseId.value = data.value; //仓库ID
+    ServiceWarehouse.value.forEach(item => {
+      item.disabled = true;
+    });
+    data.disabled = false;
+  }
+};
 // 获取仓库
-const MyWarehouseList = () => {
-  $_getMyWarehouseList().then(res => {
+const MyWarehouseList = async () => {
+  await $_getMyWarehouseList().then(res => {
     console.log(res, '仓库列表');
     res.data.data.forEach(item => {
-      warehouseList.value.push({
-        value: item.name,
+      ServiceWarehouse.value.push({
+        value: item.id,
         label: item.name,
       });
     });
+    disabledWarehouse();
+  });
+};
+const GetTemplate = () => {
+  let data = {
+    size: 1000,
+    current: 1,
+    warehouseName:
+      ServiceWarehouse.value.find(res => res.value == form.value.warehouseId)?.label || '',
+  };
+  // 重置模板
+  form.value.templateId = '';
+  PriceTemplate.value = [];
+  $_WarehousePricingTemplate(data).then(res => {
+    console.log(res, '可选的模板');
+    if (res.data.code == 200) {
+      if (res.data.data.records?.length) {
+        res.data.data.records.forEach(item => {
+          PriceTemplate.value.push({
+            label: item.templateName,
+            value: item.id,
+          });
+        });
+        console.log(PriceTemplate.value, '模板');
+      }
+    }
   });
 };
 // 页面初始化
-const onLoad = () => {};
-const PageOnload = () => {
-  MyWarehouseList(); //获取仓库
+const onLoad = value => {
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    warehouseId: WarehouseId.value,
+    ...details.query,
+    ...value,
+  };
+  details.loadingObj.list = true;
+  $_ServiceProviderPrice(data)
+    .then(res => {
+      console.log(res, 'rsss');
+      if (res.data.code == 200) {
+        details.data = res.data.data.records || [];
+        details.page.total = res.data.data.total; //页码
+      }
+    })
+    .catch(error => {
+      console.log(error);
+    })
+    .finally(() => {
+      details.loadingObj.list = false;
+    });
+};
+const Getdriver = async () => {
+  if (form.value.warehouseId) {
+    let data = {
+      warehouseId: form.value.warehouseId,
+    };
+    await $_getDriverList(data).then(res => {
+      console.log(res, '司机列表');
+      if (res.data.code == 200) {
+        if (res.data.data.length) {
+          res.data.data.forEach(item => {
+            driver.value.push({
+              value: item.id,
+              label: item.name,
+            });
+          });
+        }
+      }
+    });
+  }
+};
+const PageOnload = async () => {
+  await MyWarehouseList(); //获取仓库
+  onLoad();
 };
 
 //页面初始化方法
 PageOnload();
-// 页面初始化方法
+// 价格配置提交
+const Priceconfigurationsubmission = () => {
+  let data = {
+    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.id = rowData.value.id;
+    $_ServiceProviderPriceupdate(data)
+      .then(res => {
+        console.log(res, '提交成功');
+        if (res.data.code == 200) {
+          ElMessage({
+            message: res.data.msg,
+            type: 'success',
+          });
+          Priceconfiguration.value = false;
+          onLoad();
+        }
+      })
+      .catch(error => {
+        console.log(error, '提交失败');
+      })
+      .finally(() => {
+        tcloading.value = false;
+      });
+  } else {
+    $_ServiceProviderPricesave(data)
+      .then(res => {
+        console.log(res, '提交成功');
+        if (res.data.code == 200) {
+          ElMessage({
+            message: res.data.msg,
+            type: 'success',
+          });
+          Priceconfiguration.value = false;
+          onLoad();
+        }
+      })
+      .catch(error => {
+        console.log(error, '提交失败');
+      })
+      .finally(() => {
+        tcloading.value = false;
+      });
+  }
+};
+// 新增
+const Informationadd = () => {
+  form.value.driverId = '';
+  form.value.warehouseId = '';
+  form.value.templateId = '';
+  PriceTemplate.value = [];
+  driver.value = [];
+  Priceconfiguration.value = true;
+  PriceconfigurationTitle.value = '价格配置(新增)';
+};
+// 服务仓事件
+const changServiceWarehouse = () => {
+  GetTemplate(); //获取可用模板
+  Getdriver(); //获取司机
+};
+const EditTemplate = async row => {
+  rowData.value = row;
+  form.value.warehouseId = row.warehouseId; //仓库
+  await Getdriver();
+  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,
+    },
+  ];
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
index edfdfe86..f38956f9 100644
--- a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
@@ -244,6 +244,7 @@ const showdrawer = _flag => {
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
+  onLoad();
 };
 // 实例函数
 /** 表格表头时间选择 */
@@ -256,6 +257,7 @@ const timesc = (index, row) => {
   if (!index) {
     delete details.query[row.prop];
   }
+  onLoad();
 };
 
 /** 表格表头输入框搜索 */
@@ -277,15 +279,19 @@ const searchChange = () => {
 };
 // 每页多少条
 const sizeChange = val => {
-  page.value.pageSize = val;
+  details.page.pageSize = val;
+  onLoad();
 };
 /** 页码改变执行的回调 */
 const currentChange = val => {
-  page.value.currentPage = val;
+  details.page.currentPage = val;
+  onLoad();
 };
+
+
 // 刷新按钮
 const searchChangeS = () => {
-  details.search = false; //关闭搜索
+  onLoad();
 };
 // 顶部搜索
 const searchHide = () => {