diff --git a/src/api/basicdata/basicdataGoodsShelfView.ts b/src/api/basicdata/basicdataGoodsShelfView.ts
index 62b69226..71d32079 100644
--- a/src/api/basicdata/basicdataGoodsShelfView.ts
+++ b/src/api/basicdata/basicdataGoodsShelfView.ts
@@ -68,6 +68,7 @@ export function geturl(name,params): Promise<AxiosResponse<VisualizationResponse
     params
   })
 }
+
 /**
  * 货位上架
  */
diff --git a/src/option/Pricesystem/index.js b/src/option/Pricesystem/index.js
index e23cf938..6f0078a3 100644
--- a/src/option/Pricesystem/index.js
+++ b/src/option/Pricesystem/index.js
@@ -1,3 +1,5 @@
+import { Value } from "sass";
+
 export const columnList = [
   {
     prop: '',
@@ -39,7 +41,7 @@ export const columnList = [
   {
     prop: 'serviceType',
     label: '服务类型',
-    type: 3,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
diff --git a/src/option/warehouse/distributionStockArticle.js b/src/option/warehouse/distributionStockArticle.js
index e3bf1f43..fb271161 100644
--- a/src/option/warehouse/distributionStockArticle.js
+++ b/src/option/warehouse/distributionStockArticle.js
@@ -230,7 +230,7 @@ export const columnList = [
         label: '预约信息',
         type: 13,
         values: '',
-        width: '150',
+        width: '250',
         checkarr: [],
         fixed: false,
         sortable: true,
diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue
index 1c20c9f8..4adfdcd2 100644
--- a/src/views/Pricesystem/ListOfPriceSystems.vue
+++ b/src/views/Pricesystem/ListOfPriceSystems.vue
@@ -8,8 +8,7 @@
         <el-form :inline="true" :model="query" class="header_search">
           <!-- 查询按钮 -->
           <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+
           </el-form-item>
         </el-form>
       </div>
@@ -20,6 +19,8 @@
         <div class="avue-crud__left"></div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
+          <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
           <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
           <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
           <el-button icon="Search" @click="searchHide" circle></el-button>
diff --git a/src/views/Pricesystem/Price/PriceDelivery.vue b/src/views/Pricesystem/Price/PriceDelivery.vue
index a5a75c73..eb4d719c 100644
--- a/src/views/Pricesystem/Price/PriceDelivery.vue
+++ b/src/views/Pricesystem/Price/PriceDelivery.vue
@@ -59,6 +59,7 @@
                   :min="0"
                   :max="9999999"
                   :controls="false"
+                  :value-on-clear="0"
                   placeholder="请输入价格"
                 />
               </el-form-item>
@@ -82,6 +83,7 @@
                   :min="0"
                   :max="9999999"
                   :controls="false"
+                  :value-on-clear="0"
                   placeholder="请输入价格"
                 />
               </el-form-item>
@@ -107,6 +109,7 @@
                   :min="0"
                   :max="9999999"
                   :controls="false"
+                  :value-on-clear="0"
                   placeholder="请输入价格"
                 />
               </el-form-item>
@@ -131,6 +134,7 @@
                   :min="0"
                   :max="9999999"
                   :controls="false"
+                  :value-on-clear="0"
                   placeholder="请输入价格"
                 />
               </el-form-item>
@@ -147,6 +151,7 @@
                   :min="0"
                   :max="9999999"
                   :controls="false"
+                  :value-on-clear="0"
                   placeholder="请输入价格"
                 />
               </el-form-item>
@@ -163,6 +168,7 @@
                   :min="0"
                   :max="9999999"
                   :controls="false"
+                  :value-on-clear="0"
                   placeholder="请输入价格"
                 />
               </el-form-item>
@@ -192,7 +198,11 @@
           style="width: 48%"
           v-if="form.Wholevehicle"
         >
-          <SurchargeTable :SurchargeData="form.fullVehicleData" :Surcharge="form.fullVehicle">
+          <SurchargeTable
+            :SurchargeData="form.fullVehicleData"
+            :Surcharge="form.fullVehicle"
+            @change="selectChange"
+          >
             <template #default="slotProps">
               <template v-if="slotProps.scope.column.label === '操作'">
                 <div class="eml_btn">
@@ -233,6 +243,7 @@
                       :max="9999999"
                       :controls="false"
                       placeholder="请输入价格"
+                      :value-on-clear="0"
                     />
                   </el-form-item>
                 </div>
@@ -248,6 +259,7 @@
                       :max="9999999"
                       :controls="false"
                       placeholder="请输入价格"
+                      :value-on-clear="0"
                     />
                   </el-form-item>
                 </div>
@@ -263,6 +275,7 @@
                       :max="9999999"
                       :controls="false"
                       placeholder="请输入价格"
+                      :value-on-clear="0"
                     />
                   </el-form-item>
                 </div>
@@ -277,6 +290,7 @@
                       :min="0"
                       :max="9999999"
                       :controls="false"
+                      :value-on-clear="0"
                       placeholder="请输入价格"
                     />
                   </el-form-item>
@@ -302,6 +316,7 @@
                   :precision="2"
                   :min="0"
                   :max="9999999"
+                  :value-on-clear="0"
                   :controls="false"
                   placeholder="请输入价格"
                 />
@@ -327,6 +342,7 @@
                     :min="0"
                     :max="9999999"
                     :controls="false"
+                    :value-on-clear="0"
                     placeholder="请输入价格"
                   />
                 </el-form-item>
@@ -339,6 +355,7 @@
                   :max="9999999"
                   :controls="false"
                   placeholder="请输入价格"
+                  :value-on-clear="0"
                 />
               </el-form-item>
             </div>
@@ -357,6 +374,7 @@
                   :max="9999999"
                   :controls="false"
                   placeholder="请输入价格"
+                  :value-on-clear="0"
                 />
               </el-form-item>
             </template>
@@ -368,6 +386,7 @@
                 :min="0"
                 :max="9999999"
                 :controls="false"
+                :value-on-clear="0"
                 placeholder="请输入价格"
               />
             </el-form-item>
@@ -382,6 +401,7 @@
                     :min="0"
                     :max="9999999"
                     :controls="false"
+                    :value-on-clear="0"
                     placeholder="请输入价格"
                   />
                 </el-form-item>
@@ -394,6 +414,7 @@
                     v-model="form.dispatchUpwardJudgmentCost"
                     :precision="2"
                     :min="0"
+                    :value-on-clear="0"
                     :max="9999999"
                     :controls="false"
                     placeholder="请输入价格"
@@ -708,7 +729,7 @@ const form = ref({
   ],
 });
 async function updateDictionary(targetArray, dictionaryType) {
- await getDictionaryBiz(dictionaryType)
+  await getDictionaryBiz(dictionaryType)
     .then(res => {
       console.log(res, '字典');
       if (res.data.code == 200) {
@@ -726,6 +747,43 @@ async function updateDictionary(targetArray, dictionaryType) {
     .catch(() => {})
     .finally(() => {});
 }
+
+function updateOptions(allDropdowns) {
+  // 拉平所有的下拉框组到一个单一数组中
+  let dropdowns = allDropdowns;
+  console.log(dropdowns, 'dropdowns');
+  // 遍历每个下拉框
+  dropdowns.forEach((dropdown, index, self) => {
+    // 取出当前下拉框选中的值
+    let selectedValue = dropdown.vehicleType;
+
+    // 更新其他下拉框的options状态
+    self.forEach(otherDropdown => {
+      if (dropdown !== otherDropdown) {
+        // 确保不是自身
+        otherDropdown.options.forEach(option => {
+          // 如果选项值和当前下拉框选中值相同，则禁用该选项
+          if (option.value === selectedValue) {
+            option.disabled = true;
+          } else {
+            // 如果其他逻辑导致应保持禁用，可以在这里加上，下面的语句是检查是否已在别处被选中
+            let isSelectedSomewhereElse = self.some(
+              d => d !== otherDropdown && d.vehicleType === option.value
+            );
+            option.disabled = isSelectedSomewhereElse;
+          }
+        });
+      }
+    });
+  });
+}
+
+// 选择框值发生改变
+const selectChange = data => {
+  // 更新选项
+  updateOptions(form.value.fullVehicleData);
+};
+
 // 重置表单
 const resetFormData = () => {
   ElMessageBox.confirm('是否重置数据?', '提示', {
@@ -763,9 +821,10 @@ async function addItemAfterId(array) {
     vehicleType: '', //	车型
     loading: false,
     price: 0, //价格
-    options: pricevehicle.value, //选择框列表
+    options: deepClone(pricevehicle.value), //选择框列表
   };
- await array.push(newItem);
+  await array.push(newItem);
+  updateOptions(form.value.fullVehicleData);
 }
 // 仓储减
 const storagereduce = id => {
@@ -774,8 +833,9 @@ const storagereduce = id => {
 };
 
 // 仓储加
-const storageplus = data => {
-  addItemAfterId(form.value.fullVehicleData);
+const storageplus = async data => {
+  await addItemAfterId(form.value.fullVehicleData);
+  // 更新选项
 };
 
 const billing = async () => {
@@ -824,9 +884,24 @@ const onLoad = async () => {
     billing(); //显示条件
     // 整车
     if (form.value.dispatchPricingType.includes(4)) {
-      addItemAfterId(form.value.fullVehicleData);
+      console.log('执行整车');
+      if (request.value.fullVehicle) {
+        addItemAfterId(form.value.fullVehicleData);
+      } else {
+        form.value.fullVehicleData = [
+          {
+            index: 1, // 新对象的 ID 为当前数组长度加 1
+            plus: false, // 是否显示加号
+            reduce: true, // 是否显示减号
+            vehicleType: '', //	车型
+            loading: false,
+            price: 0, //价格
+            options: pricevehicle.value, //选择框列表
+          },
+        ];
+        console.log(form.value.fullVehicleData, '整车数据');
+      }
     }
-
     // 按件品类计费
     if (request.value.dispatchIsByCategory) {
       if (form.value.dispatchPricingType.includes(1)) {
@@ -844,29 +919,32 @@ const onLoad = async () => {
       }
       //  按方计费
       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.dispatchCubeCategorys && request.value.dispatchCubeCategorys.length) {
+          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(2)) {
-        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 (request.value.dispatchWeightCategorys && request.value.dispatchWeightCategorys.length) {
+          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');
@@ -893,13 +971,16 @@ const onLoad = async () => {
     // 最低计费等级
     console.log(form.value.Minimumbilling, 'Minimumbilling');
     console.log(request.value.dispatchMinCostType);
-    form.value.Minimumbilling.forEach(res => {
-      if (res.index == request.value.dispatchMinCostType) {
-        res.disabled = true;
-      } else {
-        res.disabled = false;
-      }
-    });
+    if (form.value.Minimumbilling.length) {
+      form.value.Minimumbilling.forEach(res => {
+        if (res.index == request.value.dispatchMinCostType) {
+          res.disabled = true;
+        } else {
+          res.disabled = false;
+        }
+      });
+    }
+
     // if (request.value.dispatchMinCostType != 1) {
     //   form.value.Minimumbilling.find(res => res.label == '加算价格').disabled = true;
     //   console.log('有加算价格');
@@ -908,13 +989,15 @@ const onLoad = async () => {
     //   console.log('加算价格没有');
     // }
     // 遗留控制
-    form.value.Minimumlegacy.forEach(res => {
-      if (res.index == request.value.dispatchMinCostType) {
-        res.disabled = true;
-      } else {
-        res.disabled = false;
-      }
-    });
+    if (form.value.Minimumlegacy.length) {
+      form.value.Minimumlegacy.forEach(res => {
+        if (res.index == request.value.dispatchMinCostType) {
+          res.disabled = true;
+        } else {
+          res.disabled = false;
+        }
+      });
+    }
 
     // 附加费用
     // 是否有操作/装卸费
@@ -953,7 +1036,9 @@ const onLoad = async () => {
     } else {
       form.value.pieceCategory.find(res => res.prop === 'leaveBehindPrice').disabled = true;
     }
-
+    if (request.value.dispatchIsStairsCarryingCharge && request.value.dispatchIsFeeFloor) {
+      form.value.dispatchStairsCarryingCharge = 0;
+    }
     // (品类计费按方)是否有遗留
     if (!request.value.dispatchIsLeaveBehind) {
       form.value.cubeCategory.find(res => res.prop === 'leaveBehindPrice').disabled = false;
@@ -989,7 +1074,11 @@ const onLoad = async () => {
           });
         }
 
-        if (form.value.dispatchPricingType.includes(2) && form.value.weightCategoryData.length) {
+        if (
+          form.value.dispatchPricingType.includes(2) &&
+          form.value.weightCategoryData &&
+          form.value.weightCategoryData.length
+        ) {
           // 按重量品类计费
           requestInfo.value.weightCategory.forEach(item => {
             let data = form.value.weightCategoryData.find(res => res.categoryId == item.categoryId);
@@ -1000,7 +1089,11 @@ const onLoad = async () => {
           });
         }
 
-        if (form.value.dispatchPricingType.includes(3) && form.value.cubeCategoryData.length) {
+        if (
+          form.value.dispatchPricingType.includes(3) &&
+          form.value.cubeCategoryData &&
+          form.value.cubeCategoryData.length
+        ) {
           // 按方品类计费
 
           requestInfo.value.cubeCategory.forEach(item => {
@@ -1014,78 +1107,94 @@ const onLoad = async () => {
       } else {
         // 按件品类计费
         if (form.value.dispatchPricingType.includes(1)) {
-          let data = requestInfo.value.pieceCategory[0] || [];
-          form.value.pieceCategoryInput = data.price || 0;
+          if (requestInfo.value.pieceCategory && requestInfo.value.pieceCategory.length) {
+            let data = requestInfo.value.pieceCategory[0] || [];
+            form.value.pieceCategoryInput = data.price || 0;
+          }
         }
 
         if (form.value.dispatchPricingType.includes(2)) {
           // 按重量品类计费
-          let data = requestInfo.value.weightCategory[0] || [];
-          form.value.weightCategoryInput = data.price || 0;
+          if (requestInfo.value.weightCategory.length) {
+            let data = requestInfo.value.weightCategory[0] || [];
+            form.value.weightCategoryInput = data.price || 0;
+          }
         }
 
         if (form.value.dispatchPricingType.includes(3)) {
           // 按方品类计费
-          let data = requestInfo.value.cubeCategory[0] || [];
-          form.value.cubeCategoryInput = data.price || 0;
+          if (requestInfo.value.cubeCategory && requestInfo.value.cubeCategory.length) {
+            let data = requestInfo.value.cubeCategory[0] || [];
+            form.value.cubeCategoryInput = data.price || 0;
+          }
         }
       }
       // 按公里
       if (form.value.dispatchPricingType.includes(7)) {
-        form.value.kilometerCost = requestInfo.value.kilometerCost[0].price || 0;
+        if (requestInfo.value.kilometerCost && requestInfo.value.kilometerCost.length) {
+          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 (requestInfo.value.tonKilometerCost && requestInfo.value.tonKilometerCost.length) {
+          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 (requestInfo.value.tonCost && requestInfo.value.tonCost.length) {
+          form.value.tonCost = requestInfo.value.tonCost[0].price || 0;
+        }
       }
       //按整车
       if (form.value.dispatchPricingType.includes(4)) {
-        form.value.fullVehicleData = [];
-        if(requestInfo.value.fullVehicle && requestInfo.value.fullVehicle.length){
+        if (requestInfo.value.fullVehicle && requestInfo.value.fullVehicle.length) {
+          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.fullVehicleData.push({
+              index: index + 1,
+              loading: false,
+              options: pricevehicle.value,
+              plus: true,
+              price: item.price || 0,
+              vehicleType: item.vehicleType,
+            });
           });
-        });
         }
-
       }
 
       //  附加费用
       if (request.value.dispatchIsCategorySubjoin) {
-        if( requestInfo.value.additionalCategory && requestInfo.value.additionalCategory.length){
+        if (requestInfo.value.additionalCategory && requestInfo.value.additionalCategory.length) {
           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;
-          }
-        });
+            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;
+        if (requestInfo.value.additionalCategory && requestInfo.value.additionalCategory.length) {
+          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;
+        }
+      }
+      if (request.value.dispatchIsStairsCarryingCharge && request.value.dispatchIsFeeFloor) {
+        console.log('有楼层', form.value.dispatchStairsCarryingCharge);
+        form.value.dispatchStairsCarryingCharge =
+          requestInfo.value.dispatchStairsCarryingCharge || 0;
       }
-      // 上楼费免费楼层(缺少判断)
-      form.value.dispatchStairsCarryingCharge = requestInfo.value.dispatchStairsCarryingCharge;
+
       // 最低计费
       if (request.value.dispatchIsMinCost) {
         form.value.Minimumbilling.find(res => res.disabled).minCost =
@@ -1111,18 +1220,13 @@ const onLoad = async () => {
     }
   }
 
-let setTime = setTimeout(()=>{
   formCopy.value = deepClone(form.value);
-    loading.value = false;
-    clearTimeout(setTime);
- },500)
-
+  loading.value = false;
 };
 
 onLoad();
 // 提交信息
 const handleSubmit = () => {
-
   let data = {
     checkType: '4',
     id: $route.query.id,
@@ -1142,36 +1246,42 @@ const handleSubmit = () => {
   if (request.value.dispatchIsByCategory) {
     console.log('区分品类');
     // 按件品类计费
-    if (form.value.dispatchPricingType.includes(1) && form.value.pieceCategoryData.length) {
-      form.value.pieceCategoryData.forEach(item => {
-        data.dispatch['pieceCategory'].push({
-          categoryId: item.categoryId, //品类id
-          leaveBehindPrice: item.leaveBehindPrice, //	遗留单价
-          price: item.price, //单价
+    if (form.value.dispatchPricingType.includes(1)) {
+      if (form.value.pieceCategoryData && form.value.pieceCategoryData.length) {
+        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) {
+    if (form.value.dispatchPricingType.includes(2)) {
       // 按重量品类计费
-      form.value.weightCategoryData.forEach(item => {
-        data.dispatch['weightCategory'].push({
-          categoryId: item.categoryId, //品类id
-          leaveBehindPrice: item.leaveBehindPrice, //	遗留单价
-          price: item.price, //单价
+      if (form.value.weightCategoryData && 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) {
+    if (form.value.dispatchPricingType.includes(3)) {
       // 按方品类计费
-      form.value.cubeCategoryData.forEach(item => {
-        data.dispatch['cubeCategory'].push({
-          categoryId: item.categoryId, //品类id
-          leaveBehindPrice: item.leaveBehindPrice, //	遗留单价
-          price: item.price, //单价
+      if (form.value.cubeCategoryData && form.value.cubeCategoryData.length) {
+        form.value.cubeCategoryData.forEach(item => {
+          data.dispatch['cubeCategory'].push({
+            categoryId: item.categoryId, //品类id
+            leaveBehindPrice: item.leaveBehindPrice, //	遗留单价
+            price: item.price, //单价
+          });
         });
-      });
+      }
     }
   } else {
     // 按件统一计费
@@ -1212,36 +1322,37 @@ const handleSubmit = () => {
     });
   }
   // 整车计费
-  if(form.value.dispatchPricingType.includes(4)){
+  if (form.value.dispatchPricingType.includes(4)) {
     let fullVehicleDataState = form.value.fullVehicleData.every(res => res.vehicleType);
-  if (fullVehicleDataState && form.value.fullVehicleData.length) {
-    form.value.fullVehicleData.forEach(item => {
-      data.dispatch['fullVehicle'].push({
-        price: item.price || 0, //	整车计费（元/车）
-        vehicleType: item.vehicleType, //车型
+    if (fullVehicleDataState && form.value.fullVehicleData.length) {
+      form.value.fullVehicleData.forEach(item => {
+        data.dispatch['fullVehicle'].push({
+          price: item.price || 0, //	整车计费（元/车）
+          vehicleType: item.vehicleType, //车型
+        });
       });
-    });
-  } else {
-    ElMessage({
-      message: '整车计费有未选择车型',
-      type: 'warning',
-    });
-    return;
-  }
-
+    } else {
+      ElMessage({
+        message: '整车计费有未选择车型',
+        type: 'warning',
+      });
+      return;
+    }
   }
 
   // 附加费用
-  if (request.value.dispatchIsCategorySubjoin && form.value.additionalCategoryData.length) {
-    form.value.additionalCategoryData.forEach(res => {
-      data.dispatch['additionalCategory'].push({
-        categoryId: res.categoryId, //品类id
-        handlingPrice: res.handlingPrice || 0, //装卸费
-        relocationPrice: res.relocationPrice || 0, //平移费
-        sortPrice: res.sortPrice || 0, //分货费
-        upstairsDeliveryPrice: res.upstairsDeliveryPrice || 0, //上楼费
+  if (request.value.dispatchIsCategorySubjoin) {
+    if (form.value.additionalCategoryData && form.value.additionalCategoryData.length) {
+      form.value.additionalCategoryData.forEach(res => {
+        data.dispatch['additionalCategory'].push({
+          categoryId: res.categoryId, //品类id
+          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 || 0, //装卸费
@@ -1252,6 +1363,7 @@ const handleSubmit = () => {
   }
   // 上楼费免费楼层
   if (request.value.dispatchIsStairsCarryingCharge && request.value.dispatchIsFeeFloor) {
+    console.log('有楼层', form.value.dispatchStairsCarryingCharge);
     data.dispatch.dispatchStairsCarryingCharge = form.value.dispatchStairsCarryingCharge || 0;
   }
   // 最低计费
@@ -1280,19 +1392,22 @@ const handleSubmit = () => {
   }
   console.log(data, '要提交的数据');
   loading.value = true;
-  putBasicdataPrice(data).then(res => {
-    console.log(res, '处理好的值');
-    if (res.data.code == 200) {
-      ElMessage({
-        message: res.data.msg,
-        type: 'success',
-      });
-    }
-  }).catch(res=>{
-    console.log(res,'错误信息');
-  }).finally(()=>{
-    loading.value = false;
-  })
+  putBasicdataPrice(data)
+    .then(res => {
+      console.log(res, '处理好的值');
+      if (res.data.code == 200) {
+        ElMessage({
+          message: res.data.msg,
+          type: 'success',
+        });
+      }
+    })
+    .catch(res => {
+      console.log(res, '错误信息');
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 };
 
 // 返回
diff --git a/src/views/Pricesystem/Price/PriceWarehousing.vue b/src/views/Pricesystem/Price/PriceWarehousing.vue
index 5605540b..bc801594 100644
--- a/src/views/Pricesystem/Price/PriceWarehousing.vue
+++ b/src/views/Pricesystem/Price/PriceWarehousing.vue
@@ -638,6 +638,7 @@ const handleSubmit = () => {
       delete mox.warehouseSortPrice;
     }
   }
+  loading.value=true
   putBasicdataPrice(data)
     .then(res => {
       console.log(res, '保存成功');
@@ -649,7 +650,9 @@ const handleSubmit = () => {
       }
     })
     .catch(() => {})
-    .finally(() => {});
+    .finally(() => {
+      loading.value=false
+    });
 };
 </script>
 
diff --git a/src/views/Pricesystem/PricesyHome.vue b/src/views/Pricesystem/PricesyHome.vue
index e038555e..8a0aee78 100644
--- a/src/views/Pricesystem/PricesyHome.vue
+++ b/src/views/Pricesystem/PricesyHome.vue
@@ -108,7 +108,7 @@ async function executeCheckedResults(results) {
     await provideData();
   }
   pageLoading.value = false;
-  Tabmenu.value=results[0].label;//设置第一个菜单
+
 }
 
 /** 获取回显数据 */
@@ -176,7 +176,7 @@ const onLoad = async () => {
       const result = ServiceList.value.filter(item => form.value.ServiceType.includes(item.value));
       await initData();
       // 激活菜单设置为已经存在的
-      executeCheckedResults(result);
+     await executeCheckedResults(result);
 
       await nextTick();
       setTimeout(() => {
@@ -188,6 +188,7 @@ const onLoad = async () => {
           financialTrunkLine.value[0].initDictionaryBiz();
         }
       }, 1000);
+      Tabmenu.value=result[0].label;//设置第一个菜单
     });
   } catch (error) {
     console.log('error :>> ', error);
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
index 8f55bb44..689f2ebf 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
@@ -425,8 +425,8 @@ const details = reactive({
       head: false,
     },
     {
-      prop: 'customerAddress',
-      label: '客户地址',
+      prop: 'num',
+      label: '数量',
       type: 2,
       values: '',
       width: '130',
@@ -617,6 +617,10 @@ async function onLoad(page, params = {}) {
       default:
         break;
     }
+
+    let query= JSON.parse($route.query.info)
+    console.log(query,'结构参数');
+    data.areaType =1
     let response = await geturl(url, data);
     if (response.data.code == 200) {
       console.log('res', response.data);
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
index 442a586b..beeda67a 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -239,6 +239,29 @@ export default {
             sortable: true,
             head: false,
           },
+
+        {
+            prop: 'scanUser',
+            label: '签收人',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'signingTime',
+            label: '签收时间',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
           // {
           //   prop: 'trainNumber',
           //   label: '客户车次号',
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 07128297..763b637e 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -1159,6 +1159,17 @@ const menuData2 = ref([
     sortable: true,
     head: false,
   },
+  {
+    prop: 'materialName',
+    label: '物料名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'firsts',
     label: '一级品类',
diff --git a/src/views/financialsector/CustomerBaseprice.vue b/src/views/financialsector/CustomerBaseprice.vue
index f9477f91..ec1c3319 100644
--- a/src/views/financialsector/CustomerBaseprice.vue
+++ b/src/views/financialsector/CustomerBaseprice.vue
@@ -8,8 +8,7 @@
         <el-form :inline="true" :model="query" class="el-fr-d">
           <!-- 查询按钮 -->
           <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+    
           </el-form-item>
         </el-form>
       </el-row>
@@ -29,6 +28,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
diff --git a/src/views/financialsector/FinanceHome.vue b/src/views/financialsector/FinanceHome.vue
index f3223853..53f7dc89 100644
--- a/src/views/financialsector/FinanceHome.vue
+++ b/src/views/financialsector/FinanceHome.vue
@@ -119,9 +119,9 @@ const request = ref({}); //用于保存会显的值
 const templateInfo = ref({});
 // 菜单列表
 const ServiceList = 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) {
@@ -134,8 +134,6 @@ function updateDictionary(targetArray, dictionaryType) {
             });
           });
         }
-
-        console.log('targetArray :>> ', targetArray);
       }
     })
     .catch(() => {})
@@ -152,7 +150,8 @@ async function executeCheckedResults(results) {
     await provideData();
   }
   pageLoading.value = false;
-  Tabmenu.value=results[0].label;//设置第一个菜单
+  console.log(results,'results');
+
 }
 // 页面初始化必要请求
 const onLoad = async () => {
@@ -161,7 +160,7 @@ const onLoad = async () => {
     let data = {
       id: $route.query.id,
     };
-    $_InfopriceTemplate(data).then(res => {
+    $_InfopriceTemplate(data).then(async res => {
       console.log(res, '获取详情');
       if (res.data.code == 200) {
         request.value = res.data.data; //发送回显数据
@@ -170,11 +169,12 @@ const onLoad = async () => {
         form.value.ServiceType = res.data.data.serviceType.split(',') || []; //服务类型
 
         console.log('form.value.ServiceType :>> ', form.value.ServiceType);
-        const result = ServiceList.value.filter(item =>
+        const result = await ServiceList.value.filter(item =>
           form.value.ServiceType.includes(item.value)
         );
         // 激活菜单设置为已经存在的
-        executeCheckedResults(result);
+       await executeCheckedResults(result);
+        Tabmenu.value=result[0].label;//设置第一个菜单
       }
     });
   } else {
diff --git a/src/views/financialsector/Financialse/FinancialDelivery.vue b/src/views/financialsector/Financialse/FinancialDelivery.vue
index 7b326c80..84dde1ef 100644
--- a/src/views/financialsector/Financialse/FinancialDelivery.vue
+++ b/src/views/financialsector/Financialse/FinancialDelivery.vue
@@ -650,15 +650,17 @@ const removeTag = value => {
   Timedelive(); //加载效果
 };
 
-// 移除对象
 // 移除对象
 function removeItemById(array, id) {
   const index = array.findIndex(item => item.index === id);
   if (index !== -1) {
     array.splice(index, 1);
-    array.forEach((item, index) => {
+    if(array.length){
+      array.forEach((item, index) => {
       item.index = index + 1;
     });
+    }
+
   }
 }
 // 添加对象
@@ -715,9 +717,12 @@ function FmremoveItemById(array, id) {
   const index = array.findIndex(item => item.id === id);
   if (index !== -1) {
     array.splice(index, 1);
-    array.forEach((item, index) => {
+    if(array.length){
+      array.forEach((item, index) => {
       item.id = index + 1;
     });
+    }
+
   }
   let timerId = setTimeout(() => {
     goriesloading.value = false;
@@ -755,7 +760,8 @@ async function updateDictionary(targetArray, dictionaryType) {
       //服务类型
       if (dictionaryType === 'dispatch_pricing_type') {
         Commercialcial.value = []; //清空服务类型
-        res.data.data.forEach(res => {
+        if(res.data.data && res.data.data.length){
+          res.data.data.forEach(res => {
           let data = {
             title: res.dictValue, // 标题
             id: Number(res.dictKey), //码表ID
@@ -777,6 +783,8 @@ async function updateDictionary(targetArray, dictionaryType) {
             ...data,
           });
         });
+        }
+
 
         CommercialcialCopy.value = deepClone(Commercialcial.value);
         // 配送服务类型标题
@@ -826,7 +834,8 @@ const search = val => {
             let data = null;
             SelectData.value.options = []; //如果有新的参数就清空之前的
             console.log(SelectData.value.StateName, 'SelectData.value.StateName');
-            res.data.data.forEach(item => {
+            if(res.data.data && res.data.data.length){
+              res.data.data.forEach(item => {
               if (SelectData.value.StateName == 'storage') {
                 //仓储
                 concatdata = form.value.dispatchCubeCategoryData.concat(
@@ -839,7 +848,6 @@ const search = val => {
                 data = form.value.dispatchSubjoinCategoryData.find(
                   res => res.Warehousecategory == item.goodsId
                 );
-                console.log(data, '213123');
               }
               SelectData.value.options.push({
                 label: item.goodsName,
@@ -847,6 +855,8 @@ const search = val => {
                 disabled: data ? true : false,
               });
             });
+            }
+
           }
         }
       })
@@ -920,34 +930,11 @@ const SurchargeChange = val => {
         ];
   }
 };
-// 附加品类的搜索
-const categoriesearch = goodsName => {
-  console.log(goodsName, '当前搜索参数');
-  if (!goodsName) {
-    return;
-  }
-  let data = {
-    goodsName: goodsName,
-  };
 
-  console.log(SelectOpin.value, '当前点击的谁');
-  postFindCategoryInfo(data).then(res => {
-    console.log(res, '附加费品类计费');
-    if (res.data.code == 200) {
-      if (res.data.data.length) {
-        SelectOpin.value.Additionalcategories = []; //如果有新的参数就清空之前的
-        res.data.data.forEach(item => {
-          SelectOpin.value.Additionalcategories.push({
-            label: item.goodsName,
-            value: item.goodsId,
-          });
-        });
-      }
-    }
-  });
-};
 const clink = () => {
-  if (ServiceList.value.length) ServiceList.value.forEach(res => (res.check = false));
+  if (ServiceList.value.length) {
+    ServiceList.value.forEach(res => (res.check = false));
+  }
 };
 /** 重置数据 */
 const resetFormData = () => {
@@ -961,7 +948,8 @@ const resetFormData = () => {
     if ($route.query.id) {
       console.log(form.value.dispatchPricingType, 'form.value.dispatchPricingType');
       form.value = await deepClone(formedit.value);
-      ServiceList.value.forEach((res, index) => {
+      if(ServiceList.value.length){
+        ServiceList.value.forEach((res, index) => {
         console.log(res);
 
         if (form.value.dispatchPricingType.includes(res.value)) {
@@ -972,6 +960,8 @@ const resetFormData = () => {
           res.check = false;
         }
       });
+      }
+
     } else {
       clink();
       Commercialcial.value = deepClone(CommercialcialCopy.value);
@@ -1005,8 +995,8 @@ const onLoad = async () => {
     form.value.dispatchPricingType = request.value.dispatchPricingType
       ? request.value.dispatchPricingType.split(',').map(Number)
       : []; //服务类型
-
-    ServiceList.value.forEach(dataItem => {
+    if(ServiceList.value.length){
+      ServiceList.value.forEach(dataItem => {
       if (form.value.dispatchPricingType.includes(dataItem.value)) {
         dataItem.check = true;
         if (dataItem.value == 1) {
@@ -1018,6 +1008,8 @@ const onLoad = async () => {
         }
       }
     });
+    }
+
 
     StateDelivery.value = true; //显示表格
     form.value.dispatchPieceCategoryData = [];
@@ -1202,11 +1194,7 @@ const handleSubmit = async () => {
     return;
   }
 
-  ElMessageBox.confirm('是否保存?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(async () => {
+
     form.value.serviceType = props.templateData.ServiceType.join(','); //顶部选择的服务类型
     // 初始化数据
     const Submit = deepClone(form.value); //拷贝一份要提交的数据
@@ -1281,6 +1269,12 @@ const handleSubmit = async () => {
     }
 
     console.log(Submit, '要提交的数据');
+    ElMessageBox.confirm('是否保存?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    pageLoading.value=true
     if (props.templateData.code || $route.query.id) {
       console.log('走编辑接口');
       // 编辑接口
@@ -1297,6 +1291,10 @@ const handleSubmit = async () => {
             type: 'success',
           });
         }
+      }).catch(res=>{
+        console.log(res,'错误信息');
+      }).finally(()=>{
+        pageLoading.value=false
       });
     } else {
       // 新增接口
@@ -1313,7 +1311,11 @@ const handleSubmit = async () => {
           });
           emit('request-data', res.data.data); //把获取到的数据传递给父页面
         }
-      });
+      }).catch(res=>{
+        console.log(res,'错误信息');
+      }).finally(()=>{
+        pageLoading.value=false
+      });;
     }
   });
 };
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index f2181e79..3ff45a82 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -351,50 +351,51 @@ const search = val => {
   }
 };
 function updateOptions(allDropdowns) {
-    // 拉平所有的下拉框组到一个单一数组中
-    let dropdowns = [].concat(...allDropdowns);
+  // 拉平所有的下拉框组到一个单一数组中
+  let dropdowns = [].concat(...allDropdowns);
 
-    // 遍历每个下拉框
-    dropdowns.forEach((dropdown, index, self) => {
-        // 取出当前下拉框选中的值
-        let selectedValue = dropdown.Warehousecategory;
+  // 遍历每个下拉框
+  dropdowns.forEach((dropdown, index, self) => {
+    // 取出当前下拉框选中的值
+    let selectedValue = dropdown.Warehousecategory;
 
-        // 更新其他下拉框的options状态
-        self.forEach(otherDropdown => {
-            if (dropdown !== otherDropdown) {  // 确保不是自身
-                otherDropdown.options.forEach(option => {
-                    // 如果选项值和当前下拉框选中值相同，则禁用该选项
-                    if (option.value === selectedValue) {
-                        option.disabled = true;
-                    } else {
-                        // 如果其他逻辑导致应保持禁用，可以在这里加上，下面的语句是检查是否已在别处被选中
-                        let isSelectedSomewhereElse = self.some(d => d !== otherDropdown && d.Warehousecategory === option.value);
-                        option.disabled = isSelectedSomewhereElse;
-                    }
-                });
-            }
+    // 更新其他下拉框的options状态
+    self.forEach(otherDropdown => {
+      if (dropdown !== otherDropdown) {
+        // 确保不是自身
+        otherDropdown.options.forEach(option => {
+          // 如果选项值和当前下拉框选中值相同，则禁用该选项
+          if (option.value === selectedValue) {
+            option.disabled = true;
+          } else {
+            // 如果其他逻辑导致应保持禁用，可以在这里加上，下面的语句是检查是否已在别处被选中
+            let isSelectedSomewhereElse = self.some(
+              d => d !== otherDropdown && d.Warehousecategory === option.value
+            );
+            option.disabled = isSelectedSomewhereElse;
+          }
         });
+      }
     });
+  });
 }
 
-
 // 选择框值发生改变
 const selectChange = data => {
-// console.log(data, 'data');
-// console.log(form.value.dispatchCubeCategoryData,'dispatchCubeCategoryData111');
-// console.log(form.value.dispatchWeightCategoryData,'dispatchWeightCategoryData222');
-// console.log(form.value.dispatchPieceCategoryData,'dispatchPieceCategoryData333');
-
-let allDropdowns = [form.value.StoragecategoryData];
-// 更新选项
-updateOptions(allDropdowns);
+  // console.log(data, 'data');
+  // console.log(form.value.dispatchCubeCategoryData,'dispatchCubeCategoryData111');
+  // console.log(form.value.dispatchWeightCategoryData,'dispatchWeightCategoryData222');
+  // console.log(form.value.dispatchPieceCategoryData,'dispatchPieceCategoryData333');
 
+  let allDropdowns = [form.value.StoragecategoryData];
+  // 更新选项
+  updateOptions(allDropdowns);
+};
+const wxselectChange = () => {
+  let allDropdowns = [form.value.AdditionalcategoriesData];
+  // 更新选项
+  updateOptions(allDropdowns);
 };
-const wxselectChange=()=>{
-let allDropdowns = [form.value.AdditionalcategoriesData];
-// 更新选项
-updateOptions(allDropdowns);
-}
 const formCopy = ref({}); //拷贝对象
 const SelectOpin = ref(null); //当前点击的品类搜索框
 const $route = useRoute(); //获取地址栏参数
@@ -659,81 +660,80 @@ const Submit = () => {
     if (!valid) {
       return;
     }
-    ElMessageBox.confirm('是否保存?', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(async () => {
-      pageLoading.value = true;
-      await emit('request-data'); //通知父页面传递数据
-      console.log(props, 'props');
 
-      if (!props.templateData.TemplateName) {
+    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 = form.value.StoragecategoryData.find(res => !res.warehousePieceCategory); //查看仓储品类配置是否完全没有填写
+      if (storage) {
+        // 如果勾选了,并且查到了有没有填写的就提示必须填写
         ElMessage({
-          message: '请输入模板名称',
+          message: '请填完整写仓储品类配置',
           type: 'warning',
         });
         return;
       } else {
-        form.value.name = props.templateData.TemplateName; //模板名称
+        // 如果都填写了进行数据处理
+        form.value.warehousePieceCategory = form.value.StoragecategoryData.map(
+          res => res.warehousePieceCategory
+        ).join(',');
+      }
+    } else {
+      if (form.value.warehousePieceCategory) {
+        form.value.warehousePieceCategory = '';
       }
-      if (!props.templateData.brand) {
+    }
+    // 如果勾选了附加费是否按品类计费判断是否填写了附加品类配置
+    if (form.value.warehouseIsCategorySubjoin) {
+      let Surcharge = form.value.AdditionalcategoriesData.find(res => !res.warehousePieceCategory); //查看附加费品类配置是否完全没有填写
+      if (Surcharge) {
+        // 如果勾选了,并且查到了有没有填写的就提示必须填写
         ElMessage({
-          message: '请选择品牌',
+          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 = 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 = '';
-        }
+        // 如果都填写了进行数据处理
+        form.value.warehouseSubjoinCategory = form.value.AdditionalcategoriesData.map(
+          res => res.warehousePieceCategory
+        ).join(',');
       }
-      // 如果勾选了附加费是否按品类计费判断是否填写了附加品类配置
-      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 = '';
-        }
+    } else {
+      if (form.value.warehouseSubjoinCategory) {
+        form.value.warehouseSubjoinCategory = '';
       }
+    }
 
-      console.log(form.value, '要提交的参数');
+    console.log(form.value, '要提交的参数');
 
+    ElMessageBox.confirm('是否保存?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(async () => {
+      pageLoading.value = true;
       if (props.templateData.code || $route.query.id) {
         // 编辑接口
         let data = {
@@ -742,6 +742,7 @@ const Submit = () => {
           checkType: '3', //服务类型（仓储固定参数）
         };
         console.log('编辑操作');
+
         $_putpriceTemplate(data)
           .then(res => {
             console.log(res, '编辑成功之后返回值');
diff --git a/src/views/reportforms/DeliveryCustomers.vue b/src/views/reportforms/DeliveryCustomers.vue
index 61cc2af7..0991601e 100644
--- a/src/views/reportforms/DeliveryCustomers.vue
+++ b/src/views/reportforms/DeliveryCustomers.vue
@@ -25,7 +25,7 @@
             <el-form-item label="仓库">
               <el-select
                 multiple
-                v-model="TopQuery.warehouseNameRange"
+                v-model="TopQuery.warehouseNameRange"   
                 filterable
                 clearable
                 placeholder="多选仓库搜索"
@@ -71,10 +71,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+      
         </el-form>
       </el-row>
 
@@ -89,6 +86,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -159,7 +158,13 @@ import { ElMessageBox } from 'element-plus';
 import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
-const TopQuery = ref({}); //顶部搜索
+const TopQuery = ref({
+  time:[],
+  warehouseNameRange:[],
+  consigneeRange:'',
+  driverNameRange:'',
+  vehicleNameRange:'',
+}); //顶部搜索
 const warehouseList = ref([]); //仓库列表
 // const DeliveryTypeList =ref([])
 const queryCarn = ref({}); //查询顶部
@@ -346,7 +351,7 @@ const selectionChange = list => {
 // 网页顶部搜索按钮
 const searchChange = () => {
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -388,9 +393,10 @@ const searchChange = () => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.time = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+  columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -493,6 +499,7 @@ const exportReport = () => {
     .then(() => {
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportCustomer(data)
         .then(res => {
diff --git a/src/views/reportforms/DeliveryDetails.vue b/src/views/reportforms/DeliveryDetails.vue
index c268ad1c..180ed92c 100644
--- a/src/views/reportforms/DeliveryDetails.vue
+++ b/src/views/reportforms/DeliveryDetails.vue
@@ -82,10 +82,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+   
         </el-form>
       </el-row>
 
@@ -100,6 +97,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -170,8 +169,13 @@ import { ElMessageBox } from 'element-plus';
 import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
-const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({}); //查询顶部
+const queryCarn = ref({
+
+}); //查询顶部
+const TopQuery = ref({
+  warehouseNameRange:[],
+  time:[],
+}); //查询顶部
 const warehouseList = ref([]); //仓库列表
 const DeliveryTypeList = ref([
   {
@@ -248,7 +252,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList: deepClone(columnLists),
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
@@ -362,9 +366,11 @@ const selectionChange = list => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.time = [];
+
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+ columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -374,7 +380,7 @@ const searchReset = () => {
 // 网页顶部搜索按钮
 const searchChange = () => {
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -517,6 +523,7 @@ const exportReport = () => {
     .then(() => {
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportDetails(data)
         .then(res => {
diff --git a/src/views/reportforms/DeliveryTrainNumber.vue b/src/views/reportforms/DeliveryTrainNumber.vue
index 09c68093..567e6d30 100644
--- a/src/views/reportforms/DeliveryTrainNumber.vue
+++ b/src/views/reportforms/DeliveryTrainNumber.vue
@@ -82,8 +82,7 @@
             </el-form-item> -->
           </div>
           <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+        
           </el-form-item>
         </el-form>
       </el-row>
@@ -99,6 +98,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -195,7 +196,12 @@ const DeliverygenericList = ref([
   },
 ]); //配送类型
 
-const TopQuery = ref({}); //顶部搜索
+const TopQuery = ref({
+  time:[],
+  warehouseNameRange:[],
+  vehicleNameRange:'',
+  driverNameRange:'',
+}); //顶部搜索
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -347,7 +353,7 @@ const selectionChange = list => {
 // 网页顶部搜索按钮
 const searchChange = () => {
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -380,10 +386,12 @@ const searchChange = () => {
 //顶部清空搜索
 const searchReset = () => {
   TopQuery.value = {};
-  TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.warehouseNameRange = []; 
+  TopQuery.value.time = []; 
   queryCarn.value = {};
-  details.columnList.forEach(item => {
+  columnList.forEach(item => {
     item.values = '';
+    console.log(item,'item');
   });
   (details.query = {}), (details.page.total = 0);
   details.data = [];
@@ -495,6 +503,7 @@ const exportReport = () => {
       details.loadingObj.list = true;
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportTrain(data)
         .then(res => {
diff --git a/src/views/reportforms/Inventory.vue b/src/views/reportforms/Inventory.vue
index dff8e22e..a397e26f 100644
--- a/src/views/reportforms/Inventory.vue
+++ b/src/views/reportforms/Inventory.vue
@@ -80,10 +80,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+
         </el-form>
       </el-row>
 
@@ -98,6 +95,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -173,7 +172,9 @@ import { downloadXls,deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({});
+const TopQuery = ref({
+  warehouseNameRange:[]
+});
 const warehouseList = ref([]); //仓库列表
 const DeliveryType = ref([
   {
@@ -417,7 +418,7 @@ const searchReset = () => {
   TopQuery.value.warehouseNameRange = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+ columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -498,6 +499,7 @@ const exportReport = () => {
       details.loadingObj.list = true;
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportInventory(data)
         .then(res => {
diff --git a/src/views/reportforms/InventoryOutbound.vue b/src/views/reportforms/InventoryOutbound.vue
index 220bc501..415aa13d 100644
--- a/src/views/reportforms/InventoryOutbound.vue
+++ b/src/views/reportforms/InventoryOutbound.vue
@@ -92,10 +92,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+  
         </el-form>
       </el-row>
 
@@ -110,6 +107,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -181,7 +180,10 @@ import { downloadXls } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({});
+const TopQuery = ref({
+  warehouseNameRange:[],
+  time:[]
+});
 const warehouseList = ref([]); //仓库列表
 const DeliveryType = ref([
   {
@@ -353,9 +355,10 @@ const selectionChange = list => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.time = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+  columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -366,7 +369,7 @@ const searchReset = () => {
 const searchChange = () => {
   console.log(TopQuery.value, 'TopQuery.value');
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startCreateTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endCreateTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -515,6 +518,7 @@ const exportReport = () => {
       details.loadingObj.list = true;
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportOutStocks(data)
         .then(res => {
diff --git a/src/views/reportforms/InventoryReceipt.vue b/src/views/reportforms/InventoryReceipt.vue
index dfc4e0f6..2d2b5aff 100644
--- a/src/views/reportforms/InventoryReceipt.vue
+++ b/src/views/reportforms/InventoryReceipt.vue
@@ -93,10 +93,6 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
         </el-form>
       </el-row>
 
@@ -111,6 +107,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -182,7 +180,10 @@ import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({});
+const TopQuery = ref({
+  warehouseNameRange:[],
+  time:[],
+});
 const warehouseList = ref([]); //仓库列表
 const DeliveryType=ref([{
   label:'商配',
@@ -354,9 +355,11 @@ const selectionChange = list => {
 const searchReset=()=>{
 TopQuery.value={};
 TopQuery.value.warehouseNameRange=[]
+TopQuery.value.time=[]
 queryCarn.value={};
 details.query = {};
-  details.columnList.forEach(item => {
+ columnList.forEach(item => {
+    console.log(item,'item');
       item.values = '';
     });
     details.page.total  =  0
@@ -367,7 +370,7 @@ details.query = {};
 const searchChange = () => {
   console.log(TopQuery.value, 'TopQuery.value');
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startWarehousingTime = dayjs(TopQuery.value.time[0]).format(
       'YYYY-MM-DD HH:mm:ss'
     ); //开始日期
@@ -379,6 +382,7 @@ const searchChange = () => {
     delete queryCarn.value.endWarehousingTime;
   }
   // 仓库处理
+  console.log(TopQuery.value,'TopQuery.value');
   if (TopQuery.value.warehouseNameRange.length) {
     queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
   } else {
@@ -519,6 +523,7 @@ const exportReport = () => {
       details.loadingObj.list = true;
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportInStocks(data)
         .then(res => {
diff --git a/src/views/reportforms/Selfpickupreport.vue b/src/views/reportforms/Selfpickupreport.vue
index d235612e..34d78c1c 100644
--- a/src/views/reportforms/Selfpickupreport.vue
+++ b/src/views/reportforms/Selfpickupreport.vue
@@ -70,10 +70,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+  
         </el-form>
       </el-row>
 
@@ -88,6 +85,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -163,7 +162,10 @@ import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({});
+const TopQuery = ref({
+  warehouseNameRange:[],
+  time:[],
+});
 const warehouseList = ref([]); //仓库列表
 const details = reactive({
   /** 是否开启搜索 */
@@ -317,9 +319,10 @@ const selectionChange = list => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.time = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+ columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -330,7 +333,7 @@ const searchReset = () => {
 const searchChange = () => {
   console.log(TopQuery.value, 'TopQuery.value');
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startScanTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endScanTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -459,6 +462,7 @@ const exportReport = () => {
       details.loadingObj.list = true;
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportSelfpickup(data)
         .then(res => {
diff --git a/src/views/reportforms/Selfpickuptask.vue b/src/views/reportforms/Selfpickuptask.vue
index de87d49c..654dfec8 100644
--- a/src/views/reportforms/Selfpickuptask.vue
+++ b/src/views/reportforms/Selfpickuptask.vue
@@ -81,10 +81,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+
         </el-form>
       </el-row>
 
@@ -99,6 +96,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -168,13 +167,18 @@ import {
   $_getMyWarehouseList,
   $_exportStockOrder,
   $_getstockOrder,
+  $_getasks,
+  $_exportTasks
 } from '@/api/reportforms/index.js';
 import { ElMessageBox } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({}); //查询顶部
+const TopQuery = ref({
+  warehouseRange:[],
+  time:[],
+}); //查询顶部
 const warehouseList = ref([]); //仓库列表
 const DeliveryTypeList = ref([
   {
@@ -351,9 +355,10 @@ const selectionChange = list => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseRange = [];
+  TopQuery.value.time = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -363,7 +368,7 @@ const searchReset = () => {
 // 网页顶部搜索按钮
 const searchChange = () => {
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startCreatedTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endCreatedTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -478,7 +483,7 @@ const getrain = val => {
   };
   details.loadingObj.list = true;
 
-  $_getstockOrder(data)
+  $_getasks(data)
     .then(res => {
       console.log(res, '当前参数');
       details.page.total = res.data.data.total;
@@ -500,10 +505,11 @@ const exportReport = () => {
     .then(() => {
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
-      $_exportStockOrder(data)
+      $_exportTasks(data)
         .then(res => {
-          downloadXls(res.data, `在库订单报表数据.xlsx`);
+          downloadXls(res.data, `自提任务报表数据.xlsx`);
         })
         .catch(() => {})
         .finally(() => {
diff --git a/src/views/reportforms/Stockordertable.vue b/src/views/reportforms/Stockordertable.vue
index eecd048e..15adba85 100644
--- a/src/views/reportforms/Stockordertable.vue
+++ b/src/views/reportforms/Stockordertable.vue
@@ -67,10 +67,6 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
         </el-form>
       </el-row>
 
@@ -85,6 +81,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -161,7 +159,10 @@ import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({}); //查询顶部
+const TopQuery = ref({
+  warehouseRange:[],
+  time:[],
+}); //查询顶部
 const warehouseList = ref([]); //仓库列表
 const DeliveryTypeList = ref([
   {
@@ -338,9 +339,10 @@ const selectionChange = list => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.time = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+  columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -350,10 +352,10 @@ const searchReset = () => {
 const searchChange = () => {
   // 日期处理
   // 处理开始和结束日期
-  queryCarn.value.startWarehouseEntryTime = TopQuery.value.time
+  queryCarn.value.startWarehouseEntryTime = TopQuery.value.time.length
     ? dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss')
     : undefined;
-  queryCarn.value.endWarehouseEntryTime = TopQuery.value.time
+  queryCarn.value.endWarehouseEntryTime = TopQuery.value.time.length
     ? dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss')
     : undefined;
 
@@ -475,6 +477,7 @@ const exportReport = () => {
     .then(() => {
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportTasks(data)
         .then(res => {
diff --git a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
index b753a9ed..6911bbe6 100644
--- a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
+++ b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
@@ -32,7 +32,6 @@
             />
           </el-form-item>
 
-
           <el-form-item label="签收扫描时间">
             <el-date-picker
               v-model="TopQuery.scanSingnTime"
@@ -97,12 +96,13 @@
             </template>
 
             <template v-if="slotProps.scope.column.label === '预约信息'">
-              <el-text class="el_textBtn" @click="informationClick(slotProps.scope.row)">
-                {{
-                  slotProps.scope.column.label === '预约信息'
-                    ? slotProps.scope.row.reservationInfo
-                    : ''
-                }}
+              <el-text
+                class="el_textBtn"
+                v-for="(item, index) in slotProps.scope.row.reservationInfo.split(',')"
+                :key="index"
+                @click="informationClick(item.trim(), slotProps.scope.row)"
+              >
+                {{`${item}` }}
               </el-text>
             </template>
 
@@ -149,11 +149,13 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue
 import { columnList } from '@/option/warehouse/distributionStockArticle.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
-import { $_signforList ,$_signforDistributionStockArticleList} from '@/api/distribution/distributionStockArticle.js';
+import {
+  $_signforList,
+  $_signforDistributionStockArticleList,
+} from '@/api/distribution/distributionStockArticle.js';
 import functions from '@/utils/functions.js';
-import { ElMessageBox, ElMessage} from 'element-plus';
-import { downloadXls} from '@/utils/util';
-
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { downloadXls } from '@/utils/util';
 const $router = useRouter(); //跳转
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
@@ -279,7 +281,30 @@ const inputsc = (index, row) => {
   processRowProperty(index, row, details);
 };
 // 实例函数
+const informationClick = (item, row) => {
+
+  const cleanedItem = item.replace(/\([^)]*\)/g, '');
+  console.log(cleanedItem, 'cleanedItem');
+  console.log(row, 'row');
+  // 尝试使用 HTML 字符串
+  const message = `将跳转预约信息为 <b><span style="color: red;">${cleanedItem}</span></b>是否确认!`;
+  ElMessageBox.confirm(
+    message,
+    '提示',
+    {
+      dangerouslyUseHTMLString: true,
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
 
+    })
+    .catch(() => {
+    
+    })
+};
 /** 表格表头时间选择 */
 const timesc = (index, row) => {
   console.log(index, row);
@@ -324,18 +349,22 @@ const searchChange = () => {
     queryCarn.value.signingTimeStart = dayjs(TopQuery.value.signinTime[0]).format(
       'YYYY-MM-DD HH:mm:ss'
     ); //开始日期
-    queryCarn.value.signingTimeEnd = dayjs(TopQuery.value.signinTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+    queryCarn.value.signingTimeEnd = dayjs(TopQuery.value.signinTime[1]).format(
+      'YYYY-MM-DD HH:mm:ss'
+    ); //结束日期
   } else {
     delete queryCarn.value.signingTimeStart;
     delete queryCarn.value.signingTimeEnd;
   }
- 
+
   // 签收扫描时间
   if (TopQuery.value.scanSingnTime) {
     queryCarn.value.scanSigningTimeStart = dayjs(TopQuery.value.scanSingnTime[0]).format(
       'YYYY-MM-DD HH:mm:ss'
     ); //开始日期
-    queryCarn.value.scanSigningTimeEnd = dayjs(TopQuery.value.scanSingnTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+    queryCarn.value.scanSigningTimeEnd = dayjs(TopQuery.value.scanSingnTime[1]).format(
+      'YYYY-MM-DD HH:mm:ss'
+    ); //结束日期
   } else {
     delete queryCarn.value.scanSigningTimeStart;
     delete queryCarn.value.scanSigningTimeEnd;
@@ -367,16 +396,14 @@ const searchHide = () => {
 };
 // 导出
 
-
-
-const exportExcel  = () => {
+const exportExcel = () => {
   if (!Object.values(queryCarn.value).length || Object.values(details.query).length) {
     ElMessage({
-    message: '请输入查询条件',
-    type: 'warning',
-  })
-return
-}
+      message: '请输入查询条件',
+      type: 'warning',
+    });
+    return;
+  }
   ElMessageBox.confirm('是否导出数据?', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -388,24 +415,21 @@ return
         size: details.page.pageSize,
         ...details.query,
         ...queryCarn.value,
-
       };
       $_signforDistributionStockArticleList(data).then(res => {
         downloadXls(res.data, `已签订单.xlsx`);
         ElMessage({
-        message:'导出成功',
-        type: 'success',
-        })
+          message: '导出成功',
+          type: 'success',
+        });
       });
     })
     .catch(() => {});
 };
 
-
 // 清空
 const searchReset = () => {
-  
-  TopQuery.value={}
+  TopQuery.value = {};
   details.query = {};
   details.columnList.forEach(item => {
     item.values = '';
@@ -496,9 +520,6 @@ const removeParentheses = str => {
   return str;
 };
 // 预约信息
-const informationClick = val => {
-  return;
-};
 
 const OrdernumberClick = val => {
   $router.push({