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

src/api/storagecost/index.js

@@ -261,3 +261,28 @@ export const $_expenseDispatchPricedetail = params => {
     params,
   });
 };
+
+// 配送-模板-车型计费配置-修改
+export const $_expenseDispatchPriceupdate = data => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPrice/update',
+    method: 'post',
+    data,
+  });
+};
+// 配送-模板-车型计费配置-删除
+export const $_expenseDispatchPriceremove = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPrice/remove',
+    method: 'post',
+    params,
+  });
+};
+// 配送-模板-超区删除
+export const $_expenseDispatchPriceOverZoneremove = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchPriceOverZone/remove',
+    method: 'post',
+    params,
+  });
+};

src/components/IMGcompressor/imgcompressor.js

@@ -0,0 +1,46 @@
+export async function compressImageBlob(blob) {
+  return new Promise((resolve, reject) => {
+    const img = new Image();
+    const reader = new FileReader();
+
+    reader.onload = e => {
+      img.src = e.target.result;
+    };
+
+    img.onload = () => {
+      const width = img.width;
+      const height = img.height;
+      const maxWidth = 800; // 最大宽度
+      const maxHeight = 800; // 最大高度
+      let newWidth = width;
+      let newHeight = height;
+
+      // 计算缩放比例
+      if (width > height) {
+        if (width > maxWidth) {
+          newHeight *= maxWidth / newWidth;
+          newWidth = maxWidth;
+        }
+      } else {
+        if (height > maxHeight) {
+          newWidth *= maxHeight / newHeight;
+          newHeight = maxHeight;
+        }
+      }
+
+      // 创建离屏 canvas
+      const offScreenCanvas = new OffscreenCanvas(newWidth, newHeight);
+      const ctx = offScreenCanvas.getContext('2d');
+      ctx.drawImage(img, 0, 0, newWidth, newHeight);
+
+      // 压缩图片
+      offScreenCanvas
+        .convertToBlob({ type: 'image/jpeg', quality: 0.8 })
+        .then(resolve)
+        .catch(reject);
+    };
+
+    reader.onerror = reject;
+    reader.readAsDataURL(blob);
+  });
+}

src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue

@@ -18,7 +18,7 @@
               <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">
+              <span @click="categoriesduceSurcharge(slotProps.scope.row)" class="el_btn_a">
                 <el-icon style="color: #f00"><Delete /></el-icon>删除
               </span>
             </div>
@@ -27,9 +27,9 @@
       </SurchargeTable>
     </div>
   </div>
-
+  <div class="el_tc_dialog">
     <!-- 配置计价规则 -->
-  <el-dialog v-model="form.dialogPricingrules" title="编辑" width="70%">
+    <el-dialog v-model="form.dialogPricingrules" :title="dialogtitle" width="70%">
       <div class="el_content">
         <div style="width: 100%">
           <div class="el_category">
@@ -114,6 +114,7 @@
             :Surcharge="asurcharge"
             @focus="handleRowFocus"
             @search="search"
+            :height="150"
           >
             <template #default="slotProps">
               <template v-if="slotProps.scope.column.label === '操作'"> </template>
@@ -125,7 +126,7 @@
         <div class="el_Kilometers_box">
           <span class="title">公里数单价</span>
           <el-input-number
-          v-model="form.numa"
+            v-model="form.kilometerCost"
             :min="0"
             :controls="false"
             :precision="2"
@@ -135,7 +136,7 @@
         <div class="el_Kilometers_box">
           <span class="title">补贴起步公里数(km)</span>
           <el-input-number
-          v-model="form.numb"
+            v-model="form.subsidyInitKilometer"
             :min="0"
             :controls="false"
             :precision="2"
@@ -145,7 +146,7 @@
         <div class="el_Kilometers_box">
           <span class="title">补贴单价(元/km)</span>
           <el-input-number
-          v-model="form.numc"
+            v-model="form.subsidyCost"
             :min="0"
             :controls="false"
             :precision="2"
@@ -155,6 +156,9 @@
       </div>
       <div class="el_Oversizedbilling">
         <span class="title">超区区域计费</span>
+        <el-button class="el_addbtn" type="primary" @click="Oversizedbillingadd"
+          ><el-icon><Plus /></el-icon>新增</el-button
+        >
         <SurchargeTable
           :SurchargeData="form.Oversizedbilling"
           :Surcharge="Oversizedbilling"
@@ -164,8 +168,9 @@
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
               <div class="el_btn_txt">
