diff --git a/src/router/views/index.js b/src/router/views/index.js
index 1051ba49..277c17cb 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1541,7 +1541,7 @@ export default [
       {
         meta: {
           i18n: 'dict',
-          keepAlive: false,
+          keepAlive: true,
         },
         path: '/financialsector/FinanceHome',
         name: '财务',
diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index f04b44be..0e5edaa1 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -985,7 +985,7 @@ export default {
         if (!this.CustomerEntd) {
           setTimeout(async () => {
             const response = { valid: false }; // 假设校验通过
-            await $_getListlistName({ code: a }).then(res => {
+            await $_getListlistName({ name: a }).then(res => {
               console.log("客户名称校验",res.data);
               if (res.data.data.length > 0) {
                 reject(new Error('客户名称已存在')); // 校验不通过，调用 reject() 并传递错误信息
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 8454a660..8927af23 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -4700,13 +4700,14 @@ export default {
     },
     // 复核签收确认弹窗
     submitForm() {
-      if (!this.DoorstepPhoto.length) {
-        ElMessage({
-          message: '至少上传一张上门照片',
-          type: 'warning',
-        });
-        return;
-      }
+      // 取消上门照片规则
+      // if (!this.DoorstepPhoto.length) {
+      //   ElMessage({
+      //     message: '至少上传一张上门照片',
+      //     type: 'warning',
+      //   });
+      //   return;
+      // }
       if (!this.StackingPhoto.length) {
         ElMessage({
           message: '至少上传一张堆码照片',
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 127e11eb..478fcaec 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -1719,6 +1719,9 @@ onMounted(() => {
     getDeliveryList(route.query.id).then(res => {
       //司机配置
       if (res.data.data.kind == 2) {
+        if(!res.data.data.deliveryTripartiteVO){
+          return
+        }
         DataSubmit.value.tripartite.distributionCompany = res.data.data.distributionCompany; //外协来源
         DataSubmit.value.tripartite.driverName = res.data.data.deliveryTripartiteVO.driverName; //司机名称
         DataSubmit.value.tripartite.vehicleNum = res.data.data.deliveryTripartiteVO.vehicleNum; //司机车牌
@@ -1732,7 +1735,11 @@ onMounted(() => {
         numTab.value[0].name = '0'; //切换外协选项卡
         numTab.value[1].name = '1';
         kind.value = true;
-        res.data.data.deliverySelfVO.forEach(item => {
+        if(res.data.data.deliverySelfVO){
+          if(!res.data.data.deliverySelfVO.length){
+            return
+          }
+          res.data.data.deliverySelfVO.forEach(item => {
           console.log(item, '司机配置信息');
           DriverTemporaryStorage.value.push({
             driverId: item.driverId, //司机ID
@@ -1755,24 +1762,35 @@ onMounted(() => {
             DataSubmit.value.masterVehicleNub = item.vehicleNub; //司机车牌号
           }
         });
+        }
+
       }
-      wrapDataInfo.value = res.data.data.stockArticleList; // 订单包件
-      dataInfo.value = res.data.data.stockArticleList; //订单列表
+      console.log(res.data.data,'123');
+      
+      wrapDataInfo.value = res.data.data.stockArticleList||''; // 订单包件
+      dataInfo.value = res.data.data.stockArticleList||''; //订单列表
       // dataInfoTemp.value=dataInfo.value;//把获取到的值传递给公共组件
-      DataSubmit.value.stockup.loaderId = res.data.data.loadingTeamId; //装车班组ID
-      DataSubmit.value.stockup.loaderName = res.data.data.loadingTeamName; //装车班组名称
-      DataSubmit.value.stockup.unloaderId = res.data.data.unloadingTeamId; //卸车班组ID
-      DataSubmit.value.stockup.unloaderName = res.data.data.unloadingTeamName; //卸车班组名称
+      DataSubmit.value.stockup.loaderId = res.data.data.loadingTeamId||''; //装车班组ID
+      DataSubmit.value.stockup.loaderName = res.data.data.loadingTeamName||''; //装车班组名称
+      DataSubmit.value.stockup.unloaderId = res.data.data.unloadingTeamId||''; //卸车班组ID
+      DataSubmit.value.stockup.unloaderName = res.data.data.unloadingTeamName||''; //卸车班组名称
       DataSubmit.value.remarks = res.data.data.remarks; //备注信息
-      DataSubmit.value.stockup.forkliftName = res.data.data.stockupInfo.forkliftName; //备货人员名称
-      DataSubmit.value.stockup.forkliftId = res.data.data.stockupInfo.forkliftId; //备货人员ID
-      DataSubmit.value.stockup.goodsAreaId = res.data.data.stockupInfo.goodsAreaId; //备货区域ID
-      DataSubmit.value.stockup.goodsAreaName = res.data.data.stockupInfo.stockupArea; //备货区域名称
-      DataSubmit.value.stockup.outboundDate = res.data.data.stockupInfo.outboundDate; //出库时间
-      DataSubmit.value.stockup.stockupDate = res.data.data.stockupInfo.stockupDate; //备货时间
+      if(!res.data.data.stockupInfo){
+        return 
+      }
+      DataSubmit.value.stockup.forkliftName = res.data.data.stockupInfo.forkliftName||''; //备货人员名称
+      DataSubmit.value.stockup.forkliftId = res.data.data.stockupInfo.forkliftId||''; //备货人员ID
+      DataSubmit.value.stockup.goodsAreaId = res.data.data.stockupInfo.goodsAreaId||''; //备货区域ID
+      DataSubmit.value.stockup.goodsAreaName = res.data.data.stockupInfo.stockupArea||''; //备货区域名称
+      DataSubmit.value.stockup.outboundDate = res.data.data.stockupInfo.outboundDate||''; //出库时间
+      DataSubmit.value.stockup.stockupDate = res.data.data.stockupInfo.stockupDate||''; //备货时间
       DataSubmit.value.taskTime = res.data.data.taskTime; //配送日期
       editLoading.value = false; //所有信息获取完成关闭弹窗
       tooSUM();
+    }).catch(()=>{
+
+    }).finally(()=>{
+      editLoading.value = false; //开启加载
     });
   }
 });
@@ -2964,22 +2982,19 @@ const SubmitCommercial = async () => {
       const res = await updateDeliveryList(DataSubmitRenamed);
       console.log(res, '修改之后提交的返回值');
       code = res.data.code;
+      ElMessage({
+      message: res.data.msg,
+      type: 'success',
+      })
+      handleBack();
     } else {
       // 新增信息
 
       console.log(DataSubmit.value, '准备提交的信息');
       const res = await deliveryBusinessTask(DataSubmit.value);
       code = res.data.code;
-      console.log(res, '新增之后的返回值');
-    }
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    editLoading.value = false; //关闭提交加载
-
-    if (code !== 200) return;
-    state.value = false; //重置满足条件
-    ElMessageBox.confirm(
+      if (code !== 200) return;
+      ElMessageBox.confirm(
     '计划添加成功,是否继续添加?',
     '提示',
     {
@@ -3002,6 +3017,17 @@ sjInput.value=''
       handleBack();
     })
 
+      console.log(res, '新增之后的返回值');
+    }
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    editLoading.value = false; //关闭提交加载
+
+    if (code !== 200) return;
+    state.value = false; //重置满足条件
+
+
 
   }
   console.log(DataSubmit.value, '准备提交的信息');
diff --git a/src/views/financialsector/FinanceHome.vue b/src/views/financialsector/FinanceHome.vue
index 462bfd16..70a8c212 100644
--- a/src/views/financialsector/FinanceHome.vue
+++ b/src/views/financialsector/FinanceHome.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="content_box">
+  <div class="content_box" v-loading='ServiceTypeLoading'>
     <div class="header">
       <!-- 模板名称 -->
       <div class="el_Template">
@@ -17,6 +17,7 @@
           style="width: 340px"
           multiple
           @remove-tag="removeTag"
+          :loading='ServiceTypeLoading'
         >
           <el-option
             v-for="item in ServiceList"
@@ -33,7 +34,7 @@
     </div>
 
     <!-- 模板内容 -->
-    <div class="content">
+    <div class="content" >
       <el-tabs type="border-card" v-model="Tabmenu">
         <template v-for="item in ServiceList" :key="item.label">
           <el-tab-pane :name="item.label" v-if="item.state" :label="item.label">
@@ -53,6 +54,7 @@
 
 <script setup>
 import { ref, defineAsyncComponent } from 'vue';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
 //仓储模板
 const FinancialWarehousing = defineAsyncComponent(() =>
   import('@/views/financialsector/Financialse/FinancialWarehousing.vue')
@@ -63,44 +65,39 @@ const FinancialBill = defineAsyncComponent(() => import('@/views/financialsector
 const FinancialDelivery = defineAsyncComponent(() =>
   import('@/views/financialsector/Financialse/FinancialDelivery.vue')
 );
+const ServiceTypeLoading=ref(true);//菜单加载
 const form = ref({});
 const Tabmenu = ref('仓储');
 const templateInfo = ref({
   name: '参数',
 });
 // 菜单列表
-const ServiceList = ref([
-  {
-    label: '提货',
-    value: '1',
-    state: false,
-    check: false,
-  },
-  {
-    label: '干线',
-    value: '2',
-    state: false,
-    check: false,
-  },
-  {
-    label: '仓储',
-    value: '3',
-    state: false,
-    check: false,
-  },
-  {
-    label: '配送',
-    value: '4',
-    state: false,
-    check: false,
-  },
-  {
-    label: '安装',
-    value: '5',
-    state: false,
-    check: false,
-  },
-]);
+const ServiceList = ref([]);
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    if(res.data.code ==200){
+      if(res.data.data.length){
+        res.data.data.forEach(item => {
+         targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
+        id:item.id,
+      });
+    });
+   }
+  }
+}).catch(()=>{
+}).finally(()=>{
+  ServiceTypeLoading.value=false;
+});
+}
+// 页面初始化必要请求
+const onLoad=()=>{
+  updateDictionary(ServiceList.value,'service_type');//菜单加载
+}
+onLoad()
 // 点击菜单
 const isChecked = val => {
   //菜单隐藏/显示
@@ -152,6 +149,7 @@ const removeTag = value => {
       width: 100% !important;
       padding: 0 30px;
       .el-checkbox__label {
+        width: 100%;
         margin-left: 20px;
       }
     }
@@ -179,5 +177,6 @@ const removeTag = value => {
 }
 .content {
   margin-top: 6px;
+  height: 100%;
 }
 </style>
diff --git a/src/views/financialsector/Financialse/FinancialDelivery.vue b/src/views/financialsector/Financialse/FinancialDelivery.vue
index 56325e12..7bd5977c 100644
--- a/src/views/financialsector/Financialse/FinancialDelivery.vue
+++ b/src/views/financialsector/Financialse/FinancialDelivery.vue
@@ -7,7 +7,6 @@
         class="el_Cselect"
         v-model="form.Warehousebillingmode"
         filterable
-        clearable
         placeholder="选择计费类型"
         style="width: 240px"
         @change="chargetype"
@@ -29,7 +28,7 @@
           filterable
           placeholder="请选择服务类型"
           :popper-append-to-body="false"
-          style="width: 660px"
+          style="width: 760px"
           multiple
           @remove-tag="removeTag"
         >
@@ -67,14 +66,18 @@
     </div>
 
     <!-- 商配/市配  -->
-    <div class="el_Storage">
+    <div class="el_Storage" v-if="WarehousebillingmodeTitle">
       <el-tabs class="demo-tabs">
-        <el-tab-pane :label="WarehousebillingmodeTitle">
+        <el-tab-pane
+          :label="WarehousebillingmodeTitle"
+          v-loading="Deliveryloading"
+          element-loading-text="Loading..."
+        >
           <!-- 商配/市配内容 -->
-          <div class="el_Commercial_ercial">
+          <div class="el_Commercial_ercial" v-if="StateDelivery">
             <!-- 按件计费 -->
             <template v-for="Item in Commercialcial" :key="Item.title">
-              <div class="el_Storage">
+              <div class="el_Storage" v-if="Item.state">
                 <div class="Storage-cont">
                   <!-- 标题 -->
                   <span class="el_table_span">{{ Item.title }}</span>
@@ -132,216 +135,260 @@
         </el-tab-pane>
       </el-tabs>
     </div>
+    <!-- 附加费计费 -->
+    <div class="el_Surchargebilling">
+      <span class="el_title_span">附加费计费</span>
+      <!-- 是否有分货费  -->
+      <div class="el_Storage">
+        <span class="el_table_span">是否有分货费</span>
+        <el-radio-group v-model="form.Distributionfee" 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 class="el_Storage">
+        <span class="el_table_span">是否有操作/装卸费</span>
+        <el-radio-group v-model="form.Operatingfee" 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 class="el_Storage el_upstairs">
+        <div class="el_upstairs_a">
+          <span class="el_table_span">是否有上楼费</span>
+          <el-radio-group v-model="form.upstairs" 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_upstairs_b">
+          <span class="el_table_span">是否配置免费层数</span>
+          <el-radio-group v-model="form.Numberlayers" 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 class="el_Storage">
+        <span class="el_table_span">是否有平移费</span>
+        <el-radio-group v-model="form.Translationfee" class="el_Cselect">
+          <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.Surchargefee" class="el_Cselect">
+          <el-radio v-for="item in Surchargefee" :key="item.label" :label="item.value">{{
+            item.label
+          }}</el-radio>
+        </el-radio-group>
+      </div>
+
+      <!-- 附加费品类 -->
+      <div class="el_Storage">
+        <div class="Storage-cont">
+          <span class="el_table_span">附加费品类</span>
+          <!-- 表格  -->
+          <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>
+              <el-select
+                class="el_Cselect"
+                v-model="item.AdditionalcategoriesInput"
+                filterable
+                clearable
+                placeholder="请选择品类"
+                style="width: 240px"
+              >
+                <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="categoriesduce(item.id)"
+                  v-if="item.reduce"
+                  class="el_table_operation_span_a"
+                  >-</span
+                >
+                <span
+                  @click="categoriesplus(item.id)"
+                  v-if="item.plus"
+                  class="el_table_operation_span_b"
+                  >+</span
+                >
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 最低计费  -->
+      <div class="el_Storage el_Minimumbilling">
+        <span class="el_table_title">最低计费</span>
+        <div class="el_Storage">
+          <div class="el_Minimumbillingbox">
+            <!-- 是否最低计费 -->
+            <div class="el_Minimumbilling_a">
+              <span class="el_table_span">是否最低计费</span>
+              <el-radio-group v-model="form.Minimumbilling" class="el_Cselect">
+                <el-radio v-for="item in Minimumbilling" :key="item.label" :label="item.value">{{
+                  item.label
+                }}</el-radio>
+              </el-radio-group>
+            </div>
+            <!-- 最低计费方式 -->
+            <div class="el_Minimumbilling_b">
+              <span class="el_table_span">最低计费方式</span>
+              <el-radio-group v-model="form.Billingmethod" class="el_Cselect">
+                <el-radio v-for="item in Billingmethod" :key="item.label" :label="item.value">{{
+                  item.label
+                }}</el-radio>
+              </el-radio-group>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 最低计费类型  -->
+      <div class="el_Storage">
+        <span class="el_table_span">最低计费类型</span>
+        <el-radio-group v-model="form.chargetype" class="el_Cselect">
+          <el-radio v-for="item in chargetypeSelect" :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.Upwardjudgment" class="el_Cselect">
+          <el-radio v-for="item in Upwardjudgment" :key="item.label" :label="item.value">{{
+            item.label
+          }}</el-radio>
+        </el-radio-group>
+      </div>
+    </div>
   </div>
 </template>
 
 <script setup>
 import { ref } from 'vue';
+import { ElMessage } from 'element-plus';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+//表单
 const form = ref({
-  Warehousebillingmode: '1', //仓储计费类型
-  Distinguishcategories: '1', //是否区分品类
-  Leftoverparts: '1', //是否有遗留件
-}); //表单
-// 配送服务类型
-const Warehousebillingmode = ref([
-  { label: '市配', value: '1' },
-  { label: '商配', value: '2' },
-]);
-const WarehousebillingmodeTitle = ref('市配'); //配送服务类型标题
-// 配送计费模式
-const ServiceList = ref([
-  {
-    label: '按计件计费',
-    value: '1',
-    check: false,
-  },
-  {
-    label: '按重量计费',
-    value: '2',
-    check: false,
-  },
-  {
-    label: '按方计费',
-    value: '3',
-    check: false,
-  },
-  {
-    label: '按整车计费',
-    value: '4',
-    state: false,
-    check: false,
-  },
-  {
-    label: '按点位计费',
-    value: '5',
-    check: false,
-  },
-  {
-    label: '按吨计费',
-    value: '6',
-    check: false,
-  },
-  {
-    label: '按公里计费',
-    value: '7',
-    check: false,
-  },
-]);
-
-const Commercialcial = ref([
-  {
-    title: '按件数计费', // 标题
-    state: false, //是否显示
-    Storageloading: false, //加载效果
-    sequence: [
-      //表格
-      {
-        id: 1, //序号
-        plus: true, //加号显示
-        reduce: false, //减号显示
-        StoragecategoryList: [], //品类
-      },
-      {
-        id: 2,
-        plus: true,
-        reduce: true,
-        StoragecategoryList: [],
-      },
-    ],
-  },
-  {
-    title: '按重量计费',
-    state: false, //是否显示
-    Storageloading: false, //加载效果
-    sequence: [
-      //表格
-      {
-        id: 1, //序号
-        plus: true, //加号显示
-        reduce: false, //减号显示
-        StoragecategoryList: [], //品类
-      },
-      {
-        id: 2,
-        plus: true,
-        reduce: true,
-        StoragecategoryList: [],
-      },
-    ],
-  },
-  {
-    title: '按方计费',
-    state: false, //是否显示
-    Storageloading: false, //加载效果
-    sequence: [
-      //表格
-      {
-        id: 1, //序号
-        plus: true, //加号显示
-        reduce: false, //减号显示
-        StoragecategoryList: [], //品类
-      },
-      {
-        id: 2,
-        plus: true,
-        reduce: true,
-        StoragecategoryList: [],
-      },
-    ],
-  },
-  {
-    title: '按整车计费',
-    state: false, //是否显示
-    Storageloading: false, //加载效果
-    sequence: [
-      //表格
-      {
-        id: 1, //序号
-        plus: true, //加号显示
-        reduce: false, //减号显示
-        StoragecategoryList: [], //品类
-      },
-      {
-        id: 2,
-        plus: true,
-        reduce: true,
-        StoragecategoryList: [],
-      },
-    ],
-  },
-  {
-    title: '按点位计费',
-    state: false,
-    state: false, //是否显示
-    Storageloading: false, //加载效果
-    sequence: [
-      //表格
-      {
-        id: 1, //序号
-        plus: true, //加号显示
-        reduce: false, //减号显示
-        StoragecategoryList: [], //品类
-      },
-      {
-        id: 2,
-        plus: true,
-        reduce: true,
-        StoragecategoryList: [],
-      },
-    ],
-  },
-  {
-    title: '按吨计费',
-    state: false, //是否显示
-    Storageloading: false, //加载效果
-    sequence: [
-      //表格
-      {
-        id: 1, //序号
-        plus: true, //加号显示
-        reduce: false, //减号显示
-        StoragecategoryList: [], //品类
-      },
-      {
-        id: 2,
-        plus: true,
-        reduce: true,
-        StoragecategoryList: [],
-      },
-    ],
-  },
+  Warehousebillingmode: '', //仓储计费类型
+  Distinguishcategories: '0', //是否区分品类
+  Leftoverparts: '0', //是否有遗留件
+  Distributionfee: '0', //是否有分货费
+  Operatingfee: '0', //是否有操作装卸费
+  upstairs: '0', //是否有上楼费
+  Numberlayers: '0', //是否配置免费层数
+  Translationfee: '0', //是否有平移费
+  Surchargefee: '0', //附加费
+  Minimumbilling: '0', //是否最低计费
+  Billingmethod: '1', //最低计费方式
+  chargetype: '1', //最低计费类型
+  Upwardjudgment: '0', //是否向上判断
+});
+// 是否向上判断
+const Upwardjudgment = ref([]);
+// 最低计费类型
+const chargetypeSelect = ref([]);
+// 最低计费方式
+const Billingmethod = ref([]);
+// 是否显示服务类型选择的列表
+const StateDelivery = ref(false);
+// 是否最低计费
+const Minimumbilling = ref([]);
+// 附加品类loading
+const goriesloading = ref(false);
+// 附加费品类配置
+const AdditionalcategoriesList = ref([
   {
-    title: '按公里计费',
-    state: false, //是否显示
-    Storageloading: false, //加载效果
-    sequence: [
-      //表格
+    id: 1,
+    plus: true,
+    reduce: false,
+    AdditionalcategoriesInput: '', //选择框值
+    Additionalcategories: [
       {
-        id: 1, //序号
-        plus: true, //加号显示
-        reduce: false, //减号显示
-        StoragecategoryList: [], //品类
+        label: '衣柜',
+        value: '1',
       },
       {
-        id: 2,
-        plus: true,
-        reduce: true,
-        StoragecategoryList: [],
+        label: '橱柜',
+        value: '2',
       },
     ],
   },
 ]);
-
-// 是否区分品类
-const Distinguishcategories = ref([
-  { label: '是', value: '1' },
-  { label: '否', value: '0' },
+// 附加费是否统一计费
+const Surchargefee = ref([]);
+//是否有平移费
+const Translationfee = ref([]);
+//是否配置免费层数
+const Numberlayers = ref([]);
+// 是否有上楼费
+const upstairs = ref([]);
+//是否有分货费
+const Distributionfee = ref([]);
+//是否有操作装卸费
+const Operatingfee = ref([]);
+const Deliveryloading = ref(false);
+// 配送服务类型
+const Warehousebillingmode = ref([]);
+const WarehousebillingmodeTitle = ref(''); //配送服务类型标题
+// 配送计费模式
+const ServiceList = ref([]);
+const Commercialcial = ref([
+  //   {
+  //     title: '按公里计费',
+  //     state: false, //是否显示
+  //     Storageloading: false, //加载效果
+  //     sequence: [
+  //       //表格
+  //       {
+  //         id: 1, //序号
+  //         plus: true, //加号显示
+  //         reduce: false, //减号显示
+  //         StoragecategoryList: [], //品类
+  //         Warehousecategory: '', //选择的值
+  //       },
+  //     ],
+  //   },
 ]);
+// 是否区分品类
+const Distinguishcategories = ref([]);
 // 是否有遗留件
-const Leftoverparts = ref([
-  { label: '是', value: '1' },
-  { label: '否', value: '0' },
-]);
+const Leftoverparts = ref([]);
 // 计费类型选择
 const chargetype = val => {
   console.log(val);
@@ -353,19 +400,6 @@ const chargetype = val => {
 };
 //案件计费
 const Storageloading = ref(false);
-// 仓储品类配置
-const StoragecategoryList = ref([
-  {
-    id: 1,
-    plus: true,
-    reduce: false,
-  },
-  {
-    id: 2,
-    plus: true,
-    reduce: true,
-  },
-]);
 // 附加费品类
 const Additionalcategories = ref([
   {
@@ -377,20 +411,59 @@ const Additionalcategories = ref([
     value: '2',
   },
 ]);
+// 页面初始化添加品类
 Commercialcial.value.forEach(res => {
-  console.log(res, '第一层');
   res.sequence.forEach(rues => {
-    console.log(rues, '第二曾');
     rues.StoragecategoryList = { ...Additionalcategories.value };
   });
 });
+const Timedelive = () => {
+  Deliveryloading.value = true;
+  let timerId = setTimeout(() => {
+    Deliveryloading.value = false;
+    clearTimeout(timerId); // 在回调函数内部清除定时器
+  }, 300);
+};
+
+// 根据当前选择的服务类型来选择是否显示框框
+const CommercialcialDisplay = () => {
+  if (Commercialcial.value.find(res => res.state)) {
+    StateDelivery.value = true;
+  } else {
+    StateDelivery.value = false;
+  }
+};
+
 // 点击菜单
-const isChecked = val => {
-  console.log(val, '点击的');
+const isChecked = value => {
+  if (!WarehousebillingmodeTitle.value) {
+    ElMessage({
+      message: '请先选择仓储计费类型',
+      type: 'warning',
+    });
+    form.value.ServiceType = []; //清空选择
+    value.check = false; //取消当前勾选
+    return;
+  }
+  console.log(value, '当前点击的菜单');
+  //   找到当前点击的菜单,显示对应的列表
+  let data = ServiceList.value.find(res => res.label == value.label);
+  Commercialcial.value.find(res => res.title == data.label).state = !Commercialcial.value.find(
+    res => res.title == data.label
+  ).state;
+
+  CommercialcialDisplay(); // 根据当前选择的服务类型来选择是否显示框框
+  Timedelive(); //加载效果
 };
 // 点击移除
 const removeTag = value => {
-  ServiceList.value.find(res => res.value == value).check = false;
+  Deliveryloading.value = true;
+  let data = ServiceList.value.find(res => res.value == value);
+  data.check = false;
+  Commercialcial.value.find(res => res.title == data.label).state = false;
+  // 根据当前选择的服务类型来选择是否显示框框
+  CommercialcialDisplay(); // 根据当前选择的服务类型来选择是否显示框框
+  Timedelive(); //加载效果
 };
 
 // 移除对象
@@ -415,11 +488,10 @@ function addItemAfterId(array, id) {
     id: array.sequence.length + 1, // 新对象的 ID 为当前数组长度加 1
     plus: true, //加号
     reduce: true, //减号
-    StoragecategoryList: [ ...Additionalcategories.value ], //品类
+    StoragecategoryList: [...Additionalcategories.value], //品类
+    Warehousecategory: '', //选择的值
   };
 
-
-
   const index = array.sequence.findIndex(item => item.id === id);
   if (index !== -1) {
     array.sequence.splice(index + 1, 0, newItem); // 在找到的 ID 后面插入新对象
@@ -447,6 +519,121 @@ const storageplus = (item, id) => {
   item.Storageloading = true;
   addItemAfterId(item, id);
 };
+// 附加品类加移除对象
+function FmremoveItemById(array, id) {
+  const index = array.findIndex(item => item.id === id);
+  if (index !== -1) {
+    array.splice(index, 1);
+    array.forEach((item, index) => {
+      item.id = index + 1;
+    });
+  }
+  let timerId = setTimeout(() => {
+    goriesloading.value = false;
+    clearTimeout(timerId); // 在回调函数内部清除定时器
+  }, 300);
+}
+
+// 附加品类加添加对象
+function FmaddItemAfterId(array, id, data) {
+  console.log(array);
+  const newItem = {
+    id: array.length + 1, // 新对象的 ID 为当前数组长度加 1
+    plus: true, //是否显示加号
+    reduce: true, //是否显示减号
+    WarehousecategoryInput: '', //选择框值
+    Additionalcategories: [...data], //选择框列表,防止后期需要改动列表值
+  };
+  const index = array.findIndex(item => item.id === id);
+  if (index !== -1) {
+    array.splice(index + 1, 0, newItem); // 在找到的 ID 后面插入新对象
+    // 重新排序 ID
+    array.forEach((item, index) => {
+      item.id = index + 1;
+    });
+  }
+  let timerId = setTimeout(() => {
+    goriesloading.value = false; //关闭加载效果
+    clearTimeout(timerId); // 在回调函数内部清除定时器
+  }, 300);
+  // 取消定时器
+}
+// 附加品类加
+const categoriesplus = id => {
+  goriesloading.value = true;
+  FmaddItemAfterId(AdditionalcategoriesList.value, id, Additionalcategories.value);
+};
+// 附加品类减
+const categoriesduce = id => {
+  goriesloading.value = true;
+  FmremoveItemById(AdditionalcategoriesList.value, id);
+};
+
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType)
+    .then(res => {
+      console.log(res, '字典');
+      if (res.data.code == 200) {
+        if (res.data.data.length) {
+          res.data.data.forEach(item => {
+            targetArray.push({
+              value: item.dictKey,
+              label: item.dictValue,
+              id: item.id,
+            });
+          });
+        }
+      }
+      // 是否类型
+      if (dictionaryType == 'price_yes_no') {
+        Leftoverparts.value= {...Distinguishcategories.value};//是否有遗留件
+        Distributionfee.value= {...Distinguishcategories.value};//是否有分货费
+        Operatingfee.value= {...Distinguishcategories.value};//是否有操作/装卸费
+        upstairs.value= {...Distinguishcategories.value};//是否有上楼费
+        Numberlayers.value= {...Distinguishcategories.value};//是否配置免费层数
+        Translationfee.value= {...Distinguishcategories.value};//是否有平移费
+        Surchargefee.value= {...Distinguishcategories.value};//附加费是否统一计费
+        Minimumbilling.value= {...Distinguishcategories.value};//是否最低计费
+        Upwardjudgment.value= {...Distinguishcategories.value};//是否向上判断
+      }
+      //服务类型
+      if (dictionaryType == 'dispatch_pricing_type') {
+        Commercialcial.value = []; //清空服务类型
+        res.data.data.forEach(res => {
+          let data = {
+            title: res.dictValue, // 标题
+            id: res.id, //码表ID
+            state: false, //是否显示
+            Storageloading: false, //加载效果
+            sequence: [
+              //表格
+              {
+                id: 1, //序号
+                plus: true, //加号显示
+                reduce: false, //减号显示
+                StoragecategoryList: [], //品类
+                Warehousecategory: '', //选择的值
+              },
+            ],
+          };
+          Commercialcial.value.push({
+            ...data,
+          });
+        });
+      }
+    })
+    .catch(() => {})
+    .finally(() => {});
+}
+// 页面初始化必要请求
+const onLoad = () => {
+  updateDictionary(Warehousebillingmode.value, 'dispatch_type'); //仓储计费类型
+  updateDictionary(ServiceList.value, 'dispatch_pricing_type'); //仓储计费类型
+  updateDictionary(Distinguishcategories.value, 'price_yes_no'); //是否区分品类 
+  updateDictionary(Billingmethod.value, 'min_cost_way'); //是否区分品类  
+  updateDictionary(chargetypeSelect.value, 'min_cost_type'); //最低计费类型  
+};
+onLoad();
 </script>
 
 <style scoped lang="scss">
@@ -464,6 +651,7 @@ const storageplus = (item, id) => {
     width: 100% !important;
     padding: 0 30px;
     .el-checkbox__label {
+      width: 100%;
       margin-left: 20px;
     }
   }
@@ -496,7 +684,7 @@ const storageplus = (item, id) => {
   }
   .el_table_span {
     font-size: 16px;
-    font-weight: bold;
+    font-weight: 500;
     display: inline-block;
     width: 160px;
   }
@@ -594,7 +782,7 @@ const storageplus = (item, id) => {
 
   .el_Commercial_ercial {
     width: 100%;
-    height: 500px;
+    max-height: 500px;
     box-sizing: border-box;
     border: 1px solid #ccc;
     padding: 4px;
@@ -602,4 +790,27 @@ const storageplus = (item, id) => {
     overflow-y: scroll;
   }
 }
+.el_Surchargebilling {
+  .el_title_span {
+    font-weight: bold;
+  }
+}
+
+.el_upstairs {
+  display: flex;
+  .el_upstairs_b {
+    margin-left: 70px;
+  }
+}
+.el_Minimumbilling {
+  .el_table_title {
+    font-weight: bold;
+  }
+  .el_Minimumbillingbox {
+    display: flex;
+  }
+  .el_Minimumbilling_b {
+    margin-left: 70px;
+  }
+}
 </style>
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index 6eb48195..27c27d7f 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -239,6 +239,9 @@
 <script setup>
 import { ref } from 'vue';
 import { defineProps } from 'vue';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+
+
 // 接收参数
 const props = defineProps({
   templateData: Object,
@@ -246,66 +249,21 @@ const props = defineProps({
 console.log(props, '来自父页面参数');
 const Storageloading = ref(false); //仓储品类加载
 const goriesloading = ref(false); //仓储品类加载
-console.log('仓储子页面');
 const form = ref({
   CalculationBasis: '1', // 计算基准
-  Distinguishcategories: '1', //是否区分品类
-  Managementfees: '1', //是否有管理费
-  Operatingunloading: '1', //是否有操作/装卸费
-  Sortingfee: '1', //是否有分拣费
+  Distinguishcategories: '0', //是否区分品类
+  Managementfees: '0', //是否有管理费
+  Operatingunloading: '0', //是否有操作/装卸费
+  Sortingfee: '0', //是否有分拣费
 }); //表单
 // 仓储计费类型
-const Storagebillingtype = ref([
-  {
-    value: '1',
-    label: '按件',
-  },
-  {
-    value: '2',
-    label: '按方',
-  },
-  {
-    value: '3',
-    label: '按重量(KG)',
-  },
-  {
-    value: '4',
-    label: '按吨',
-  },
-]);
+const Storagebillingtype = ref([]);
 // 仓储计费模式
-const Warehousebillingmode = ref([
-  {
-    value: '1',
-    label: '分段式计费',
-  },
-  {
-    value: '2',
-    label: '最高标准计费',
-  },
-]);
+const Warehousebillingmode = ref([]);
 // 计算基准
-const CalculationBasis = ref([
-  {
-    value: '1',
-    label: '按件/天',
-  },
-  {
-    value: '2',
-    label: '按件/月',
-  },
-]);
+const CalculationBasis = ref([]);
 // 是否区分品类
-const Distinguishcategories = ref([
-  {
-    value: '1',
-    label: '是',
-  },
-  {
-    value: '2',
-    label: '否',
-  },
-]);
+const Distinguishcategories = ref([]);
 // 仓库品类列表
 const Warehousecategory = ref([
   {
@@ -366,67 +324,15 @@ const Additionalcategories = ref([
 ]);
 // 附加计费单位
 const Surchargepricingunit = ref([
-  {
-    label: '件',
-    value: '1',
-  },
-  {
-    label: '方',
-    value: '2',
-  },
-  {
-    label: '重量(KG)',
-    value: '3',
-  },
-  {
-    label: '吨(KG)',
-    value: '4',
-  },
 ]);
 // 是否有管理费
-const Managementfees = ref([
-  {
-    value: '1',
-    label: '是',
-  },
-  {
-    value: '0',
-    label: '否',
-  },
-]);
+const Managementfees = ref([]);
 // 是否有操作/装卸费
-const Operatingunloading = ref([
-  {
-    value: '1',
-    label: '是',
-  },
-  {
-    value: '0',
-    label: '否',
-  },
-]);
+const Operatingunloading = ref([]);
 // 是否有分拣费
-const Sortingfee = ref([
-  {
-    value: '1',
-    label: '是',
-  },
-  {
-    value: '0',
-    label: '否',
-  },
-]);
+const Sortingfee = ref([]);
 // 附加费用是否统一计费
-const Additionalfeebilling = ref([
-  {
-    value: '1',
-    label: '是',
-  },
-  {
-    value: '2',
-    label: '否',
-  },
-]);
+const Additionalfeebilling = ref([]);
 
 // 移除对象
 function removeItemById(array, id) {
@@ -490,6 +396,41 @@ const categoriesduce = id => {
   goriesloading.value = true;
   removeItemById(AdditionalcategoriesList.value, id);
 };
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    if(res.data.code ==200){
+      if(res.data.data.length){
+        res.data.data.forEach(item => {
+        targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
+        id: item.id,
+      });
+    });
+   }
+  }
+  if(dictionaryType == 'price_yes_no'){
+    Managementfees.value ={...Distinguishcategories.value};//是否有管理费
+    Operatingunloading.value ={...Distinguishcategories.value};//是否有操作/装卸费
+    Sortingfee.value ={...Distinguishcategories.value};//是否有分拣费用
+    Additionalfeebilling.value ={...Distinguishcategories.value};//附加费用是否统一计费
+
+  }
+}).catch(()=>{
+}).finally(()=>{
+});
+}
+// 页面初始化必要请求
+const onLoad=()=>{
+  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');//附加费计价单位  	
+  
+}
+onLoad()
 </script>
 
 <style scoped lang="scss">