From ebca8a8f3517cba00bb914a165b612eab8b99eb1 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 25 Apr 2024 16:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A2=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Pricesystem/Price/PriceDelivery.vue | 184 +++++++++++++----
 .../Pricesystem/Price/PriceWarehousing.vue    |   5 +-
 .../signfor/distributionSignforedt.vue        |  11 ++
 .../Financialse/FinancialDelivery.vue         |  22 ++-
 .../Financialse/FinancialWarehousing.vue      | 187 +++++++++---------
 5 files changed, 269 insertions(+), 140 deletions(-)

diff --git a/src/views/Pricesystem/Price/PriceDelivery.vue b/src/views/Pricesystem/Price/PriceDelivery.vue
index 6e368d1e..6b1d4c72 100644
--- a/src/views/Pricesystem/Price/PriceDelivery.vue
+++ b/src/views/Pricesystem/Price/PriceDelivery.vue
@@ -192,7 +192,12 @@
           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">
@@ -726,6 +731,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 +805,11 @@ async function addItemAfterId(array) {
     vehicleType: '', //	车型
     loading: false,
     price: 0, //价格
-    options: pricevehicle.value, //选择框列表
+    options: deepClone(pricevehicle.value), //选择框列表
+    
   };
   await array.push(newItem);
+  updateOptions(form.value.fullVehicleData);
 }
 // 仓储减
 const storagereduce = id => {
@@ -774,10 +818,73 @@ const storagereduce = id => {
 };
 
 // 仓储加
-const storageplus = data => {
-  addItemAfterId(form.value.fullVehicleData);
-};
+const storageplus = async data => {
+ await addItemAfterId(form.value.fullVehicleData);
+  // 更新选项
 
+
+};
+// let data=[
+//     {
+//         "index": 1,
+//         "loading": false,  
+//         "options": [
+//             {
+//                 "value": 1,
+//                 "label": "5米6",
+//                 "id": "1775349356882358274"
+//             },
+//             {
+//                 "value": 2,
+//                 "label": "9米5",
+//                 "id": "1775349396015214594"
+//             },
+//             {
+//                 "value": 3,
+//                 "label": "3米7",
+//                 "id": "1775349435810770945"
+//             },
+//             {
+//                 "value": 4,
+//                 "label": "2米8",
+//                 "id": "1775349490655490049"
+//             }
+//         ],
+//         "plus": true,
+//         "price": 55,
+//         "vehicleType": 1
+//     },
+//     {
+//         "index": 2,
+//         "plus": false,
+//         "reduce": true,
+//         "vehicleType": "",
+//         "loading": false,
+//         "price": 0,
+//         "options": [
+//             {
+//                 "value": 1,
+//                 "label": "5米6",
+//                 "id": "1775349356882358274"
+//             },
+//             {
+//                 "value": 2,
+//                 "label": "9米5",
+//                 "id": "1775349396015214594"
+//             },
+//             {
+//                 "value": 3,
+//                 "label": "3米7",
+//                 "id": "1775349435810770945"
+//             },
+//             {
+//                 "value": 4,
+//                 "label": "2米8",
+//                 "id": "1775349490655490049"
+//             }
+//         ]
+//     }
+// ]
 const billing = async () => {
   // 服务类型转换为数字数组
   form.value.dispatchPricingType = (await request.value.dispatchPricingType)
@@ -859,35 +966,33 @@ const onLoad = async () => {
       }
       //  按方计费
       if (form.value.dispatchPricingType.includes(3)) {
-        if(request.value.dispatchCubeCategorys.length){
+        if (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 }],
+            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)) {
-        if(  request.value.dispatchWeightCategorys.length){
+        if (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 }],
+            form.value.weightCategoryData.push({
+              index: index + 1,
+              categoryId: item.id, //品类
+              price: 0, //价格
+              leaveBehindPrice: 0, //遗留单价
+              options: [{ label: item.name, value: item.id }],
+            });
           });
-        });
         }
-
       }
-    } 
+    }
 
     console.log(request.value, ' request.value');
     //  附加费品类
@@ -913,14 +1018,14 @@ const onLoad = async () => {
     // 最低计费等级
     console.log(form.value.Minimumbilling, 'Minimumbilling');
     console.log(request.value.dispatchMinCostType);
-    if( form.value.Minimumbilling.length){
+    if (form.value.Minimumbilling.length) {
       form.value.Minimumbilling.forEach(res => {
-      if (res.index == request.value.dispatchMinCostType) {
-        res.disabled = true;
-      } else {
-        res.disabled = false;
-      }
-    });
+        if (res.index == request.value.dispatchMinCostType) {
+          res.disabled = true;
+        } else {
+          res.disabled = false;
+        }
+      });
     }
 
     // if (request.value.dispatchMinCostType != 1) {
@@ -931,16 +1036,15 @@ const onLoad = async () => {
     //   console.log('加算价格没有');
     // }
     // 遗留控制
-    if(form.value.Minimumlegacy.length){
+    if (form.value.Minimumlegacy.length) {
       form.value.Minimumlegacy.forEach(res => {
-      if (res.index == request.value.dispatchMinCostType) {
-        res.disabled = true;
-      } else {
-        res.disabled = false;
-      }
-    });
-    } 
-
+        if (res.index == request.value.dispatchMinCostType) {
+          res.disabled = true;
+        } else {
+          res.disabled = 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/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/Financialse/FinancialDelivery.vue b/src/views/financialsector/Financialse/FinancialDelivery.vue
index 90ccf0ce..84dde1ef 100644
--- a/src/views/financialsector/Financialse/FinancialDelivery.vue
+++ b/src/views/financialsector/Financialse/FinancialDelivery.vue
@@ -1194,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); //拷贝一份要提交的数据
@@ -1273,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('走编辑接口');
       // 编辑接口
@@ -1289,6 +1291,10 @@ const handleSubmit = async () => {
             type: 'success',
           });
         }
+      }).catch(res=>{
+        console.log(res,'错误信息');
+      }).finally(()=>{
+        pageLoading.value=false
       });
     } else {
       // 新增接口
@@ -1305,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, '编辑成功之后返回值');