-              <el-text class="el_text_del" @click="Oversizedbillingdel(slotProps)">删除</el-text>
-              <el-text class="el_text_add" @click="Oversizedbillingadd">新增</el-text>
+                <el-text class="el_text_del" @click="Oversizedbillingdel(slotProps.scope.row)"
+                  >删除</el-text
+                >
               </div>
             </template>
           </template>
@@ -176,7 +181,7 @@
         <div class="el_Super_box">
           <span class="title">统一超区公里数(km)</span>
           <el-input-number
-          v-model="form.numc"
+            v-model="form.overZoneKilometer"
             :min="0"
             :controls="false"
             :precision="2"
@@ -186,7 +191,7 @@
         <div class="el_Super_box">
           <span class="title">统一超区后单价(元/km)</span>
           <el-input-number
-          v-model="form.numc"
+            v-model="form.overZoneKilometerCost"
             :min="0"
             :controls="false"
             :precision="2"
@@ -196,7 +201,7 @@
         <div class="el_Super_box">
           <span class="title">点位补贴单价(元/点)</span>
           <el-input-number
-          v-model="form.numc"
+            v-model="form.siteSubsidyCost"
             :min="0"
             :controls="false"
             :precision="2"
@@ -206,7 +211,7 @@
         <div class="el_Super_box">
           <span class="title">保底费(元)</span>
           <el-input-number
-          v-model="form.numc"
+            v-model="form.minimumFee"
             :min="0"
             :controls="false"
             :precision="2"
@@ -216,7 +221,7 @@
         <div class="el_Super_box">
           <span class="title">油费(元/km)</span>
           <el-input-number
-          v-model="form.numc"
+            v-model="form.fuelCost"
             :min="0"
             :controls="false"
             :precision="2"
@@ -227,11 +232,12 @@
 
       <template #footer>
         <div class="dialog-footer">
-        <el-button @click="form.dialogVisible = false">取消</el-button>
+          <el-button @click="form.dialogPricingrules = false">取消</el-button>
           <el-button type="primary" @click="Pricingrules"> 确定 </el-button>
         </div>
       </template>
     </el-dialog>
+  </div>
   <div class="footer">
     <el-button type="primary" @click="preservation"
       >保存<el-icon><Promotion /></el-icon
@@ -242,11 +248,15 @@
 import { ref } from 'vue';
 import SurchargeTable from '@/components/pric/tablePric.vue';
 import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
+import { ElMessage, ElMessageBox } from 'element-plus';
 import {
   $_expenseDispatchPricepage,
   $_expenseDispatchPricesave,
   $_expenseDispatchPricedetail,
   $_expenseDispatchPriceUnit,
+  $_expenseDispatchPriceupdate,
+  $_expenseDispatchPriceremove,
+  $_expenseDispatchPriceOverZoneremove,
 } from '@/api/storagecost/index.js';
 import { $_ObtainRegion } from '@/api/basicdata/basicdataWarehouse';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
@@ -254,14 +264,22 @@ const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
 const activeName = ref('1');
+const regionList = ref([]); //地区
 const SelectData = ref({}); //当前点击品类
