修复已知bug

src/router/views/index.js

@@ -1368,7 +1368,7 @@ export default [
         },
         path: '/aftersales/aftersalesWorkOrderAdd',
         name: '工单新增',
-        component: () => import('@/views/aftersales/aftersalesWorkOrderAddTemp.vue'),
+        component: () => import('@/views/aftersales/aftersalesWorkOrderAdd.vue'),
       },
     ],
   },
@@ -1650,22 +1650,22 @@ export default [
 
   // 工单新增重构页面
 
-  {
+  // {
-    path: '/aftersales/aftersalesWorkOrderAddTemp',
+  //   path: '/aftersales/aftersalesWorkOrderAddTemp',
-    component: Layout,
+  //   component: Layout,
-    redirect: '/aftersales/aftersalesWorkOrderAddTemp',
+  //   redirect: '/aftersales/aftersalesWorkOrderAddTemp',
-    children: [
+  //   children: [
-      {
+  //     {
-        meta: {
+  //       meta: {
-          i18n: 'dict',
+  //         i18n: 'dict',
-          keepAlive: true,
+  //         keepAlive: true,
-        },
+  //       },
-        path: '/aftersales/aftersalesWorkOrderAddTemp',
+  //       path: '/aftersales/aftersalesWorkOrderAddTemp',
-        name: '工单新增重构页面',
+  //       name: '工单新增重构页面',
-        component: () => import('@/views/aftersales/aftersalesWorkOrderAddTemps.vue'),
+  //       component: () => import('@/views/aftersales/aftersalesWorkOrderAddTemp.vue'),
-      },
+  //     },
-    ],
+  //   ],
-  },
+  // },
   // {
   //   // 这是父路由，财务主页面
   //   path: '/financialsector/FinanceHome',

src/views/aftersales/aftersalesWorkOrder.vue

@@ -368,7 +368,7 @@
                         <!-- <el-button v-if="AppealStatusT" @click="Appealeditor">编辑</el-button> -->
                         <!-- <el-button @click="ViewEvent(slotProps.scope)">编辑</el-button> -->
                         <!-- <el-button @click="reply(slotProps.scope)">回复</el-button> -->
-                        <!-- <el-button @click="ViewDelete(slotProps.scope)">删除</el-button> -->
+                        <el-button @click="ViewDelete(slotProps.scope)">删除</el-button>
                         <!-- <el-button @click="CompletionButton(slotProps.scope)">完结</el-button> -->
                         <!-- <el-button v-if="ClaimStatus" @click="appeal(slotProps.scope)"
                           >申诉</el-button

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -353,13 +353,13 @@
                 <!-- 初始必填 -->
                 <el-form-item
                   label="调查经过"
-                  prop="basis.investigationPocess"
+                  prop="basis.investigationProcess"
                   class="el_Investigation"
                   clearable
-                  v-if="displaySettings.investigationPocess"
+                  v-if="displaySettings.investigationProcess"
                 >
                   <el-input
-                    v-model="form.basis.investigationPocess"
+                    v-model="form.basis.investigationProcess"
                     placeholder="请输调查经过"
                     type="textarea"
                     :autosize="{ minRows: 1, maxRows: 10 }"
@@ -776,7 +776,7 @@ const ruleForm = reactive({
     discoveryTime: [{ required: true, message: '请选择发现时间', trigger: ['bulr', 'change'] }],
     waybillMall: [{ required: true, message: '请输入运单商场', trigger: ['bulr'] }],
     typeServiceName: [{ required: false, message: '请输入合作模式', trigger: ['bulr', 'change'] }],
-    investigationPocess: [
+    investigationProcess: [
       { required: true, message: '请输入调查经过', trigger: ['bulr', 'change'] },
     ],
     result: [{ required: true, message: '请输选择处理结果', trigger: ['bulr'] }],
@@ -957,7 +957,7 @@ const displaySettings = computed(() => {
     waybillMall: true, //运单商场
     typeServiceName: true, //合作模式
     processor: true, //处理方
-    investigationPocess: true, //调查经过
+    investigationProcess: true, //调查经过
   };
 });
 // 新增包件

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -499,7 +499,7 @@
         <el-tabs
           type="border-card"
           class="demo-tabs el-photo"
-          v-if="['1', '3'].includes(Indexform.workOrderType)"
+          v-if="Indexform.packList.length"
         >
           <el-tab-pane>
             <template #label>

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -137,7 +137,7 @@
                 </div>
                 <div class="el_btbox" v-for="(item, index) in PackageInfo" :key="index">
                   <div class="leftbox">
-                    <div class="maxBox">
+                    <!-- <div class="maxBox">
                       <span class="title">包条码:</span>
                       <el-input
                         disabled
@@ -147,37 +147,38 @@
                         :rows="2"
                         @change="ChangePackageInfo(item.packageCode, index)"
                       />
-                    </div>
+                    </div> -->
 
-                    <div class="maxBox">
+                    <el-form-item label="包条码">
-                      <span class="title">订单自编码:</span>
                       <el-input
-                        v-model="item.orderCode"
+                        v-model="item.packageCode"
-                        placeholder="请输入订单自编号"
+                        @change="ChangePackageInfo(item.packageCode, index)"
-                        clearable
                         disabled
                       />
-                    </div>
+                    </el-form-item>
 
-                    <div class="maxBox">
+                    <el-form-item label="运单号">
-                      <span class="title">运单号:</span>
+                      <el-input v-model="item.waybillNumber" disabled />
-                      <el-input
+                    </el-form-item>
-                        v-model="item.waybillNumber"
-                        placeholder="请输入运单号"
-                        clearable
-                        disabled
-                      />
-                    </div>
-                  </div>
 
-                  <div class="el-btn">
+                    <el-form-item label="订单自编码">
-                    <el-button v-if="item.state" type="primary" @click="historicalPackages(index)">
+                      <el-input v-model="item.orderCode" disabled />
-                      查看历史包件
+                    </el-form-item>
-                    </el-button>
+
-                    <!-- <el-button type="primary" @click="PackagRemoval(index)" disabled>
+                    <el-form-item label="一级品">
-                      移除
+                      <el-input v-model="item.first" disabled />
-                    </el-button> -->
+                    </el-form-item>
+
+                    <el-form-item label="二级品">
+                      <el-input v-model="item.secondary" disabled />
+                    </el-form-item>
+
+                    <el-form-item label="品牌">
+                      <el-input v-model="item.brandName" disabled />
+                    </el-form-item>
                   </div>
+
+
                 </div>
                 <div class="NumTotal">
                   <span>总件数:{{ PackageInfo.length }}</span>
@@ -273,11 +274,6 @@
                       />
                     </div>
                   </div>
-                  <div class="el-btn">
-                    <!-- <el-button type="primary" disabled @click="ResponsibilityRemoval(index)">
-                      移除
-                    </el-button> -->
-                  </div>
                 </div>
                 <div class="Proportion">
                   <span class="title">公司占比:{{ companyProportion }}%</span>
@@ -508,8 +504,8 @@
             </div> -->
 
             <!-- 图片  -->
-            <div class="Transport_damage_photos">
+            <div class="Transport_damage_photos" v-if="endFrom.packageImage.length">
-              <span class="title">图片</span>
+              <span class="title">照片</span>
               <el-upload
                 disabled
                 v-model:file-list="endFrom.packageImage"
@@ -1749,12 +1745,12 @@ const AddPackage = () => {
 const PackagRemoval = val => {
   PackageInfo.value.splice(val, 1); //移除当前点击的按钮
 };
-// 查看历史包件
+// // 查看历史包件
-const historicalPackages = val => {
+// const historicalPackages = val => {
-  dialogHistoricalPackage.value = true; //打开历史包件弹窗
+//   dialogHistoricalPackage.value = true; //打开历史包件弹窗
-  HistorIndex.value = val;
+//   HistorIndex.value = val;
-  console.log(val);
+//   console.log(val);
-};
+// };
 // 查询包件信息自动回显
 const ChangePackageInfo = (val, index) => {
   let data = {
@@ -2844,11 +2840,21 @@ const CustomerServiceCompleted = () => {
   display: flex;
   flex-direction: column;
   margin-bottom: 10px;
+  justify-content: flex-start;
   .leftbox {
     width: 100%;
     display: flex;
-    justify-content: space-between;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+    .el-form-item{
+      margin-right:24px;
+      flex-direction: column;
+      align-items: flex-start;
+      flex: none;
+      width: 12%;
     }
+  }
+
   .maxBox {
     display: flex;
     align-items: center;

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -487,7 +487,7 @@
             <el-button @click="QRcodes" style="margin-bottom: 4px" type="primary"
               >批量查看二维码</el-button
             >
-            <el-button @click="Batchpackages" style="margin-bottom: 4px" type="primary"
+            <el-button v-if="accessControl" @click="Batchpackages" style="margin-bottom: 4px" type="primary"
               >批量签收</el-button
             >
             <el-button @click="PackBatchcancellation" style="margin-bottom: 4px" type="primary"
@@ -548,7 +548,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="库存品包件" name="reservationInventoryPackage">
-            <el-button @click="Batchsigning" style="margin-bottom: 4px" type="primary"
+            <el-button v-if="accessControl" @click="Batchsigning" style="margin-bottom: 4px" type="primary"
               >批量签收</el-button
             >
             <el-button @click="Batchcancellation" style="margin-bottom: 4px" type="primary"
@@ -610,7 +610,7 @@
           <!--          <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>-->
 
           <el-tab-pane label="零担列表" name="LessThantruckloadList">
-            <el-button @click="LdBatchsigning" style="margin-bottom: 4px" type="primary"
+            <el-button v-if="accessControl" @click="LdBatchsigning" style="margin-bottom: 4px" type="primary"
               >批量签收</el-button
             >
             <el-button @click="Ldcancellation" style="margin-bottom: 4px" type="primary"
@@ -950,10 +950,12 @@ import { getToken } from '@/utils/auth';
 import { setNodeHeight } from '@/utils/util.js';
 import { AbnormalReview } from '@/option/distribution/DeliveryExceptionReview.js';
 import print from '@/utils/print';
+import { useStore } from 'vuex';
 
 export default {
   data() {
     return {
+      accessControl:'',
       html: '',
       reservationActiveName: 'reservationPackage',
       checkloading: false, //复核签收加载
@@ -3838,6 +3840,14 @@ export default {
     this.setTableHeight();
   },
   created() {
+const $useStore = useStore();
+if($useStore.getters && $useStore.getters.permission){
+  this.accessControl = $useStore.getters.permission.Batch_signing;//批量签收权限
+  console.log(this.accessControl,'accessControl按钮权限');
+}
+
+
+
     // this.onLoad();
     // //查询字典
     // this.queryDictionary();

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -112,6 +112,7 @@
                 @btnCheck="btnsc"
                 @selectCheck="selectsc"
                 @selection="selectionChange"
+                
               >
                 <template #default="slotProps">
                   <el-button
@@ -580,6 +581,7 @@
           @btnCheck="btnsc"
           @selectCheck="orderSelectSc"
           @selection="orderSelectChange"
+          :isselectfun="ProhibitSelection"
         >
         </tablecmt>
         <div class="avue-crud__pagination" style="width: 100%">
@@ -2389,6 +2391,14 @@ export default {
         });
       this.dialogChooseOrderVisible = false;
     },
+ProhibitSelection(val, index) {
+if (val.orderPackageStatus == 70) {
+      return false;
+    } else {
+      return true;
+    }
+ 
+},
     // 数量校验
     handleNumberRange(e, row) {
       console.log(e, 'ee=====');

src/views/distribution/signfor/distributionSignfor.vue

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

src/views/distribution/signfor/distributionSignforedt.vue

@@ -87,6 +87,13 @@
           <el-input v-model="form.unLoadingTeamName" disabled placeholder="卸车班组" />
         </el-tooltip>
       </div>
+      <div class="el-txt" style="margin-top: 20px">
+        <el-icon><Stopwatch /></el-icon>
+        <span class="title-name"> 实际配送时间:</span>
+   
+          <el-input v-model="pageRow.taskTime" disabled placeholder="卸车班组" />
+      
+      </div>
     </div>
 
     <!-- 收货人信息 -->
@@ -199,6 +206,71 @@
       </div>
     </div>
 
+
+
+
+
+
+
+
+
+
+
+    <div class="Basic-information">
+      <div class="el-txt">
+        <el-icon><User /></el-icon>
+        <span class="title-name">计划件数:</span>
+          <el-input v-model="pageRow.reservationNum" disabled placeholder="收货人姓名" />
+      </div>
+      <div class="el-txt">
+        <el-icon><User /></el-icon>
+        <span class="title-name">装车件数:</span>
+          <el-input v-model="pageRow.loadedNumber" disabled placeholder="收货人号码" />
+      </div>
+      <div class="el-txt">
+        <el-icon><Postcard /></el-icon>
+        <span class="title-name"> 签收件数:</span>
+          <el-input v-model="pageRow.receivedQuantity" disabled placeholder="收货人地址" />
+      </div>
+      <div class="el-txt">
+        <el-icon><Van /></el-icon>
+        <span class="title-name"> 复核人:</span>
+          <el-input v-model="pageRow.examineUserName" disabled placeholder="是否加急" />
+
+      </div>
+      <div class="el-txt" style=" margin-top: 24px;">
+        <el-icon><Van /></el-icon>
+        <span class="title-name"> 签收人:</span>
+          <el-input v-model="pageRow.signeeName" disabled placeholder="是否加急" />
+     </div>
+
+     <div class="el-txt" style=" margin-top: 24px;">
+        <el-icon><Van /></el-icon>
+        <span class="title-name"> 签收完成时间:</span>
+          <el-input v-model="pageRow.sjsigningTime" disabled placeholder="是否加急" />
+     </div>
+
+     <div class="el-txt" style=" margin-top: 24px;">
+        <el-icon><Van /></el-icon>
+        <span class="title-name"> 文员复核时间:</span>
+          <el-input v-model="pageRow.signingTime" disabled placeholder="是否加急" />
+     </div>
+    </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <div class="FImg">
       <div class="imgName">
         <span
@@ -1748,11 +1820,18 @@ const btnClass = type => {
     ElBtnClass.value = 'el-Btn-btn';
   }
 };
+const pageRow=ref({});//页面参数
 // 页面初始化需要请求的参数
 const onLoad = () => {
   menuData.value = menuData1.value; //页面初始化默认显示第一个表格
   data.value = InitializeTable.value; //默认显示第一个表格数据
 };
+console.log(route.query,'route.query');
+
+const { row } =route.query;
+pageRow.value=JSON.parse(row)
+console.log(pageRow.value,'pageRow.value');
+
 // RouterId.value = '1721707916601487362';
 // RouterReservationId.value = '1721707896171032578';
 // 获取路由必要参数

src/views/financialsector/Financialse/FinancialDelivery.vue

@@ -32,6 +32,7 @@
             style="width: 100%"
             multiple
             @remove-tag="removeTag"
+            @change="DeliveryType"
           >
             <el-option
               style="padding: 0"
@@ -188,27 +189,31 @@
       <div class="el_Commercial_ercial">
         <span class="el_title_span">附加费计费</span>
         <div class="el_fj">
-          <!-- 是否有分货费  -->
           <div class="el_Storage">
-            <span class="el_table_span">是否有分货费</span>
+            <span class="el_table_span">是否附加费</span>
-            <el-radio-group v-model="form.dispatchIsSortFee" class="el_Cselect">
+            <el-radio-group
-              <el-radio v-for="item in Distributionfee" :key="item.label" :label="item.value">{{
+              v-model="form.dispatchIsAddFee"
+              class="el_Cselect"
+              @change="isdispatchIsAddFee"
+            >
+              <el-radio v-for="item in additionalfee" :key="item.label" :label="item.value">{{
                 item.label
               }}</el-radio>
             </el-radio-group>
           </div>
-          <!-- 是否有操作/装卸费  -->
+
-          <div class="el_Storage">
+          <!-- 是否有分货费  -->
-            <span class="el_table_span">是否有操作/装卸费</span>
+          <div class="el_Storage" v-if="form.dispatchIsAddFee">
-            <el-radio-group v-model="form.dispatchIsOperateFee" class="el_Cselect">
+            <span class="el_table_span">是否有分货费</span>
-              <el-radio v-for="item in Operatingfee" :key="item.label" :label="item.value">{{
+            <el-radio-group v-model="form.dispatchIsSortFee" class="el_Cselect">
+              <el-radio v-for="item in Distributionfee" :key="item.label" :label="item.value">{{
                 item.label
               }}</el-radio>
             </el-radio-group>
           </div>
 
           <!-- 是否有上楼费  -->
-          <div class="el_Storage">
+          <div class="el_Storage" v-if="form.dispatchIsAddFee">
             <div class="el_upstairs_a">
               <span class="el_table_span">是否有上楼费</span>
               <el-radio-group
@@ -222,7 +227,7 @@
               </el-radio-group>
             </div>
           </div>
-          <div class="el_Storage">
+          <div class="el_Storage" v-if="form.dispatchIsAddFee">
             <div class="el_upstairs_b" v-if="form.dispatchIsStairsCarryingCharge">
               <span class="el_table_span">是否配置免费层数</span>
               <el-radio-group v-model="form.dispatchIsFeeFloor" class="el_Cselect">
@@ -235,7 +240,7 @@
         </div>
         <div class="el_translation">
           <!-- 是否有平移费  -->
-          <div class="el_Storage">
+          <div class="el_Storage" v-if="form.dispatchIsAddFee">
             <span class="el_table_span">是否有平移费</span>
             <el-radio-group v-model="form.dispatchIsShiftingCharge" class="el_Cselect el_fx">
               <el-radio v-for="item in Translationfee" :key="item.label" :label="item.value">{{
@@ -243,9 +248,18 @@
               }}</el-radio>
             </el-radio-group>
           </div>
+          <!-- 是否有操作/装卸费  -->
+          <div class="el_Storage" v-if="form.dispatchIsAddFee">
+            <span class="el_table_span">是否有操作/装卸费</span>
+            <el-radio-group v-model="form.dispatchIsOperateFee" class="el_Cselect el_fx">
+              <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">
+          <div class="el_Storage" v-if="form.dispatchIsAddFee">
             <span class="el_table_span">附加费是否按品类计费</span>
             <el-radio-group v-model="form.dispatchIsCategorySubjoin" class="el_Cselect el_fx">
               <el-radio
@@ -386,9 +400,9 @@ const SelectData = ref({});
 const formedit = ref({}); //编辑重置
 const formCopy = ref(null); //拷贝的数据
 const form = ref({
-  dispatchPieceCategoryState: true, //按件是否显示
+  dispatchPieceCategoryState: false, //按件是否显示
-  dispatchWeightCategoryState: true, //按重量是否显示
+  dispatchWeightCategoryState: false, //按重量是否显示
-  dispatchCubeCategoryState: true, //按方是否显示
+  dispatchCubeCategoryState: false, //按方是否显示
   dispatchServiceType: '', //仓储计费类型
   dispatchIsByCategory: 0, //是否区分品类
   dispatchIsLeaveBehind: 0, //是否有遗留件
@@ -398,6 +412,7 @@ const form = ref({
   dispatchIsFeeFloor: null, //是否配置免费层数
   dispatchIsShiftingCharge: 0, //是否有平移费
   dispatchIsCategorySubjoin: 0, //附加费
+  dispatchIsAddFee: 0, //是否附加费
   dispatchIsMinCost: 0, //是否最低计费
   dispatchMinCostMode: null, //最低计费方式
   dispatchMinCostType: 1, //最低计费类型
@@ -500,6 +515,8 @@ const upstairs = ref([]);
 const MinimumState = ref(false);
 //是否有分货费
 const Distributionfee = ref([]);
+// 是否附加费
+const additionalfee = ref([]);
 //是否有操作装卸费
 const Operatingfee = ref([]);
 const Deliveryloading = ref(false);
@@ -544,7 +561,43 @@ const UpstairsChange = val => {
   }
 };
 // 是否区分品类
-const categoryChange = val => {};
+const categoryChange = val => {
+  form.value.dispatchPieceCategoryData = [
+    {
+      index: 1,
+      Warehousecategory: '',
+      options: [],
+      plus: true,
+      reduce: false,
+      StateName: 'storage', //仓储标识
+      loading: false,
+    },
+  ];
+
+  form.value.dispatchWeightCategoryData = [
+    {
+      index: 1,
+      Warehousecategory: '',
+      options: [],
+      plus: true,
+      reduce: false,
+      StateName: 'storage', //仓储标识
+      loading: false,
+    },
+  ];
+
+  form.value.dispatchCubeCategoryData = [
+    {
+      index: 1,
+      Warehousecategory: '',
+      options: [],
+      plus: true,
+      reduce: false,
+      StateName: 'storage', //仓储标识
+      loading: false,
+    },
+  ];
+};
 // 是否最低计费展示
 const MinimumChange = val => {
   console.log(val);
@@ -647,6 +700,7 @@ const isChecked = async item => {
     });
   }
 };
+const DeliveryType = async value => {};
 // 点击移除
 const removeTag = value => {
   console.log(value, '点击移除value');
@@ -806,6 +860,7 @@ async function updateDictionary(targetArray, dictionaryType) {
       if (dictionaryType == 'price_yes_no') {
         Leftoverparts.value = { ...Distinguishcategories.value }; //是否有遗留件
         Distributionfee.value = { ...Distinguishcategories.value }; //是否有分货费
+        additionalfee.value = { ...Distinguishcategories.value }; //是否附加费
         Operatingfee.value = { ...Distinguishcategories.value }; //是否有操作/装卸费
         upstairs.value = { ...Distinguishcategories.value }; //是否有上楼费
         Numberlayers.value = { ...Distinguishcategories.value }; //是否配置免费层数
@@ -873,6 +928,16 @@ const search = val => {
   }
 };
 
+// 是否附加费
+
+const isdispatchIsAddFee = value => {
+  (form.value.dispatchIsSortFee = 0), //是否有分货费
+    (form.value.dispatchIsStairsCarryingCharge = 0), //是否有上楼费
+    (form.value.dispatchIsFeeFloor = null), //是否配置免费层数
+    (form.value.dispatchIsShiftingCharge = 0), //是否有平移费
+    (form.value.dispatchIsOperateFee = 0), //是否有操作装卸
+    (form.value.dispatchIsCategorySubjoin = 0); //附加费是否按品类计费
+};
 function updateOptions(allDropdowns) {
   // 拉平所有的下拉框组到一个单一数组中
   let dropdowns = [].concat(...allDropdowns);

src/views/financialsector/Financialse/FinancialWarehousing.vue

@@ -110,7 +110,25 @@
       <div class="el_Surcharge">
         <!-- 附加费计价单位 -->
         <div class="el_flex_row">
+          <div style="width: 100%">
             <div class="el_Storage">
+              <el-form-item label="是否附加费">
+                <el-radio-group
+                  v-model="form.warehouseIsAddFee"
+                  class="el_Cselect"
+                  @change="iswarehouseIsAddFee"
+                >
+                  <el-radio
+                    v-for="item in warehouseIsAddFeeList"
+                    :key="item.label"
+                    :label="item.value"
+                    >{{ item.label }}</el-radio
+                  >
+                </el-radio-group>
+              </el-form-item>
+            </div>
+          </div>
+          <div class="el_Storage" v-if="form.warehouseIsAddFee">
             <el-form-item label="附加费计价单位" prop="warehouseSubjoinFeeUnit">
               <el-select
                 class="el_Cselect"
@@ -131,7 +149,7 @@
           </div>
 
           <!-- 是否有管理费 -->
-          <div class="el_Storage">
+          <div class="el_Storage" v-if="form.warehouseIsAddFee">
             <el-form-item label="是否有管理费">
               <el-radio-group v-model="form.warehouseIsManageFee" class="el_Cselect">
                 <el-radio v-for="item in Managementfees" :key="item.label" :label="item.value">{{
@@ -142,7 +160,7 @@
           </div>
 
           <!-- 是否有操作/装卸费 -->
-          <div class="el_Storage">
+          <div class="el_Storage" v-if="form.warehouseIsAddFee">
             <el-form-item label="是否有操作/装卸费">
               <el-radio-group v-model="form.warehouseIsOperateFee" class="el_Cselect">
                 <el-radio
@@ -157,7 +175,7 @@
 
           <!-- 是否有分拣费用 -->
           <div class="el_Storage">
-            <el-form-item label="是否有分拣费用">
+            <el-form-item label="是否有分拣费用" v-if="form.warehouseIsAddFee">
               <el-radio-group v-model="form.warehouseIsSortFee" class="el_Cselect">
                 <el-radio v-for="item in Sortingfee" :key="item.label" :label="item.value">{{
                   item.label
@@ -166,8 +184,9 @@
             </el-form-item>
           </div>
         </div>
+
         <!-- 附加费用是否统一计费 -->
-        <div class="el_Storage">
+        <div class="el_Storage" v-if="form.warehouseIsAddFee">
           <el-form-item label="附加费是否按品类计费">
             <el-radio-group
               @change="AdditionalDisplayChange"
@@ -246,6 +265,7 @@ const ruleFormRef = ref();
 const SelectData = ref({});
 const formedit = ref({}); //编辑重置
 const form = ref({
+  warehouseIsAddFee: 0, //是否附加费
   warehouseCalculationBasis: 1, // 计算基准
   warehouseIsByCategory: 0, //是否区分品类
   warehouseIsManageFee: 0, //是否有管理费
@@ -497,7 +517,8 @@ const Operatingunloading = ref([]);
 const Sortingfee = ref([]);
 // 附加费用是否统一计费
 const Additionalfeebilling = ref([]);
-
+// 是否附加费
+const warehouseIsAddFeeList = ref([]);
 // 移除对象
 function removeItemById(array, id) {
   const index = array.findIndex(item => item.index === id);
@@ -548,6 +569,15 @@ const categoriesduce = id => {
   goriesloading.value = true;
   removeItemById(form.value.AdditionalcategoriesData, id);
 };
+
+// 附加费重置
+const iswarehouseIsAddFee = () => {
+  form.value.warehouseSubjoinFeeUnit = ''; //附加费计价单位
+  form.value.warehouseIsManageFee = 0; //是否有管理费
+  form.value.warehouseIsOperateFee = 0; //是否有操作/装卸费
+  form.value.warehouseIsSortFee = 0; //是否有分拣费用
+  form.value.warehouseIsCategorySubjoin = 0; //附加费用是否统一计费
+};
 async function updateDictionary(targetArray, dictionaryType) {
   await getDictionaryBiz(dictionaryType)
     .then(res => {
@@ -568,6 +598,7 @@ async function updateDictionary(targetArray, dictionaryType) {
         Operatingunloading.value = { ...Distinguishcategories.value }; //是否有操作/装卸费
         Sortingfee.value = { ...Distinguishcategories.value }; //是否有分拣费用
         Additionalfeebilling.value = { ...Distinguishcategories.value }; //附加费用是否统一计费
+        warehouseIsAddFeeList.value = { ...Distinguishcategories.value };
       }
     })
     .catch(() => {})
@@ -613,7 +644,6 @@ const onLoad = async () => {
     // 执行回显
     form.value = await deepClone(request);
 
-   
     if (request.warehouseIsByCategory == 1) {
       form.value.StoragecategoryData = [];
       request.warehousePieceCategorys.forEach((res, index) => {
@@ -651,9 +681,8 @@ const onLoad = async () => {
         });
       });
     }
-    console.log(request.warehouseCalculationBasis,'request.warehouseCalculationBasis++++++===>>>');
+    form.value.warehouseCalculationBasis = request.warehouseCalculationBasis || 1; //计算基准
-  form.value.warehouseCalculationBasis= request.warehouseCalculationBasis|| 0;//计算基准
+    console.log(form.value, 'form.value.warehouseCalculationBasis');
-  console.log(form.value,'form.value.warehouseCalculationBasis');
   }
 
   formedit.value = deepClone(form.value);
@@ -733,7 +762,6 @@ const Submit = () => {
     }
 
     console.log(form.value, '要提交的参数');
-
     ElMessageBox.confirm('是否保存?', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -868,6 +896,7 @@ const AdditionalDisplayChange = val => {
   .el_flex_row {
     display: flex;
     justify-content: space-between;
+    flex-wrap: wrap;
     .el-form-item {
       flex-direction: column;
       margin-right: 0;