From f6a3fc304178d2b34f33bc3929e92b02828e1757 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 22 Apr 2024 19:51:47 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=B4=A2=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Pricesystem/Price/PriceDelivery.vue | 606 ++++++++++++------
 src/views/Pricesystem/PricesyHome.vue         |  15 +-
 .../Financialse/FinancialDelivery.vue         |   6 +-
 3 files changed, 438 insertions(+), 189 deletions(-)

diff --git a/src/views/Pricesystem/Price/PriceDelivery.vue b/src/views/Pricesystem/Price/PriceDelivery.vue
index 32a0d829..0c1c6d0a 100644
--- a/src/views/Pricesystem/Price/PriceDelivery.vue
+++ b/src/views/Pricesystem/Price/PriceDelivery.vue
@@ -56,7 +56,7 @@
                 v-model="form.ss"
                 :precision="2"
                 :min="0"
-                :max="10"
+                :max="9999999"
                 :controls="false"
                 placeholder="请输入价格"
               />
@@ -79,7 +79,7 @@
                 v-model="form.ss"
                 :precision="2"
                 :min="0"
-                :max="10"
+                :max="9999999"
                 :controls="false"
                 placeholder="请输入价格"
               />
@@ -101,7 +101,7 @@
                 v-model="form.ss"
                 :precision="2"
                 :min="0"
-                :max="10"
+                :max="9999999"
                 :controls="false"
                 placeholder="请输入价格"
               />
@@ -122,10 +122,10 @@
           <div>
             <el-form-item label="按公里计费(元/km)">
               <el-input-number
-                v-model="form.ss"
+                v-model="form.kilometerCost"
                 :precision="2"
                 :min="0"
-                :max="10"
+                :max="9999999"
                 :controls="false"
                 placeholder="请输入价格"
               />
@@ -138,10 +138,10 @@
           <div>
             <el-form-item label="统一计费(元/吨/吨公里)">
               <el-input-number
-                v-model="form.ss"
+                v-model="form.tonKilometerCost"
                 :precision="2"
                 :min="0"
-                :max="10"
+                :max="9999999"
                 :controls="false"
                 placeholder="请输入价格"
               />
@@ -154,10 +154,10 @@
           <div>
             <el-form-item label="按吨位计费(元/t)">
               <el-input-number
-                v-model="form.ss"
+                v-model="form.tonCost"
                 :precision="2"
                 :min="0"
-                :max="10"
+                :max="9999999"
                 :controls="false"
                 placeholder="请输入价格"
               />
@@ -165,7 +165,7 @@
           </div>
         </div>
 
-        <div class="el_flex_h" v-if="form.spot">
+        <!-- <div class="el_flex_h" v-if="form.spot">
           <span class="Subtitle">按点位计费</span>
           <div>
             <el-form-item label="按点位计费点位(元/点位)">
@@ -173,13 +173,13 @@
                 v-model="form.ss"
                 :precision="2"
                 :min="0"
-                :max="10"
+                :max="9999999"
                 :controls="false"
                 placeholder="请输入价格"
               />
             </el-form-item>
           </div>
-        </div>
+        </div> -->
       </div>
       <!-- 整车计费  -->
       <el-form-item
@@ -192,12 +192,16 @@
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
               <div class="eml_btn">
-                <span @click="storageplus" class="el_btn_a">
+                <span v-if="slotProps.scope.row.index == 1" @click="storageplus" class="el_btn_a">
                   <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
                     ><CirclePlus /></el-icon
                   >新增
                 </span>
-                <span @click="storagereduce(slotProps.scope.row.index)" class="el_btn_b">
+                <span
+                  v-if="slotProps.scope.row.index != 1"
+                  @click="storagereduce(slotProps.scope.row.index)"
+                  class="el_btn_b"
+                >
                   <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
                     ><Delete /></el-icon
                   >删除
@@ -212,71 +216,72 @@
         <div class="el_sever_title">
           <span>附加费用</span>
         </div>
-        <span class="Subtitle">统一计费</span>
-        <div class="el_flex">
-          <div class="el_flex_h" v-if="request.dispatchIsOperateFee">
-            <div>
-              <el-form-item label="操作/装卸费(元/件)">
-                <el-input-number
-                  v-model="form.ss"
-                  :precision="2"
-                  :min="0"
-                  :max="10"
-                  :controls="false"
-                  placeholder="请输入价格"
-                />
-              </el-form-item>
+        <div v-if="!request.dispatchIsCategorySubjoin">
+          <span class="Subtitle">统一计费</span>
+          <div class="el_flex">
+            <div class="el_flex_h" v-if="request.dispatchIsOperateFee">
+              <div>
+                <el-form-item label="操作/装卸费(元/件)">
+                  <el-input-number
+                    v-model="form.handlingPrice"
+                    :precision="2"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    placeholder="请输入价格"
+                  />
+                </el-form-item>
+              </div>
             </div>
-          </div>
 
-          <div class="el_flex_h" v-if="request.dispatchIsSortFee">
-            <div>
-              <el-form-item label="分货费(元/件)">
-                <el-input-number
-                  v-model="form.ss"
-                  :precision="2"
-                  :min="0"
-                  :max="10"
-                  :controls="false"
-                  placeholder="请输入价格"
-                />
-              </el-form-item>
+            <div class="el_flex_h" v-if="request.dispatchIsSortFee">
+              <div>
+                <el-form-item label="分货费(元/件)">
+                  <el-input-number
+                    v-model="form.sortPrice"
+                    :precision="2"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    placeholder="请输入价格"
+                  />
+                </el-form-item>
+              </div>
             </div>
-          </div>
 
-          <div class="el_flex_h" v-if="request.dispatchIsShiftingCharge">
-            <div>
-              <el-form-item label="平移费(元/件)">
-                <el-input-number
-                  v-model="form.ss"
-                  :precision="2"
-                  :min="0"
-                  :max="10"
-                  :controls="false"
-                  placeholder="请输入价格"
-                />
-              </el-form-item>
+            <div class="el_flex_h" v-if="request.dispatchIsShiftingCharge">
+              <div>
+                <el-form-item label="平移费(元/件)">
+                  <el-input-number
+                    v-model="form.relocationPrice"
+                    :precision="2"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    placeholder="请输入价格"
+                  />
+                </el-form-item>
+              </div>
             </div>
-          </div>
 
-          <div class="el_flex_h" v-if="request.dispatchIsStairsCarryingCharge">
-            <div>
-              <el-form-item label="上楼费(元/层)">
-                <el-input-number
-                  v-model="form.ss"
-                  :precision="2"
-                  :min="0"
-                  :max="10"
-                  :controls="false"
-                  placeholder="请输入价格"
-                />
-              </el-form-item>
+            <div class="el_flex_h" v-if="request.dispatchIsStairsCarryingCharge">
+              <div>
+                <el-form-item label="上楼费(元/层)">
+                  <el-input-number
+                    v-model="form.upstairsDeliveryPrice"
+                    :precision="2"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    placeholder="请输入价格"
+                  />
+                </el-form-item>
+              </div>
             </div>
           </div>
         </div>
-
         <!-- 品类计费  -->
-        <el-form-item label="品类计费" class="el_flex_row">
+        <el-form-item label="品类计费" class="el_flex_row" v-else>
           <SurchargeTable
             :SurchargeData="form.additionalCategoryData"
             :Surcharge="form.additionalCategory"
@@ -286,10 +291,10 @@
           <div>
             <el-form-item label="上楼费免费楼层">
               <el-input-number
-                v-model="form.ss"
+                v-model="form.dispatchStairsCarryingCharge"
                 :precision="2"
                 :min="0"
-                :max="10"
+                :max="9999999"
                 :controls="false"
                 placeholder="请输入价格"
               />
@@ -299,69 +304,97 @@
       </div>
       <!-- 最低等级计费 -->
       <div>
-        <div class="el_sever_title">
-          <span> 最低计费等级 </span>
-        </div>
-        <div class="el_flex_Minimum">
-          <template v-for="item in form.Minimumbilling" :key="item.label">
-            <el-form-item :label="item.label" v-if="item.disabled" class="el_row">
+        <div v-if="request.dispatchIsMinCost">
+          <div class="el_sever_title">
+            <span> 最低计费等级 </span>
+          </div>
+
+          <!-- 加算价格  -->
+
+          <div class="el_flex_Minimum">
+            <template v-for="item in form.Minimumbilling" :key="item.label">
+              <el-form-item :label="item.label" v-if="item.disabled" class="el_row">
+                <el-input-number
+                  v-model="item.minCost"
+                  :precision="2"
+                  :min="0"
+                  :max="9999999"
+                  :controls="false"
+                  placeholder="请输入价格"
+                />
+              </el-form-item>
+            </template>
+            <el-form-item label="加算价格" v-if="request.dispatchMinCostType == 1" class="el_row">
               <el-input-number
-                v-model="item.input"
+                v-model="form.additionalCost"
                 :precision="2"
                 :min="0"
-                :max="10"
+                :max="9999999"
                 :controls="false"
                 placeholder="请输入价格"
               />
             </el-form-item>
-          </template>
+          </div>
         </div>
         <!-- 遗留件 -->
-        <div class="el_flex_Minimum" v-if="request.dispatchIsLeaveBehind && request.dispatchIsMinCost">
+        <div
+          class="el_flex_Minimum"
+          v-if="request.dispatchIsLeaveBehind && request.dispatchIsMinCost"
+        >
           <template v-for="item in form.Minimumlegacy" :key="item.label">
             <el-form-item :label="item.label" v-if="item.disabled" class="el_row">
               <el-input-number
-                v-model="item.input"
+                v-model="item.leaveBehindMinCost"
                 :precision="2"
                 :min="0"
-                :max="10"
+                :max="9999999"
                 :controls="false"
                 placeholder="请输入价格"
               />
             </el-form-item>
           </template>
+
+          <el-form-item label="遗留加算" v-if="request.dispatchMinCostType == 1" class="el_row">
+            <el-input-number
+              v-model="form.leaveBehindAdditionalCost"
+              :precision="2"
+              :min="0"
+              :max="9999999"
+              :controls="false"
+              placeholder="请输入价格"
+            />
+          </el-form-item>
         </div>
-        <div style="display:flex;" v-if="request.dispatchIsUpwardJudgment"> 
+        <div style="display: flex" v-if="request.dispatchIsUpwardJudgment">
           <div class="el_flex_h">
-          <div>
-            <el-form-item label="向上判断件数">
-              <el-input-number
-                v-model="form.ss"
-                :precision="2"
-                :min="0"
-                :max="10"
-                :controls="false"
-                placeholder="请输入价格"
-              />
-            </el-form-item>
+            <div>
+              <el-form-item label="向上判断件数">
+                <el-input-number
+                  v-model="form.dispatchUpwardJudgment"
+                  :precision="2"
+                  :min="0"
+                  :max="9999999"
+                  :controls="false"
+                  placeholder="请输入价格"
+                />
+              </el-form-item>
+            </div>
           </div>
-        </div>
-        <div class="el_flex_h">
-          <div>
-            <el-form-item label="向上判断加价">
-              <el-input-number
-                v-model="form.ss"
-                :precision="2"
-                :min="0"
-                :max="10"
-                :controls="false"
-                placeholder="请输入价格"
-              />
-            </el-form-item>
+          <div class="el_flex_h">
+            <div>
+              <el-form-item label="向上判断加价">
+                <el-input-number
+                  v-model="form.dispatchUpwardJudgmentCost"
+                  :precision="2"
+                  :min="0"
+                  :max="9999999"
+                  :controls="false"
+                  placeholder="请输入价格"
+                />
+              </el-form-item>
+            </div>
           </div>
         </div>
-        </div>
-
       </div>
     </div>
   </el-form>
@@ -375,6 +408,7 @@
 <script setup>
 import { ref, defineEmits, defineComponent, computed } from 'vue';
 import SurchargeTable from '@/components/pric/tablePric.vue';
+import { ElMessage } from 'element-plus';
 import { putBasicdataPrice } from '@/api/Pricesystem/index';
 import { useRoute } from 'vue-router';
 import { deepClone } from '@/utils/util';
