Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

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

@@ -141,7 +141,7 @@ export const $_WarehousePricingTemplate = params => {
     params,
   });
 };
-// 新增模板 
+// 新增模板
 export const $_WarehouseTemplateHome = data => {
   return request({
     url: '/api/logpm-statisticsdata/expenseDispatchPriceTemplate/save',
@@ -184,7 +184,6 @@ export const $_expenseDispatchPriceUnitupdate = data => {
   });
 };
 
-
 // 配送-模板-品牌品类计价单位-删除
 export const $_expenseDispatchPriceUnitremove = params => {
   return request({
@@ -194,10 +193,71 @@ export const $_expenseDispatchPriceUnitremove = params => {
   });
 };
 // 配送-模板-配送成本计价模板-新增
-export const $_expenseDispatchPriceRulesave = params => {
+export const $_expenseDispatchPriceRulesave = data => {
   return request({
     url: '/api/logpm-statisticsdata/expenseDispatchPriceRule/save',
     method: 'post',
+    data,
+  });
+};
+// 配送-模板-配送成本计价模板-详情
+export const $_expenseDispatchPriceRuledetail = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceRule/detail',
+    method: 'get',
+    params,
+  });
+};
+// 配送-模板-配送成本计价模板-编辑
+export const $_expenseDispatchPriceRuleupdate = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceRule/update',
+    method: 'post',
+    data,
+  });
+};
+
+// 配送-模板-基础配置-详情
+export const $_expenseDispatchPriceTemplatedetail = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceTemplate/detail',
+    method: 'get',
+    params,
+  });
+};
+
+// 配送-模板-基础配置-修改
+export const $_expenseDispatchPriceTemplateupdate = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceTemplate/update',
+    method: 'post',
+    data,
+  });
+};
+
+// 配送-模板-车型计费配置-列表
+export const $_expenseDispatchPricepage = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPrice/page',
+    method: 'get',
     params,
   });
-};
+};
+
+// 配送-模板-车型计费配置-新增
+export const $_expenseDispatchPricesave = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPrice/save',
+    method: 'post',
+    data,
+  });
+};
+
+// 配送-模板-车型计费配置-详情
+export const $_expenseDispatchPricedetail = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPrice/detail',
+    method: 'get',
+    params,
+  });
+};

src/components/tablecmt/tablecmt.vue

@@ -933,7 +933,8 @@ defineExpose({ handleCheckSelect, handleClearSelect });
 .el_placeholder {
   width: 100%;
   position: absolute;
-  margin-top: -10% !important;
+  margin-top: -12% !important;
   z-index: 9999999;
+  left: 0;
 }
 </style>

src/components/webCameraIMG/webCamera.vue