+const editID = ref(''); //编辑需要的ID当前行
+const dialogtitle = ref('新增'); //标题
 // 配置计价规则
 const formLoad = ref({});
 const optionsVehicle = ref([]);
 const form = ref({
-  numa: 0,
-  numb: 0,
-  numc: 0,
+  kilometerCost: 0, //公里数单价
+  subsidyInitKilometer: 0, //补贴起步公里数
+  subsidyCost: 0, //补贴单价
+  overZoneKilometer: 0, //统一超区公里数
+  siteSubsidyCost: 0, //点位补贴单价
+  minimumFee: 0, //保底费
+  fuelCost: 0, //油费
+  overZoneKilometerCost: 0, //统一超区后单价
   dialogPricingrules: false, //配置车型规则
   dialogConfigure: false,
   dispatchSubjoinCategoryData: [],
@@ -275,26 +293,14 @@ const form = ref({
   Categorychargesbyweight: [],
   // 品类按吨计费
   Categorybilledbyton: [],
-  asurcharge: [
-    {
-      index: 1,
-      categoryId: '', //成本结算品类
-      cost: 0, //单价(元/件)
-      a: '', //套单价(元/套)
-      b: '',
-      c: '',
-      options: [],
-      loading: false,
-    },
-  ],
+  asurcharge: [],
   // 超区计费
   Oversizedbilling: [
     {
       index: 1,
-      categoryId: '', //成本结算品类
-      a: '', //省市区
-      b: '', //超区公里数
-      c: '', //超区后单价
+      region: [], //省市区
+      overZoneKilometer: '', //超区公里数
+      overZoneCost: '', //超区后单价
       options: [],
       loading: false,
     },
@@ -306,21 +312,21 @@ const Oversizedbilling = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
   {
     label: '省市区',
-    prop: 'a',
+    prop: 'region',
     type: 'cascader',
     width: 'auto',
     disabled: true,
   },
   {
     label: '超区公里数',
-    prop: 'b',
+    prop: 'overZoneKilometer',
     type: 'number',
     width: 'auto',
     disabled: true,
   },
   {
     label: '超区后单价',
-    prop: 'c',
+    prop: 'overZoneCost',
     type: 'number',
     width: 'auto',
     disabled: true,
@@ -337,6 +343,7 @@ const Categorybyitembilling = ref([
     type: 'select',
     width: 'auto',
     disabled: true,
+    show: true,
   },
   {
     label: '单价(元/件)',
@@ -355,6 +362,7 @@ const Categorybasedbillingbyparty = ref([
     type: 'select',
     width: 'auto',
     disabled: true,
+    show: true,
   },
   {
     label: '单价(元/件)',
@@ -373,6 +381,7 @@ const Categorychargesbyweight = ref([
     type: 'select',
     width: 'auto',
     disabled: true,
+    show: true,
   },
   {
     label: '单价(元/件)',
@@ -391,6 +400,7 @@ const Categorybilledbyton = ref([
     type: 'select',
     width: 'auto',
     disabled: true,
+    show: true,
   },
   {
     label: '单价(元/件)',
@@ -400,6 +410,7 @@ const Categorybilledbyton = ref([
     disabled: true,
   },
 ]);
+
 // 附加费
 const asurcharge = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
@@ -409,31 +420,32 @@ const asurcharge = ref([
     type: 'select',
     width: 'auto',
     disabled: true,
+    show: true,
   },
   {
     label: '上楼费(元/层/件)',
-    prop: 'cost',
+    prop: 'stairsCharge',
     type: 'number',
     width: 'auto',
     disabled: true,
   },
   {
     label: '分货费(元/层/件)',
-    prop: 'a',
+    prop: 'cargoSplittingFee',
     type: 'number',
     width: 'auto',
     disabled: true,
   },
   {
     label: '平移费(元/件)',
-    prop: 'b',
+    prop: 'translationFee',
     type: 'number',
     width: 'auto',
     disabled: true,
   },
   {
-    label: '卸费(元/件)',
-    prop: 'c',
+    label: '装卸费(元/件)',
+    prop: 'loadingUnloadingFee',
     type: 'number',
     width: 'auto',
     disabled: true,
@@ -460,23 +472,36 @@ const search = (value, row) => {
   console.log(value, 'value');
   console.log(row, 'row');
 };
-const handleClick = () => {};
+const handleClick = () => {
+  let time = setTimeout(() => {
+    onLoad();
+    clearTimeout(time);
+  }, 50);
+};
+// 删除数据
 const categoriesduceSurcharge = row => {
-  console.log(row, '要删除的数组下标');
-  console.log(form.value.dispatchSubjoinCategoryData, 'form.value.dispatchSubjoinCategoryData');
-
-  // 删除数组中指定下标的对象
-  form.value.dispatchSubjoinCategoryData.splice(row - 1, 1);
-
-  // 重新排序
-  form.value.dispatchSubjoinCategoryData.forEach((item, index) => {
-    item.index = index + 1;
+  console.log(row, 'row');
+  ElMessageBox.confirm('是否确认删除该数据?', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      let data = {
+        ids: row.id,
+      };
+      $_expenseDispatchPriceremove(data).then(res => {
+        console.log(res, '删除');
+        if (res.data.code == 200) {
+          ElMessage({
+            type: 'success',
+            message: res.data.msg,
           });
-
-  console.log(
-    form.value.dispatchSubjoinCategoryData,
-    'form.value.dispatchSubjoinCategoryData after deletion and reordering'
-  );
+          onLoad();
+        }
+      });
+    })
+    .catch(() => {});
 };
 // 品类分组
 const grouping = data => {
@@ -515,23 +540,25 @@ const Categorystatistics = (data, value, type) => {
       loading: false,
       type: type, //类型1 普通费 2 附加费
     };
+    if (type == 2) {
+      _data.stairsCharge = item.stairsCharge || 0; //上楼费
+      _data.cargoSplittingFee = item.cargoSplittingFee || 0; //分货费
+      _data.translationFee = item.translationFee || 0; //平移费
+      _data.loadingUnloadingFee = item.loadingUnloadingFee || 0; //装卸费
+    }
+    // 编辑才需要ID
+    if (dialogtitle.value == '编辑') {
+      _data.id = item.id;
+    }
     value.push(_data);
   });
 };
-const EditRules = row => {
-  console.log(row, 'row====>');
-  form.value.dialogPricingrules = true; //开启车型配置规则弹窗
+// 获取品类
+const GetCategory = () => {
   let data = {
     type: activeName.value,
-    id: row.id,
+    id: $route.query.id,
   };
-  $_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) {
@@ -539,6 +566,11 @@ const EditRules = row => {
       let groupingData = await grouping(res.data.data.records);
       console.log(groupingData, '分好组的数据');
       //按件
+      form.value.Categorybyitembilling = [];
+      form.value.Categorybasedbillingbyparty = [];
+      form.value.Categorychargesbyweight = [];
+      form.value.Categorybilledbyton = [];
+      form.value.asurcharge = [];
       const categoryMapping = {
         piece: form.value.Categorybyitembilling,
         square: form.value.Categorybasedbillingbyparty,
@@ -551,21 +583,189 @@ const EditRules = row => {
           Categorystatistics(data, category, 1);
         }
       });
+      let flattenedData = Object.values(groupingData).flat(); //展平添加到附加费里面
+      console.log(flattenedData, '附加费');
+      Categorystatistics(flattenedData, form.value.asurcharge, 2);
+    }
+  });
+};
+// 编辑获取车型
+const configurationdetails = row => {
+  let data = {
+    type: activeName.value,
+    id: row.id,
+  };
+  $_expenseDispatchPricedetail(data).then(async res => {
+    console.log(res, '详情');
+    if (res.data.code == 200) {
+      const scope = res.data.data;
+      // 基础数据
+      form.value.carModel = scope.carModel; //车型·
+      if ($route.query.id) {
+        form.value.kilometerCost = scope.kilometerCost; //公里数单价
+        form.value.subsidyInitKilometer = scope.subsidyInitKilometer; //补贴起步公里数(km)
+        form.value.subsidyCost = scope.subsidyCost; //补贴单价(元/km)
+        form.value.overZoneKilometer = scope.overZoneKilometer; // 统一超区公里数
+        form.value.overZoneKilometerCost = scope.overZoneKilometerCost; //统一超区后单价
+        form.value.siteSubsidyCost = scope.siteSubsidyCost; //点位补贴单价
+        form.value.minimumFee = scope.minimumFee; //保底费
+        form.value.fuelCost = scope.fuelCost; //油费
+        console.log(scope, '详情参数');
+        // 超区区域计费
+        form.value.Oversizedbilling = [];
+        if (scope.overZoneList?.length) {
+          scope.overZoneList.forEach((item, index) => {
+            let _data = {
+              index: index + 1,
+              region: ['province', 'city', 'district']
+                .filter(key => item[key])
+                .map(key => String(item[key])),
+              overZoneKilometer: item.overZoneKilometer, //超区公里数
+              overZoneCost: item.overZoneCost, //超区后单价
+              options: [...regionList.value],
+              loading: false,
+              id: item.id,
+            };
+            form.value.Oversizedbilling.push(_data);
+          });
+        }
+        console.log(form.value.Oversizedbilling, 'form.value.Oversizedbilling');
+        // 使用 reduce 方法进行分组
+        let groupingData = await grouping(scope.priceList);
+        console.log(groupingData, '分好组的数据');
+        //按件
+        form.value.Categorybyitembilling = [];
+        form.value.Categorybasedbillingbyparty = [];
+        form.value.Categorychargesbyweight = [];
+        form.value.Categorybilledbyton = [];
+        form.value.asurcharge = [];
+        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);
           }
         });
+        let flattenedData = Object.values(groupingData).flat(); //展平添加到附加费里面
+        console.log(flattenedData, '附加费');
+        Categorystatistics(res.data.data.addPriceList, form.value.asurcharge, 2);
+      }
     }
   });
 };
+// 车型编辑
+const EditRules = row => {
+  dialogtitle.value = '编辑';
+  console.log(row, 'row====>');
+  editID.value = row.id;
+  form.value.dialogPricingrules = true; //开启车型配置规则弹窗
+  configurationdetails(row); //获取车型
+};
+// 新增
 const newlyadded = row => {
+  dialogtitle.value = '新增';
   form.value.dialogPricingrules = true; //开启车型配置规则弹窗
+  GetCategory(); //获取品类
 };
-// 编辑车型规则
+// 提交结果数据
 const Pricingrules = () => {
   console.log(form.value);
+  // 新增提交
+  if (dialogtitle.value == '新增') {
+    submission();
+  } else {
+    // 编辑提交
+
+    Pricingrulesupdate();
+  }
+};
+// 提交品类处理
+const Categoryprocessing = (value, data, type) => {
+  if (value.key?.length) {
+    value.key.forEach(item => {
+      console.log(item, '品类-----》');
+      let _data = {};
+      _data.categoryId = item.categoryId; //品类ID
+      _data.cost = item.cost; //单价
+      _data.type = type; //	类型 1 普通费 2 附加费
+      _data.id = item.id;
+      _data.unit = value.value;
+      if (type == 2) {
+        // 附加费
+        _data.stairsCharge = item.stairsCharge; //上楼费
+        _data.cargoSplittingFee = item.cargoSplittingFee; //分货费
+        _data.translationFee = item.translationFee; //平移费
+        _data.loadingUnloadingFee = item.loadingUnloadingFee; //装卸费
+        delete _data.cost;
+      }
+      data.push(_data);
+    });
+  }
+};
+// 附加费处理
+// 超区计费处理
+const Oversizedbillingprocessing = (value, data) => {
+  form.value.Oversizedbilling.forEach(item => {
+    let _data = {
+      province: item.region[0], //省
+      city: item.region[1], //市
+      district: item.region[2], //区
+      overZoneCost: item.overZoneCost, //超区后单价
+      overZoneKilometer: item.overZoneKilometer, //超区公里数
+      id: item.id,
+    };
+    data.push(_data);
+  });
+};
+// 新增提交
+const submission = async () => {
   let data = {
+    ...form.value,
     type: activeName.value, //商配/市配
-    carModel: form.value.carModel, //车型
+    priceList: [], //品类
+    overZoneList: [], //超区
   };
+  const billingCategories = [
+    {
+      key: form.value.Categorybyitembilling, //品类按件计费
+      value: '1',
+    },
+    {
+      key: form.value.Categorybasedbillingbyparty, //品类按方计费
+      value: '2',
+    },
+    {
+      key: form.value.Categorychargesbyweight, //品类按重量计费
+      value: '3',
+    },
+    {
+      key: form.value.Categorybilledbyton, //品类按吨计费
+      value: '4',
+    },
+  ];
+
+  // 处理品类
+  billingCategories.forEach(category => {
+    Categoryprocessing(category, data['priceList'], 1);
+  });
+
+  //附加费处理
+  Categoryprocessing(
+    {
+      key: form.value.asurcharge,
+      value: '',
+    },
+    data['priceList'],
+    2
+  );
+  // 超区区域计费处理
+  await Oversizedbillingprocessing(form.value.Oversizedbilling, data['overZoneList']);
+  console.log(data, '要提交的数据');
   $_expenseDispatchPricesave(data).then(res => {
     console.log(res, '提交成功');
     if (res.data.code == 200) {
@@ -573,11 +773,94 @@ const Pricingrules = () => {
     }
   });
 };
+//修改提交
+const Pricingrulesupdate = () => {
+  let data = {
+    ...form.value,
+    type: activeName.value, //商配/市配
+    id: editID.value,
+    priceList: [], //品类
+    overZoneList: [], //超区
+  };
+  const billingCategories = [
+    {
+      key: form.value.Categorybyitembilling, //品类按件计费
+      value: '1',
+    },
+    {
+      key: form.value.Categorybasedbillingbyparty, //品类按方计费
+      value: '2',
+    },
+    {
+      key: form.value.Categorychargesbyweight, //品类按重量计费
+      value: '3',
+    },
+    {
+      key: form.value.Categorybilledbyton, //品类按吨计费
+      value: '4',
+    },
+  ];
+
+  // 处理品类
+  billingCategories.forEach(category => {
+    Categoryprocessing(category, data['priceList'], 1);
+  });
+
+  //附加费处理
+  Categoryprocessing(
+    {
+      key: form.value.asurcharge,
+      value: '',
+    },
+    data['priceList'],
+    2
+  );
+  // 超区区域计费处理
+  Oversizedbillingprocessing(form.value.Oversizedbilling, data['overZoneList']);
+  console.log(data, '要提交的数据');
+
+  $_expenseDispatchPriceupdate(data).then(res => {
+    console.log(res, '修改成功');
+  });
+};
+
 // 新增超区区域计费
-const Oversizedbillingadd = () => {};
+const Oversizedbillingadd = () => {
+  let _data = {
+    index: 1,
+    region: [], //省市区
+    overZoneKilometer: '', //超区公里数
+    overZoneCost: '', //超区后单价
+    options: [...regionList.value],
+    loading: false,
+  };
+  form.value.Oversizedbilling.push(_data);
+  form.value.Oversizedbilling.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);
+        if (indexToRemove !== -1) {
+          form.value.Oversizedbilling.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);
+    }
+  }
 };
 
 // 字典公共函数
@@ -599,6 +882,7 @@ const GetRegion = () => {
     console.log(res, '地区。。。');
     console.log(form.value.Oversizedbilling, 'form.value.Oversizedbilling');
     if (res.data.code === 200) {
+      regionList.value = res.data.data;
       form.value.Oversizedbilling.forEach(item => {
         item['options'] = res.data.data;
       });
@@ -609,10 +893,12 @@ const GetRegion = () => {
 const onLoad = () => {
   let data = {
     id: $route.query.id,
+    type: activeName.value,
   };
   $_expenseDispatchPricepage(data).then(res => {
     console.log(res, '车型');
     if (res.data.code == 200) {
+      form.value.dispatchSubjoinCategoryData = [];
       let _data = {};
       if (res.data.data.records?.length) {
         res.data.data.records.forEach((item, index) => {
@@ -766,6 +1052,9 @@ onLoadPage();
   }
 }
 .el_Oversizedbilling {
+  .el_addbtn {
+    margin-bottom: 10px;
+  }
   .title {
     position: relative;
     padding: 0 10px;
@@ -836,4 +1125,12 @@ onLoadPage();
     font-size: 16px;
   }
 }
+.el_tc_dialog {
+  .el-dialog {
+    position: fixed;
+    top: 35%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+}
 </style>

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -294,6 +294,7 @@
               v-model:file-list="DoorstepPhoto"
               :action="doubledCount"
               list-type="picture-card"
+              :before-upload="beforeUpload"
               :on-preview="EnlargeTheTmageA"
               :on-remove="handleRemove"
               :on-success="ImgSuccessA"
@@ -315,6 +316,7 @@
               v-model:file-list="StackingPhoto"
               :action="doubledCount"
               list-type="picture-card"
+              :before-upload="beforeUpload"
               :on-preview="EnlargeTheTmageB"
               :on-remove="handleRemove"
               :on-success="ImgSuccessB"
@@ -337,6 +339,7 @@
               :action="doubledCount"
               list-type="picture-card"
               :on-preview="EnlargeTheTmageC"
+               :before-upload="beforeUpload"
               :on-remove="handleRemove"
               :on-success="ImgSuccessC"
               :headers="headers"
@@ -357,6 +360,7 @@
               v-model:file-list="HomePhotos"
               :action="doubledCount"
               list-type="picture-card"
+               :before-upload="beforeUpload"
               :on-preview="EnlargeTheTmageD"
               :on-remove="handleRemove"
               :on-success="ImgSuccessD"
@@ -379,6 +383,7 @@
               :action="doubledCount"
               list-type="picture-card"
               :on-preview="EnlargeTheTmageE"
+               :before-upload="beforeUpload"
               :on-remove="handleRemove"
               :on-success="ImgSuccessE"
               :headers="headers"
@@ -521,6 +526,7 @@ import {
   $_retentionScan,
 } from '@/api/distribution/distributionSignfor';
 import { update as updatesign } from '@/api/distribution/distributionSignfor';
+import{compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js'
 import option from '@/option/distribution/distributionSignfor';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -1856,6 +1862,9 @@ export default {
     },
     //签收
     submitForm() {
+
+       console.log(this.DoorstepPhoto,'img最新');
+      return
       // this.isDis = true;
       // console.log(this.$refs.signform.validate, 'this.$refs.signform');
       // let row = {};
@@ -1955,6 +1964,11 @@ export default {
     EnlargeTheTmageA(uploadFile) {
       this.dialogImageUrlA = uploadFile.url;
       this.dialogVisibleA = true;
+      
+    },
+   async beforeUpload(file){
+        const compressedBlob = await compressImageBlob(file);
+        return compressedBlob;
     },
     EnlargeTheTmageB(uploadFile) {
       this.dialogImageUrlB = uploadFile.url;