@@ -395,6 +429,18 @@ const request = ref({});
 const Warehousebillingmode = ref([]); //服务类型
 const pricevehicle = ref([]); //车型
 const form = ref({
+  kilometerCost: 0, //按公里计费
+  tonKilometerCost: 0, //按吨公里计费
+  tonCost: 0, //按吨计费
+  handlingPrice: 0, //装卸费
+  relocationPrice: 0, //平移费
+  sortPrice: 0, //分货费
+  upstairsDeliveryPrice: 0, //上楼费
+  dispatchStairsCarryingCharge: 0, //上楼费免费楼层
+  additionalCost: 0, //加算价格
+  leaveBehindAdditionalCost: 0, //遗留加算
+  dispatchUpwardJudgment: 0, //向上判断件数
+  dispatchUpwardJudgmentCost: 0, //向上判断加价
   // 按件计费
   pieceCategory: [
     { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
@@ -575,64 +621,54 @@ const form = ref({
   Minimumbilling: [
     {
       label: '最低计费价格',
-      input: 0,
       disabled: true,
       index: 1,
+      minCost: 0, //价格
     },
     {
       label: '最低计费件数',
-      input: 0,
       disabled: true,
       index: 2,
+      minCost: 0, //价格
     },
     {
       label: '最低计费方数',
-      input: 0,
       disabled: true,
       index: 3,
+      minCost: 0, //价格
     },
     {
       label: '最低计费重量',
-      input: 0,
       disabled: true,
       index: 4,
-    },
-    {
-      label: '加算价格',
-      input: 0,
-      disabled: true,
+      minCost: 0, //价格
     },
   ],
   // 最低级计费遗留
   Minimumlegacy: [
     {
       label: '遗留件低于最低件数收费(元)',
-      input: 0,
       index: 1,
       disabled: true,
+      leaveBehindMinCost: 0, //价格
     },
     {
       label: '遗留件最最低计费件数',
-      input: 0,
       index: 2,
       disabled: true,
+      leaveBehindMinCost: 0, //价格
     },
     {
       label: '遗留件最低计费方数',
-      input: 0,
       index: 3,
       disabled: true,
+      leaveBehindMinCost: 0, //价格
     },
     {
       label: '遗留件最低计费重量',
-      input: 0,
       index: 4,
       disabled: true,
-    },
-    {
-      label: '遗留加算',
-      input: 0,
-      disabled: true,
+      leaveBehindMinCost: 0, //价格
     },
   ],
 });
@@ -681,6 +717,7 @@ function addItemAfterId(array) {
 }
 // 仓储减
 const storagereduce = id => {
+  console.log(id, 'id');
   removeItemById(form.value.fullVehicleData, id); //传入配置项和对应的ID
 };
 
@@ -688,9 +725,6 @@ const storagereduce = id => {
 const storageplus = data => {
   addItemAfterId(form.value.fullVehicleData);
 };
-// const display=computed(()=>{
-
-// })
 
 const billing = async () => {
   // 服务类型转换为数字数组
@@ -797,7 +831,7 @@ const onLoad = async () => {
 
     // 最低计费等级
     console.log(form.value.Minimumbilling, 'Minimumbilling');
-    console.log(request.dispatchMinCostType);
+    console.log(request.value.dispatchMinCostType);
     form.value.Minimumbilling.forEach(res => {
       if (res.index == request.value.dispatchMinCostType) {
         res.disabled = true;
@@ -805,22 +839,136 @@ const onLoad = async () => {
         res.disabled = false;
       }
     });
-    if(request.dispatchMinCostType !=1){
-      form.value.Minimumbilling.find(res=>res.label=='加算价格').disabled=true
-    }
+    // if (request.value.dispatchMinCostType != 1) {
+    //   form.value.Minimumbilling.find(res => res.label == '加算价格').disabled = true;
+    //   console.log('有加算价格');
+    // } else {
+    //   form.value.Minimumbilling.find(res => res.label == '加算价格').disabled = false;
+    //   console.log('加算价格没有');
+    // }
     // 遗留控制
-      form.value.Minimumlegacy.forEach(res => {
+    form.value.Minimumlegacy.forEach(res => {
       if (res.index == request.value.dispatchMinCostType) {
         res.disabled = true;
       } else {
         res.disabled = false;
       }
     });
-    if(request.dispatchMinCostType !=1){
-      form.value.Minimumlegacy.find(res=>res.label=='遗留加算').disabled=true
-    }
+    // if (request.value.dispatchMinCostType != 1) {
+    //   form.value.Minimumlegacy.find(res => res.label == '遗留加算').disabled = true;
+    // } else {
+    //   form.value.Minimumlegacy.find(res => res.label == '遗留加算').disabled = false;
+    // }
+  }
+  if (Object.keys(props.templateData.requestInfo).length > 0) {
+    if (props.templateData.requestInfo.dispatch) {
+      requestInfo.value = await deepClone(props.templateData.requestInfo.dispatch);
+      // 是否区分品类
+      if (request.value.dispatchIsByCategory) {
+        // 按件品类计费
+        if (form.value.dispatchPricingType.includes(1) && form.value.pieceCategoryData.length) {
+          requestInfo.value.pieceCategory.forEach(item => {
+            let data = form.value.pieceCategoryData.find(res => res.categoryId == item.categoryId);
+            if (data) {
+              data.leaveBehindPrice = item.leaveBehindPrice;
+              data.price = item.price;
+            }
+          });
+        }
+
+        if (form.value.dispatchPricingType.includes(2) && form.value.weightCategoryData.length) {
+          // 按重量品类计费
+          requestInfo.value.weightCategory.forEach(item => {
+            let data = form.value.weightCategoryData.find(res => res.categoryId == item.categoryId);
+            if (data) {
+              data.leaveBehindPrice = item.leaveBehindPrice; //	遗留单价
+              data.price = item.price; //单价
+            }
+          });
+        }
+
+        if (form.value.dispatchPricingType.includes(3) && form.value.cubeCategoryData.length) {
+          // 按方品类计费
+
+          requestInfo.value.cubeCategory.forEach(item => {
+            let data = form.value.cubeCategoryData.find(res => res.categoryId == item.categoryId);
+            if (data) {
+              data.leaveBehindPrice = item.leaveBehindPrice; //	遗留单价
+              data.price = item.price; //单价
+            }
+          });
+        }
+
+        // 按公里
+        if (form.value.dispatchPricingType.includes(7)) {
+          form.value.kilometerCost = requestInfo.value.kilometerCost[0].price;
+        }
+        //按吨公里
+        if (form.value.dispatchPricingType.includes(6)) {
+          form.value.tonKilometerCost = requestInfo.value.tonKilometerCost[0].price;
+        }
+        //按吨
+        if (form.value.dispatchPricingType.includes(8)) {
+          form.value.tonCost = requestInfo.value.tonCost[0].price;
+        }
+        //按整车
+        if (form.value.dispatchPricingType.includes(4)) {
+          form.value.fullVehicleData = [];
+          requestInfo.value.fullVehicle.forEach((item, index) => {
+            form.value.fullVehicleData.push({
+              index: index + 1,
+              loading: false,
+              options: pricevehicle.value,
+              plus: true,
+              price: item.price,
+              vehicleType: item.vehicleType,
+            });
+          });
+        }
+
+        //  附加费用
+        // 附加费用
+        if (request.value.dispatchIsCategorySubjoin) {
+          requestInfo.value.additionalCategory.forEach(item => {
+            let data = form.value.additionalCategoryData.find(
+              res => res.categoryId == item.categoryId
+            );
+            if (data) {
+              data.handlingPrice = item.handlingPrice;
+              data.relocationPrice = item.relocationPrice;
+              data.sortPrice = item.sortPrice;
+              data.upstairsDeliveryPrice = item.upstairsDeliveryPrice;
+            }
+          });
+        } else { 
+          const data  = requestInfo.value.additionalCategory[0];
+          console.log(data,'data===>');
+          form.value.handlingPrice=data.handlingPrice
+          form.value.relocationPrice=data.relocationPrice
+          form.value.sortPrice=data.sortPrice
+          form.value.upstairsDeliveryPrice=data.upstairsDeliveryPrice
+        }
+        // 上楼费免费楼层(缺少判断)
+        form.value.dispatchStairsCarryingCharge = requestInfo.value.dispatchStairsCarryingCharge;
 
+        // 最低计费
+        form.value.Minimumbilling.find(res => res.disabled).minCost = requestInfo.value.minCost;
+        // 加算价格
+        form.value.additionalCost = requestInfo.value.additionalCost;
 
+        //  遗留最低计费
+        form.value.Minimumlegacy.find(res => res.disabled).leaveBehindMinCost =
+          requestInfo.value.leaveBehindMinCost;
+        // 遗留加算价格
+        form.value.leaveBehindAdditionalCost = requestInfo.value.leaveBehindAdditionalCost;
+
+        // 是否向上判断
+        if (request.value.dispatchIsUpwardJudgment) {
+        form.value.dispatchUpwardJudgment =  requestInfo.value.dispatchUpwardJudgment; //向上判断件数
+        form.value.dispatchUpwardJudgmentCost =requestInfo.value.dispatchUpwardJudgmentCost; //向上判断加价
+        }
+      }
+    }
   }
 };
 
@@ -831,55 +979,149 @@ const btn = () => {
 const view = val => {
   console.log(val);
 };
-const handleSubmit=()=>{
-  let data={
+const handleSubmit = () => {
+  let data = {
     checkType: '4',
     id: $route.query.id,
-    dispatch:{
-      pieceCategory:[],//  按件品类计费
-      cubeCategory:[],//按方品类计费
-      weightCategory:[],//按重量品类计费
-      tonKilometerCost:[],//按公里计费
+    dispatch: {
+      pieceCategory: [], //  按件品类计费
+      cubeCategory: [], //按方品类计费
+      weightCategory: [], //按重量品类计费
+      tonKilometerCost: [], //按公里计费
+      kilometerCost: [], //按公里品类计费
+      tonKilometerCost: [], //按吨公里计费
+      tonCost: [], //按吨计费
+      fullVehicle: [], //整车计费
+      additionalCategory: [], //附加费品类
+    },
+  };
+  // 是否区分品类
+  if (request.value.dispatchIsByCategory) {
+    console.log('区分品类');
+    // 按件品类计费
+    if (form.value.dispatchPricingType.includes(1) && form.value.pieceCategoryData.length) {
+      console.log(
+        form.value.dispatchPricingType.includes(1),
+        'form.value.dispatchPricingType.includes(1)'
+      );
+      console.log(form.value.pieceCategoryData.length, 'lengs');
+      form.value.pieceCategoryData.forEach(item => {
+        data.dispatch['pieceCategory'].push({
+          categoryId: item.categoryId, //品类id
+          leaveBehindPrice: item.leaveBehindPrice, //	遗留单价
+          price: item.price, //单价
+        });
+      });
+    }
+
+    if (form.value.dispatchPricingType.includes(2) && form.value.weightCategoryData.length) {
+      // 按重量品类计费
+      form.value.weightCategoryData.forEach(item => {
+        data.dispatch['weightCategory'].push({
+          categoryId: item.categoryId, //品类id
+          leaveBehindPrice: item.leaveBehindPrice, //	遗留单价
+          price: item.price, //单价
+        });
+      });
+    }
+
+    if (form.value.dispatchPricingType.includes(3) && form.value.cubeCategoryData.length) {
+      console.log(
+        form.value.dispatchPricingType.includes(3),
+        'form.value.dispatchPricingType.includes(1)'
+      );
+      console.log(form.value.cubeCategoryData.length, 'lengs');
+      // 按方品类计费
+      form.value.cubeCategoryData.forEach(item => {
+        data.dispatch['cubeCategory'].push({
+          categoryId: item.categoryId, //品类id
+          leaveBehindPrice: item.leaveBehindPrice, //	遗留单价
+          price: item.price, //单价
+        });
+      });
     }
   }
-  // 按件品类计费
-  form.value.pieceCategoryData.forEach(item=>{
-    data.dispatch['pieceCategory'].push({
-      categoryId:item.categoryId,//品类id
-      leaveBehindPrice:item.leaveBehindPrice,//	遗留单价
-      price:item.price,//单价
-    })
-  })
-  // 按方品类计费
-  form.value.cubeCategoryData.forEach(item=>{
-    data.dispatch['cubeCategory'].push({
-      categoryId:item.categoryId,//品类id
-      leaveBehindPrice:item.leaveBehindPrice,//	遗留单价
-      price:item.price,//单价
-    })
-  })
 
-  // 按重量品类计费
-  form.value.weightCategoryData.forEach(item=>{
-    data.dispatch['weightCategory'].push({
-      categoryId:item.categoryId,//品类id
-      leaveBehindPrice:item.leaveBehindPrice,//	遗留单价
-      price:item.price,//单价
-    })
-  })
-// 按公里品类计费
-  data.dispatch['weightCategory'].push({
-      categoryId:item.categoryId,//品类id
-      leaveBehindPrice:item.leaveBehindPrice,//	遗留单价
-      price:item.price,//单价
-    })
+  // 按公里品类计费
+  data.dispatch['kilometerCost'].push({
+    price: form.value.kilometerCost, //价格
+  });
+  // 按吨公里计费
+  data.dispatch['tonKilometerCost'].push({
+    price: form.value.tonKilometerCost, //价格
+  });
+  // 按吨计费
+  data.dispatch['tonCost'].push({
+    price: form.value.tonCost, //价格
+  });
 
-  console.log(data,'准备提交的数据');
-  return
-  putBasicdataPrice(data).then(res=>{
-    console.log(res,'处理好的值');
-  })
-}
+  // 整车计费
+  let fullVehicleDataState = form.value.fullVehicleData.every(res => res.vehicleType);
+  if (fullVehicleDataState) {
+    form.value.fullVehicleData.forEach(item => {
+      console.log(item, '整车计费');
+      data.dispatch['fullVehicle'].push({
+        price: item.price, //	整车计费（元/车）
+        vehicleType: item.vehicleType, //车型
+      });
+    });
+  } else {
+    ElMessage({
+      message: '整车计费有未选择车型',
+      type: 'warning',
+    });
+    return;
+  }
+
+  // 附加费用
+  if (request.value.dispatchIsCategorySubjoin) {
+    form.value.additionalCategoryData.forEach(res => {
+      data.dispatch['additionalCategory'].push({
+        categoryId: res.categoryId, //品类id
+        handlingPrice: res.handlingPrice, //装卸费
+        relocationPrice: res.relocationPrice, //平移费
+        sortPrice: res.sortPrice, //分货费
+        upstairsDeliveryPrice: res.upstairsDeliveryPrice, //上楼费
+      });
+    });
+  } else {
+    data.dispatch['additionalCategory'].push({
+      handlingPrice: form.value.handlingPrice, //装卸费
+      relocationPrice: form.value.relocationPrice, //平移费
+      sortPrice: form.value.sortPrice, //分货费
+      upstairsDeliveryPrice: form.value.upstairsDeliveryPrice, //上楼费
+    });
+  }
+
+  // 上楼费免费楼层
+  data.dispatch.dispatchStairsCarryingCharge = form.value.dispatchStairsCarryingCharge;
+  // 最低计费
+  data.dispatch.minCost = form.value.Minimumbilling.find(res => res.disabled).minCost; //最低计费
+  // 加算价格
+  data.dispatch.additionalCost = form.value.additionalCost;
+
+  //  遗留最低计费
+  data.dispatch.leaveBehindMinCost = form.value.Minimumlegacy.find(
+    res => res.disabled
+  ).leaveBehindMinCost;
+  // 遗留加算价格
+  data.dispatch.leaveBehindAdditionalCost = form.value.leaveBehindAdditionalCost;
+  // 是否向上判断
+  if (request.value.dispatchIsUpwardJudgment) {
+    data.dispatch.dispatchUpwardJudgment = form.value.dispatchUpwardJudgment; //向上判断件数
+    data.dispatch.dispatchUpwardJudgmentCost = form.value.dispatchUpwardJudgmentCost; //向上判断加价
+  }
+  console.log(data, '要提交的数据');
+  putBasicdataPrice(data).then(res => {
+    console.log(res, '处理好的值');
+    if (res.data.code == 200) {
+      ElMessage({
+        message: res.data.msg,
+        type: 'success',
+      });
+    }
+  });
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/Pricesystem/PricesyHome.vue b/src/views/Pricesystem/PricesyHome.vue
index 9346a16e..cc7d0c8b 100644
--- a/src/views/Pricesystem/PricesyHome.vue
+++ b/src/views/Pricesystem/PricesyHome.vue
@@ -18,10 +18,10 @@
                 :templateData="templateInfo"
             /></span>
             <span v-if="item.label == '仓储'"
-              ><FinancialWarehousing @request-data="provideData" :templateData="templateInfo"
+              ><FinancialWarehousing ref="financialWarehousing" @request-data="provideData" :templateData="templateInfo"
             /></span>
             <span v-if="item.label == '配送'"
-              ><FinancialDelivery @request-data="provideData" :templateData="templateInfo"
+              ><FinancialDelivery  ref="financialDelivery" @request-data="provideData" :templateData="templateInfo"
             /></span>
             <span v-if="item.label == '安装'">安装</span>
           </el-tab-pane>
@@ -70,6 +70,9 @@ const financialBill = ref();
 
 const financialTrunkLine = ref();
 
+const financialDelivery=ref()
+
+const financialWarehousing=ref()
 // 字典公共函数
 function updateDictionary(targetArray, dictionaryType) {
   getDictionaryBiz(dictionaryType)
@@ -170,8 +173,12 @@ const onLoad = async () => {
       await nextTick();
       setTimeout(() => {
         console.log('financialBill :>> ', financialBill);
-        financialBill.value[0].initDictionaryBiz();
-        financialTrunkLine.value[0].initDictionaryBiz();
+        if( financialBill.value && financialBill.value.length){
+          financialBill.value[0].initDictionaryBiz();
+        }
+        if(financialTrunkLine.value &&  financialTrunkLine.value.length){
+          financialTrunkLine.value[0].initDictionaryBiz();
+        }
       }, 1000);
     });
   } catch (error) {
diff --git a/src/views/financialsector/Financialse/FinancialDelivery.vue b/src/views/financialsector/Financialse/FinancialDelivery.vue
index 63dfabdf..90b94dcc 100644
--- a/src/views/financialsector/Financialse/FinancialDelivery.vue
+++ b/src/views/financialsector/Financialse/FinancialDelivery.vue
@@ -521,11 +521,11 @@ const categoryChange = val => {
 // 是否最低计费展示
 const MinimumChange = val => {
   console.log(val);
-  if (val) {
+  if (val) {  
     form.value.dispatchMinCostMode = 1;
-    form.value.dispatchIsUpwardJudgment = null; //向上判断
+    form.value.dispatchIsUpwardJudgment =0
   } else {
-    form.value.dispatchMinCostMode = null;
+    form.value.dispatchMinCostMode = 0;
     form.value.dispatchIsUpwardJudgment = 0; //向上判断
   }
 };

From e37a5e6d54fed1d1e8adc8f8c6aae435f433cbc7 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 23 Apr 2024 16:43:20 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=B4=A2=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pric/tablePric.vue             |   33 +
 src/views/Pricesystem/Price/PriceDelivery.vue | 1134 ++++++++++-------
 .../Pricesystem/Price/PriceWarehousing.vue    |  444 ++++---
 .../distribution/reservation/reservation.vue  |    4 +-
 .../stockup/distributionStockupMarket.vue     |    4 +-
 .../Financialse/FinancialWarehousing.vue      |  351 +++--
 6 files changed, 1097 insertions(+), 873 deletions(-)

diff --git a/src/components/pric/tablePric.vue b/src/components/pric/tablePric.vue
index f4fb0ecf..82df7b3b 100644
--- a/src/components/pric/tablePric.vue
+++ b/src/components/pric/tablePric.vue
@@ -15,6 +15,7 @@
             :min="0"
             :max="999999"
             :controls="false"
+            :value-on-clear="0"
             placeholder="请输入价格"
           />
 
@@ -31,6 +32,7 @@
             :loading=scope.row.loading
             loading-text='正在查询中...'
             @focus="categoriesSearchfocus(column, scope.row)"
+            :disabled=column.show
           >
             <el-option
               v-for="item in scope.row.options"
@@ -79,3 +81,34 @@ const props = defineProps({
   },
 });
 </script>
+
+<style scoped lang='scss'>
+:deep(.el_row_table) {
+  thead {
+    th {
+      background-color: #0d6f3c;
+      color: #172e60;
+    }
+  }
+  tbody {
+    .el-table tr:hover {
+      background-color: transparent;
+    }
+
+    .cell {
+      text-align: center;
+      padding: 0;
+      .el-input-number {
+        width: 100%;
+        .el-input__wrapper {
+          box-shadow: none;
+        }
+
+        .el-input__inner:hover {
+          box-shadow: 0px 1px 0vw 0px #172e60;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/Pricesystem/Price/PriceDelivery.vue b/src/views/Pricesystem/Price/PriceDelivery.vue
index 0c1c6d0a..e344d3ec 100644
--- a/src/views/Pricesystem/Price/PriceDelivery.vue
+++ b/src/views/Pricesystem/Price/PriceDelivery.vue
@@ -1,171 +1,175 @@
 <template>
-  <el-form label-position="top" label-width="400" :model="form" class="el_form">
-    <div class="content">
-      <div class="el_row_1">
-        <div class="el_flex_row">
-          <el-form-item label="配送服务类型">
-            <el-select
-              class="el_Cselect"
-              style="width: 100%"
-              v-model="form.dispatchServiceType"
-              filterable
-              placeholder="选择计费类型"
-              disabled
-              @change="chargetype"
-            >
-              <el-option
-                v-for="item in Warehousebillingmode"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="计费模式">
-            <el-select
-              v-model="form.dispatchPricingType"
-              filterable
-              placeholder="请选择配送计费模式"
-              :popper-append-to-body="false"
-              style="width: 100%"
-              disabled
-              multiple
-            >
-              <el-option
-                v-for="item in ServiceList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+  <div v-loading="loading" element-loading-text="正在加载中...">
+    <el-form label-position="top" label-width="400" :model="form" class="el_form">
+      <div class="content">
+        <div class="el_row_1">
+          <div class="el_flex_row">
+            <el-form-item label="配送服务类型">
+              <el-select
+                class="el_Cselect"
+                style="width: 100%"
+                v-model="form.dispatchServiceType"
+                filterable
+                placeholder="选择计费类型"
+                disabled
+                @change="chargetype"
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
+                <el-option
+                  v-for="item in Warehousebillingmode"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="计费模式">
+              <el-select
+                v-model="form.dispatchPricingType"
+                filterable
+                placeholder="请选择配送计费模式"
+                :popper-append-to-body="false"
+                style="width: 100%"
+                disabled
+                multiple
+              >
+                <el-option
+                  v-for="item in ServiceList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+        </div>
+        <!-- 服务类型  -->
+        <div class="el_sever_title">
+          <span>市配</span>
         </div>
-      </div>
-      <!-- 服务类型  -->
-      <div class="el_sever_title">
-        <span>市配</span>
-      </div>
 
-      <div class="el_flex">
-        <div class="el_flex_row el_flex_right el_flex_input" v-if="form.piece">
-          <span class="Subtitle">按件计费 </span>
-          <div class="el_flex_row_1" v-if="form.dispatchIsByCategory">
-            <el-form-item label="统一计费(元/件)">
-              <el-input-number
-                v-model="form.ss"
-                :precision="2"
-                :min="0"
-                :max="9999999"
-                :controls="false"
-                placeholder="请输入价格"
+        <div class="el_flex">
+          <div class="el_flex_row el_flex_right el_flex_input" v-if="form.piece">
+            <span class="Subtitle">按件计费 </span>
+            <div class="el_flex_row_1" v-if="!request.dispatchIsByCategory">
+              <el-form-item label="统一计费(元/件)">
+                <el-input-number
+                  v-model="form.pieceCategoryInput"
+                  :precision="2"
+                  :min="0"
+                  :max="9999999"
+                  :controls="false"
+                  placeholder="请输入价格"
+                />
+              </el-form-item>
+            </div>
+
+            <el-form-item label="品类计费" v-else>
+              <SurchargeTable
+                :SurchargeData="form.pieceCategoryData"
+                :Surcharge="form.pieceCategory"
               />
             </el-form-item>
           </div>
+          <!-- 按方计费  -->
+          <div class="el_flex_row el_flex_input" v-if="form.square">
+            <span class="Subtitle">按方计费</span>
+            <div class="el_flex_row_1" v-if="!request.dispatchIsByCategory">
+              <el-form-item label="统一计费(元/m³)">
+                <el-input-number
+                  v-model="form.cubeCategoryInput"
+                  :precision="2"
+                  :min="0"
+                  :max="9999999"
+                  :controls="false"
+                  placeholder="请输入价格"
+                />
+              </el-form-item>
+            </div>
 
-          <el-form-item label="品类计费" v-else>
-            <SurchargeTable
-              :SurchargeData="form.pieceCategoryData"
-              :Surcharge="form.pieceCategory"
-            />
-          </el-form-item>
-        </div>
-        <!-- 按方计费  -->
-        <div class="el_flex_row el_flex_input" v-if="form.square">
-          <span class="Subtitle">按方计费</span>
-          <div class="el_flex_row_1" v-if="form.dispatchIsByCategory">
-            <el-form-item label="统一计费(元/m³)">
-              <el-input-number
-                v-model="form.ss"
-                :precision="2"
-                :min="0"
-                :max="9999999"
-                :controls="false"
-                placeholder="请输入价格"
+            <el-form-item label="品类计费" v-else>
+              <SurchargeTable
+                :SurchargeData="form.cubeCategoryData"
+                :Surcharge="form.cubeCategory"
               />
             </el-form-item>
           </div>
 
-          <el-form-item label="品类计费" v-else>
-            <SurchargeTable :SurchargeData="form.cubeCategoryData" :Surcharge="form.cubeCategory" />
-          </el-form-item>
-        </div>
-
-        <!-- 按重量计费  -->
-        <div class="el_flex_row el_flex_right" v-if="form.heavy">
-          <span class="Subtitle">按重量计费</span>
-          <div v-if="form.dispatchIsByCategory">
-            <el-form-item label="统一计费(元/KG)" style="margin-right: 0">
-              <el-input-number
-                style="width: 48%"
-                v-model="form.ss"
-                :precision="2"
-                :min="0"
-                :max="9999999"
-                :controls="false"
-                placeholder="请输入价格"
+          <!-- 按重量计费  -->
+          <div class="el_flex_row el_flex_right" v-if="form.heavy">
+            <span class="Subtitle">按重量计费</span>
+            <div v-if="!request.dispatchIsByCategory">
+              <el-form-item label="统一计费(元/KG)" style="margin-right: 0">
+                <el-input-number
+                  style="width: 48%"
+                  v-model="form.weightCategoryInput"
+                  :precision="2"
+                  :min="0"
+                  :max="9999999"
+                  :controls="false"
+                  placeholder="请输入价格"
+                />
+              </el-form-item>
+            </div>
+            <el-form-item label="品类计费" v-else>
+              <SurchargeTable
+                :SurchargeData="form.weightCategoryData"
+                :Surcharge="form.weightCategory"
               />
             </el-form-item>
           </div>
-          <el-form-item label="品类计费" v-else>
-            <SurchargeTable
-              :SurchargeData="form.weightCategoryData"
-              :Surcharge="form.weightCategory"
-            />
-          </el-form-item>
         </div>
-      </div>
 
-      <div class="el_flex">
-        <div class="el_flex_h" v-if="form.tonkilometer">
-          <span class="Subtitle">按公里计费</span>
-          <div>
-            <el-form-item label="按公里计费(元/km)">
-              <el-input-number
-                v-model="form.kilometerCost"
-                :precision="2"
-                :min="0"
-                :max="9999999"
-                :controls="false"
-                placeholder="请输入价格"
-              />
-            </el-form-item>
+        <div class="el_flex">
+          <div class="el_flex_h" v-if="form.tonkilometer">
+            <span class="Subtitle">按公里计费</span>
+            <div>
+              <el-form-item label="按公里计费(元/km)">
+                <el-input-number
+                  v-model="form.kilometerCost"
+                  :precision="2"
+                  :min="0"
+                  :max="9999999"
+                  :controls="false"
+                  placeholder="请输入价格"
+                />
+              </el-form-item>
+            </div>
           </div>
-        </div>
 
-        <div class="el_flex_h" v-if="form.ton">
-          <span class="Subtitle">按吨公里计费</span>
-          <div>
-            <el-form-item label="统一计费(元/吨/吨公里)">
-              <el-input-number
-                v-model="form.tonKilometerCost"
-                :precision="2"
-                :min="0"
-                :max="9999999"
-                :controls="false"
-                placeholder="请输入价格"
-              />
-            </el-form-item>
+          <div class="el_flex_h" v-if="form.ton">
+            <span class="Subtitle">按吨公里计费</span>
+            <div>
+              <el-form-item label="统一计费(元/吨/吨公里)">
+                <el-input-number
+                  v-model="form.tonKilometerCost"
+                  :precision="2"
+                  :min="0"
+                  :max="9999999"
+                  :controls="false"
+                  placeholder="请输入价格"
+                />
+              </el-form-item>
+            </div>
           </div>
-        </div>
 
-        <div class="el_flex_h" v-if="form.kilometre">
-          <span class="Subtitle">按吨计费</span>
-          <div>
-            <el-form-item label="按吨位计费(元/t)">
-              <el-input-number
-                v-model="form.tonCost"
-                :precision="2"
-                :min="0"
-                :max="9999999"
-                :controls="false"
-                placeholder="请输入价格"
-              />
-            </el-form-item>
+          <div class="el_flex_h" v-if="form.kilometre">
+            <span class="Subtitle">按吨计费</span>
+            <div>
+              <el-form-item label="按吨位计费(元/t)">
+                <el-input-number
+                  v-model="form.tonCost"
+                  :precision="2"
+                  :min="0"
+                  :max="9999999"
+                  :controls="false"
+                  placeholder="请输入价格"
+                />
+              </el-form-item>
+            </div>
           </div>
-        </div>
 
-        <!-- <div class="el_flex_h" v-if="form.spot">
+          <!-- <div class="el_flex_h" v-if="form.spot">
           <span class="Subtitle">按点位计费</span>
           <div>
             <el-form-item label="按点位计费点位(元/点位)">
@@ -180,142 +184,121 @@
             </el-form-item>
           </div>
         </div> -->
-      </div>
-      <!-- 整车计费  -->
-      <el-form-item
-        label="整车计费"
-        class="Subtitle Wholevehicle"
-        style="width: 48%"
-        v-if="form.Wholevehicle"
-      >
-        <SurchargeTable :SurchargeData="form.fullVehicleData" :Surcharge="form.fullVehicle">
-          <template #default="slotProps">
-            <template v-if="slotProps.scope.column.label === '操作'">
-              <div class="eml_btn">
-                <span v-if="slotProps.scope.row.index == 1" @click="storageplus" class="el_btn_a">
-                  <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
-                    ><CirclePlus /></el-icon
-                  >新增
-                </span>
-                <span
-                  v-if="slotProps.scope.row.index != 1"
-                  @click="storagereduce(slotProps.scope.row.index)"
-                  class="el_btn_b"
-                >
-                  <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
-                    ><Delete /></el-icon
-                  >删除
-                </span>
-              </div>
-            </template>
-          </template>
-        </SurchargeTable>
-      </el-form-item>
-      <!-- 附加费用  -->
-      <div class="el_flex_Surcharge">
-        <div class="el_sever_title">
-          <span>附加费用</span>
         </div>
-        <div v-if="!request.dispatchIsCategorySubjoin">
-          <span class="Subtitle">统一计费</span>
-          <div class="el_flex">
-            <div class="el_flex_h" v-if="request.dispatchIsOperateFee">
-              <div>
-                <el-form-item label="操作/装卸费(元/件)">
-                  <el-input-number
-                    v-model="form.handlingPrice"
-                    :precision="2"
-                    :min="0"
-                    :max="9999999"
-                    :controls="false"
-                    placeholder="请输入价格"
-                  />
-                </el-form-item>
+        <!-- 整车计费  -->
+        <el-form-item
+          label="整车计费"
+          class="Subtitle Wholevehicle"
+          style="width: 48%"
+          v-if="form.Wholevehicle"
+        >
+          <SurchargeTable :SurchargeData="form.fullVehicleData" :Surcharge="form.fullVehicle">
+            <template #default="slotProps">
+              <template v-if="slotProps.scope.column.label === '操作'">
+                <div class="eml_btn">
+                  <span v-if="slotProps.scope.row.index == 1" @click="storageplus" class="el_btn_a">
+                    <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
+                      ><CirclePlus /></el-icon
+                    >新增
+                  </span>
+                  <span
+                    v-if="slotProps.scope.row.index != 1"
+                    @click="storagereduce(slotProps.scope.row.index)"
+                    class="el_btn_b"
+                  >
+                    <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
+                      ><Delete /></el-icon
+                    >删除
+                  </span>
+                </div>
+              </template>
+            </template>
+          </SurchargeTable>
+        </el-form-item>
+        <!-- 附加费用  -->
+        <div class="el_flex_Surcharge">
+          <div class="el_sever_title">
+            <span>附加费用</span>
+          </div>
+          <div v-if="!request.dispatchIsCategorySubjoin">
+            <span class="Subtitle">统一计费</span>
+            <div class="el_flex">
+              <div class="el_flex_h" v-if="request.dispatchIsOperateFee">
+                <div>
+                  <el-form-item label="操作/装卸费(元/件)">
+                    <el-input-number
+                      v-model="form.handlingPrice"
+                      :precision="2"
+                      :min="0"
+                      :max="9999999"
+                      :controls="false"
+                      placeholder="请输入价格"
+                    />
+                  </el-form-item>
+                </div>
               </div>
-            </div>
 
-            <div class="el_flex_h" v-if="request.dispatchIsSortFee">
-              <div>
-                <el-form-item label="分货费(元/件)">
-                  <el-input-number
-                    v-model="form.sortPrice"
-                    :precision="2"
-                    :min="0"
-                    :max="9999999"
-                    :controls="false"
-                    placeholder="请输入价格"
-                  />
-                </el-form-item>
+              <div class="el_flex_h" v-if="request.dispatchIsSortFee">
+                <div>
+                  <el-form-item label="分货费(元/件)">
+                    <el-input-number
+                      v-model="form.sortPrice"
+                      :precision="2"
+                      :min="0"
+                      :max="9999999"
+                      :controls="false"
+                      placeholder="请输入价格"
+                    />
+                  </el-form-item>
+                </div>
               </div>
-            </div>
 
-            <div class="el_flex_h" v-if="request.dispatchIsShiftingCharge">
-              <div>
-                <el-form-item label="平移费(元/件)">
-                  <el-input-number
-                    v-model="form.relocationPrice"
-                    :precision="2"
-                    :min="0"
-                    :max="9999999"
-                    :controls="false"
-                    placeholder="请输入价格"
-                  />
-                </el-form-item>
+              <div class="el_flex_h" v-if="request.dispatchIsShiftingCharge">
+                <div>
+                  <el-form-item label="平移费(元/件)">
+                    <el-input-number
+                      v-model="form.relocationPrice"
+                      :precision="2"
+                      :min="0"
+                      :max="9999999"
+                      :controls="false"
+                      placeholder="请输入价格"
+                    />
+                  </el-form-item>
+                </div>
               </div>
-            </div>
 
-            <div class="el_flex_h" v-if="request.dispatchIsStairsCarryingCharge">
-              <div>
-                <el-form-item label="上楼费(元/层)">
-                  <el-input-number
-                    v-model="form.upstairsDeliveryPrice"
-                    :precision="2"
-                    :min="0"
-                    :max="9999999"
-                    :controls="false"
-                    placeholder="请输入价格"
-                  />
-                </el-form-item>
+              <div class="el_flex_h" v-if="request.dispatchIsStairsCarryingCharge">
+                <div>
+                  <el-form-item label="上楼费(元/层)">
+                    <el-input-number
+                      v-model="form.upstairsDeliveryPrice"
+                      :precision="2"
+                      :min="0"
+                      :max="9999999"
+                      :controls="false"
+                      placeholder="请输入价格"
+                    />
+                  </el-form-item>
+                </div>
               </div>
             </div>
           </div>
-        </div>
-        <!-- 品类计费  -->
-        <el-form-item label="品类计费" class="el_flex_row" v-else>
-          <SurchargeTable
-            :SurchargeData="form.additionalCategoryData"
-            :Surcharge="form.additionalCategory"
-          />
-        </el-form-item>
-        <div class="el_flex_h" v-if="request.dispatchIsFeeFloor">
-          <div>
-            <el-form-item label="上楼费免费楼层">
-              <el-input-number
-                v-model="form.dispatchStairsCarryingCharge"
-                :precision="2"
-                :min="0"
-                :max="9999999"
-                :controls="false"
-                placeholder="请输入价格"
-              />
-            </el-form-item>
-          </div>
-        </div>
-      </div>
-      <!-- 最低等级计费 -->
-      <div>
-        <div v-if="request.dispatchIsMinCost">
-          <div class="el_sever_title">
-            <span> 最低计费等级 </span>
-          </div>
-
-          <!-- 加算价格  -->
-
-          <div class="el_flex_Minimum">
-            <template v-for="item in form.Minimumbilling" :key="item.label">
-              <el-form-item :label="item.label" v-if="item.disabled" class="el_row">
+          <!-- 品类计费  -->
+          <el-form-item label="品类计费" class="el_flex_row" v-else>
+            <SurchargeTable
+              :SurchargeData="form.additionalCategoryData"
+              :Surcharge="form.additionalCategory"
+            />
+          </el-form-item>
+          <div
+            class="el_flex_h"
+            v-if="request.dispatchIsStairsCarryingCharge && request.dispatchIsFeeFloor"
+          >
+            <div>
+              <el-form-item label="上楼费免费楼层">
                 <el-input-number
-                  v-model="item.minCost"
+                  v-model="form.dispatchStairsCarryingCharge"
                   :precision="2"
                   :min="0"
                   :max="9999999"
@@ -323,54 +306,34 @@
                   placeholder="请输入价格"
                 />
               </el-form-item>
-            </template>
-            <el-form-item label="加算价格" v-if="request.dispatchMinCostType == 1" class="el_row">
-              <el-input-number
-                v-model="form.additionalCost"
-                :precision="2"
-                :min="0"
-                :max="9999999"
-                :controls="false"
-                placeholder="请输入价格"
-              />
-            </el-form-item>
+            </div>
           </div>
         </div>
-        <!-- 遗留件 -->
-        <div
-          class="el_flex_Minimum"
-          v-if="request.dispatchIsLeaveBehind && request.dispatchIsMinCost"
-        >
-          <template v-for="item in form.Minimumlegacy" :key="item.label">
-            <el-form-item :label="item.label" v-if="item.disabled" class="el_row">
-              <el-input-number
-                v-model="item.leaveBehindMinCost"
-                :precision="2"
-                :min="0"
-                :max="9999999"
-                :controls="false"
-                placeholder="请输入价格"
-              />
-            </el-form-item>
-          </template>
+        <!-- 最低等级计费 -->
+        <div>
+          <div v-if="request.dispatchIsMinCost">
+            <div class="el_sever_title">
+              <span> 最低计费等级 </span>
+            </div>
 
-          <el-form-item label="遗留加算" v-if="request.dispatchMinCostType == 1" class="el_row">
-            <el-input-number
-              v-model="form.leaveBehindAdditionalCost"
-              :precision="2"
-              :min="0"
-              :max="9999999"
-              :controls="false"
-              placeholder="请输入价格"
-            />
-          </el-form-item>
-        </div>
-        <div style="display: flex" v-if="request.dispatchIsUpwardJudgment">
-          <div class="el_flex_h">
-            <div>
-              <el-form-item label="向上判断件数">
+            <!-- 加算价格  -->
+
+            <div class="el_flex_Minimum">
+              <template v-for="item in form.Minimumbilling" :key="item.label">
+                <el-form-item :label="item.label" v-if="item.disabled" class="el_row">
+                  <el-input-number
+                    v-model="item.minCost"
+                    :precision="2"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    placeholder="请输入价格"
+                  />
+                </el-form-item>
+              </template>
+              <el-form-item label="加算价格" v-if="request.dispatchMinCostType == 1" class="el_row">
                 <el-input-number
-                  v-model="form.dispatchUpwardJudgment"
+                  v-model="form.additionalCost"
                   :precision="2"
                   :min="0"
                   :max="9999999"
@@ -380,11 +343,15 @@
               </el-form-item>
             </div>
           </div>
-          <div class="el_flex_h">
-            <div>
-              <el-form-item label="向上判断加价">
+          <!-- 遗留件 -->
+          <div
+            class="el_flex_Minimum"
+            v-if="request.dispatchIsLeaveBehind && request.dispatchIsMinCost"
+          >
+            <template v-for="item in form.Minimumlegacy" :key="item.label">
+              <el-form-item :label="item.label" v-if="item.disabled" class="el_row">
                 <el-input-number
-                  v-model="form.dispatchUpwardJudgmentCost"
+                  v-model="item.leaveBehindMinCost"
                   :precision="2"
                   :min="0"
                   :max="9999999"
@@ -392,27 +359,68 @@
                   placeholder="请输入价格"
                 />
               </el-form-item>
+            </template>
+
+            <el-form-item label="遗留加算" v-if="request.dispatchMinCostType == 1" class="el_row">
+              <el-input-number
+                v-model="form.leaveBehindAdditionalCost"
+                :precision="2"
+                :min="0"
+                :max="9999999"
+                :controls="false"
+                placeholder="请输入价格"
+              />
+            </el-form-item>
+          </div>
+          <div style="display: flex" v-if="request.dispatchIsUpwardJudgment">
+            <div class="el_flex_h">
+              <div>
+                <el-form-item label="向上判断件数">
+                  <el-input-number
+                    v-model="form.dispatchUpwardJudgment"
+                    :precision="2"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    placeholder="请输入价格"
+                  />
+                </el-form-item>
+              </div>
+            </div>
+            <div class="el_flex_h">
+              <div>
+                <el-form-item label="向上判断加价">
+                  <el-input-number
+                    v-model="form.dispatchUpwardJudgmentCost"
+                    :precision="2"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    placeholder="请输入价格"
+                  />
+                </el-form-item>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </el-form>
+    <!-- 操作按钮 -->
+    <div class="flex-c-c">
+      <el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
+      <el-button type="primary" icon="Position" @click="handleSubmit">保存</el-button>
     </div>
-  </el-form>
-  <!-- 操作按钮 -->
-  <div class="flex-c-c">
-    <el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
-    <el-button type="primary" icon="Position" @click="handleSubmit">保存</el-button>
   </div>
 </template>
 
 <script setup>
 import { ref, defineEmits, defineComponent, computed } from 'vue';
 import SurchargeTable from '@/components/pric/tablePric.vue';
-import { ElMessage } from 'element-plus';
 import { putBasicdataPrice } from '@/api/Pricesystem/index';
 import { useRoute } from 'vue-router';
 import { deepClone } from '@/utils/util';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { ElMessage, ElMessageBox } from 'element-plus';
 const $route = useRoute(); //获取地址栏参数
 const emit = defineEmits(['request-data']);
 defineComponent({
@@ -428,6 +436,8 @@ const requestInfo = ref({}); //价格回显
 const request = ref({});
 const Warehousebillingmode = ref([]); //服务类型
 const pricevehicle = ref([]); //车型
+const loading = ref(true);
+const formCopy = ref({}); //重置对象
 const form = ref({
   kilometerCost: 0, //按公里计费
   tonKilometerCost: 0, //按吨公里计费
@@ -441,10 +451,20 @@ const form = ref({
   leaveBehindAdditionalCost: 0, //遗留加算
   dispatchUpwardJudgment: 0, //向上判断件数
   dispatchUpwardJudgmentCost: 0, //向上判断加价
+  pieceCategoryInput: 0, //按件统一计费
+  weightCategoryInput: 0, //按重量
+  cubeCategoryInput: 0, //按方
   // 按件计费
   pieceCategory: [
     { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
-    { label: '产品品类', prop: 'categoryId', type: 'select', width: 'auto', disabled: true },
+    {
+      label: '产品品类',
+      prop: 'categoryId',
+      type: 'select',
+      width: 'auto',
+      disabled: true,
+      show: true,
+    },
     {
       label: '单价(元/件)',
       prop: 'price',
@@ -466,7 +486,14 @@ const form = ref({
   // 按方品类计费
   cubeCategory: [
     { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
-    { label: '产品品类', prop: 'categoryId', type: 'select', width: 'auto', disabled: true },
+    {
+      label: '产品品类',
+      prop: 'categoryId',
+      type: 'select',
+      width: 'auto',
+      disabled: true,
+      show: true,
+    },
     { label: '单价(元/m³)', prop: 'price', type: 'number', width: 'auto', disabled: true },
     {
       label: '遗留单价(元/m³)',
@@ -481,7 +508,14 @@ const form = ref({
   // 按重量品类计费
   weightCategory: [
     { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
-    { label: '产品品类', prop: 'categoryId', type: 'select', width: 'auto', disabled: true },
+    {
+      label: '产品品类',
+      prop: 'categoryId',
+      type: 'select',
+      width: 'auto',
+      disabled: true,
+      show: true,
+    },
     { label: '单价(元/kg)', prop: 'price', type: 'number', width: 'auto', disabled: true },
     {
       label: '遗留单价(元/kg)',
@@ -563,7 +597,7 @@ const form = ref({
       width: 'auto',
       disabled: true,
     },
-    { label: '操作', prop: '', type: '', width: '130', disabled: true },
+    { label: '操作', prop: '', type: '', width: 'auto', disabled: true },
   ],
 
   // 附加费品类
@@ -575,6 +609,7 @@ const form = ref({
       type: 'select',
       width: 'auto',
       disabled: true,
+      show: true,
     },
     {
       label: '操作/装卸费(元/件)',
@@ -691,7 +726,24 @@ function updateDictionary(targetArray, dictionaryType) {
     .catch(() => {})
     .finally(() => {});
 }
-
+// 重置表单
+const resetFormData = () => {
+  ElMessageBox.confirm('是否重置数据?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    loading.value = true;
+    form.value = deepClone(formCopy.value);
+    setTimeout(() => {
+      loading.value = false;
+      ElMessage({
+        message: '重置成功',
+        type: 'success',
+      });
+    }, 300);
+  });
+};
 // 移除对象
 function removeItemById(array, id) {
   const index = array.findIndex(item => item.index === id);
@@ -702,7 +754,7 @@ function removeItemById(array, id) {
     });
   }
 }
-function addItemAfterId(array) {
+async function addItemAfterId(array) {
   console.log(array);
   const newItem = {
     index: array.length + 1, // 新对象的 ID 为当前数组长度加 1
@@ -713,7 +765,7 @@ function addItemAfterId(array) {
     price: 0, //价格
     options: pricevehicle.value, //选择框列表
   };
-  array.push(newItem);
+ await array.push(newItem);
 }
 // 仓储减
 const storagereduce = id => {
@@ -770,46 +822,54 @@ const onLoad = async () => {
       ? request.value.dispatchPricingType.split(',').map(Number)
       : []; //服务类型
     billing(); //显示条件
-    addItemAfterId(form.value.fullVehicleData); //整车计费(缺少判断)
-    // 缺少判断
-    // 按件品类计费
-    if (form.value.dispatchPricingType.includes(1)) {
-      request.value.dispatchPieceCategorys.forEach((item, index) => {
-        form.value.pieceCategoryData.push({
-          index: index + 1,
-          categoryId: item.id, //品类
-          price: 0, //价格
-          leaveBehindPrice: 0, //遗留单价
-          options: [{ label: item.name, value: item.id }],
-        });
-      });
+    if (form.value.dispatchPricingType.includes(4)) {
+      addItemAfterId(form.value.fullVehicleData);
     }
-    //  按方计费
-    if (form.value.dispatchPricingType.includes(3)) {
-      request.value.dispatchCubeCategorys.forEach((item, index) => {
-        form.value.cubeCategoryData.push({
-          index: index + 1,
-          categoryId: item.id, //品类
-          price: 0, //价格
-          leaveBehindPrice: 0, //遗留单价
-          options: [{ label: item.name, value: item.id }],
+
+    // 按件品类计费
+    if (request.value.dispatchIsByCategory) {
+      if (form.value.dispatchPricingType.includes(1)) {
+        if (request.value.dispatchPieceCategorys && request.value.dispatchPieceCategorys.length) {
+          request.value.dispatchPieceCategorys.forEach((item, index) => {
+            form.value.pieceCategoryData.push({
+              index: index + 1,
+              categoryId: item.id, //品类
+              price: 0, //价格
+              leaveBehindPrice: 0, //遗留单价
+              options: [{ label: item.name, value: item.id }],
+            });
+          });
+        }
+      }
+      //  按方计费
+      if (form.value.dispatchPricingType.includes(3)) {
+        request.value.dispatchCubeCategorys.forEach((item, index) => {
+          form.value.cubeCategoryData.push({
+            index: index + 1,
+            categoryId: item.id, //品类
+            price: 0, //价格
+            leaveBehindPrice: 0, //遗留单价
+            options: [{ label: item.name, value: item.id }],
+          });
         });
-      });
-    }
-    //  按重量
-    if (form.value.dispatchPricingType.includes(3)) {
-      request.value.dispatchWeightCategorys.forEach((item, index) => {
-        form.value.weightCategoryData.push({
-          index: index + 1,
-          categoryId: item.id, //品类
-          price: 0, //价格
-          leaveBehindPrice: 0, //遗留单价
-          options: [{ label: item.name, value: item.id }],
+      }
+      //  按重量
+      if (form.value.dispatchPricingType.includes(3)) {
+        request.value.dispatchWeightCategorys.forEach((item, index) => {
+          form.value.weightCategoryData.push({
+            index: index + 1,
+            categoryId: item.id, //品类
+            price: 0, //价格
+            leaveBehindPrice: 0, //遗留单价
+            options: [{ label: item.name, value: item.id }],
+          });
         });
-      });
+      }
+    } else {
     }
+
     console.log(request.value, ' request.value');
-    //  附加费品类(缺少if)
+    //  附加费品类
     if (request.value.dispatchSubjoinCategorys && request.value.dispatchSubjoinCategorys.length) {
       request.value.dispatchSubjoinCategorys.forEach((item, index) => {
         form.value.additionalCategoryData.push({
@@ -854,6 +914,58 @@ const onLoad = async () => {
         res.disabled = false;
       }
     });
+
+    // 附加费用
+    // 是否有操作/装卸费
+    if (!request.value.dispatchIsOperateFee) {
+      form.value.additionalCategory.find(res => res.prop === 'handlingPrice').disabled = false;
+    } else {
+      form.value.additionalCategory.find(res => res.prop === 'handlingPrice').disabled = true;
+    }
+    // 是否有上楼费
+    if (!request.value.dispatchIsStairsCarryingCharge) {
+      form.value.additionalCategory.find(
+        res => res.prop === 'upstairsDeliveryPrice'
+      ).disabled = false;
+    } else {
+      form.value.additionalCategory.find(
+        res => res.prop === 'upstairsDeliveryPrice'
+      ).disabled = true;
+    }
+    // 是否有分货费
+
+    if (!request.value.dispatchIsSortFee) {
+      form.value.additionalCategory.find(res => res.prop === 'sortPrice').disabled = false;
+    } else {
+      form.value.additionalCategory.find(res => res.prop === 'sortPrice').disabled = true;
+    }
+    // 是否有平移费
+    if (!request.value.dispatchIsShiftingCharge) {
+      form.value.additionalCategory.find(res => res.prop === 'relocationPrice').disabled = false;
+    } else {
+      form.value.additionalCategory.find(res => res.prop === 'relocationPrice').disabled = true;
+    }
+
+    // (品类计费按件)是否有遗留
+    if (!request.value.dispatchIsLeaveBehind) {
+      form.value.pieceCategory.find(res => res.prop === 'leaveBehindPrice').disabled = false;
+    } else {
+      form.value.pieceCategory.find(res => res.prop === 'leaveBehindPrice').disabled = true;
+    }
+
+    // (品类计费按方)是否有遗留
+    if (!request.value.dispatchIsLeaveBehind) {
+      form.value.cubeCategory.find(res => res.prop === 'leaveBehindPrice').disabled = false;
+    } else {
+      form.value.cubeCategory.find(res => res.prop === 'leaveBehindPrice').disabled = true;
+    }
+    // (品类计费重量)是否有遗留
+    if (!request.value.dispatchIsLeaveBehind) {
+      form.value.weightCategory.find(res => res.prop === 'leaveBehindPrice').disabled = false;
+    } else {
+      form.value.weightCategory.find(res => res.prop === 'leaveBehindPrice').disabled = true;
+    }
+
     // if (request.value.dispatchMinCostType != 1) {
     //   form.value.Minimumlegacy.find(res => res.label == '遗留加算').disabled = true;
     // } else {
@@ -870,8 +982,8 @@ const onLoad = async () => {
           requestInfo.value.pieceCategory.forEach(item => {
             let data = form.value.pieceCategoryData.find(res => res.categoryId == item.categoryId);
             if (data) {
-              data.leaveBehindPrice = item.leaveBehindPrice;
-              data.price = item.price;
+              data.leaveBehindPrice = item.leaveBehindPrice || 0;
+              data.price = item.price || 0;
             }
           });
         }
@@ -881,8 +993,8 @@ const onLoad = async () => {
           requestInfo.value.weightCategory.forEach(item => {
             let data = form.value.weightCategoryData.find(res => res.categoryId == item.categoryId);
             if (data) {
-              data.leaveBehindPrice = item.leaveBehindPrice; //	遗留单价
-              data.price = item.price; //单价
+              data.leaveBehindPrice = item.leaveBehindPrice || 0; //	遗留单价
+              data.price = item.price || 0; //单价
             }
           });
         }
@@ -893,93 +1005,117 @@ const onLoad = async () => {
           requestInfo.value.cubeCategory.forEach(item => {
             let data = form.value.cubeCategoryData.find(res => res.categoryId == item.categoryId);
             if (data) {
-              data.leaveBehindPrice = item.leaveBehindPrice; //	遗留单价
-              data.price = item.price; //单价
+              data.leaveBehindPrice = item.leaveBehindPrice || 0; //	遗留单价
+              data.price = item.price || 0; //单价
             }
           });
         }
-
-        // 按公里
-        if (form.value.dispatchPricingType.includes(7)) {
-          form.value.kilometerCost = requestInfo.value.kilometerCost[0].price;
-        }
-        //按吨公里
-        if (form.value.dispatchPricingType.includes(6)) {
-          form.value.tonKilometerCost = requestInfo.value.tonKilometerCost[0].price;
-        }
-        //按吨
-        if (form.value.dispatchPricingType.includes(8)) {
-          form.value.tonCost = requestInfo.value.tonCost[0].price;
+      } else {
+        // 按件品类计费
+        if (form.value.dispatchPricingType.includes(1)) {
+          let data = requestInfo.value.pieceCategory[0] || [];
+          form.value.pieceCategoryInput = data.price || 0;
         }
-        //按整车
-        if (form.value.dispatchPricingType.includes(4)) {
-          form.value.fullVehicleData = [];
-          requestInfo.value.fullVehicle.forEach((item, index) => {
-            form.value.fullVehicleData.push({
-              index: index + 1,
-              loading: false,
-              options: pricevehicle.value,
-              plus: true,
-              price: item.price,
-              vehicleType: item.vehicleType,
-            });
-          });
+
+        if (form.value.dispatchPricingType.includes(2)) {
+          // 按重量品类计费
+          let data = requestInfo.value.weightCategory[0] || [];
+          form.value.weightCategoryInput = data.price || 0;
         }
 
-        //  附加费用
-        // 附加费用
-        if (request.value.dispatchIsCategorySubjoin) {
-          requestInfo.value.additionalCategory.forEach(item => {
-            let data = form.value.additionalCategoryData.find(
-              res => res.categoryId == item.categoryId
-            );
-            if (data) {
-              data.handlingPrice = item.handlingPrice;
-              data.relocationPrice = item.relocationPrice;
-              data.sortPrice = item.sortPrice;
-              data.upstairsDeliveryPrice = item.upstairsDeliveryPrice;
-            }
-          });
-        } else { 
-          const data  = requestInfo.value.additionalCategory[0];
-          console.log(data,'data===>');
-          form.value.handlingPrice=data.handlingPrice
-          form.value.relocationPrice=data.relocationPrice
-          form.value.sortPrice=data.sortPrice
-          form.value.upstairsDeliveryPrice=data.upstairsDeliveryPrice
+        if (form.value.dispatchPricingType.includes(3)) {
+          // 按方品类计费
+          let data = requestInfo.value.cubeCategory[0] || [];
+          form.value.cubeCategoryInput = data.price || 0;
         }
-        // 上楼费免费楼层(缺少判断)
-        form.value.dispatchStairsCarryingCharge = requestInfo.value.dispatchStairsCarryingCharge;
+      }
+      // 按公里
+      if (form.value.dispatchPricingType.includes(7)) {
+        form.value.kilometerCost = requestInfo.value.kilometerCost[0].price || 0;
+      }
+      //按吨公里
+      if (form.value.dispatchPricingType.includes(6)) {
+        form.value.tonKilometerCost = requestInfo.value.tonKilometerCost[0].price || 0;
+      }
+      //按吨
+      if (form.value.dispatchPricingType.includes(8)) {
+        form.value.tonCost = requestInfo.value.tonCost[0].price || 0;
+      }
+      //按整车
+      if (form.value.dispatchPricingType.includes(4)) {
+        form.value.fullVehicleData = [];
+        requestInfo.value.fullVehicle.forEach((item, index) => {
+          form.value.fullVehicleData.push({
+            index: index + 1,
+            loading: false,
+            options: pricevehicle.value,
+            plus: true,
+            price: item.price || 0,
+            vehicleType: item.vehicleType,
+          });
+        });
+      }
 
-        // 最低计费
-        form.value.Minimumbilling.find(res => res.disabled).minCost = requestInfo.value.minCost;
-        // 加算价格
-        form.value.additionalCost = requestInfo.value.additionalCost;
+      //  附加费用
+      if (request.value.dispatchIsCategorySubjoin) {
+        requestInfo.value.additionalCategory.forEach(item => {
+          let data = form.value.additionalCategoryData.find(
+            res => res.categoryId == item.categoryId
+          );
+          if (data) {
+            data.handlingPrice = item.handlingPrice || 0;
+            data.relocationPrice = item.relocationPrice || 0;
+            data.sortPrice = item.sortPrice || 0;
+            data.upstairsDeliveryPrice = item.upstairsDeliveryPrice || 0;
+          }
+        });
+      } else {
+        const data = requestInfo.value.additionalCategory[0];
+        console.log(data, 'data===>');
+        form.value.handlingPrice = data.handlingPrice || 0;
+        form.value.relocationPrice = data.relocationPrice || 0;
+        form.value.sortPrice = data.sortPrice || 0;
+        form.value.upstairsDeliveryPrice = data.upstairsDeliveryPrice || 0;
+      }
+      // 上楼费免费楼层(缺少判断)
+      form.value.dispatchStairsCarryingCharge = requestInfo.value.dispatchStairsCarryingCharge;
+      // 最低计费
+      if (request.value.dispatchIsMinCost) {
+        form.value.Minimumbilling.find(res => res.disabled).minCost =
+          requestInfo.value.minCost || 0;
 
         //  遗留最低计费
         form.value.Minimumlegacy.find(res => res.disabled).leaveBehindMinCost =
-          requestInfo.value.leaveBehindMinCost;
-        // 遗留加算价格
-        form.value.leaveBehindAdditionalCost = requestInfo.value.leaveBehindAdditionalCost;
+          requestInfo.value.leaveBehindMinCost || 0;
 
-        // 是否向上判断
-        if (request.value.dispatchIsUpwardJudgment) {
-        form.value.dispatchUpwardJudgment =  requestInfo.value.dispatchUpwardJudgment; //向上判断件数
-        form.value.dispatchUpwardJudgmentCost =requestInfo.value.dispatchUpwardJudgmentCost; //向上判断加价
+        // 加算价格
+        if (request.value.dispatchMinCostType == 1) {
+          // 最低加算价格
+          form.value.additionalCost = requestInfo.value.additionalCost || 0;
+          // 遗留加算价格
+          form.value.leaveBehindAdditionalCost = requestInfo.value.leaveBehindAdditionalCost || 0;
         }
       }
+      // 是否向上判断
+      if (request.value.dispatchIsUpwardJudgment) {
+        form.value.dispatchUpwardJudgment = requestInfo.value.dispatchUpwardJudgment || 0; //向上判断件数
+        form.value.dispatchUpwardJudgmentCost = requestInfo.value.dispatchUpwardJudgmentCost || 0; //向上判断加价
+      }
     }
   }
+
+let setTime = setTimeout(()=>{
+  formCopy.value = deepClone(form.value);
+    loading.value = false;
+    clearTimeout(setTime);
+ },500)
+
 };
 
 onLoad();
-const btn = () => {
-  console.log(form.value);
-};
-const view = val => {
-  console.log(val);
-};
+// 提交信息
 const handleSubmit = () => {
+  loading.value = true;
   let data = {
     checkType: '4',
     id: $route.query.id,
@@ -1000,11 +1136,6 @@ const handleSubmit = () => {
     console.log('区分品类');
     // 按件品类计费
     if (form.value.dispatchPricingType.includes(1) && form.value.pieceCategoryData.length) {
-      console.log(
-        form.value.dispatchPricingType.includes(1),
-        'form.value.dispatchPricingType.includes(1)'
-      );
-      console.log(form.value.pieceCategoryData.length, 'lengs');
       form.value.pieceCategoryData.forEach(item => {
         data.dispatch['pieceCategory'].push({
           categoryId: item.categoryId, //品类id
@@ -1026,11 +1157,6 @@ const handleSubmit = () => {
     }
 
     if (form.value.dispatchPricingType.includes(3) && form.value.cubeCategoryData.length) {
-      console.log(
-        form.value.dispatchPricingType.includes(3),
-        'form.value.dispatchPricingType.includes(1)'
-      );
-      console.log(form.value.cubeCategoryData.length, 'lengs');
       // 按方品类计费
       form.value.cubeCategoryData.forEach(item => {
         data.dispatch['cubeCategory'].push({
@@ -1040,28 +1166,50 @@ const handleSubmit = () => {
         });
       });
     }
+  } else {
+    // 按件统一计费
+    if (form.value.dispatchPricingType.includes(1)) {
+      data.dispatch['pieceCategory'].push({
+        price: form.value.pieceCategoryInput, //单价
+      });
+    }
+    // 按重量品类计费
+    if (form.value.dispatchPricingType.includes(2)) {
+      data.dispatch['weightCategory'].push({
+        price: form.value.weightCategoryInput, //单价
+      });
+    }
+    // 按方品类计费
+    if (form.value.dispatchPricingType.includes(3)) {
+      data.dispatch['cubeCategory'].push({
+        price: form.value.cubeCategoryInput, //单价
+      });
+    }
   }
-
   // 按公里品类计费
-  data.dispatch['kilometerCost'].push({
-    price: form.value.kilometerCost, //价格
-  });
+  if (form.value.dispatchPricingType.includes(7)) {
+    data.dispatch['kilometerCost'].push({
+      price: form.value.kilometerCost || 0, //价格
+    });
+  }
   // 按吨公里计费
-  data.dispatch['tonKilometerCost'].push({
-    price: form.value.tonKilometerCost, //价格
-  });
+  if (form.value.dispatchPricingType.includes(6)) {
+    data.dispatch['tonKilometerCost'].push({
+      price: form.value.tonKilometerCost || 0, //价格
+    });
+  }
   // 按吨计费
-  data.dispatch['tonCost'].push({
-    price: form.value.tonCost, //价格
-  });
-
+  if (form.value.dispatchPricingType.includes(8)) {
+    data.dispatch['tonCost'].push({
+      price: form.value.tonCost || 0, //价格
+    });
+  }
   // 整车计费
   let fullVehicleDataState = form.value.fullVehicleData.every(res => res.vehicleType);
-  if (fullVehicleDataState) {
+  if (fullVehicleDataState && form.value.fullVehicleData.length) {
     form.value.fullVehicleData.forEach(item => {
-      console.log(item, '整车计费');
       data.dispatch['fullVehicle'].push({
-        price: item.price, //	整车计费（元/车）
+        price: item.price || 0, //	整车计费（元/车）
         vehicleType: item.vehicleType, //车型
       });
     });
@@ -1074,40 +1222,49 @@ const handleSubmit = () => {
   }
 
   // 附加费用
-  if (request.value.dispatchIsCategorySubjoin) {
+  if (request.value.dispatchIsCategorySubjoin && form.value.additionalCategoryData.length) {
     form.value.additionalCategoryData.forEach(res => {
       data.dispatch['additionalCategory'].push({
         categoryId: res.categoryId, //品类id
-        handlingPrice: res.handlingPrice, //装卸费
-        relocationPrice: res.relocationPrice, //平移费
-        sortPrice: res.sortPrice, //分货费
-        upstairsDeliveryPrice: res.upstairsDeliveryPrice, //上楼费
+        handlingPrice: res.handlingPrice || 0, //装卸费
+        relocationPrice: res.relocationPrice || 0, //平移费
+        sortPrice: res.sortPrice || 0, //分货费
+        upstairsDeliveryPrice: res.upstairsDeliveryPrice || 0, //上楼费
       });
     });
   } else {
     data.dispatch['additionalCategory'].push({
-      handlingPrice: form.value.handlingPrice, //装卸费
-      relocationPrice: form.value.relocationPrice, //平移费
-      sortPrice: form.value.sortPrice, //分货费
-      upstairsDeliveryPrice: form.value.upstairsDeliveryPrice, //上楼费
+      handlingPrice: form.value.handlingPrice || 0, //装卸费
+      relocationPrice: form.value.relocationPrice || 0, //平移费
+      sortPrice: form.value.sortPrice || 0, //分货费
+      upstairsDeliveryPrice: form.value.upstairsDeliveryPrice || 0, //上楼费
     });
   }
-
   // 上楼费免费楼层
-  data.dispatch.dispatchStairsCarryingCharge = form.value.dispatchStairsCarryingCharge;
+  if (request.value.dispatchIsStairsCarryingCharge && request.value.dispatchIsFeeFloor) {
+    data.dispatch.dispatchStairsCarryingCharge = form.value.dispatchStairsCarryingCharge || 0;
+  }
   // 最低计费
-  data.dispatch.minCost = form.value.Minimumbilling.find(res => res.disabled).minCost; //最低计费
-  // 加算价格
-  data.dispatch.additionalCost = form.value.additionalCost;
+  if (request.value.dispatchIsMinCost) {
+    data.dispatch.minCost = form.value.Minimumbilling.find(res => res.disabled).minCost || 0;
+    // 加算价格
+    if (request.value.dispatchMinCostType == 1) {
+      data.dispatch.additionalCost = form.value.additionalCost || 0;
+    }
+  }
 
   //  遗留最低计费
-  data.dispatch.leaveBehindMinCost = form.value.Minimumlegacy.find(
-    res => res.disabled
-  ).leaveBehindMinCost;
-  // 遗留加算价格
-  data.dispatch.leaveBehindAdditionalCost = form.value.leaveBehindAdditionalCost;
+  if (request.value.dispatchIsLeaveBehind && request.value.dispatchIsMinCost) {
+    data.dispatch.leaveBehindMinCost =
+      form.value.Minimumlegacy.find(res => res.disabled).leaveBehindMinCost || 0;
+    // 遗留加算价格
+    if (request.value.dispatchMinCostType == 1) {
+      data.dispatch.leaveBehindAdditionalCost = form.value.leaveBehindAdditionalCost || 0;
+    }
+  }
+
   // 是否向上判断
-  if (request.value.dispatchIsUpwardJudgment) {
+  if (!request.value.dispatchIsMinCost && request.value.dispatchIsUpwardJudgment) {
     data.dispatch.dispatchUpwardJudgment = form.value.dispatchUpwardJudgment; //向上判断件数
     data.dispatch.dispatchUpwardJudgmentCost = form.value.dispatchUpwardJudgmentCost; //向上判断加价
   }
@@ -1120,6 +1277,17 @@ const handleSubmit = () => {
         type: 'success',
       });
     }
+  }).catch(res=>{
+    console.log(res,'错误信息');
+  }).finally(()=>{
+    loading.value = false;
+  })
+};
+
+// 返回
+const handleBack = () => {
+  router.push({
+    path: '/pricesystem/price',
   });
 };
 </script>
@@ -1262,4 +1430,8 @@ const handleSubmit = () => {
     font-size: 18px;
   }
 }
+.el_btn_a,
+.el_btn_b {
+  cursor: pointer;
+}
 </style>
diff --git a/src/views/Pricesystem/Price/PriceWarehousing.vue b/src/views/Pricesystem/Price/PriceWarehousing.vue
index 7b0f6356..6fe0d841 100644
--- a/src/views/Pricesystem/Price/PriceWarehousing.vue
+++ b/src/views/Pricesystem/Price/PriceWarehousing.vue
@@ -1,179 +1,141 @@
 <template>
-  <el-form label-position="top" label-width="400" :model="form" class="el_form">
-    <div class="content">
-      <div class="el_row_1">
-        <div class="el_flex_row">
-          <el-form-item label="计算类型">
-            <el-select
-              class="el_Cselect"
-              v-model="form.warehousePricingType"
-              filterable
-              clearable
-              disabled
-              placeholder="选择计费类型"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in Storagebillingtype"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="计算模式">
-            <el-select
-              class="el_Cselect"
-              v-model="form.warehousePricingMode"
-              filterable
-              clearable
-              disabled
-              placeholder="选择仓储计费模式"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in Warehousebillingmode"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </div>
-        <div class="el_flex_row">
-          <el-form-item label="计算基准">
-            <el-radio-group
-              v-model="form.warehouseCalculationBasis"
-              class="el_Cselect"
-              style="width: 100%; background-color: #f5f7fa; padding: 0 4px"
-              disabled
-            >
-              <el-radio v-for="item in CalculationBasis" :key="item.label" :label="item.value">{{
-                item.label
-              }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </div>
-      </div>
-
-      <div class="el_row_2" v-if="Surchargecd">
-        <div class="el_sever_title">
-          <span> 附加费用</span>
-        </div>
-        <div v-if="!request.warehouseIsCategorySubjoin">
-         
-          <span class="Subtitle">统一计费单价</span>
-          <div class="el_row_2_1">
-            <div class="el_flex_row">
-              <el-form-item
-                label="仓储操作/装卸费"
-                class="el_lable_title"
-                v-if="request.warehouseIsOperateFee"
+  <div v-loading="loading" element-loading-text="正在加载中...">
+    <el-form label-position="top" label-width="400" :model="form" class="el_form">
+      <div class="content">
+        <div class="el_row_1">
+          <div class="el_flex_row">
+            <el-form-item label="计算类型">
+              <el-select
+                class="el_Cselect"
+                v-model="form.warehousePricingType"
+                filterable
+                clearable
+                disabled
+                placeholder="选择计费类型"
+                style="width: 100%"
               >
-                <el-input-number
-                  v-model="form.operatePrice"
-                  :precision="2"
-                  :min="0"
-                  :max="10"
-                  :controls="false"
-                  placeholder="请输入价格"
+                <el-option
+                  v-for="item in Storagebillingtype"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 />
-              </el-form-item>
-              <el-form-item
-                label="仓储管理费"
-                style="margin-top: 10px"
-                v-if="request.warehouseIsManageFee"
+              </el-select>
+            </el-form-item>
+            <el-form-item label="计算模式">
+              <el-select
+                class="el_Cselect"
+                v-model="form.warehousePricingMode"
+                filterable
+                clearable
+                disabled
+                placeholder="选择仓储计费模式"
+                style="width: 100%"
               >
-                <el-input-number
-                  v-model="form.warehouseManagementPrice"
-                  :precision="2"
-                  :min="0"
-                  :max="10"
-                  :controls="false"
-                  placeholder="请输入价格"
-                />
-              </el-form-item>
-            </div>
-            <div class="el_flex_row" style="margin-top: 10px" v-if="request.warehouseIsSortFee">
-              <el-form-item label="仓储分货费">
-                <el-input-number
-                  v-model="form.warehouseSortPrice"
-                  :precision="2"
-                  :min="0"
-                  :max="10"
-                  :controls="false"
-                  placeholder="请输入价格"
+                <el-option
+                  v-for="item in Warehousebillingmode"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 />
-              </el-form-item>
-            </div>
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="el_flex_row">
+            <el-form-item label="计算基准">
+              <el-radio-group
+                v-model="form.warehouseCalculationBasis"
+                class="el_Cselect"
+                style="width: 100%; background-color: #f5f7fa; padding: 0 4px"
+                disabled
+              >
+                <el-radio v-for="item in CalculationBasis" :key="item.label" :label="item.value">{{
+                  item.label
+                }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </div>
         </div>
-      </div>
 
-      <!-- 品类计费单价 -->
-      <div class="el_row" style="width: 50%" v-if="request.warehouseIsCategorySubjoin">
-        <el-form-item label="品类计费单价">
-          <SurchargeTable :SurchargeData="form.SurchargeData" :Surcharge="form.Surcharge" />
-        </el-form-item>
-      </div>
-      <!-- 下半部分布局 -->
-      <div class="el_flex">
-        <!-- 按件计费 -->
-        <!-- <div class="el_row" v-if="request.warehouseSubjoinFeeUnit == 1">
-          <span class="Subtitle">按件计费</span>
-          <el-form-item label="统一计费单价" class="el_lable_title">
-            <SurchargeTable :SurchargeData="form.piecebillingData" :Surcharge="form.piecebilling" />
-          </el-form-item>
-          <el-form-item label="按件计费品类单价">
-            <SurchargeTable
-              :SurchargeData="form.piecebillingData"
-              :Surcharge="form.piecebillingPL"
-            />
-          </el-form-item>
-        </div> -->
-
-        <!-- <div class="el_row" v-if="request.warehouseSubjoinFeeUnit == 2">
-          <span class="Subtitle">按方计费</span>
-          <el-form-item label="统一计费单价" class="el_lable_title">
-            <SurchargeTable :SurchargeData="form.piecebillingData" :Surcharge="form.piecebilling" />
-          </el-form-item>
-          <el-form-item label="按件计费品类单价">
-            <SurchargeTable
-              :SurchargeData="form.piecebillingData"
-              :Surcharge="form.piecebillingPL"
-            />
-          </el-form-item>
-        </div> -->
+        <!-- 下半部分布局 -->
+        <div class="el_flex">
+          <div class="el_row">
+            <span class="Subtitle">{{ tabform.title }}</span>
+            <el-form-item :label="tabform.table">
+              <SurchargeTable :SurchargeData="form.publicData" :Surcharge="form.publicTable" />
+            </el-form-item>
+          </div>
+        </div>
 
-        <!-- <div class="el_row" v-if="request.warehouseSubjoinFeeUnit == 3">
-          <span class="Subtitle">按重量计费(kg)</span>
-          <el-form-item label="统一计费单价" class="el_lable_title">
-            <SurchargeTable
-              :SurchargeData="form.BillingbyweightPLData"
-              :Surcharge="form.Billingbyweight"
-            />
-          </el-form-item>
+        <div class="el_row_2" v-if="Surchargecd">
+          <div class="el_sever_title">
+            <span> 附加费用</span>
+          </div>
+          <div v-if="!request.warehouseIsCategorySubjoin">
+            <span class="Subtitle">统一计费单价</span>
+            <div class="el_row_2_1">
+              <div class="el_flex_row">
+                <el-form-item
+                  label="仓储操作/装卸费"
+                  class="el_lable_title"
+                  v-if="request.warehouseIsOperateFee"
+                >
+                  <el-input-number
+                    v-model="form.operatePrice"
+                    :precision="2"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    :value-on-clear="0"
+                    placeholder="请输入价格"
+                  />
+                </el-form-item>
+                <el-form-item
+                  label="仓储管理费"
+                  style="margin-top: 10px"
+                  v-if="request.warehouseIsManageFee"
+                >
+                  <el-input-number
+                    v-model="form.warehouseManagementPrice"
+                    :precision="2"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    :value-on-clear="0"
+                    placeholder="请输入价格"
+                  />
+                </el-form-item>
+              </div>
+              <div class="el_flex_row" style="margin-top: 10px" v-if="request.warehouseIsSortFee">
+                <el-form-item label="仓储分货费">
+                  <el-input-number
+                    v-model="form.warehouseSortPrice"
+                    :precision="2"
+                    :min="0"
+                    :max="9999999"
+                    :controls="false"
+                    :value-on-clear="0"
+                    placeholder="请输入价格"
+                  />
+                </el-form-item>
+              </div>
+            </div>
+          </div>
+        </div>
 
-          <el-form-item label="按重量(KG)计费品类单价">
-            <SurchargeTable
-              :SurchargeData="form.piecebillingData"
-              :Surcharge="form.BillingbyweightPL"
-            />
-          </el-form-item>
-        </div> -->
-        <div class="el_row">
-          <span class="Subtitle">{{ tabform.title }}</span>
-          <el-form-item :label="tabform.table" class="el_lable_title">
-            <SurchargeTable :SurchargeData="form.publicData" :Surcharge="form.publicTable" />
+        <!-- 品类计费单价 -->
+        <div class="el_row" style="width: 50%" v-if="request.warehouseIsCategorySubjoin">
+          <el-form-item label="品类计费单价">
+            <SurchargeTable :SurchargeData="form.SurchargeData" :Surcharge="form.Surcharge" />
           </el-form-item>
         </div>
       </div>
+    </el-form>
+    <!-- 操作按钮 -->
+    <div class="flex-c-c">
+      <el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
+      <el-button type="primary" icon="Position" @click="handleSubmit">保存</el-button>
     </div>
-  </el-form>
-  <!-- 操作按钮 -->
-  <div class="flex-c-c">
-    <el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
-    <el-button type="primary" icon="Position" @click="handleSubmit">保存</el-button>
   </div>
 </template>
 
@@ -182,7 +144,7 @@ import { ref, defineEmits, defineComponent, computed } from 'vue';
 import SurchargeTable from '@/components/pric/tablePric.vue';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { deepClone } from '@/utils/util';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
 import { putBasicdataPrice } from '@/api/Pricesystem/index';
 import { useRoute } from 'vue-router';
 const $route = useRoute(); //获取地址栏参数
@@ -224,7 +186,8 @@ function updateDictionary(targetArray, dictionaryType) {
     .catch(() => {})
     .finally(() => {});
 }
-
+const loading = ref(true);
+const formCopy = ref({}); //拷贝数据
 const form = ref({
   operatePrice: 0, //操作/装卸费
   warehouseManagementPrice: 0, //仓储管理费
@@ -232,26 +195,33 @@ const form = ref({
   // 附加费
   Surcharge: [
     { label: '序号', prop: 'index', type: 'string', width: '80', disabled: true },
-    { label: '产品品类', prop: 'categoryId', type: 'select', width: '150', disabled: true },
+    {
+      label: '产品品类',
+      prop: 'categoryId',
+      type: 'select',
+      width: '150',
+      disabled: true,
+      show: true,
+    },
     {
       label: '仓储操作/装卸费',
       prop: 'operatePrice',
       type: 'number',
-      width: '180',
+      width: 'auto',
       disabled: true,
     },
     {
       label: '仓储管理费',
       prop: 'warehouseManagementPrice',
       type: 'number',
-      width: '180',
+      width: 'auto',
       disabled: true,
     },
     {
       label: '仓储分货费',
       prop: 'warehouseSortPrice',
       type: 'number',
-      width: '180',
+      width: 'auto',
       disabled: true,
     },
   ],
@@ -259,33 +229,40 @@ const form = ref({
   // 按吨计费
   publicTable: [
     { label: '序号', prop: 'index', type: 'string', width: '80', disabled: true },
-    { label: '产品品类', prop: 'categoryId', type: 'select', width: '150', disabled: true },
+    {
+      label: '产品品类',
+      prop: 'categoryId',
+      type: 'select',
+      width: '150',
+      disabled: true,
+      show: true,
+    },
     {
       label: '30天内',
       prop: 'withinThirtyPrice',
       type: 'number',
-      width: '180',
+      width: 'auto',
       disabled: true,
     },
     {
       label: '30天-60天',
       prop: 'betweenThirtySixtyPrice',
       type: 'number',
-      width: '180',
+      width: 'auto',
       disabled: true,
     },
     {
       label: '60天外',
       prop: 'beyondSixtyPrice',
       type: 'number',
-      width: '180',
+      width: 'auto',
       disabled: true,
     },
     {
       label: '上限',
       prop: 'maximumPrice',
       type: 'number',
-      width: '180',
+      width: 'auto',
       disabled: true,
     },
   ],
@@ -293,14 +270,14 @@ const form = ref({
   publicData: [],
 });
 const onLoad = async () => {
-  updateDictionary(Storagebillingtype.value, 'warehouse_pricing_type'); //仓储计费类型
-  updateDictionary(Warehousebillingmode.value, 'warehouse_pricing_mode'); //仓储计费模式
-  updateDictionary(CalculationBasis.value, 'warehouse_calculation_basis'); //计算基准
+  await Promise.all([
+    updateDictionary(Storagebillingtype.value, 'warehouse_pricing_type'), // 仓储计费类型
+    updateDictionary(Warehousebillingmode.value, 'warehouse_pricing_mode'), // 仓储计费模式
+    updateDictionary(CalculationBasis.value, 'warehouse_calculation_basis'), // 计算基准
+  ]);
   // updateDictionary(Surchargepricingunit.value, 'warehouse_pricing_unit'); //附加费计价单位
-  // 价格回显
-
+  // 回显
   if (props.templateData.request) {
- 
     form.value.warehousePricingType = request.value.warehousePricingType; //计算类型
     form.value.warehousePricingMode = request.value.warehousePricingMode; //计费模式
     form.value.warehouseCalculationBasis = request.value.warehouseCalculationBasis; //计算基准
@@ -328,13 +305,13 @@ const onLoad = async () => {
           });
         });
       }
-    }else{
+    } else {
       console.log('没有附加品类');
-      let data=  requestInfo.value.additionalCategory[0]
-      console.log(data,'data数据');
-      form.value.operatePrice=data.operatePrice
-      form.value.warehouseManagementPrice=data.warehouseManagementPrice
-      form.value.warehouseSortPrice=data.warehouseSortPrice
+      let data = requestInfo.value.additionalCategory[0];
+      console.log(data, 'data数据');
+      form.value.operatePrice = data.operatePrice || 0;
+      form.value.warehouseManagementPrice = data.warehouseManagementPrice || 0;
+      form.value.warehouseSortPrice = data.warehouseSortPrice || 0;
     }
     form.value.publicData = []; //清空数据
     // 仓储回显
@@ -416,6 +393,46 @@ const onLoad = async () => {
         handleFormUpdate(isByCategory, '(元/t)', '按吨计费(t)');
         break;
     }
+    // 附加费是否有操作装/装卸费
+    if (!request.value.warehouseIsOperateFee) {
+      form.value.Surcharge.find(res => res.prop === 'operatePrice').disabled = false;
+    } else {
+      form.value.Surcharge.find(res => res.prop === 'operatePrice').disabled = true;
+    }
+    // 附加费是否有仓储管理费
+    if (!request.value.warehouseIsManageFee) {
+      form.value.Surcharge.find(res => res.prop === 'warehouseManagementPrice').disabled = false;
+    } else {
+      form.value.Surcharge.find(res => res.prop === 'warehouseManagementPrice').disabled = true;
+    }
+    // 附加费是否有仓储分货费
+    if (!request.value.warehouseIsSortFee) {
+      form.value.Surcharge.find(res => res.prop === 'warehouseSortPrice').disabled = false;
+    } else {
+      form.value.Surcharge.find(res => res.prop === 'warehouseSortPrice').disabled = true;
+    }
+
+    // {
+    //   label: '仓储操作/装卸费',
+    //   prop: 'operatePrice',
+    //   type: 'number',
+    //   width: 'auto',
+    //   disabled: true,
+    // },
+    // {
+    //   label: '仓储管理费',
+    //   prop: 'warehouseManagementPrice',
+    //   type: 'number',
+    //   width: 'auto',
+    //   disabled: true,
+    // },
+    // {
+    //   label: '仓储分货费',
+    //   prop: 'warehouseSortPrice',
+    //   type: 'number',
+    //   width: 'auto',
+    //   disabled: true,
+    // },
 
     // if(request.value.warehouseSubjoinFeeUnit==4){
     //   form.value.publicTable.forEach(res=>{
@@ -467,45 +484,46 @@ const onLoad = async () => {
     //    }
     // }
   }
-
-  console.log(request.value, '初始化页面');
-};
-
-const price = async () => {
-
+  // 价格处理
   if (Object.keys(requestInfo.value).length > 0) {
     if (requestInfo.value.catergory && requestInfo.value.catergory.length) {
       // 仓储
       requestInfo.value.catergory.forEach(res => {
         let data = form.value.publicData.find(temp => temp.categoryId == res.categoryId);
         if (data) {
-          data.betweenThirtySixtyPrice = res.betweenThirtySixtyPrice;
-          data.beyondSixtyPrice = res.beyondSixtyPrice;
-          data.maximumPrice = res.maximumPrice;
-          data.withinThirtyPrice = res.withinThirtyPrice;
+          data.betweenThirtySixtyPrice = res.betweenThirtySixtyPrice || 0;
+          data.beyondSixtyPrice = res.beyondSixtyPrice || 0;
+          data.maximumPrice = res.maximumPrice || 0;
+          data.withinThirtyPrice = res.withinThirtyPrice || 0;
         }
       });
     }
-    // 附加费（还差状态）
+    // 附加费
     if (requestInfo.value.additionalCategory && requestInfo.value.additionalCategory.length) {
       requestInfo.value.additionalCategory.forEach(res => {
         let data = form.value.SurchargeData.find(temp => temp.categoryId == res.categoryId);
         if (data) {
-          data.operatePrice = res.operatePrice;//操作/装卸费
-          data.managementFee = res.managementFee;
-          data.warehouseManagementPrice = res.warehouseManagementPrice;//	仓储管理费
-          data.warehouseSortPrice = res.warehouseSortPrice;//仓储分货费
+          data.operatePrice = res.operatePrice || 0; //操作/装卸费
+          data.managementFee = res.managementFee || 0;
+          data.warehouseManagementPrice = res.warehouseManagementPrice || 0; //	仓储管理费
+          data.warehouseSortPrice = res.warehouseSortPrice || 0; //仓储分货费
         }
       });
+    }
   }
-  }
+  let setTime = setTimeout(async () => {
+    formCopy.value = await deepClone(form.value);
+    loading.value = false;
+    clearTimeout(setTime);
+  }, 500);
+  console.log(request.value, '初始化页面');
 };
 
+// 页面初始化
 const pageonload = async () => {
   request.value = await deepClone(props.templateData.request);
   requestInfo.value = await deepClone(props.templateData.requestInfo.warehouse);
   onLoad(); //页面渲染
-  price(); //处理价格
 };
 pageonload();
 const Surchargecd = computed(() => {
@@ -526,7 +544,24 @@ const Surchargecd = computed(() => {
     return true;
   }
 });
-
+// 重置表单
+const resetFormData = () => {
+  ElMessageBox.confirm('是否重置数据?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    loading.value = true;
+    form.value = deepClone(formCopy.value);
+    setTimeout(() => {
+      loading.value = false;
+      ElMessage({
+        message: '重置成功',
+        type: 'success',
+      });
+    }, 300);
+  });
+};
 // 保存数据
 const handleSubmit = () => {
   let data = {
@@ -584,7 +619,6 @@ const handleSubmit = () => {
 
   // 数据处理
   if (!request.value.warehouseIsCategorySubjoin) {
-
     // 不存在填写统一单价
     // data.warehouse['additionalCategory'].push({
     //   operatePrice: form.value.operatePrice, //操作/装卸费
@@ -593,7 +627,7 @@ const handleSubmit = () => {
     //   name: 'fj',
     // });
     let mox = data.warehouse['additionalCategory'].find(res => res.name == 'fj');
-    delete mox.name
+    delete mox.name;
     if (!request.value.warehouseIsManageFee) {
       //删除管理费
       delete mox.warehouseManagementPrice;
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 6273ed5b..9f0e095a 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -280,7 +280,7 @@
       <!--          </el-option>-->
       <!--        </el-select>-->
       <!--      </el-form-item>-->
-      <el-form-item label="备货区域:">
+      <!-- <el-form-item label="备货区域:">
         <el-select v-model="info.stockupArea" clearable placeholder="请选择备货区编号">
           <el-option
             v-for="item in goodsAreaIdData"
@@ -290,7 +290,7 @@
           >
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
     <template #footer>
       <span class="dialog-footer">
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index 6a904a7e..2ed24aa4 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -149,7 +149,7 @@
               </el-option>
             </el-select>
           </el-form-item>-->
-          <el-form-item label="备货区域" :label-width="formLabelWidth">
+          <!-- <el-form-item label="备货区域" :label-width="formLabelWidth">
             <el-select
               v-model="form.goodsAreaId"
               clearable
@@ -164,7 +164,7 @@
               >
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item
             label="出库时间"
             prop="outboundDate"
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index cc1785b8..0aa59491 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -42,11 +42,7 @@
       <!-- 计算基准 -->
       <div class="el_Storage">
         <span class="el_table_span">计算基准</span>
-        <el-radio-group
-          v-model="form.warehouseCalculationBasis"
-          class="el_Cselect"
-          style="padding-left: 4px"
-        >
+        <el-radio-group v-model="form.warehouseCalculationBasis" class="el_Cselect">
           <el-radio v-for="item in CalculationBasis" :key="item.label" :label="item.value">{{
             item.label
           }}</el-radio>
@@ -60,7 +56,6 @@
           @change="categoriesDisplayChange"
           v-model="form.warehouseIsByCategory"
           class="el_Cselect"
-          style="padding-left: 4px"
         >
           <el-radio v-for="item in Distinguishcategories" :key="item.label" :label="item.value">{{
             item.label
@@ -70,9 +65,14 @@
     </div>
     <!-- 仓储品类配置 -->
     <!--  -->
-    <div class="el_Storage Storage-cont" v-if="form.warehouseIsByCategory" style="width: 24%;">
+    <div class="el_Storage Storage-cont" v-if="form.warehouseIsByCategory" style="width: 24%">
       <span class="el_table_span">仓储品类配置</span>
-      <SurchargeTable :SurchargeData="StoragecategoryData" :Surcharge="Storagecategory"   @focus="handleRowFocus" @search='search'>
+      <SurchargeTable
+        :SurchargeData="StoragecategoryData"
+        :Surcharge="Storagecategory"
+        @focus="handleRowFocus"
+        @search="search"
+      >
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
             <div class="eml_btn">
@@ -81,7 +81,11 @@
                   ><CirclePlus /></el-icon
                 >新增
               </span>
-              <span @click="storagereduce(slotProps.scope.row.index)" class="el_btn_b" v-if="slotProps.scope.row.reduce">
+              <span
+                @click="storagereduce(slotProps.scope.row.index)"
+                class="el_btn_b"
+                v-if="slotProps.scope.row.reduce"
+              >
                 <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"><Delete /></el-icon
                 >删除
               </span>
@@ -89,57 +93,6 @@
           </template>
         </template>
       </SurchargeTable>
-      <!-- <div class="Storage-cont">
-        <span class="el_table_span">仓储品类配置</span>
-
-        <div
-          class="el_Storagecategory"
-          v-loading="Storageloading"
-          element-loading-text="Loading..."
-        >
-          <div class="el_table_span">
-            <div class="el_table_id">序号</div>
-            <div class="el_table_title">产品品类</div>
-          </div>
-
-          <div class="el_table_td" v-for="item in StoragecategoryList" :key="item.id">
-            <div class="el_table_idNumber">{{ item.id }}</div>
-            <el-select
-              class="el_Cselect"
-              v-model="item.warehousePieceCategory"
-              filterable
-              remote
-              clearable
-              reserve-keyword
-              placeholder="请选择品类"
-              style="width: 240px"
-              remote-show-suffix
-              :remote-method="categoriesearch"
-              @focus="categoriesSearchfocus(item)"
-            >
-              <el-option
-                v-for="items in item.Additionalcategories"
-                :key="items.value"
-                :label="items.label"
-                :value="items.value"
-              />
-            </el-select>
-            <div class="el_table_operation">
-              <span @click="storageplus(item.id)" v-if="item.plus" class="el_table_operation_span_b"
-                >+</span
-              >
-              <span
-                @click="storagereduce(item.id)"
-                v-if="item.reduce"
-                class="el_table_operation_span_a"
-                >-</span
-              >
-            </div>
-          </div>
-
-
-        </div>
-      </div> -->
     </div>
     <hr class="el_hr" />
     <!-- 附加费 -->
@@ -148,56 +101,56 @@
     </div>
     <div class="el_Surcharge">
       <!-- 附加费计价单位 -->
-      <div class="el_flex_row"> 
-      <div class="el_Storage">
-        <span class="el_table_span">附加费计价单位</span>
-        <el-select
-          class="el_Cselect"
-          v-model="form.warehouseSubjoinFeeUnit"
-          filterable
-          clearable
-          placeholder="选择计费类型"
-          style="width:100%"
-        >
-          <el-option
-            v-for="item in Surchargepricingunit"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </div>
+      <div class="el_flex_row">
+        <div class="el_Storage">
+          <span class="el_table_span">附加费计价单位</span>
+          <el-select
+            class="el_Cselect"
+            v-model="form.warehouseSubjoinFeeUnit"
+            filterable
+            clearable
+            placeholder="选择计费类型"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in Surchargepricingunit"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </div>
 
-      <!-- 是否有管理费 -->
-      <div class="el_Storage">
-        <span class="el_table_span">是否有管理费</span>
-        <el-radio-group v-model="form.warehouseIsManageFee" class="el_Cselect">
-          <el-radio v-for="item in Managementfees" :key="item.label" :label="item.value">{{
-            item.label
-          }}</el-radio>
-        </el-radio-group>
-      </div>
+        <!-- 是否有管理费 -->
+        <div class="el_Storage">
+          <span class="el_table_span">是否有管理费</span>
+          <el-radio-group v-model="form.warehouseIsManageFee" class="el_Cselect">
+            <el-radio v-for="item in Managementfees" :key="item.label" :label="item.value">{{
+              item.label
+            }}</el-radio>
+          </el-radio-group>
+        </div>
 
-      <!-- 是否有操作/装卸费 -->
-      <div class="el_Storage">
-        <span class="el_table_span">是否有操作/装卸费</span>
-        <el-radio-group v-model="form.warehouseIsOperateFee" class="el_Cselect">
-          <el-radio v-for="item in Operatingunloading" :key="item.label" :label="item.value">{{
-            item.label
-          }}</el-radio>
-        </el-radio-group>
-      </div>
+        <!-- 是否有操作/装卸费 -->
+        <div class="el_Storage">
+          <span class="el_table_span">是否有操作/装卸费</span>
+          <el-radio-group v-model="form.warehouseIsOperateFee" class="el_Cselect">
+            <el-radio v-for="item in Operatingunloading" :key="item.label" :label="item.value">{{
+              item.label
+            }}</el-radio>
+          </el-radio-group>
+        </div>
 
-      <!-- 是否有分拣费用 -->
-      <div class="el_Storage">
-        <span class="el_table_span">是否有分拣费用</span>
-        <el-radio-group v-model="form.warehouseIsSortFee" class="el_Cselect">
-          <el-radio v-for="item in Sortingfee" :key="item.label" :label="item.value">{{
-            item.label
-          }}</el-radio>
-        </el-radio-group>
+        <!-- 是否有分拣费用 -->
+        <div class="el_Storage">
+          <span class="el_table_span">是否有分拣费用</span>
+          <el-radio-group v-model="form.warehouseIsSortFee" class="el_Cselect">
+            <el-radio v-for="item in Sortingfee" :key="item.label" :label="item.value">{{
+              item.label
+            }}</el-radio>
+          </el-radio-group>
+        </div>
       </div>
-    </div>
       <!-- 附加费用是否统一计费 -->
       <div class="el_Storage">
         <span class="el_table_span">附加费是否按品类计费</span>
@@ -214,27 +167,33 @@
       </div>
 
       <!-- 附加费品类配置 -->
-      <div class="el_Storage" v-if="form.warehouseIsCategorySubjoin" style="width: 24%;">
+      <div class="el_Storage" v-if="form.warehouseIsCategorySubjoin" style="width: 24%">
         <div class="Storage-cont">
           <span class="el_table_span">附加费品类配置</span>
           <!-- 表格  -->
-      <SurchargeTable :SurchargeData="AdditionalcategoriesData" :Surcharge="Additionalcategories"   @focus="handleRowFocus" @search='search'>
-        <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '操作'">
-            <div class="eml_btn">
-              <span @click="categoriesplus" class="el_btn_a" v-if="slotProps.scope.row.plus">
-                <el-icon style="font-size: 19px; color: #409eff; margin-right: 3px"
-                  ><CirclePlus /></el-icon
-                >新增
-              </span>
-              <span @click="categoriesduce(slotProps.scope.row.index)" class="el_btn_b" v-if="slotProps.scope.row.reduce">
-                <el-icon style="font-size: 19px; color: #f00; margin-right: 3px"><Delete /></el-icon
-                >删除
-              </span>
-            </div>
-          </template>
-        </template>
-      </SurchargeTable>
+          <SurchargeTable
+            :SurchargeData="AdditionalcategoriesData"
+            :Surcharge="Additionalcategories"
+            @focus="handleRowFocus"
+            @search="search"
+          >
+            <template #default="slotProps">
+              <template v-if="slotProps.scope.column.label === '操作'">
+                <div class="eml_btn">
+                  <span @click="categoriesplus" class="el_btn_a" v-if="slotProps.scope.row.plus">
+                    <el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon>新增
+                  </span>
+                  <span
+                    @click="categoriesduce(slotProps.scope.row.index)"
+                    class="el_btn_b"
+                    v-if="slotProps.scope.row.reduce"
+                  >
+                    <el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>删除
+                  </span>
+                </div>
+              </template>
+            </template>
+          </SurchargeTable>
           <!-- <div
             class="el_Storagecategory"
             v-loading="goriesloading"
@@ -309,7 +268,7 @@ import { deepClone } from '@/utils/util';
 import { useRoute } from 'vue-router';
 import SurchargeTable from '@/components/pric/tablePric.vue';
 const pageLoading = ref(false); //页面加载
-const SelectData=ref({})
+const SelectData = ref({});
 // 仓储
 const StoragecategoryData = ref([
   {
@@ -319,80 +278,78 @@ const StoragecategoryData = ref([
     plus: true,
     reduce: false,
     StateName: 'storage', //仓储标识
-    loading:false,
+    loading: false,
   },
 ]);
 
 const Storagecategory = ref([
-  { label: '序号', prop: 'index', type: 'string', width: '80', disabled: true },
+  { label: '序号', prop: 'index', type: 'string', width: 'auto', disabled: true },
   {
     label: '产品品类',
     prop: 'warehousePieceCategory',
     type: 'select',
     width: 'auto',
-
     disabled: true,
   },
   { label: '操作', prop: '', type: '', width: 'auto', disabled: true },
 ]);
 // 附加品类
-const AdditionalcategoriesData=ref([
-{
+const AdditionalcategoriesData = ref([
+  {
     index: 1,
     warehousePieceCategory: '',
     options: [],
     plus: true,
     reduce: false,
     StateName: 'additional', //附加品类
-    loading:false,
+    loading: false,
   },
-])
-const Additionalcategories=ref([
-{ label: '序号', prop: 'index', type: 'string', width: '80', disabled: true },
+]);
+const Additionalcategories = ref([
+  { label: '序号', prop: 'index', type: 'string', width: 'auto', disabled: true },
   {
     label: '产品品类',
     prop: 'warehousePieceCategory',
     type: 'select',
     width: 'auto',
-
     disabled: true,
   },
   { label: '操作', prop: '', type: '', width: 'auto', disabled: true },
-])
-const handleRowFocus = (data) => {
-  SelectData.value =data.row
-  console.log(  SelectData.value,'  SelectData.value');
+]);
+const handleRowFocus = data => {
+  SelectData.value = data.row;
+  console.log(SelectData.value, '  SelectData.value');
   console.log('row:', data.row);
   console.log('column:', data.column);
-  
 };
 // 品类搜索
-const search=(val)=>{
-  if(val){
+const search = val => {
+  if (val) {
     let data = {
-    goodsName: val,
-  };
-  SelectData.value.loading=true
-  postFindCategoryInfo(data).then(res => {
-    console.log(res, '附加费品类计费');
-    if (res.data.code == 200) {
-      if (res.data.data.length) {
-        SelectData.value.options = []; //如果有新的参数就清空之前的
-        res.data.data.forEach(item => {
-          SelectData.value.options.push({
-            label: item.goodsName,
-            value: item.goodsId,
-          });
-        });
-      }
-    }
-  }).catch(res=>{
-
-  }).finally(()=>{
-    SelectData.value.loading=false
-  });
+      goodsName: val,
+    };
+    SelectData.value.loading = true;
+    postFindCategoryInfo(data)
+      .then(res => {
+        console.log(res, '附加费品类计费');
+        if (res.data.code == 200) {
+          if (res.data.data.length) {
+            SelectData.value.options = []; //如果有新的参数就清空之前的
+            res.data.data.forEach(item => {
+              SelectData.value.options.push({
+                label: item.goodsName,
+                value: item.goodsId,
+              });
+            });
+          }
+        }
+      })
+      .catch(res => {})
+      .finally(() => {
+        SelectData.value.loading = false;
+      });
   }
-}
+};
 
 const formCopy = ref({}); //拷贝对象
 const SelectOpin = ref(null); //当前点击的品类搜索框
@@ -518,9 +475,9 @@ function addItemAfterId(array, StateName) {
     StateName, // 标识
     warehousePieceCategory: '', // 选择框值
     options: [], // 选择框列表，防止后期需要改动列表值
-    loading:false
+    loading: false,
   };
-  array.push(newItem)
+  array.push(newItem);
 }
 // 仓储减
 const storagereduce = id => {
@@ -532,15 +489,15 @@ const storagereduce = id => {
 // StateName:'additional',//附加费标识
 // 仓储加
 const storageplus = data => {
-    console.log(data.row);
+  console.log(data.row);
   // Storageloading.value = true;
   addItemAfterId(StoragecategoryData.value, 'storage');
-  console.log(StoragecategoryData.value,'StoragecategoryData.value');
+  console.log(StoragecategoryData.value, 'StoragecategoryData.value');
 };
 // 附加品类加
 const categoriesplus = id => {
   goriesloading.value = true;
-  addItemAfterId(AdditionalcategoriesData.value,  'additional');
+  addItemAfterId(AdditionalcategoriesData.value, 'additional');
 };
 // 附加品类减
 const categoriesduce = id => {
@@ -607,11 +564,11 @@ const onLoad = async () => {
       request.warehousePieceCategorys.forEach((res, index) => {
         StoragecategoryData.value.push({
           index: index + 1,
-          plus: !index?true:false,
+          plus: !index ? true : false,
           reduce: index ? true : false,
           StateName: 'storage', //仓储标识
           warehousePieceCategory: res.id,
-          loading:false,
+          loading: false,
           options: [
             {
               label: res.name,
@@ -627,7 +584,7 @@ const onLoad = async () => {
       request.warehouseSubjoinCategorys.forEach((res, index) => {
         AdditionalcategoriesData.value.push({
           index: index + 1,
-          plus: !index?true:false,
+          plus: !index ? true : false,
           reduce: index ? true : false,
           StateName: 'additional', //附加费标识
           warehousePieceCategory: res.id,
@@ -687,7 +644,7 @@ const Submit = async () => {
     }
   } else {
     if (form.value.warehousePieceCategory) {
-       form.value.warehousePieceCategory='';
+      form.value.warehousePieceCategory = '';
     }
   }
   // 如果勾选了附加费是否按品类计费判断是否填写了附加品类配置
@@ -764,7 +721,7 @@ const categoriesDisplayChange = val => {
         options: [],
       },
     ];
-  } 
+  }
 };
 // 附加费是否按品类计费
 const AdditionalDisplayChange = val => {
@@ -779,7 +736,7 @@ const AdditionalDisplayChange = val => {
         Additionalcategories: [],
       },
     ];
-  } 
+  }
 };
 </script>
 
@@ -894,16 +851,16 @@ const AdditionalDisplayChange = val => {
   margin-bottom: 10px;
 }
 .el_Surcharge {
-  .el_Storage{
+  .el_Storage {
     width: 24%;
     display: flex;
     flex-direction: column;
-    .el_Cselect{
+    .el_Cselect {
       margin-left: 0;
       background-color: #f5f5f6;
     }
   }
-  .el_flex_row{
+  .el_flex_row {
     display: flex;
     justify-content: space-between;
   }
@@ -926,7 +883,6 @@ const AdditionalDisplayChange = val => {
     width: 24%;
     display: flex;
     flex-direction: column;
-
     .el_Cselect {
       margin-left: 0;
       margin-top: 8px;
@@ -935,12 +891,41 @@ const AdditionalDisplayChange = val => {
     }
   }
 }
-.el_btn_a,.el_btn_b{
-  font-size: 20px;
+.el_btn_a,
+.el_btn_b {
+  font-size: 14px;
   display: flex;
   align-items: center;
-  .el-icon{
-    font-size: 20px;
+  .el-icon {
+    font-size: 14px;
+  }
+}
+:deep(.el_row_table) {
+  thead {
+    th {
+      background-color: #f5f8fa;
+      color: #172e60;
+    }
+  }
+  tbody {
+    .el-table tr:hover {
+      background-color: transparent;
+    }
+
+    .cell {
+      text-align: center;
+      padding: 0;
+      .el-input-number {
+        width: 100%;
+        .el-input__wrapper {
+          box-shadow: none;
+        }
+
+        .el-input__inner:hover {
+          box-shadow: 0px 1px 0vw 0px #172e60;
+        }
+      }
+    }
   }
 }
 </style>

From 8b08ecea06f158043cc485006c716c1747f42abf Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 23 Apr 2024 19:57:36 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=B4=A2=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pric/tablePric.vue             |  27 -
 src/views/Pricesystem/Price/PriceDelivery.vue |   4 +-
 .../Pricesystem/Price/PriceWarehousing.vue    |   4 +-
 src/views/financialsector/FinanceHome.vue     | 165 ++-
 .../Financialse/FinancialDelivery.vue         | 976 ++++++++----------
 .../Financialse/FinancialWarehousing.vue      | 900 ++++++++--------
 6 files changed, 938 insertions(+), 1138 deletions(-)

diff --git a/src/components/pric/tablePric.vue b/src/components/pric/tablePric.vue
index 82df7b3b..94d59aff 100644
--- a/src/components/pric/tablePric.vue
+++ b/src/components/pric/tablePric.vue
@@ -83,32 +83,5 @@ const props = defineProps({
 </script>
 
 <style scoped lang='scss'>
-:deep(.el_row_table) {
-  thead {
-    th {
-      background-color: #0d6f3c;
-      color: #172e60;
-    }
-  }
-  tbody {
-    .el-table tr:hover {
-      background-color: transparent;
-    }
 
-    .cell {
-      text-align: center;
-      padding: 0;
-      .el-input-number {
-        width: 100%;
-        .el-input__wrapper {
-          box-shadow: none;
-        }
-
-        .el-input__inner:hover {
-          box-shadow: 0px 1px 0vw 0px #172e60;
-        }
-      }
-    }
-  }
-}
 </style>
diff --git a/src/views/Pricesystem/Price/PriceDelivery.vue b/src/views/Pricesystem/Price/PriceDelivery.vue
index e344d3ec..b83d677f 100644
--- a/src/views/Pricesystem/Price/PriceDelivery.vue
+++ b/src/views/Pricesystem/Price/PriceDelivery.vue
@@ -707,8 +707,8 @@ const form = ref({
     },
   ],
 });
-function updateDictionary(targetArray, dictionaryType) {
-  getDictionaryBiz(dictionaryType)
+async function updateDictionary(targetArray, dictionaryType) {
+ await getDictionaryBiz(dictionaryType)
     .then(res => {
       console.log(res, '字典');
       if (res.data.code == 200) {
diff --git a/src/views/Pricesystem/Price/PriceWarehousing.vue b/src/views/Pricesystem/Price/PriceWarehousing.vue
index 6fe0d841..d6f9d796 100644
--- a/src/views/Pricesystem/Price/PriceWarehousing.vue
+++ b/src/views/Pricesystem/Price/PriceWarehousing.vue
@@ -167,8 +167,8 @@ const Warehousebillingmode = ref([]);
 const CalculationBasis = ref([]);
 const request = ref({});
 const Surchargepricingunit = ref([]);
-function updateDictionary(targetArray, dictionaryType) {
-  getDictionaryBiz(dictionaryType)
+async function updateDictionary(targetArray, dictionaryType) {
+await  getDictionaryBiz(dictionaryType)
     .then(res => {
       console.log(res, '字典');
       if (res.data.code == 200) {
diff --git a/src/views/financialsector/FinanceHome.vue b/src/views/financialsector/FinanceHome.vue
index ff85d1ee..82278b5d 100644
--- a/src/views/financialsector/FinanceHome.vue
+++ b/src/views/financialsector/FinanceHome.vue
@@ -42,12 +42,13 @@
           :loading="ServiceTypeLoading"
         >
           <el-option
+            style="padding: 0"
             v-for="item in ServiceList"
             :key="item.value"
             :label="item.label"
             :value="item.value"
           >
-            <el-checkbox v-model="item.check" @change="() => isChecked(item, true,true)">
+            <el-checkbox v-model="item.check" @change="() => isChecked(item, true, true)">
               {{ item.label }}
             </el-checkbox>
           </el-option>
@@ -83,8 +84,12 @@
 <script setup>
 import { ref, defineAsyncComponent, getCurrentInstance } from 'vue';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
-import { $_basicdataBrande, $_InfopriceTemplate ,$_tempDelpriceTemplate} from '@/api/financialsector/index'; //价格模板
-import { ElMessage,ElMessageBox  } from 'element-plus';
+import {
+  $_basicdataBrande,
+  $_InfopriceTemplate,
+  $_tempDelpriceTemplate,
+} from '@/api/financialsector/index'; //价格模板
+import { ElMessage, ElMessageBox } from 'element-plus';
 const $route = useRoute(); //获取地址栏参数
 const pageLoading = ref(true); //页面加载效果
 
@@ -143,7 +148,7 @@ function updateDictionary(targetArray, dictionaryType) {
 async function executeCheckedResults(results) {
   for (const res of results) {
     await new Promise(resolve => setTimeout(resolve, 500));
-    await isChecked(res,false,false);
+    await isChecked(res, false, false);
     await provideData();
   }
   pageLoading.value = false;
@@ -187,83 +192,74 @@ const onLoad = async () => {
 };
 onLoad();
 // 点击菜单
-const isChecked = (val, isChecked = false,msg=false) => {
-  console.log(msg,'当前msg');
+const isChecked = (val, isChecked = false, msg = false) => {
+  console.log(msg, '当前msg');
   console.log(val, 'val');
-  if(msg){
+  if (msg) {
     val.state = !val.state;
     Tabmenu.value = val.label;
-    if(!val.check){
-    form.value.ServiceType.push(val.value)
-    console.log(  form.value.ServiceType,'  form.value.ServiceType');
-    val.check = true;
-    val.state = true;
-    ElMessageBox.confirm(
-    '关闭当前模板会重置数据！是否关闭？',
-    '提示',
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }
-  )
-    .then(() => {
-      val.check = false;
-      val.state = false;
-      let indexToRemove = form.value.ServiceType.findIndex(item => item ==val.value);
-      if (indexToRemove !== -1) {
-      form.value.ServiceType.splice(indexToRemove, 1);
-      }
-      if (form.value.ServiceType.length) {
-        Tabmenu.value = ServiceList.value.find(res => res.state).label;
-      }
-      if($route.query.id || templateInfo.value.code){
-        let data={
-        checkType:val.value,
-        templateId:$route.query.id,
-      }
-      $_tempDelpriceTemplate(data).then(res=>{
-        console.log(res,'删除成功返回值');
-        if(res.data.code ==200){
-          ElMessage({
-          type: 'success',
-        message: res.data.msg,
-         })
-        }
-      })
-      }else{
-        ElMessage({
-        type: 'success',
-        message: '操作成功',
-      })
-      }
-
-
-
-    })
-    .catch(() => {
-      val.state = true;
+    if (!val.check) {
+      form.value.ServiceType.push(val.value);
+      console.log(form.value.ServiceType, '  form.value.ServiceType');
       val.check = true;
-    })
-  }
-  }else{
-  console.log(val, 'val');
-  //菜单隐藏/显示
-  val.state = !val.state;
-  if ($route.query.id && !isChecked) {
-    val.check = !val.check;
-  }
-  // 激活菜单设置为已经存在的
-  //设置激活菜单
-  Tabmenu.value = val.label;
-  // 如果当前菜单被关闭则显示最新菜单
-  if (!val.state && form.value.ServiceType.length) {
-    Tabmenu.value = ServiceList.value.find(res => res.state).label;
+      val.state = true;
+      ElMessageBox.confirm('关闭当前模板会重置数据！是否关闭？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          val.check = false;
+          val.state = false;
+          let indexToRemove = form.value.ServiceType.findIndex(item => item == val.value);
+          if (indexToRemove !== -1) {
+            form.value.ServiceType.splice(indexToRemove, 1);
+          }
+          if (form.value.ServiceType.length) {
+            Tabmenu.value = ServiceList.value.find(res => res.state).label;
+          }
+          if ($route.query.id || templateInfo.value.code) {
+            let data = {
+              checkType: val.value,
+              templateId: $route.query.id,
+            };
+            $_tempDelpriceTemplate(data).then(res => {
+              console.log(res, '删除成功返回值');
+              if (res.data.code == 200) {
+                ElMessage({
+                  type: 'success',
+                  message: res.data.msg,
+                });
+              }
+            });
+          } else {
+            ElMessage({
+              type: 'success',
+              message: '操作成功',
+            });
+          }
+        })
+        .catch(() => {
+          val.state = true;
+          val.check = true;
+        });
+    }
+  } else {
+    console.log(val, 'val');
+    //菜单隐藏/显示
+    val.state = !val.state;
+    if ($route.query.id && !isChecked) {
+      val.check = !val.check;
+    }
+    // 激活菜单设置为已经存在的
+    //设置激活菜单
+    Tabmenu.value = val.label;
+    // 如果当前菜单被关闭则显示最新菜单
+    if (!val.state && form.value.ServiceType.length) {
+      Tabmenu.value = ServiceList.value.find(res => res.state).label;
+    }
   }
 };
-
-
-};
 // 点击移除
 const removeTag = value => {
   ServiceList.value.find(res => res.value == value).check = false;
@@ -272,7 +268,7 @@ const removeTag = value => {
   if (form.value.ServiceType.length) {
     Tabmenu.value = ServiceList.value.find(res => res.state).label;
   }
-  }
+};
 //   给子页面传递数据
 const provideData = data => {
   console.log(data, '来自子页面的数据');
@@ -328,6 +324,7 @@ const handleChange = () => {
     .name {
       font-size: 16px;
     }
+
   }
 }
 
@@ -338,10 +335,11 @@ const handleChange = () => {
   .el-checkbox__label {
     margin-left: 20px;
   }
+  .el-select-dropdown__item {
+    padding: 0 !important;
+  }
 }
-.el-select-dropdown__item {
-  padding: 0;
-}
+
 .el-select-dropdown__item::after {
   content: '';
   display: none;
@@ -350,13 +348,4 @@ const handleChange = () => {
   margin-top: 6px;
   height: 100%;
 }
-:deep(.el-scrollbar__view){
-  padding:  0 10px !important;
-}
-.el-scrollbar__view{
-  .el-select-dropdown__item {
-  padding:0 10px !important;
-}
-}
-
 </style>
diff --git a/src/views/financialsector/Financialse/FinancialDelivery.vue b/src/views/financialsector/Financialse/FinancialDelivery.vue
index 90b94dcc..a7f9f346 100644
--- a/src/views/financialsector/Financialse/FinancialDelivery.vue
+++ b/src/views/financialsector/Financialse/FinancialDelivery.vue
@@ -1,39 +1,40 @@
 <template>
-  <div class="content_max" v-loading='pageLoading'>
-    <!-- 配送服务类型 -->
-    <div class="el_row_f1">
-      <div class="el_Storage ">
-        <span class="el_table_span">配送服务类型</span>
-        <el-select
-          class="el_Cselect"
-          style="width: 100%;"
-          v-model="form.dispatchServiceType"
-          filterable
-          placeholder="选择计费类型"
-          @change="chargetype"
-        >
-          <el-option
-            v-for="item in Warehousebillingmode"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </div>
-      <!-- 配送计费模式 -->
-      <div class="el_select_check el_Storage ">
- 
+  <div class="content_max" v-loading="pageLoading">
+    <el-form>
+      <!-- 配送服务类型 -->
+      <div class="el_row_f1">
+        <div class="el_Storage">
+          <span class="el_table_span">配送服务类型</span>
+          <el-select
+            class="el_Cselect"
+            style="width: 100%"
+            v-model="form.dispatchServiceType"
+            filterable
+            placeholder="选择计费类型"
+            @change="chargetype"
+          >
+            <el-option
+              v-for="item in Warehousebillingmode"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </div>
+        <!-- 配送计费模式 -->
+        <div class="el_select_check el_Storage">
           <span class="el_table_span name">配送计费模式</span>
           <el-select
             v-model="form.dispatchPricingType"
             filterable
             placeholder="请选择配送计费模式"
             :popper-append-to-body="false"
-            style="width:100%;"
+            style="width: 100%"
             multiple
             @remove-tag="removeTag"
           >
             <el-option
+              style="padding: 0"
               v-for="item in ServiceList"
               :key="item.value"
               :label="item.label"
@@ -44,336 +45,262 @@
               </el-checkbox>
             </el-option>
           </el-select>
-  
-      </div>
-      <!-- 是否区分品类  -->
-      <div  class="el_Storage" >
-        <span class="el_table_span">是否区分品类</span>
-        <el-radio-group
-          @change="categoryChange"
-          v-model="form.dispatchIsByCategory"
-          class="el_Cselect el_fx"
-          style="width: 100%"
-        >
-          <el-radio v-for="item in Distinguishcategories" :key="item.label" :label="item.value">{{
-            item.label
-          }}</el-radio>
-        </el-radio-group>
-      </div>
-
-      <!-- 是否有遗留件  -->
-      <div   class="el_Storage">
-        <span class="el_table_span">是否有遗留件</span>
-        <el-radio-group
-          v-model="form.dispatchIsLeaveBehind"
-          class="el_Cselect el_fx"
-          style="width:100%"
-        >
-          <el-radio v-for="item in Leftoverparts" :key="item.label" :label="item.value">{{
-            item.label
-          }}</el-radio>
-        </el-radio-group>
-      </div>
-    </div>
-    <!-- 商配/市配  -->
-    <div class="el_Storage" v-if="form.dispatchServiceType && form.dispatchIsByCategory">
-      <el-tabs class="demo-tabs">
-        <el-tab-pane
-          :label="form.WarehousebillingmodeTitle"
-          v-loading="Deliveryloading"
-          element-loading-text="Loading..."
-        >
-          <!-- 商配/市配内容 -->
-          <div class="el_Commercial_ercial" >
-            <!-- 按件计费 -->
-            <template v-for="Item in Commercialcial" :key="Item.title">
-              <div v-if="Item.state" class="tabBox">
-                <!-- 标题 -->
-                <span class="el_table_span">{{ Item.title }}</span>
-                <!-- 表格 -->
-                <div
-                  class="el_Storagecategory"
-                  v-loading="Item.Storageloading"
-                  element-loading-text="Loading..."
-                >
-                  <!-- 使用table标签创建表格 -->
-                  <table class="styled-table">
-                    <thead>
-                      <tr>
-                        <th style="width: 30px; text-align: center">序号</th>
-                        <th>产品品类</th>
-                        <th style="width: 104px">操作</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <!-- 表格循环 -->
-                      <tr v-for="item in Item.sequence" :key="item.id">
-                        <!-- 序号 -->
-                        <td style="text-align: center">{{ item.id }}</td>
-                        <!-- 选择的品类 -->
-                        <td>
-                          <el-select
-                            class="el_Cselect"
-                            v-model="item.Warehousecategory"
-                            filterable
-                            remote
-                            clearable
-                            reserve-keyword
-                            placeholder="请选择品类"
-                            style="width: 100%"
-                            remote-show-suffix
-                            :remote-method="categoriesearch"
-                            @focus="categoriesSearchfocus(item)"
-                          >
-                            <!-- 品类列表 -->
-                            <el-option
-                              v-for="option in item.Additionalcategories"
-                              :key="option.value"
-                              :label="option.label"
-                              :value="option.value"
-                            />
-                          </el-select>
-                        </td>
-                        <td style="line-height: 16px">
-                          <span
-                            class="el_btn_a"
-                            @click="storageplus(Item, item.id)"
-                            v-if="item.plus"
-                          >
-                            <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
-                              ><CirclePlus /></el-icon
-                            >新增
-                          </span>
-                          <span
-                            class="el_btn_b"
-                            @click="storagereduce(Item, item.id)"
-                            v-if="item.reduce"
-                          >
-                            <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
-                              ><Delete /></el-icon
-                            >删除
-                          </span>
-                        </td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-            </template>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <!-- 附加费计费 -->
-    <div class="el_Commercial_ercial">
-      <span class="el_title_span">附加费计费</span>
-      <div class="el_fj">
-        <!-- 是否有分货费  -->
+        </div>
+        <!-- 是否区分品类  -->
         <div class="el_Storage">
-          <span class="el_table_span">是否有分货费</span>
-          <el-radio-group v-model="form.dispatchIsSortFee" class="el_Cselect">
-            <el-radio v-for="item in Distributionfee" :key="item.label" :label="item.value">{{
+          <span class="el_table_span">是否区分品类</span>
+          <el-radio-group
+            @change="categoryChange"
+            v-model="form.dispatchIsByCategory"
+            class="el_Cselect el_fx"
+            style="width: 100%"
+          >
+            <el-radio v-for="item in Distinguishcategories" :key="item.label" :label="item.value">{{
               item.label
             }}</el-radio>
           </el-radio-group>
         </div>
-        <!-- 是否有操作/装卸费  -->
+
+        <!-- 是否有遗留件  -->
         <div class="el_Storage">
-          <span class="el_table_span">是否有操作/装卸费</span>
-          <el-radio-group v-model="form.dispatchIsOperateFee" class="el_Cselect">
-            <el-radio v-for="item in Operatingfee" :key="item.label" :label="item.value">{{
+          <span class="el_table_span">是否有遗留件</span>
+          <el-radio-group
+            v-model="form.dispatchIsLeaveBehind"
+            class="el_Cselect el_fx"
+            style="width: 100%"
+          >
+            <el-radio v-for="item in Leftoverparts" :key="item.label" :label="item.value">{{
               item.label
             }}</el-radio>
           </el-radio-group>
         </div>
+      </div>
+      <!-- 商配/市配  -->
+      <div class="el_Storage" v-if="form.dispatchServiceType && form.dispatchIsByCategory">
+        <el-tabs class="demo-tabs">
+          <el-tab-pane
+            :label="form.WarehousebillingmodeTitle"
+            v-loading="Deliveryloading"
+            element-loading-text="Loading..."
+          >
+            <!-- 商配/市配内容 -->
+            <div class="el_Commercial_ercial">
+              <!-- 按件计费 -->
 
-        <!-- 是否有上楼费  -->
-        <div class="el_Storage">
-          <div class="el_upstairs_a">
-            <span class="el_table_span">是否有上楼费</span>
-            <el-radio-group
-              @change="UpstairsChange"
-              v-model="form.dispatchIsStairsCarryingCharge"
-              class="el_Cselect"
-            >
-              <el-radio v-for="item in upstairs" :key="item.label" :label="item.value">{{
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <!-- 附加费计费 -->
+      <div class="el_Commercial_ercial">
+        <span class="el_title_span">附加费计费</span>
+        <div class="el_fj">
+          <!-- 是否有分货费  -->
+          <div class="el_Storage">
+            <span class="el_table_span">是否有分货费</span>
+            <el-radio-group v-model="form.dispatchIsSortFee" class="el_Cselect">
+              <el-radio v-for="item in Distributionfee" :key="item.label" :label="item.value">{{
                 item.label
               }}</el-radio>
             </el-radio-group>
           </div>
-        </div>
-        <div class="el_Storage">
-          <div class="el_upstairs_b" v-if="form.dispatchIsStairsCarryingCharge">
-            <span class="el_table_span">是否配置免费层数</span>
-            <el-radio-group v-model="form.dispatchIsFeeFloor" class="el_Cselect">
-              <el-radio v-for="item in Numberlayers" :key="item.label" :label="item.value">{{
+          <!-- 是否有操作/装卸费  -->
+          <div class="el_Storage">
+            <span class="el_table_span">是否有操作/装卸费</span>
+            <el-radio-group v-model="form.dispatchIsOperateFee" class="el_Cselect">
+              <el-radio v-for="item in Operatingfee" :key="item.label" :label="item.value">{{
                 item.label
               }}</el-radio>
             </el-radio-group>
           </div>
-        </div>
-      </div>
-      <div class="el_translation">
-        <!-- 是否有平移费  -->
-        <div  class="el_Storage" >
-          <span class="el_table_span">是否有平移费</span>
-          <el-radio-group v-model="form.dispatchIsShiftingCharge" class="el_Cselect el_fx">
-            <el-radio v-for="item in Translationfee" :key="item.label" :label="item.value">{{
-              item.label
-            }}</el-radio>
-          </el-radio-group>
-        </div>
-
-        <!-- 附加费是否统一计费  -->
-        <div class="el_Storage">
-          <span class="el_table_span">附加费是否按品类计费</span>
-          <el-radio-group v-model="form.dispatchIsCategorySubjoin" class="el_Cselect el_fx">
-            <el-radio
-              @change="SurchargeChange"
-              v-for="item in Surchargefee"
-              :key="item.label"
-              :label="item.value"
-              >{{ item.label }}</el-radio
-            >
-          </el-radio-group>
-        </div>
 
-      </div>
-
-      <!-- 附加费品类 -->
-      <div class="el_Storage" v-if="form.dispatchIsCategorySubjoin">
-        <div class="Storage-cont">
-          <span class="el_table_span">附加费品类</span>
-          <!-- 表格 -->
-          <div
-            class="el_Storagecategory"
-            v-loading="goriesloading"
-            element-loading-text="Loading..."
-          >
-            <!-- 使用table标签创建表格 -->
-            <table class="styled-table">
-              <thead>
-                <tr>
-                  <th style="width: 30px; text-align: center">序号</th>
-                  <th>品类</th>
-                  <th style="width: 104px">操作</th>
-                </tr>
-              </thead>
-              <tbody>
-                <!-- 表格循环 -->
-                <tr v-for="item in AdditionalcategoriesList" :key="item.id">
-                  <!-- 序号 -->
-                  <td style="text-align: center">{{ item.id }}</td>
-                  <!-- 选择的品类 -->
-                  <td>
-                    <el-select
-                      class="el_Cselect"
-                      v-model="item.Warehousecategory"
-                      filterable
-                      remote
-                      clearable
-                      reserve-keyword
-                      placeholder="请选择品类"
-                      style="width: 100%"
-                      remote-show-suffix
-                      :remote-method="categoriesearch"
-                      @focus="categoriesSearchfocus(item)"
-                    >
-                      <!-- 品类列表 -->
-                      <el-option
-                        v-for="items in item.Additionalcategories"
-                        :key="items.value"
-                        :label="items.label"
-                        :value="items.value"
-                      />
-                    </el-select>
-                  </td>
-                  <td style="line-height: 16px">
-                    <span @click="categoriesplus(item.id)" v-if="item.plus" class="el_btn_a">
-                      <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
-                        ><CirclePlus /></el-icon
-                      >新增
-                    </span>
-                    <span @click="categoriesduce(item.id)" v-if="item.reduce" class="el_btn_b">
-                      <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
-                        ><Delete /></el-icon
-                      >删除
-                    </span>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </div>
-
-      <!-- 最低计费  -->
-      <div class="el_Storage el_Minimumbilling">
-        <span>最低计费</span>
-        <div class="el_Storage">
-          <div class="el_Minimumbillingbox">
-            <!-- 是否最低计费 -->
-            <div class="el_flex_row"  >
-              <span class="el_table_span">是否最低计费</span>
-              <el-radio-group v-model="form.dispatchIsMinCost" class="el_Cselect el_fx">
-                <el-radio
-                  @change="MinimumChange"
-                  v-for="item in Minimumbilling"
-                  :key="item.label"
-                  :label="item.value"
-                  >{{ item.label }}</el-radio
-                >
-              </el-radio-group>
-            </div>
-            <!-- 最低计费方式 -->
-            <!-- v-if="form.dispatchIsMinCost" -->
-            <div
-            v-if="form.dispatchIsMinCost" class="el_flex_row" >
-              <span class="el_table_span">最低计费方式</span>
-              <el-radio-group v-model="form.dispatchMinCostMode" class="el_Cselect el_fx">
-                <el-radio v-for="item in Billingmethod" :key="item.label" :label="item.value">{{
+          <!-- 是否有上楼费  -->
+          <div class="el_Storage">
+            <div class="el_upstairs_a">
+              <span class="el_table_span">是否有上楼费</span>
+              <el-radio-group
+                @change="UpstairsChange"
+                v-model="form.dispatchIsStairsCarryingCharge"
+                class="el_Cselect"
+              >
+                <el-radio v-for="item in upstairs" :key="item.label" :label="item.value">{{
                   item.label
                 }}</el-radio>
               </el-radio-group>
             </div>
-            <!-- 最低计费类型  -->
-
-            <div class="el_flex_row"  v-if="form.dispatchIsMinCost">
-              <span class="el_table_span">最低计费类型</span>
-              <el-radio-group v-model="form.dispatchMinCostType" class="el_Cselect el_fx">
-                <el-radio v-for="item in chargetypeSelect" :key="item.label" :label="item.value">{{
+          </div>
+          <div class="el_Storage">
+            <div class="el_upstairs_b" v-if="form.dispatchIsStairsCarryingCharge">
+              <span class="el_table_span">是否配置免费层数</span>
+              <el-radio-group v-model="form.dispatchIsFeeFloor" class="el_Cselect">
+                <el-radio v-for="item in Numberlayers" :key="item.label" :label="item.value">{{
                   item.label
                 }}</el-radio>
               </el-radio-group>
             </div>
+          </div>
+        </div>
+        <div class="el_translation">
+          <!-- 是否有平移费  -->
+          <div class="el_Storage">
+            <span class="el_table_span">是否有平移费</span>
+            <el-radio-group v-model="form.dispatchIsShiftingCharge" class="el_Cselect el_fx">
+              <el-radio v-for="item in Translationfee" :key="item.label" :label="item.value">{{
+                item.label
+              }}</el-radio>
+            </el-radio-group>
+          </div>
 
-            <!-- 是否向上判断  -->
-     
-            <div  v-if="!form.dispatchIsMinCost" class="el_flex_row" >
-              <span class="el_table_span">是否向上判断</span>
-              <el-radio-group v-model="form.dispatchIsUpwardJudgment" class="el_Cselect el_fx">
-                <el-radio v-for="item in Upwardjudgment" :key="item.label" :label="item.value">{{
-                  item.label
-                }}</el-radio>
-              </el-radio-group>
+          <!-- 附加费是否统一计费  -->
+          <div class="el_Storage">
+            <span class="el_table_span">附加费是否按品类计费</span>
+            <el-radio-group v-model="form.dispatchIsCategorySubjoin" class="el_Cselect el_fx">
+              <el-radio
+                @change="SurchargeChange"
+                v-for="item in Surchargefee"
+                :key="item.label"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
+            </el-radio-group>
+          </div>
+        </div>
+
+        <!-- 附加费品类 -->
+        <div class="el_Storage" v-if="form.dispatchIsCategorySubjoin">
+          <div class="Storage-cont">
+            <span class="el_table_span">附加费品类</span>
+            <!-- 表格 -->
+            <div
+              class="el_Storagecategory"
+              v-loading="goriesloading"
+              element-loading-text="Loading..."
+            >
+              <!-- 使用table标签创建表格 -->
+              <table class="styled-table">
+                <thead>
+                  <tr>
+                    <th style="width: 30px; text-align: center">序号</th>
+                    <th>品类</th>
+                    <th style="width: 104px">操作</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <!-- 表格循环 -->
+                  <tr v-for="item in AdditionalcategoriesList" :key="item.id">
+                    <!-- 序号 -->
+                    <td style="text-align: center">{{ item.id }}</td>
+                    <!-- 选择的品类 -->
+                    <td>
+                      <el-select
+                        class="el_Cselect"
+                        v-model="item.Warehousecategory"
+                        filterable
+                        remote
+                        clearable
+                        reserve-keyword
+                        placeholder="请选择品类"
+                        style="width: 100%"
+                        remote-show-suffix
+                        :remote-method="categoriesearch"
+                        @focus="categoriesSearchfocus(item)"
+                      >
+                        <!-- 品类列表 -->
+                        <el-option
+                          v-for="items in item.Additionalcategories"
+                          :key="items.value"
+                          :label="items.label"
+                          :value="items.value"
+                        />
+                      </el-select>
+                    </td>
+                    <td style="line-height: 16px">
+                      <span @click="categoriesplus(item.id)" v-if="item.plus" class="el_btn_a">
+                        <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
+                          ><CirclePlus /></el-icon
+                        >新增
+                      </span>
+                      <span @click="categoriesduce(item.id)" v-if="item.reduce" class="el_btn_b">
+                        <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
+                          ><Delete /></el-icon
+                        >删除
+                      </span>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 操作按钮 -->
-    <div class="flex-c-c">
-      <el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
-      <el-button type="primary" icon="Position" @click="handleSubmit">保存</el-button>
-    </div>
 
-    
+        <!-- 最低计费  -->
+        <div class="el_Storage el_Minimumbilling">
+          <span>最低计费</span>
+          <div class="el_Storage">
+            <div class="el_Minimumbillingbox">
+              <!-- 是否最低计费 -->
+              <div class="el_flex_row">
+                <span class="el_table_span">是否最低计费</span>
+                <el-radio-group v-model="form.dispatchIsMinCost" class="el_Cselect el_fx">
+                  <el-radio
+                    @change="MinimumChange"
+                    v-for="item in Minimumbilling"
+                    :key="item.label"
+                    :label="item.value"
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+              </div>
+              <!-- 最低计费方式 -->
+              <!-- v-if="form.dispatchIsMinCost" -->
+              <div v-if="form.dispatchIsMinCost" class="el_flex_row">
+                <span class="el_table_span">最低计费方式</span>
+                <el-radio-group v-model="form.dispatchMinCostMode" class="el_Cselect el_fx">
+                  <el-radio v-for="item in Billingmethod" :key="item.label" :label="item.value">{{
+                    item.label
+                  }}</el-radio>
+                </el-radio-group>
+              </div>
+              <!-- 最低计费类型  -->
+
+              <div class="el_flex_row" v-if="form.dispatchIsMinCost">
+                <span class="el_table_span">最低计费类型</span>
+                <el-radio-group v-model="form.dispatchMinCostType" class="el_Cselect el_fx">
+                  <el-radio
+                    v-for="item in chargetypeSelect"
+                    :key="item.label"
+                    :label="item.value"
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+              </div>
+
+              <!-- 是否向上判断  -->
+
+              <div v-if="!form.dispatchIsMinCost" class="el_flex_row">
+                <span class="el_table_span">是否向上判断</span>
+                <el-radio-group v-model="form.dispatchIsUpwardJudgment" class="el_Cselect el_fx">
+                  <el-radio v-for="item in Upwardjudgment" :key="item.label" :label="item.value">{{
+                    item.label
+                  }}</el-radio>
+                </el-radio-group>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 操作按钮 -->
+      <div class="flex-c-c">
+        <el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
+        <el-button type="primary" icon="Position" @click="handleSubmit">保存</el-button>
+      </div>
+    </el-form>
   </div>
 </template>
 
 <script setup>
-import { ref, defineEmits, defineComponent } from 'vue';
-import { ElMessage,ElMessageBox } from 'element-plus';
+import { ref, defineEmits, defineComponent, reactive } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { deepClone } from '@/utils/util';
 import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
@@ -388,8 +315,9 @@ const props = defineProps({
   templateData: Object,
 });
 console.log(props, '来自父页面参数');
+const request = ref({}); //接收参数
 //表单
-const pageLoading=ref(false)
+const pageLoading = ref(true);
 const formCopy = ref(null); //拷贝的数据
 const form = ref({
   dispatchServiceType: '', //仓储计费类型
@@ -405,12 +333,12 @@ const form = ref({
   dispatchMinCostMode: null, //最低计费方式
   dispatchMinCostType: 1, //最低计费类型
   dispatchIsUpwardJudgment: 0, //是否向上判断
-  WarehousebillingmodeTitle:'',//标题
+  WarehousebillingmodeTitle: '', //标题
 });
 const SelectOpin = ref(null); //当前点击的品类搜索框
 // 是否向上判断
 const Upwardjudgment = ref([]);
-const CommercialcialCopy=ref([]);//服务类型拷贝
+const CommercialcialCopy = ref([]); //服务类型拷贝
 // 最低计费类型
 const chargetypeSelect = ref([]);
 // 最低计费方式
@@ -521,9 +449,9 @@ const categoryChange = val => {
 // 是否最低计费展示
 const MinimumChange = val => {
   console.log(val);
-  if (val) {  
+  if (val) {
     form.value.dispatchMinCostMode = 1;
-    form.value.dispatchIsUpwardJudgment =0
+    form.value.dispatchIsUpwardJudgment = 0;
   } else {
     form.value.dispatchMinCostMode = 0;
     form.value.dispatchIsUpwardJudgment = 0; //向上判断
@@ -545,8 +473,8 @@ const isChecked = value => {
   //   找到当前点击的菜单,显示对应的列表
   if (value.value == '1' || value.value == '2' || value.value == '3') {
     let data = ServiceList.value.find(res => res.label == value.label);
-    console.log(data,'data===>');
-    console.log( Commercialcial.value,'要处理的数据');
+    console.log(data, 'data===>');
+    console.log(Commercialcial.value, '要处理的数据');
     Commercialcial.value.find(res => res.title == data.label).state = !Commercialcial.value.find(
       res => res.title == data.label
     ).state;
@@ -672,8 +600,8 @@ const categoriesduce = id => {
   FmremoveItemById(AdditionalcategoriesList.value, id);
 };
 
-function updateDictionary(targetArray, dictionaryType) {
-  getDictionaryBiz(dictionaryType)
+async function updateDictionary(targetArray, dictionaryType) {
+  await getDictionaryBiz(dictionaryType)
     .then(async res => {
       console.log(res, '字典');
       if (res.data.code == 200) {
@@ -689,7 +617,7 @@ function updateDictionary(targetArray, dictionaryType) {
       }
 
       //服务类型
-      if (dictionaryType == 'dispatch_pricing_type') {
+      if (dictionaryType === 'dispatch_pricing_type') {
         Commercialcial.value = []; //清空服务类型
         res.data.data.forEach(res => {
           let data = {
@@ -712,10 +640,9 @@ function updateDictionary(targetArray, dictionaryType) {
           Commercialcial.value.push({
             ...data,
           });
-          
         });
-        CommercialcialCopy.value=deepClone(Commercialcial.value)
-  
+        console.log(Commercialcial.value, 'Commercialcial.value===>>>>????');
+        CommercialcialCopy.value = deepClone(Commercialcial.value);
       }
       console.log(form.value, '服务类型');
       // 是否类型
@@ -730,172 +657,6 @@ function updateDictionary(targetArray, dictionaryType) {
         Minimumbilling.value = { ...Distinguishcategories.value }; //是否最低计费
         Upwardjudgment.value = { ...Distinguishcategories.value }; //是否向上判断
       }
-
-      // 编辑回显
-      if (props.templateData.request) {
-        let request = props.templateData.request;
-        form.value = await deepClone(request);
-
-        form.value.dispatchPricingType = request.dispatchPricingType
-          ? request.dispatchPricingType.split(',').map(Number)
-          : []; //服务类型
-
-        ServiceList.value.forEach(dataItem => {
-          if (form.value.dispatchPricingType.includes(dataItem.value)) {
-            dataItem.check = true;
-          }
-        });
-
-        if (request.dispatchIsByCategory) {
-          categoriesState.value = true; //区分品类
-          console.log(categoriesState.value, '是否区分品类');
-        }
-        // 配送服务类型标题
-        form.value.WarehousebillingmodeTitle = Warehousebillingmode.value.find(
-          res => res.value == form.value.dispatchServiceType
-        ).label;
-        StateDelivery.value = true; //显示表格
-        // 显示那些表格
-        Commercialcial.value.forEach(dataItem => {
-          // 检查当前dataItem的id是否为1, 2, 或 3 且 dispatchPricingType数组包含这个id
-          if (
-            [1, 2, 3].includes(dataItem.id) &&
-            form.value.dispatchPricingType.includes(dataItem.id)
-          ) {
-            dataItem.state = true;
-          } else {
-            // 如果需要，这里可以添加处理其他情况的逻辑，默认情况下不设置state或设置为false
-            // 例如 dataItem.state = false;
-          }
-        });
-        // 按件计费回显
-        if (request.dispatchPieceCategory) {
-          let piece = Commercialcial.value.find(res => res.id == 1);
-          piece.sequence = [];
-          request.dispatchPieceCategorys.forEach((res, index) => {
-            console.log(piece, '按件显示');
-            piece.sequence.push({
-              Additionalcategories: [
-                {
-                  label: res.name,
-                  value: res.id,
-                },
-              ],
-              StateName: 'storage',
-              Warehousecategory: res.id,
-              id: index + 1,
-              plus: true,
-              reduce: !index ? false : true,
-            });
-          });
-        }
-        // 按重量
-        if (request.dispatchWeightCategory) {
-          let piece = Commercialcial.value.find(res => res.id == 2);
-          piece.sequence = [];
-          request.dispatchWeightCategorys.forEach((res, index) => {
-            console.log(piece, '按件显示');
-            piece.sequence.push({
-              Additionalcategories: [
-                {
-                  label: res.name,
-                  value: res.id,
-                },
-              ],
-              StateName: 'storage',
-              Warehousecategory: res.id,
-              id: index + 1,
-              plus: true,
-              reduce: !index ? false : true,
-            });
-          });
-        }
-        // 按方
-        if (request.dispatchCubeCategory) {
-          let piece = Commercialcial.value.find(res => res.id == 3);
-          piece.sequence = [];
-          request.dispatchCubeCategorys.forEach((res, index) => {
-            console.log(piece, '按件显示');
-            piece.sequence.push({
-              Additionalcategories: [
-                {
-                  label: res.name,
-                  value: res.id,
-                },
-              ],
-              StateName: 'storage',
-              Warehousecategory: res.id,
-              id: index + 1,
-              plus: true,
-              reduce: !index ? false : true,
-            });
-          });
-        }
-
-        // 附加品类回显
-        if (request.dispatchSubjoinCategory) {
-          AdditionalcategoriesList.value = [];
-          console.log('执行1');
-          request.dispatchSubjoinCategorys.forEach((res, index) => {
-            console.log('执行2');
-            AdditionalcategoriesList.value.push({
-              Additionalcategories: [
-                {
-                  label: res.name,
-                  value: res.id,
-                },
-              ],
-              StateName: 'additional',
-              Warehousecategory: res.id,
-              id: index + 1,
-              plus: true,
-              reduce: !index ? false : true,
-            });
-          });
-        }
-
-        //       function updateSequence(requestCategorys, commercialId, stateName) {
-        //   let piece = Commercialcial.value.find(res => res.id == commercialId);
-        //   if (!piece) return; // 确保找到了相应的部分再继续
-
-        //   piece.sequence = []; // 重置sequence防止数据累加
-        //   requestCategorys.forEach((res, index) => {
-        //     piece.sequence.push({
-        //       Additionalcategories: [{
-        //         label: res.name,
-        //         value: res.id,
-        //       }],
-        //       StateName: stateName,
-        //       Warehousecategory: res.id,
-        //       id: index + 1,
-        //       plus: true,
-        //       reduce: !index ? false : true,
-        //     });
-        //     console.log(piece, `按${stateName}显示`); // 根据状态显示不同的日志
-        //   });
-        // }
-
-        // // 按件计费回显
-        // if (request.dispatchPieceCategory) {
-        //   updateSequence(request.dispatchPieceCategorys, 1, "storage");
-        // }
-
-        // // 按重量
-        // if (request.dispatchWeightCategory) {
-        //   updateSequence(request.dispatchWeightCategorys, 2, "storage");
-        // }
-
-        // // 按方
-        // if (request.dispatchCubeCategory) {
-        //   updateSequence(request.dispatchCubeCategorys, 3, "storage");
-        // }
-
-        // // 附加品类回显
-        // if (request.dispatchSubjoinCategory) {
-        //   AdditionalcategoriesList.value = []; // 重置数组
-        //   updateSequence(request.dispatchSubjoinCategorys, 0, "additional");
-        // }
-      }
     })
     .catch(() => {})
     .finally(() => {});
@@ -946,37 +707,159 @@ const categoriesearch = goodsName => {
     }
   });
 };
-const clink=()=>{
-  if(ServiceList.value.length)
-  ServiceList.value.forEach(res=>res.check=false)
-}
+const clink = () => {
+  if (ServiceList.value.length) ServiceList.value.forEach(res => (res.check = false));
+};
 /** 重置数据 */
 const resetFormData = () => {
-    console.log( CommercialcialCopy.value);
+  console.log(CommercialcialCopy.value);
   ElMessageBox.confirm('是否重置数据?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-   pageLoading.value = true;
-   clink()
-   Commercialcial.value = deepClone(CommercialcialCopy.value) 
-  form.value = deepClone(formCopy.value);
+    pageLoading.value = true;
+    clink();
+    Commercialcial.value = deepClone(CommercialcialCopy.value);
+    form.value = deepClone(formCopy.value);
     setTimeout(() => {
-  pageLoading.value = false;
+      pageLoading.value = false;
     }, 300);
   });
 };
 
-
 // 页面初始化必要请求
-const onLoad = async() => {
- await updateDictionary(ServiceList.value, 'dispatch_pricing_type'); //仓储计费类型
-  formCopy.value =await deepClone(form.value);
-  updateDictionary(Warehousebillingmode.value, 'dispatch_type'); //仓储计费类型
-  updateDictionary(Distinguishcategories.value, 'price_yes_no'); //是否区分品类
-  updateDictionary(Billingmethod.value, 'min_cost_way'); //是否区分品类
-  updateDictionary(chargetypeSelect.value, 'min_cost_type'); //最低计费类型
+const onLoad = async () => {
+  await updateDictionary(ServiceList.value, 'dispatch_pricing_type'); //仓储计费类型
+
+  await updateDictionary(Warehousebillingmode.value, 'dispatch_type'); //仓储计费类型
+  await updateDictionary(Distinguishcategories.value, 'price_yes_no'); //是否区分品类
+  await updateDictionary(Billingmethod.value, 'min_cost_way'); //是否区分品类
+  await updateDictionary(chargetypeSelect.value, 'min_cost_type'); //最低计费类型
+  formCopy.value = await deepClone(form.value);
+  // 编辑回显
+  if (props.templateData.request) {
+    request.value = await deepClone(props.templateData.request);
+    form.value = await deepClone(request.value);
+
+    form.value.dispatchPricingType = request.value.dispatchPricingType
+      ? request.value.dispatchPricingType.split(',').map(Number)
+      : []; //服务类型
+
+    ServiceList.value.forEach(dataItem => {
+      if (form.value.dispatchPricingType.includes(dataItem.value)) {
+        dataItem.check = true;
+      }
+    });
+
+    if (request.value.dispatchIsByCategory) {
+      categoriesState.value = true; //区分品类
+      console.log(categoriesState.value, '是否区分品类');
+    }
+    // 配送服务类型标题
+    form.value.WarehousebillingmodeTitle = Warehousebillingmode.value.find(
+      res => res.value == form.value.dispatchServiceType
+    ).label;
+    StateDelivery.value = true; //显示表格
+    // 显示那些表格
+    Commercialcial.value.forEach(dataItem => {
+      // 检查当前dataItem的id是否为1, 2, 或 3 且 dispatchPricingType数组包含这个id
+      if ([1, 2, 3].includes(dataItem.id) && form.value.dispatchPricingType.includes(dataItem.id)) {
+        dataItem.state = true;
+      } else {
+        dataItem.state = false;
+      }
+    });
+    // 按件计费回显
+    if (request.value.dispatchPieceCategory) {
+      console.log(Commercialcial.value, 'Commercialcial.value===>');
+      let piece = Commercialcial.value.find(res => res.id == 1);
+      console.log(piece, 'piece===>???');
+      piece.sequence = [];
+      request.value.dispatchPieceCategorys.forEach((res, index) => {
+        console.log(piece, '按件显示');
+        piece.sequence.push({
+          Additionalcategories: [
+            {
+              label: res.name,
+              value: res.id,
+            },
+          ],
+          StateName: 'storage',
+          Warehousecategory: res.id,
+          id: index + 1,
+          plus: true,
+          reduce: !index ? false : true,
+        });
+      });
+    }
+    // 按重量
+    if (request.value.dispatchWeightCategory) {
+      let piece = Commercialcial.value.find(res => res.id == 2);
+      piece.sequence = [];
+      request.value.dispatchWeightCategorys.forEach((res, index) => {
+        console.log(piece, '按件显示');
+        piece.sequence.push({
+          Additionalcategories: [
+            {
+              label: res.name,
+              value: res.id,
+            },
+          ],
+          StateName: 'storage',
+          Warehousecategory: res.id,
+          id: index + 1,
+          plus: true,
+          reduce: !index ? false : true,
+        });
+      });
+    }
+    // 按方
+    if (request.value.dispatchCubeCategory) {
+      let piece = Commercialcial.value.find(res => res.id == 3);
+      piece.sequence = [];
+      request.value.dispatchCubeCategorys.forEach((res, index) => {
+        console.log(piece, '按件显示');
+        piece.sequence.push({
+          Additionalcategories: [
+            {
+              label: res.name,
+              value: res.id,
+            },
+          ],
+          StateName: 'storage',
+          Warehousecategory: res.id,
+          id: index + 1,
+          plus: true,
+          reduce: !index ? false : true,
+        });
+      });
+    }
+
+    // 附加品类回显
+    if (request.value.dispatchSubjoinCategory) {
+      AdditionalcategoriesList.value = [];
+      console.log('执行1');
+      request.value.dispatchSubjoinCategorys.forEach((res, index) => {
+        console.log('执行2');
+        AdditionalcategoriesList.value.push({
+          Additionalcategories: [
+            {
+              label: res.name,
+              value: res.id,
+            },
+          ],
+          StateName: 'additional',
+          Warehousecategory: res.id,
+          id: index + 1,
+          plus: true,
+          reduce: !index ? false : true,
+        });
+      });
+    }
+  }
+  console.log('执行2');
+  pageLoading.value = false;
 };
 onLoad();
 // 保存事件
@@ -1044,18 +927,16 @@ const handleSubmit = async () => {
   }
   // 选择了是否区分品类才进行处理数据
   console.log(categoriesState.value, 'categoriesState.value');
-  if (form.value.dispatchIsByCategory){
-    if(!form.value.dispatchPricingType.find(res=>res.value ==1)){
-         Submit.dispatchPieceCategory=''
-      }
-      if(!form.value.dispatchPricingType.find(res=>res.value ==2)){
-         Submit.dispatchWeightCategory=''
-      }
-      if(!form.value.dispatchPricingType.find(res=>res.value ==3)){
-         Submit.dispatchCubeCategory=''
-      }
-
-
+  if (form.value.dispatchIsByCategory) {
+    if (!form.value.dispatchPricingType.find(res => res.value == 1)) {
+      Submit.dispatchPieceCategory = '';
+    }
+    if (!form.value.dispatchPricingType.find(res => res.value == 2)) {
+      Submit.dispatchWeightCategory = '';
+    }
+    if (!form.value.dispatchPricingType.find(res => res.value == 3)) {
+      Submit.dispatchCubeCategory = '';
+    }
 
     for (const res of form.value.dispatchPricingType) {
       let shouldReturn = false;
@@ -1086,25 +967,20 @@ const handleSubmit = async () => {
       }
       if (shouldReturn) return; // 如果检查未通过，退出当前函数
     }
-  }else{
-   Submit.dispatchPieceCategory=''
-   Submit.dispatchWeightCategory=''
-   Submit.dispatchCubeCategory=''
+  } else {
+    Submit.dispatchPieceCategory = '';
+    Submit.dispatchWeightCategory = '';
+    Submit.dispatchCubeCategory = '';
   }
 
-
-  
-
-
-
   // 附加费是否按品类计费选择了是才进行处理
   if (form.value.dispatchIsCategorySubjoin) {
     Submit.dispatchSubjoinCategory = AdditionalcategoriesList.value
       .map(res => res.Warehousecategory)
       .join(','); //附加费品类
-  }else{
-    if(Submit.dispatchSubjoinCategory){
-     Submit.dispatchSubjoinCategory=''
+  } else {
+    if (Submit.dispatchSubjoinCategory) {
+      Submit.dispatchSubjoinCategory = '';
     }
   }
 
@@ -1180,9 +1056,6 @@ const handleSubmit = async () => {
   }
 }
 
-.el-select-dropdown__item {
-  padding: 0;
-}
 .el-select-dropdown__item::after {
   content: '';
   display: none;
@@ -1371,17 +1244,16 @@ const handleSubmit = async () => {
 .el_Minimumbilling {
   .el_Minimumbillingbox {
     display: flex;
-    .el_flex_row{
+    .el_flex_row {
       display: flex;
       flex-direction: column;
       width: 24%;
       margin-right: 30px;
-      .el-radio-group{
+      .el-radio-group {
         width: 100%;
       }
     }
   }
-
 }
 .el_flex {
   display: flex;
@@ -1473,17 +1345,17 @@ const handleSubmit = async () => {
     color: #ff0000;
   }
 }
-.el_translation{
+.el_translation {
   display: flex;
-    width: 100%;
-    .el_Storage{
-      width: 24%;
-      display: flex;
+  width: 100%;
+  .el_Storage {
+    width: 24%;
+    display: flex;
     flex-direction: column;
     margin-right: 24px;
     .el-radio-group {
-      width: 100%
-    }
+      width: 100%;
     }
+  }
 }
 </style>
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index 0aa59491..b45ce390 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -1,260 +1,231 @@
 <template>
   <div class="content_max" v-loading="pageLoading">
-    <div class="el_flex_box">
-      <!-- 仓储计费类型 -->
-      <div class="el_Storage el_flex">
-        <span class="el_table_span">仓储计费类型</span>
-        <el-select
-          class="el_Cselect"
-          v-model="form.warehousePricingType"
-          filterable
-          clearable
-          placeholder="选择计费类型"
-        >
-          <el-option
-            v-for="item in Storagebillingtype"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </div>
-
-      <!-- 仓储计费模式 -->
-      <div class="el_Storage">
-        <span class="el_table_span">仓储计费模式</span>
-        <el-select
-          class="el_Cselect"
-          v-model="form.warehousePricingMode"
-          filterable
-          clearable
-          placeholder="选择仓储计费模式"
-        >
-          <el-option
-            v-for="item in Warehousebillingmode"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </div>
-
-      <!-- 计算基准 -->
-      <div class="el_Storage">
-        <span class="el_table_span">计算基准</span>
-        <el-radio-group v-model="form.warehouseCalculationBasis" class="el_Cselect">
-          <el-radio v-for="item in CalculationBasis" :key="item.label" :label="item.value">{{
-            item.label
-          }}</el-radio>
-        </el-radio-group>
-      </div>
-
-      <!-- 是否区分品类 -->
-      <div class="el_Storage">
-        <span class="el_table_span">是否区分品类</span>
-        <el-radio-group
-          @change="categoriesDisplayChange"
-          v-model="form.warehouseIsByCategory"
-          class="el_Cselect"
-        >
-          <el-radio v-for="item in Distinguishcategories" :key="item.label" :label="item.value">{{
-            item.label
-          }}</el-radio>
-        </el-radio-group>
-      </div>
-    </div>
-    <!-- 仓储品类配置 -->
-    <!--  -->
-    <div class="el_Storage Storage-cont" v-if="form.warehouseIsByCategory" style="width: 24%">
-      <span class="el_table_span">仓储品类配置</span>
-      <SurchargeTable
-        :SurchargeData="StoragecategoryData"
-        :Surcharge="Storagecategory"
-        @focus="handleRowFocus"
-        @search="search"
-      >
-        <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '操作'">
-            <div class="eml_btn">
-              <span @click="storageplus" class="el_btn_a" v-if="slotProps.scope.row.plus">
-                <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
-                  ><CirclePlus /></el-icon
-                >新增
-              </span>
-              <span
-                @click="storagereduce(slotProps.scope.row.index)"
-                class="el_btn_b"
-                v-if="slotProps.scope.row.reduce"
-              >
-                <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"><Delete /></el-icon
-                >删除
-              </span>
-            </div>
-          </template>
-        </template>
-      </SurchargeTable>
-    </div>
-    <hr class="el_hr" />
-    <!-- 附加费 -->
-    <div class="el_Surcharge_title">
-      <span>附加费</span>
-    </div>
-    <div class="el_Surcharge">
-      <!-- 附加费计价单位 -->
-      <div class="el_flex_row">
+    <el-form :model="form" ref="ruleFormRef" :rules="rules">
+      <div class="el_flex_box">
         <div class="el_Storage">
-          <span class="el_table_span">附加费计价单位</span>
-          <el-select
-            class="el_Cselect"
-            v-model="form.warehouseSubjoinFeeUnit"
-            filterable
-            clearable
-            placeholder="选择计费类型"
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in Surchargepricingunit"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
+          <el-form-item label="仓储计费类型" prop="warehousePricingType">
+            <el-select
+              class="el_Cselect"
+              v-model="form.warehousePricingType"
+              filterable
+              clearable
+              placeholder="选择计费类型"
+            >
+              <el-option
+                v-for="item in Storagebillingtype"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </div>
-
-        <!-- 是否有管理费 -->
+        <!-- 仓储计费模式 -->
         <div class="el_Storage">
-          <span class="el_table_span">是否有管理费</span>
-          <el-radio-group v-model="form.warehouseIsManageFee" class="el_Cselect">
-            <el-radio v-for="item in Managementfees" :key="item.label" :label="item.value">{{
-              item.label
-            }}</el-radio>
-          </el-radio-group>
+          <el-form-item label="仓储计费模式" prop="warehousePricingMode">
+            <el-select
+              class="el_Cselect"
+              v-model="form.warehousePricingMode"
+              filterable
+              clearable
+              placeholder="选择仓储计费模式"
+            >
+              <el-option
+                v-for="item in Warehousebillingmode"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </div>
 
-        <!-- 是否有操作/装卸费 -->
+        <!-- 计算基准 -->
         <div class="el_Storage">
-          <span class="el_table_span">是否有操作/装卸费</span>
-          <el-radio-group v-model="form.warehouseIsOperateFee" class="el_Cselect">
-            <el-radio v-for="item in Operatingunloading" :key="item.label" :label="item.value">{{
-              item.label
-            }}</el-radio>
-          </el-radio-group>
+          <el-form-item label="计算基准">
+            <el-radio-group v-model="form.warehouseCalculationBasis" class="el_Cselect">
+              <el-radio v-for="item in CalculationBasis" :key="item.label" :label="item.value">{{
+                item.label
+              }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </div>
 
-        <!-- 是否有分拣费用 -->
+        <!-- 是否区分品类 -->
         <div class="el_Storage">
-          <span class="el_table_span">是否有分拣费用</span>
-          <el-radio-group v-model="form.warehouseIsSortFee" class="el_Cselect">
-            <el-radio v-for="item in Sortingfee" :key="item.label" :label="item.value">{{
-              item.label
-            }}</el-radio>
-          </el-radio-group>
+          <el-form-item label="是否区分品类">
+            <el-radio-group
+              @change="categoriesDisplayChange"
+              v-model="form.warehouseIsByCategory"
+              class="el_Cselect"
+            >
+              <el-radio
+                v-for="item in Distinguishcategories"
+                :key="item.label"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
         </div>
       </div>
-      <!-- 附加费用是否统一计费 -->
-      <div class="el_Storage">
-        <span class="el_table_span">附加费是否按品类计费</span>
-
-        <el-radio-group
-          @change="AdditionalDisplayChange"
-          v-model="form.warehouseIsCategorySubjoin"
-          class="el_Cselect"
+      <!-- 仓储品类配置 -->
+      <!--  -->
+      <div class="el_Storage Storage-cont" v-if="form.warehouseIsByCategory" style="width: 24%">
+        <span class="el_table_span" style="margin-bottom: 18px">仓储品类配置</span>
+        <SurchargeTable
+          :SurchargeData="form.StoragecategoryData"
+          :Surcharge="Storagecategory"
+          @focus="handleRowFocus"
+          @search="search"
         >
-          <el-radio v-for="item in Additionalfeebilling" :key="item.label" :label="item.value">{{
-            item.label
-          }}</el-radio>
-        </el-radio-group>
-      </div>
-
-      <!-- 附加费品类配置 -->
-      <div class="el_Storage" v-if="form.warehouseIsCategorySubjoin" style="width: 24%">
-        <div class="Storage-cont">
-          <span class="el_table_span">附加费品类配置</span>
-          <!-- 表格  -->
-          <SurchargeTable
-            :SurchargeData="AdditionalcategoriesData"
-            :Surcharge="Additionalcategories"
-            @focus="handleRowFocus"
-            @search="search"
-          >
-            <template #default="slotProps">
-              <template v-if="slotProps.scope.column.label === '操作'">
-                <div class="eml_btn">
-                  <span @click="categoriesplus" class="el_btn_a" v-if="slotProps.scope.row.plus">
-                    <el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon>新增
-                  </span>
-                  <span
-                    @click="categoriesduce(slotProps.scope.row.index)"
-                    class="el_btn_b"
-                    v-if="slotProps.scope.row.reduce"
-                  >
-                    <el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>删除
-                  </span>
-                </div>
-              </template>
+          <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <div class="eml_btn">
+                <span @click="storageplus" class="el_btn_a" v-if="slotProps.scope.row.plus">
+                  <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
+                    ><CirclePlus /></el-icon
+                  >新增
+                </span>
+                <span
+                  @click="storagereduce(slotProps.scope.row.index)"
+                  class="el_btn_b"
+                  v-if="slotProps.scope.row.reduce"
+                >
+                  <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
+                    ><Delete /></el-icon
+                  >删除
+                </span>
+              </div>
             </template>
-          </SurchargeTable>
-          <!-- <div
-            class="el_Storagecategory"
-            v-loading="goriesloading"
-            element-loading-text="Loading..."
-          >
-            <div class="el_table_span">
-              <div class="el_table_id">序号</div>
-              <div class="el_table_title">产品品类</div>
-            </div>
-    
-            <div class="el_table_td" v-for="item in AdditionalcategoriesList" :key="item.id">
-              <div class="el_table_idNumber">{{ item.id }}</div>
+          </template>
+        </SurchargeTable>
+      </div>
+      <hr class="el_hr" />
+      <!-- 附加费 -->
+      <div class="el_Surcharge_title">
+        <span>附加费</span>
+      </div>
+      <div class="el_Surcharge">
+        <!-- 附加费计价单位 -->
+        <div class="el_flex_row">
+          <div class="el_Storage">
+            <el-form-item label="附加费计价单位" prop="warehouseSubjoinFeeUnit">
               <el-select
                 class="el_Cselect"
-                v-model="item.warehousePieceCategory"
+                v-model="form.warehouseSubjoinFeeUnit"
                 filterable
-                remote
                 clearable
-                reserve-keyword
-                placeholder="请选择品类"
-                style="width: 240px"
-                remote-show-suffix
-                :remote-method="categoriesearch"
-                @focus="categoriesSearchfocus(item)"
+                placeholder="选择计费类型"
+                style="width: 100%"
               >
                 <el-option
-                  v-for="items in item.Additionalcategories"
-                  :key="items.value"
-                  :label="items.label"
-                  :value="items.value"
+                  v-for="item in Surchargepricingunit"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 />
               </el-select>
-              <div class="el_table_operation">
-                <span
-                  @click="categoriesplus(item.id)"
-                  v-if="item.plus"
-                  class="el_table_operation_span_b"
-                  >+</span
-                >
-                <span
-                  @click="categoriesduce(item.id)"
-                  v-if="item.reduce"
-                  class="el_table_operation_span_a"
-                  >-</span
+            </el-form-item>
+          </div>
+
+          <!-- 是否有管理费 -->
+          <div class="el_Storage">
+            <el-form-item label="是否有管理费">
+              <el-radio-group v-model="form.warehouseIsManageFee" class="el_Cselect">
+                <el-radio v-for="item in Managementfees" :key="item.label" :label="item.value">{{
+                  item.label
+                }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </div>
+
+          <!-- 是否有操作/装卸费 -->
+          <div class="el_Storage">
+            <el-form-item label="是否有操作/装卸费">
+              <el-radio-group v-model="form.warehouseIsOperateFee" class="el_Cselect">
+                <el-radio
+                  v-for="item in Operatingunloading"
+                  :key="item.label"
+                  :label="item.value"
+                  >{{ item.label }}</el-radio
                 >
-              </div>
-            </div>
-          </div> -->
+              </el-radio-group>
+            </el-form-item>
+          </div>
+
+          <!-- 是否有分拣费用 -->
+          <div class="el_Storage">
+            <el-form-item label="是否有分拣费用">
+              <el-radio-group v-model="form.warehouseIsSortFee" class="el_Cselect">
+                <el-radio v-for="item in Sortingfee" :key="item.label" :label="item.value">{{
+                  item.label
+                }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </div>
+        </div>
+        <!-- 附加费用是否统一计费 -->
+        <div class="el_Storage">
+          <el-form-item label="附加费是否按品类计费">
+            <el-radio-group
+              @change="AdditionalDisplayChange"
+              v-model="form.warehouseIsCategorySubjoin"
+              class="el_Cselect"
+            >
+              <el-radio
+                v-for="item in Additionalfeebilling"
+                :key="item.label"
+                :label="item.value"
+                >{{ item.label }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </div>
+
+        <!-- 附加费品类配置 -->
+        <div class="el_Storage" v-if="form.warehouseIsCategorySubjoin" style="width: 24%">
+          <div class="Storage-cont">
+            <span class="el_table_span">附加费品类配置</span>
+            <!-- 表格  -->
+            <SurchargeTable
+              :SurchargeData="form.AdditionalcategoriesData"
+              :Surcharge="Additionalcategories"
+              @focus="handleRowFocus"
+              @search="search"
+            >
+              <template #default="slotProps">
+                <template v-if="slotProps.scope.column.label === '操作'">
+                  <div class="eml_btn">
+                    <span @click="categoriesplus" class="el_btn_a" v-if="slotProps.scope.row.plus">
+                      <el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon
+                      >新增
+                    </span>
+                    <span
+                      @click="categoriesduce(slotProps.scope.row.index)"
+                      class="el_btn_b"
+                      v-if="slotProps.scope.row.reduce"
+                    >
+                      <el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>删除
+                    </span>
+                  </div>
+                </template>
+              </template>
+            </SurchargeTable>
+          </div>
         </div>
       </div>
-    </div>
-    <!-- 操作按钮 -->
-    <div class="flex-c-c">
-      <el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
-      <el-button type="primary" icon="Position" @click="Submit">保存</el-button>
-    </div>
+      <!-- 操作按钮 -->
+      <div class="flex-c-c">
+        <el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
+        <el-button type="primary" icon="Position" @click="Submit">保存</el-button>
+      </div>
+    </el-form>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { defineProps, defineEmits, defineComponent } from 'vue';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import {
@@ -267,23 +238,45 @@ import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
 import { deepClone } from '@/utils/util';
 import { useRoute } from 'vue-router';
 import SurchargeTable from '@/components/pric/tablePric.vue';
-const pageLoading = ref(false); //页面加载
+const pageLoading = ref(true); //页面加载
+const ruleFormRef = ref();
 const SelectData = ref({});
-// 仓储
-const StoragecategoryData = ref([
-  {
-    index: 1,
-    warehousePieceCategory: '',
-    options: [],
-    plus: true,
-    reduce: false,
-    StateName: 'storage', //仓储标识
-    loading: false,
-  },
-]);
+const formedit = ref({}); //编辑重置
+const form = ref({
+  warehouseCalculationBasis: 1, // 计算基准
+  warehouseIsByCategory: 0, //是否区分品类
+  warehouseIsManageFee: 0, //是否有管理费
+  warehouseIsOperateFee: 0, //是否有操作/装卸费
+  warehouseIsSortFee: 0, //是否有分拣费
+  warehouseIsCategorySubjoin: 0, //附加费用是否按品类计费
+  // 仓储
+  StoragecategoryData: [
+    {
+      index: 1,
+      warehousePieceCategory: '',
+      options: [],
+      plus: true,
+      reduce: false,
+      StateName: 'storage', //仓储标识
+      loading: false,
+    },
+  ],
+  // 附加品类
+  AdditionalcategoriesData: [
+    {
+      index: 1,
+      warehousePieceCategory: '',
+      options: [],
+      plus: true,
+      reduce: false,
+      StateName: 'additional', //附加品类
+      loading: false,
+    },
+  ],
+}); //表单
 
 const Storagecategory = ref([
-  { label: '序号', prop: 'index', type: 'string', width: 'auto', disabled: true },
+  { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
   {
     label: '产品品类',
     prop: 'warehousePieceCategory',
@@ -291,22 +284,11 @@ const Storagecategory = ref([
     width: 'auto',
     disabled: true,
   },
-  { label: '操作', prop: '', type: '', width: 'auto', disabled: true },
-]);
-// 附加品类
-const AdditionalcategoriesData = ref([
-  {
-    index: 1,
-    warehousePieceCategory: '',
-    options: [],
-    plus: true,
-    reduce: false,
-    StateName: 'additional', //附加品类
-    loading: false,
-  },
+  { label: '操作', prop: '', type: '', width: '80', disabled: true },
 ]);
+
 const Additionalcategories = ref([
-  { label: '序号', prop: 'index', type: 'string', width: 'auto', disabled: true },
+  { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
   {
     label: '产品品类',
     prop: 'warehousePieceCategory',
@@ -314,7 +296,7 @@ const Additionalcategories = ref([
     width: 'auto',
     disabled: true,
   },
-  { label: '操作', prop: '', type: '', width: 'auto', disabled: true },
+  { label: '操作', prop: '', type: '', width: '80', disabled: true },
 ]);
 const handleRowFocus = data => {
   SelectData.value = data.row;
@@ -354,6 +336,13 @@ const search = val => {
 const formCopy = ref({}); //拷贝对象
 const SelectOpin = ref(null); //当前点击的品类搜索框
 const $route = useRoute(); //获取地址栏参数
+
+const rules = reactive({
+  warehousePricingType: [{ required: true, message: '仓储计费类型', trigger: 'change' }],
+  warehousePricingMode: [{ required: true, message: '仓储计费模式', trigger: 'change' }],
+
+  warehouseSubjoinFeeUnit: [{ required: true, message: '附加费计价单位', trigger: 'change' }],
+});
 // 获取点击的品类(附加品类配置)
 const categoriesSearchfocus = item => {
   console.log(item, 'item');
@@ -374,7 +363,7 @@ const categoriesearch = goodsName => {
   if (SelectOpin.value.StateName == 'storage') {
     selectionList = StoragecategoryList.value.find(res => res.id == SelectOpin.value.id); //当前是那个选择框
   } else {
-    selectionList = AdditionalcategoriesData.value.find(res => res.id == SelectOpin.value.id); //当前是那个选择框
+    selectionList = form.value.AdditionalcategoriesData.find(res => res.id == SelectOpin.value.id); //当前是那个选择框
   }
   console.log(selectionList, 'selectionList');
   postFindCategoryInfo(data).then(res => {
@@ -404,14 +393,7 @@ const props = defineProps({
 console.log(props, '来自父页面参数');
 const Storageloading = ref(false); //仓储品类加载
 const goriesloading = ref(false); //仓储品类加载
-const form = ref({
-  warehouseCalculationBasis: 1, // 计算基准
-  warehouseIsByCategory: 0, //是否区分品类
-  warehouseIsManageFee: 0, //是否有管理费
-  warehouseIsOperateFee: 0, //是否有操作/装卸费
-  warehouseIsSortFee: 0, //是否有分拣费
-  warehouseIsCategorySubjoin: 0, //附加费用是否按品类计费
-}); //表单
+
 // 仓储计费类型
 const Storagebillingtype = ref([]);
 // 仓储计费模式
@@ -483,7 +465,7 @@ function addItemAfterId(array, StateName) {
 const storagereduce = id => {
   // ID当前点击的
   // Storageloading.value = true; //开启加载效果
-  removeItemById(StoragecategoryData.value, id); //传入配置项和对应的ID
+  removeItemById(form.value.StoragecategoryData, id); //传入配置项和对应的ID
 };
 // StateName:'storage',//仓储标识
 // StateName:'additional',//附加费标识
@@ -491,21 +473,20 @@ const storagereduce = id => {
 const storageplus = data => {
   console.log(data.row);
   // Storageloading.value = true;
-  addItemAfterId(StoragecategoryData.value, 'storage');
-  console.log(StoragecategoryData.value, 'StoragecategoryData.value');
+  addItemAfterId(form.value.StoragecategoryData, 'storage');
 };
 // 附加品类加
 const categoriesplus = id => {
   goriesloading.value = true;
-  addItemAfterId(AdditionalcategoriesData.value, 'additional');
+  addItemAfterId(form.value.AdditionalcategoriesData, 'additional');
 };
 // 附加品类减
 const categoriesduce = id => {
   goriesloading.value = true;
-  removeItemById(AdditionalcategoriesData.value, id);
+  removeItemById(form.value.AdditionalcategoriesData, id);
 };
-function updateDictionary(targetArray, dictionaryType) {
-  getDictionaryBiz(dictionaryType)
+async function updateDictionary(targetArray, dictionaryType) {
+ await getDictionaryBiz(dictionaryType)
     .then(res => {
       console.log(res, '字典');
       if (res.data.code == 200) {
@@ -538,31 +519,39 @@ const resetFormData = () => {
     type: 'warning',
   }).then(() => {
     pageLoading.value = true;
-    form.value = deepClone(formCopy.value);
-    setTimeout(() => {
-      pageLoading.value = false;
-    }, 300);
+    if ($route.query.id) {
+      console.log(formedit.value, 'formedit.value');
+      form.value = deepClone(formedit.value);
+      setTimeout(() => {
+        pageLoading.value = false;
+      }, 300);
+    } else {
+      form.value = deepClone(formCopy.value);
+      setTimeout(() => {
+        pageLoading.value = false;
+      }, 300);
+    }
   });
 };
 
 // 页面初始化必要请求
 const onLoad = async () => {
+  pageLoading.value = true;
   formCopy.value = deepClone(form.value);
-  updateDictionary(Storagebillingtype.value, 'warehouse_pricing_type'); //仓储计费类型
-  updateDictionary(Warehousebillingmode.value, 'warehouse_pricing_mode'); //仓储计费模式
-  updateDictionary(CalculationBasis.value, 'warehouse_calculation_basis'); //计算基准
-  updateDictionary(Distinguishcategories.value, 'price_yes_no'); //是否区分品类
-  updateDictionary(Surchargepricingunit.value, 'warehouse_pricing_unit'); //附加费计价单位
+  await updateDictionary(Storagebillingtype.value, 'warehouse_pricing_type'); //仓储计费类型
+  await updateDictionary(Warehousebillingmode.value, 'warehouse_pricing_mode'); //仓储计费模式
+  await updateDictionary(CalculationBasis.value, 'warehouse_calculation_basis'); //计算基准
+  await updateDictionary(Distinguishcategories.value, 'price_yes_no'); //是否区分品类
+  await updateDictionary(Surchargepricingunit.value, 'warehouse_pricing_unit'); //附加费计价单位
   if (props.templateData.request) {
+    console.log('执行1');
     let request = props.templateData.request;
     // 执行回显
     form.value = await deepClone(request);
     if (request.warehouseIsByCategory == 1) {
-      console.log(StoragecategoryData.value, '品类');
-
-      StoragecategoryData.value = [];
+      form.value.StoragecategoryData = [];
       request.warehousePieceCategorys.forEach((res, index) => {
-        StoragecategoryData.value.push({
+        form.value.StoragecategoryData.push({
           index: index + 1,
           plus: !index ? true : false,
           reduce: index ? true : false,
@@ -579,10 +568,9 @@ const onLoad = async () => {
       });
     }
     if (request.warehouseIsCategorySubjoin == 1) {
-      AdditionalcategoriesData.value = [];
-      console.log(AdditionalcategoriesData.value, '附加品类');
+      form.value.AdditionalcategoriesData = [];
       request.warehouseSubjoinCategorys.forEach((res, index) => {
-        AdditionalcategoriesData.value.push({
+        form.value.AdditionalcategoriesData.push({
           index: index + 1,
           plus: !index ? true : false,
           reduce: index ? true : false,
@@ -598,120 +586,148 @@ const onLoad = async () => {
       });
     }
   }
+  formedit.value = deepClone(form.value);
+  pageLoading.value = false;
 };
 onLoad();
 // 新增
-const Submit = async () => {
-  await emit('request-data'); //通知父页面传递数据
-  console.log(props, 'props');
-
-  if (!props.templateData.TemplateName) {
-    ElMessage({
-      message: '请输入模板名称',
-      type: 'warning',
-    });
-    return;
-  } else {
-    form.value.name = props.templateData.TemplateName; //模板名称
-  }
-  if (!props.templateData.brand) {
-    ElMessage({
-      message: '请选择品牌',
-      type: 'warning',
-    });
-    return;
-  } else {
-    form.value.brandId = props.templateData.brand; //品牌ID
-  }
-
-  form.value.serviceType = props.templateData.ServiceType.join(','); //顶部选择的服务类型
-  // 如果勾选了区分品类判断是否填写了仓储品类配置
-  if (form.value.warehouseIsByCategory) {
-    let storage = StoragecategoryData.value.find(res => !res.warehousePieceCategory); //查看仓储品类配置是否完全没有填写
-    if (storage) {
-      // 如果勾选了,并且查到了有没有填写的就提示必须填写
-      ElMessage({
-        message: '请填写仓储品类配置',
-        type: 'warning',
-      });
-      return;
-    } else {
-      console.log(StoragecategoryData.value, 'StoragecategoryData.value');
-      // 如果都填写了进行数据处理
-      form.value.warehousePieceCategory = StoragecategoryData.value
-        .map(res => res.warehousePieceCategory)
-        .join(',');
-    }
-  } else {
-    if (form.value.warehousePieceCategory) {
-      form.value.warehousePieceCategory = '';
-    }
-  }
-  // 如果勾选了附加费是否按品类计费判断是否填写了附加品类配置
-  if (form.value.warehouseIsCategorySubjoin) {
-    let Surcharge = AdditionalcategoriesData.value.find(res => !res.warehousePieceCategory); //查看附加费品类配置是否完全没有填写
-    if (Surcharge) {
-      // 如果勾选了,并且查到了有没有填写的就提示必须填写
-      ElMessage({
-        message: '请填写附加品类配置',
-        type: 'warning',
-      });
+const Submit = () => {
+  ruleFormRef.value.validate(async valid => {
+    if (!valid) {
       return;
-    } else {
-      // 如果都填写了进行数据处理
-      form.value.warehouseSubjoinCategory = AdditionalcategoriesData.value
-        .map(res => res.warehousePieceCategory)
-        .join(',');
     }
-  } else {
-    if (form.value.warehouseSubjoinCategory) {
-      form.value.warehouseSubjoinCategory = '';
-    }
-  }
-
-  console.log(form.value, '要提交的参数');
+    ElMessageBox.confirm('是否保存?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(async () => {
+      pageLoading.value = true;
+      await emit('request-data'); //通知父页面传递数据
+      console.log(props, 'props');
 
-  if (props.templateData.code || $route.query.id) {
-    // 编辑接口
-    let data = {
-      id: props.templateData.code, //编辑参数
-      ...form.value,
-      checkType: '3', //服务类型（仓储固定参数）
-    };
-    console.log('编辑操作');
-    $_putpriceTemplate(data).then(res => {
-      console.log(res, '编辑成功之后返回值');
-      if (res.data.code == 200) {
+      if (!props.templateData.TemplateName) {
         ElMessage({
-          message: res.data.msg,
-          type: 'success',
+          message: '请输入模板名称',
+          type: 'warning',
         });
+        return;
+      } else {
+        form.value.name = props.templateData.TemplateName; //模板名称
       }
-    });
-  } else {
-    let data = {
-      ...form.value,
-    };
-    // 新增接口
-    console.log('新增操作');
-    $_priceTemplate(data).then(res => {
-      console.log(res, '提交成功之后返回值');
-      if (res.data.code == 200) {
+      if (!props.templateData.brand) {
         ElMessage({
-          message: res.data.msg,
-          type: 'success',
+          message: '请选择品牌',
+          type: 'warning',
         });
-        emit('request-data', res.data.data); //把获取到的数据传递给父页面
+        return;
+      } else {
+        form.value.brandId = props.templateData.brand; //品牌ID
+      }
+      form.value.serviceType = props.templateData.ServiceType.join(','); //顶部选择的服务类型
+      // 如果勾选了区分品类判断是否填写了仓储品类配置
+      if (form.value.warehouseIsByCategory) {
+        let storage = form.value.StoragecategoryData.find(res => !res.warehousePieceCategory); //查看仓储品类配置是否完全没有填写
+        if (storage) {
+          // 如果勾选了,并且查到了有没有填写的就提示必须填写
+          ElMessage({
+            message: '请填完整写仓储品类配置',
+            type: 'warning',
+          });
+          return;
+        } else {
+          // 如果都填写了进行数据处理
+          form.value.warehousePieceCategory = form.value.StoragecategoryData.map(
+            res => res.warehousePieceCategory
+          ).join(',');
+        }
+      } else {
+        if (form.value.warehousePieceCategory) {
+          form.value.warehousePieceCategory = '';
+        }
+      }
+      // 如果勾选了附加费是否按品类计费判断是否填写了附加品类配置
+      if (form.value.warehouseIsCategorySubjoin) {
+        let Surcharge = form.value.AdditionalcategoriesData.find(
+          res => !res.warehousePieceCategory
+        ); //查看附加费品类配置是否完全没有填写
+        if (Surcharge) {
+          // 如果勾选了,并且查到了有没有填写的就提示必须填写
+          ElMessage({
+            message: '请填写完整附加品类配置',
+            type: 'warning',
+          });
+          return;
+        } else {
+          // 如果都填写了进行数据处理
+          form.value.warehouseSubjoinCategory = form.value.AdditionalcategoriesData.map(
+            res => res.warehousePieceCategory
+          ).join(',');
+        }
+      } else {
+        if (form.value.warehouseSubjoinCategory) {
+          form.value.warehouseSubjoinCategory = '';
+        }
+      }
+
+      console.log(form.value, '要提交的参数');
+
+      if (props.templateData.code || $route.query.id) {
+        // 编辑接口
+        let data = {
+          id: props.templateData.code, //编辑参数
+          ...form.value,
+          checkType: '3', //服务类型（仓储固定参数）
+        };
+        console.log('编辑操作');
+        $_putpriceTemplate(data)
+          .then(res => {
+            console.log(res, '编辑成功之后返回值');
+            if (res.data.code == 200) {
+              ElMessage({
+                message: res.data.msg,
+                type: 'success',
+              });
+            }
+          })
+          .catch(res => {
+            console.log(res, '错误信息');
+          })
+          .finally(() => {
+            pageLoading.value = false;
+          });
+      } else {
+        let data = {
+          ...form.value,
+        };
+        // 新增接口
+        console.log('新增操作');
+        $_priceTemplate(data)
+          .then(res => {
+            console.log(res, '提交成功之后返回值');
+            if (res.data.code == 200) {
+              ElMessage({
+                message: res.data.msg,
+                type: 'success',
+              });
+              emit('request-data', res.data.data); //把获取到的数据传递给父页面
+            }
+            // res.data.data 返回的参数
+          })
+          .catch(res => {
+            console.log(res, '错误信息');
+          })
+          .finally(() => {
+            pageLoading.value = false;
+          });
       }
-      // res.data.data 返回的参数
     });
-  }
+  });
 };
 // 是否区分品类事件
 const categoriesDisplayChange = val => {
   console.log(val);
   if (val == 1) {
-    StoragecategoryData.value = [
+    form.value.StoragecategoryData = [
       {
         index: 1,
         plus: true,
@@ -726,7 +742,7 @@ const categoriesDisplayChange = val => {
 // 附加费是否按品类计费
 const AdditionalDisplayChange = val => {
   if (val == 1) {
-    AdditionalcategoriesData.value = [
+    form.value.AdditionalcategoriesData = [
       {
         index: 1,
         plus: true,
@@ -756,89 +772,8 @@ const AdditionalDisplayChange = val => {
     width: 160px;
   }
   .Storage-cont {
-    /* 禁止双击选中文本 */
-    -webkit-user-select: none; /* Safari */
-    -moz-user-select: none; /* Firefox */
-    -ms-user-select: none; /* IE 10+/Edge */
-    user-select: none; /* Standard syntax */
     display: flex;
     flex-direction: column;
-    .el_Storagecategory {
-      border: 1px solid #ccc;
-      .el_table_span {
-        display: flex;
-        width: 100%;
-        background-color: #ebeef5;
-        padding: 4px;
-        box-sizing: border-box;
-      }
-      .el_table_id {
-        width: 62px;
-        font-weight: 600;
-        color: #606266;
-      }
-      .el_table_title {
-        font-weight: 600;
-        color: #606266;
-      }
-      .el_table_td {
-        display: flex;
-        height: 40px;
-        align-items: center;
-        border-bottom: 1px solid #ccc;
-        position: relative;
-        .el_table_operation {
-          width: 70px;
-          height: 100%;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          position: absolute;
-          right: -80px;
-          .el_table_operation_span_a,
-          .el_table_operation_span_b {
-            font-size: 20px;
-            font-weight: bold;
-            width: 40%;
-            border: 2px solid #f00;
-            color: #f00;
-            height: 70%;
-            border-radius: 6px;
-            display: block;
-            line-height: 23px;
-            text-align: center;
-            cursor: pointer;
-          }
-          .el_table_operation_span_b {
-            border: 2px solid #0d83b7;
-            color: #0d83b7;
-          }
-
-          .el_table_operation_span_a:hover {
-            background-color: #f00;
-            color: #ccc;
-          }
-          .el_table_operation_span_b:hover {
-            background-color: #0d83b7;
-            color: #ccc;
-          }
-        }
-      }
-      .el_table_idNumber {
-        width: 50px;
-        text-align: center;
-        font-size: 16px;
-        font-weight: 400;
-        height: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-right: 1px solid #ccc;
-      }
-      :deep(.el-input__wrapper) {
-        box-shadow: none;
-      }
-    }
   }
 }
 .el_hr {
@@ -863,6 +798,14 @@ const AdditionalDisplayChange = val => {
   .el_flex_row {
     display: flex;
     justify-content: space-between;
+    .el-form-item {
+      flex-direction: column;
+      margin-right: 0;
+      .el-radio-group {
+        width: 100%;
+        padding: 0 10px;
+      }
+    }
   }
 }
 .el_submit {
@@ -879,10 +822,15 @@ const AdditionalDisplayChange = val => {
 .el_flex_box {
   display: flex;
   justify-content: space-between;
+  .el-form-item {
+    flex-direction: column;
+    margin-right: 0;
+  }
   .el_Storage {
     width: 24%;
     display: flex;
     flex-direction: column;
+
     .el_Cselect {
       margin-left: 0;
       margin-top: 8px;
@@ -906,6 +854,9 @@ const AdditionalDisplayChange = val => {
       background-color: #f5f8fa;
       color: #172e60;
     }
+    .cell {
+      padding: 0 10px;
+    }
   }
   tbody {
     .el-table tr:hover {
@@ -914,7 +865,7 @@ const AdditionalDisplayChange = val => {
 
     .cell {
       text-align: center;
-      padding: 0;
+      padding: 0 10px;
       .el-input-number {
         width: 100%;
         .el-input__wrapper {
@@ -928,4 +879,19 @@ const AdditionalDisplayChange = val => {
     }
   }
 }
+.eml_btn {
+  display: flex;
+  justify-content: space-evenly;
+  align-items: center;
+}
+.el_Storage {
+  .el-form-item {
+    flex-direction: column;
+    margin-right: 0;
+    .el-radio-group {
+      width: 100%;
+      padding: 0 10px;
+    }
+  }
+}
 </style>

From be30b0913d4163ae69863f1e05c3a17d2d24d1d7 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 23 Apr 2024 19:58:21 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=A7=BB=E5=8A=A8=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/checkInventoryTask/createTask.vue    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index e5a64da7..e73ff931 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -1125,6 +1125,17 @@ const InventoryDetails = ref([
     search: false,
     head: true,
   },
+  {
+    prop: 'newTrayName',
+    label: '移动托盘名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
   {
     prop: 'isChange',
     label: '是否数量变更',

From 7c21a82d3e5b366f6548c16a058d73a595818fd4 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 23 Apr 2024 20:34:54 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B4=A2=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Financialse/FinancialDelivery.vue         | 292 +++++++++++++++---
 .../parcelList/distributionParcelList.vue     |  24 +-
 2 files changed, 255 insertions(+), 61 deletions(-)

diff --git a/src/views/financialsector/Financialse/FinancialDelivery.vue b/src/views/financialsector/Financialse/FinancialDelivery.vue
index a7f9f346..6a75dcef 100644
--- a/src/views/financialsector/Financialse/FinancialDelivery.vue
+++ b/src/views/financialsector/Financialse/FinancialDelivery.vue
@@ -85,8 +85,172 @@
           >
             <!-- 商配/市配内容 -->
             <div class="el_Commercial_ercial">
-              <!-- 按件计费 -->
 
+              <template v-for="Item in Commercialcial" :key="Item.title">
+                <div v-if="Item.state" class="tabBox">
+             
+        
+                  <div
+                    class="el_Storagecategory"
+                    v-loading="Item.Storageloading"
+                    element-loading-text="Loading..."
+                  >
+                
+                    <table class="styled-table">
+                      <thead>
+                        <tr>
+                          <th style="width: 30px; text-align: center">序号</th>
+                          <th>产品品类</th>
+                          <th style="width: 104px">操作</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+               
+                        <tr v-for="item in Item.sequence" :key="item.id">
+                  
+                          <td style="text-align: center">{{ item.id }}</td>
+                  
+                          <td>
+                            <el-select
+                              class="el_Cselect"
+                              v-model="item.Warehousecategory"
+                              filterable
+                              remote
+                              clearable
+                              reserve-keyword
+                              placeholder="请选择品类"
+                              style="width: 100%"
+                              remote-show-suffix
+                              :remote-method="categoriesearch"
+                              @focus="categoriesSearchfocus(item)"
+                            >
+                
+                              <el-option
+                                v-for="option in item.Additionalcategories"
+                                :key="option.value"
+                                :label="option.label"
+                                :value="option.value"
+                              />
+                            </el-select>
+                          </td>
+                          <td style="line-height: 16px">
+                            <span
+                              class="el_btn_a"
+                              @click="storageplus(Item, item.id)"
+                              v-if="item.plus"
+                            >
+                              <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
+                                ><CirclePlus /></el-icon
+                              >新增
+                            </span>
+                            <span
+                              class="el_btn_b"
+                              @click="storagereduce(Item, item.id)"
+                              v-if="item.reduce"
+                            >
+                              <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
+                                ><Delete /></el-icon
+                              >删除
+                            </span>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                </div>
+              </template>
+              <!-- 按件  -->
+              <el-form-item label="按件计费">
+                <SurchargeTable
+                  :SurchargeData="form.dispatchPieceCategoryData"
+                  :Surcharge="dispatchPieceCategory"
+                  @focus="handleRowFocus"
+                  @search="search"
+                >
+                  <template #default="slotProps">
+                    <template v-if="slotProps.scope.column.label === '操作'">
+                      <div class="eml_btn">
+                        <span
+                          @click="categoriesplus"
+                          class="el_btn_a"
+                          v-if="slotProps.scope.row.plus"
+                        >
+                          <el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon
+                          >新增
+                        </span>
+                        <span
+                          @click="categoriesduce(slotProps.scope.row.index)"
+                          class="el_btn_b"
+                          v-if="slotProps.scope.row.reduce"
+                        >
+                          <el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>删除
+                        </span>
+                      </div>
+                    </template>
+                  </template>
+                </SurchargeTable>
+              </el-form-item>
+
+              <el-form-item label="按重量计费">
+                <SurchargeTable
+                  :SurchargeData="form.dispatchWeightCategoryData"
+                  :Surcharge="dispatchWeightCategory"
+                  @focus="handleRowFocus"
+                  @search="search"
+                >
+                  <template #default="slotProps">
+                    <template v-if="slotProps.scope.column.label === '操作'">
+                      <div class="eml_btn">
+                        <span
+                          @click="categoriesplus"
+                          class="el_btn_a"
+                          v-if="slotProps.scope.row.plus"
+                        >
+                          <el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon
+                          >新增
+                        </span>
+                        <span
+                          @click="categoriesduce(slotProps.scope.row.index)"
+                          class="el_btn_b"
+                          v-if="slotProps.scope.row.reduce"
+                        >
+                          <el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>删除
+                        </span>
+                      </div>
+                    </template>
+                  </template>
+                </SurchargeTable>
+              </el-form-item>
+              <el-form-item label="按方计费">
+                <SurchargeTable
+                  :SurchargeData="form.dispatchCubeCategoryData"
+                  :Surcharge="dispatchCubeCategory"
+                  @focus="handleRowFocus"
+                  @search="search"
+                >
+                  <template #default="slotProps">
+                    <template v-if="slotProps.scope.column.label === '操作'">
+                      <div class="eml_btn">
+                        <span
+                          @click="categoriesplus"
+                          class="el_btn_a"
+                          v-if="slotProps.scope.row.plus"
+                        >
+                          <el-icon style="color: #409eff; margin-right: 3px"><CirclePlus /></el-icon
+                          >新增
+                        </span>
+                        <span
+                          @click="categoriesduce(slotProps.scope.row.index)"
+                          class="el_btn_b"
+                          v-if="slotProps.scope.row.reduce"
+                        >
+                          <el-icon style="color: #f00; margin-right: 3px"><Delete /></el-icon>删除
+                        </span>
+                      </div>
+                    </template>
+                  </template>
+                </SurchargeTable>
+              </el-form-item>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -305,6 +469,7 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { deepClone } from '@/utils/util';
 import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
 import { $_priceTemplate, $_putpriceTemplate } from '@/api/financialsector/index'; //价格模板
+import SurchargeTable from '@/components/pric/tablePric.vue';
 const $route = useRoute(); //获取地址栏参数
 const emit = defineEmits(['request-data']);
 defineComponent({
@@ -334,7 +499,48 @@ const form = ref({
   dispatchMinCostType: 1, //最低计费类型
   dispatchIsUpwardJudgment: 0, //是否向上判断
   WarehousebillingmodeTitle: '', //标题
+  dispatchPieceCategoryData: [], //按件品类
+  dispatchWeightCategoryData: [], //按重量
+  dispatchCubeCategoryData: [], //按方品类
 });
+// 按件品类
+const dispatchPieceCategory = ref([
+  //按件品类
+  { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
+  {
+    label: '产品品类',
+    prop: 'Warehousecategory',
+    type: 'select',
+    width: 'auto',
+    disabled: true,
+  },
+  { label: '操作', prop: '', type: '', width: '80', disabled: true },
+]);
+// 按重量
+const dispatchWeightCategory = ref([
+  { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
+  {
+    label: '产品品类',
+    prop: 'Warehousecategory',
+    type: 'select',
+    width: 'auto',
+    disabled: true,
+  },
+  { label: '操作', prop: '', type: '', width: '80', disabled: true },
+]);
+// 按方品类
+const dispatchCubeCategory = ref([
+  { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
+  {
+    label: '产品品类',
+    prop: 'Warehousecategory',
+    type: 'select',
+    width: 'auto',
+    disabled: true,
+  },
+  { label: '操作', prop: '', type: '', width: '80', disabled: true },
+]);
+
 const SelectOpin = ref(null); //当前点击的品类搜索框
 // 是否向上判断
 const Upwardjudgment = ref([]);
@@ -403,16 +609,7 @@ const chargetype = val => {
 //案件计费
 const Storageloading = ref(false);
 // 附加费品类
-const Additionalcategories = ref([
-  {
-    label: '衣柜',
-    value: '1',
-  },
-  {
-    label: '橱柜',
-    value: '2',
-  },
-]);
+const Additionalcategories = ref([]);
 
 const Timedelive = () => {
   Deliveryloading.value = true;
@@ -731,7 +928,6 @@ const resetFormData = () => {
 // 页面初始化必要请求
 const onLoad = async () => {
   await updateDictionary(ServiceList.value, 'dispatch_pricing_type'); //仓储计费类型
-
   await updateDictionary(Warehousebillingmode.value, 'dispatch_type'); //仓储计费类型
   await updateDictionary(Distinguishcategories.value, 'price_yes_no'); //是否区分品类
   await updateDictionary(Billingmethod.value, 'min_cost_way'); //是否区分品类
@@ -761,77 +957,76 @@ const onLoad = async () => {
       res => res.value == form.value.dispatchServiceType
     ).label;
     StateDelivery.value = true; //显示表格
-    // 显示那些表格
-    Commercialcial.value.forEach(dataItem => {
-      // 检查当前dataItem的id是否为1, 2, 或 3 且 dispatchPricingType数组包含这个id
-      if ([1, 2, 3].includes(dataItem.id) && form.value.dispatchPricingType.includes(dataItem.id)) {
-        dataItem.state = true;
-      } else {
-        dataItem.state = false;
-      }
-    });
-    // 按件计费回显
+    // // 显示那些表格
+    // Commercialcial.value.forEach(dataItem => {
+    //   // 检查当前dataItem的id是否为1, 2, 或 3 且 dispatchPricingType数组包含这个id
+    //   if ([1, 2, 3].includes(dataItem.id) && form.value.dispatchPricingType.includes(dataItem.id)) {
+    //     dataItem.state = true;
+    //   } else {
+    //     dataItem.state = false;
+    //   }
+    // });
     if (request.value.dispatchPieceCategory) {
-      console.log(Commercialcial.value, 'Commercialcial.value===>');
-      let piece = Commercialcial.value.find(res => res.id == 1);
-      console.log(piece, 'piece===>???');
-      piece.sequence = [];
+      form.value.dispatchPieceCategoryData = [];
       request.value.dispatchPieceCategorys.forEach((res, index) => {
         console.log(piece, '按件显示');
-        piece.sequence.push({
-          Additionalcategories: [
+        console.log(form.value, '      form.value.dispatchPieceCategoryData');
+        form.value.dispatchPieceCategoryData.push({
+          index: index + 1,
+          Warehousecategory: res.id,
+          options: [
             {
               label: res.name,
               value: res.id,
             },
           ],
-          StateName: 'storage',
-          Warehousecategory: res.id,
-          id: index + 1,
           plus: true,
-          reduce: !index ? false : true,
+          reduce: false,
+          StateName: 'storage', //仓储标识
+          loading: false,
         });
+
       });
     }
     // 按重量
     if (request.value.dispatchWeightCategory) {
-      let piece = Commercialcial.value.find(res => res.id == 2);
-      piece.sequence = [];
+      form.value.dispatchWeightCategoryData=[]
       request.value.dispatchWeightCategorys.forEach((res, index) => {
         console.log(piece, '按件显示');
-        piece.sequence.push({
-          Additionalcategories: [
+        form.value.dispatchWeightCategoryData.push({
+          index: index + 1,
+          Warehousecategory: res.id,
+          options: [
             {
               label: res.name,
               value: res.id,
             },
           ],
-          StateName: 'storage',
-          Warehousecategory: res.id,
-          id: index + 1,
           plus: true,
-          reduce: !index ? false : true,
+          reduce: false,
+          StateName: 'storage', //仓储标识
+          loading: false,
         });
       });
     }
     // 按方
     if (request.value.dispatchCubeCategory) {
-      let piece = Commercialcial.value.find(res => res.id == 3);
-      piece.sequence = [];
+      form.value.dispatchCubeCategoryData=[]
       request.value.dispatchCubeCategorys.forEach((res, index) => {
         console.log(piece, '按件显示');
-        piece.sequence.push({
-          Additionalcategories: [
+        form.value.dispatchCubeCategoryData.push({
+          index: index + 1,
+          Warehousecategory: res.id,
+          options: [
             {
               label: res.name,
               value: res.id,
             },
           ],
-          StateName: 'storage',
-          Warehousecategory: res.id,
-          id: index + 1,
           plus: true,
-          reduce: !index ? false : true,
+          reduce: false,
+          StateName: 'storage', //仓储标识
+          loading: false,
         });
       });
     }
@@ -858,7 +1053,6 @@ const onLoad = async () => {
       });
     }
   }
-  console.log('执行2');
   pageLoading.value = false;
 };
 onLoad();
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index 696402d7..880d458f 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -320,17 +320,17 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'pickupBatch',
-          label: '提货批次',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
+        // {
+        //   prop: 'pickupBatch',
+        //   label: '提货批次',
+        //   type: 2,
+        //   values: '',
+        //   width: '140',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
         {
           prop: 'scanTime',
           label: '装车时间',
@@ -465,7 +465,7 @@ export default {
         // },
         {
           prop: 'reservationCode',
-          label: '预约单编号',
+          label: '任务号',
           type: 2,
           values: '',
           width: '140',