@@ -172,7 +172,7 @@ const Opentrimming = () => {
   };
   request('http://127.0.0.1:38088/dvideo=cameradeskew', 'POST', data)
     .then(response => {
-      const message = '';
+      let message = '';
       if (response.code !== '0') {
         message = IMG_Trimming_edge.value ? '图像裁边已开启' : '图像裁边已关闭';
         ElMessage({ message, type: 'success' });

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/Basicconfiguration.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="content">
+  <div class="content" v-loading="loading" element-loading-text="Loading...">
     <el-form :model="form" label-width="auto">
-      <el-form-item label="仓库">
-        <el-select v-model="form.warehouse" filterable placeholder="请选择" clearable>
+      <el-form-item label="仓库:">
+        <el-select v-model="form.warehouse" filterable placeholder="请选择仓库" clearable>
           <el-option
             v-for="item in warehouseList"
             :key="item.value"
@@ -13,12 +13,15 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="模板名称">
+      <el-form-item label="模板名称:">
         <el-input v-model="form.templateName" placeholder="请输入模板名称" />
       </el-form-item>
     </el-form>
   </div>
   <div class="footer">
+    <el-button type="primary" @click="preservation"
+      >保存<el-icon><Promotion /></el-icon
+    ></el-button>
     <el-button type="primary" @click="nextstep"
       >下一步<el-icon><ArrowRightBold /></el-icon
     ></el-button>
@@ -27,8 +30,13 @@
 
 <script setup>
 import { ref, defineComponent } from 'vue';
-import { $_getMyWarehouseList, $_WarehouseTemplateHome } from '@/api/storagecost/index.js';
-
+import {
+  $_getMyWarehouseList,
+  $_WarehouseTemplateHome,
+  $_expenseDispatchPriceTemplatedetail,
+  $_expenseDispatchPriceTemplateupdate,
+} from '@/api/storagecost/index.js';
+import { ElMessage } from 'element-plus';
 import { useRoute } from 'vue-router';
 import { useStore } from 'vuex';
 const $useStore = useStore();
@@ -43,6 +51,7 @@ const props = defineProps({
 });
 console.log(props, '来自父页面参数');
 const form = ref({});
+const loading = ref(false);
 const warehouseList = ref([]);
 // 获取仓库
 const getWarehouse = () => {
@@ -50,6 +59,7 @@ const getWarehouse = () => {
     console.log('获取仓库', res);
     if (res.data.code == 200) {
       warehouseList.value = res.data.data || [];
+      disabledWarehouse();
     }
   });
 };
@@ -57,34 +67,110 @@ const getWarehouse = () => {
 const disabledWarehouse = () => {
   let WarehouseName = localStorage.getItem('WarehouseName');
   if (WarehouseName != 'undefined') {
-    console.log('不存在仓库');
+    let data = warehouseList.value.find(res => res.name == WarehouseName);
+    warehouseList.value.forEach(item => {
+      item.disabled = true;
+    });
+    data.disabled = false;
+  }
+};
+const getInfo = () => {
+  // 编辑查询
+  if ($route.query.id) {
+    let data = {
+      id: $route.query.id,
+    };
+    loading.value = true;
+    $_expenseDispatchPriceTemplatedetail(data)
+      .then(res => {
+        console.log(res, '详情');
+        if (res.data.code == 200) {
+          form.value.warehouse = res.data.data.warehouseId;
+          form.value.templateName = res.data.data.templateName;
+        }
+      })
+      .catch(error => {
+        console.log(error);
+      })
+      .finally(() => {
+        loading.value = false;
+      });
   }
 };
-
 const onLoad = () => {
   getWarehouse();
-  disabledWarehouse();
+  getInfo();
 };
 
 onLoad();
-
-// 下一步
-const nextstep = () => {
+const preservation = () => {
+  if (loading.value) {
+    return;
+  }
+  if (!form.value.warehouse) {
+    ElMessage({
+      message: '请选择仓库',
+      type: 'warning',
+    });
+    return;
+  }
+  if (!form.value.templateName) {
+    ElMessage({
+      message: '请输入模板名称',
+      type: 'warning',
+    });
+    return;
+  }
   let data = {
     templateName: form.value.templateName,
     warehouseName: warehouseList.value.find(item => item.id == form.value.warehouse)?.name || '', //
     warehouseId: form.value.warehouse, //仓库ID
   };
-  $_WarehouseTemplateHome(data).then(res => {
-    console.log(res, '新增成功');
-    if(res.data.code ==200){
-      emit('request-data',{id:res.data.data}); //通知父页面传递数据
-      console.log(props, '最新参数');
-    }
-  });
+  loading.value = true;
+  if ($route.query.id) {
+    // 编辑
+    data.id = $route.query.id; //编辑额外参数
+    $_expenseDispatchPriceTemplateupdate(data)
+      .then(res => {
+        console.log(res, '修改成功');
+        if (res.data.code == 200) {
+          ElMessage({
+            message: res.data.msg,
+            type: 'success',
+          });
+        }
+      })
+      .catch(error => {
+        console.log(error);
+      })
+      .finally(() => {
+        loading.value = false;
+      });
+  } else {
+    // 新增接口
+    $_WarehouseTemplateHome(data)
+      .then(res => {
+        console.log(res, '新增成功');
+        if (res.data.code == 200) {
+          emit('request-data', { id: res.data.data }); //通知父页面传递数据
+          console.log(props, '最新参数');
+          ElMessage({
+            message: res.data.msg,
+            type: 'success',
+          });
+        }
+      })
+      .catch(error => {
+        console.log(error);
+      })
+      .finally(() => {
+        loading.value = false;
+      });
+  }
+};
+// 下一步
+const nextstep = () => {
   return;
-
-
 };
 </script>
 

src/views/cost/Deliverycostmanagement/Categorypricingunit.vue

@@ -325,6 +325,7 @@ function updateDictionary(targetArray, dictionaryType) {
 // 页面初始化
 const onLoad = value => {
   let data = {
+    templateId:'1820287812099485698',
     current: details.page.currentPage,
     size: details.page.pageSize,
     ...details.query,
@@ -359,7 +360,7 @@ const handleEdit = row => {
   form.value.unit = row.unit;
   categoryList.value = [
     {
-      goodsName: '',
+      goodsName: row.categoryName,
       goodsId: row.categoryId,
     },
   ];
@@ -426,6 +427,7 @@ const Categoryaddition = async () => {
       let data = {
         categoryId: form.value.categoryId, //成本结算品类
         unit: form.value.unit, //计价单位
+        templateId:'1820287812099485698',
       };
       details.loadingObj.list = true;
       if (categorytitle.value == '新增') {

src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue

@@ -2,8 +2,8 @@
   <div class="content">
     <!-- 配置计价规则 -->
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="商配" name="0"></el-tab-pane>
-      <el-tab-pane label="市配" name="1"></el-tab-pane>
+      <el-tab-pane label="商配" :name="1"></el-tab-pane>
+      <el-tab-pane label="市配" :name="2"></el-tab-pane>
     </el-tabs>
     <el-form :model="form" class="el_pricing">
       <div class="el_row">
@@ -149,7 +149,13 @@
 
 <script setup>
 import { ref } from 'vue';
-import { $_expenseDispatchPriceRulesave } from '@/api/storagecost/index.js';
+import {
+  $_expenseDispatchPriceRulesave,
+  $_expenseDispatchPriceRuledetail,
+  $_expenseDispatchPriceRuleupdate,
+} from '@/api/storagecost/index.js';
+const $route = useRoute(); //获取地址栏参数
+
 const form = ref({
   ynSurcharge: 0, //是否有附加费
   ynChargedKilometer: 0, //是否公里数计费
@@ -168,19 +174,54 @@ const form = ref({
   subsidyFuelCostRule: 1, //补贴油费计算规则
   ynSubsidyFuelCostReturn: 0, //补贴油费是否计算返程
 });
-const activeName = ref('0');
+const activeName = ref(1); //类型(1商配2市配)
 const handleClick = () => {
   console.log(activeName.value);
 };
 const preservation = () => {
   let data = {
-    templateId:'1820287812099485698',
-    ...form.value
+    type: activeName.value,
+    templateId: '1820287812099485698',
+    ...form.value,
   };
-  $_expenseDispatchPriceRulesave(data).then(res => {
-    console.log(res, '新增成');
+
+  // 修改编辑
+  if ($route.query.id) {
+    $_expenseDispatchPriceRuleupdate(data).then(res => {
+      if (res.data.code == 200) {
+        ElMessage({
+          message: res.data.msg,
+          type: 'success',
+        });
+      }
+    });
+  } else {
+    // 新增
+    $_expenseDispatchPriceRulesave(data).then(res => {
+      console.log(res, '新增成');
+      if (res.data.code == 200) {
+        ElMessage({
+          message: res.data.msg,
+          type: 'success',
+        });
+      }
+    });
+  }
+};
+const onLoad = () => {
+  console.log($route, '$route');
+  let data = {
+    templateId: '1820287812099485698',
+    type: activeName.value,
+  };
+  $_expenseDispatchPriceRuledetail(data).then(res => {
+    console.log(res, '详情');
+    if (res.data.code == 200 && res.data.data) {
+      form.value = res.data.data;
+    }
   });
 };
+onLoad();
 </script>
 
 <style scoped lang="scss">

src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue

@@ -1,9 +1,10 @@
 <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">
       <SurchargeTable
         :SurchargeData="form.dispatchSubjoinCategoryData"
@@ -14,10 +15,7 @@
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
             <div class="eml_btn">
-              <span class="el_btn_a" @click="newlyadded(slotProps)">
-                <el-icon style="color: #409eff"><CirclePlus /></el-icon>新增
-              </span>
-              <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">
@@ -33,6 +31,20 @@
   <!-- 配置计价规则 -->
   <el-dialog v-model="form.dialogPricingrules" title="编辑" width="70%">
     <div class="el_content">
+      <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
@@ -220,147 +232,54 @@
       </div>
     </template>
   </el-dialog>
+  <div class="footer">
+    <el-button type="primary" @click="preservation"
+      >保存<el-icon><Promotion /></el-icon
+    ></el-button>
+  </div>
 </template>
 <script setup>
 import { ref } from 'vue';
 import SurchargeTable from '@/components/pric/tablePric.vue';
 import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
+import {
+  $_expenseDispatchPricepage,
+  $_expenseDispatchPricesave,
+  $_expenseDispatchPricedetail,
+  $_expenseDispatchPriceUnit,
+} from '@/api/storagecost/index.js';
 import { $_ObtainRegion } from '@/api/basicdata/basicdataWarehouse';
-const activeName = ref('Commercialdistribution');
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+const $router = useRouter(); //跳转
+const $useStore = useStore(); //权限
+const $route = useRoute(); //获取地址栏参数
+const activeName = ref('1');
 const SelectData = ref({}); //当前点击品类
 // 配置计价规则
 const formLoad = ref({});
+const optionsVehicle = ref([]);
 const form = ref({
   numa: 0,
   numb: 0,
   numc: 0,
   dialogPricingrules: false, //配置车型规则
   dialogConfigure: false,
-  dispatchSubjoinCategoryData: [
-    {
-      index: 1,
-      Warehousecategory: '',
-      options: [],
-      loading: false,
-    },
-  ],
+  dispatchSubjoinCategoryData: [],
   // 车型配置
   // 品类按件计费
-  Categorybyitembilling: [
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-    {
-      index: 1,
-      Costsettlementcategory: '', //成本结算品类
-      UnitPrice: '', //单价(元/件)
-      options: [],
-      loading: false,
-    },
-    {
-      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: '',
@@ -372,7 +291,7 @@ const form = ref({
   Oversizedbilling: [
     {
       index: 1,
-      Costsettlementcategory: '', //成本结算品类
+      categoryId: '', //成本结算品类
       a: '', //省市区
       b: '', //超区公里数
       c: '', //超区后单价
@@ -381,18 +300,7 @@ const form = ref({
     },
   ],
 });
-const onLoad = () => {
-  $_ObtainRegion().then(res => {
-    console.log(res, '地区。。。');
-    console.log(form.value.Oversizedbilling, 'form.value.Oversizedbilling');
-    if (res.data.code === 200) {
-      form.value.Oversizedbilling.forEach(item => {
-        item['options'] = res.data.data;
-      });
-    }
-  });
-};
-onLoad();
+
 // 超区计费
 const Oversizedbilling = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
@@ -425,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,
@@ -443,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,
@@ -461,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,
@@ -479,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,
@@ -497,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,
@@ -536,7 +444,7 @@ const dispatchSubjoinCategory = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
   {
     label: '车型',
-    prop: 'Warehousecategory',
+    prop: 'carModel',
     type: 'select',
     width: 'auto',
     disabled: true,
@@ -570,22 +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 => {
-  console.log(row, '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; //开启车型配置规则弹窗
   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 = {
+    type: activeName.value, //商配/市配
+    carModel: form.value.carModel, //车型
+  };
+  $_expenseDispatchPricesave(data).then(res => {
+    console.log(res, '提交成功');
+    if (res.data.code == 200) {
+      onLoad();
+    }
+  });
 };
 // 新增超区区域计费
 const Oversizedbillingadd = () => {};
@@ -593,6 +579,63 @@ const Oversizedbillingadd = () => {};
 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,
+      });
+    });
+  });
+}
+
+// 获取地区
+const GetRegion = () => {
+  $_ObtainRegion().then(res => {
+    console.log(res, '地区。。。');
+    console.log(form.value.Oversizedbilling, 'form.value.Oversizedbilling');
+    if (res.data.code === 200) {
+      form.value.Oversizedbilling.forEach(item => {
+        item['options'] = res.data.data;
+      });
+    }
+  });
+};
+
+const onLoad = () => {
+  let data = {
+    id: $route.query.id,
+  };
+  $_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(); //获取地区
+};
+onLoadPage();
 </script>
 
 <style scoped lang="scss">
@@ -780,4 +823,17 @@ const Oversizedbillingdel = row => {
 .SuperAdd {
   display: flex;
 }
+.footer {
+  position: fixed;
+  bottom: 10px;
+  left: 4%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  .el-button {
+    width: 120px;
+    height: 40px;
+    font-size: 16px;
+  }
+}
 </style>

src/views/mail/order/add.vue

@@ -214,6 +214,7 @@
                   @selection="selectionChange"
           >
             <template #default="slotProps">
+
               <!--              <el-text-->
               <!--                      v-if="inventoryShow"-->
               <!--                      type="primary"-->
@@ -452,10 +453,11 @@
       </template>
 
       <template v-if="isaddvalue">
-        <el-dialog v-model="isaddvalue" title="包件信息" width="100%" :model="addvalue">
+        <el-dialog v-model="isaddvalue" title="包件信息" width="80%" :model="addvalue">
           <!-- 列表模块 -->
           <!--                :isselectfun="checkPackage"-->
           <tablecmt
+                  class="tcpack"
                   :columnList="columnParcels"
                   :tableData="packageData"
                   :checkselect="packageDataSec"
@@ -744,7 +746,7 @@
           {
             prop: 'storeTime',
             label: '在库时间',
-            type: 5,
+            type: 1,
             values: '',
             width: '150',
             checkarr: [],
@@ -1184,26 +1186,26 @@
             sortable: true,
             head: false,
           },
-          {
-            prop: 'reservationStatusName',
-            label: '预约状态',
-            type: 3,
-            values: '',
-            width: '150',
-            checkarr: [
-              {
-                label: '未预约',
-                value: '10',
-              },
-              {
-                label: '部分预约',
-                value: '20',
-              },
-            ],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
+          // {
+          //   prop: 'reservationStatusName',
+          //   label: '预约状态',
+          //   type: 3,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [
+          //     {
+          //       label: '未预约',
+          //       value: '10',
+          //     },
+          //     {
+          //       label: '部分预约',
+          //       value: '20',
+          //     },
+          //   ],
+          //   fixed: false,
+          //   sortable: true,
+          //   head: false,
+          // },
           {
             prop: 'freezeStatusName',
             label: '冻结状态',
@@ -2302,7 +2304,7 @@
           this.loading = false;
         } else {
           console.log(">>>>> id ，",row.id);
-          getPackageListByStockArticleId(page.currentPage, page.pageSize, {id:row.id}).then(res => {
+         await getPackageListByStockArticleId(page.currentPage, page.pageSize, {id:row.id}).then(res => {
             console.log('res---------------->', res);
             // console.log(res.data.data.records);
             if (res.data.data) {
@@ -2314,6 +2316,11 @@
             this.loading = false;
           });
         }
+        let ctime= setTimeout(()=>{
+          const _node = document.querySelector('.tcpack');
+          setNodeHeight(_node, '', true);
+          clearTimeout(ctime)
+          },50)
       },
 
       // 选择包件信息
@@ -2437,6 +2444,7 @@
         });
         console.log('this.orderData------------>', this.orderData);
         this.isaddvalue = false;
+        this.obj.reservationNum =   this.packageListInfo.length
       },
       onSubmit() {
        
@@ -2454,21 +2462,41 @@
         let inventoryIds = [];
         let inventoryList = [];
         let stockArticleList = [];
+        // let operation = true;
+        // this.inventoryData.forEach(item => {
+        //   if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
+        //     this.$message({
+        //       type: 'warning',
+        //       message: '存在无效的预约数量',
+        //     });
+        //     operation = false;
+        //     return;
+        //   }
+        //   item.reservationNum = item.reservationNum;
+        //   inventoryIds.push(item.id);
+        //   inventoryList.push(item);
+        // });
+        // if(!operation){
+        //   return
+        // }
         let operation = true;
-        this.inventoryData.forEach(item => {
-          if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
-            this.$message({
-              type: 'warning',
-              message: '存在无效的预约数量',
-            });
-            operation = false;
-            return;
-          }
-          item.reservationNum = item.reservationNum;
-          inventoryIds.push(item.id);
-          inventoryList.push(item);
-        });
+        for (let i = 0; i < this.inventoryData.length; i++) {
+        const item = this.inventoryData[i];
+        if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
+         this.$message({
+           type: 'warning',
+            message: '存在无效的预约数量',
+          });
+          operation = false;
+          break; // 立即跳出循环
+       }
+      inventoryIds.push(item.id);
+        inventoryList.push(item);
+      }
 
+      if (!operation) {
+        return;
+      }
         orderIds.join(',');
         inventoryIds.join(',');
         this.form.stockArticleIds = orderIds.toString();

src/views/mail/order/list.vue

@@ -507,16 +507,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'availableQuantity',
-          label: '可用数量',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'availableQuantity',
+        //   label: '可用数量',
+        //   type: 2,
+        //   values: '',
+        //   width: '140',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'notReceived',
           label: '未入库数量',

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 === '';

src/views/mail/signfor/list.vue

@@ -777,6 +777,7 @@ export default {
         query: {
           id: row.id,
           reservationId: row.reservationId,
+          row:JSON.stringify(row),
           name: '签收查看',
         },
       });