商家端取消预约，修复已知bug

src/api/distribution/distributionReservation.js

@@ -250,6 +250,15 @@ export const cancelReservation = data => {
   });
 };
 
+// 取消预约-新
+export const $_batchCancelReservation = params => {
+  return request({
+    url: '/api/logpm-distribution/mall/order/batchCancelMallReservation',
+    method: 'delete',
+    params,
+  });
+};
+
 export const getReservationDetail = id => {
   return request({
     url: '/api/logpm-distribution/reservation/getReservationDetail',

src/api/storagecost/index.js

@@ -251,4 +251,13 @@ export const $_expenseDispatchPricesave = data => {
     method: 'post',
     data,
   });
-};
+};
+
+// 配送-模板-车型计费配置-详情
+export const $_expenseDispatchPricedetail = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPrice/detail',
+    method: 'get',
+    params,
+  });
+};

src/option/storagecost/Categorypricingunit.js

@@ -15,7 +15,7 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'categoryId',
+    prop: 'categoryName',
     label: '成本结算品类',
     type: 2,
     values: '',

src/views/cost/Deliverycostmanagement/Categorypricingunit.vue

@@ -360,7 +360,7 @@ const handleEdit = row => {
   form.value.unit = row.unit;
   categoryList.value = [
     {
-      goodsName: '',
+      goodsName: row.categoryName,
       goodsId: row.categoryId,
     },
   ];

src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue

@@ -1,8 +1,8 @@
 <template>
   <div style="padding: 0 10px">
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="商配" name="Commercialdistribution"></el-tab-pane>
-      <el-tab-pane label="市配" name="Municipaldistribution"></el-tab-pane>
+      <el-tab-pane label="商配" name="1"></el-tab-pane>
+      <el-tab-pane label="市配" name="2"></el-tab-pane>
     </el-tabs>
     <el-button type="primary" @click="newlyadded">新增</el-button>
     <div class="form">
@@ -15,7 +15,7 @@
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
             <div class="eml_btn">
-              <span class="el_btn_a" @click="EditRules">
+              <span class="el_btn_a" @click="EditRules(slotProps.scope.row)">
                 <el-icon style="color: #409eff"><Edit /></el-icon>编辑
               </span>
               <span @click="categoriesduceSurcharge(slotProps.scope.row.index)" class="el_btn_a">
@@ -31,17 +31,20 @@
   <!-- 配置计价规则 -->
   <el-dialog v-model="form.dialogPricingrules" title="编辑" width="70%">
     <div class="el_content">
-      <div class="el_category">
-        <span class="title"> 车型 </span>
-        <el-select v-model="form.carModel" placeholder="请选择车型" >
-          <el-option
-            v-for="item in optionsVehicle "
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
+      <div style="width: 100%">
+        <div class="el_category">
+          <span class="title"> 车型 </span>
+          <el-select v-model="form.carModel" placeholder="请选择车型">
+            <el-option
+              v-for="item in optionsVehicle"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </div>
       </div>
+
       <div class="el_category">
         <span class="title"> 品类按件计费 </span>
         <SurchargeTable
@@ -239,78 +242,44 @@
 import { ref } from 'vue';
 import SurchargeTable from '@/components/pric/tablePric.vue';
 import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
-import { $_expenseDispatchPricepage,$_expenseDispatchPricesave } from '@/api/storagecost/index.js';
+import {
+  $_expenseDispatchPricepage,
+  $_expenseDispatchPricesave,
+  $_expenseDispatchPricedetail,
+  $_expenseDispatchPriceUnit,
+} from '@/api/storagecost/index.js';
 import { $_ObtainRegion } from '@/api/basicdata/basicdataWarehouse';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
-const activeName = ref('Commercialdistribution');
+const activeName = ref('1');
 const SelectData = ref({}); //当前点击品类
 // 配置计价规则
 const formLoad = ref({});
-const optionsVehicle=ref([]);
+const optionsVehicle = ref([]);
 const form = ref({
   numa: 0,
   numb: 0,
   numc: 0,
   dialogPricingrules: false, //配置车型规则
   dialogConfigure: false,
-  dispatchSubjoinCategoryData: [
-    {
-      index: 1,
-      carModel: '',
-      options: [],
-      loading: false,
-    },
-  ],
+  dispatchSubjoinCategoryData: [],
   // 车型配置
   // 品类按件计费
-  Categorybyitembilling: [
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-  ],
+  Categorybyitembilling: [],
   //品类按方计费
-  Categorybasedbillingbyparty: [
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-  ],
+  Categorybasedbillingbyparty: [],
 
   // 品类按重量计费
-  Categorychargesbyweight: [
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-  ],
+  Categorychargesbyweight: [],
   // 品类按吨计费
-  Categorybilledbyton: [
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-  ],
+  Categorybilledbyton: [],
   asurcharge: [
     {
       index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
+      categoryId: '', //成本结算品类
+      cost: 0, //单价(元/件)
       a: '', //套单价(元/套)
       b: '',
       c: '',
@@ -322,7 +291,7 @@ const form = ref({
   Oversizedbilling: [
     {
       index: 1,
-      Costsettlementcategory: '', //成本结算品类
+      categoryId: '', //成本结算品类
       a: '', //省市区
       b: '', //超区公里数
       c: '', //超区后单价
@@ -364,14 +333,14 @@ const Categorybyitembilling = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
   {
     label: '成本结算品类',
-    prop: 'Warehousecategory',
+    prop: 'categoryId',
     type: 'select',
     width: 'auto',
     disabled: true,
   },
   {
     label: '单价(元/件)',
-    prop: 'UnitPrice',
+    prop: 'cost',
     type: 'number',
     width: 'auto',
     disabled: true,
@@ -382,14 +351,14 @@ const Categorybasedbillingbyparty = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
   {
     label: '成本结算品类',
-    prop: 'Warehousecategory',
+    prop: 'categoryId',
     type: 'select',
     width: 'auto',
     disabled: true,
   },
   {
     label: '单价(元/件)',
-    prop: 'UnitPrice',
+    prop: 'cost',
     type: 'number',
     width: 'auto',
     disabled: true,
@@ -400,14 +369,14 @@ const Categorychargesbyweight = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
   {
     label: '成本结算品类',
-    prop: 'Warehousecategory',
+    prop: 'categoryId',
     type: 'select',
     width: 'auto',
     disabled: true,
   },
   {
     label: '单价(元/件)',
-    prop: 'UnitPrice',
+    prop: 'cost',
     type: 'number',
     width: 'auto',
     disabled: true,
@@ -418,14 +387,14 @@ const Categorybilledbyton = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
   {
     label: '成本结算品类',
-    prop: 'Warehousecategory',
+    prop: 'categoryId',
     type: 'select',
     width: 'auto',
     disabled: true,
   },
   {
     label: '单价(元/件)',
-    prop: 'UnitPrice',
+    prop: 'cost',
     type: 'number',
     width: 'auto',
     disabled: true,
@@ -436,14 +405,14 @@ const asurcharge = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
   {
     label: '成本结算品类',
-    prop: 'Warehousecategory',
+    prop: 'categoryId',
     type: 'select',
     width: 'auto',
     disabled: true,
   },
   {
     label: '上楼费(元/层/件)',
-    prop: 'UnitPrice',
+    prop: 'cost',
     type: 'number',
     width: 'auto',
     disabled: true,
@@ -509,33 +478,100 @@ const categoriesduceSurcharge = row => {
     'form.value.dispatchSubjoinCategoryData after deletion and reordering'
   );
 };
-const EditRules = () => {
-  form.value.dialogPricingrules = true; //开启车型配置规则弹窗
+// 品类分组
+const grouping = data => {
+  // 定义 id 到键名的映射
+  const keyMap = {
+    1: 'piece', //按件
+    2: 'square', //按方
+    3: 'weight', //按重量
+    4: 'ton', //按吨
+  };
+  return data.reduce((acc, curr) => {
+    const key = keyMap[curr.unit];
+
+    if (key) {
+      if (!acc[key]) {
+        acc[key] = [];
+      }
+      acc[key].push(curr);
+    }
+    return acc;
+  }, {});
 };
-const newlyadded = row => {
+// 品类统计
+const Categorystatistics = (data, value, type) => {
+  data.forEach((item, index) => {
+    let _data = {
+      index: index + 1,
+      categoryId: item.categoryId, //品类ID
+      cost: item.cost || 0, //价格
+      options: [
+        {
+          value: item.categoryId,
+          label: item.categoryName,
+        },
+      ],
+      loading: false,
+      type: type, //类型1 普通费 2 附加费
+    };
+    value.push(_data);
+  });
+};
+const EditRules = row => {
+  console.log(row, 'row====>');
   form.value.dialogPricingrules = true; //开启车型配置规则弹窗
-  return;
-  console.log(row, 'row');
   let data = {
-    index: form.value.dispatchSubjoinCategoryData.length + 1,
-    Warehousecategory: '',
-    options: [],
-    loading: false,
+    type: activeName.value,
+    id: row.id,
   };
-  form.value.dispatchSubjoinCategoryData.push(data);
+  $_expenseDispatchPricedetail(data).then(res => {
+    console.log(res, '详情');
+    if (res.data.code == 200) {
+      const scope = res.data.data;
+      console.log(scope, '详情参数');
+      form.value.carModel = scope.carModel; //车型
+      data.id = $route.query.id;
+      $_expenseDispatchPriceUnit(data).then(async res => {
+        console.log(res, '品类');
+        if (res.data.code == 200) {
+          // 使用 reduce 方法进行分组
+          let groupingData = await grouping(res.data.data.records);
+          console.log(groupingData, '分好组的数据');
+          //按件
+          const categoryMapping = {
+            piece: form.value.Categorybyitembilling,
+            square: form.value.Categorybasedbillingbyparty,
+            weight: form.value.Categorychargesbyweight,
+            ton: form.value.Categorybilledbyton,
+          };
+          Object.entries(categoryMapping).forEach(([key, category]) => {
+            const data = groupingData[key] ?? [];
+            if (data.length) {
+              Categorystatistics(data, category, 1);
+            }
+          });
+        }
+      });
+    }
+  });
+};
+const newlyadded = row => {
+  form.value.dialogPricingrules = true; //开启车型配置规则弹窗
 };
 // 编辑车型规则
 const Pricingrules = () => {
   console.log(form.value);
-  let data={
-    carModel:form.value.carModel,//车型
-  }
-  $_expenseDispatchPricesave(data).then(res=>{
-    console.log(res,'提交成功');
-    
-  })
-
-
+  let data = {
+    type: activeName.value, //商配/市配
+    carModel: form.value.carModel, //车型
+  };
+  $_expenseDispatchPricesave(data).then(res => {
+    console.log(res, '提交成功');
+    if (res.data.code == 200) {
+      onLoad();
+    }
+  });
 };
 // 新增超区区域计费
 const Oversizedbillingadd = () => {};
@@ -544,18 +580,19 @@ const Oversizedbillingdel = row => {
   console.log(row, '删除超区费');
 };
 
-  // 字典公共函数
-  function updateDictionary(targetArray, dictionaryType) {
-    getDictionaryBiz(dictionaryType).then(res => {
-      console.log(res, '字典');
-      res.data.data.forEach(item => {
-        targetArray.push({
-          value: item.dictKey,
-          label: item.dictValue,
-        });
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    res.data.data.forEach(item => {
+      targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
       });
     });
-  }
+  });
+}
+
 // 获取地区
 const GetRegion = () => {
   $_ObtainRegion().then(res => {
@@ -575,13 +612,28 @@ const onLoad = () => {
   };
   $_expenseDispatchPricepage(data).then(res => {
     console.log(res, '车型');
+    if (res.data.code == 200) {
+      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,
+          };
+          form.value.dispatchSubjoinCategoryData.push(_data);
+        });
+      }
+    }
   });
 };
 // 页面初始化
 const onLoadPage = () => {
+  updateDictionary(optionsVehicle.value, 'price_vehicle_type'); // 获取车型
   onLoad();
   GetRegion(); //获取地区
-  updateDictionary(optionsVehicle.value, 'price_vehicle_type'); // 获取车型
 };
 onLoadPage();
 </script>

src/views/mail/reservation/list.vue

@@ -85,7 +85,7 @@
                     type="primary"
                     link
                     icon="el-icon-view"
-                    @click="cancelReservation(slotProps.scope)"
+                    @click="cancelReservationConfirm(slotProps.scope.row)"
                     >取消预约
                   </el-text>
                 </template>
@@ -250,7 +250,7 @@
     </template>
   </el-dialog>
 
-  <el-dialog title="预约取消" v-model="dialogCancelReservation" style="width: 30%; height: 40%">
+  <!-- <el-dialog title="预约取消" v-model="dialogCancelReservation" style="width: 30%; height: 40%">
     <el-form :model="cancel">
       <el-form-item label="原因:">
         <el-input v-model="cancel.message" autocomplete="off"></el-input>
@@ -260,7 +260,7 @@
       <el-button @click="dialogCancelReservation = false">取 消</el-button>
       <el-button type="primary" @click="cancelReservationConfirm(row)">确 定</el-button>
     </div>
-  </el-dialog>
+  </el-dialog> -->
 </template>
 
 <script>
@@ -273,6 +273,7 @@ import {
   confirms,
   addReservations,
   cancelReservation,
+  $_batchCancelReservation,
   patchPrintList,
   reservationExport,
 } from '@/api/distribution/distributionReservation';
@@ -287,7 +288,7 @@ import { getStockUpArea, stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import dayjs from 'dayjs';
 import print from '@/utils/print';
 import { downloadXls, handleClearTableQuery } from '@/utils/util';
-
+import { ElMessage, ElMessageBox } from 'element-plus'
 export default {
   data() {
     return {
@@ -938,24 +939,34 @@ export default {
       // }
       // console.log('this.activename :>> ', this.activename);
     },
-    cancelReservationConfirm() {
-      if (!this.cancel.message) {
-        this.$message.warning('请输入取消原因!!');
-        return;
-      }
-      let data = {};
-      if (this.cancelReservationRow) {
-        data = this.cancelReservationRow;
-        data.cancelReason = this.cancel.message;
-      } else {
-        this.$message.error('请稍后再试!!');
-        return;
+    cancelReservationConfirm(row) {
+      ElMessageBox.confirm(
+    '是否确认取消预约?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      let data={
+        ids:row.id
       }
-      cancelReservation(data).then(res => {
-        this.onLoad(this.page);
-        this.cancelReservationRow = {};
-        this.dialogCancelReservation = false;
+      $_batchCancelReservation(data).then(res => {
+        if(res.data.code == 200){
+      ElMessage({
+        type: 'success',
+        message:res.data.msg,
+      })
+          this.onLoad(this.page);
+        }
       });
+
+    })
+    .catch(() => {
+    })
+
     },
     ddd() {
       this.form.deliveryType === '';